holado 0.9.0__py3-none-any.whl → 0.9.2__py3-none-any.whl

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_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_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_python/__init__.py

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

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()
         

holado_python/standard_library/ssl/resources/certificates/tcpbin.crt

@@ -2,20 +2,20 @@
 MIIDZTCCAk2gAwIBAgIBKjANBgkqhkiG9w0BAQsFADCBizELMAkGA1UEBhMCVVMx
 CzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMQ8wDQYDVQQKDAZ0
 Y3BiaW4xDDAKBgNVBAsMA29wczETMBEGA1UEAwwKdGNwYmluLmNvbTEjMCEGCSqG
-SIb3DQEJARYUaGFycnliYWdkaUBnbWFpbC5jb20wHhcNMjUwOTI0MTAzMzE5WhcN
-MjUwOTI1MTAzMzE5WjAcMRowGAYDVQQDDBF0Y3BiaW4uY29tLWNsaWVudDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALuFFkk1M7uFHl+/XHsVOYe3BAjO
-FIXrlDFk0D3G9QAwjpuDnCPYSrhAHpSxdVrp+5RV9L/OFj7ome2O9thFKvQJaG89
-g44Jpa1SnVysonZui23GJZUcbS2td8tLXVyE6e+v8CeIjeQvjKqkS/t4t+4SkBCU
-4PUt6aP+PuK1aG0/7KqBoctC12c0RwRqh+eJAHBxlb69/OzdOTTpXpXMyzWuyLTp
-gzHbBhbtMHle/0dk/gHmh+/dAASCnoHfIOHOvqRW57p/SpnKW80QkshxArS6/mvm
-7RkxYpQEjrAWpk24CcR+LYbL5Q89oXvxmXg4V2IiEvy4oXRh9vXG/obe06UCAwEA
-AaNCMEAwHQYDVR0OBBYEFD7PxtLlvXy3LXcd2TsiB6KewQxeMB8GA1UdIwQYMBaA
-FOLuMowBSAZfV5v82LmlaIIOvU/DMA0GCSqGSIb3DQEBCwUAA4IBAQAwUvYMFteT
-N/CVVickwg/MpAv2/HLr5NeajfKQO9ya7K9ymHF8WU2S9MSwXUuJ4/wGzNwbpXmj
-hsbh0W06ZL1ClrWr/US6lkHZegbVBGkF3qwDP0kMYVXEp6LcEy0e6lX4ey9t342H
-RBxbxmzXsp1plV4PecWXGt7LF18kzMe57sbGmSgDZ0LDGANFM97C72ytNrR2v5XB
-Mw1t5C5I9IowMWh484Ue/VUtGCekCvtrfO0ur1tta7y0mRIJu49MmPJeAdScefSj
-ke+Pf96v53zieSpMoV8mvI8f6Mjt3GMVq07VX7+IWufxJ7FXx7TQ1q3LBdOVtsZ7
-+biJwocFLiem
+SIb3DQEJARYUaGFycnliYWdkaUBnbWFpbC5jb20wHhcNMjUxMDAyMTMzNjQ1WhcN
+MjUxMDAzMTMzNjQ1WjAcMRowGAYDVQQDDBF0Y3BiaW4uY29tLWNsaWVudDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK2xah/MsJKGnIpj84nYfBRCeAh8
+MmN5dZwUCteehkX+wFhioEx1loAIqcqs6MPe7qQdeROuOZlGeiDR/6X0mnDsgyR4
+qUnrIaRHS3EFWGtGp0WRLsQhKNvtxAHL7dErz7BoxTO5gV/w6dcT3uPORfZxkZdm
+6t01t7DwPFktopQju9E8eeMBKVKaO1RrclZKkWEyfuHP3wNpIE6GwsH8jCn4I+r/
+Y8Pgd+k4EyCaH+ngtFbS0lEhxxuqTpPRYyQrlEDMa1i/nETuMiL2WFkjEO2gEX/p
+w05GlO3YUTDpaXWUWZf+Ck7MYevrFDC57oSZvMwTn5pJrQztvNJjFc+YF6kCAwEA
+AaNCMEAwHQYDVR0OBBYEFLuHuKWOQ/U1+OpiGgffNV1faI9qMB8GA1UdIwQYMBaA
+FOLuMowBSAZfV5v82LmlaIIOvU/DMA0GCSqGSIb3DQEBCwUAA4IBAQBYIRlg6Paz
+ALTKoBm8nRB19n4d7Ay+U1bUBCP2U5vZkUTSu05ttQXT72TaFIaT04pFs9uIHGFZ
+9yhP2DgbuCaexQrvf9yf6nnoCqLjlhJ8Y0NmscK14Hp9GgVSnkXeweL82gFsXB45
+FaqqyDn20QiH14nwU2H7g8y/Ys0PIemhjG8UT7OjSLyhkaCkxwYy88N/2YjX3hGH
+9eTHvfMZ+9E7Urh3DevivhfPQnX/6lUAOK7Sr+WTIEjpZ89Lz/rLltRCXoXv75C4
+PdRoxB2/lo+3+X1i4B7ujaduZDLaMyPcckbpuTYxjPZtoxhLyYkKgzQTUMwYsVrW
+DoI6HuqlfzoH
 -----END CERTIFICATE-----

holado_python/standard_library/ssl/resources/certificates/tcpbin.key

@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC7hRZJNTO7hR5f
-v1x7FTmHtwQIzhSF65QxZNA9xvUAMI6bg5wj2Eq4QB6UsXVa6fuUVfS/zhY+6Jnt
-jvbYRSr0CWhvPYOOCaWtUp1crKJ2bottxiWVHG0trXfLS11chOnvr/AniI3kL4yq
-pEv7eLfuEpAQlOD1Lemj/j7itWhtP+yqgaHLQtdnNEcEaofniQBwcZW+vfzs3Tk0
-6V6VzMs1rsi06YMx2wYW7TB5Xv9HZP4B5ofv3QAEgp6B3yDhzr6kVue6f0qZylvN
-EJLIcQK0uv5r5u0ZMWKUBI6wFqZNuAnEfi2Gy+UPPaF78Zl4OFdiIhL8uKF0Yfb1
-xv6G3tOlAgMBAAECggEBAJfv3L/ScKk20gaIebls2CFjo8wyliRwXbGr2qLDiw3t
-Sg8tkxzkCp7BrUWTh9/zCBoHj3i91f6A3v/Bv7Y6TPRQjyLa97XlkS0fbEuDwVsu
-dKCsVRU9ZCUHkbHRzcLCGv5PUsnldfp2oIY++yW1iWpH9hzJVIC0A8QRpAhzLjqd
-ls34VvUqo/BCdrYXVOLrQvqprak5R3UQFQ1JfAg8uh9BgTxs5W+EZJg050O4Z5Jt
-AAGZSNpyBWHbDopUFXFOfSuBSJx79qsN2u3uH8MU+Ryi2J3cNIooJ1iPdfzLN24/
-7kGrCz0uFDhSLn373QLbv/Q7OXXxOlWniKebF68aBt0CgYEA4JdHM7mG+Pj+3I1A
-oV2JeQ/okMIkeAyi+YP2uz8ENK+fNkFumSgUOMihVq2RxYX9vbA31I6AZR2OehNL
-DJROr+5beofJgZFP1RqY0yVSByWPyKEXDoEyxYb0x3ymTDxEJxfchzNJHLs4zMRg
-HV6HEhF1/RstAQOrgMdpxCQiZV8CgYEA1b6awQClNav848iHCtq9VQbj7q9rqcio
-7cVd8noh3crpTi+g89yEkNGUU9KBI5+CSQwJbgWZcmu6DVoZww/piebmDfNfs2Q9
-MYaJ3g1JG42lQx+sD99Mdeki7yRGnYa1E9EWHuh0RPav6io2/p2orQKYYPKzNeu7
-Gk+6CmRFQXsCgYBvXXQYCOoNsOInmP8wRMJzPlky1qHgyVtS4IXK6X97ZI5NB/sA
-hOgqFAo0gdKjoEJm+edlRdgSy6onjEONlEjEYiwIQSbBUb3FTO/02y+mjZCTipV1
-QslbOwVLmdqYONYOkH1wqRSa45dRqhqC1amiYvgfrocNVrWHINqoQMaxfwKBgQCQ
-UK46K85gS6xmu2j6WjBFbW6OJKDjtNjiGUVSR0YAc1VM9fmNTVGwWeD1K4cH31Xf
-LiJbx6oQSE4JX9FPE7pR4rVnq+/stnxeqQEDDSNUWDHB/Wt2GAWPAwcUQgDvsRkn
-tR9jZP3D5m9mAnS5Owe9MKhjpNp9SJk+rZ/mDkd4awKBgCBTqzV43mNNWW1ZTyAd
-zGWbVseAZI/i1SqYG59gIuEtPdeQYcF893V184U2CAaBIUarE6DENXqOuBOGPn3s
-2K8hd+B+0d6zB8WwvnO4H9gaO6OZleEOV3pVaCOMlDn6GE8UiQoS6JzUXk3+iW4j
-jSA0Xr3pUFydKnSdlYLECucd
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCtsWofzLCShpyK
+Y/OJ2HwUQngIfDJjeXWcFArXnoZF/sBYYqBMdZaACKnKrOjD3u6kHXkTrjmZRnog
+0f+l9Jpw7IMkeKlJ6yGkR0txBVhrRqdFkS7EISjb7cQBy+3RK8+waMUzuYFf8OnX
+E97jzkX2cZGXZurdNbew8DxZLaKUI7vRPHnjASlSmjtUa3JWSpFhMn7hz98DaSBO
+hsLB/Iwp+CPq/2PD4HfpOBMgmh/p4LRW0tJRIccbqk6T0WMkK5RAzGtYv5xE7jIi
+9lhZIxDtoBF/6cNORpTt2FEw6Wl1lFmX/gpOzGHr6xQwue6EmbzME5+aSa0M7bzS
+YxXPmBepAgMBAAECggEBAIqgeMTch2jKyxGg6HTyNUWuL0MGbOj7vaROUsD4os4m
+nrlsLegYSX/yaiF6k2QQ/4I4i7Prb8kneL3NHS8E5GaQPbLUIrj+UyFcTZfs3j7w
+avyY/SxIEuZFBBUy/6HcR6zSUeIQgnNiQiAImfJTZX9l8P9Xgsf+4Zb0hhXe2E1G
+TqLAYWnLoxD9us0rryQb37mRIREKcTO3qza+FXk32bWe83f1Dy46JJIChIoQg/QB
+hwzSL51ld22fy7p+bsqeI3HUDWHplq4T0lws0SGUd4IvntF9rNGYHAI+aUKwiUBC
+g/0se9+GBKeMSjhS11F9/Clg4i0E/tN/poOytA83aAECgYEA3+E0bhbaFAvzzevv
+tAWSXkwHSFZ745KsJSJ8OOVkd+ATleyGl3AoRTrDxNqY+R/TvBFaTyiY+zqGV6tj
+NI8SaSXuhRzbA9zDL2rSH7GIOeqzUs8PSUMk6JnmfCKk+aTBOoi8ULolHE4N6B45
+te3GVgy/luJK22pPLCMsmL+D0ykCgYEAxpzr8T2CPVtl33W+loGbvrqZ1xXgq/7n
+IsjHZdVdFsIIxFhtE2A2iO/7vMsLmwkZ7LgbtHcfEPOxjx5VzVt89l1I2lnP0jW+
+pjKrN/eyXcHnWLLPCEtXA06oIvyem/VMSGXumu7EcOJZjnG3/PmqCWCjc2UUo2lJ
+F2rQdC9bMIECgYEAl3nSdaI0j1e+79bw6kbSz8Z1LvaFAGce3klE72IV5h3QYqIU
+NqaGOMEX8DtPQU/NfPPovKJlT6Y7e1nU15zuAgLOLXZmoWhfD9ggr5z45Obtydub
+JiCt+ksW7WqrYNWef7JAaAZqUYpmUmUQ+w0UIuihQL9/kpGNW/m4lOkPknECgYAI
+gbodWAwXAq4nVwy1t5FrJuTl8HryAvX1aHIZ63yUN/VWK49ocAuF6/l1SaESn94r
+ZGtTXHLJMBbf0WXNaOi+SJqRN52OHF0xEySAPiy2lVKKWwZBDbEJZDoRXY6RkX0V
+8L+6hRWG3DsHvdkqjar5wdjeXWr34M+PoDSTdV/LgQKBgFAqJc4I91AK8Ah9Ba8k
+LqYtRFGFJ2J+p8QqcibfT6d6tZqWffxiXbQ5bS52/fmM3BdxEHjtzLdA7cOqCh6g
+79kxRb3B5jjq5JvGtLy89VphZ08W9dhzgL/l3KGtgMobfTYUEDaNk33oExhItQnx
+F97ecAMIx20oqFFOg6N0unwW
 -----END PRIVATE KEY-----

holado_python/tests/behave/steps/standard_library/datetime_steps.py

@@ -45,9 +45,9 @@ def step_impl(context, varname, format_value, duration, duration_unit, value):
     deltaT = timedelta(**args)
      
     if value == "ago": 
-        date = datetime.now() - deltaT
+        date = DateTime.now() - deltaT
     elif value == "ahead":
-        date = datetime.now() + deltaT
+        date = DateTime.now() + deltaT
         
     
     v = date.strftime(format_value)

holado_rabbitmq/tools/rabbitmq/rabbitmq_manager.py

@@ -92,12 +92,12 @@ class RMQManager:
         #         polling_seconds = 0.001       # a polling period below 1 ms is usually not efficient in testing context
         #
         # # Wait first message is needed
-        # dt_begin = datetime.now()
+        # dt_begin = DateTime.now()
         # dt_last_poll = dt_begin
         # if first_timeout_seconds is not None:
         #     while (dt_last_poll - dt_begin).total_seconds() < first_timeout_seconds:
         #         nb_msg_by_consumer = {c.name: c.nb_messages for c in consumers if c.nb_messages > 0}
-        #         dt_last_poll = datetime.now()
+        #         dt_last_poll = DateTime.now()
         #         if len(nb_msg_by_consumer) > 0:
         #             res = sum(nb_msg_by_consumer.values())
         #             if Tools.do_log(logger, logging.DEBUG):
@@ -115,7 +115,7 @@ class RMQManager:
         # while (dt_last_poll - dt_last_receive).total_seconds() < window_seconds:
         #     nb_msg_by_consumer = {c.name: c.nb_messages for c in consumers if c.nb_messages > 0}
         #     nb = sum(nb_msg_by_consumer.values())
-        #     dt_last_poll = datetime.now()
+        #     dt_last_poll = DateTime.now()
         #     if nb > res:
         #         res = nb
         #         if Tools.do_log(logger, logging.DEBUG):

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_report/campaign/campaign_manager.py

@@ -14,9 +14,10 @@
 from holado.common.context.session_context import SessionContext
 import logging
 from holado_core.common.resource.table_data_manager import TableDataManager
-from holado_python.common.tools.datetime import DateTime
+from holado_python.common.tools.datetime import DateTime, TIMEZONE_LOCAL
 import os
 from holado_system.system.filesystem.file import File
+import re
 
 
 logger = logging.getLogger(__name__)
@@ -99,7 +100,7 @@ class CampaignManager(object):
         res_dict_list = client.execute(query_str, result_as_dict_list=True, as_generator=False)
         
         status_dt_str = res_dict_list[0]['status_at'] if res_dict_list else None
-        status_dt = DateTime.str_2_datetime(status_dt_str) if status_dt_str else None
+        status_dt = DateTime.str_2_datetime(status_dt_str, tz=TIMEZONE_LOCAL) if status_dt_str else None
         return status_dt
         
     def import_campaign_reports(self, report_path):
@@ -182,7 +183,11 @@ class CampaignManager(object):
             parts = line.split(' - ')
             status_dt_str = parts[0]
             scenario_name = parts[1]
-            status = parts[-1]
+            status_info = parts[-1]
+            
+            m = re.match(r"^(.*?)(?: \(.*\))?$", status_info)
+            status = m.group(1)
+            
             self.update_or_add_campaign_scenario(camp_id, scenario_name, status=status, status_at_str=status_dt_str)
         
 

holado_report/report/builders/detailed_scenario_failed_report_builder.py

@@ -33,10 +33,10 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        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":
-            self.__file_fail_add_scenario(scenario, scenario_report, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario(scenario, scenario_report, category_validation, status_validation, step_failed, step_number)
             
     def after_all(self):
         # Manage file fail
@@ -44,13 +44,13 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
             self.__file_fail.close()
             self.__file_fail = None
         
-    def __file_fail_add_scenario(self, scenario, scenario_report, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number):
         if self.__is_format_xml:
-            self.__file_fail_add_scenario_xml(scenario, scenario_report, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario_xml(scenario, scenario_report, category_validation, status_validation, step_failed, step_number)
         else:
-            self.__file_fail_add_scenario_txt(scenario, scenario_report, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario_txt(scenario, scenario_report, category_validation, status_validation, step_failed, step_number)
         
-    def __file_fail_add_scenario_xml(self, scenario, scenario_report, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario_xml(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number):
         from holado_report.report.report_manager import ReportManager
         
         self.__open_file_if_needed()
@@ -61,6 +61,8 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         msg_list.append(f"    <scenario>{scenario.name}</scenario>")
         msg_list.append(f"    <report>{scenario_report.report_path}</report>")
         msg_list.append(f"    <tags>-t " + " -t ".join(scenario.feature.tags + scenario.tags) + "</tags>")
+        if category_validation:
+            msg_list.append(f"    <validation_category>{category_validation}</validation_category>")
         msg_list.append(f"    <validation_status>{status_validation}</validation_status>")
         if step_failed is not None:
             msg_list.append(f"    <failure>")
@@ -102,7 +104,7 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         self.__file_fail.write(msg)
         self.__file_fail.flush()
         
-    def __file_fail_add_scenario_txt(self, scenario, scenario_report, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario_txt(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number):
         from holado_report.report.report_manager import ReportManager
         
         self.__open_file_if_needed()
@@ -112,6 +114,8 @@ class DetailedScenarioFailedReportBuilder(ReportBuilder):
         msg_list.append(f"    Scenario: {scenario.name}")
         msg_list.append(f"    Report: {scenario_report.report_path}")
         msg_list.append(f"    Tags: -t " + " -t ".join(scenario.feature.tags + scenario.tags))
+        if category_validation:
+            msg_list.append(f"    Validation category: {category_validation}")
         msg_list.append(f"    Validation status: {status_validation}")
         if step_failed is not None:
             msg_list.append(f"    Failure:")

holado_report/report/builders/failure_report_builder.py

@@ -41,16 +41,17 @@ class FailureReportBuilder(ReportBuilder):
         
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        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":
             step_error_message = ReportManager.get_step_error_message(step_failed).strip()
             if step_error_message not in self.__failures:
                 self.__failures[step_error_message] = []
             
+            category_str = f" ({category_validation})" if category_validation else ""
             if self.__file_format == 'txt':
                 msg_list = []
-                msg_list.append(f"scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}")
+                msg_list.append(f"scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}{category_str}")
                 msg_list.append(f"    Feature/Scenario: {scenario.feature.name}  =>  {scenario.name}")
                 msg_list.append(f"    Report: {scenario_report.report_path}")
                 msg_list.append(f"    Tags: -t " + " -t ".join(scenario.feature.tags + scenario.tags))
@@ -59,7 +60,7 @@ class FailureReportBuilder(ReportBuilder):
                 self.__failures[step_error_message].append(msg_scenario)
             elif self.__file_format in ['json', 'xml']:
                 scenario_info = {
-                    'title': f"{scenario.filename} - l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}",
+                    'title': f"{scenario.filename} - l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}{category_str}",
                     'scenario': f"{scenario.feature.name}  =>  {scenario.name}",
                     'report': scenario_report.report_path,
                     'tags': "-t " + " -t ".join(scenario.feature.tags + scenario.tags),

holado_report/report/builders/short_scenario_failed_report_builder.py

@@ -32,10 +32,10 @@ class ShortScenarioFailedReportBuilder(ReportBuilder):
         
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        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":
-            self.__file_fail_add_scenario(scenario, scenario_report, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario(scenario, scenario_report, category_validation, status_validation, step_failed, step_number)
             
     def after_all(self):
         # Manage file fail
@@ -43,16 +43,17 @@ class ShortScenarioFailedReportBuilder(ReportBuilder):
             self.__file_fail.close()
             self.__file_fail = None
         
-    def __file_fail_add_scenario(self, scenario, scenario_report, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario(self, scenario, scenario_report, category_validation, status_validation, step_failed, step_number):
         from holado_report.report.report_manager import ReportManager
         
         self.__open_file_if_needed()
         
         msg_list = []
+        category_str = f" ({category_validation})" if category_validation else ""
         if step_failed is not None:
-            msg_list.append(f"scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}")
+            msg_list.append(f"scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}{category_str}")
         else:
-            msg_list.append(f"scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?) - {status_validation}")
+            msg_list.append(f"scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?) - {status_validation}{category_str}")
         msg_list.append(f"    Feature/Scenario: {scenario.feature.name}  =>  {scenario.name}")
         msg_list.append(f"    Report: {scenario_report.report_path}")
         msg_list.append(f"    Tags: -t " + " -t ".join(scenario.feature.tags + scenario.tags))

holado_report/report/builders/summary_report_builder.py

@@ -63,7 +63,7 @@ class SummaryReportBuilder(ReportBuilder):
         
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        status_name, _, _ = ReportManager.get_current_scenario_status_information(scenario)
+        _, status_name, _, _ = ReportManager.get_current_scenario_status_information(scenario)
         
         if status_name not in self.__scenarios:
             self.__scenarios[status_name] = 0

holado_report/report/builders/summary_scenario_failed_report_builder.py

@@ -31,10 +31,10 @@ class SummaryScenarioFailedReportBuilder(ReportBuilder):
         
     def after_scenario(self, scenario, scenario_report=None):
         from holado_report.report.report_manager import ReportManager
-        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":
-            self.__file_fail_add_scenario(scenario, status_validation, step_failed, step_number)
+            self.__file_fail_add_scenario(scenario, category_validation, status_validation, step_failed, step_number)
             
     def after_all(self):
         # Manage file fail
@@ -42,12 +42,13 @@ class SummaryScenarioFailedReportBuilder(ReportBuilder):
             self.__file_fail.close()
             self.__file_fail = None
         
-    def __file_fail_add_scenario(self, scenario, status_validation, step_failed, step_number):
+    def __file_fail_add_scenario(self, scenario, category_validation, status_validation, step_failed, step_number):
         self.__open_file_if_needed()
+        category_str = f" ({category_validation})" if category_validation else ""
         if step_failed is not None:
-            self.__file_fail.write(f"scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}\n")
+            self.__file_fail.write(f"scenario in {scenario.filename} at l.{scenario.line} - step {step_number} (l.{step_failed.line}) - {status_validation}{category_str}\n")
         else:
-            self.__file_fail.write(f"scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?) - {status_validation}\n")
+            self.__file_fail.write(f"scenario in {scenario.filename} at l.{scenario.line} - step ? (missing step implementation ?) - {status_validation}{category_str}\n")
         self.__file_fail.flush()
     
     def __open_file_if_needed(self):