c2cwsgiutils 6.1.8.dev68__tar.gz → 6.1.10.dev5__tar.gz

{c2cwsgiutils-6.1.8.dev68 → c2cwsgiutils-6.1.10.dev5}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2025, Camptocamp SA
+Copyright (c) 2015-2026, Camptocamp SA
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

{c2cwsgiutils-6.1.8.dev68 → c2cwsgiutils-6.1.10.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cwsgiutils
-Version: 6.1.8.dev68
+Version: 6.1.10.dev5
 Summary: Common utilities for Camptocamp WSGI applications
 Home-page: https://github.com/camptocamp/c2cwsgiutils
 License: BSD-2-Clause
@@ -56,6 +56,7 @@ Requires-Dist: requests-oauthlib ; extra == "standard" or extra == "oauth2" or e
 Requires-Dist: scikit-image ; extra == "test-images"
 Requires-Dist: sentry-sdk ; extra == "standard" or extra == "sentry" or extra == "all"
 Requires-Dist: ujson
+Requires-Dist: urllib3
 Requires-Dist: waitress ; extra == "dev" or extra == "all"
 Requires-Dist: zope.interface ; extra == "standard" or extra == "webserver" or extra == "all"
 Requires-Dist: zope.sqlalchemy ; extra == "standard" or extra == "webserver" or extra == "all"

{c2cwsgiutils-6.1.8.dev68 → c2cwsgiutils-6.1.10.dev5}/c2cwsgiutils/acceptance/package-lock.json

@@ -735,9 +735,9 @@
       "license": "MIT"
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
@@ -1107,9 +1107,9 @@
       }
     },
     "node_modules/tar-fs": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.9.tgz",
-      "integrity": "sha512-XF4w9Xp+ZQgifKakjZYmFdkLoSWd34VGKcsTCwlNWM7QG3ZbaxnTsaBwnjFZqHRf/rROxaR8rXnbtwdvaDI+lA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.1.tgz",
+      "integrity": "sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==",
       "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0",

{c2cwsgiutils-6.1.8.dev68 → c2cwsgiutils-6.1.10.dev5}/c2cwsgiutils/db.py

@@ -51,7 +51,7 @@ def setup_session(
     With an accompanying tween that switches between the master and the slave DB
     connection. Uses prefixed entries in the application's settings.
 
-    The slave DB will be used for anything that is GET and OPTIONS queries. The master DB will be used for
+    The slave DB will be used for anything that is GET, HEAD and OPTIONS queries. The master DB will be used for
     all the other queries. You can tweak this behavior with the force_master and force_slave parameters.
     Those parameters are lists of regex that are going to be matched against "{VERB} {PATH}". Warning, the
     path includes the route_prefix.
@@ -107,7 +107,7 @@ def create_session(
     With an accompanying tween that switches between the master and the slave DB
     connection.
 
-    The slave DB will be used for anything that is GET and OPTIONS queries. The master DB will be used for
+    The slave DB will be used for anything that is GET, HEAD and OPTIONS queries. The master DB will be used for
     all the other queries. You can tweak this behavior with the force_master and force_slave parameters.
     Those parameters are lists of regex that are going to be matched against "{VERB} {PATH}". Warning, the
     path includes the route_prefix.
@@ -178,7 +178,10 @@ def _add_tween(
             has_force_master = any(r.match(method_path) for r in master_paths)
             if FORCE_READONLY or (
                 not has_force_master
-                and (request.method in ("GET", "OPTIONS") or any(r.match(method_path) for r in slave_paths))
+                and (
+                    request.method in ("GET", "HEAD", "OPTIONS")
+                    or any(r.match(method_path) for r in slave_paths)
+                )
             ):
                 _LOG.debug(
                     "Using %s database for: %s",
@@ -246,7 +249,7 @@ class SessionFactory(_sessionmaker):
             if FORCE_READONLY or (
                 not has_force_master
                 and (
-                    request.method in ("GET", "OPTIONS")
+                    request.method in ("GET", "OPTIONS", "HEAD")
                     or any(r.match(method_path) for r in self.slave_paths)
                 )
             ):

{c2cwsgiutils-6.1.8.dev68 → c2cwsgiutils-6.1.10.dev5}/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.8.dev68 → c2cwsgiutils-6.1.10.dev5}/c2cwsgiutils/stats_pyramid/_db_spy.py

@@ -15,7 +15,7 @@ _LOG = logging.getLogger(__name__)
 _PROMETHEUS_DB_SUMMARY = prometheus_client.Summary(
     prometheus.build_metric_name("database"),
     "Database requests",
-    ["what"],
+    ["what", "engine"],
     unit="seconds",
 )
 
@@ -66,12 +66,14 @@ def _simplify_sql(sql: str) -> str:
     return re.sub(r"%\(\w+\)\w", "?", sql)
 
 
-def _create_sqlalchemy_timer_cb(what: str) -> Callable[..., Any]:
+def _create_sqlalchemy_timer_cb(what: str, engine_name: str | None = None) -> Callable[..., Any]:
     start = time.perf_counter()
 
     def after(*_args: Any, **_kwargs: Any) -> None:
-        _PROMETHEUS_DB_SUMMARY.labels({"query": what}).observe(time.perf_counter() - start)
-        _LOG.debug("Execute statement '%s' in %d.", what, time.perf_counter() - start)
+        elapsed_time = time.perf_counter() - start
+        _PROMETHEUS_DB_SUMMARY.labels(what=what, engine=engine_name).observe(elapsed_time)
+        engine_suffix = f", on {engine_name}" if engine_name else ""
+        _LOG.debug("Execute statement '%s' in %.3f%ss.", what, elapsed_time, engine_suffix)
 
     return after
 
@@ -79,8 +81,12 @@ def _create_sqlalchemy_timer_cb(what: str) -> Callable[..., Any]:
 def _before_cursor_execute(
     conn: Connection, _cursor: Any, statement: str, _parameters: Any, _context: Any, _executemany: Any
 ) -> None:
+    engine_name = getattr(conn.engine, "c2c_name", None)
     sqlalchemy.event.listen(
-        conn, "after_cursor_execute", _create_sqlalchemy_timer_cb(_simplify_sql(statement)), once=True
+        conn,
+        "after_cursor_execute",
+        _create_sqlalchemy_timer_cb(_simplify_sql(statement), engine_name),
+        once=True,
     )
 
 

{c2cwsgiutils-6.1.8.dev68 → c2cwsgiutils-6.1.10.dev5}/c2cwsgiutils/templates/index.html.mako

@@ -19,8 +19,8 @@
     />
     <link
         rel="stylesheet"
-        href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css"
-        integrity="sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg=="
+        href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.8/css/bootstrap.min.css"
+        integrity="sha512-2bBQCjcnw658Lho4nlXJcc6WkV/UxpE/sAokbXPxQNGqmNdQrWqtw26Ns9kFF/yG792pKR1Sx8/Y1Lf1XN4GKA=="
         crossorigin="anonymous"
         referrerpolicy="no-referrer"
     />

{c2cwsgiutils-6.1.8.dev68 → c2cwsgiutils-6.1.10.dev5}/pyproject.toml

@@ -16,7 +16,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cwsgiutils"
-version = "6.1.8.dev68"
+version = "6.1.10.dev5"
 description = "Common utilities for Camptocamp WSGI applications"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -67,8 +67,8 @@ sentry = "c2cwsgiutils.sentry:filter_factory"
 
 [tool.poetry.dependencies]
 python = ">=3.10,<4.0"
-requests = "2.32.4"
-pyyaml = { version = "6.0.2" }
+requests = "2.32.5"
+pyyaml = { version = "6.0.3" }
 alembic = { version = "1.13.3", optional = true }
 boltons = { version = "24.0.0", optional = true }
 cornice = { version = "6.1.0", optional = true }
@@ -76,13 +76,13 @@ redis = { version = "5.1.1", optional = true }
 gunicorn = { version = "23.0.0", optional = true }
 lxml = { version = "5.3.1", optional = true }
 objgraph = { version = "3.6.2", optional = true }
-psycopg2 = { version = "2.9.10", optional = true }
+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" }
 cee_syslog_handler = { version = "0.6.0" }
-SQLAlchemy = { version = "2.0.41", optional = true }
+SQLAlchemy = { version = "2.0.45", 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 }
@@ -92,6 +92,7 @@ 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.3"
 
 [tool.poetry.extras]
 standard = [
@@ -174,7 +175,7 @@ prospector = { extras = ["with_bandit", "with_mypy", "with_pyroma"], version = "
 prospector-profile-duplicated = "1.6.0"
 prospector-profile-utils = "1.9.1"
 coverage = "7.6.12"
-junit2html = "31.0.2"
+junit2html = "31.0.5"
 pytest = "8.3.5"
 pytest-cov = "5.0.0"
 pytest-html = "4.1.1"