csu 2.3.5__tar.gz → 2.3.6__tar.gz

{csu-2.3.5 → csu-2.3.6}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.3.5
+current_version = 2.3.6
 commit = True
 tag = True
 

{csu-2.3.5 → csu-2.3.6}/.cookiecutterrc

@@ -41,7 +41,7 @@ default_context:
     sphinx_theme: furo
     test_matrix_separate_coverage: false
     tests_inside_package: true
-    version: 2.3.5
+    version: 2.3.6
     version_manager: bump2version
     website: https://blog.ionelmc.ro
     year_from: '2024'

{csu-2.3.5 → csu-2.3.6}/.pre-commit-config.yaml

@@ -11,14 +11,14 @@ repos:
       - id: django-upgrade
         args: [ --target-version, "5.2" ]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.10
+    rev: v0.15.17
     hooks:
       - id: ruff
         # Using --unsafe-fixes can change code behavior
         args: [--fix, --exit-non-zero-on-fix, --show-fixes, --unsafe-fixes]
       - id: ruff-format
   - repo: https://github.com/tombi-toml/tombi-pre-commit
-    rev: v0.9.17
+    rev: v1.1.2
     hooks:
       - id: tombi-format
         # args: [ "--offline" ]

{csu-2.3.5 → csu-2.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.3.5
+Version: 2.3.6
 Summary: Clean Slate Utils - bunch of utility code, mostly Django/DRF specific.
 Author-email: Ionel Cristian Mărieș <contact@ionelmc.ro>
 License-Expression: BSD-2-Clause
@@ -69,9 +69,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.3.5.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.3.6.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.3.5...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.3.6...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.3.5 → csu-2.3.6}/README.rst

@@ -34,9 +34,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.3.5.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.3.6.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.3.5...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.3.6...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.3.5 → csu-2.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "csu"
-version = "2.3.5"
+version = "2.3.6"
 description = "Clean Slate Utils - bunch of utility code, mostly Django/DRF specific."
 requires-python = ">=3.14"
 license = "BSD-2-Clause"

{csu-2.3.5 → csu-2.3.6}/src/csu/__init__.py

@@ -2,4 +2,4 @@
 a.k.a Clean Slate Utils
 """
 
-__version__ = "2.3.5"
+__version__ = "2.3.6"

{csu-2.3.5 → csu-2.3.6}/src/csu/service.py

@@ -165,7 +165,7 @@ class HTTPServiceContext[RTYPE = HTTPServiceResponse]:
         self.handle_log_response(response, response.content)
 
     def handle_log_response(self, response: Response | AsyncResponse, content):
-        size = len(content)
+        size = len(content) if content else 0
         content_type = response.headers.get("content-type")
         content_type = "no content-type" if content_type is None else repr(content_type)
         response_line = f" response body ({content_type} - {size} bytes) ".center(LINE_LENGTH, "-")
@@ -334,7 +334,7 @@ class AsyncHTTPServiceContext[RT = HTTPServiceResponse](HTTPServiceContext[RT]):
     async def log_request(self, request: PreparedRequest):
         self.handle_log_request(request)
 
-    async def log_response(self, response: AsyncResponse | Response):
+    async def log_response(self, response: AsyncResponse | Response, **kwargs):
         if isinstance(response, AsyncResponse):
             content = await response.content
         else:

{csu-2.3.5 → csu-2.3.6}/src/csu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.3.5
+Version: 2.3.6
 Summary: Clean Slate Utils - bunch of utility code, mostly Django/DRF specific.
 Author-email: Ionel Cristian Mărieș <contact@ionelmc.ro>
 License-Expression: BSD-2-Clause
@@ -69,9 +69,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.3.5.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.3.6.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.3.5...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.3.6...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

csu-2.3.6/tests/conftest.py

@@ -0,0 +1,186 @@
+import functools
+import itertools
+import sys
+import time
+from datetime import datetime
+from io import BytesIO
+from logging import INFO
+from logging import getLogger
+from pathlib import Path
+from types import SimpleNamespace
+from unittest import mock
+
+import pytest
+from niquests import adapters
+from niquests import async_session
+from niquests import sessions
+from urllib3 import AsyncHTTPConnectionPool
+from urllib3 import AsyncHTTPResponse
+from urllib3 import HTTPHeaderDict
+from vcr.errors import CannotOverwriteExistingCassetteException
+from vcr.patch import CassettePatcherBuilder
+from vcr.request import Request
+
+from csu import exceptions
+
+logger = getLogger(__name__)
+
+_original_async_urlopen = AsyncHTTPConnectionPool.urlopen
+_original_build = CassettePatcherBuilder.build
+
+_DEFAULT_PORTS = {"https": 443, "http": 80}
+
+
+@pytest.fixture(scope="session")
+def vcr_config():
+    return {
+        "decode_compressed_response": True,
+        "match_on": ("method", "scheme", "host", "path", "query"),  # no port because it's random
+    }
+
+
+@pytest.fixture
+def fake_accident_id(monkeypatch):
+    calls = []
+
+    def fake_urandom(_):
+        frame = sys._getframe().f_back.f_back
+        filename = Path(frame.f_code.co_filename).name
+        calls.append(f"{filename}:{frame.f_lineno}")
+        return bytes([len(calls)])
+
+    monkeypatch.setattr(exceptions, "now", lambda: datetime(2024, 12, 12))  # noqa: DTZ001
+    monkeypatch.setattr(exceptions, "urandom", fake_urandom)
+    monkeypatch.setattr(time, "perf_counter", lambda: 0)
+    monkeypatch.setattr(sessions, "preferred_clock", lambda: 0)
+
+    return SimpleNamespace(
+        calls=calls,
+    )
+
+
+def replace(text, replacements: dict[str, str]):
+    for alias, value in replacements.items():
+        text = text.replace(value, f"[&{alias}]")
+    return text
+
+
+@pytest.fixture
+def caplogs(caplog):
+    def get_logs(**replacements):
+        return [replace(f"{record.levelname:7} | {record.message}", replacements) for record in caplog.records]
+
+    with caplog.at_level(INFO, logger="service"):
+        yield SimpleNamespace(
+            get=get_logs,
+        )
+
+
+def _serialize_headers(headers) -> dict[str, list[str]]:
+    out: dict[str, list[str]] = {}
+    for key, val in headers.items():
+        out.setdefault(key, []).append(val)
+    return out
+
+
+def _deserialize_headers(headers: dict[str, list[str]]) -> HTTPHeaderDict:
+    hd = HTTPHeaderDict()
+    for key, values in headers.items():
+        if isinstance(values, list):
+            for v in values:
+                hd.add(key, v)
+        else:
+            hd.add(key, values)
+    return hd
+
+
+def _reconstruct_uri(pool, url: str) -> str:
+    if url.startswith(("http://", "https://")):
+        return url
+    scheme = pool.scheme or "http"
+    host = pool.host
+    port = pool.port
+    port_postfix = f":{port}" if port and port != _DEFAULT_PORTS.get(scheme) else ""
+    return f"{scheme}://{host}{port_postfix}{url}"
+
+
+def _build_async_response(vcr_response) -> AsyncHTTPResponse:
+    headers = dict(vcr_response.get("headers", {}))
+    for k in [h for h in headers if h.lower() == "transfer-encoding"]:
+        del headers[k]
+    body = vcr_response.get("body", {}).get("string", b"")
+    if isinstance(body, str):
+        body = body.encode("utf-8")
+    return AsyncHTTPResponse(
+        body=BytesIO(body),
+        status=vcr_response["status"]["code"],
+        reason=vcr_response["status"]["message"],
+        headers=_deserialize_headers(headers),
+        preload_content=True,
+    )
+
+
+def _make_async_urlopen(cassette):
+    @functools.wraps(_original_async_urlopen)
+    async def vcr_async_urlopen(self, method, url, body=None, headers=None, **kw):
+        if headers is None:
+            headers = {}
+        uri = _reconstruct_uri(self, url)
+        vcr_request = Request(method, uri, body, _serialize_headers(headers))
+
+        if cassette.can_play_response_for(vcr_request):
+            logger.info("Playing response for %s from cassette", vcr_request)
+            return _build_async_response(cassette.play_response(vcr_request))
+
+        if cassette.write_protected and cassette.filter_request(vcr_request):
+            raise CannotOverwriteExistingCassetteException(
+                cassette=cassette,
+                failed_request=vcr_request,
+            )
+
+        logger.info("%s not in cassette, sending to real server", vcr_request)
+        response = await _original_async_urlopen(self, method, url, body=body, headers=headers, **kw)
+        resp_body = response._body
+        if resp_body is None:
+            resp_body = await response.data
+        if isinstance(resp_body, str):
+            resp_body = resp_body.encode("utf-8")
+        cassette.append(
+            vcr_request,
+            {
+                "status": {"code": response.status, "message": response.reason or ""},
+                "headers": _serialize_headers(response.headers),
+                "body": {"string": resp_body or b""},
+            },
+        )
+        return response
+
+    return vcr_async_urlopen
+
+
+def _patched_build(self):
+    return itertools.chain(
+        _original_build(self),
+        (
+            mock.patch.object(
+                AsyncHTTPConnectionPool,
+                "urlopen",
+                _make_async_urlopen(self._cassette),
+            ),
+        ),
+    )
+
+
+@pytest.fixture(scope="session", autouse=True)
+def _vcr_async_urllib3():
+    """Monkey-patch vcrpy so cassettes also cover async urllib3."""
+    CassettePatcherBuilder.build = _patched_build
+    yield
+    CassettePatcherBuilder.build = _original_build
+
+
+@pytest.fixture(autouse=True)
+def vcr_fix(monkeypatch):
+    monkeypatch.setattr(adapters, "preferred_clock", lambda: 0)
+    monkeypatch.setattr(sessions, "preferred_clock", lambda: 0)
+    monkeypatch.setattr(async_session, "preferred_clock", lambda: 0)

{csu-2.3.5 → csu-2.3.6}/tests/test_service_auth.py

@@ -124,23 +124,24 @@ INFO    | [01:000000.00] POST [&HTTPBIN]/post
   Connection: 'keep-alive'
   Content-Length: '15'
   Content-Type: 'application/json;charset=utf-8'
-  User-Agent: 'niquests/3.18.1'
-------------------------------------------------------------- request content --------------------------------------------------------------
+  User-Agent: 'niquests/3.18.6'
+---------------------------------------- request body ('application/json;charset=utf-8' - 15 bytes) ----------------------------------------
    b'{"foobar": 123}'
 ============================================================================================================================================\
 """,
+            "INFO    | Playing response for <Request (POST) [&HTTPBIN]/post> from cassette",
             """\
-INFO    | [01:000000.00] POST [&HTTPBIN]/post => 200 in 0.0105s (H11)
+INFO    | [01:000000.00] POST [&HTTPBIN]/post => 200 in 0.0000s (H0)
 ------------------------------------------------------------- response headers -------------------------------------------------------------
   Access-Control-Allow-Credentials: 'true'
   Access-Control-Allow-Origin: '*'
   Connection: 'Close'
   Content-Length: '356'
   Content-Type: 'application/json'
-  Date: 'Thu, 12 Mar 2026 20:29:34 GMT'
+  Date: 'Thu, 12 Mar 2026 20:21:07 GMT'
   Server: 'Pytest-HTTPBIN/0.1.0'
----------------------------------------------- response body ('application/json' - 356) bytes ----------------------------------------------
-  b'{"args":{},"data":"{\\\\"foobar\\\\": 123}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"15","Content-Type":"application/json;charset=utf-8","Host":"127.0.0.1:35321","User-Agent":"niquests/3.18.1"},"json":{"foobar":123},"origin":"127.0.0.1","url":"[&HTTPBIN]/post"}\\n'
+---------------------------------------------- response body ('application/json' - 356 bytes) ----------------------------------------------
+  b'{"args":{},"data":"{\\\\"foobar\\\\": 123}","files":{},"form":{},"headers":{"Accept":"*/*","Accept-Encoding":"gzip, deflate, br","Connection":"keep-alive","Content-Length":"15","Content-Type":"application/json;charset=utf-8","Host":"127.0.0.1:44101","User-Agent":"niquests/3.18.1"},"json":{"foobar":123},"origin":"127.0.0.1","url":"http://127.0.0.1:44101/post"}\\n'
 ============================================================================================================================================\
 """,
             """\
@@ -149,20 +150,21 @@ INFO    | [01:000000.00] GET [&HTTPBIN]/json
   Accept: '*/*'
   Accept-Encoding: 'gzip, deflate, br'
   Connection: 'keep-alive'
-  User-Agent: 'niquests/3.18.1'
+  User-Agent: 'niquests/3.18.6'
   X-Auth: '123'\
 """,
+            "INFO    | Playing response for <Request (GET) [&HTTPBIN]/json> from cassette",
             """\
-INFO    | [01:000000.00] GET [&HTTPBIN]/json => 200 in 0.0021s (H11)
+INFO    | [01:000000.00] GET [&HTTPBIN]/json => 200 in 0.0000s (H0)
 ------------------------------------------------------------- response headers -------------------------------------------------------------
   Access-Control-Allow-Credentials: 'true'
   Access-Control-Allow-Origin: '*'
   Connection: 'Close'
   Content-Length: '275'
   Content-Type: 'application/json'
-  Date: 'Thu, 12 Mar 2026 20:29:34 GMT'
+  Date: 'Thu, 12 Mar 2026 20:21:07 GMT'
   Server: 'Pytest-HTTPBIN/0.1.0'
----------------------------------------------- response body ('application/json' - 275) bytes ----------------------------------------------
+---------------------------------------------- response body ('application/json' - 275 bytes) ----------------------------------------------
   b'{"slideshow":{"author":"Yours Truly","date":"date of publication","slides":[{"title":"Wake up to WonderWidgets!","type":"all"},{"items":["Why <em>WonderWidgets</em> are great","Who <em>buys</em> WonderWidgets"],"title":"Overview","type":"all"}],"title":"Sample Slide Show"}}\\n'
 ============================================================================================================================================\
 """,

csu-2.3.5/tests/conftest.py

@@ -1,56 +0,0 @@
-import logging
-import sys
-import time
-from datetime import datetime
-from pathlib import Path
-from types import SimpleNamespace
-
-import pytest
-from niquests import sessions
-
-from csu import exceptions
-
-
-@pytest.fixture(scope="session")
-def vcr_config():
-    return {
-        "decode_compressed_response": True,
-        "match_on": ("method", "scheme", "host", "path", "query"),  # no port because it's random
-    }
-
-
-@pytest.fixture
-def fake_accident_id(monkeypatch):
-    calls = []
-
-    def fake_urandom(_):
-        frame = sys._getframe().f_back.f_back
-        filename = Path(frame.f_code.co_filename).name
-        calls.append(f"{filename}:{frame.f_lineno}")
-        return bytes([len(calls)])
-
-    monkeypatch.setattr(exceptions, "now", lambda: datetime(2024, 12, 12))  # noqa: DTZ001
-    monkeypatch.setattr(exceptions, "urandom", fake_urandom)
-    monkeypatch.setattr(time, "perf_counter", lambda: 0)
-    monkeypatch.setattr(sessions, "preferred_clock", lambda: 0)
-
-    return SimpleNamespace(
-        calls=calls,
-    )
-
-
-def replace(text, replacements: dict[str, str]):
-    for alias, value in replacements.items():
-        text = text.replace(value, f"[&{alias}]")
-    return text
-
-
-@pytest.fixture
-def caplogs(caplog):
-    def get_logs(**replacements):
-        return [replace(f"{record.levelname:7} | {record.message}", replacements) for record in caplog.records]
-
-    with caplog.at_level(logging.INFO, logger="service"):
-        yield SimpleNamespace(
-            get=get_logs,
-        )