fluidattacks_utils_logger 3.0.0__tar.gz → 3.0.4__tar.gz

{fluidattacks_utils_logger-3.0.0 → fluidattacks_utils_logger-3.0.4}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: fluidattacks_utils_logger
-Version: 3.0.0
+Version: 3.0.4
 Summary: Common logger handlers
 Author-email: Product Team <development@fluidattacks.com>
 Requires-Python: >=3.11
 Classifier: License :: OSI Approved :: MIT License
-Requires-Dist: fluidattacks-core >=4.0.0, <5.0.0
+Requires-Dist: fluidattacks-core >=9.0.0, <10.0.0
 Requires-Dist: fa-purity >=2.5.2, <3.0.0
+Requires-Dist: python-json-logger >=3.3.0, <5.0.0

{fluidattacks_utils_logger-3.0.0 → fluidattacks_utils_logger-3.0.4}/build/default.nix

@@ -1,7 +1,9 @@
-{ nixpkgs, builders, scripts, src, }: {
+{ src }:
+{
   inherit src;
   root_path = "observes/common/utils-logger";
   module_name = "fluidattacks_utils_logger";
-  pypi_token_var = "UTILS_LOGGER_TOKEN";
-  override = b: b;
+  pypi_token = {
+    method = "oidc";
+  };
 }

{fluidattacks_utils_logger-3.0.0 → fluidattacks_utils_logger-3.0.4}/flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1754487366,
-        "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
+        "lastModified": 1762810396,
+        "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
+        "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923",
         "type": "github"
       },
       "original": {
@@ -20,26 +20,11 @@
     },
     "nix_filter": {
       "locked": {
-        "lastModified": 1731533336,
-        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
+        "lastModified": 1757882181,
+        "narHash": "sha256-+cCxYIh2UNalTz364p+QYmWHs0P+6wDhiWR4jDIKQIU=",
         "owner": "numtide",
         "repo": "nix-filter",
-        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "type": "github"
-      }
-    },
-    "nix_filter_2": {
-      "locked": {
-        "lastModified": 1731533336,
-        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
+        "rev": "59c44d1909c72441144b93cf0f054be7fe764de5",
         "type": "github"
       },
       "original": {
@@ -50,26 +35,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736441877,
-        "narHash": "sha256-m3+PhBFkDwqo9lBplG4AyMW8P4/KcioJRS1UG8N7okM=",
+        "lastModified": 1758690382,
+        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ce3899414dab3297cf025bfa356dc2da426feefd",
+        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1753579242,
-        "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=",
+        "lastModified": 1761765539,
+        "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e",
+        "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",
         "type": "github"
       },
       "original": {
@@ -95,22 +81,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1758690382,
-        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1761373498,
         "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
@@ -128,11 +98,11 @@
     },
     "nixpkgs_flake": {
       "locked": {
-        "lastModified": 1756313514,
-        "narHash": "sha256-3Xbak0pXR8ziNv1ghHyJ5a5Ti2kt/LWq6hKZVJTvjBs=",
+        "lastModified": 1778253243,
+        "narHash": "sha256-KkH2QvU6iRLDTGGEwH5jnMqHWj4zMTuHxi1S1zdr01w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "181464235b2daff8725773fef43ffc9d6b02e1c2",
+        "rev": "4fcda7103530b23c5ca44286344912082aad4220",
         "type": "github"
       },
       "original": {
@@ -141,56 +111,9 @@
         "type": "github"
       }
     },
-    "observes_flake_builder": {
-      "inputs": {
-        "nix_filter": "nix_filter",
-        "nixpkgs_flake": "nixpkgs_flake",
-        "pynix_flake": "pynix_flake",
-        "pyproject-build-systems": "pyproject-build-systems",
-        "pyproject-nix": "pyproject-nix_2",
-        "shell-helpers": "shell-helpers",
-        "uv2nix": "uv2nix_2"
-      },
-      "locked": {
-        "dir": "observes/common/std_flake_2",
-        "lastModified": 1761684858,
-        "narHash": "sha256-gybMRO/MSOPXQjI//u2UKfvs8pD0sACqL2Kjp+xR4rI=",
-        "ref": "refs/heads/trunk",
-        "rev": "c5053864bb838edbe226d74a650d901c0270843b",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@gitlab.com/fluidattacks/universe"
-      },
-      "original": {
-        "dir": "observes/common/std_flake_2",
-        "rev": "c5053864bb838edbe226d74a650d901c0270843b",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@gitlab.com/fluidattacks/universe"
-      }
-    },
-    "pynix_flake": {
-      "inputs": {
-        "nix_filter": "nix_filter_2",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1758642502,
-        "narHash": "sha256-PD/bQMz2dqZSkydHyvRh+jS/0qoV8SdcIVs6sassteQ=",
-        "owner": "dmurciaatfluid",
-        "repo": "python_nix_builder",
-        "rev": "809aafe2e1995e72c15378d099bf251b78f04a20",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "dmurciaatfluid",
-        "repo": "python_nix_builder",
-        "type": "gitlab"
-      }
-    },
     "pyproject-build-systems": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "pyproject-nix": "pyproject-nix",
         "uv2nix": "uv2nix"
       },
@@ -211,7 +134,7 @@
     "pyproject-nix": {
       "inputs": {
         "nixpkgs": [
-          "observes_flake_builder",
+          "python_builder",
           "pyproject-build-systems",
           "nixpkgs"
         ]
@@ -232,7 +155,7 @@
     },
     "pyproject-nix_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1762427963,
@@ -251,7 +174,7 @@
     "pyproject-nix_3": {
       "inputs": {
         "nixpkgs": [
-          "observes_flake_builder",
+          "python_builder",
           "uv2nix",
           "nixpkgs"
         ]
@@ -270,45 +193,73 @@
         "type": "github"
       }
     },
+    "python_builder": {
+      "inputs": {
+        "nix_filter": "nix_filter",
+        "nixpkgs_flake": "nixpkgs_flake",
+        "pyproject-build-systems": "pyproject-build-systems",
+        "pyproject-nix": "pyproject-nix_2",
+        "shell-helpers": "shell-helpers",
+        "uv2nix": "uv2nix_2"
+      },
+      "locked": {
+        "dir": "common/utils/python-builder",
+        "lastModified": 1785790367,
+        "narHash": "sha256-Br5oTB6LNGANZMUecvZhlXpA0k0wb0EKmOqyQeYCe7A=",
+        "ref": "refs/heads/trunk",
+        "rev": "f66f38301987775ceb39ee72388ef0885ef30d13",
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@gitlab.com/fluidattacks/universe"
+      },
+      "original": {
+        "dir": "common/utils/python-builder",
+        "rev": "f66f38301987775ceb39ee72388ef0885ef30d13",
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@gitlab.com/fluidattacks/universe"
+      }
+    },
     "root": {
       "inputs": {
-        "observes_flake_builder": "observes_flake_builder"
+        "python_builder": "python_builder"
       }
     },
     "shell-helpers": {
       "inputs": {
         "flake-parts": "flake-parts",
         "nixpkgs": [
-          "observes_flake_builder",
+          "python_builder",
           "nixpkgs_flake"
         ]
       },
       "locked": {
         "dir": "common/utils/shell-helpers",
-        "lastModified": 1752896460,
-        "narHash": "sha256-AsyTatXMx839cGsF6knwTrDZHk3Eue2QD3eSP7bkmpg=",
-        "owner": "fluidattacks",
-        "repo": "universe",
-        "rev": "27749d2c3a2b018eb010a322e5e1352f993c9e86",
-        "type": "github"
+        "lastModified": 1762806066,
+        "narHash": "sha256-Wz99Fl7SpPU1NkTHJ36XOo6DjOEAMXCw3ThRABOS2Hs=",
+        "ref": "refs/heads/trunk",
+        "rev": "d73cfdc7ae9e7f547e22a4481d4c2ccce38b26a8",
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@gitlab.com/fluidattacks/universe"
       },
       "original": {
         "dir": "common/utils/shell-helpers",
-        "owner": "fluidattacks",
-        "repo": "universe",
-        "rev": "27749d2c3a2b018eb010a322e5e1352f993c9e86",
-        "type": "github"
+        "rev": "d73cfdc7ae9e7f547e22a4481d4c2ccce38b26a8",
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@gitlab.com/fluidattacks/universe"
       }
     },
     "uv2nix": {
       "inputs": {
         "nixpkgs": [
-          "observes_flake_builder",
+          "python_builder",
           "pyproject-build-systems",
           "nixpkgs"
         ],
         "pyproject-nix": [
-          "observes_flake_builder",
+          "python_builder",
           "pyproject-build-systems",
           "pyproject-nix"
         ]
@@ -329,7 +280,7 @@
     },
     "uv2nix_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "pyproject-nix": "pyproject-nix_3"
       },
       "locked": {

fluidattacks_utils_logger-3.0.4/flake.nix

@@ -0,0 +1,28 @@
+{
+  description = "Log utils for observes packages";
+
+  inputs = {
+    python_builder = {
+      url = "git+ssh://git@gitlab.com/fluidattacks/universe?shallow=1&rev=f66f38301987775ceb39ee72388ef0885ef30d13&dir=common/utils/python-builder";
+    };
+  };
+
+  outputs =
+    { self, ... }@inputs:
+    let
+      build_args =
+        {
+          system,
+          python_version,
+          nixpkgs,
+          builders,
+          scripts,
+        }:
+        import ./build {
+          src = import ./build/filter.nix nixpkgs.nix-filter self;
+        };
+    in
+    {
+      packages = inputs.python_builder.outputs.build build_args;
+    };
+}

{fluidattacks_utils_logger-3.0.0 → fluidattacks_utils_logger-3.0.4}/fluidattacks_utils_logger/__init__.py

@@ -15,7 +15,7 @@ from .levels import (
     LoggingLvl,
 )
 
-__version__ = "3.0.0"
+__version__ = "3.0.4"
 
 
 def set_main_log(

{fluidattacks_utils_logger-3.0.0 → fluidattacks_utils_logger-3.0.4}/fluidattacks_utils_logger/env.py

@@ -19,7 +19,7 @@ def current_app_env() -> Cmd[Envs]:
     def _action() -> Envs:
         return Envs(environ.get("OBSERVES_ENV", "production"))
 
-    return Cmd.wrap_impure(_action)
+    return Cmd[Envs].wrap_impure(_action)
 
 
 def observes_debug() -> Cmd[bool]:
@@ -27,4 +27,4 @@ def observes_debug() -> Cmd[bool]:
         _debug = environ.get("OBSERVES_DEBUG", "")
         return _debug.lower() == "true"
 
-    return Cmd.wrap_impure(_action)
+    return Cmd[bool].wrap_impure(_action)

{fluidattacks_utils_logger-3.0.0 → fluidattacks_utils_logger-3.0.4}/fluidattacks_utils_logger/handlers.py

@@ -50,7 +50,7 @@ def logger_handler_with_env(
         handler.setFormatter(formatter)
         return handler
 
-    return Cmd.wrap_impure(_action)
+    return Cmd[Handler].wrap_impure(_action)
 
 
 def logger_handler(conf: LoggingConf, target: IO[str]) -> Cmd[Handler]:

{fluidattacks_utils_logger-3.0.0 → fluidattacks_utils_logger-3.0.4}/fluidattacks_utils_logger/logger.py

@@ -24,16 +24,16 @@ class Logger:
     _inner: _Logger
 
     def critical(self, formatted_msg: str, values: FrozenList[str]) -> Cmd[None]:
-        return Cmd.wrap_impure(lambda: self._inner.logger.critical(formatted_msg, *values))
+        return Cmd[None].wrap_impure(lambda: self._inner.logger.critical(formatted_msg, *values))
 
     def debug(self, formatted_msg: str, values: FrozenList[str]) -> Cmd[None]:
-        return Cmd.wrap_impure(lambda: self._inner.logger.debug(formatted_msg, *values))
+        return Cmd[None].wrap_impure(lambda: self._inner.logger.debug(formatted_msg, *values))
 
     def info(self, formatted_msg: str, values: FrozenList[str]) -> Cmd[None]:
-        return Cmd.wrap_impure(lambda: self._inner.logger.info(formatted_msg, *values))
+        return Cmd[None].wrap_impure(lambda: self._inner.logger.info(formatted_msg, *values))
 
     def warning(self, formatted_msg: str, values: FrozenList[str]) -> Cmd[None]:
-        return Cmd.wrap_impure(lambda: self._inner.logger.warning(formatted_msg, *values))
+        return Cmd[None].wrap_impure(lambda: self._inner.logger.warning(formatted_msg, *values))
 
 
 def get_logger(name: str) -> Cmd[Logger]:
@@ -41,7 +41,7 @@ def get_logger(name: str) -> Cmd[Logger]:
         log = _Logger(logging.getLogger(name))
         return Logger(log)
 
-    return Cmd.wrap_impure(_action)
+    return Cmd[Logger].wrap_impure(_action)
 
 
 def set_logger(name: str, lvl: LoggingLvl, handlers: FrozenList[Cmd[logging.Handler]]) -> Cmd[None]:
@@ -51,4 +51,4 @@ def set_logger(name: str, lvl: LoggingLvl, handlers: FrozenList[Cmd[logging.Hand
         for item in handlers:
             log.addHandler(unwrapper.act(item))
 
-    return Cmd.new_cmd(_action)
+    return Cmd[None].new_cmd(_action)

{fluidattacks_utils_logger-3.0.0 → fluidattacks_utils_logger-3.0.4}/pyproject.toml

@@ -4,8 +4,9 @@ authors = [{ name = "Product Team", email = "development@fluidattacks.com" }]
 classifiers = ["License :: OSI Approved :: MIT License"]
 requires-python = ">=3.11"
 dependencies = [
-    "fluidattacks-core >=4.0.0, <5.0.0",
+    "fluidattacks-core >=9.0.0, <10.0.0",
     "fa-purity >=2.5.2, <3.0.0",
+    "python-json-logger >=3.3.0, <5.0.0",
 ]
 description = "Common logger handlers"
 dynamic = ["version"]
@@ -17,8 +18,13 @@ build-backend = "flit_core.buildapi"
 [dependency-groups]
 dev = [
     "arch-lint >=5.0.0, <6.0.0",
+    "basedpyright>=1.39.8",
     "mypy >=1.18.2, <2.0.0",
-    "pytest >=8.4.2, <9.0.0",
+    "pytest >=9.0.3, <10.0.0",
     "pytest-cov >=7.0.0, <8.0.0",
     "ruff >=0.14.1, <1.0.0",
 ]
+
+[tool.uv]
+exclude-newer = "7 days"
+exclude-newer-package = { fluidattacks-core = "2099-01-02T00:00:00Z", fluid-blends = "2099-01-02T00:00:00Z" }

{fluidattacks_utils_logger-3.0.0 → fluidattacks_utils_logger-3.0.4}/ruff.toml

@@ -4,23 +4,26 @@ indent-width = 4
 target-version = "py311"
 
 [lint]
+preview = true
+explicit-preview-rules = true
 select = ["ALL"]
+extend-select = ["PLR1702", "PLR0916"]
 ignore = [
   "FBT001", # debatable
-  "FBT003",  # conflict with the convention of denying kwargs
+  "FBT003", # conflict with the convention of denying kwargs
   "RET503", # raises false positives
-  "N818", # semantics on names, the type already has the semantics
+  "N818",   # semantics on names, the type already has the semantics
   "TC001",  # import cycles can be hidden
   "TC002",  # import cycles can be hidden
   "TC003",  # technical debt!
   "FLY002", # f-string is not type safe: implicit str conversion can hide codification issues
-  "D203",  # conflict with D211 one must be ignored
-  "D212",  # conflict with D213 one must be ignored
-  "D104",  # missing docs; technical debt!
-  "D103",  # missing docs; technical debt!
-  "D102",  # missing docs; technical debt!
-  "D101",  # missing docs; technical debt!
-  "D100",  # missing docs; technical debt!
+  "D203",   # conflict with D211 one must be ignored
+  "D212",   # conflict with D213 one must be ignored
+  "D104",   # missing docs; technical debt!
+  "D103",   # missing docs; technical debt!
+  "D102",   # missing docs; technical debt!
+  "D101",   # missing docs; technical debt!
+  "D100",   # missing docs; technical debt!
 ]
 fixable = ["ALL"]
 unfixable = []
@@ -35,3 +38,12 @@ quote-style = "double"
 indent-style = "space"
 skip-magic-trailing-comma = false
 line-ending = "lf"
+
+[lint.mccabe]
+max-complexity = 8
+
+[lint.pylint]
+max-branches = 8
+max-nested-blocks = 4
+max-statements = 25
+max-bool-expr = 5

{fluidattacks_utils_logger-3.0.0 → fluidattacks_utils_logger-3.0.4}/tests/arch/test_arch.py

@@ -20,7 +20,7 @@ root = "fluidattacks_utils_logger"
 
 
 def test_dag_creation() -> None:
-    project_dag()
+    _ = project_dag()
 
 
 def test_dag_completeness() -> None:
@@ -29,7 +29,7 @@ def test_dag_completeness() -> None:
 
 
 def test_forbidden_creation() -> None:
-    forbidden_allowlist()
+    _ = forbidden_allowlist()
 
 
 def test_forbidden() -> None:

{fluidattacks_utils_logger-3.0.0 → fluidattacks_utils_logger-3.0.4}/tests/test_logger.py

@@ -36,7 +36,11 @@ def test_json_formatter_in_production() -> None:
 
         output_content = output_stream.getvalue()
         try:
-            formatted_output: dict[str, str] = json.loads(output_content.strip())
+            # json.loads returns Any; the shape is asserted below, not
+            # statically checkable.
+            formatted_output: dict[str, str] = json.loads(  # pyright: ignore[reportAny]
+                output_content.strip(),
+            )
             assert "ddsource" in formatted_output
             assert "dd.service" in formatted_output
             assert "dd.version" in formatted_output
@@ -46,7 +50,7 @@ def test_json_formatter_in_production() -> None:
         except json.JSONDecodeError as exc:
             raise RuntimeError from exc
 
-        return Cmd.wrap_value(None)
+        return Cmd[None].wrap_value(None)
 
     test_cmd = set_logger(
         name=logger_name,
@@ -84,7 +88,7 @@ def test_colorful_formatter_in_development() -> None:
         assert f"[{logger_name}]" in output_content
         assert test_message in output_content
 
-        return Cmd.wrap_value(None)
+        return Cmd[None].wrap_value(None)
 
     test_cmd = set_logger(
         name=logger_name,