logger-36 2025.26__tar.gz → 2025.28__tar.gz

{logger_36-2025.26 → logger_36-2025.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: logger-36
-Version: 2025.26
+Version: 2025.28
 Summary: Simple logger with a catalog of handlers
 Home-page: https://src.koda.cnrs.fr/eric.debreuve/logger-36/
 Author: Eric Debreuve

{logger_36-2025.26 → logger_36-2025.28}/documentation/wiki/description.asciidoc

@@ -1,4 +1,4 @@
-// Copyright CNRS/Inria/UniCA
+// Copyright CNRS (https://www.cnrs.fr/index.php/en)
 // Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 // SEE COPYRIGHT NOTICE BELOW
 
@@ -59,17 +59,3 @@
 // knowledge of the CeCILL license and that you accept its terms.
 //
 // SEE LICENCE NOTICE: file README-LICENCE-utf8.txt at project source root.
-//
-// This software is being developed by Eric Debreuve, a CNRS employee and
-// member of team Morpheme.
-// Team Morpheme is a joint team between Inria, CNRS, and UniCA.
-// It is hosted by the Centre Inria d'Université Côte d'Azur, Laboratory
-// I3S, and Laboratory iBV.
-//
-// CNRS: https://www.cnrs.fr/index.php/en
-// Inria: https://www.inria.fr/en/
-// UniCA: https://univ-cotedazur.eu/
-// Centre Inria d'Université Côte d'Azur: https://www.inria.fr/en/centre/sophia/
-// I3S: https://www.i3s.unice.fr/en/
-// iBV: http://ibv.unice.fr/
-// Team Morpheme: https://team.inria.fr/morpheme/

{logger_36-2025.26 → logger_36-2025.28}/package/logger_36/catalog/logger/chronos.py

@@ -6,8 +6,8 @@ SEE COPYRIGHT NOTICE BELOW
 
 from datetime import datetime as date_time_t
 
-from logger_36.constant.chronos import FORMATTED_START_DATE_TIME
-from logger_36.constant.record import SHOW_WHEN_ATTR
+from logger_36.constant.chronos import FORMATTED_START_DATE_TIME, START_DATE_TIME
+from logger_36.constant.record import SHOW_WHEN_ATTR, SHOW_WHERE_ATTR
 from logger_36.instance.logger import L
 from logger_36.task.measure.chronos import FormattedElapsedTime
 from logger_36.type.logger import logger_t
@@ -15,11 +15,35 @@ from logger_36.type.logger import logger_t
 
 def LogElapsedTime(*, logger: logger_t = L) -> None:
     """"""
-    logger.info(
-        f"Elapsed Time: {FormattedElapsedTime(date_time_t.now())[1:]} "
-        f"(since {FORMATTED_START_DATE_TIME})",
-        extra={SHOW_WHEN_ATTR: False},
+    now = date_time_t.now()
+
+    message = (
+        f"Elapsed Time: {FormattedElapsedTime(now, with_separator=False)} "
+        f"(since {FORMATTED_START_DATE_TIME})"
     )
+    if logger.intermediate_times.__len__() > 0:
+        intermediate_e_times = []
+        for (start_name, start_time), (end_name, end_time) in zip(
+            [("START", START_DATE_TIME)] + logger.intermediate_times,
+            logger.intermediate_times + [("END", now)],
+            strict=True,
+        ):
+            intermediate_e_times.append(
+                (
+                    f"{start_name} → {end_name}",
+                    FormattedElapsedTime(
+                        end_time, reference=start_time, with_separator=False
+                    ),
+                )
+            )
+        max_length = max(map(len, (_[0] for _ in intermediate_e_times)))
+        intermediate_e_times = "\n    ".join(
+            f"{_: <{max_length}} +{__}" for _, __ in intermediate_e_times
+        )
+        message += "\n    " + intermediate_e_times
+        logger.intermediate_times.clear()
+
+    logger.info(message, extra={SHOW_WHEN_ATTR: False, SHOW_WHERE_ATTR: False})
 
 
 """

{logger_36-2025.26 → logger_36-2025.28}/package/logger_36/task/measure/chronos.py

@@ -24,7 +24,11 @@ def TimeStamp(*, precision: str = "microseconds") -> str:
 
 
 def FormattedElapsedTime(
-    now: date_time_t, /, *, reference: date_time_t = START_DATE_TIME
+    now: date_time_t,
+    /,
+    *,
+    reference: date_time_t = START_DATE_TIME,
+    with_separator: bool = True,
 ) -> str:
     """"""
     output = str(now - reference)
@@ -36,7 +40,8 @@ def FormattedElapsedTime(
     if output[0] == "0":
         output = output[1:]
 
-    output = ELAPSED_TIME_SEPARATOR + output
+    if with_separator:
+        output = ELAPSED_TIME_SEPARATOR + output
 
     if output.__len__() > TIME_LENGTH:
         return output[:TIME_LENGTH]

{logger_36-2025.26 → logger_36-2025.28}/package/logger_36/type/logger.py

@@ -9,7 +9,6 @@ import inspect as e
 import logging as l
 import multiprocessing as prll
 import sys as s
-import textwrap as text
 import threading as thrd
 import traceback as tcbk
 import types as t
@@ -41,7 +40,7 @@ from logger_36.constant.chronos import DATE_ORIGIN, DATE_TIME_ORIGIN
 from logger_36.constant.issue import ISSUE_LEVEL_SEPARATOR, ORDER, order_h
 from logger_36.constant.logger import WARNING_LOGGER_NAME, WARNING_TYPE_COMPILED_PATTERN
 from logger_36.constant.memory import UNKNOWN_MEMORY_USAGE
-from logger_36.constant.message import LINE_INDENT, expected_op_h
+from logger_36.constant.message import expected_op_h
 from logger_36.constant.path import USER_FOLDER, LAUNCH_ROOT_FILE_relative
 from logger_36.constant.record import (
     HAS_ACTUAL_EXPECTED_ATTR,
@@ -56,7 +55,6 @@ from logger_36.extension.sentinel import NOT_PASSED
 from logger_36.task.format.message import MessageWithActualExpected
 from logger_36.task.measure.chronos import FormattedElapsedTime
 from logger_36.task.measure.memory import CurrentUsage as CurrentMemoryUsage
-from logger_36.type.handler import extension_t as handler_extension_t
 from logger_36.type.handler import handler_h as base_handler_h
 from logger_36.type.issue import NewIssue, issue_t
 
@@ -94,6 +92,9 @@ class logger_t(base_t):
 
     history: dict[date_time_t, str] = d.field(init=False, default_factory=dict)
     n_events: dict[int, int] = d.field(init=False, default_factory=dict)
+    intermediate_times: list[tuple[str, date_time_t]] = d.field(
+        init=False, default_factory=list
+    )
 
     last_message_now: date_time_t = d.field(init=False, default=DATE_TIME_ORIGIN)
     last_message_date: date_t = d.field(init=False, default=DATE_ORIGIN)
@@ -449,7 +450,7 @@ class logger_t(base_t):
         """
         For a print-like calling for print-based debugging.
         """
-        separator = kwargs.get("separator", " ")
+        separator = kwargs.pop("separator", " ")
 
         frame = e.stack(context=0)[1][0]  # 1=caller.
         details = e.getframeinfo(frame, context=0)
@@ -458,7 +459,10 @@ class logger_t(base_t):
             path = path.relative_to(USER_FOLDER)
         where = f"{str(path.with_suffix(''))}:{details.function}:{details.lineno}"
 
-        self.info(separator.join(map(str, args)) + f"\n{WHERE_SEPARATOR} " + where)
+        self.info(
+            separator.join(map(str, args)) + f"\n{WHERE_SEPARATOR} " + where,
+            extra=kwargs,
+        )
 
     def Log(
         self,
@@ -471,6 +475,7 @@ class logger_t(base_t):
         expected_is_choices: bool = False,
         expected_op: expected_op_h = "=",
         with_final_dot: bool = True,
+        **extra,
     ) -> None:
         """"""
         if isinstance(level, str):
@@ -483,25 +488,12 @@ class logger_t(base_t):
             expected_op=expected_op,
             with_final_dot=with_final_dot,
         )
-        if has_actual_expected:
-            extra = {HAS_ACTUAL_EXPECTED_ATTR: True}
-        else:
-            extra = {}
+        extra[HAS_ACTUAL_EXPECTED_ATTR] = has_actual_expected
         self.log(level, message, extra=extra)
 
-    def LogAsIs(self, message: str, /, *, indented: bool = False) -> None:
+    def LogAsIs(self, message: str, /) -> None:
         """"""
-        if indented:
-            message = text.indent(message, LINE_INDENT)
-
-        emit_message_name = handler_extension_t.EmitMessage.__name__
-        FallbackEmitMessage = print
-        for handler in self.handlers:
-            EmitMessage = getattr(handler, emit_message_name, FallbackEmitMessage)
-            if EmitMessage is not None:
-                EmitMessage(message)
-                if EmitMessage is print:
-                    FallbackEmitMessage = None
+        self.log(l.INFO, message, extra={SHOW_WHEN_ATTR: False, SHOW_WHERE_ATTR: False})
 
     info_raw = LogAsIs  # To follow the convention of the logging methods info, error...
 
@@ -681,9 +673,13 @@ class logger_t(base_t):
                     del extra[HAS_ACTUAL_EXPECTED_ATTR]
         self.staged_issues.clear()
 
+    def SetInstantName(self, name: str, /) -> None:
+        """"""
+        self.intermediate_times.append((name, date_time_t.now()))
+
     def StoragePath(self, suffix: str, /) -> path_t:
         """
-        Use as staticmethod if needed.
+        Use as staticmethod if needed, passing a logger as self.
         """
         for handler in self.handlers:
             if (path := getattr(handler, "baseFilename", None)) is not None:
@@ -712,8 +708,13 @@ class logger_t(base_t):
 
     def __del__(self) -> None:
         """"""
-        if (prll.current_process().name == MAIN_PROCESS_NAME) and (
-            self.log_server is not None
+        for handler in self.handlers:
+            handler.flush()
+
+        if (
+            (prll.current_process is not None)
+            and (prll.current_process().name == MAIN_PROCESS_NAME)
+            and (self.log_server is not None)
         ):
             self.log_server.stop()
 

{logger_36-2025.26 → logger_36-2025.28}/package/logger_36/version.py

@@ -4,7 +4,7 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2023
 SEE COPYRIGHT NOTICE BELOW
 """
 
-__version__ = "2025.26"
+__version__ = "2025.28"
 
 """
 COPYRIGHT NOTICE

{logger_36-2025.26 → logger_36-2025.28}/package/logger_36.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: logger-36
-Version: 2025.26
+Version: 2025.28
 Summary: Simple logger with a catalog of handlers
 Home-page: https://src.koda.cnrs.fr/eric.debreuve/logger-36/
 Author: Eric Debreuve