Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions apps/trigger/handler/impl/task/application_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ def get_reference(fields, obj):


def conversion_custom_value(value, _type):
if _type in ('array', 'dict', 'float', 'int', 'boolean', 'any'):
if ['array', 'dict', 'float', 'int', 'boolean', 'any'].__contains__(_type):
try:
return json.loads(value)
except Exception:
except Exception as e:
pass
return value

Expand All @@ -48,11 +48,9 @@ def valid_value_type(value, _type):
if _type == 'float':
return isinstance(value, float)
if _type == 'int':
return isinstance(value, int) and not isinstance(value, bool)
return isinstance(value, int)
if _type == 'boolean':
return isinstance(value, bool)
if _type == 'any':
return True
return isinstance(value, str)


Expand All @@ -62,17 +60,15 @@ def get_field_value(value, kwargs, _type, required, default_value, field):
_value = value.get('value')
if _value:
_value = conversion_custom_value(_value, _type)
else:
if default_value:
return default_value
if required:
raise Exception(f'{field} is required')
else:
return None
else:
_value = get_reference(value.get('value'), kwargs)

if _value is None:
if default_value:
return default_value
if required:
raise Exception(f'{field} is required')
else:
return None

valid = valid_value_type(_value, _type)
if not valid:
raise Exception(f'{field} type error')
Expand Down
Loading