From 10dbd9c0ed75eac9b3fa2679378ab5afbec27294 Mon Sep 17 00:00:00 2001 From: "Alexie (Boyong) Madolid" Date: Mon, 14 Aug 2023 16:41:48 +0800 Subject: [PATCH] [ABILITY-CALL]: Let ability call raise and show all types of error --- jaseci_core/jaseci/extens/act_lib/request.py | 12 ++++++------ jaseci_core/jaseci/prim/ability.py | 6 ------ .../jaseci_serv/jac_api/tests/test_jac_api.py | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/jaseci_core/jaseci/extens/act_lib/request.py b/jaseci_core/jaseci/extens/act_lib/request.py index 2723c54076..2a556a0854 100644 --- a/jaseci_core/jaseci/extens/act_lib/request.py +++ b/jaseci_core/jaseci/extens/act_lib/request.py @@ -4,7 +4,7 @@ @jaseci_action() -def get(url: str, data: dict, header: dict): +def get(url: str, data: dict = {}, header: dict = {}): """ Issue request Param 1 - url @@ -23,7 +23,7 @@ def get(url: str, data: dict, header: dict): @jaseci_action() -def post(url: str, data: dict, header: dict): +def post(url: str, data: dict = {}, header: dict = {}): """ Issue request Param 1 - url @@ -42,7 +42,7 @@ def post(url: str, data: dict, header: dict): @jaseci_action() -def put(url: str, data: dict, header: dict): +def put(url: str, data: dict = {}, header: dict = {}): """ Issue request Param 1 - url @@ -61,7 +61,7 @@ def put(url: str, data: dict, header: dict): @jaseci_action() -def delete(url: str, data: dict, header: dict): +def delete(url: str, data: dict = {}, header: dict = {}): """ Issue request Param 1 - url @@ -80,7 +80,7 @@ def delete(url: str, data: dict, header: dict): @jaseci_action() -def head(url: str, data: dict, header: dict): +def head(url: str, data: dict = {}, header: dict = {}): """ Issue request Param 1 - url @@ -99,7 +99,7 @@ def head(url: str, data: dict, header: dict): @jaseci_action() -def options(url: str, data: dict, header: dict): +def options(url: str, data: dict = {}, header: dict = {}): """ Issue request Param 1 - url diff --git a/jaseci_core/jaseci/prim/ability.py b/jaseci_core/jaseci/prim/ability.py index c8186be36b..d785753d24 100644 --- a/jaseci_core/jaseci/prim/ability.py +++ b/jaseci_core/jaseci/prim/ability.py @@ -80,12 +80,6 @@ def run_action(self, param_list, scope, interp, jac_ast): else: try: result = func(*param_list["args"], **param_list["kwargs"]) - except TypeError as e: - params = str(inspect.signature(func)) - interp.rt_error( - f"Invalid arguments {param_list} to action call {self.name}! Valid paramters are {params}.", - jac_ast, - ) except Exception as e: interp.rt_error(e, jac_ast, True) t = time.time() - ts diff --git a/jaseci_serv/jaseci_serv/jac_api/tests/test_jac_api.py b/jaseci_serv/jaseci_serv/jac_api/tests/test_jac_api.py index d0a9d06006..2a49cb273c 100644 --- a/jaseci_serv/jaseci_serv/jac_api/tests/test_jac_api.py +++ b/jaseci_serv/jaseci_serv/jac_api/tests/test_jac_api.py @@ -1819,7 +1819,7 @@ def test_try_catch(self): self.assertEqual(14, res["report"][0]["line"]) self.assertEqual(23, res["report"][0]["col"]) self.assertIn( - "zsb:walker_exception_with_try_else - line 14, col 23 - rule ability_call - Invalid arguments {'args': ['invalidUrl'], 'kwargs': {}} to action call request.get! Valid paramters are (url: str, data: dict, header: dict).", + "zsb:walker_exception_with_try_else - line 14, col 23 - rule ability_call - Invalid URL 'invalidUrl': No scheme supplied. Perhaps you meant https://invalidUrl?", res["errors"][0], )