hydra-structlog 0.2.0__tar.gz → 1.0.0__tar.gz

{hydra_structlog-0.2.0 → hydra_structlog-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydra-structlog
-Version: 0.2.0
+Version: 1.0.0
 Summary: An opinionated hydra plugin to configure logging with structlog
 Keywords: hydra,structlog,plugin,hydra-zen
 Author: Sören Zapp

{hydra_structlog-0.2.0 → hydra_structlog-1.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hydra-structlog"
-version = "0.2.0"
+version = "1.0.0"
 description = "An opinionated hydra plugin to configure logging with structlog"
 readme = "README.md"
 authors = [
@@ -42,6 +42,7 @@ dev = [
     "nox>=2026.2.9",
 ]
 tests = [
+    "dirty-equals>=0.11",
     "pytest>=9.0.2",
     "pytest-cov>=7.1.0",
     "pytest-randomly>=4.0.1",

hydra_structlog-1.0.0/src/hydra_structlog/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.0"

{hydra_structlog-0.2.0 → hydra_structlog-1.0.0}/src/hydra_structlog/conf/hydra/job_logging/structlog.yaml

@@ -107,6 +107,6 @@ handlers:
 
 root:
   level: INFO
-  handlers: [console, file, json]
+  handlers: ${hydra-structlog.dev:[console, file, json],[file, json]}
 
 disable_existing_loggers: false

{hydra_structlog-0.2.0 → hydra_structlog-1.0.0}/src/hydra_structlog/handlers.py

@@ -1,16 +1,16 @@
 import logging
 from typing import Any, TextIO
 
-try:
+try:  # pragma: no cover
     from tqdm.std import tqdm as std_tqdm  # type: ignore[ty:unresolved-import]
 
     TqdmClass = type[std_tqdm]
-except ImportError:
+except ImportError:  # pragma: no cover
     std_tqdm: Any = None
     TqdmClass = None
 
 
-class TqdmStreamHandler(logging.StreamHandler):
+class TqdmStreamHandler(logging.StreamHandler):  # pragma: no cover
     """Handler inheriting from StreamHandler to route logging stream through tqdm."""
 
     def __init__(
@@ -30,5 +30,5 @@ class TqdmStreamHandler(logging.StreamHandler):
                 self.flush()
             except (KeyboardInterrupt, RecursionError, SystemExit):
                 raise
-            except Exception:
+            except Exception:  # noqa: BLE001
                 self.handleError(record)

{hydra_structlog-0.2.0 → hydra_structlog-1.0.0}/src/hydra_structlog/init.py

@@ -14,6 +14,21 @@ _excepthook = None
 _configured_once = False
 
 
+def _module_from_filename(filename: str) -> str | None:
+    """Obtain the module name from filename through call stack."""
+    frame = sys._getframe(1)
+    while frame is not None:
+        if frame.f_code.co_filename == filename:
+            return frame.f_globals.get("__name__")
+        frame = frame.f_back
+
+    # Fallback: Module from sys.modules
+    for name, mod in list(sys.modules.items()):
+        if getattr(mod, "__file__", None) == filename:
+            return name
+    return None
+
+
 def warning_logger(
     message: Warning | str,
     category: type[Warning],
@@ -23,10 +38,20 @@ def warning_logger(
     line: str | None = None,
 ) -> None:
     """Emit Python-native warnings as logging warnings."""
-    frame = sys._getframe(2)
-    module = frame.f_globals.get("__name__")
+    module = _module_from_filename(filename)
     logger = logging.getLogger(module)
-    logger.warning("%s: %s", category.__name__, f"{message} (line {lineno})")
+    if not logger.isEnabledFor(logging.WARNING):
+        return  # pragma: no cover
+    record = logger.makeRecord(
+        logger.name,
+        logging.WARNING,
+        filename,
+        lineno,
+        "%s: %s (line %d)",
+        (category.__name__, message, lineno),
+        None,
+    )
+    logger.handle(record)
 
 
 def exception_logger(
@@ -56,7 +81,7 @@ def exception_logger(
             filename = frame.f_code.co_filename.replace(os.sep, "/")
             if filename.endswith(skip_files) and tb:
                 exc_traceback = tb
-    except Exception:
+    except Exception:  # pragma: no cover  # noqa: BLE001, S110
         pass
 
     message = getattr(exc_value, "message", str(exc_value))
@@ -64,7 +89,9 @@ def exception_logger(
     logger.critical(message, exc_info=exc_info)
 
 
-def init_plugin(foreign_pre_chain: Sequence[structlog.typing.Processor]) -> None:
+def init_plugin(
+    foreign_pre_chain: Sequence[structlog.typing.Processor],
+) -> None:  # pragma: no cover
     """Configure structlog and warning and exception hooks."""
     global _excepthook, _showwarning, _configured_once
 

{hydra_structlog-0.2.0 → hydra_structlog-1.0.0}/src/hydra_structlog/plugin.py

@@ -1,7 +1,11 @@
 from hydra.core.config_search_path import ConfigSearchPath
 from hydra.plugins.search_path_plugin import SearchPathPlugin
+from omegaconf import OmegaConf
+
+from .resolvers import dev_switch
 
 
 class HydraStructlogSearchPathPlugin(SearchPathPlugin):
     def manipulate_search_path(self, search_path: ConfigSearchPath) -> None:
+        OmegaConf.register_new_resolver("hydra-structlog.dev", dev_switch)
         search_path.append("hydra-structlog", "pkg://hydra_structlog.conf")

hydra_structlog-1.0.0/src/hydra_structlog/resolvers.py

@@ -0,0 +1,9 @@
+import os
+
+
+def dev_switch(is_dev, is_not_dev, *, _root_):
+    """OmegaConf resolver to select node based on dev environment."""
+    # Grab ENV from 'env_set' first and fall back to environment variable
+    hydra_env = _root_.get("hydra", {}).get("job", {}).get("env_set", {})
+    ENV = hydra_env.get("ENV", os.environ.get("ENV")) or "dev"
+    return is_dev if ENV == "dev" else is_not_dev

hydra_structlog-0.2.0/src/hydra_structlog/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.0"