c2cwsgiutils 6.2.0.dev78__py3-none-any.whl → 6.2.0.dev80__py3-none-any.whl

c2cwsgiutils/auth.py

@@ -59,7 +59,7 @@ class AuthConfig(TypedDict, total=False):
 def get_expected_secret(request: pyramid.request.Request) -> str:
     """Return the secret expected from the client."""
     settings = request.registry.settings
-    return cast(str, env_or_settings(settings, SECRET_ENV, SECRET_PROP, default=False))
+    return cast("str", env_or_settings(settings, SECRET_ENV, SECRET_PROP, default=False))
 
 
 def _hash_secret(secret: str) -> str:
@@ -117,7 +117,7 @@ def _is_auth_user_github(request: pyramid.request.Request) -> tuple[bool, UserDe
     if cookie:
         try:
             return True, cast(
-                UserDetails,
+                "UserDetails",
                 jwt.decode(
                     cookie,
                     env_or_settings(

c2cwsgiutils/config_utils.py

@@ -9,7 +9,7 @@ import pyramid.config
 
 def get_base_path(config: pyramid.config.Configurator) -> str:
     """Get the base path of all the views."""
-    return cast(str, env_or_config(config, "C2C_BASE_PATH", "c2c.base_path", "/c2c"))
+    return cast("str", env_or_config(config, "C2C_BASE_PATH", "c2c.base_path", "/c2c"))
 
 
 def env_or_config(

c2cwsgiutils/db.py

@@ -236,8 +236,8 @@ class SessionFactory(_sessionmaker):
     def engine_name(self, readwrite: bool) -> str:
         """Get the engine name."""
         if readwrite:
-            return cast(str, self.rw_engine.c2c_name)  # type: ignore[attr-defined]
-        return cast(str, self.ro_engine.c2c_name)  # type: ignore[attr-defined]
+            return cast("str", self.rw_engine.c2c_name)  # type: ignore[attr-defined]
+        return cast("str", self.ro_engine.c2c_name)  # type: ignore[attr-defined]
 
     def __call__(  # type: ignore[override]
         self,

c2cwsgiutils/db_maintenance_view.py

@@ -34,7 +34,7 @@ def includeme(config: pyramid.config.Configurator) -> None:
 
 def _db_maintenance(request: pyramid.request.Request) -> Mapping[str, Any]:
     auth.auth_view(request)
-    readonly_param = cast(str, request.params.get("readonly"))
+    readonly_param = cast("str", request.params.get("readonly"))
     if readonly_param is not None:
         readonly = readonly_param.lower() == "true"
 

c2cwsgiutils/debug/_listeners.py

@@ -92,7 +92,7 @@ def _dump_memory_impl(
             cache = linecache.cache
             result[analyze_type]["biggest_objects"] = sorted(
                 ({"filename": k, "size_kb": get_size(v)} for k, v in cache.items()),
-                key=lambda i: -(cast(int, i["size_kb"])),
+                key=lambda i: -(cast("int", i["size_kb"])),
             )
         else:
             biggest_objects.reverse()

c2cwsgiutils/debug/_views.py

@@ -185,7 +185,7 @@ def _add_view(
 
 def _dump_memory_maps(request: pyramid.request.Request) -> list[dict[str, Any]]:
     auth.auth_view(request)
-    return sorted(dump_memory_maps(), key=lambda i: cast(int, -i.get("pss_kb", 0)))
+    return sorted(dump_memory_maps(), key=lambda i: cast("int", -i.get("pss_kb", 0)))
 
 
 def _show_refs(request: pyramid.request.Request) -> pyramid.response.Response:

c2cwsgiutils/health_check.py

@@ -117,7 +117,7 @@ class _OldBinding(_Binding):
         self.prev_bind = None
 
     def name(self) -> str:
-        return cast(str, self.engine.c2c_name)  # type: ignore[attr-defined]
+        return cast("str", self.engine.c2c_name)  # type: ignore[attr-defined]
 
     def __enter__(self) -> _scoped_session:
         self.prev_bind = self.session.bind  # type: ignore[assignment]

c2cwsgiutils/index.py

@@ -459,7 +459,7 @@ def _github_login_callback(request: pyramid.request.Request) -> dict[str, Any]:
             "c2c-auth-jwt",
         ),
         jwt.encode(
-            cast(dict[str, Any], user_information),
+            cast("dict[str, Any]", user_information),
             env_or_settings(
                 settings,
                 GITHUB_AUTH_SECRET_ENV,

c2cwsgiutils/loader.py

@@ -14,7 +14,7 @@ class Loader(BaseLoader):  # type: ignore[misc]
     def _get_defaults(self, defaults: dict[str, str] | None = None) -> dict[str, str]:
         d = get_config_defaults()
         d.update(defaults or {})
-        return cast(dict[str, str], super()._get_defaults(d))
+        return cast("dict[str, str]", super()._get_defaults(d))
 
     def __repr__(self) -> str:
         """Get the object representation."""

c2cwsgiutils/prometheus.py

@@ -3,8 +3,9 @@
 import os
 import re
 import resource
-from collections.abc import Generator, Iterable
-from typing import Any, TypedDict, cast
+from collections.abc import Generator
+from pathlib import Path
+from typing import TYPE_CHECKING, Any, TypedDict, cast
 
 import prometheus_client
 import prometheus_client.core
@@ -16,6 +17,10 @@ import pyramid.config
 from c2cwsgiutils import broadcast, redis_utils
 from c2cwsgiutils.debug.utils import dump_memory_maps
 
+if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+
 PSUTILS = True
 try:
     import psutil
@@ -136,7 +141,7 @@ class MultiProcessCustomCollector(prometheus_client.registry.Collector):
         for channel in MULTI_PROCESS_COLLECTOR_BROADCAST_CHANNELS:
             result = broadcast.broadcast(channel, expect_answers=True)
             if result is not None:
-                results.extend(cast(Iterable[list[SerializedMetric]], result))
+                results.extend(cast("Iterable[list[SerializedMetric]]", result))
         return _deserialize_collected_data(results)
 
 
@@ -192,7 +197,9 @@ class MemoryMapCollector(prometheus_client.registry.Collector):
         )
 
         for pid in (
-            [p for p in os.listdir("/proc/") if _NUMBER_RE.match(p)] if self.pids is None else self.pids
+            [p.name for p in Path("/proc/").iterdir() if _NUMBER_RE.match(p.name)]
+            if self.pids is None
+            else self.pids
         ):
             for e in dump_memory_maps(pid):
                 gauge.add_metric([pid, e["name"]], e[self.memory_type + "_kb"] * 1024)

c2cwsgiutils/scripts/genversion.py

@@ -23,7 +23,7 @@ def _get_package_version(comp: str) -> tuple[str | None, str | None]:
     src_matcher = _SRC_VERSION_RE.match(comp)
     matcher = src_matcher or _VERSION_RE.match(comp)
     if matcher:
-        return cast(tuple[str, str], matcher.groups())
+        return cast("tuple[str, str]", matcher.groups())
     if len(comp) > 0 and comp[:3] != "-e ":
         print("Cannot parse package version: " + comp)
     return None, None

c2cwsgiutils/scripts/stats_db.py

@@ -307,14 +307,14 @@ def main() -> None:
     success = False
     args = _parse_args()
     c2cwsgiutils.setup_process.init(args.config_uri)
-    for _ in range(int(os.environ.get("C2CWSGIUTILS_STATS_DB_TRYNUMBER", 10))):
+    for _ in range(int(os.environ.get("C2CWSGIUTILS_STATS_DB_TRYNUMBER", "10"))):
         try:
             _do_dtats_db(args)
             success = True
             break
         except:  # pylint: disable=bare-except
             _LOG.exception("Exception during run")
-        time.sleep(float(os.environ.get("C2CWSGIUTILS_STATS_DB_SLEEP", 1)))
+        time.sleep(float(os.environ.get("C2CWSGIUTILS_STATS_DB_SLEEP", "1")))
 
     if not success:
         _LOG.error("Not in success, exiting")

c2cwsgiutils/setup_process.py

@@ -102,4 +102,4 @@ def bootstrap_application(
     loader = get_config_loader(config_uri)
     loader.setup_logging(options)
     logging.getLogger(__name__).info("Loading the application from %s", config_uri)
-    return cast(PyramidEnv, bootstrap(config_uri, options=options))
+    return cast("PyramidEnv", bootstrap(config_uri, options=options))

c2cwsgiutils/version.py

@@ -88,7 +88,7 @@ def _read_versions() -> dict[str, dict[str, str]]:
     """Read the version."""
     with _VERSIONS_PATH.open(encoding="utf-8") as file:
         versions = json.load(file)
-    return cast(dict[str, dict[str, str]], versions)
+    return cast("dict[str, dict[str, str]]", versions)
 
 
 def get_version() -> str | None:

{c2cwsgiutils-6.2.0.dev78.dist-info → c2cwsgiutils-6.2.0.dev80.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: c2cwsgiutils
-Version: 6.2.0.dev78
+Version: 6.2.0.dev80
 Summary: Common utilities for Camptocamp WSGI applications
 License: BSD-2-Clause
 Keywords: geo,gis,sqlalchemy,orm,wsgi

{c2cwsgiutils-6.2.0.dev78.dist-info → c2cwsgiutils-6.2.0.dev80.dist-info}/RECORD

@@ -7,30 +7,30 @@ c2cwsgiutils/acceptance/package.json,sha256=ClHsOOzzwKrN7PL-7bcfIGiojA3MNBrk6fP_
 c2cwsgiutils/acceptance/print.py,sha256=i6UxfSuZ8z9grC_P2qn0yU6RXLbNCcopPMOgjc8D1rI,2555
 c2cwsgiutils/acceptance/screenshot.js,sha256=FAJYIWOLJFMm0MNggKzo3mIybtN-VtKLdMzPhQ9pO1g,2041
 c2cwsgiutils/acceptance/utils.py,sha256=zTu-CRL4ZwFrluiM6rPvcGsXsC2Aq_r4L7oVyucQkbY,1920
-c2cwsgiutils/auth.py,sha256=VWilgapDz9bw_1D1UnHrJPLmX546waflQ2-72fbRmHo,9753
+c2cwsgiutils/auth.py,sha256=m_jYHhsT80Qo0eTKZiJ7HDdK2Wl30sL2GMfJ2InW0Pk,9757
 c2cwsgiutils/broadcast/__init__.py,sha256=ZXegEEeBNlVD1k2lBn3EVlBvvRM-My5v34_wJ_ijU6s,4501
 c2cwsgiutils/broadcast/interface.py,sha256=FUK6ZTcqleM3oI3bq_dRPWnbH8Q54fdJzL3Y1QKyE5E,685
 c2cwsgiutils/broadcast/local.py,sha256=I0dT3Y6nRJ4JanEbXQLuKG7aENtmizJR0Y6lRJ7f1mY,1369
 c2cwsgiutils/broadcast/redis.py,sha256=K3sKNCJE0j4N40JOGMh9lhJbAnrAlv14k4ceMiBt8Zk,5447
 c2cwsgiutils/broadcast/utils.py,sha256=0fQZXPu3p_5LEJpGenJwiiMxECQjJhjZBjIkBk8h-ng,272
 c2cwsgiutils/client_info.py,sha256=pik4rMw_GFIEjNVDO0b4aspO_eTLS3ts7dwGXmywdNE,4039
-c2cwsgiutils/config_utils.py,sha256=S_Px7uvx7U36nndor0IIvXOOe5B5mcH-BcklRlkj-dM,1526
+c2cwsgiutils/config_utils.py,sha256=vtMrVFU_fI41rbNrgjD7Msr4d8CXfPU2PRtjExX30E8,1528
 c2cwsgiutils/coverage_setup.py,sha256=4xz9nRoYxC-8cCkMNhE06DGk0pr1azNSQK36u6wgBSM,935
-c2cwsgiutils/db.py,sha256=S9tzxjyTonxP2bEsRSPzd_c_b1eWX8BHdZc-x1UzU3s,16568
-c2cwsgiutils/db_maintenance_view.py,sha256=VzcJ7G8rHQNtIZSDLQxPt_nXZYeJwwsDyPYuHgPmY6w,3073
+c2cwsgiutils/db.py,sha256=EiqoYkVAqXh0i2Tk7qFWmo_ZHBi_KtjaScwT8GTt-RE,16572
+c2cwsgiutils/db_maintenance_view.py,sha256=LvJ-sdbNg8cjiIkfuw8xUBmfRE3iSE3JAXS_BtnNBLg,3075
 c2cwsgiutils/debug/__init__.py,sha256=-MM2PJ1Dhpi7T1CvDO8JpTuO9cnRNv4DFVoCxkCZuLo,1333
-c2cwsgiutils/debug/_listeners.py,sha256=UhKbvnwwOhsuA8Q6RBmQs83lO00yMe--WGVEETaD-yk,4271
-c2cwsgiutils/debug/_views.py,sha256=EmWoIAqBDHbaXaFLYA9PHVlfUPkeXDuKiyasR_go5Kw,8661
+c2cwsgiutils/debug/_listeners.py,sha256=XTtA7ix9FnTCXltGd_wAmq8huYnTaECSk0_RrELJvbE,4273
+c2cwsgiutils/debug/_views.py,sha256=5FZtRiDPE7-fR91AGd0v6SLuzelpHfzTBZemtCVoYNo,8663
 c2cwsgiutils/debug/utils.py,sha256=GpQQ0LgDCJ57IZmJwjIi2GkFAnHPLHeNtDT-zmMbLTY,2338
 c2cwsgiutils/errors.py,sha256=EXb4AODAqn1T3AOaQ-39XlAHfNxjSkgFUJJhciDjrSQ,6748
-c2cwsgiutils/health_check.py,sha256=L7Or5YmZNnupaPsZBz32HnVuj8WN65YP5avHtNu9z-4,20865
-c2cwsgiutils/index.py,sha256=5NbRP2G-GeZhRa7Bv6XB-7-LJlxc_aSPgvxZCnoY49M,17979
-c2cwsgiutils/loader.py,sha256=bvokKtBzC2-GkZGHPuxQPGROd8T5MrnM5u2kRnGdbDQ,1421
+c2cwsgiutils/health_check.py,sha256=KKt2ApRPzUyll9y2tSWC9ot_hK50Vr1ZQyVkvgeR5Ng,20867
+c2cwsgiutils/index.py,sha256=kqdX2Ktj5GCg7s8XVjDKCMtQcjZNofZttF4bpoavdhw,17981
+c2cwsgiutils/loader.py,sha256=dLI1B_k1qWSle-M-7GQyVeJqWee6G3lLunGO0sPlqT4,1423
 c2cwsgiutils/logging_view.py,sha256=TfPNgiLLm86UnTJF1i6J1u8Nnyh8HaUK6pZAZfGJRjY,3491
 c2cwsgiutils/models_graph.py,sha256=Ca09i6SfLJ1i4tHewth3XnY9hccFnkUSlkBi-XoVCSY,2709
 c2cwsgiutils/pretty_json.py,sha256=-BxW_772VK-DuJNWo1hN9VYmTECRrKE_bMD2VysIwCE,1721
 c2cwsgiutils/profiler.py,sha256=NiEMhkpBbvFXZtfk_znC9Msa5CR7Dq4sIMEn4e1W8Lk,758
-c2cwsgiutils/prometheus.py,sha256=_f2tctAIjmp0j6AzQR-G6aci50Vr5AKtNGFbVHfcJMg,8701
+c2cwsgiutils/prometheus.py,sha256=PO-_ppkNumZWdHpgRaJnFDnQaYN5mlxf9_Ky2JGbgvo,8832
 c2cwsgiutils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 c2cwsgiutils/pyramid.py,sha256=t0INCb-kpLdswWALIhSLXNMWT0kTIvjlQRfUbyp8HZ8,1396
 c2cwsgiutils/pyramid_logging.py,sha256=ZuzDwTWMCIAt9mWDdZla-6N6p9cnCkzUaGrt2vtN3d0,3973
@@ -39,12 +39,12 @@ c2cwsgiutils/redis_utils.py,sha256=8lxqVZTMzHMoo-QOxqWLcNdVE7HF8N8JZEH_nocv2NY,4
 c2cwsgiutils/request_tracking/__init__.py,sha256=ONYs7oH5YK90_-0liz6fwP3wQgzC3yHdcBPZf0v_tzA,4194
 c2cwsgiutils/request_tracking/_sql.py,sha256=Z3xVF1Le_2_O2y5K4B2qQy9iqJo4N0uRmYQ6VND5sHw,585
 c2cwsgiutils/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-c2cwsgiutils/scripts/genversion.py,sha256=q_oXVc-DkDikp8BYG4lxD7Y8-vRLe3081sEE3saMkmQ,2041
-c2cwsgiutils/scripts/stats_db.py,sha256=YLVIyMoDsG1lN-raQQb6VJS5kRvW8lJj8nI1-G6WKNo,10611
+c2cwsgiutils/scripts/genversion.py,sha256=rxaoxgH4ZpaLNgGzStLKb0dGkha-ZCLWfzaicu-_m98,2043
+c2cwsgiutils/scripts/stats_db.py,sha256=FY6c8ZaJH6s2Tq923tWISBAYN751ojm8O4KiakHIGx8,10615
 c2cwsgiutils/scripts/test_print.py,sha256=-ofACKJfMF7GJv5eBwCFQKePodpZWxFTbn05AHMm8qQ,2139
 c2cwsgiutils/sentry.py,sha256=eKY3n7Fu-Mtoe_iqKFIlE4cDbCw3nZ2hMZ5gqmOh5ZE,6913
 c2cwsgiutils/services.py,sha256=AxdiH2S8gfEQpOY36R4WqKtJ-3P4OXhx0srTm5G5070,1569
-c2cwsgiutils/setup_process.py,sha256=Ox2Q7T7J9CaZ55Bomg3r1cW5FxKZaMSbfkwGMkbkl7U,3585
+c2cwsgiutils/setup_process.py,sha256=Ew0zsEGN7MyYmaVnYILJI6ciCEf1gXdBN0ymT5wSEnM,3587
 c2cwsgiutils/sql_profiler/__init__.py,sha256=YR8003lCNNGC2eZdyIt5gt76-1frG5szw8IYE_EsQB4,921
 c2cwsgiutils/sql_profiler/_impl.py,sha256=pVaoxQMwfUWLMXRAT7NplgMkGL8KnWjRAwLKh7_5mwg,3816
 c2cwsgiutils/sqlalchemylogger/README.md,sha256=qXfyhGC4Kbt-Ye_geTPm_1InpclhthmKZpc66rqB4as,2018
@@ -60,9 +60,9 @@ c2cwsgiutils/stats_pyramid/__init__.py,sha256=0NizIUbaPbNf6bPye7pGrF9AaFerIN30Eh
 c2cwsgiutils/stats_pyramid/_db_spy.py,sha256=_E5_KFipmsOdqD849mde4EDIlXS7ae0oClZb7GmZRLo,2992
 c2cwsgiutils/stats_pyramid/_pyramid_spy.py,sha256=KFxxKdEKrmDeA1zpps-BPiB2c4hhR2GlgJvq6KOTyjU,3498
 c2cwsgiutils/templates/index.html.mako,sha256=cK8qGBDeQG5SiJJCfvL0oKpgacr7dPKx634AAQivmjA,1416
-c2cwsgiutils/version.py,sha256=3SzSbPTaURGvBHxXomKcN4ZMC1rE5-ksOWlh-_JPqSQ,3154
-c2cwsgiutils-6.2.0.dev78.dist-info/LICENSE,sha256=6bEOU0n7ued3SA-DQCsHQaACONMMRzGHmH5XhDVeD-U,1304
-c2cwsgiutils-6.2.0.dev78.dist-info/METADATA,sha256=ARh6DuRBqPOB8s9nMN8b4ecAr1nDv8RzEECYYVT9icI,36598
-c2cwsgiutils-6.2.0.dev78.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-c2cwsgiutils-6.2.0.dev78.dist-info/entry_points.txt,sha256=ujgqMTL1awN9qDg8WXmrF7m0fgR-hslUM6zKH86pvy0,703
-c2cwsgiutils-6.2.0.dev78.dist-info/RECORD,,
+c2cwsgiutils/version.py,sha256=b8rwN7vATtBWvVKyvxW_-ixbmMJGQBZhW3gNvGdAyVg,3156
+c2cwsgiutils-6.2.0.dev80.dist-info/LICENSE,sha256=6bEOU0n7ued3SA-DQCsHQaACONMMRzGHmH5XhDVeD-U,1304
+c2cwsgiutils-6.2.0.dev80.dist-info/METADATA,sha256=6GDSLVFc976vGRl8kg8DB-wN268H1vFg7tC6PTDdt-8,36598
+c2cwsgiutils-6.2.0.dev80.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+c2cwsgiutils-6.2.0.dev80.dist-info/entry_points.txt,sha256=ujgqMTL1awN9qDg8WXmrF7m0fgR-hslUM6zKH86pvy0,703
+c2cwsgiutils-6.2.0.dev80.dist-info/RECORD,,