c2cwsgiutils 6.1.7.dev6__tar.gz → 6.2.0.dev4__tar.gz

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/LICENSE

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

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cwsgiutils
-Version: 6.1.7.dev6
+Version: 6.2.0.dev4
 Summary: Common utilities for Camptocamp WSGI applications
 Home-page: https://github.com/camptocamp/c2cwsgiutils
 License: BSD-2-Clause
@@ -64,7 +64,7 @@ Description-Content-Type: text/markdown
 
 # Camptocamp WSGI utilities
 
-This is a Python 3 library providing common tools for Camptocamp WSGI
+This is a Python 3 library (>=3.5) providing common tools for Camptocamp WSGI
 applications:
 
 - Provide prometheus metrics

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/README.md

@@ -1,6 +1,6 @@
 # Camptocamp WSGI utilities
 
-This is a Python 3 library providing common tools for Camptocamp WSGI
+This is a Python 3 library (>=3.5) providing common tools for Camptocamp WSGI
 applications:
 
 - Provide prometheus metrics

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/c2cwsgiutils/acceptance/image.py

@@ -58,7 +58,7 @@ def normalize_image(image: NpNdarrayInt) -> NpNdarrayInt:
     return image
 
 
-def check_image(  # pylint: disable=too-many-locals,too-many-statements
+def check_image(
     result_folder: str,
     image_to_check: NpNdarrayInt,
     expected_filename: str,
@@ -108,13 +108,6 @@ def check_image(  # pylint: disable=too-many-locals,too-many-statements
 
     mask = None
     if mask_filename is not None:
-        background_color = [255, 255, 255]
-        for color in range(3):
-            img_hist, _ = skimage.exposure.histogram(
-                image_to_check[..., color], nbins=256, source_range="dtype"
-            )
-            background_color[color] = np.argmax(img_hist)
-
         mask = skimage.io.imread(mask_filename)
 
         assert mask is not None, "Wrong mask: " + mask_filename
@@ -137,7 +130,7 @@ def check_image(  # pylint: disable=too-many-locals,too-many-statements
         assert (
             mask.shape[0] == image_to_check.shape[0] and mask.shape[1] == image_to_check.shape[1]
         ), f"Mask and image should have the same shape ({mask.shape} != {image_to_check.shape})"
-        image_to_check[mask] = background_color
+        image_to_check[mask] = [255, 255, 255]
 
     if not os.path.exists(result_folder):
         os.makedirs(result_folder)
@@ -155,7 +148,7 @@ def check_image(  # pylint: disable=too-many-locals,too-many-statements
         assert (
             expected.shape[0] == mask.shape[0] and expected.shape[1] == mask.shape[1]
         ), f"Mask and expected image should have the same shape ({mask.shape} != {expected.shape})"
-        expected[mask] = background_color
+        expected[mask] = [255, 255, 255]
 
     assert (
         expected.shape == image_to_check.shape

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/c2cwsgiutils/acceptance/package-lock.json

@@ -6,7 +6,7 @@
     "": {
       "dependencies": {
         "commander": "12.1.0",
-        "puppeteer": "23.5.3"
+        "puppeteer": "23.5.0"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -909,9 +909,9 @@
       }
     },
     "node_modules/puppeteer": {
-      "version": "23.5.3",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.5.3.tgz",
-      "integrity": "sha512-FghmfBsr/UUpe48OiCg1gV3W4vVfQJKjQehbF07SjnQvEpWcvPTah1nykfGWdOQQ1ydJPIXcajzWN7fliCU3zw==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.5.0.tgz",
+      "integrity": "sha512-jnUx5M0YtFva7vXr39qqsxgB46JiwXJavuM1Hgsqbd9WWiGTEUt9klGpTxyHi+ZQf3NUgleDhNsnI10IK8Ebsg==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -919,7 +919,7 @@
         "chromium-bidi": "0.8.0",
         "cosmiconfig": "^9.0.0",
         "devtools-protocol": "0.0.1342118",
-        "puppeteer-core": "23.5.3",
+        "puppeteer-core": "23.5.0",
         "typed-query-selector": "^2.12.0"
       },
       "bin": {
@@ -930,9 +930,9 @@
       }
     },
     "node_modules/puppeteer-core": {
-      "version": "23.5.3",
-      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.5.3.tgz",
-      "integrity": "sha512-V58MZD/B3CwkYsqSEQlHKbavMJptF04fzhMdUpiCRCmUVhwZNwSGEPhaiZ1f8I3ABQUirg3VNhXVB6Z1ubHXtQ==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.5.0.tgz",
+      "integrity": "sha512-+5ed+625GuQ2emRHqYec8khT9LP14FWzv8hYl0HiM6hnnlNzdVU9uDJIPHeCPLIWxq15ost9MeF8kBk4R3eiFw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@puppeteer/browsers": "2.4.0",

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/c2cwsgiutils/acceptance/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "commander": "12.1.0",
-    "puppeteer": "23.5.3"
+    "puppeteer": "23.5.0"
   },
   "type": "module"
 }

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/c2cwsgiutils/client_info.py

@@ -26,13 +26,13 @@ class Filter:
             _handle_others(environ)
 
         if "C2CWSGIUTILS_FORCE_PROTO" in os.environ:
-            environ["wsgi.url_scheme"] = os.environ["C2CWSGIUTILS_FORCE_PROTO"]
+            os.environ["wsgi.url_scheme"] = os.environ.pop("C2CWSGIUTILS_FORCE_PROTO")
         if "C2CWSGIUTILS_FORCE_HOST" in os.environ:
-            environ["HTTP_HOST"] = os.environ["C2CWSGIUTILS_FORCE_HOST"]
+            os.environ["HTTP_HOST"] = os.environ.pop("C2CWSGIUTILS_FORCE_HOST")
         if "C2CWSGIUTILS_FORCE_SERVER_NAME" in os.environ:
-            environ["SERVER_NAME"] = os.environ["C2CWSGIUTILS_FORCE_SERVER_NAME"]
+            os.environ["SERVER_NAME"] = os.environ.pop("C2CWSGIUTILS_FORCE_SERVER_NAME")
         if "C2CWSGIUTILS_FORCE_REMOTE_ADDR" in os.environ:
-            environ["REMOTE_ADDR"] = os.environ["C2CWSGIUTILS_FORCE_REMOTE_ADDR"]
+            os.environ["REMOTE_ADDR"] = os.environ.pop("C2CWSGIUTILS_FORCE_REMOTE_ADDR")
 
         return self._application(environ, start_response)
 

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/c2cwsgiutils/debug/_listeners.py

@@ -68,7 +68,12 @@ def _dump_memory_impl(
                         and not (FILES_FIELDS - set(obj["globals"].keys()))
                     ):
                         python_internal = True
-                    if python_internal != python_internals_map:
+                    if (
+                        python_internal
+                        and not python_internals_map
+                        or not python_internal
+                        and python_internals_map
+                    ):
                         continue
                 size = get_size(obj) / 1024
                 if len(biggest_objects) < limit or size > biggest_objects[0][0]:

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/c2cwsgiutils/debug/_views.py

@@ -47,7 +47,7 @@ def _dump_memory(request: pyramid.request.Request) -> list[Mapping[str, Any]]:
     auth.auth_view(request)
     limit = int(request.params.get("limit", "30"))
     analyze_type = request.params.get("analyze_type")
-    python_internals_map = request.params.get("python_internals_map", "0").lower() in ("1", "true", "on")
+    python_internals_map = request.params.get("python_internals_map", "0").lower() in ("", "1", "true", "on")
     result = broadcast.broadcast(
         "c2c_dump_memory",
         params={"limit": limit, "analyze_type": analyze_type, "python_internals_map": python_internals_map},
@@ -75,7 +75,7 @@ def _dump_memory_diff(request: pyramid.request.Request) -> list[Any]:
 
     # warm-up run
     try:
-        if request.params.get("no_warmup", "0").lower() in ("1", "true", "on"):
+        if "no_warmup" not in request.params:
             request.invoke_subrequest(sub_request)
     except Exception:  # nosec  # pylint: disable=broad-except
         pass
@@ -189,17 +189,10 @@ def _show_refs(request: pyramid.request.Request) -> pyramid.response.Response:
         args["extra_info"] = lambda obj: f"{get_size(obj) / 1024:.3f} kb\n{id(obj)}"
 
     result = StringIO()
-    if request.params.get("backrefs", "") == "":
-
-        def new_filter(x: Any) -> bool:
-            return not objgraph.inspect.isclass(x)
-
-        if "filter" in args:
-            old_filter = args["filter"]
-            args["filter"] = lambda x: old_filter(x) and new_filter(x)
-        else:
-            args["filter"] = new_filter
-    objgraph.show_backrefs(objs, output=result, **args)
+    if request.params.get("backrefs", "") != "":
+        objgraph.show_backrefs(objs, output=result, **args)
+    else:
+        objgraph.show_refs(objs, output=result, filter=lambda x: not objgraph.inspect.isclass(x), **args)
 
     request.response.content_type = "text/vnd.graphviz"
     request.response.text = result.getvalue()

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/c2cwsgiutils/index.py

@@ -122,20 +122,8 @@ def input_(
     if type_ is None:
         if isinstance(value, int):
             type_ = "number"
-        elif isinstance(value, bool):
-            type_ = "checkbox"
         else:
             type_ = "text"
-    if type_ == "checkbox":
-        checked = " checked" if value else ""
-        return f"""
-<div class="form-check">
-  <input class="form-check-input" type="checkbox" name="{name}" value="true" id="{id_}"{checked}>
-  <label class="form-check-label" for="{id_}">
-    {label}
-  </label>
-</div>"""
-
     result = ""
     if label is not None:
         result += f'<div class="row mb-3"><label class="col-sm-2 col-form-label" for="{id_}">{label}</label>'
@@ -213,7 +201,7 @@ def _index(request: pyramid.request.Request) -> dict[str, str]:
 def _versions(request: pyramid.request.Request) -> str:
     versions_url = _url(request, "c2c_versions")
     if versions_url:
-        return section("Versions " + link(versions_url, "Get"), sep=False)
+        return section("Versions", paragraph(link(versions_url, "Get")), sep=False)
     else:
         return ""
 
@@ -292,7 +280,6 @@ def _logging(request: pyramid.request.Request) -> str:
 def _debug(request: pyramid.request.Request) -> str:
     dump_memory_url = _url(request, "c2c_debug_memory")
     if dump_memory_url:
-        as_dot = 'as <a href="https://graphviz.org/">dot diagram</a>, can be open with <a href="https://pypi.org/project/xdot/">xdot</a>'
         return section(
             " ".join(
                 [
@@ -302,42 +289,32 @@ def _debug(request: pyramid.request.Request) -> str:
                     link(_url(request, "c2c_debug_memory_maps"), "Mapped memory"),
                 ]
             ),
-            '<h2>Memory usage<span style="font-size: 0.5em;">, with <a href="https://mg.pov.lt/objgraph/">objgraph</a></span></h2>',
-            "<p>Runs the garbage collector and dumps the memory usage as JSON.</p>",
             form(
                 dump_memory_url,
                 input_("limit", value=30),
                 input_("analyze_type"),
-                input_("python_internals_map", type_="checkbox"),
                 button("Dump memory usage"),
             ),
-            f"<p>Runs the garbage collector and dumps the memory refs {as_dot}.</p>",
             form(
                 _url(request, "c2c_debug_show_refs"),
                 input_("analyze_type", value="gunicorn.app.wsgiapp.WSGIApplication"),
-                input_("analyze_id", type_="number"),
-                input_("max_depth", type_="number", value=3),
-                input_("too_many", type_="number", value=10),
+                input_("max_depth", value=3),
+                input_("too_many", value=10),
                 input_("min_size_kb", type_="number"),
                 button("Object refs"),
             ),
-            "<p>Runs the garbage collector, query the path, runs the garbage collector again, get the memory diff as JSON.</p>",
             form(
                 _url(request, "c2c_debug_memory_diff"),
                 input_("path"),
                 input_("limit", value=30),
-                input_("no_warmup", type_="checkbox"),
                 button("Memory diff"),
             ),
-            "<h2>Sleep</h2>",
             form(
                 _url(request, "c2c_debug_sleep"),
                 input_("time", value=1),
                 button("Sleep"),
             ),
-            "<h2>Server times</h2>",
-            form(_url(request, "c2c_debug_time"), button("Get")),
-            "<h2>HTTP error</h2>",
+            form(_url(request, "c2c_debug_time"), button("Time")),
             form(
                 _url(request, "c2c_debug_error"),
                 input_("status", value=500),

c2cwsgiutils-6.2.0.dev4/c2cwsgiutils/loader.py

@@ -0,0 +1,21 @@
+import logging
+from typing import Optional, cast
+
+from plaster_pastedeploy import Loader as BaseLoader
+
+from c2cwsgiutils import get_config_defaults
+
+_LOG = logging.getLogger(__name__)
+
+
+class Loader(BaseLoader):  # type: ignore
+    """The application loader."""
+
+    def _get_defaults(self, defaults: Optional[dict[str, str]] = None) -> dict[str, str]:
+        d = get_config_defaults()
+        d.update(defaults or {})
+        return cast(dict[str, str], super()._get_defaults(d))
+
+    def __repr__(self) -> str:
+        """Get the object representation."""
+        return f'c2cwsgiutils.loader.Loader(uri="{self.uri}")'

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/c2cwsgiutils/prometheus.py

@@ -1,6 +1,5 @@
 """Every thing we needs to have the metrics in Prometheus."""
 
-import logging
 import os
 import re
 from collections.abc import Generator, Iterable
@@ -12,12 +11,10 @@ import prometheus_client.metrics_core
 import prometheus_client.multiprocess
 import prometheus_client.registry
 import pyramid.config
-import redis.exceptions
 
 from c2cwsgiutils import broadcast, redis_utils
 from c2cwsgiutils.debug.utils import dump_memory_maps
 
-_LOG = logging.getLogger(__name__)
 _NUMBER_RE = re.compile(r"^[0-9]+$")
 MULTI_PROCESS_COLLECTOR_BROADCAST_CHANNELS = [
     "c2cwsgiutils_prometheus_collector_gc",
@@ -120,12 +117,9 @@ class MultiProcessCustomCollector(prometheus_client.registry.Collector):
     def collect(self) -> Generator[prometheus_client.core.Metric, None, None]:
         results: list[list[SerializedMetric]] = []
         for channel in MULTI_PROCESS_COLLECTOR_BROADCAST_CHANNELS:
-            try:
-                result = broadcast.broadcast(channel, expect_answers=True)
-                if result is not None:
-                    results.extend(cast(Iterable[list[SerializedMetric]], result))
-            except redis.exceptions.ConnectionError:
-                _LOG.error("Failed to get the metrics from the other processes")
+            result = broadcast.broadcast(channel, expect_answers=True)
+            if result is not None:
+                results.extend(cast(Iterable[list[SerializedMetric]], result))
         return _deserialize_collected_data(results)
 
 

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/c2cwsgiutils/sqlalchemylogger/handlers.py

@@ -102,7 +102,7 @@ class SQLAlchemyHandler(logging.Handler):
             with self.engine.begin() as connection:
                 if not self.engine.dialect.has_schema(connection, self.Log.__table_args__["schema"]):
                     connection.execute(
-                        sqlalchemy.schema.CreateSchema(self.Log.__table_args__["schema"]),
+                        sqlalchemy.schema.CreateSchema(self.Log.__table_args__["schema"]),  # type: ignore
                     )
         Base.metadata.create_all(self.engine)
 

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/c2cwsgiutils/stats_pyramid/_pyramid_spy.py

@@ -1,4 +1,3 @@
-import logging
 import time
 from typing import Callable, Optional
 
@@ -10,8 +9,6 @@ from pyramid.httpexceptions import HTTPException
 
 from c2cwsgiutils import prometheus
 
-_LOG = logging.getLogger(__name__)
-
 _PROMETHEUS_PYRAMID_ROUTES_SUMMARY = prometheus_client.Summary(
     prometheus.build_metric_name("pyramid_routes"),
     "Pyramid routes",
@@ -64,15 +61,6 @@ def _create_finished_cb(
             name = request.matched_route.name
             if kind == "route":
                 _add_server_metric(request, "route", description=name)
-        if status >= 500:
-            _LOG.warning(
-                "Request %s %s %s route %s return status %s",
-                request.method,
-                request.path,
-                kind,
-                name,
-                status,
-            )
         measure.labels(
             method=request.method, route=name, status=status, group=str(status // 100 * 100)
         ).observe(time.process_time() - start)

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/c2cwsgiutils/templates/index.html.mako

@@ -24,7 +24,7 @@
         crossorigin="anonymous"
         referrerpolicy="no-referrer"
     />
-    <title>C2C WSGI Utils tools</title>
+    <title>c2cwsgiutils tools</title>
     <style>
       body {
         margin-top: 0.5rem;
@@ -32,9 +32,6 @@
       button, p  {
         margin-bottom: 0.5rem;
       }
-      .row > h2 {
-        margin-top: 1rem;
-      }
     </style>
   </head>
   <body>

{c2cwsgiutils-6.1.7.dev6 → c2cwsgiutils-6.2.0.dev4}/pyproject.toml

@@ -16,7 +16,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cwsgiutils"
-version = "6.1.7.dev6"
+version = "6.2.0.dev4"
 description = "Common utilities for Camptocamp WSGI applications"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -72,25 +72,25 @@ pyyaml = { version = "6.0.2" }
 alembic = { version = "1.13.3", optional = true }
 boltons = { version = "24.0.0", optional = true }
 cornice = { version = "6.1.0", optional = true }
-redis = { version = "5.1.1", optional = true }
+redis = { version = "5.1.0", optional = true }
 gunicorn = { version = "23.0.0", optional = true }
 lxml = { version = "5.3.0", optional = true }
-objgraph = { version = "3.6.2", optional = true }
-psycopg2 = { version = "2.9.10", optional = true }
+objgraph = { version = "3.6.1", optional = true }
+psycopg2 = { version = "2.9.9", 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.36", optional = true }
+SQLAlchemy = { version = "2.0.35", 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 }
 requests-oauthlib = { version = "2.0.0", optional = true }
-waitress = "3.0.2"
+waitress = { version = "3.0.0", optional = true }
 scikit-image = { version = "0.24.0", optional = true }
-prometheus-client = { version = "0.21.1", optional = true}
+prometheus-client = { version = "0.21.0", optional = true}
 pyramid_mako = { version = "1.1.0", optional = true}
 
 [tool.poetry.extras]
@@ -170,19 +170,19 @@ test_images = ["scikit-image"]
 
 [tool.poetry.group.dev.dependencies]
 # pylint = { version = "2.15.6" }
-prospector = { extras = ["with_bandit", "with_mypy", "with_pyroma"], version = "1.12.1" }
+prospector = { extras = ["with_bandit", "with_mypy", "with_pyroma"], version = "1.12.0" }
 prospector-profile-duplicated = "1.6.0"
 prospector-profile-utils = "1.9.1"
-coverage = "7.6.9"
+coverage = "7.6.1"
 junit2html = "31.0.2"
-pytest = "8.3.4"
+pytest = "8.3.3"
 pytest-cov = "5.0.0"
 pytest-html = "4.1.1"
-types-pyyaml = "6.0.12.20241221"
-types-requests = "2.32.0.20241016"
+types-pyyaml = "6.0.12.20240917"
+types-requests = "2.32.0.20240914"
 types-redis = "4.6.0.20241004"
 types-ujson = "5.10.0.20240515"
-types-python-dateutil = "2.9.0.20241206"
+types-python-dateutil = "2.9.0.20241003"
 typing_extensions = "4.12.2"
 
 [build-system]

c2cwsgiutils-6.1.7.dev6/c2cwsgiutils/loader.py

@@ -1,40 +0,0 @@
-import logging
-from typing import Optional, cast
-
-from plaster_pastedeploy import Loader as BaseLoader
-
-from c2cwsgiutils import get_config_defaults, get_logconfig_dict
-
-_LOG = logging.getLogger(__name__)
-
-
-class Loader(BaseLoader):  # type: ignore
-    """The application loader."""
-
-    def _get_defaults(self, defaults: Optional[dict[str, str]] = None) -> dict[str, str]:
-        d = get_config_defaults()
-        d.update(defaults or {})
-        return cast(dict[str, str], super()._get_defaults(d))
-
-    def __repr__(self) -> str:
-        """Get the object representation."""
-        return f'c2cwsgiutils.loader.Loader(uri="{self.uri}")'
-
-    def setup_logging(self, defaults: Optional[dict[str, str]] = None) -> None:
-        """
-        Set up logging via :func:`logging.config.dictConfig` with value returned from c2cwsgiutils.get_logconfig_dict.
-
-        Defaults are specified for the special ``__file__`` and ``here``
-        variables, similar to PasteDeploy config loading. Extra defaults can
-        optionally be specified as a dict in ``defaults``.
-
-        Arguments:
-        ---------
-        defaults: The defaults that will be used when passed to
-            :func:`logging.config.fileConfig`.
-
-        """
-        if "loggers" in self.get_sections():
-            logging.config.dictConfig(get_logconfig_dict(self.uri.path))
-        else:
-            logging.basicConfig()