parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 109 Wiki Activity

Improve handling of task arg display 

Shows each subarg of the task_args as its own element, if applicable,
and fits the width to the terminal using MAX_CONTENT_WIDTH instead of an
arbitrary value.
This commit is contained in:
Joshua Boniface 2024-01-18 13:00:48 -05:00
parent 4dc4c975f1
commit 2886176762
1 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
client-cli/pvc/cli/formatters.py
View File

@ -645,6 +645,24 @@ def cli_cluster_task_format_pretty(CLI_CONFIG, task_data):
if _task_type_length > task_type_length: if _task_type_length > task_type_length:
task_type_length = _task_type_length task_type_length = _task_type_length
for arg_name, arg_data in task["kwargs"].items():
# Skip the "run_on" argument
if arg_name == "run_on":
continue
# task_arg_name column
_task_arg_name_length = len(str(arg_name)) + 1
if _task_arg_name_length > task_arg_name_length:
task_arg_name_length = _task_arg_name_length
task_header_length = (
task_id_length + task_name_length + task_type_length + task_worker_length + 3
)
max_task_data_length = (
MAX_CONTENT_WIDTH - task_header_length - task_arg_name_length - 2
)
for task in task_data:
updated_kwargs = list() updated_kwargs = list()
for arg_name, arg_data in task["kwargs"].items(): for arg_name, arg_data in task["kwargs"].items():
# Skip the "run_on" argument # Skip the "run_on" argument
@ -656,15 +674,30 @@ def cli_cluster_task_format_pretty(CLI_CONFIG, task_data):
if _task_arg_name_length > task_arg_name_length: if _task_arg_name_length > task_arg_name_length:
task_arg_name_length = _task_arg_name_length task_arg_name_length = _task_arg_name_length
if len(str(arg_data)) > 17: if isinstance(arg_data, list):
arg_data = arg_data[:17] + "..." for subarg_data in arg_data:
if len(subarg_data) > max_task_data_length:
subarg_data = (
str(subarg_data[: max_task_data_length - 4]) + " ..."
)
# task_arg_data column # task_arg_data column
_task_arg_data_length = len(str(arg_data)) + 1 _task_arg_data_length = len(str(subarg_data)) + 1
if _task_arg_data_length > task_arg_data_length: if _task_arg_data_length > task_arg_data_length:
task_arg_data_length = _task_arg_data_length task_arg_data_length = _task_arg_data_length
updated_kwargs.append({"name": arg_name, "data": subarg_data})
else:
if len(str(arg_data)) > 24:
arg_data = str(arg_data[:24]) + " ..."
# task_arg_data column
_task_arg_data_length = len(str(arg_data)) + 1
if _task_arg_data_length > task_arg_data_length:
task_arg_data_length = _task_arg_data_length
updated_kwargs.append({"name": arg_name, "data": arg_data})
updated_kwargs.append({"name": arg_name, "data": arg_data})
task["kwargs"] = updated_kwargs task["kwargs"] = updated_kwargs
tasks.append(task) tasks.append(task)