ClearML/clearml-server
1
0
Fork 0
mirror of https://github.com/clearml/clearml-server synced 2025-03-04 02:59:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of empty hyperparam/configuration keys

Browse Source
This commit is contained in:
allegroai 2022-07-08 17:54:19 +03:00
parent f7e833bf6f
commit b058770af1
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
apiserver/bll/task/param_utils.py
View File

@ -121,18 +121,31 @@ def params_prepare_for_save(fields: dict, previous_task: Task = None):
nested_set(fields, new_path, new_param) nested_set(fields, new_path, new_param)
nested_delete(fields, old_params_field) nested_delete(fields, old_params_field)
for param_field in ("hyperparams", "configuration"): def ensure_non_empty(k: str, desc: str) -> str:
params = fields.get(param_field) if not k:
raise errors.bad_request.ValidationError(
f"Empty {desc} name is not allowed"
)
return k
params = fields.get("hyperparams")
if params: if params:
escaped_params = { escaped_params = {
ParameterKeyEscaper.escape(key): { ParameterKeyEscaper.escape(ensure_non_empty(key, "section")): {
ParameterKeyEscaper.escape(k): v for k, v in value.items() ParameterKeyEscaper.escape(ensure_non_empty(k, "parameter")): v
for k, v in value.items()
} }
if isinstance(value, dict)
else value
for key, value in params.items() for key, value in params.items()
} }
fields[param_field] = escaped_params fields["hyperparams"] = escaped_params
params = fields.get("configuration")
if params:
escaped_params = {
ParameterKeyEscaper.escape(ensure_non_empty(key, "configuration")): value
for key, value in params.items()
}
fields["configuration"] = escaped_params
def params_unprepare_from_saved(fields, copy_to_legacy=False): def params_unprepare_from_saved(fields, copy_to_legacy=False):
@ -186,7 +199,7 @@ def escape_paths(paths: Sequence[str]) -> Sequence[str]:
for old_prefix, new_prefix in ( for old_prefix, new_prefix in (
("execution.parameters", f"hyperparams.{hyperparams_default_section}"), ("execution.parameters", f"hyperparams.{hyperparams_default_section}"),
("execution.model_desc", "configuration"), ("execution.model_desc", "configuration"),
("execution.docker_cmd", "container") ("execution.docker_cmd", "container"),
): ):
path: str path: str
paths = [path.replace(old_prefix, new_prefix) for path in paths] paths = [path.replace(old_prefix, new_prefix) for path in paths]