csu 2.6.4__tar.gz → 2.6.6__tar.gz

{csu-2.6.4 → csu-2.6.6}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.6.4
+current_version = 2.6.6
 commit = True
 tag = True
 

{csu-2.6.4 → csu-2.6.6}/.cookiecutterrc

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

{csu-2.6.4 → csu-2.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.6.4
+Version: 2.6.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.6.4.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.6.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.6.4...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.6.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.6.4 → csu-2.6.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.6.4.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.6.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.6.4...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.6.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.6.4 → csu-2.6.6}/pyproject.toml

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

{csu-2.6.4 → csu-2.6.6}/src/csu/__init__.py

@@ -2,4 +2,4 @@
 a.k.a Clean Slate Utils
 """
 
-__version__ = "2.6.4"
+__version__ = "2.6.6"

{csu-2.6.4 → csu-2.6.6}/src/csu/exceptions.py

@@ -1,3 +1,4 @@
+from base64 import b64encode
 from collections import Counter
 from collections.abc import Iterable
 from importlib.util import find_spec
@@ -23,8 +24,7 @@ else:
 
 def get_event_id():
     dt = now()
-    seconds = dt - dt.replace(second=0, microsecond=0)
-    return dt.strftime(f"%y%m%d:{urandom(4).hex()}:%H%M{seconds.total_seconds():05.2f}")
+    return dt.strftime(f"%y%m%d:{b64encode(urandom(3)).strip(b'=').decode()}:%H%M%S")
 
 
 class TaggedError(Exception):

{csu-2.6.4 → csu-2.6.6}/src/csu/test_service.py

@@ -1,23 +1,14 @@
 from typing import reveal_type
 
-import time_machine
 from niquests import PreparedRequest
 from niquests import Response
 
-from . import exceptions
-from .exceptions import get_event_id
 from .service import AsyncHTTPService
 from .service import AsyncHTTPServiceContext
 from .service import HTTPService
 from .service import HTTPServiceContext
 
 
-def test_get_accident_id(monkeypatch):
-    monkeypatch.setattr(exceptions, "urandom", lambda len: bytes(range(len)))
-    with time_machine.travel(1674777700.5816755):
-        assert get_event_id() == "230127:00010203:020140.58"
-
-
 class CustomResponse:
     def bar(self, x: float) -> float: ...
 

{csu-2.6.4 → csu-2.6.6}/src/csu/views.py

@@ -79,7 +79,9 @@ def exception_handler(
     event_id_field="accident_id",
     message_field="detail",
     error_error_code_field="code",
-):
+    rollback_transaction=True,
+    build_response=True,
+) -> Response | None:
     """
     Returns the response that should be used for any given exception.
 
@@ -106,6 +108,7 @@ def exception_handler(
         if auth_header := getattr(exc, "auth_header", None):
             headers["WWW-Authenticate"] = auth_header
         if wait := getattr(exc, "wait", None):
+            assert isinstance(wait, int), f"Expected exc.wait={wait=!r} to be int!"
             headers["Retry-After"] = f"{wait:d}"
         status_code = exc.status_code
     else:
@@ -154,15 +157,17 @@ def exception_handler(
         exc_info=True,
         extra={"csu_exc": True},
     )
-    set_rollback()
-    response = Response(data, status=status_code, headers=headers)
-    accepted_renderer = getattr(request, "accepted_renderer", None)
-    if not accepted_renderer:
-        accepted_renderer = JSONRenderer()
-    response.accepted_renderer = accepted_renderer
-    response.accepted_media_type = accepted_renderer.media_type
-    response.renderer_context = context
-    return response
+    if rollback_transaction:
+        set_rollback()
+    if build_response:
+        response = Response(data, status=status_code, headers=headers)
+        accepted_renderer = getattr(request, "accepted_renderer", None)
+        if not accepted_renderer:
+            accepted_renderer = JSONRenderer()
+        response.accepted_renderer = accepted_renderer
+        response.accepted_media_type = accepted_renderer.media_type
+        response.renderer_context = context
+        return response
 
 
 def server_error(request, *args, **kwargs):

{csu-2.6.4 → csu-2.6.6}/src/csu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.6.4
+Version: 2.6.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.6.4.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.6.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.6.4...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.6.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.6.4 → csu-2.6.6}/src/csu.egg-info/SOURCES.txt

@@ -36,7 +36,6 @@ src/csu/routers.py
 src/csu/service.py
 src/csu/test_consts.py
 src/csu/test_env.py
-src/csu/test_exceptions.py
 src/csu/test_management.py
 src/csu/test_service.py
 src/csu/test_timezones.py
@@ -83,6 +82,7 @@ src/csu/worker/registry.py
 tests/conftest.py
 tests/exampleworker.py
 tests/test_exampleworker.py
+tests/test_exceptions.py
 tests/test_logging.py
 tests/test_models.py
 tests/test_service.py

{csu-2.6.4/src/csu → csu-2.6.6/tests}/test_exceptions.py

@@ -3,12 +3,13 @@ from datetime import datetime
 from zoneinfo import ZoneInfo
 
 import time_machine
+from inline_snapshot import snapshot
 
-from . import exceptions
-from .exceptions import APIServiceError
-from .exceptions import ExhaustedRetriesError
-from .exceptions import OpenServiceError
-from .exceptions import get_event_id
+from csu import exceptions
+from csu.exceptions import APIServiceError
+from csu.exceptions import ExhaustedRetriesError
+from csu.exceptions import OpenServiceError
+from csu.exceptions import get_event_id
 
 
 class OpenFooError(OpenServiceError):
@@ -25,11 +26,13 @@ def test_open_service_error(monkeypatch):
     monkeypatch.setattr(exceptions, "get_event_id", lambda: 234)
     api_exc = exc.as_api_service_error()
     assert isinstance(api_exc, APIServiceError)
-    assert api_exc.detail == {
-        "accident_id": 234,
-        "code": "unknown",
-        "detail": "Unknown error",
-    }
+    assert api_exc.detail == snapshot(
+        {
+            "accident_id": 234,
+            "code": "unknown",
+            "detail": "Unknown error",
+        }
+    )
 
 
 def test_open_service_error_subclass(monkeypatch):
@@ -38,18 +41,22 @@ def test_open_service_error_subclass(monkeypatch):
     monkeypatch.setattr(exceptions, "get_event_id", lambda: 123)
     api_exc = exc.as_api_service_error()
     assert isinstance(api_exc, APIServiceError)
-    assert api_exc.detail == {
-        "accident_id": 123,
-        "code": "unknown",
-        "detail": "proper foo",
-    }
+    assert api_exc.detail == snapshot(
+        {
+            "accident_id": 123,
+            "code": "unknown",
+            "detail": "proper foo",
+        }
+    )
 
 
 def test_add_note():
     exc = OpenServiceError("My message!", details=[1, 2, Exception(123)], event_id=None)
-    assert exc.__notes__ == [
-        "(1, 2, Exception(123))",
-    ]
+    assert exc.__notes__ == snapshot(
+        [
+            "(1, 2, Exception(123))",
+        ]
+    )
 
     exc = OpenServiceError("My message!", details=[], event_id=None)
     assert getattr(exc, "__notes__", []) == []
@@ -84,4 +91,10 @@ def test_exhausted_retries_error():
 def test_get_event_id(monkeypatch):
     monkeypatch.setattr(exceptions, "urandom", lambda _: b"ZZZ")
     with time_machine.travel(datetime(2024, 12, 12, 1, 2, 3, microsecond=456789, tzinfo=ZoneInfo("Europe/Bucharest"))):
-        assert get_event_id() == "241212:5a5a5a:010203.46"
+        assert get_event_id() == snapshot("241212:Wlpa:010203")
+
+
+def test_get_accident_id(monkeypatch):
+    monkeypatch.setattr(exceptions, "urandom", lambda len: bytes(range(len)))
+    with time_machine.travel(1674777700.5816755):
+        assert get_event_id() == snapshot("230127:AAEC:020140")