c2cwsgiutils 6.2.0.dev330__tar.gz → 6.2.0.dev336__tar.gz

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: c2cwsgiutils
-Version: 6.2.0.dev330
+Version: 6.2.0.dev336
 Summary: Common utilities for Camptocamp WSGI applications
 License-Expression: BSD-2-Clause
 License-File: LICENSE

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import ast
 import configparser
 import logging

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/acceptance/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import time
 import typing

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/acceptance/connection.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import re
 from collections.abc import Mapping, MutableMapping
 from enum import Enum

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/acceptance/image.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import json
 import subprocess  # nosec
 from pathlib import Path

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/acceptance/print.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import functools
 import json
 import logging

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/acceptance/utils.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import time
 from collections.abc import Callable

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/auth.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import hashlib
 import logging
 from collections.abc import Mapping

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/broadcast/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """Broadcast messages to all the processes of Gunicorn in every containers."""
 
 import functools

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/broadcast/interface.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 from abc import abstractmethod
 from collections.abc import Callable, Mapping
 from typing import Any

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/broadcast/local.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 from collections.abc import Callable, Mapping, MutableMapping
 from typing import Any
 

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/broadcast/redis.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import json
 import logging
 import random

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/broadcast/utils.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import os
 import socket
 from typing import Any

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/client_info.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import os
 import re

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/config_utils.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """Private utilities."""
 
 import os

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/coverage_setup.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import os
 import warnings

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/db.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """SQLalchemy models."""
 
 import logging

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/db_maintenance_view.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import warnings
 from collections.abc import Mapping

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/debug/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import warnings
 
 import pyramid.config

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/debug/_listeners.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import gc
 import sys
 import threading

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/debug/_views.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import datetime
 import gc
 import logging

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/debug/utils.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import gc
 import logging
 import re

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/errors.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """Install exception views to have nice JSON error pages."""
 
 import logging

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/health_check.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """
 Setup an health_check API.
 

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/index.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import urllib.parse
 import warnings

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/loader.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging.config
 from typing import cast
 

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/logging_view.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import warnings
 from collections.abc import Generator, Mapping

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/models_graph.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import inspect
 import sys
 from typing import Any

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/pretty_json.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import warnings
 from typing import Any
 

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/profiler.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import contextlib
 import cProfile
 import pstats

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/prometheus.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """Every thing we needs to have the metrics in Prometheus."""
 
 import os

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/pyramid.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 
 import cornice

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/pyramid_logging.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """
 Install a filter on the logging handler.
 

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/redis_stats.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import warnings
 from collections.abc import Callable

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/redis_utils.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import threading
 import time
@@ -18,12 +20,16 @@ _REDIS_OPTIONS_KEY = "C2C_REDIS_OPTIONS"
 REDIS_SENTINELS_KEY = "C2C_REDIS_SENTINELS"
 REDIS_SERVICENAME_KEY = "C2C_REDIS_SERVICENAME"
 _REDIS_DB_KEY = "C2C_REDIS_DB"
+_REDIS_PUBSUB_RETRY_DELAY_KEY = "C2C_REDIS_PUBSUB_RETRY_DELAY"
+_REDIS_PUBSUB_GET_MESSAGE_TIMEOUT_KEY = "C2C_REDIS_PUBSUB_GET_MESSAGE_TIMEOUT"
 
 REDIS_URL_KEY_PROP = "c2c.redis_url"
 _REDIS_OPTIONS_KEY_PROP = "c2c.redis_options"
 REDIS_SENTINELS_KEY_PROP = "c2c.redis_sentinels"
 REDIS_SERVICENAME_KEY_PROP = "c2c.redis_servicename"
 _REDIS_DB_KEY_PROP = "c2c.redis_db"
+_REDIS_PUBSUB_RETRY_DELAY_KEY_PROP = "c2c.redis_pubsub_retry_delay"
+_REDIS_PUBSUB_GET_MESSAGE_TIMEOUT_KEY_PROP = "c2c.redis_pubsub_get_message_timeout"
 
 _master: Optional["redis.client.Redis[str]"] = None
 _slave: Optional["redis.client.Redis[str]"] = None
@@ -107,11 +113,30 @@ def _init(settings: Mapping[str, Any] | None) -> None:
 class PubSubWorkerThread(threading.Thread):
     """A clone of redis.client.PubSubWorkerThread that doesn't die when the connections are broken."""
 
-    def __init__(self, pubsub: redis.client.PubSub, name: str | None = None) -> None:
+    def __init__(
+        self,
+        pubsub: redis.client.PubSub,
+        name: str | None = None,
+        settings: Mapping[str, Any] | None = None,
+    ) -> None:
         """Initialize the PubSubWorkerThread."""
         super().__init__(name=name, daemon=True)
         self.pubsub = pubsub
         self._running = False
+        self._retry_delay = c2cwsgiutils.config_utils.env_or_settings(
+            settings,
+            _REDIS_PUBSUB_RETRY_DELAY_KEY,
+            _REDIS_PUBSUB_RETRY_DELAY_KEY_PROP,
+            0.5,
+            float,
+        )
+        self._get_message_timeout = c2cwsgiutils.config_utils.env_or_settings(
+            settings,
+            _REDIS_PUBSUB_GET_MESSAGE_TIMEOUT_KEY,
+            _REDIS_PUBSUB_GET_MESSAGE_TIMEOUT_KEY_PROP,
+            1.0,
+            float,
+        )
 
     def run(self) -> None:
         """Run the worker."""
@@ -122,15 +147,15 @@ class PubSubWorkerThread(threading.Thread):
         last_was_ok = True
         while pubsub.subscribed:
             try:
-                pubsub.get_message(ignore_subscribe_messages=True, timeout=1)
+                pubsub.get_message(ignore_subscribe_messages=True, timeout=self._get_message_timeout)
                 if not last_was_ok:
-                    _LOG.info("Redis is back")
+                    _LOG.debug("Redis is back")
                     last_was_ok = True
             except redis.exceptions.RedisError:
                 if last_was_ok:
-                    _LOG.warning("Redis connection problem")
+                    _LOG.debug("Redis connection problem")
                 last_was_ok = False
-                time.sleep(0.5)
+                time.sleep(self._retry_delay)
             except Exception:  # noqa: BLE001
                 _LOG.warning("Unexpected error", exc_info=True)
         _LOG.info("Redis subscription worker stopped")

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/request_tracking/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """
 Allows to track the request_id in the logs, the DB and others.
 
@@ -43,9 +45,9 @@ def _patch_requests() -> None:
         self: requests.adapters.HTTPAdapter,
         request: requests.models.PreparedRequest,
         stream: bool = False,
-        timeout: None | float | tuple[float, float] | tuple[float, None] = None,
+        timeout: float | tuple[float, float] | tuple[float, None] | None = None,
         verify: bool | str = True,
-        cert: None | bytes | str | tuple[bytes | str, bytes | str] = None,
+        cert: bytes | str | tuple[bytes | str, bytes | str] | None = None,
         proxies: Mapping[str, str] | None = None,
     ) -> requests.Response:
         pyramid_request = get_current_request()

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/request_tracking/_sql.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 from typing import Any
 
 import sqlalchemy.event

c2cwsgiutils-6.2.0.dev336/c2cwsgiutils/scripts/__init__.py

@@ -0,0 +1 @@
+# Copyright (c) 2026, Camptocamp SA

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/scripts/genversion.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Copyright (c) 2026, Camptocamp SA
+
 import json
 import logging
 import os

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/scripts/stats_db.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Copyright (c) 2026, Camptocamp SA
+
 """Provide prometheus gauges for every tables of a database."""
 
 import argparse

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/scripts/test_print.py

@@ -1,4 +1,6 @@
 #!/usr/bin/env python3
+# Copyright (c) 2026, Camptocamp SA
+
 """Test a MapfishPrint server."""
 
 import argparse

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/sentry.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import contextlib
 import logging
 import os

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/services.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 from typing import Any
 

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/setup_process.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """
 Used by standalone (non-wsgi) processes to setup all the bits and pieces of c2cwsgiutils that could be useful.
 

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/sql_profiler/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """
 A view (URL=/sql_provider) allowing to enabled/disable a SQL spy.
 

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/sql_profiler/_impl.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """
 A view (URL=/sql_provider) allowing to enabled/disable a SQL spy.
 

c2cwsgiutils-6.2.0.dev336/c2cwsgiutils/sqlalchemylogger/__init__.py

@@ -0,0 +1 @@
+# Copyright (c) 2026, Camptocamp SA

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/sqlalchemylogger/_filters.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import re
 from typing import Any

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/sqlalchemylogger/_models.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 from typing import Any
 
 from sqlalchemy import Column

c2cwsgiutils-6.2.0.dev336/c2cwsgiutils/sqlalchemylogger/examples/__init__.py

@@ -0,0 +1 @@
+# Copyright (c) 2026, Camptocamp SA

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/sqlalchemylogger/examples/example.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import time
 

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/sqlalchemylogger/handlers.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import queue
 import threading

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/stats_pyramid/__init__.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 """Generate statsd metrics for pyramid and SQLAlchemy events."""
 
 import warnings

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/stats_pyramid/_db_spy.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import re
 import time

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/stats_pyramid/_pyramid_spy.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import logging
 import time
 from collections.abc import Callable

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/c2cwsgiutils/version.py

@@ -1,3 +1,5 @@
+# Copyright (c) 2026, Camptocamp SA
+
 import json
 import logging
 import os

{c2cwsgiutils-6.2.0.dev330 → c2cwsgiutils-6.2.0.dev336}/pyproject.toml

@@ -160,7 +160,7 @@ test_images = ["scikit-image"]
 
 [tool.poetry.group.dev.dependencies]
 # pylint = { version = "2.15.6" }
-prospector = { version = "1.19.0", extras = ["with_bandit", "with_mypy", "with_pyroma", "with_ruff"] }
+prospector = { version = "1.19.1", extras = ["with_bandit", "with_mypy", "with_pyroma", "with_ruff"] }
 prospector-profile-duplicated = "1.12.0"
 prospector-profile-utils = "1.27.0"
 junit2html = "31.1.4"
@@ -227,7 +227,7 @@ include = [
 ]
 requires-python = ">=3.11"
 dependencies = ["requests", "pyyaml", "ujson", "cee_syslog_handler", "prometheus-client", "setuptools<81.0.0"]
-version = "6.2.0.dev330"
+version = "6.2.0.dev336"
 
 [project.urls]
 repository = "https://github.com/camptocamp/c2cwsgiutils"