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

Fix ArgParse auto-connect to support default function type (stored as empty string, ignored when running remotely) and type string with default value None (ignored when running remotely and None value is kept)

Browse Source
This commit is contained in:
allegroai 2020-10-04 16:58:50 +03:00
parent 765afcbb64
commit 1a39973cb9
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
trains/backend_interface/task/args.py
View File

@ -3,6 +3,7 @@ import yaml
from six import PY2 from six import PY2
from argparse import _StoreAction, ArgumentError, _StoreConstAction, _SubParsersAction, SUPPRESS from argparse import _StoreAction, ArgumentError, _StoreConstAction, _SubParsersAction, SUPPRESS
from copy import copy from copy import copy
import types
from ...backend_api import Session from ...backend_api import Session
from ...utilities.args import call_original_argparser from ...utilities.args import call_original_argparser
@ -92,8 +93,9 @@ class _Arguments(object):
else: else:
args_dict = call_original_argparser(a_parser, args=a_args, namespace=a_namespace).__dict__ args_dict = call_original_argparser(a_parser, args=a_args, namespace=a_namespace).__dict__
defaults_ = { defaults_ = {
a.dest: args_dict.get(a.dest) if (args_dict.get(a.dest) is not None) else '' a.dest: args_dict.get(a.dest) if (
for a in actions args_dict.get(a.dest) is not None and not callable(args_dict.get(a.dest))
) else '' for a in actions
} }
except Exception: except Exception:
# don't crash us if we failed parsing the inputs # don't crash us if we failed parsing the inputs
@ -305,6 +307,19 @@ class _Arguments(object):
if v not in (None, ''): if v not in (None, ''):
arg_parser_argeuments[k] = v arg_parser_argeuments[k] = v
elif current_action and current_action.type: elif current_action and current_action.type:
# if we have an action type and value (v) is None, and cannot be casted, leave as is
if isinstance(current_action.type, types.FunctionType) and not v:
# noinspection PyBroadException
try:
v = current_action.type(v)
except Exception:
continue
elif current_action.type == str and current_action.default is None and v in (None, ''):
# if the type is str and the default is None, and we stored empty string,
# do not change the value (i.e. leave it as None)
continue
arg_parser_argeuments[k] = v arg_parser_argeuments[k] = v
# noinspection PyBroadException # noinspection PyBroadException
try: try: