fluidattacks_utils_logger 3.0.2__tar.gz → 3.0.4__tar.gz

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

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: fluidattacks_utils_logger
-Version: 3.0.2
+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 >=8.2.0, <9.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.2 → fluidattacks_utils_logger-3.0.4}/build/default.nix

@@ -1,13 +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.2 → fluidattacks_utils_logger-3.0.4}/flake.lock

@@ -98,11 +98,11 @@
     },
     "nixpkgs_flake": {
       "locked": {
-        "lastModified": 1762812764,
-        "narHash": "sha256-MNqrovkO8AEQeYQK7e3X2GDx2H8vfDIxV4K/VEaIjjo=",
+        "lastModified": 1778253243,
+        "narHash": "sha256-KkH2QvU6iRLDTGGEwH5jnMqHWj4zMTuHxi1S1zdr01w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "400156fe527ab6b54cf6f70cca2c8385548a29c4",
+        "rev": "4fcda7103530b23c5ca44286344912082aad4220",
         "type": "github"
       },
       "original": {
@@ -111,49 +111,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_flake_2": {
-      "locked": {
-        "lastModified": 1761668286,
-        "narHash": "sha256-YN/cm/hbm7pi7lMZCsNhu6jlBUi4wUirrIlyOMpbjKU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1fdb9eb10eff581a40ce2e9511c4ed517eac0c3f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "observes_flake_builder": {
-      "inputs": {
-        "nix_filter": "nix_filter",
-        "nixpkgs_flake": "nixpkgs_flake",
-        "pyproject-build-systems": "pyproject-build-systems",
-        "pyproject-nix": "pyproject-nix_2",
-        "pythonix_flake": "pythonix_flake",
-        "shell-helpers": "shell-helpers",
-        "uv2nix": "uv2nix_2"
-      },
-      "locked": {
-        "dir": "observes/common/std_flake_2",
-        "lastModified": 1770672786,
-        "narHash": "sha256-W4qMpuS/Zg9P/PooFDsqW7EzjF3A+ITsxKbp1SWdARI=",
-        "ref": "refs/heads/trunk",
-        "rev": "ad927cc6545df64a7d622696a43bcee225b9867b",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@gitlab.com/fluidattacks/universe"
-      },
-      "original": {
-        "dir": "observes/common/std_flake_2",
-        "rev": "ad927cc6545df64a7d622696a43bcee225b9867b",
-        "shallow": true,
-        "type": "git",
-        "url": "ssh://git@gitlab.com/fluidattacks/universe"
-      }
-    },
     "pyproject-build-systems": {
       "inputs": {
         "nixpkgs": "nixpkgs",
@@ -177,7 +134,7 @@
     "pyproject-nix": {
       "inputs": {
         "nixpkgs": [
-          "observes_flake_builder",
+          "python_builder",
           "pyproject-build-systems",
           "nixpkgs"
         ]
@@ -217,7 +174,7 @@
     "pyproject-nix_3": {
       "inputs": {
         "nixpkgs": [
-          "observes_flake_builder",
+          "python_builder",
           "uv2nix",
           "nixpkgs"
         ]
@@ -236,23 +193,28 @@
         "type": "github"
       }
     },
-    "pythonix_flake": {
+    "python_builder": {
       "inputs": {
-        "nixpkgs_flake": "nixpkgs_flake_2"
+        "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": "observes/common/pythonix_mirror",
-        "lastModified": 1767370831,
-        "narHash": "sha256-VR86TSrJsNHQq31Ksga+1dvsrkv9u1pKa0MKuKYeIAc=",
+        "dir": "common/utils/python-builder",
+        "lastModified": 1785790367,
+        "narHash": "sha256-Br5oTB6LNGANZMUecvZhlXpA0k0wb0EKmOqyQeYCe7A=",
         "ref": "refs/heads/trunk",
-        "rev": "0678f8ff3bfe02cfe23bc819bfa739c53bd6e4b6",
+        "rev": "f66f38301987775ceb39ee72388ef0885ef30d13",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@gitlab.com/fluidattacks/universe"
       },
       "original": {
-        "dir": "observes/common/pythonix_mirror",
-        "rev": "0678f8ff3bfe02cfe23bc819bfa739c53bd6e4b6",
+        "dir": "common/utils/python-builder",
+        "rev": "f66f38301987775ceb39ee72388ef0885ef30d13",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@gitlab.com/fluidattacks/universe"
@@ -260,14 +222,14 @@
     },
     "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"
         ]
       },
@@ -292,12 +254,12 @@
     "uv2nix": {
       "inputs": {
         "nixpkgs": [
-          "observes_flake_builder",
+          "python_builder",
           "pyproject-build-systems",
           "nixpkgs"
         ],
         "pyproject-nix": [
-          "observes_flake_builder",
+          "python_builder",
           "pyproject-build-systems",
           "pyproject-nix"
         ]

{fluidattacks_utils_logger-3.0.2 → fluidattacks_utils_logger-3.0.4}/flake.nix

@@ -2,8 +2,8 @@
   description = "Log utils for observes packages";
 
   inputs = {
-    observes_flake_builder = {
-      url = "git+ssh://git@gitlab.com/fluidattacks/universe?shallow=1&rev=ad927cc6545df64a7d622696a43bcee225b9867b&dir=observes/common/std_flake_2";
+    python_builder = {
+      url = "git+ssh://git@gitlab.com/fluidattacks/universe?shallow=1&rev=f66f38301987775ceb39ee72388ef0885ef30d13&dir=common/utils/python-builder";
     };
   };
 
@@ -19,11 +19,10 @@
           scripts,
         }:
         import ./build {
-          inherit nixpkgs builders scripts;
           src = import ./build/filter.nix nixpkgs.nix-filter self;
         };
     in
     {
-      packages = inputs.observes_flake_builder.outputs.build build_args;
+      packages = inputs.python_builder.outputs.build build_args;
     };
 }

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

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

{fluidattacks_utils_logger-3.0.2 → 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.2 → 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.2 → 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.2 → fluidattacks_utils_logger-3.0.4}/pyproject.toml

@@ -4,7 +4,7 @@ authors = [{ name = "Product Team", email = "development@fluidattacks.com" }]
 classifiers = ["License :: OSI Approved :: MIT License"]
 requires-python = ">=3.11"
 dependencies = [
-    "fluidattacks-core >=8.2.0, <9.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",
 ]
@@ -18,6 +18,7 @@ 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 >=9.0.3, <10.0.0",
     "pytest-cov >=7.0.0, <8.0.0",
@@ -26,4 +27,4 @@ dev = [
 
 [tool.uv]
 exclude-newer = "7 days"
-exclude-newer-package = { fluidattacks-core = "2099-01-01", fluid-blends = "2099-01-01" }
+exclude-newer-package = { fluidattacks-core = "2099-01-02T00:00:00Z", fluid-blends = "2099-01-02T00:00:00Z" }

{fluidattacks_utils_logger-3.0.2 → 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.2 → 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,