holado 0.9.0__tar.gz → 0.9.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.9.0
+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.0 → 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.0 → holado-0.9.2}/src/holado/common/context/session_context.py

@@ -12,13 +12,13 @@
 #################################################
 
 from builtins import super
-from _datetime import datetime
 import logging
 import os.path
 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.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}")
@@ -331,13 +333,14 @@ class SessionContext(Context):
         
         with self.__multitask_lock:
             # Log error on failing scenario
-            status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
+            category_validation, status_validation, step_failed, step_number = ReportManager.get_current_scenario_status_information(scenario)
             if status_validation != "Passed":
                 msg_list = []
+                category_str = f" ({category_validation})" if category_validation else ""
                 if step_failed is not None:
-                    msg_list.append(f"Scenario {status_validation}:  [scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line})]")
+                    msg_list.append(f"Scenario {status_validation}{category_str}:  [scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line})]")
                 else:
-                    msg_list.append(f"Scenario {status_validation}:  [scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?)]")
+                    msg_list.append(f"Scenario {status_validation}{category_str}:  [scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?)]")
                 step_error_message = ReportManager.get_step_error_message(step_failed)
                 if step_error_message:
                     msg_list.append(step_error_message)

{holado-0.9.0 → 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.0 → holado-0.9.2}/src/holado_core/common/block/base.py

@@ -13,9 +13,9 @@
 
 from builtins import super
 import abc
-from datetime import datetime
 import logging
 from holado_core.common.tools.tools import Tools
+from holado_python.common.tools.datetime import DateTime
 
 logger = logging.getLogger(__name__)
 
@@ -66,10 +66,10 @@ class BaseBlock(object):
         raise NotImplementedError
 
     def _process_start(self):
-        self.__start_dt = datetime.now()
+        self.__start_dt = DateTime.now()
 
     def _process_end(self):
-        self.__end_dt = datetime.now()
+        self.__end_dt = DateTime.now()
     
 
 

{holado-0.9.0 → holado-0.9.2}/src/holado_core/common/tools/path_manager.py

@@ -189,7 +189,7 @@ class PathManager(object):
     def get_timestamped_path(self, prefix, ext, dt=None, dt_format="%Y%m%d-%H%M%S"):
         ext = ext.strip('.')
         if dt is None:
-            dt = datetime.now()
+            dt = DateTime.now()
         now_str = datetime.strftime(dt, dt_format)
         return f"{prefix}_{now_str}.{ext}"
     

{holado-0.9.0 → holado-0.9.2}/src/holado_django/server/django_projects/rest_api/rest_api/urls.py

@@ -18,7 +18,7 @@ from django.contrib import admin
 from django.urls import path
 from rest_framework import routers
 from django.urls.conf import include
-from rest_api.application.apps import django_application_inst
+from rest_api.application.apps import django_application_inst  # @UnresolvedImport
 from holado_core.common.exceptions.technical_exception import TechnicalException
 
 router = routers.DefaultRouter()

{holado-0.9.0 → holado-0.9.2}/src/holado_docker/tests/behave/steps/tools/docker_controller/client_steps.py

@@ -19,7 +19,7 @@ import logging
 from holado_test.scenario.step_tools import StepTools
 from holado_test.behave.scenario.behave_step_tools import BehaveStepTools
 from holado_value.common.tables.converters.value_table_converter import ValueTableConverter
-from holado_docker.tools.docker_controller.docker_controller_manager import DockerControllerManager
+from holado_docker.tools.docker_controller.client.rest.docker_controller_client import DockerControllerClient
 
 logger = logging.getLogger(__name__)
 
@@ -40,7 +40,7 @@ def step_impl(context, var_name):
     else:
         kwargs = {}
     
-    res = DockerControllerManager.new_client(**kwargs)
+    res = DockerControllerClient.new_client(**kwargs)
 
     __get_variable_manager().register_variable(var_name, res)
 

{holado-0.9.0 → holado-0.9.2}/src/holado_docker/tools/docker_controller/client/rest/docker_controller_client.py

@@ -13,13 +13,50 @@
 
 import logging
 from holado_rest.api.rest.rest_client import RestClient
-from holado.common.handlers.undefined import default_value
+from holado.common.handlers.undefined import default_value, undefined_argument,\
+    undefined_value
+import os
+from holado_core.common.tools.converters.converter import Converter
+from holado_rest.api.rest.rest_manager import RestManager
 
 logger = logging.getLogger(__name__)
 
 
 class DockerControllerClient(RestClient):
     
+    @classmethod
+    def new_client(cls, use_localhost=undefined_argument, **kwargs):
+        if 'name' not in kwargs:
+            kwargs['name'] = None
+        if 'url' not in kwargs:
+            if use_localhost is undefined_argument:
+                env_use = os.getenv("HOLADO_USE_LOCALHOST", False)
+                use_localhost = Converter.is_boolean(env_use) and Converter.to_boolean(env_use)
+            
+            url = os.getenv("HOLADO_DOCKER_CONTROLLER_URL", undefined_value)
+            if url is undefined_value:
+                scheme = kwargs.get('scheme', undefined_value)
+                if scheme is undefined_value:
+                    scheme = os.getenv("HOLADO_DOCKER_CONTROLLER_SCHEME", "http")
+                host = kwargs.get('host', undefined_value)
+                if host is undefined_value:
+                    host = "localhost" if use_localhost else os.getenv("HOLADO_DOCKER_CONTROLLER_HOST", "holado_docker_controller")
+                port = kwargs.get('port', undefined_value)
+                if port is undefined_value:
+                    port = os.getenv("HOLADO_DOCKER_CONTROLLER_PORT", 51231)
+                
+                if port is None:
+                    url = f"{scheme}://{host}"
+                else:
+                    url = f"{scheme}://{host}:{port}"
+            kwargs['url'] = url
+        
+        manager = RestManager(default_client_class=DockerControllerClient)
+        res = manager.new_client(**kwargs)
+        
+        return res
+
+    
     def __init__(self, name, url, headers=None):
         super().__init__(name, url, headers)
     

{holado-0.9.0 → holado-0.9.2}/src/holado_docker/tools/docker_controller/server/run_docker_controller_in_docker.sh

@@ -12,8 +12,8 @@
 #     Have access to any HolAdo registry.
 #
 #     Optionally, define in .profile the following variables
-#         - HOLADO_DOCKER_CONTROLLER_NAME: name of the container
-#         - HOLADO_DOCKER_CONTROLLER_PORT: REST API port to use (default: 8000)
+#         - HOLADO_DOCKER_CONTROLLER_HOST: host name or name of the container
+#         - HOLADO_DOCKER_CONTROLLER_PORT: REST API port to use (default: 51231)
 #         - HOLADO_IMAGE_REGISTRY: docker image registry to use (default: holado/docker_controller)
 #         - HOLADO_IMAGE_TAG: docker image tag to use (default: latest)
 #         - HOLADO_OUTPUT_BASEDIR: absolute path to base output directory (default: [HOME]/.holado/output)
@@ -75,7 +75,7 @@ fi
 
 # Define port to use
 if [[ -z "$HOLADO_DOCKER_CONTROLLER_PORT" ]]; then
-    HOLADO_DOCKER_CONTROLLER_PORT=8000
+    HOLADO_DOCKER_CONTROLLER_PORT=51231
 fi
 
 

{holado-0.9.0 → holado-0.9.2}/src/holado_examples/tests/behave/testing_solution/environment.py

@@ -12,13 +12,13 @@ source_path = os.path.normpath(os.path.join(here, 'src'))
 sys.path.insert(0, source_path)
 
 # Add HolAdo source paths (needed when using a clone of HolAdo project)
-from initialize_holado import insert_holado_source_paths
+from initialize_holado import insert_holado_source_paths  # @UnresolvedImport
 insert_holado_source_paths()
 
 
 # Configure HolAdo
 import holado
-from context.session_context import TSSessionContext
+from context.session_context import TSSessionContext  # @UnresolvedImport
 # holado.initialize(TSessionContext=TSSessionContext, 
 holado.initialize(TSessionContext=None, 
                   logging_config_file_path=os.path.join(here, 'logging.conf'), log_level=logging.INFO,
@@ -26,7 +26,7 @@ holado.initialize(TSessionContext=None,
 
 
 # Import generic environment methods
-from behave_environment import *
+from behave_environment import *  # @UnresolvedImport
 
 # Define project specific environment methods
 # TestConfig.profile_memory_in_features = True

{holado-0.9.0 → holado-0.9.2}/src/holado_examples/tests/behave/testing_solution/src/context/session_context.py

@@ -17,7 +17,7 @@ class TSSessionContext(SessionContext):
         
         # Override default registered modules
          
-        from common.tools.path_manager import TSPathManager
+        from common.tools.path_manager import TSPathManager  # @UnresolvedImport
         self.services.register_service_type("path_manager", TSPathManager,
                             lambda m: m.initialize(),
                             raise_if_exist=False )
@@ -25,7 +25,7 @@ class TSSessionContext(SessionContext):
         
         # Register new modules
         
-        from config.config_manager import TSConfigManager
+        from config.config_manager import TSConfigManager  # @UnresolvedImport
         self.services.register_service_type("config_manager", TSConfigManager,
                             lambda m: m.initialize(lambda: self.path_manager) )
         

{holado-0.9.0 → holado-0.9.2}/src/holado_examples/tests/behave/testing_solution/steps/config_steps.py

@@ -3,7 +3,7 @@
 import logging
 from holado_test.behave.behave import *  # @UnusedWildImport
 from holado.common.context.session_context import SessionContext
-from config.config_manager import TSConfigManager
+from config.config_manager import TSConfigManager  # @UnresolvedImport
 
 
 logger = logging.getLogger(__name__)

{holado-0.9.0 → 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.0 → 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.0 → 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.0 → holado-0.9.2}/src/holado_multitask/multithreading/loopthread.py

@@ -13,10 +13,10 @@
 
 import threading
 import time
-import datetime
 import logging
 import holado_multitask.multithreading.thread as ctt
 from holado.common.handlers.undefined import default_context
+from holado_python.common.tools.datetime import DateTime
 
 logger = logging.getLogger(__name__)
 
@@ -31,7 +31,7 @@ class LoopThread(ctt.InterruptableThread):
         
         # Manage loops
         self.__is_under_loop = threading.Event()
-        self.__next_loop_datetime = datetime.datetime.now()
+        self.__next_loop_datetime = DateTime.now()
         self.__loop_counter = 0
         
     @property
@@ -79,10 +79,10 @@ class LoopThread(ctt.InterruptableThread):
         logger.info("Loop thread '{}' has finished.".format(self.name))
         
     def does_need_run_loop(self):
-        return datetime.datetime.now() >= self.__next_loop_datetime
+        return DateTime.now() >= self.__next_loop_datetime
     
     def _get_sleep_time_before_next_loop(self):
-        now = datetime.datetime.now()
+        now = DateTime.now()
         if now < self.__next_loop_datetime:
             delta = self.__next_loop_datetime - now
             res = delta.total_seconds()

{holado-0.9.0 → 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.0 → holado-0.9.2}/src/holado_python/common/tools/datetime.py

@@ -22,7 +22,7 @@ import os
 from holado_core.common.tools.converters.converter import Converter
 from enum import Enum
 from holado_python.common.enums import ArithmeticOperator
-from datetime import timedelta, timezone
+from datetime import timedelta
 from dateutil.relativedelta import relativedelta
 import math
 from decimal import Decimal
@@ -39,6 +39,10 @@ FORMAT_DATETIME_ISO = '%Y-%m-%dT%H:%M:%S.%fZ'
 FORMAT_DATETIME_ISO_SECONDS = '%Y-%m-%dT%H:%M:%SZ'
 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):
     # Nanosecond = "nanosecond"
@@ -55,11 +59,16 @@ class DurationUnit(str, Enum):
 
 
 class DateTime(object):
+    """ Tools to manipulate datetimes.
+    Note: Naive and aware datetimes cannot be compared. Thus HolAdo methods always set datetime timezone when it is known.
+          In methods unable to define the timezone (ex: str_2_datetime), it is highly recommended to specify 'tz' argument.
+    """
     
     __is_system_time_in_tai = None
     __is_system_time_expected_in_tai = None
     __utc_to_tai_timedelta = None
     
+    
     def __init__(self):
         pass
     
@@ -71,22 +80,22 @@ class DateTime(object):
         return cls.__is_system_time_in_tai
     
     @classmethod
-    def now(cls):
-        return datetime.datetime.now()
+    def now(cls, tz=default_timezone):  # @UndefinedVariable
+        return datetime.datetime.now(tz=tz)
     
     @classmethod
     def utcnow(cls):
         if cls.is_system_time_in_tai():
-            return datetime.datetime.utcnow() - cls.utc_to_tai_timedelta()
+            return cls.now(TIMEZONE_UTC) - cls.utc_to_tai_timedelta()
         else:
-            return datetime.datetime.utcnow()
+            return cls.now(TIMEZONE_UTC)
     
     @classmethod
     def tainow(cls):
         if cls.is_system_time_in_tai():
-            return datetime.datetime.utcnow()
+            return cls.now(TIMEZONE_UTC)
         else:
-            return datetime.datetime.utcnow() + cls.utc_to_tai_timedelta()
+            return cls.now(TIMEZONE_UTC) + cls.utc_to_tai_timedelta()
     
     @classmethod
     def utc_to_tai_timedelta(cls):
@@ -126,8 +135,15 @@ class DateTime(object):
         return res
 
     @classmethod
-    def str_2_datetime(cls, dt_str, dt_format=None, default_timezone=timezone.utc):
-        """Convert string to datetime instance"""
+    def str_2_datetime(cls, dt_str, dt_format=None, tz=None):
+        """Convert string to datetime instance
+        @param dt_format If defined, use this format to parse string rather than using first matching format
+        @param tz If defined, return a datetime with this timezone. 
+                  If string already defines a timezone, the datetime is converted to this timezone, 
+                  else the string is supposed to represent a datetime in this timezone and timezone is set in result datetime.
+        Note: Naive and aware datetimes cannot be compared. Thus HolAdo methods always set datetime timezone when it is known.
+              It is highly recommended to specify 'tz' argument
+        """
         res = None
         if dt_format is None:
             res = dateutil.parser.parse(dt_str)
@@ -135,8 +151,11 @@ class DateTime(object):
             res = datetime.datetime.strptime(dt_str, dt_format)
         
         # Set timezone if needed
-        if res.tzinfo is None and default_timezone is not None:
-            res = res.replace(tzinfo=default_timezone)
+        if tz is not None:
+            if res.tzinfo is None:
+                res = res.replace(tzinfo=tz)
+            else:
+                res = res.astimezone(tz)
         
         return res
 
@@ -162,19 +181,19 @@ class DateTime(object):
         return res
     
     @classmethod
-    def _get_datetime(cls, dt):
+    def _get_datetime(cls, dt, tz_in_str=None):
         res = None
         if dt is not None:
             if isinstance(dt, datetime.datetime):
                 res = dt
             elif isinstance(dt, str):
-                res = DateTime.str_2_datetime(dt)
+                res = DateTime.str_2_datetime(dt, tz=tz_in_str)
             else:
                 raise TechnicalException(f"Datetime can be a datetime, a str containing a datetime, or None")
         return res
     
     @classmethod
-    def _get_epoch_datetime(cls, epoch):
+    def _get_epoch_datetime(cls, epoch, tz_in_str=None):
         res = None
         if epoch is not None:
             if isinstance(epoch, datetime.datetime):
@@ -183,7 +202,7 @@ class DateTime(object):
                 if epoch in ['EPOCH_1970', 'EPOCH_JULIAN_CNES', 'EPOCH_JULIAN_NASA']:
                     res = eval(epoch)
                 else:
-                    res = DateTime.str_2_datetime(epoch)
+                    res = DateTime.str_2_datetime(epoch, tz=tz_in_str)
             else:
                 raise TechnicalException(f"Epoch can be a datetime, a str containing a datetime, a str containing an EPOCH name, or None")
         return res
@@ -296,7 +315,7 @@ class DateTime(object):
         """
         dt_src = dt
         if isinstance(dt_src, str):
-            dt_src = cls.str_2_datetime(dt_src, dt_format)
+            dt_src = cls.str_2_datetime(dt_src, dt_format, tz=TIMEZONE_UTC)
         
         return dt_src + DateTime.utc_to_tai_timedelta()
     
@@ -308,7 +327,7 @@ class DateTime(object):
         """
         dt_src = dt
         if isinstance(dt_src, str):
-            dt_src = cls.str_2_datetime(dt_src, dt_format)
+            dt_src = cls.str_2_datetime(dt_src, dt_format, tz=TIMEZONE_UTC)
         
         return dt_src - DateTime.utc_to_tai_timedelta()