c2cwsgiutils 5.2.3__tar.gz → 5.2.4__tar.gz

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: c2cwsgiutils
-Version: 5.2.3
+Version: 5.2.4
 Summary: Common utilities for Camptocamp WSGI applications
 Home-page: https://github.com/camptocamp/c2cwsgiutils
 License: BSD-2-Clause
@@ -37,9 +37,11 @@ Requires-Dist: cee_syslog_handler ; extra == "standard" or extra == "all"
 Requires-Dist: certifi
 Requires-Dist: cornice ; extra == "standard" or extra == "all"
 Requires-Dist: gunicorn ; extra == "standard" or extra == "all"
+Requires-Dist: idna
 Requires-Dist: lxml ; extra == "standard" or extra == "all"
 Requires-Dist: netifaces ; extra == "standard" or extra == "all"
 Requires-Dist: objgraph ; extra == "standard" or extra == "all"
+Requires-Dist: pillow
 Requires-Dist: psycopg2 ; extra == "standard" or extra == "all"
 Requires-Dist: pyjwt ; extra == "oauth2" or extra == "all"
 Requires-Dist: pyramid ; extra == "standard" or extra == "all"
@@ -52,7 +54,10 @@ Requires-Dist: scikit-image ; extra == "test-images"
 Requires-Dist: scipy
 Requires-Dist: sentry-sdk ; extra == "standard" or extra == "all"
 Requires-Dist: ujson ; extra == "standard" or extra == "all"
+Requires-Dist: urllib3
 Requires-Dist: waitress ; extra == "dev" or extra == "all"
+Requires-Dist: webob
+Requires-Dist: zipp
 Requires-Dist: zope.interface ; extra == "standard" or extra == "all"
 Requires-Dist: zope.sqlalchemy ; extra == "standard" or extra == "all"
 Project-URL: Repository, https://github.com/camptocamp/c2cwsgiutils
@@ -726,3 +731,10 @@ To make a release:
 - Add the new branch name in the `.github/workflows/rebuild.yaml` and
   `.github/workflows/audit.yaml` files.
 
+## Pserve
+
+Pserve will not set the headers in the environment then if you are behind a reverse proxy, you will have
+wrong values in client information, you can force them by using the environment variables:
+`C2CWSGIUTILS_FORCE_PROTO`, `C2CWSGIUTILS_FORCE_HOST` `C2CWSGIUTILS_FORCE_SERVER_NAME` and
+`C2CWSGIUTILS_FORCE_REMOTE_ADDR`.
+

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/README.md

@@ -665,3 +665,10 @@ To make a release:
 - Tag the GIT commit.
 - Add the new branch name in the `.github/workflows/rebuild.yaml` and
   `.github/workflows/audit.yaml` files.
+
+## Pserve
+
+Pserve will not set the headers in the environment then if you are behind a reverse proxy, you will have
+wrong values in client information, you can force them by using the environment variables:
+`C2CWSGIUTILS_FORCE_PROTO`, `C2CWSGIUTILS_FORCE_HOST` `C2CWSGIUTILS_FORCE_SERVER_NAME` and
+`C2CWSGIUTILS_FORCE_REMOTE_ADDR`.

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/acceptance/connection.py

@@ -159,12 +159,29 @@ class Connection:
         cache_expected: CacheExpected = CacheExpected.NO,
         **kwargs: Any,
     ) -> Any:
-        """POST the given URL (relative to the root of API)."""
+        """PUT the given URL (relative to the root of API)."""
         with self.session.put(self.base_url + url, headers=self._merge_headers(headers, cors), **kwargs) as r:
             check_response(r, expected_status, cache_expected)
             self._check_cors(cors, r)
             return _get_json(r)
 
+    def patch_json(
+        self,
+        url: str,
+        expected_status: int = 200,
+        headers: Optional[Mapping[str, str]] = None,
+        cors: bool = True,
+        cache_expected: CacheExpected = CacheExpected.NO,
+        **kwargs: Any,
+    ) -> Any:
+        """PATCH the given URL (relative to the root of API)."""
+        with self.session.patch(
+            self.base_url + url, headers=self._merge_headers(headers, cors), **kwargs
+        ) as r:
+            check_response(r, expected_status, cache_expected)
+            self._check_cors(cors, r)
+            return _get_json(r)
+
     def delete(
         self,
         url: str,

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/auth.py

@@ -217,22 +217,26 @@ def check_access(
     return check_access_config(
         request,
         {
-            "github_repository": env_or_settings(
-                settings,
-                GITHUB_REPOSITORY_ENV,
-                GITHUB_REPOSITORY_PROP,
-                "",
-            )
-            if repo is None
-            else repo,
-            "github_access_type": env_or_settings(
-                settings,
-                GITHUB_ACCESS_TYPE_ENV,
-                GITHUB_ACCESS_TYPE_PROP,
-                "pull",
-            )
-            if access_type is None
-            else access_type,
+            "github_repository": (
+                env_or_settings(
+                    settings,
+                    GITHUB_REPOSITORY_ENV,
+                    GITHUB_REPOSITORY_PROP,
+                    "",
+                )
+                if repo is None
+                else repo
+            ),
+            "github_access_type": (
+                env_or_settings(
+                    settings,
+                    GITHUB_ACCESS_TYPE_ENV,
+                    GITHUB_ACCESS_TYPE_PROP,
+                    "pull",
+                )
+                if access_type is None
+                else access_type
+            ),
         },
     )
 

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/broadcast/__init__.py

@@ -1,4 +1,5 @@
 """Broadcast messages to all the processes of Gunicorn in every containers."""
+
 import functools
 import logging
 import warnings

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/client_info.py

@@ -1,3 +1,4 @@
+import os
 import re
 from typing import Any, Callable, Dict
 
@@ -22,6 +23,15 @@ class Filter:
         else:
             _handle_others(environ)
 
+        if "C2CWSGIUTILS_FORCE_PROTO" in os.environ:
+            environ["wsgi.url_scheme"] = os.environ["C2CWSGIUTILS_FORCE_PROTO"]
+        if "C2CWSGIUTILS_FORCE_HOST" in os.environ:
+            environ["HTTP_HOST"] = os.environ["C2CWSGIUTILS_FORCE_HOST"]
+        if "C2CWSGIUTILS_FORCE_SERVER_NAME" in os.environ:
+            environ["SERVER_NAME"] = os.environ["C2CWSGIUTILS_FORCE_SERVER_NAME"]
+        if "C2CWSGIUTILS_FORCE_REMOTE_ADDR" in os.environ:
+            environ["REMOTE_ADDR"] = os.environ["C2CWSGIUTILS_FORCE_REMOTE_ADDR"]
+
         return self._application(environ, start_response)
 
 

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/config_utils.py

@@ -1,4 +1,5 @@
 """Private utilities."""
+
 import os
 from typing import Any, Callable, Mapping, Optional, cast
 

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/db.py

@@ -1,4 +1,5 @@
 """SQLalchemy models."""
+
 import logging
 import re
 import warnings

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/errors.py

@@ -1,4 +1,5 @@
 """Install exception views to have nice JSON error pages."""
+
 import logging
 import os
 import traceback
@@ -20,7 +21,7 @@ DEPRECATED_ENV_KEY = "ERROR_DETAILS_SECRET"
 LOG = logging.getLogger(__name__)
 STATUS_LOGGER = {
     401: LOG.debug,
-    500: LOG.error
+    500: LOG.error,
     # The rest are warnings
 }
 

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/health_check.py

@@ -4,6 +4,7 @@ Setup an health_check API.
 To use it, create an instance of this class in your application initialization and do a few calls to its
 methods add_db_check()
 """
+
 import configparser
 import copy
 import logging

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/pyramid_logging.py

@@ -10,6 +10,7 @@ To add some info about requests:
 
 A pyramid event handler is installed to setup this filter for the current request.
 """
+
 import json
 import logging
 import logging.config

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/request_tracking/__init__.py

@@ -3,6 +3,7 @@ Allows to track the request_id in the logs, the DB and others.
 
 Adds a c2c_request_id attribute to the Pyramid Request class to access it.
 """
+
 import logging
 import urllib.parse
 import uuid

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/request_tracking/_sql.py

@@ -5,7 +5,7 @@ from pyramid.threadlocal import get_current_request
 from sqlalchemy.orm import Session
 
 
-def _add_session_id(session: Session, _transaction: Any, _connection: Any) -> None:
+def _add_session_id(session: Session, _transaction: Any) -> None:
     request = get_current_request()
     if request is not None:
         session.execute(
@@ -15,4 +15,5 @@ def _add_session_id(session: Session, _transaction: Any, _connection: Any) -> No
 
 def init() -> None:
     """Initialize the SQL alchemy session selector."""
-    sqlalchemy.event.listen(Session, "after_begin", _add_session_id)
+
+    sqlalchemy.event.listen(Session, "after_transaction_create", _add_session_id)

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/setup_process.py

@@ -4,7 +4,6 @@ Used by standalone (non-wsgi) processes to setup all the bits and pieces of c2cw
 Must be imported at the very beginning of the process's life, before any other module is imported.
 """
 
-
 import argparse
 import warnings
 from typing import Any, Callable, Dict, Optional, TypedDict, cast

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/sql_profiler/__init__.py

@@ -3,6 +3,7 @@ A view (URL=/sql_provider) allowing to enabled/disable a SQL spy.
 
 That runs an "EXPLAIN ANALYZE" on every SELECT query going through SQLAlchemy.
 """
+
 import logging
 import warnings
 

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/sql_profiler/_impl.py

@@ -3,6 +3,7 @@ A view (URL=/sql_provider) allowing to enabled/disable a SQL spy.
 
 That runs an "EXPLAIN ANALYZE" on every SELECT query going through SQLAlchemy.
 """
+
 import logging
 import re
 from threading import Lock

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/sqlalchemylogger/handlers.py

@@ -76,7 +76,7 @@ class SQLAlchemyHandler(logging.Handler):
         try:
             self.session.bulk_save_objects(logs)
             self.session.commit()
-        except (SQLAlchemyError):
+        except SQLAlchemyError:
             try:
                 self.create_db()
                 self.session.rollback()
@@ -101,7 +101,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"]),  # type: ignore
+                        sqlalchemy.schema.CreateSchema(self.Log.__table_args__["schema"]),
                     )
         Base.metadata.create_all(self.engine)
 

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/c2cwsgiutils/stats_pyramid/__init__.py

@@ -1,4 +1,5 @@
 """Generate statsd metrics for pyramid and SQLAlchemy events."""
+
 import warnings
 
 import pyramid.config

{c2cwsgiutils-5.2.3 → c2cwsgiutils-5.2.4}/pyproject.toml

@@ -21,7 +21,7 @@ strict = true
 
 [tool.poetry]
 name = "c2cwsgiutils"
-version = "5.2.3"
+version = "5.2.4"
 description = "Common utilities for Camptocamp WSGI applications"
 readme = "README.md"
 authors = ["Camptocamp <info@camptocamp.com>"]
@@ -68,23 +68,23 @@ sentry = "c2cwsgiutils.sentry:filter_factory"
 
 [tool.poetry.dependencies]
 python = ">=3.8,<3.12"
-requests = "2.31.0"
-pyyaml = { version = "6.0.1" }
+requests = "2.32.3"
+pyyaml = { version = "6.0.2" }
 alembic = { version = "1.9.4", optional = true }
 boltons = { version = "21.0.0", optional = true }
 cornice = { version = "6.0.1", optional = true }
-redis = "4.4.4"
-gunicorn = { version = "20.1.0", optional = true }
-lxml = { version = "4.9.3", optional = true }
+redis = { version = "4.4.4", optional = true }
+gunicorn = { version = "22.0.0", optional = true }
+lxml = { version = "4.9.4", optional = true }
 netifaces = { version = "0.11.0", optional = true }
 objgraph = { version = "3.5.0", optional = true }
-psycopg2 = { version = "2.9.6", optional = true }
-pyramid = { version = "2.0.1", optional = true }
+psycopg2 = { version = "2.9.10", optional = true }
+pyramid = { version = "2.0.2", optional = true }
 pyramid-tm = { version = "2.5", optional = true }
-sentry-sdk = { version = "1.14.0", optional = true }
+sentry-sdk = "2.8.0"
 ujson = { version = "5.7.0", optional = true }
 cee_syslog_handler = { version = "0.6.0", optional = true }
-SQLAlchemy = { version = "2.0.15", optional = true }
+SQLAlchemy = { version = "2.0.36", optional = true }
 SQLAlchemy-Utils = { version = "0.39.0", optional = true }
 "zope.interface" = { version = "5.5.2", optional = true }
 "zope.sqlalchemy" = { version = "1.6", optional = true }
@@ -92,8 +92,13 @@ pyjwt = { version = "2.6.0", optional = true }
 requests-oauthlib = { version = "1.3.1", optional = true }
 waitress = { version = "2.1.2", optional = true }
 scikit-image = { version = "0.19.3", optional = true }
-certifi = "2023.7.22"
-scipy = "1.10.1"
+certifi = "2024.7.4"
+scipy = { version = "1.10.1", optional = true }
+pillow = { version = "10.3.0", optional = true }
+urllib3 = "1.26.20"
+idna = { version = "3.7", optional = true }
+zipp = "3.19.3"
+webob = "1.8.9"
 
 [tool.poetry.extras]
 standard = [
@@ -149,16 +154,16 @@ test_images = ["scikit-image"]
 # pylint = { version = "2.15.6" }
 prospector = { extras = ["with_bandit", "with_mypy", "with_pyroma"], version = "1.8.4" }
 coverage = "7.1.0"
-junit2html = "30.1.3"
+junit2html = "30.1.6"
 pytest = "7.2.2"
 pytest-cov = "4.0.0"
 pytest-html = "3.2.0"
-types-pyyaml = "6.0.12.11"
+types-pyyaml = "6.0.12.20240917"
 types-requests = "2.28.11.17"
 types-redis = "4.4.0.6"
 types-ujson = "5.7.0.5"
-types-python-dateutil = "2.8.19.14"
-typing_extensions = "4.4.0"
+types-python-dateutil = "2.8.19.20240311"
+typing_extensions = "4.6.3"
 
 [build-system]
 requires = [