holado 0.6.5__py3-none-any.whl → 0.7.0__py3-none-any.whl

holado/holado_config.py

@@ -1,3 +1,4 @@
+import logging
 
 #################################################
 # HolAdo (Holistic Automation do)
@@ -39,4 +40,8 @@ class Config(object):
     UNIQUE_SYMBOL = u"#"
     NOT_APPLICABLE_SYMBOL = u"N/A"
     NONE_SYMBOL = u"None"
+    
+    # Default log levels
+    log_level_grpc_request = logging.INFO
+    log_level_rest_request = logging.INFO
 

{holado-0.6.5.dist-info → holado-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.6.5
+Version: 0.7.0
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues

{holado-0.6.5.dist-info → holado-0.7.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 holado/__init__.py,sha256=ibxjS0XIck0rguf8FT_3HftofWmJqyfWraxjczMzzrw,14895
-holado/holado_config.py,sha256=-HPwBdEcdG1kLfqSq4bH_esXbndVkNX4WW0VSpqoxu4,2459
+holado/holado_config.py,sha256=H1Wgndhz133nm0OcqS5hD6oDxZbDD_DeHJsKOuenQrI,2588
 holado/common/__init__.py,sha256=ZjXM-FRQgnfzRNXqcvJOGewDHVRR-U5-ugStSs8U2Xs,1525
 holado/common/context/__init__.py,sha256=3jJBLm8myrYF9jbdV1EhIA6BtnlmjX33eeoDpTzwmLA,1604
 holado/common/context/context.py,sha256=XPrdZw_9j096AI9EZwMT4xVd58c1ZH6VGxT5Yb-qYYU,6660
@@ -123,11 +123,11 @@ holado_core/common/tables/comparators/table_comparator_manager.py,sha256=A5a1xQK
 holado_core/common/tables/comparators/table_row_comparator.py,sha256=1_3N2E-PD6QyFwO9a-D3VpNVX8R7lSj0imyVTLajciI,6842
 holado_core/common/tables/comparators/table_with_header_comparator.py,sha256=j7BcT8thQtz5fCYZik78tdMbhrQqB5lC8g_zFwRgFnM,4642
 holado_core/common/tables/converters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holado_core/common/tables/converters/table_converter.py,sha256=TLKLOXIAhxM2ENu1ajtyr6MRtZxgizhsx0_7w5wZHCg,10165
+holado_core/common/tables/converters/table_converter.py,sha256=PD7NJoxtejpr4aS1l3YKcXW1aEn1xBxdi4Ljs5G7R4g,10251
 holado_core/common/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 holado_core/common/tools/path_manager.py,sha256=dgdm8wAaVubh-krpquCXXeGUTtGqRKDpuEKmvhA9dKA,8899
 holado_core/common/tools/string_tools.py,sha256=bQuMlI_yS7OoSPFL7qyfyXkrnjC8xHVpIsfmEC6JxhI,5590
-holado_core/common/tools/tools.py,sha256=FLQ55BeksEu3Tqg6mZC7UwkmY0ZX1pHr78qZv-iDnpU,9555
+holado_core/common/tools/tools.py,sha256=zkDz7u8S_02bfyN6K-p7-Ey_SkDxzu9DJljnczY0OAo,9683
 holado_core/common/tools/comparators/comparator.py,sha256=K4LcXIRORHX5vkmDibI6P6Bu1L-6Xezb63ZzzOMKrWY,6812
 holado_core/common/tools/comparators/object_comparator.py,sha256=RPI319h_tij6z75UVbZII3gBggQolRFMNMD4cN6z37Y,1399
 holado_core/common/tools/converters/converter.py,sha256=a77OzLC_bp6-jRVNVYcSXyixOrk_lg4hhs-jj9pYqaA,4136
@@ -159,11 +159,11 @@ holado_db/tests/behave/steps/tools/db/postgresql_client_steps.py,sha256=HtO-NSlT
 holado_db/tests/behave/steps/tools/db/sqlite_client_steps.py,sha256=6B8GGBJxxG6Z49cGCPykm8BP7nQQZWUrWpw0XgaYGaE,2930
 holado_db/tools/db/db_manager.py,sha256=0llXc6YhXfLr6oNfncPNjh4_ZInIm8XYywutQYvvLso,5400
 holado_db/tools/db/clients/base/db_audit.py,sha256=eJ1r_0YUhvq50JngpWAdyEeVHWjAD4YCvWCJsLc1zmc,4368
-holado_db/tools/db/clients/base/db_client.py,sha256=sdMKDbnhO0zMCxq3n6vHcn5d5Asm6N5WhKDss89v_PU,15298
+holado_db/tools/db/clients/base/db_client.py,sha256=Uj1S-dOVmx-gHRj7x7VpYbyeE0Vde6fKTAlHOJX7p4E,15294
 holado_db/tools/db/clients/postgresql/postgresql_audit.py,sha256=yoy4-Yt4lZHJw7xAcuTj2Thg4aTDCYJBt-6HzQeEE80,3939
 holado_db/tools/db/clients/postgresql/postgresql_client.py,sha256=FW9t4kGh3ClDr1NfOymSMAYSrguPcKeqbwE6BM4ognI,4746
 holado_db/tools/db/clients/sqlite/sqlite_audit.py,sha256=cK7hBE7aKCFOX5xnT-QnYD_1loQPgPP9Gf6qTT1XuI4,3966
-holado_db/tools/db/clients/sqlite/sqlite_client.py,sha256=-EvKAeaOc1Iv_wmuAgvzpS5hEfDFvZgP9OkFc9L5M-s,2891
+holado_db/tools/db/clients/sqlite/sqlite_client.py,sha256=x1ZiS_6AvDGrCz2a1FzP-IkYC7JHThE5daDZebbhDvE,2913
 holado_db/tools/db/query/query_manager.py,sha256=7n-d_Q373hlsKQshY3accIH8XfqaLScqnhMdTT2oWC4,3642
 holado_db/tools/db/query/base/query_builder.py,sha256=-nCyBe8zsRhOX39uCV0P7OY_YKobQJVIpJDL2sUA_H8,5926
 holado_db/tools/db/query/pypika/pypika_query_builder.py,sha256=9x2-7B4p3eXSq3vLWWLscoFWJZakhcPxmNrpGR2ysdw,10964
@@ -255,7 +255,7 @@ holado_examples/tests/behave/testing_solution/steps/public_steps.py,sha256=nnxgB
 holado_grpc/TODO,sha256=ESjES2-J6-3AJYdt6olcz_YGt4YTxw80CjIt-tjJ0z4,206
 holado_grpc/__init__.py,sha256=SaAz66iSTqMw7oIDrj94rGcO8W7BgS15B78p--OogHc,2266
 holado_grpc/api/rpc/TODO.txt,sha256=uWZT-WtrGuWbiOVU8-6xNiNyx_kKx-htM691zprLjh0,130
-holado_grpc/api/rpc/grpc_client.py,sha256=sCsNzwHY8QAXvcqMd-Wt-gXy3VKrsqVbB8ncBf_EcRA,8990
+holado_grpc/api/rpc/grpc_client.py,sha256=7j6DOdrkAXZpas2hsIOSr-kkOEZNhw9hAAluHY8m3BE,10433
 holado_grpc/api/rpc/grpc_manager.py,sha256=v3e7b1JCNlUoCnWUPgB9aWKde-AbseRCZAxFwz5gPN8,4115
 holado_grpc/ipc/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 holado_grpc/ipc/rpc/grpc_compiler.py,sha256=f_v1Rj6gDpLSCpkN8a6Jn4w9d826JqNRII16HSPPrWA,2477
@@ -287,7 +287,7 @@ holado_helper/script/job.py,sha256=hb7WenhQP1qFMsxWGMsgbA-Z-zixynjRWjmZdx9wHEI,4
 holado_helper/script/json_action_script.py,sha256=angdSt6e385lKwYSGJBqytVb4sp3-HjMKziVEFSz6ro,5147
 holado_helper/script/script.py,sha256=77LRYUWiNwiXRDGiwlKqZJ40-lKD40dtR31w1bQW178,4494
 holado_json/__init__.py,sha256=z0SNFOdBBWUouC12WKDmL18T_OH3TdmfcgIbnNQzbjU,1247
-holado_json/ipc/json.py,sha256=MuMBa_KrDdIXtikl6CF84jMfBXmRHQRwVmIdRbQ3ejI,6203
+holado_json/ipc/json.py,sha256=Q8b4HtrQGCAcT3i5CHtKADZfjilK29UwuFpclZ5JNa0,7178
 holado_json/ipc/json_converter.py,sha256=i4sPg9jZ2EziW8L6K-Rlm5-ubweFIWHq2R19avmsjkM,3433
 holado_json/ipc/json_types.py,sha256=MP72SmSUqFnoNC_YFMLUmU4prJv4uzO1VUoUBVLYwD8,7883
 holado_json/tests/behave/steps/__init__.py,sha256=FVGM5by0yswjfo8yC58x3onJKjKcQx919TOcYEUOWEw,1276
@@ -408,8 +408,8 @@ holado_report/report/reports/feature_report.py,sha256=i0wpk3LQLArVjWDsP9UcNSJzAU
 holado_report/report/reports/scenario_report.py,sha256=eMyqw9EzaKMmX3pGFJN1rqAOQ5eqO2ISZdxAfK3XQR4,2945
 holado_rest/__init__.py,sha256=BOeE6t6ejeqRYd44SE4vYJVTNz01BwcVCIWfwRQ5axg,1526
 holado_rest/api/rest/TODO.txt,sha256=Oz8BYPkBEs9OAEgyYLLm7i5tJ1bRE5POBpT3SRFWTi4,29
-holado_rest/api/rest/rest_client.py,sha256=rJipR3_I4c90GR38c-gwOE49Iz6QDbf8KbMFUoobKqQ,7024
-holado_rest/api/rest/rest_manager.py,sha256=lo8zUAXsi86Diw5dego-AOn3vUbwKj5xK7i0atIgwlA,4013
+holado_rest/api/rest/rest_client.py,sha256=_Ck9CZxAF01kZMz8anIhSK_rH57poa7fNm-t0SSFu_I,8099
+holado_rest/api/rest/rest_manager.py,sha256=XldPjNgj73GlzAmlsEcQYaHiDRk7SGU6VEFOLBnHjQM,4010
 holado_rest/tests/behave/steps/__init__.py,sha256=lEH5NYkKtpgDV2ZAO1qAGNN4ipwILWMpgvQgnamgYKk,1283
 holado_rest/tests/behave/steps/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 holado_rest/tests/behave/steps/api/rest_client_steps.py,sha256=naN0YcRVQyM--RhV0jPhnlsjZS6luijwGvVC5lM0XCY,9749
@@ -498,7 +498,7 @@ holado_test/common/context/feature_context.py,sha256=GhC0lihnvTBhv5tE4JzPt39eP7g
 holado_test/common/context/scenario_context.py,sha256=pmo-xGtn6oHtbTmcH6Vtp8Dj2iGrYVdHd0b6smtlhbY,10527
 holado_test/common/context/step_context.py,sha256=j6S4ozTPrdlpV9Slopc998fYOV8KfMLAUSW4mcEFUI8,2383
 holado_test/common/exceptions/undefined_step_exception.py,sha256=SHHX22iz4Ip-V4Y3aM2EJFDt30CCS5EaauN6KB-JORo,1461
-holado_test/scenario/step_tools.py,sha256=eovzeSDmkfyrRjGga-bVW9VcoLRCdGjN1z8xlBNovmc,25506
+holado_test/scenario/step_tools.py,sha256=Sqm7M0vVA9O2lRnv3pK5ryrSPOCGr5P7xD7C3esTpGg,25482
 holado_test/scenario/tester_tools.py,sha256=Tv035FyXPjQ46Ep8KuPOjOvzJFvxnbv9EsrSihUzAwg,2479
 holado_test/tests/behave/steps/__init__.py,sha256=rdqrp-UN7vRplIqORx4sXyKwMUkptRizyLWudsmYehM,1362
 holado_test/tests/behave/steps/scenario/exception_steps.py,sha256=ZIE92Dz7a6O_c0jAP_0dj6Hc0tnW6YRgNKd4_aBpeR0,4054
@@ -514,7 +514,7 @@ holado_value/common/tables/comparators/table_2_value_table_cell_comparator.py,sh
 holado_value/common/tables/comparators/table_2_value_table_comparator.py,sha256=rITxTgXami05plxk1qaCVqDcwZaKWoXpKAzur4ingTE,1807
 holado_value/common/tables/comparators/table_2_value_table_row_comparator.py,sha256=_VglWUQWspG1Fo2iAo41auCwWYR24q0TniFck99BF_E,1752
 holado_value/common/tables/comparators/table_2_value_table_with_header_comparator.py,sha256=VKwA7PbXnE-gFSKWlDCsJv0tkWVuNY-C4aWt2tyIybE,1911
-holado_value/common/tables/converters/value_table_converter.py,sha256=OESQ-wghR7gc42lDHSF1__Swfxj56bvNsLJq3u76gJE,12067
+holado_value/common/tables/converters/value_table_converter.py,sha256=o8r2VZytUAwBlT9yORL4i5gyPvgZNFhvjuPqv32cqgM,12397
 holado_value/common/tools/unique_value_manager.py,sha256=UXKdDKWznp4auYKQeWB7zYEzfm_0GxAiGfyoFM5ZM3s,5223
 holado_value/common/tools/value.py,sha256=BwAx9L_xHA-v4K55osnXjI9z9bQn_MKQ8Cvk3mhqBjA,9108
 holado_value/common/tools/value_types.py,sha256=7nJp5D7xdoT9jMeeOxHIuPRykDyI9fXpve37ndK32gs,1801
@@ -650,7 +650,7 @@ test_holado/tools/django/api_rest/api_rest/api1/serializers.py,sha256=o_YxFr-tgC
 test_holado/tools/django/api_rest/api_rest/api1/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 test_holado/tools/django/api_rest/api_rest/api1/views.py,sha256=kOt2xT6bxO47_z__5yYR9kcYIWWv4qYzpX0K8Tqonik,758
 test_holado/tools/django/api_rest/api_rest/api1/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-holado-0.6.5.dist-info/METADATA,sha256=EdMArFb9UkUD8IoDHuHYu8OzbXpO8akW1kh0tSmgExg,7885
-holado-0.6.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-holado-0.6.5.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
-holado-0.6.5.dist-info/RECORD,,
+holado-0.7.0.dist-info/METADATA,sha256=54tIA8nZfmiafWGDsusb9S0W1hQX8PmNylQS870V4wk,7885
+holado-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+holado-0.7.0.dist-info/licenses/LICENSE,sha256=IgGmNlcFHnbp7UWrLJqAFvs_HIgjJDTmjCNRircJLsk,1070
+holado-0.7.0.dist-info/RECORD,,

holado_core/common/tables/converters/table_converter.py

@@ -113,21 +113,22 @@ class TableConverter(object):
         if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
             logger.trace(f"Converting Name/Value table to dict (table = {table})")
 
-        # Verify table structure
-        TableManager.verify_table_is_name_value_table(table)
-        
         res = {}
-        for row in table.rows:
-            if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
-                logger.trace("Converting row (%s)", row)
+        if table is not None:
+            # Verify table structure
+            TableManager.verify_table_is_name_value_table(table)
             
-            name = row.get_cell(0).content
-            value = row.get_cell(1).content
-            
-            if name in res:
-                raise FunctionalException("Name '{}' appears several times in table".format(name))
-            else:
-                res[name] = value
+            for row in table.rows:
+                if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
+                    logger.trace("Converting row (%s)", row)
+                
+                name = row.get_cell(0).content
+                value = row.get_cell(1).content
+                
+                if name in res:
+                    raise FunctionalException("Name '{}' appears several times in table".format(name))
+                else:
+                    res[name] = value
                 
         if Tools.do_log(logger, logging.DEBUG):
             logger.debug(f"Converting Name/Value table to dict (table = {table}) => {res}")

holado_core/common/tools/tools.py

@@ -78,11 +78,11 @@ class Tools(object):
         return Tools.indent_string(indent, "".join(list_format))
     
     @classmethod
-    def represent_object(cls, obj, indent=0, *, do_indent_first_line=True, full_details=False, access_type=AccessType.Public):
-        return cls.__represent_object(obj, indent, do_indent_first_line, full_details, access_type, [])
+    def represent_object(cls, obj, indent=0, *, do_indent_first_line=True, full_details=False, access_type=AccessType.Public, max_level=3):
+        return cls.__represent_object(obj, indent, do_indent_first_line, full_details, access_type, max_level, [])
     
     @classmethod
-    def __represent_object(cls, obj, indent, do_indent_first_line, full_details, access_type, _internal):
+    def __represent_object(cls, obj, indent, do_indent_first_line, full_details, access_type, max_level, _internal):
         from holado_core.common.tools.converters.converter import Converter
         
         if Converter.is_primitive(obj) and not Converter.is_dict(obj) and not Converter.is_list(obj):
@@ -102,7 +102,7 @@ class Tools(object):
                     keys = list(obj.keys())
                     for key in keys:
                         # logger.print(f"+++++ Tools.__represent_object:     key: {key}")
-                        val_str = cls.__represent_object(obj[key], 0, True, full_details, access_type, _internal)
+                        val_str = cls.__represent_object(obj[key], 0, True, full_details, access_type, max_level-1, _internal)
                         if '\n' in val_str:
                             res_list.append(f"    {key}:")
                             res_list.append(Tools.indent_string(4, val_str))
@@ -116,7 +116,7 @@ class Tools(object):
                     for el in obj:
                     # for index, el in enumerate(obj):
                     #     logger.print(f"+++++ Tools.__represent_object:     index: {index}")
-                        el_str = cls.__represent_object(el, 0, True, full_details, access_type, _internal)
+                        el_str = cls.__represent_object(el, 0, True, full_details, access_type, max_level-1, _internal)
                         if '\n' in el_str:
                             res_list.append("    {")
                             res_list.append(Tools.indent_string(4, el_str))
@@ -133,9 +133,10 @@ class Tools(object):
                     # logger.print(f"+++++ Tools.__represent_object: {str(type(obj))} is object with {attributes=}")
                     if attributes:
                         res_list = [f"{str(type(obj))}({id_obj})"] if full_details else [f"{str(type(obj))}"]
-                        for name, value in attributes:
-                            # logger.print(f"+++++ Tools.__represent_object:     attribute '{name}'")
-                            res_list.append(f"    {name}: {cls.__represent_object(value, 4, False, full_details, access_type, _internal)}")
+                        if max_level > 0:
+                            for name, value in attributes:
+                                # logger.print(f"+++++ Tools.__represent_object:     attribute '{name}'")
+                                res_list.append(f"    {name}: {cls.__represent_object(value, 4, False, full_details, access_type, max_level-1, _internal)}")
                         res = "\n".join(res_list)
                     else:
                         res = f"{obj} [{str(type(obj))}({id_obj})]" if full_details else f"{obj}"

holado_db/tools/db/clients/base/db_client.py

@@ -23,15 +23,17 @@ from holado_core.common.tables.table import Table
 from holado_db.tools.db.query.base.query_builder import QueryBuilder
 from holado_data.data.generator.base import BaseGenerator
 from holado_python.standard_library.typing import Typing
+from holado.common.handlers.object import Object
 
 logger = logging.getLogger(__name__)
 
 
-class DBClient(object):
+class DBClient(Object):
     __metaclass__ = abc.ABCMeta
 
     def __init__(self, name, connect_kwargs, with_cursor=True, auto_commit=True):
-        self.__name = name
+        super().__init__(name)
+        
         self.__connect_kwargs = connect_kwargs
         self.__with_cursor = with_cursor
         self.__auto_commit = auto_commit
@@ -41,10 +43,6 @@ class DBClient(object):
         self.__audit_manager = None
         self.__column_names_by_table = {}
     
-    @property
-    def name(self):
-        return self.__name
-    
     @property
     def query_builder(self) -> QueryBuilder:
         return self.__query_builder

holado_db/tools/db/clients/sqlite/sqlite_client.py

@@ -48,7 +48,7 @@ class SQLite3Client(DBClient):
             database = connect_kwargs.pop("database")
             return sqlite3.connect(database, **connect_kwargs)
         except Exception as exc:
-            raise FunctionalException(f"Failed to connect with kwargs={kwargs}.\nUsage:\n{Tools.indent_string(4, sqlite3.connect.__doc__)}") from exc
+            raise FunctionalException(f"Failed to connect with kwargs={kwargs}.\nUsage:\n{Tools.indent_string(4, sqlite3.connect.__doc__)}") from exc  # @UndefinedVariable
         
     def _get_sql_placeholder(self):
         return "?"

holado_grpc/api/rpc/grpc_client.py

@@ -18,6 +18,8 @@ from holado_value.common.tables.converters.value_table_converter import ValueTab
 from holado_core.common.tools.tools import Tools
 import time
 from holado.holado_config import Config
+from holado.common.handlers.object import Object
+from holado.common.handlers.undefined import undefined_argument, undefined_value
 
 logger = logging.getLogger(__name__)
 
@@ -36,7 +38,7 @@ except Exception as exc:
 # os.environ["GRPC_TRACE"] = "all"
 
 
-class GRpcClient(object):
+class GRpcClient(Object):
     """
     gRPC client
     
@@ -49,7 +51,7 @@ class GRpcClient(object):
     
     if with_grpc_requests:
         def __init__(self, name, endpoint, **kwargs):
-            self.__name = name
+            super().__init__(name)
             self.__endpoint = endpoint
             self.__kwargs = kwargs
             self.__client = grpc_requests.client.get_by_endpoint(endpoint, **kwargs)
@@ -57,6 +59,8 @@ class GRpcClient(object):
             self.__func_grpc_services = None
             self.__func_protobuf_converter = None
             self.__func_protobuf_messages = None
+            
+            self.__request_log_level = Config.log_level_grpc_request
         
         def initialize(self, func_grpc_services, func_protobuf_converter, func_protobuf_messages):
             self.__func_grpc_services = func_grpc_services
@@ -75,22 +79,28 @@ class GRpcClient(object):
         def __protobuf_messages(self):
             return self.__func_protobuf_messages()
         
-        @property
-        def name(self):
-            return self.__name
-        
         @property    
         def internal_client(self) -> grpc_requests.client.Client:
             return self.__client
         
-        def request(self, service, method, request, raw_output=False, **kwargs):
+        @property
+        def request_log_level(self):
+            return self.__request_log_level
+        
+        @request_log_level.setter
+        def request_log_level(self, log_level):
+            self.__request_log_level = log_level
+        
+        def request(self, service, method, request, raw_output=False, result_on_statuses=undefined_argument, **kwargs):
             """
             :param request: request data in json or proto format
             :param raw_output: if method should return a proto object or a json oject (default: False)
             :param kwargs: other arguments for underlying grpc_requests method, or further underlying grpc method (ex: 'timeout')
             :returns: if raw_output==True, returns a proto object, else returns a json object with proto data
             """
-            logger.info(f"Requesting {service}.{method} with data [{request}] (raw_output: {raw_output} ; kwargs:{kwargs})")
+            if Tools.do_log(logger, logging.DEBUG):
+                logger.debug(f"Requesting {service}.{method} with data [{request}] (raw_output: {raw_output} ; kwargs:{kwargs})")
+            res = undefined_value
             
             # Set a default timeout
             raise_on_timeout = False
@@ -110,6 +120,17 @@ class GRpcClient(object):
                 except Exception as exc:
                     last_exc = exc
                     exc_str = str(exc)
+                    
+                    # Manage result on statuses
+                    if result_on_statuses is not undefined_argument:
+                        for status, status_result in result_on_statuses.items():
+                            if f"status = StatusCode.{status.name}" in exc_str:
+                                res = status_result
+                                break
+                        if res is not undefined_value:
+                            success = True
+                            break
+                    
                     msg_list = [
                         f"Request failed (try {try_nb}):",
                         f"    method: {service}.{method}",
@@ -139,6 +160,7 @@ class GRpcClient(object):
                     success = True
                     break
             
+            # If still in error after all tries, raise an exception with last exception message
             if not success:
                 if "status = " in exc_msg:
                     raise FunctionalException(exc_msg) from last_exc
@@ -149,17 +171,20 @@ class GRpcClient(object):
             # Note: this step is done manually since grpc_requests has some limitations when raw_output=False:
             #     - Field with default values are not set in json result
             #     - Some field types are badly managed (ex: uint64 fields appear as string in json)
-            if raw_output == True:
-                if isinstance(res_proto, grpc._channel._MultiThreadedRendezvous):
-                    return list(res_proto)
-                else:
-                    return res_proto
-            else:
-                if isinstance(res_proto, grpc._channel._MultiThreadedRendezvous):
-                    res = [self.__protobuf_converter.convert_protobuf_object_to_json_object(cur_res) for cur_res in res_proto]
+            if res is undefined_value:
+                if raw_output == True:
+                    if isinstance(res_proto, grpc._channel._MultiThreadedRendezvous):
+                        res = list(res_proto)
+                    else:
+                        res = res_proto
                 else:
-                    res = self.__protobuf_converter.convert_protobuf_object_to_json_object(res_proto)
-                return res
+                    if isinstance(res_proto, grpc._channel._MultiThreadedRendezvous):
+                        res = [self.__protobuf_converter.convert_protobuf_object_to_json_object(cur_res) for cur_res in res_proto]
+                    else:
+                        res = self.__protobuf_converter.convert_protobuf_object_to_json_object(res_proto)
+            if Tools.do_log(logger, self.request_log_level):
+                logger.log(self.request_log_level, f"Request {service}.{method} with data [{request}] (raw_output: {raw_output} ; kwargs:{kwargs})  => {res}")
+            return res
                 
         def get_request_data_type_fullname(self, service, method):
             method_descriptor = self.__grpc_services.get_method_descriptor(service, method)

holado_json/ipc/json.py

@@ -29,7 +29,7 @@ def create_name_value_table_from_json(json_value, recursive=False, uncollapse_li
     converter = JsonConverter()
     json_value = converter.to_json(json_value)
     
-    name_values = __convert_json_value_2_name_values(json_value, recursive=recursive, uncollapse_list=uncollapse_list)
+    name_values = convert_json_value_2_name_values(json_value, recursive=recursive, uncollapse_list=uncollapse_list)
     for name, value in name_values:
         res.add_row(cells_content=(name, value))
     
@@ -51,7 +51,7 @@ def create_table_with_header_from_json(json_value, recursive=False, uncollapse_l
     for json_val in json_list:
         json_val = converter.to_json(json_val)
         
-        name_values = __convert_json_value_2_name_values(json_val, recursive=recursive, uncollapse_list=uncollapse_list)
+        name_values = convert_json_value_2_name_values(json_val, recursive=recursive, uncollapse_list=uncollapse_list)
         
         # Add new columns if needed
         for name, value in name_values:
@@ -68,9 +68,17 @@ def create_table_with_header_from_json(json_value, recursive=False, uncollapse_l
         
     return res
     
-def __convert_json_value_2_name_values(json_value, recursive=False, uncollapse_list=False):
+def convert_json_value_2_name_values(json_value, recursive=False, uncollapse_list=False, as_dict=False, sorted_=False):
+    """Convert json object as a list of (name, value).
+    If as_dict is True, the result is a dict of {name:value}
+    """
     res = []
     __fill_name_values_with_json_value(res, None, json_value, recursive=recursive, uncollapse_list=uncollapse_list)
+    
+    if sorted_:
+        res = sorted(res)
+    if as_dict:
+        res = {e[0]:e[1] for e in res}
     return res
     
 def __fill_name_values_with_json_value(res, name_prefix, json_value, recursive=False, uncollapse_list=False):
@@ -123,3 +131,16 @@ def set_object_attributes_with_json_dict(obj, json_value):
         else:
             raise FunctionalException(f"Object doesn't have attribute '{attr_name}' (object type: {Typing.get_object_class_fullname(obj)})")
 
+
+def update_json_object_with_missing_attributes(json_obj, json_ref, recursive=False):
+    if not isinstance(json_obj, dict):
+        raise TechnicalException(f"json object is expected to be a dict (obtained: {Typing.get_object_class_fullname(json_obj)}")
+    if not isinstance(json_ref, dict):
+        raise TechnicalException(f"json reference is expected to be a dict (obtained: {Typing.get_object_class_fullname(json_ref)}")
+
+    for key, value in json_ref.items():
+        if key not in json_obj:
+            json_obj[key] = value
+        elif recursive and isinstance(json_obj[key], dict) and isinstance(value, dict):
+            update_json_object_with_missing_attributes(json_obj[key], value, recursive=recursive)
+    

holado_rest/api/rest/rest_client.py

@@ -18,6 +18,8 @@ from holado_core.common.tools.tools import Tools
 import json
 from holado_core.common.tools.converters.converter import Converter
 from holado_json.ipc.json_converter import JsonConverter
+from holado.common.handlers.object import Object
+from holado.holado_config import Config
 
 logger = logging.getLogger(__name__)
 
@@ -31,7 +33,7 @@ except Exception as exc:
     with_requests = False
 
 
-class RestClient(object):
+class RestClient(Object):
     """
     REST client
     """
@@ -41,14 +43,20 @@ class RestClient(object):
         return with_requests
     
     def __init__(self, name, url, headers=None):
-        self.__name = name
+        super().__init__(name)
         self.__url = url.rstrip('/')
         self.__headers = headers if headers is not None else {}
         self.__kwargs = {}
-    
+            
+        self.__request_log_level = Config.log_level_rest_request
+        
     @property
-    def name(self):
-        return self.__name
+    def request_log_level(self):
+        return self.__request_log_level
+    
+    @request_log_level.setter
+    def request_log_level(self, log_level):
+        self.__request_log_level = log_level
     
     def authenticate_by_user(self, user, pwd):
         if Tools.do_log(logger, logging.DEBUG):
@@ -66,7 +74,14 @@ class RestClient(object):
             raise TechnicalException(f"Unmanaged SSL arguments: {unexpected_keys}")
         
         self.__kwargs.update(ssl_kwargs)
-        
+    
+    def add_parameters_to_path(self, path, parameters:dict):
+        res = path
+        if parameters:
+            res += "&" if '?' in res else "?"
+            res += "&".join([f"{k}={v}" for k,v in parameters.items()])
+        return res
+    
     def response_result(self, response, status_ok=200):
         # Get result
         if response.status_code == 204:
@@ -98,27 +113,32 @@ class RestClient(object):
         except Exception as exc:
             raise TechnicalException(f"[{self.name}] Failed to process {method} '{url}' with arguments {r_kwargs}") from exc
         
-        if Tools.do_log(logger, logging.DEBUG):
-            logger.debug(f"[{self.name}] {method} on url '{url}' => {res}")
         if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
             logger.trace(f"[{self.name}] {method} on url '{url}' => {Tools.represent_object(res, 4)}")
+        elif Tools.do_log(logger, self.request_log_level):
+            logger.log(self.request_log_level, f"[{self.name}] {method} on url '{url}' => {Tools.represent_object(res, 4, max_level=1)}")
         return res
         
-    def delete(self, path, data=None, **kwargs):
+    def delete(self, path, data=None, path_parameters=None, **kwargs):
+        path = self.add_parameters_to_path(path, path_parameters)
         return self.request("DELETE", path, data=data, **kwargs)
         
-    def get(self, path, data=None, **kwargs):
+    def get(self, path, data=None, path_parameters=None, **kwargs):
+        path = self.add_parameters_to_path(path, path_parameters)
         return self.request("GET", path, data=data, **kwargs)
         
-    def patch(self, path, data=None, **kwargs):
+    def patch(self, path, data=None, path_parameters=None, **kwargs):
+        path = self.add_parameters_to_path(path, path_parameters)
         return self.request("PATCH", path, data=data, **kwargs)
         
-    def post(self, path, data=None, json=None, **kwargs):
+    def post(self, path, data=None, json=None, path_parameters=None, **kwargs):
+        path = self.add_parameters_to_path(path, path_parameters)
         return self.request("POST", path, data=data, json=json, **kwargs)
         
-    def put(self, path, data=None, **kwargs):
+    def put(self, path, data=None, path_parameters=None, **kwargs):
+        path = self.add_parameters_to_path(path, path_parameters)
         return self.request("PUT", path, data=data, **kwargs)
-        
+    
     def __build_url(self, path):
         return f"{self.__url}/{path.lstrip('/')}" 
         

holado_rest/api/rest/rest_manager.py

@@ -32,9 +32,9 @@ class RestManager(object):
         self.__default_client_class = default_client_class
     
     def new_client(self, name, **kwargs):
-        if name is None:
-            name = f"RestClient({kwargs})"
         url = kwargs.pop("url")
+        if name is None:
+            name = f"RestClient({url})"
         headers = Tools.pop_sub_kwargs(kwargs, "headers.")
         authentication = Tools.pop_sub_kwargs(kwargs, "authentication.")
         ssl_kwargs = Tools.pop_sub_kwargs(kwargs, "ssl.")

holado_test/scenario/step_tools.py

@@ -241,7 +241,7 @@ class StepTools(object):
                     if ValueTableManager.is_value_table(value):
                         res = value
                     elif isinstance(value, TableWithHeader):
-                        res = ValueTableConverter.convert_table_with_header_2_value_table_with_header(value, do_eval_once=do_eval_once)
+                        res = ValueTableConverter.convert_table_2_value_table(value, do_eval_once=do_eval_once)
                     elif isinstance(value, Table):
                         raise FunctionalException(f"The table in variable '{cell_content}' is expected to be with header")
         elif isinstance(table, Table):        

holado_value/common/tables/converters/value_table_converter.py

@@ -48,6 +48,8 @@ class ValueTableConverter(TableConverter):
     
     @classmethod
     def convert_value_table_2_table(cls, table):
+        ValueTableManager.verify_is_value_table(table)
+        
         if isinstance(table, ValueTableWithHeader):
             res = TableWithHeader()
             res.header = copy.copy(table.header)
@@ -58,15 +60,6 @@ class ValueTableConverter(TableConverter):
             res.add_row(cells_content=cells_content)
         return res
     
-    @classmethod
-    def convert_table_with_header_2_value_table_with_header(cls, table, do_eval_once=True):
-        res = ValueTableWithHeader()
-        res.header = TableRow(cells_content=table.header.cells_content)
-        for row in table:
-            cells_content = [f"'{cc}'" if isinstance(cc, str) else f"{cc}" for cc in row.cells_content]
-            res.add_row(cells_content=cells_content, do_eval_once=do_eval_once)
-        return res
-        
     @classmethod
     def convert_table_with_header_to_dict_list(cls, table, as_generator=False):
         if not ValueTableManager.is_value_table(table):
@@ -123,36 +116,43 @@ class ValueTableConverter(TableConverter):
     
     @classmethod
     def convert_name_value_table_2_dict(cls, table, with_original_value_content = False):
+        if not ValueTableManager.is_value_table(table):
+            return TableConverter.convert_name_value_table_2_dict(table)
+        
         if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
             logger.trace(f"Converting Name/Value table to dict (table = {table})")
-
-        # Verify table structure
-        ValueTableManager.verify_table_is_name_value_table(table)
-        ValueTableManager.verify_is_value_table(table)
         
         res = {}
-        for row in table.rows:
-            if row.get_cell(1).value_type not in [ValueTypes.NotApplicable]:
-                if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
-                    logger.trace("Converting row (%s)", row)
-                
-                name = row.get_cell(0).value
-                if with_original_value_content:
-                    value = row.get_cell(1).content
-                else:
-                    value = row.get_cell(1).value
-                
-                if name in res:
-                    raise FunctionalException("Name '{}' appears several times in table".format(name))
-                else:
-                    res[name] = value
-                
+        if table is not None:
+            # Verify table structure
+            ValueTableManager.verify_table_is_name_value_table(table)
+            ValueTableManager.verify_is_value_table(table)
+            
+            for row in table.rows:
+                if row.get_cell(1).value_type not in [ValueTypes.NotApplicable]:
+                    if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
+                        logger.trace("Converting row (%s)", row)
+                    
+                    name = row.get_cell(0).value
+                    if with_original_value_content:
+                        value = row.get_cell(1).content
+                    else:
+                        value = row.get_cell(1).value
+                    
+                    if name in res:
+                        raise FunctionalException("Name '{}' appears several times in table".format(name))
+                    else:
+                        res[name] = value
+        
         if Tools.do_log(logger, logging.DEBUG):
             logger.debug(f"Converting Name/Value table to dict (table = {table}) => {res}")
         return res
         
     @classmethod
     def convert_name_value_table_2_list_and_dict(cls, table, with_original_value_content = False):
+        # if not ValueTableManager.is_value_table(table):
+        #     return TableConverter.convert_name_value_table_2_list_and_dict(table)
+        
         if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
             logger.trace(f"Converting Name/Value table to list and dict (table = {table})")
 
@@ -186,6 +186,9 @@ class ValueTableConverter(TableConverter):
  
     @classmethod
     def convert_name_value_table_2_json_object(cls, table, converter=None):
+        if not ValueTableManager.is_value_table(table):
+            return TableConverter.convert_name_value_table_2_json_object(table, converter=converter)
+        
         if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
             logger.trace(f"Converting Name/Value table to json object (table = {table})")
         if converter is None:
@@ -226,6 +229,9 @@ class ValueTableConverter(TableConverter):
 
     @classmethod
     def convert_x_name_value_table_2_list_x_values(cls, table, x_name, with_original_value_content = False):
+        # if not ValueTableManager.is_value_table(table):
+        #     return TableConverter.convert_x_name_value_table_2_list_x_values(table, x_name)
+        
         if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
             logger.trace(f"Converting {x_name}/Name/Value table to list of {x_name} and values dict (table = {table})")