holado 0.11.1__tar.gz → 0.11.3__tar.gz

{holado-0.11.1 → holado-0.11.3}/Dockerfile

@@ -38,7 +38,7 @@ WORKDIR /code/holado/python
 # Create python venv and install requirements
 RUN python -m venv /code/env \
     && source /code/env/bin/activate \
-    && pip install -r requirements_docker.txt
+    && pip install --no-cache-dir -r requirements_docker.txt
 
 
 

{holado-0.11.1 → holado-0.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.11.1
+Version: 0.11.3
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
-Requires-Dist: behave==1.2.7.dev6
+Requires-Dist: behave
 Requires-Dist: psutil
 Requires-Dist: pypika
 Requires-Dist: python-dateutil

holado-0.11.3/packaging/VERSION

@@ -0,0 +1 @@
+0.11.3

{holado-0.11.1 → holado-0.11.3}/pyproject.toml

@@ -27,7 +27,7 @@ keywords = [
     "AIS", "logging", "DB", "docker", "gRPC", "multitask", "Protobuf", 
     "RabbitMQ", "Redis", "REST", "S3", "Web Services", "YAML"]
 dependencies = [
-  "behave==1.2.7.dev6",
+  "behave",
   "python-dateutil",
   "psutil",
   # For sqlite DB internal needs
@@ -70,7 +70,7 @@ packages = ["src/holado", "src/holado_ais", "src/holado_binary", "src/holado_con
     "src/holado_keycloak", "src/holado_logging", "src/holado_multitask", "src/holado_protobuf", "src/holado_python", 
     "src/holado_rabbitmq", "src/holado_redis", "src/holado_report", "src/holado_rest", "src/holado_s3", 
     "src/holado_scripting", "src/holado_sftp", "src/holado_swagger", "src/holado_system", "src/holado_test", 
-    "src/holado_value", "src/holado_ws", "src/holado_yaml",
+    "src/holado_tools", "src/holado_value", "src/holado_ws", "src/holado_yaml",
     "tests/behave/test_holado"]
 
 

{holado-0.11.1 → holado-0.11.3}/src/holado_context/tests/behave/steps/private/common/context_steps.py

@@ -34,7 +34,7 @@ def __get_variable_manager():
 
 def __get_context(context_name):
     context_name = context_name.capitalize()
-    if context_name == SessionContext.instance().name:
+    if context_name in ["Session", SessionContext.instance().name]:
         return SessionContext.instance()
     elif context_name == __get_scenario_context().name:
         return __get_scenario_context()

{holado-0.11.1 → holado-0.11.3}/src/holado_core/common/resource/persisted_data_manager.py

@@ -41,6 +41,10 @@ class PersistedDataManager():
     def table_name(self):
         return self.__table_name
     
+    def does_persistent_db_exist(self):
+        return self.__resource_manager.has_data_table(self.__table_name, db_name=self.__db_name, is_persistent=True) \
+            and self.__resource_manager.check_data_table_schema(self.__table_name, self.__table_sql_create, db_name=self.__db_name, is_persistent=True)
+    
     def ensure_persistent_db_exists(self):
         if self.__resource_manager.has_data_table(self.__table_name, db_name=self.__db_name, is_persistent=True):
             if self.__resource_manager.check_data_table_schema(self.__table_name, self.__table_sql_create, db_name=self.__db_name, is_persistent=True):

{holado-0.11.1 → holado-0.11.3}/src/holado_core/common/resource/persisted_method_to_call_manager.py

@@ -17,7 +17,8 @@ from holado_core.common.resource.persisted_data_manager import PersistedDataMana
 from holado_python.standard_library.typing import Typing
 from holado_core.common.exceptions.technical_exception import TechnicalException
 from holado_core.common.tools.tools import Tools
-from holado.common.handlers.undefined import undefined_value, undefined_argument
+from holado.common.handlers.undefined import undefined_value, undefined_argument,\
+    any_value
 from holado_python.common.tools.datetime import DateTime
 from holado_db.tools.db.query.base.query_builder import DBCompareOperator
 from holado.common.handlers.enums import AutoNumber
@@ -34,6 +35,11 @@ class MethodCallStatus(AutoNumber):
 
 class PersistedMethodToCallManager(PersistedDataManager):
     def __init__(self, scope_name, delete_on_success=True, delete_on_fail=False, delete_on_success_after_fail=False, expiration_try_counter=10, data_name="method", table_name="method_to_call", db_name="default"):
+        """ Constructor
+        @param scope_name: Scope of this manager
+        
+        Note: if scope_name is any_value, it is possible to call all methods persisted with any scope, but it is not possible to add new methods.
+        """
         super().__init__(data_name=data_name, table_name=table_name, 
                          table_sql_create=self._get_default_table_sql_create(table_name), 
                          db_name=db_name)
@@ -93,6 +99,9 @@ class PersistedMethodToCallManager(PersistedDataManager):
         @param delete_on_fail: If True, delete method after its fail
         @param delete_on_success_after_fail: If True, delete method after its success even if it has previously failed
         """
+        if self.__scope_name is not any_value:
+            raise TechnicalException("To add a method to call, the scope name must be specified")
+        
         # Define persisted data that can define if method is already persisted
         data = {
             'scope_name': self.__scope_name,
@@ -160,7 +169,9 @@ class PersistedMethodToCallManager(PersistedDataManager):
             return 0
     
     def __get_functions_and_methods_to_call(self, use=undefined_argument, use_index=None):
-        filter_data = {'scope_name':self.__scope_name}
+        filter_data = {}
+        if self.__scope_name is not any_value:
+            filter_data['scope_name'] = self.__scope_name
         if use is not undefined_argument:
             filter_data['use'] = use
             if use_index is not None:
@@ -172,7 +183,6 @@ class PersistedMethodToCallManager(PersistedDataManager):
         """Call methods of given use
         @param use: Define persistent usage. It usually corresponds to a specific scope.
         @param use_index: If defined, call only functions and methods of given index.
-        @param delete_after_call: Define if function or method is deleted after call from persisted data.
         """
         # Get functions and methods to call
         methods_data = self.__get_functions_and_methods_to_call(use=use)

{holado-0.11.1 → holado-0.11.3}/src/holado_multitask/multithreading/context/thread_context.py

@@ -61,7 +61,7 @@ class ThreadContext(Context):
                 
             manager = VariableManager(var_man)
             self.set_object("variable_manager", manager)
-            file_path = SessionContext.instance().report_manager.get_path("logs", f"variable_update-thread_{self.thread_uid}.log")
+            file_path = SessionContext.instance().report_manager.get_path("logs", f"variable_update-thread_{self.thread_uid}.log") if SessionContext.instance().with_session_path else None
             manager.initialize(SessionContext.instance().dynamic_text_manager, SessionContext.instance().unique_value_manager,
                                variable_update_log_file_path=file_path)
         return self.get_object("variable_manager")

{holado-0.11.1 → holado-0.11.3}/src/holado_scripting/__init__.py

@@ -28,7 +28,7 @@ def register():
     SessionContext.instance().services.register_service_type("variable_manager", VariableManager,
                             lambda m: m.initialize(SessionContext.instance().dynamic_text_manager, 
                                                    SessionContext.instance().unique_value_manager,
-                                                   variable_update_log_file_path=SessionContext.instance().report_manager.get_path("logs", "variable_update.log") ) )
+                                                   variable_update_log_file_path = SessionContext.instance().report_manager.get_path("logs", "variable_update.log") if SessionContext.instance().with_session_path else None ) )
     
     
     from holado_scripting.common.tools.expression_evaluator import ExpressionEvaluator

{holado-0.11.1 → holado-0.11.3}/src/holado_test/behave/behave_manager.py

@@ -18,6 +18,7 @@ import behave
 from holado.common.context.session_context import SessionContext
 from holado_core.common.exceptions.technical_exception import TechnicalException
 from holado_multitask.multitasking.multitask_manager import MultitaskManager
+import time
 
 logger = logging.getLogger(__name__)
 
@@ -390,6 +391,8 @@ class BehaveManager(object):
                                       lambda: context_exists(MultitaskManager.get_process_id(), thread_uid))
         wait_context.redo_until(True)
         wait_context.execute()
+        # Note: previous waiting mechanism is sometimes to rapid to execute steps just after
+        time.sleep(0.01)
         
         ### Other tried implementation:
         

{holado-0.11.1 → holado-0.11.3}/src/holado_test/common/context/feature_context.py

@@ -73,7 +73,7 @@ class FeatureContext(Context):
         if not self.has_variable_manager():
             manager = VariableManager(SessionContext.instance().multitask_manager.get_thread_context().get_variable_manager())
             self.set_object("variable_manager", manager)
-            file_path = SessionContext.instance().report_manager.current_feature_report.get_path("logs", "variable_update.log")
+            file_path = SessionContext.instance().report_manager.current_feature_report.get_path("logs", "variable_update.log") if SessionContext.instance().with_session_path else None
             manager.initialize(SessionContext.instance().dynamic_text_manager, SessionContext.instance().unique_value_manager,
                                variable_update_log_file_path=file_path)
         return self.get_object("variable_manager")

{holado-0.11.1 → holado-0.11.3}/src/holado_test/common/context/scenario_context.py

@@ -135,7 +135,7 @@ class ScenarioContext(Context):
         if not self.has_variable_manager():
             manager = VariableManager(SessionContext.instance().get_feature_context().get_variable_manager())
             self.set_object("variable_manager", manager)
-            file_path = SessionContext.instance().report_manager.current_scenario_report.get_path("logs", "variable_update.log")
+            file_path = SessionContext.instance().report_manager.current_scenario_report.get_path("logs", "variable_update.log") if SessionContext.instance().with_session_path else None
             manager.initialize(self.get_dynamic_text_manager(), SessionContext.instance().unique_value_manager,
                                variable_update_log_file_path=file_path)
         return self.get_object("variable_manager")

holado-0.11.3/src/holado_tools/scripts/execute_persisted_post_processes/execute_persisted_post_processes.py

@@ -0,0 +1,36 @@
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+import logging
+
+# Uncomment next lines to insert holado sources when using a clone of holado project rather than holado package 
+# from initialize_holado import insert_holado_source_paths  # @UnresolvedImport
+# insert_holado_source_paths()
+
+# Initialize HolAdo
+from holado import initialize_for_script
+initialize_for_script(TSessionContext=None, use_holado_logger=True, logging_config_file_path=None,
+                      log_level=logging.WARNING, log_time_in_utc=None, log_on_console=True, log_in_file=False,
+                      config_kwargs={'application_group':'configuration'},
+                      garbage_collector_periodicity=None)
+
+# Script content
+from holado.common.context.session_context import SessionContext
+from holado_core.common.resource.persisted_method_to_call_manager import PersistedMethodToCallManager
+from holado.common.handlers.undefined import any_value
+
+persisted_method_to_call_manager = PersistedMethodToCallManager(scope_name=any_value)
+persisted_method_to_call_manager.initialize(SessionContext.instance().resource_manager, SessionContext.instance().expression_evaluator)
+if persisted_method_to_call_manager.does_persistent_db_exist():
+    persisted_method_to_call_manager.call_functions_and_methods(use="post_process")
+
+

holado-0.11.3/src/holado_tools/scripts/execute_persisted_post_processes/execute_persisted_post_processes.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+#${SCRIPT_DIR}/../../../run_test.sh -i /Configuration -t execute_persisted_post_processes
+python3 "${SCRIPT_DIR}"/execute_persisted_post_processes.py

holado-0.11.3/tests/behave/test_holado/features/Configuration/Actions/execute_persisted_post_processes.feature

@@ -0,0 +1,13 @@
+@configuration
+@execute_persisted_post_processes
+Feature: Execute persisted post processes
+# Note: scenario post processes are executed before session post processes since it is the usual order of execution
+
+    @scenario_post_processes
+    Scenario: Execute persisted post processes at scenario level
+        When execute persisted post processes of scenario context
+
+    @session_post_processes
+    Scenario: Execute persisted post processes at session level
+        When execute persisted post processes of session context
+

holado-0.11.3/tests/behave/test_holado/initialize_holado.py

@@ -0,0 +1,62 @@
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+
+#################################################
+# GOAL: Tools when using a clone of HolAdo project.
+#
+# This file contains methods usefull to initialize environments using a clone of HolAdo project.
+#
+# USAGE: 
+#   - Copy this file in projects using HolAdo.
+#   - Define environment variable HOLADO_PATH with path to cloned HolAdo project.
+#     If HOLADO_PATH is defined, sources of cloned HolAdo project are used, else installed holado package is used.
+#################################################
+
+
+
+import os
+import sys
+
+
+def insert_sys_path(path, index=0):
+    """Insert a path in sys.path if it doesn't already exists.
+    """
+    if path not in sys.path:
+        sys.path.insert(index, path)
+
+def insert_holado_source_paths(with_test_behave=True):
+    """Insert in sys.path all HolAdo source paths.
+    If environment variable HOLADO_PATH is defined with path to HolAdo project, following paths are inserted in sys.path:
+        - HOLADO_PATH/src: path to holado modules sources
+        - HOLADO_PATH/tests/behave (if with_test_behave==True): path to holado test sources, needed by testing solutions
+    """
+    holado_path = os.getenv('HOLADO_PATH')
+    if holado_path is None:
+        try:
+            import holado  # @UnusedImport
+        except Exception as exc:
+            if "No module named" in str(exc):
+                raise Exception(f"If environment variable HOLADO_PATH is not defined with path to HolAdo project, 'holado' python package must be installed")
+            else:
+                raise exc
+        else:
+            # holado is installed, and all sources are already accessible
+            pass
+    else:
+        print(f"Using HolAdo project installed in '{holado_path}'")
+        insert_sys_path(os.path.join(holado_path, "src"))
+        if with_test_behave:
+            insert_sys_path(os.path.join(holado_path, "tests", "behave"))
+    
+

{holado-0.11.1 → holado-0.11.3}/tests/scripts/independant_runner/environment.py

@@ -2,7 +2,7 @@
 
 
 # Import generic environment methods
-from test_testing_solution_ksc.behave_environment import *
+from holado_test.behave.behave_environment import *
 
 # Define project specific environment methods
 

holado-0.11.3/tests/scripts/independant_runner/initialize_holado.py

@@ -0,0 +1,62 @@
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+
+#################################################
+# GOAL: Tools when using a clone of HolAdo project.
+#
+# This file contains methods usefull to initialize environments using a clone of HolAdo project.
+#
+# USAGE: 
+#   - Copy this file in projects using HolAdo.
+#   - Define environment variable HOLADO_PATH with path to cloned HolAdo project.
+#     If HOLADO_PATH is defined, sources of cloned HolAdo project are used, else installed holado package is used.
+#################################################
+
+
+
+import os
+import sys
+
+
+def insert_sys_path(path, index=0):
+    """Insert a path in sys.path if it doesn't already exists.
+    """
+    if path not in sys.path:
+        sys.path.insert(index, path)
+
+def insert_holado_source_paths(with_test_behave=True):
+    """Insert in sys.path all HolAdo source paths.
+    If environment variable HOLADO_PATH is defined with path to HolAdo project, following paths are inserted in sys.path:
+        - HOLADO_PATH/src: path to holado modules sources
+        - HOLADO_PATH/tests/behave (if with_test_behave==True): path to holado test sources, needed by testing solutions
+    """
+    holado_path = os.getenv('HOLADO_PATH')
+    if holado_path is None:
+        try:
+            import holado  # @UnusedImport
+        except Exception as exc:
+            if "No module named" in str(exc):
+                raise Exception(f"If environment variable HOLADO_PATH is not defined with path to HolAdo project, 'holado' python package must be installed")
+            else:
+                raise exc
+        else:
+            # holado is installed, and all sources are already accessible
+            pass
+    else:
+        print(f"Using HolAdo project installed in '{holado_path}'")
+        insert_sys_path(os.path.join(holado_path, "src"))
+        if with_test_behave:
+            insert_sys_path(os.path.join(holado_path, "tests", "behave"))
+    
+

holado-0.11.3/tests/scripts/independant_runner/steps/public_steps.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+
+from test_holado.steps.public_steps import *
+
+
+
+

{holado-0.11.1 → holado-0.11.3}/tests/scripts/independant_runner/test.py

@@ -8,14 +8,18 @@ logger = None
 
 
 def __insert_sys_paths():
+    # Uncomment next lines to insert holado sources when using a clone of holado project rather than holado package 
+    # from initialize_holado import insert_holado_source_paths
+    # insert_holado_source_paths()
+    
     # Insert path to folder containing initialize_script
     here = os.path.abspath(os.path.dirname(__file__))
     scripts_path = os.path.abspath(os.path.join(here, ".."))
     if scripts_path not in sys.path:
         sys.path.insert(0, scripts_path)
     
-    from script_tools import insert_holado_helper  # @UnresolvedImport
-    insert_holado_helper()
+    from script_tools import insert_holado_helper_script  # @UnresolvedImport
+    insert_holado_helper_script()
     
     
 def __main(args, cwd):
@@ -30,6 +34,7 @@ def __main(args, cwd):
 
     execute_steps("""
         Given DATE = datetime now
+        When tester logs 'Now: ${DATE}'
         """)
     
     
@@ -59,7 +64,7 @@ if __name__ == "__main__":
     args = _parse_arguments()
     
     # Initialize HolAdo framework
-    cwd = initialize(args.log_level, script_path, log_in_file=args.log_in_file)
+    cwd = initialize(work_dir_path=script_path, log_level=args.log_level, log_in_file=args.log_in_file)
     
     from holado_core.common.exceptions.functional_exception import FunctionalException
     

holado-0.11.1/packaging/VERSION

@@ -1 +0,0 @@
-0.11.1

holado-0.11.1/tests/scripts/independant_runner/steps/public_steps.py

@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-from test_testing_solution_ksc.steps.public_steps import *
-
-
-
-