c2cwsgiutils 6.1.9.dev37__tar.gz → 6.1.10__tar.gz

{c2cwsgiutils-6.1.9.dev37 → c2cwsgiutils-6.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cwsgiutils
-Version: 6.1.9.dev37
+Version: 6.1.10
 Summary: Common utilities for Camptocamp WSGI applications
 Home-page: https://github.com/camptocamp/c2cwsgiutils
 License: BSD-2-Clause
@@ -43,6 +43,7 @@ Requires-Dist: cornice ; extra == "standard" or extra == "webserver" or extra ==
 Requires-Dist: gunicorn ; extra == "standard" or extra == "webserver" or extra == "all"
 Requires-Dist: lxml ; extra == "tests" or extra == "all"
 Requires-Dist: objgraph ; extra == "debug" or extra == "all"
+Requires-Dist: pillow
 Requires-Dist: prometheus-client ; extra == "standard" or extra == "webserver" or extra == "all"
 Requires-Dist: psycopg2 ; extra == "standard" or extra == "webserver" or extra == "all"
 Requires-Dist: pyjwt ; extra == "standard" or extra == "oauth2" or extra == "all"

{c2cwsgiutils-6.1.9.dev37 → c2cwsgiutils-6.1.10}/c2cwsgiutils/acceptance/package-lock.json

@@ -244,9 +244,9 @@
       "license": "MIT"
     },
     "node_modules/basic-ftp": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
-      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.2.0.tgz",
+      "integrity": "sha512-VoMINM2rqJwJgfdHq6RiUudKt2BV+FY5ZFezP/ypmwayk68+NzzAQy4XXLlqsGD4MCzq3DrmNFD/uUmBJuGoXw==",
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"

{c2cwsgiutils-6.1.9.dev37 → c2cwsgiutils-6.1.10}/c2cwsgiutils/prometheus.py

@@ -132,6 +132,7 @@ class MultiProcessCustomCollector(prometheus_client.registry.Collector):
 def _deserialize_collected_data(
     results: list[list[SerializedMetric]],
 ) -> Generator[prometheus_client.core.Metric, None, None]:
+    imported = set()
     for serialized_collection in results:
         if serialized_collection is None:
             continue
@@ -149,6 +150,10 @@ def _deserialize_collected_data(
             else:
                 raise NotImplementedError()
             for sample in serialized_metric["samples"]:
+                canonical = (sample["name"], frozenset(sample.get("labels", {}).items()))
+                if canonical in imported:
+                    continue
+                imported.add(canonical)
                 metric.samples.append(
                     prometheus_client.metrics_core.Sample(**sample),  # type: ignore[attr-defined]
                 )

{c2cwsgiutils-6.1.9.dev37 → c2cwsgiutils-6.1.10}/c2cwsgiutils/redis_utils.py

@@ -18,12 +18,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
@@ -99,10 +103,30 @@ def _init(settings: Optional[Mapping[str, Any]]) -> 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: Optional[str] = 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:
         if self._running:
@@ -112,15 +136,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:  # pylint: disable=broad-except
                 _LOG.warning("Unexpected error", exc_info=True)
         _LOG.info("Redis subscription worker stopped")

{c2cwsgiutils-6.1.9.dev37 → c2cwsgiutils-6.1.10}/pyproject.toml

@@ -16,7 +16,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cwsgiutils"
-version = "6.1.9.dev37"
+version = "6.1.10"
 description = "Common utilities for Camptocamp WSGI applications"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -67,7 +67,7 @@ sentry = "c2cwsgiutils.sentry:filter_factory"
 
 [tool.poetry.dependencies]
 python = ">=3.10,<4.0"
-requests = "2.32.5"
+requests = "2.33.0"
 pyyaml = { version = "6.0.3" }
 alembic = { version = "1.13.3", optional = true }
 boltons = { version = "24.0.0", optional = true }
@@ -80,19 +80,20 @@ psycopg2 = { version = "2.9.11", optional = true }
 pyramid = { version = "2.0.2", optional = true }
 pyramid-tm = { version = "2.5", optional = true }
 sentry-sdk = { version = "2.15.0", optional = true }
-ujson = { version = "5.10.0" }
+ujson = "5.12.0"
 cee_syslog_handler = { version = "0.6.0" }
-SQLAlchemy = { version = "2.0.45", optional = true }
+SQLAlchemy = { version = "2.0.46", optional = true }
 SQLAlchemy-Utils = { version = "0.41.2", optional = true }
 "zope.interface" = { version = "7.0.3", optional = true }
 "zope.sqlalchemy" = { version = "3.1", optional = true }
-pyjwt = { version = "2.9.0", optional = true }
+pyjwt = { version = "2.12.0", optional = true }
 requests-oauthlib = { version = "2.0.0", optional = true }
 waitress = "3.0.2"
 scikit-image = { version = "0.24.0", optional = true }
 prometheus-client = { version = "0.21.1", optional = true}
 pyramid_mako = { version = "1.1.0", optional = true}
-urllib3 = "2.6.2"
+urllib3 = "2.6.3"
+pillow = "12.1.1"
 
 [tool.poetry.extras]
 standard = [