libsh 0.0.0__tar.gz → 0.2.0__tar.gz

libsh-0.2.0/PKG-INFO

@@ -0,0 +1,13 @@
+Metadata-Version: 2.3
+Name: libsh
+Version: 0.2.0
+Summary: Scott Hyndman's reusable common package for Python projects. Provides opinionated structured logging with custom rendering (24-bit colors, relative timestamps, compact levels) and type-safe value formatting utilities (time units, ranges, pretty-printing).
+Author: shyndman
+Author-email: shyndman <scotty.hyndman@gmail.com>
+Requires-Dist: numpy
+Requires-Dist: pydantic>=2
+Requires-Dist: rich>=14
+Requires-Dist: structlog>=25
+Requires-Python: >=3.12
+Project-URL: Bug Tracker, https://github.com/shyndman/libsh-python/issues
+Project-URL: repository, https://github.com/shyndman/libsh-python

{libsh-0.0.0 → libsh-0.2.0}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "libsh"
-version = "0.0.0"
-description = "Add your description here"
+version = "0.2.0"
+description = "Scott Hyndman's reusable common package for Python projects. Provides opinionated structured logging with custom rendering (24-bit colors, relative timestamps, compact levels) and type-safe value formatting utilities (time units, ranges, pretty-printing)."
 authors = [{name = "shyndman", email = "scotty.hyndman@gmail.com"}]
 requires-python = ">=3.12"
-dependencies = ["numpy<2", "pydantic>=2", "rich>=14.1.0", "structlog>=25.4.0"]
+dependencies = ["numpy", "pydantic>=2", "rich>=14", "structlog>=25"]
 
 [build-system]
 requires = ["uv_build>=0.9.5,<0.10.0"]

{libsh-0.0.0 → libsh-0.2.0}/src/libsh/logs.py

@@ -133,12 +133,7 @@ def _relative_time_processor(
   _logger: structlog.stdlib.BoundLogger, _method_name: str, event_dict: EventDict
 ) -> EventDict:
   """Add relative timestamp since program start with hours:minutes:seconds.milliseconds format."""
-  elapsed = time.time() - _PROGRAM_START_TIME
-
-  # Calculate hours, minutes, seconds
-  hours = int(elapsed // 3600)
-  minutes = int((elapsed % 3600) // 60)
-  seconds = elapsed % 60
+  hours, minutes, seconds = _relative_time_parts()
 
   # ANSI color codes: \x1b[2m for dim/gray, \x1b[90m for darker gray, \x1b[0m to reset
   gray = "\x1b[2m"  # Normal gray (like original timestamp)
@@ -163,6 +158,30 @@ def _relative_time_processor(
   return event_dict
 
 
+def _relative_time_processor_plain(
+  _logger: structlog.stdlib.BoundLogger, _method_name: str, event_dict: EventDict
+) -> EventDict:
+  """Add relative timestamp without ANSI styling for machine-consumable outputs."""
+  hours, minutes, seconds = _relative_time_parts()
+
+  separator = ":"
+  hours_str = f"{hours:02d}{separator}" if hours != 0 else ""
+  minutes_str = f"{minutes:02d}{separator}" if minutes != 0 and hours != 0 else ""
+  seconds_str = f"{seconds:06.3f}"
+
+  event_dict["timestamp"] = f"+{hours_str}{minutes_str}{seconds_str}"
+  return event_dict
+
+
+def _relative_time_parts() -> tuple[int, int, float]:
+  """Return elapsed (hours, minutes, seconds) since program start."""
+  elapsed = time.time() - _PROGRAM_START_TIME
+  hours = int(elapsed // 3600)
+  minutes = int((elapsed % 3600) // 60)
+  seconds = elapsed % 60
+  return hours, minutes, seconds
+
+
 def _compact_level_processor(
   _logger: structlog.stdlib.BoundLogger, _method_name: str, event_dict: EventDict
 ) -> EventDict:
@@ -238,25 +257,42 @@ def setup_logging(
     filters += [LoggerFilterProcessor(filter_to_logger)]
 
   # Configure processors
-  shared_processors: list[Processor] = [
-    structlog.stdlib.add_logger_name,
-    structlog.stdlib.add_log_level,
-    *filters,
-    _debug_event_colorer,  # Run before level processing
-    _compact_level_processor,
-    structlog.stdlib.PositionalArgumentsFormatter(),
-    structlog.stdlib.ExtraAdder(),
-    FloatPrecisionProcessor(digits=3),
-    _relative_time_processor,
-    structlog.processors.StackInfoRenderer(),
-    # structlog.processors.format_exc_info,
-  ]
+  processors: list[Processor] = []
 
   # Add correlation ID if provided
   if correlation_id:
-    shared_processors.insert(0, structlog.contextvars.merge_contextvars)
+    processors.append(structlog.contextvars.merge_contextvars)
     structlog.contextvars.bind_contextvars(correlation_id=correlation_id)
 
+  # Level filtering should happen before any expensive processors run
+  processors.extend(filters)
+
+  processors += [
+    structlog.stdlib.add_logger_name,
+    structlog.stdlib.add_log_level,
+  ]
+
+  if json_output:
+    processors += [
+      structlog.stdlib.PositionalArgumentsFormatter(),
+      structlog.stdlib.ExtraAdder(),
+      FloatPrecisionProcessor(digits=3),
+      _relative_time_processor_plain,
+      structlog.processors.StackInfoRenderer(),
+      # structlog.processors.format_exc_info,
+    ]
+  else:
+    processors += [
+      _debug_event_colorer,  # Run before level processing
+      _compact_level_processor,
+      structlog.stdlib.PositionalArgumentsFormatter(),
+      structlog.stdlib.ExtraAdder(),
+      FloatPrecisionProcessor(digits=3),
+      _relative_time_processor,
+      structlog.processors.StackInfoRenderer(),
+      # structlog.processors.format_exc_info,
+    ]
+
   # Configure output format
   if json_output:
     log_renderer = structlog.processors.JSONRenderer()
@@ -283,7 +319,7 @@ def setup_logging(
             value_style_map=[
               (
                 # Integers (including negative) get bright green styling
-                r"^True|False$",
+                r"^(True|False)$",
                 hex_to_ansi_fg(0x6E6A86),
               ),
               (
@@ -340,16 +376,19 @@ def setup_logging(
       ],
     )
 
+  # Omit level filters when processing stdlib log records to avoid double filtering
+  formatter_pre_chain: list[Processor] = [proc for proc in processors if proc not in filters]
+
   # Configure structlog
   structlog.configure(
-    processors=shared_processors + [structlog.stdlib.ProcessorFormatter.wrap_for_formatter],
+    processors=processors + [structlog.stdlib.ProcessorFormatter.wrap_for_formatter],
     wrapper_class=structlog.stdlib.BoundLogger,
     logger_factory=structlog.stdlib.LoggerFactory(),
     cache_logger_on_first_use=True,
   )
 
   formatter = structlog.stdlib.ProcessorFormatter(
-    foreign_pre_chain=shared_processors,
+    foreign_pre_chain=formatter_pre_chain,
     processors=[
       structlog.stdlib.ProcessorFormatter.remove_processors_meta,
       log_renderer,

libsh-0.0.0/PKG-INFO

@@ -1,13 +0,0 @@
-Metadata-Version: 2.3
-Name: libsh
-Version: 0.0.0
-Summary: Add your description here
-Author: shyndman
-Author-email: shyndman <scotty.hyndman@gmail.com>
-Requires-Dist: numpy<2
-Requires-Dist: pydantic>=2
-Requires-Dist: rich>=14.1.0
-Requires-Dist: structlog>=25.4.0
-Requires-Python: >=3.12
-Project-URL: Bug Tracker, https://github.com/shyndman/libsh-python/issues
-Project-URL: repository, https://github.com/shyndman/libsh-python