diff --git a/.gitignore b/.gitignore index bdaab25..67fd8ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ env/ +.venv/ +.vscode/ +local/ diff --git a/handler.py b/handler.py index 814bc8c..e837534 100644 --- a/handler.py +++ b/handler.py @@ -78,7 +78,10 @@ def handle(event: str, context=None): result = dict(error=e.message) http_code_response = 500 elif payload["action"] == ActionType.GET_LINK_HANDLE: - get_link_handle_payload = validate(GetLinkHandleValidator()) + get_link_handle_payload = validate( + GetLinkHandleValidator(), + payload["input"], + ) try: result = actions.get_link_handle( get_link_handle_payload["link_type"], @@ -124,7 +127,7 @@ def handle(event: str, context=None): result = actions.get_matched_links( get_matched_links_payload["link_type"], get_matched_links_payload["target_handles"], - get_matched_links_payload["extra_parameters"], + payload["input"].get("extra_parameters"), ) elif payload["action"] == ActionType.GET_ALL_NODES: get_all_nodes_payload = validate( @@ -133,7 +136,7 @@ def handle(event: str, context=None): ) try: result = actions.get_all_nodes( - get_all_nodes_payload["link_type"], + get_all_nodes_payload["node_type"], get_all_nodes_payload["names"], ) except ValueError as e: @@ -150,7 +153,7 @@ def handle(event: str, context=None): try: result = actions.get_matched_type_template( get_matched_type_template_payload["template"], - get_matched_type_template_payload["extra_parameters"], + payload["input"].get("extra_parameters"), ) except ValueError as e: result = dict(error=e.message) @@ -166,7 +169,7 @@ def handle(event: str, context=None): try: result = actions.get_matched_type( get_matched_type_payload["link_type"], - get_matched_type_payload["extra_parameters"], + payload["input"].get("extra_parameters"), ) except Exception as e: result = dict(error=e.message) @@ -211,11 +214,9 @@ def handle(event: str, context=None): result = dict(error=e.message) http_code_response = 500 elif payload["action"] == ActionType.GET_ATOM_AS_DEEP_REPRESENTATION: - get_atom_as_deep_representation_payload = ( - actions.get_atom_as_deep_representation( - GetAtomAsDeepRepresentationValidator(), - payload["input"], - ) + get_atom_as_deep_representation_payload = validate( + GetAtomAsDeepRepresentationValidator(), + payload["input"], ) try: result = actions.get_atom_as_deep_representation( diff --git a/validators/actions.py b/validators/actions.py index 5e3dbed..db895d9 100644 --- a/validators/actions.py +++ b/validators/actions.py @@ -23,7 +23,7 @@ class GetLinkHandleValidator(PayloadValidator): class GetLinkTargetsValidator(PayloadValidator): - target_handle = datatypes.String() + link_handle = datatypes.String() class IsOrderedValidator(PayloadValidator): @@ -33,22 +33,22 @@ class IsOrderedValidator(PayloadValidator): class GetMatchedLinksValidator(PayloadValidator): link_type = datatypes.String() target_handles = datatypes.Array() - extra_parameters = datatypes.JSON(validate_dict) + #extra_parameters = datatypes.JSON(validate_dict) class GetAllNodeValidator(PayloadValidator): - link_type = datatypes.String() + node_type = datatypes.String() names = datatypes.Boolean() class GetMatchedTypeTemplateValidator(PayloadValidator): template = datatypes.Array() - extra_parameters = datatypes.JSON(validate_dict) + #extra_parameters = datatypes.JSON(validate_dict) class GetMatchedTypeValidator(PayloadValidator): link_type = datatypes.String() - extra_parameters = datatypes.JSON(validate_dict) + #extra_parameters = datatypes.JSON(validate_dict) class GetNodeNameValidator(PayloadValidator):