holado 0.9.1__tar.gz → 0.9.2__tar.gz

{holado-0.9.1 → holado-0.9.2}/PKG-INFO

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

holado-0.9.2/packaging/VERSION

@@ -0,0 +1 @@
+0.9.2

{holado-0.9.1 → holado-0.9.2}/src/holado/__init__.py

@@ -38,13 +38,14 @@ def __initialize_holado_loggers():
     
     
     
-def _initialize_logging(use_holado_logger=True, logging_config_file_path=None, log_level=None, log_on_console=False, log_in_file=True):
+def _initialize_logging(use_holado_logger=True, logging_config_file_path=None, log_level=None, log_time_in_utc=None, log_on_console=False, log_in_file=True):
     # print_imported_modules("[initialize]")
     import holado_logging
     # print_imported_modules("[after import holado_logging]")
 
     # Configure logging module
-    holado_logging.configure(use_holado_logger=use_holado_logger, logging_config_file_path=logging_config_file_path, log_level=log_level, log_on_console=log_on_console, log_in_file=log_in_file)
+    holado_logging.configure(use_holado_logger=use_holado_logger, logging_config_file_path=logging_config_file_path, 
+                             log_level=log_level, log_time_in_utc=log_time_in_utc, log_on_console=log_on_console, log_in_file=log_in_file)
     # print_imported_modules("[after import holado_logging]")
 
     # Initialize holado loggers
@@ -77,11 +78,11 @@ def initialize_minimal():
     #            session_kwargs={'with_session_path':False}, 
     #            garbage_collector_periodicity=None)
     initialize(TSessionContext=None, use_holado_logger=True, logging_config_file_path=None,
-               log_level=None, log_on_console=True, log_in_file=False,
+               log_level=None, log_time_in_utc=None, log_on_console=True, log_in_file=False,
                garbage_collector_periodicity=None)
 
 def initialize(TSessionContext=None, use_holado_logger=True, logging_config_file_path=None, 
-               log_level=None, log_on_console=False, log_in_file=True, session_kwargs=None,
+               log_level=None, log_time_in_utc=None, log_on_console=False, log_in_file=True, session_kwargs=None,
                garbage_collector_periodicity=default_value):
     global __initialized
     if __initialized:
@@ -108,7 +109,7 @@ def initialize(TSessionContext=None, use_holado_logger=True, logging_config_file
     
     # Initialize logging
     _initialize_logging(use_holado_logger=use_holado_logger, logging_config_file_path=logging_config_file_path,
-                        log_level=log_level, log_on_console=log_on_console, log_in_file=log_in_file and with_session_path)
+                        log_level=log_level, log_time_in_utc=log_time_in_utc, log_on_console=log_on_console, log_in_file=log_in_file and with_session_path)
     if Tools.do_log(logger, logging.DEBUG):
         logger.debug("Configured logging")
     
@@ -181,6 +182,7 @@ def _import_modules(module_names):
     from holado_core.common.tools.tools import Tools
     
     imported_modules = __import_modules(module_names)
+    __configure_modules(imported_modules)
     remaining_imported_modules = __register_modules_with_dependencies(imported_modules)
     
     # Register modules with cross dependencies
@@ -217,6 +219,25 @@ def __import_modules(module_names):
             res[module_name] = module
     return res
     
+def __configure_modules(imported_modules):
+    from holado_core.common.tools.tools import Tools
+    
+    if Tools.do_log(logger, logging.DEBUG):
+        logger.debug(f"Configuring imported HolAdo modules: {sorted(imported_modules.keys())}")
+    
+    imported_module_names = list(imported_modules.keys())
+    for module_name in imported_module_names:
+        if Tools.do_log(logger, logging.TRACE):  # @UndefinedVariable
+            logger.trace(f"Configuring HolAdo module '{module_name}'...")
+        module = imported_modules[module_name]
+        if hasattr(module, 'configure_module'):
+            module.configure_module()
+            if Tools.do_log(logger, logging.DEBUG):
+                logger.debug(f"Configured HolAdo module '{module_name}'")
+        else:
+            if Tools.do_log(logger, logging.DEBUG):
+                logger.debug(f"Nothing to configure for HolAdo module '{module_name}'")
+    
 def __register_modules_with_dependencies(imported_modules):
     from holado_core.common.tools.tools import Tools
     

{holado-0.9.1 → holado-0.9.2}/src/holado/common/context/session_context.py

@@ -18,7 +18,7 @@ from holado.common.context.context import Context
 from holado_core.common.tools.tools import Tools
 import threading
 from holado.common.handlers.enums import ObjectStates
-from holado_python.common.tools.datetime import DateTime
+from holado.holado_config import Config
 
 
 logger = logging
@@ -147,11 +147,13 @@ class SessionContext(Context):
             return None
 
     def new_session(self, session_kwargs=None):
+        from holado_python.common.tools.datetime import DateTime
+        
         # Report session
         report_path = None
         if self.with_session_path:
             # Create new report path for this session
-            name = "session_{}".format(DateTime.now().strftime("%Y-%m-%d_%H-%M-%S"))
+            name = "session_{}".format(DateTime.now(tz=Config.report_timezone).strftime("%Y-%m-%d_%H-%M-%S"))  # @UndefinedVariable
             report_path = self.path_manager.get_reports_path(name)
             logger.info(f"Reports location: {report_path}")
             print(f"Reports location: {report_path}")

{holado-0.9.1 → holado-0.9.2}/src/holado/holado_config.py

@@ -41,7 +41,4 @@ class Config(object):
     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.9.1 → holado-0.9.2}/src/holado_grpc/__init__.py

@@ -12,6 +12,14 @@
 # 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
+
+
+def configure_module():
+    from holado.holado_config import Config
+    
+    # Default log level
+    Config.log_level_grpc_request = logging.INFO
 
 def dependencies():
     return ["holado_multitask", "holado_protobuf"]

holado-0.9.2/src/holado_helper/holado_module_template/__init__.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+#################################################
+# 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.
+#################################################
+
+
+def configure_module():
+    """
+    Configure this module
+    Example: set new attributes in holado.holado_config.Config class
+    """
+    pass
+
+def dependencies():
+    """
+    Return None or the list of names of modules it depend on
+    """
+    return None
+
+def register():
+    """
+    Register the services of this module
+    """
+    # from holado.common.context.session_context import SessionContext
+    
+    # from holado_xxx.xxx import XXXManager
+    # SessionContext.instance().services.register_service_type("xxx_manager", XXXManager)
+    pass
+

{holado-0.9.1 → holado-0.9.2}/src/holado_logging/__init__.py

@@ -14,13 +14,17 @@
 
 
 
-def configure(use_holado_logger=True, logging_config_file_path=None, log_level=None, log_on_console=False, log_in_file=True):
-    from holado_logging.common.logging.log_config import LogConfig
-    LogConfig.configure(use_holado_logger=use_holado_logger, config_file_path=logging_config_file_path, log_level=log_level, log_on_console=log_on_console, log_in_file=log_in_file)
-    
+
 def dependencies():
     return None
 
+
+
+def configure(use_holado_logger=True, logging_config_file_path=None, log_level=None, log_time_in_utc=None, log_on_console=False, log_in_file=True):
+    from holado_logging.common.logging.log_config import LogConfig
+    LogConfig.configure(use_holado_logger=use_holado_logger, config_file_path=logging_config_file_path, 
+                        log_level=log_level, log_time_in_utc=log_time_in_utc, log_on_console=log_on_console, log_in_file=log_in_file)
+    
 def initialize_and_register():
     from holado.common.context.session_context import SessionContext
     from holado_logging.common.logging.log_manager import LogManager

{holado-0.9.1 → holado-0.9.2}/src/holado_logging/common/logging/log_config.py

@@ -22,12 +22,13 @@ class LogConfig(object):
     TManager = None
     config_file_path = None
     default_level = logging.INFO
+    log_time_in_utc = True
     log_on_console=False
     log_in_file=True
     __is_configured = False
     
     @classmethod
-    def configure(cls, use_holado_logger=True, config_file_path=None, log_level=None, log_on_console=False, log_in_file=True):
+    def configure(cls, use_holado_logger=True, config_file_path=None, log_level=None, log_time_in_utc=None, log_on_console=False, log_in_file=True):
         if cls.__is_configured:
             logging.warning(f"Logging was already configured, it is not possible to configure it twice. This new configuration is skipped.")
             return
@@ -45,14 +46,17 @@ class LogConfig(object):
             import configparser
             config = configparser.ConfigParser()
             config.read(config_file_path)
-            log_level = config.get("holado", "level")
-            log_on_console = config.get("holado", "log_on_console")
-            log_in_file = config.get("holado", "log_in_file")
+            log_level = config.get("holado", "level", fallback=log_level)
+            log_time_in_utc = config.getboolean("holado", "log_time_in_utc", fallback=log_time_in_utc)
+            log_on_console = config.get("holado", "log_on_console", fallback=log_on_console)
+            log_in_file = config.get("holado", "log_in_file", fallback=log_in_file)
         
         if log_level:
             if isinstance(log_level, str):
                 log_level = logging._nameToLevel[log_level]
             cls.default_level = log_level
+        if log_time_in_utc is not None:
+            cls.log_time_in_utc = log_time_in_utc
         if log_on_console:
             if isinstance(log_on_console, str):
                 log_on_console = True if log_on_console == "True" else False
@@ -62,6 +66,11 @@ class LogConfig(object):
                 log_in_file = True if log_in_file == "True" else False
             cls.log_in_file = log_in_file
         
+        # Change log time format if needed
+        if cls.log_time_in_utc:
+            import time
+            logging.Formatter.converter = time.gmtime
+        
         cls.__is_configured = True
     
     @classmethod

{holado-0.9.1 → holado-0.9.2}/src/holado_python/__init__.py

@@ -13,6 +13,7 @@
 #################################################
 
 
+
 def dependencies():
     """
     Return None or the list of names of modules it depend on

{holado-0.9.1 → holado-0.9.2}/src/holado_python/common/tools/datetime.py

@@ -41,6 +41,7 @@ FORMAT_DATETIME_HUMAN_SECOND = '%Y-%m-%d %H:%M:%S'
 
 TIMEZONE_LOCAL = datetime.datetime.now().astimezone().tzinfo
 TIMEZONE_UTC = datetime.timezone.utc
+default_timezone = TIMEZONE_UTC
 
 
 class DurationUnit(str, Enum):
@@ -79,7 +80,7 @@ class DateTime(object):
         return cls.__is_system_time_in_tai
     
     @classmethod
-    def now(cls, tz=TIMEZONE_LOCAL):
+    def now(cls, tz=default_timezone):  # @UndefinedVariable
         return datetime.datetime.now(tz=tz)
     
     @classmethod

{holado-0.9.1 → holado-0.9.2}/src/holado_report/__init__.py

@@ -13,6 +13,12 @@
 #################################################
 
 
+def configure_module():
+    from holado.holado_config import Config
+    from holado_python.common.tools.datetime import TIMEZONE_UTC
+    
+    Config.report_timezone = TIMEZONE_UTC
+
 def dependencies():
     return ["holado_multitask"]
 

{holado-0.9.1 → holado-0.9.2}/src/holado_rest/__init__.py

@@ -12,6 +12,14 @@
 # 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
+
+
+def configure_module():
+    from holado.holado_config import Config
+    
+    # Default log level
+    Config.log_level_rest_request = logging.INFO
 
 def dependencies():
     return None

{holado-0.9.1 → holado-0.9.2}/src/holado_test/test_server/client/rest/test_server_client.py

@@ -20,6 +20,7 @@ from holado_rest.api.rest.rest_manager import RestManager
 from holado.common.handlers.undefined import undefined_argument, undefined_value
 import os
 from holado_core.common.tools.converters.converter import Converter
+from holado_core.common.exceptions.technical_exception import TechnicalException
 
 logger = logging.getLogger(__name__)
 
@@ -76,7 +77,14 @@ class TestServerClient(RestClient):
         netloc_pattern = r"(?P<host>.*?)(?::(?P<port>\d+))?$"
         m = re.match(netloc_pattern, url_parsed.netloc)
         host = m.group('host')
-        port = Converter.to_integer(m.group('port'))
+        if m.group('port') is not None:
+            port = Converter.to_integer(m.group('port'))
+        elif url_parsed.scheme == "http":
+            port = 80
+        elif url_parsed.scheme == "https":
+            port = 443
+        else:
+            raise TechnicalException(f"Unable to define port used by test-server (URL: '{self.url}')")
         
         sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
         sock.settimeout(1)
@@ -87,7 +95,7 @@ class TestServerClient(RestClient):
             return False
         else:
             sock.close()
-            logger.debug(f"Ping of test server succeeded")
+            logger.debug(f"Ping of test server succeeded for ({host}, {port})")
             return True
         
     

holado-0.9.1/packaging/VERSION

@@ -1 +0,0 @@
-0.9.1

holado-0.9.1/src/holado_yaml/__init__.py

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#################################################
-# 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.
-#################################################
-
-
-def dependencies():
-    """
-    Return None or the list of names of modules it depend on
-    """
-    return None
-
-def register():
-    """
-    Register the services of this module
-    """
-    # from holado.common.context.session_context import SessionContext
-    
-    # from holado_xxx.xxx import XXXManager
-    # SessionContext.instance().services.register_service_type("xxx_manager", XXXManager)
-    pass
-