hydra-structlog 0.2.1__tar.gz → 1.0.1__tar.gz

{hydra_structlog-0.2.1 → hydra_structlog-1.0.1}/PKG-INFO

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

hydra_structlog-1.0.1/pyproject.toml

@@ -0,0 +1,147 @@
+[project]
+name = "hydra-structlog"
+version = "1.0.1"
+description = "An opinionated hydra plugin to configure logging with structlog"
+readme = "README.md"
+keywords = [
+    "hydra",
+    "structlog",
+    "plugin",
+    "hydra-zen",
+]
+license = "MIT"
+license-files = ["LICENSE"]
+classifiers = [
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Intended Audience :: Developers",
+    "Intended Audience :: Information Technology",
+    "Operating System :: OS Independent",
+    "Topic :: Scientific/Engineering",
+]
+requires-python = ">=3.10"
+dependencies = [
+    "hydra-core>=1.3.2",
+    "structlog>=25.5.0",
+]
+
+[[project.authors]]
+name = "Sören Zapp"
+
+[project.urls]
+Source = "https://github.com/szapp/hydra-structlog"
+Issues = "https://github.com/szapp/hydra-structlog/issues"
+Funding = "https://ko-fi.com/szapp"
+
+[dependency-groups]
+dev = [
+    "ruff>=0.15.8",
+    "ty>=0.0.26",
+    "interrogate>=1.7.0",
+    "prek>=0.3.8",
+    "nox>=2026.2.9",
+]
+tests = [
+    "dirty-equals>=0.11",
+    "pytest>=9.0.2",
+    "pytest-cov>=7.1.0",
+    "pytest-randomly>=4.0.1",
+]
+examples = [
+    "hydra-zen>=0.16.0",
+    "pydantic>=2.12.5",
+    "rich>=14.3.3",
+    "tqdm>=4.67.3",
+]
+
+[tool.uv]
+default-groups = [
+    "dev",
+    "tests",
+]
+
+[tool.uv.build-backend]
+module-name = [
+    "hydra_plugins.hydra_structlog",
+    "hydra_structlog",
+]
+
+[tool.ruff]
+line-length = 88
+
+[tool.ruff.lint]
+extend-select = [
+    "I",
+    "E501",
+    "UP006",
+    "UP035",
+    "D200",
+    "D209",
+    "D210",
+    "D212",
+    "D403",
+    "D405",
+    "D416",
+]
+ignore = ["E731"]
+
+[tool.ruff.lint.per-file-ignores]
+"**/tests/**/test_*.py" = ["S101"]
+
+[tool.ruff.format]
+line-ending = "lf"
+
+[[tool.ty.overrides]]
+include = ["src/hydra_structlog/handlers.py"]
+
+[tool.ty.overrides.rules]
+unused-type-ignore-comment = "ignore"
+
+[tool.pytest]
+strict_xfail = true
+addopts = [
+    "-ra",
+    "-vv",
+    "-p",
+    "no:tach",
+    "--strict-markers",
+    "--strict-config",
+    "--doctest-modules",
+    "--cov",
+    "--import-mode=importlib",
+]
+testpaths = [
+    "tests",
+    "src",
+]
+
+[tool.coverage.run]
+source = [
+    "src",
+    "tests",
+]
+branch = true
+
+[tool.coverage.report]
+fail_under = 100
+ignore_errors = true
+show_missing = true
+skip_covered = true
+skip_empty = true
+
+[tool.interrogate]
+omit-covered-files = true
+verbose = 2
+fail-under = 100
+whitelist-regex = ["test_.*"]
+exclude = ["*.cache"]
+style = "google"
+
+[build-system]
+requires = ["uv_build>=0.11.0,<0.12.0"]
+build-backend = "uv_build"

hydra_structlog-0.2.1/pyproject.toml → hydra_structlog-1.0.1/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "hydra-structlog"
-version = "0.2.1"
+version = "1.0.1"
 description = "An opinionated hydra plugin to configure logging with structlog"
 readme = "README.md"
 authors = [

hydra_structlog-1.0.1/src/hydra_structlog/__init__.py

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

{hydra_structlog-0.2.1 → hydra_structlog-1.0.1}/src/hydra_structlog/conf/hydra/job_logging/structlog.yaml

@@ -66,6 +66,7 @@ formatters:
         _target_: hydra_structlog.processors.KeyRenamer
         level: status
         event: message
+        _event: event
       format_exc_info:
         _target_: structlog.processors.format_exc_info
         _partial_: true
@@ -81,6 +82,7 @@ formatters:
         drop_missing: true
       json_renderer:
         _target_: structlog.processors.JSONRenderer
+        ensure_ascii: false
 handlers:
   console:
     class: hydra_structlog.handlers.TqdmStreamHandler
@@ -107,6 +109,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.1 → hydra_structlog-1.0.1}/src/hydra_structlog/handlers.py

@@ -30,5 +30,5 @@ class TqdmStreamHandler(logging.StreamHandler):  # pragma: no cover
                 self.flush()
             except (KeyboardInterrupt, RecursionError, SystemExit):
                 raise
-            except Exception:
+            except Exception:  # noqa: BLE001
                 self.handleError(record)

{hydra_structlog-0.2.1 → hydra_structlog-1.0.1}/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 (line %d)", category.__name__, message, 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:  # pragma: no cover
+    except Exception:  # pragma: no cover  # noqa: BLE001, S110
         pass
 
     message = getattr(exc_value, "message", str(exc_value))

{hydra_structlog-0.2.1 → hydra_structlog-1.0.1}/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.1/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.1/src/hydra_structlog/__init__.py

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