csu 2.3.5__tar.gz → 2.4.0__tar.gz

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

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

{csu-2.3.5 → csu-2.4.0}/.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.4.0
     version_manager: bump2version
     website: https://blog.ionelmc.ro
     year_from: '2024'

{csu-2.3.5 → csu-2.4.0}/.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.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.3.5
+Version: 2.4.0
 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.4.0.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.4.0...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.4.0}/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.4.0.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.4.0...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.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "csu"
-version = "2.3.5"
+version = "2.4.0"
 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.4.0}/src/csu/__init__.py

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

{csu-2.3.5 → csu-2.4.0}/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, "-")
@@ -215,19 +215,14 @@ class HTTPServiceContext[RTYPE = HTTPServiceResponse]:
         else:
             self.logger.warning("[%s] __exit__ !> %r", self.short_id, exc_val)
 
-    def handle_process_response(
-        self,
-        response: Response,
-        *,
-        retry_statuses: set[int],
-        accept_statuses: set[int],
-        json,
-    ) -> RTYPE:
-        if response.status_code in retry_statuses:
-            raise RetryableStatusError(response, accept_statuses, retry_statuses, event_id=self.event_id)
-        elif response.status_code not in accept_statuses:
-            raise UnexpectedStatusError(response, accept_statuses, event_id=self.event_id)
-
+    def handle_process_response(self, response: Response, *, expect_json: bool) -> RTYPE:
+        if expect_json:
+            try:
+                json = response.json(parse_float=Decimal)
+            except Exception as exc:
+                raise DecodeError(response, exc, event_id=self.event_id) from exc
+        else:
+            json = None
         return HTTPServiceResponse(
             status=response.status_code,
             http_response=response,
@@ -300,14 +295,11 @@ class HTTPServiceContext[RTYPE = HTTPServiceResponse]:
             try:
                 self.log_request(prepared_request)
                 response = self.client.send(prepared_request, timeout=self.client.timeout, allow_redirects=follow_redirects, **settings)
-                if expect_json:
-                    try:
-                        json = response.json(parse_float=Decimal)
-                    except Exception as exc:
-                        raise DecodeError(response, exc, event_id=self.event_id) from exc
-                else:
-                    json = None
-                return self.handle_process_response(response, retry_statuses=retry_statuses, accept_statuses=accept_statuses, json=json)
+                if response.status_code in retry_statuses:
+                    raise RetryableStatusError(response, accept_statuses, retry_statuses, event_id=self.event_id)
+                elif response.status_code not in accept_statuses:
+                    raise UnexpectedStatusError(response, accept_statuses, event_id=self.event_id)
+                return self.handle_process_response(response, expect_json=expect_json)
             except (RequestError, RetryableError) as exc:
                 retry_failures.append(exc)
                 self.handle_retriable_failure(method, prepared_request.url, exc, retries_left, retry_budget)
@@ -321,7 +313,7 @@ class HTTPServiceContext[RTYPE = HTTPServiceResponse]:
             raise ExhaustedRetriesError(retry_budget, retry_failures, event_id=self.event_id)
 
 
-class AsyncHTTPServiceContext[RT = HTTPServiceResponse](HTTPServiceContext[RT]):
+class AsyncHTTPServiceContext[RTYPE = HTTPServiceResponse](HTTPServiceContext[RTYPE]):
     auth_class = AsyncHTTPServiceAuth
     client_class = AsyncSession
     client: AsyncSession
@@ -334,7 +326,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:
@@ -345,6 +337,24 @@ class AsyncHTTPServiceContext[RT = HTTPServiceResponse](HTTPServiceContext[RT]):
         await self.client.__aexit__(exc_type, exc_val, exc_tb)
         self.handle_exit(exc_type, exc_val, exc_tb)
 
+    async def handle_process_response(self, response: Response, *, expect_json: bool) -> RTYPE:
+        if expect_json:
+            try:
+                if isinstance(response, AsyncResponse):
+                    json = await response.json(parse_float=Decimal)
+                else:
+                    json = response.json(parse_float=Decimal)
+            except Exception as exc:
+                raise DecodeError(response, exc, event_id=self.event_id) from exc
+        else:
+            json = None
+        return HTTPServiceResponse(
+            status=response.status_code,
+            http_response=response,
+            json=json,
+            event_id=self.event_id,
+        )
+
     async def request(
         self,
         method,
@@ -360,7 +370,7 @@ class AsyncHTTPServiceContext[RT = HTTPServiceResponse](HTTPServiceContext[RT]):
         verify: TLSVerifyType | None = None,
         cert: TLSClientCertType | None = None,
         **kwargs,
-    ) -> RT:
+    ) -> RTYPE:
         retry_statuses = set(retry_statuses)
         accept_statuses = set(accept_statuses)
         assert not (common := sorted(retry_statuses & accept_statuses)), f"{common} is in both retry_statuses and accept_statuses!"
@@ -379,7 +389,7 @@ class AsyncHTTPServiceContext[RT = HTTPServiceResponse](HTTPServiceContext[RT]):
                 **kwargs,
             )
             if prepared_request._asynchronous_auth:
-                # needs a solution with less internals coupling
+                # needs a solution without internals coupling
                 r = await prepared_request._pending_async_auth(prepared_request)
                 prepared_request.__dict__.update(r.__dict__)
                 prepared_request.prepare_content_length(prepared_request.body)
@@ -390,17 +400,11 @@ class AsyncHTTPServiceContext[RT = HTTPServiceResponse](HTTPServiceContext[RT]):
             try:
                 await self.log_request(prepared_request)
                 response = await self.client.send(prepared_request, timeout=self.client.timeout, allow_redirects=follow_redirects, **settings)
-                if expect_json:
-                    try:
-                        if isinstance(response, AsyncResponse):
-                            json = await response.json(parse_float=Decimal)
-                        else:
-                            json = response.json(parse_float=Decimal)
-                    except Exception as exc:
-                        raise DecodeError(response, exc, event_id=self.event_id) from exc
-                else:
-                    json = None
-                return self.handle_process_response(response, retry_statuses=retry_statuses, accept_statuses=accept_statuses, json=json)
+                if response.status_code in retry_statuses:
+                    raise RetryableStatusError(response, accept_statuses, retry_statuses, event_id=self.event_id)
+                elif response.status_code not in accept_statuses:
+                    raise UnexpectedStatusError(response, accept_statuses, event_id=self.event_id)
+                return await self.handle_process_response(response, expect_json=expect_json)
             except (RequestError, RetryableError) as exc:
                 retry_failures.append(exc)
                 self.handle_retriable_failure(method, prepared_request.url, exc, retries_left, retry_budget)
@@ -416,6 +420,7 @@ class AsyncHTTPServiceContext[RT = HTTPServiceResponse](HTTPServiceContext[RT]):
 
 class HTTPService[CT = HTTPServiceContext]:
     context_class: type[CT] = HTTPServiceContext
+    context_defaults: dict = {}
     logger_name: str = "service"
     logger: Logger
     base_url: str
@@ -442,7 +447,7 @@ class HTTPService[CT = HTTPServiceContext]:
         )
 
     def context(self, **kwargs) -> CT:
-        return self.context_class(self, **kwargs)
+        return self.context_class(self, **self.context_defaults, **kwargs)
 
     def auth(self, request: PreparedRequest, context: CT) -> PreparedRequest:
         return request
@@ -452,7 +457,7 @@ class AsyncHTTPService[ACT = AsyncHTTPServiceContext](HTTPService[ACT]):
     context_class: type[AsyncHTTPServiceContext] = AsyncHTTPServiceContext
 
     def context(self, **kwargs) -> ACT:
-        return self.context_class(self, **kwargs)
+        return self.context_class(self, **self.context_defaults, **kwargs)
 
     async def auth(self, request: PreparedRequest, context: ACT) -> PreparedRequest:
         return request

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.3.5
+Version: 2.4.0
 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.4.0.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.4.0...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.4.0}/src/csu.egg-info/SOURCES.txt

@@ -96,7 +96,9 @@ tests/cassettes/test_service/test_error.yaml
 tests/cassettes/test_service/test_logging.yaml
 tests/cassettes/test_service/test_redirects.yaml
 tests/cassettes/test_service_auth/test_async.yaml
+tests/cassettes/test_service_auth/test_async_auth.yaml
 tests/cassettes/test_service_auth/test_sync.yaml
+tests/cassettes/test_service_auth/test_sync_auth.yaml
 tests/testproject/__init__.py
 tests/testproject/models.py
 tests/testproject/settings.py

csu-2.4.0/tests/cassettes/test_service_auth/test_async_auth.yaml

@@ -0,0 +1,110 @@
+interactions:
+- request:
+    body: null
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate, br
+      Authorization:
+      - Basic dXNyOnB3ZA==
+      Connection:
+      - keep-alive
+      User-Agent:
+      - niquests/3.18.6
+    method: GET
+    uri: http://127.0.0.1:37027/basic-auth/usr/pwd
+  response:
+    body:
+      string: "{\n  \"authenticated\": true,\n  \"user\": \"usr\"\n}\n"
+    headers:
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Origin:
+      - '*'
+      Connection:
+      - Close
+      Content-Length:
+      - '45'
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 17 Jun 2026 16:14:27 GMT
+      Server:
+      - Pytest-HTTPBIN/0.1.0
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate, br
+      Authorization:
+      - Basic dXNyOnB3ZA==
+      Connection:
+      - keep-alive
+      User-Agent:
+      - niquests/3.18.6
+    method: GET
+    uri: http://127.0.0.1:40371/basic-auth/usr/pwd
+  response:
+    body:
+      string: "{\n  \"authenticated\": true,\n  \"user\": \"usr\"\n}\n"
+    headers:
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Origin:
+      - '*'
+      Connection:
+      - Close
+      Content-Length:
+      - '45'
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 17 Jun 2026 16:25:16 GMT
+      Server:
+      - Pytest-HTTPBIN/0.1.0
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate, br
+      Authorization:
+      - Basic dXNyOnB3ZA==
+      Connection:
+      - keep-alive
+      User-Agent:
+      - niquests/3.18.6
+    method: GET
+    uri: http://127.0.0.1:38445/basic-auth/quite/bad
+  response:
+    body:
+      string: ''
+    headers:
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Origin:
+      - '*'
+      Connection:
+      - Close
+      Content-Length:
+      - '0'
+      Date:
+      - Wed, 17 Jun 2026 16:25:39 GMT
+      Server:
+      - Pytest-HTTPBIN/0.1.0
+      WWW-Authenticate:
+      - Basic realm="Fake Realm"
+    status:
+      code: 401
+      message: Unauthorized
+version: 1

csu-2.4.0/tests/cassettes/test_service_auth/test_sync_auth.yaml

@@ -0,0 +1,146 @@
+interactions:
+- request:
+    body: null
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate, br
+      Authorization:
+      - Basic dXNyOnB3ZA==
+      Connection:
+      - keep-alive
+      User-Agent:
+      - niquests/3.18.6
+    method: GET
+    uri: http://127.0.0.1:37027/basic-auth/usr/pwd
+  response:
+    body:
+      string: "{\n  \"authenticated\": true,\n  \"user\": \"usr\"\n}\n"
+    headers:
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Origin:
+      - '*'
+      Connection:
+      - Close
+      Content-Length:
+      - '45'
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 17 Jun 2026 16:14:27 GMT
+      Server:
+      - Pytest-HTTPBIN/0.1.0
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate, br
+      Authorization:
+      - Basic dXNyOnB3ZA==
+      Connection:
+      - keep-alive
+      User-Agent:
+      - niquests/3.18.6
+    method: GET
+    uri: http://127.0.0.1:37027/basic-auth/quite/bad
+  response:
+    body:
+      string: ''
+    headers:
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Origin:
+      - '*'
+      Connection:
+      - Close
+      Content-Length:
+      - '0'
+      Date:
+      - Wed, 17 Jun 2026 16:14:27 GMT
+      Server:
+      - Pytest-HTTPBIN/0.1.0
+      WWW-Authenticate:
+      - Basic realm="Fake Realm"
+    status:
+      code: 401
+      message: Unauthorized
+- request:
+    body: null
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate, br
+      Authorization:
+      - Basic dXNyOnB3ZA==
+      Connection:
+      - keep-alive
+      User-Agent:
+      - niquests/3.18.6
+    method: GET
+    uri: http://127.0.0.1:40371/basic-auth/usr/pwd
+  response:
+    body:
+      string: "{\n  \"authenticated\": true,\n  \"user\": \"usr\"\n}\n"
+    headers:
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Origin:
+      - '*'
+      Connection:
+      - Close
+      Content-Length:
+      - '45'
+      Content-Type:
+      - application/json
+      Date:
+      - Wed, 17 Jun 2026 16:25:16 GMT
+      Server:
+      - Pytest-HTTPBIN/0.1.0
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate, br
+      Authorization:
+      - Basic dXNyOnB3ZA==
+      Connection:
+      - keep-alive
+      User-Agent:
+      - niquests/3.18.6
+    method: GET
+    uri: http://127.0.0.1:40371/basic-auth/quite/bad
+  response:
+    body:
+      string: ''
+    headers:
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Origin:
+      - '*'
+      Connection:
+      - Close
+      Content-Length:
+      - '0'
+      Date:
+      - Wed, 17 Jun 2026 16:25:16 GMT
+      Server:
+      - Pytest-HTTPBIN/0.1.0
+      WWW-Authenticate:
+      - Basic realm="Fake Realm"
+    status:
+      code: 401
+      message: Unauthorized
+version: 1