csu 2.6.5__tar.gz → 2.6.7__tar.gz

{csu-2.6.5 → csu-2.6.7}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.6.5
+current_version = 2.6.7
 commit = True
 tag = True
 

{csu-2.6.5 → csu-2.6.7}/.cookiecutterrc

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

{csu-2.6.5 → csu-2.6.7}/PKG-INFO

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

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

{csu-2.6.5 → csu-2.6.7}/src/csu/__init__.py

@@ -2,4 +2,4 @@
 a.k.a Clean Slate Utils
 """
 
-__version__ = "2.6.5"
+__version__ = "2.6.7"

{csu-2.6.5 → csu-2.6.7}/src/csu/exceptions.py

@@ -1,6 +1,9 @@
+import math
 from collections import Counter
 from collections.abc import Iterable
+from datetime import datetime
 from importlib.util import find_spec
+from math import ceil
 from os import urandom
 from typing import TYPE_CHECKING
 
@@ -20,11 +23,42 @@ else:
 
     HTTP_503_SERVICE_UNAVAILABLE = 503
 
+event_id_number_table = dict(enumerate("0123456789ABCDEFGHIJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"))
+event_id_number_table_reversed = {v: k for k, v in event_id_number_table.items()}
+event_id_number_table_len = len(event_id_number_table)
+event_id_number_table_digit_ratio = 8 * math.log(2) / math.log(event_id_number_table_len)
 
-def get_event_id():
+
+def get_event_id_datetime(event_id: str) -> datetime:
+    """
+    Returns naive datetime.
+    """
+    return datetime(  # noqa: DTZ001
+        year=event_id_number_table_reversed[event_id[0]],
+        month=event_id_number_table_reversed[event_id[1]],
+        day=event_id_number_table_reversed[event_id[2]],
+        hour=event_id_number_table_reversed[event_id[-3]],
+        minute=event_id_number_table_reversed[event_id[-2]],
+        second=event_id_number_table_reversed[event_id[-1]],
+    )
+
+
+def get_event_id(bytes=3):
     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}")
+    year = event_id_number_table[dt.year % 100]
+    month = event_id_number_table[dt.month]
+    day = event_id_number_table[dt.day]
+    hour = event_id_number_table[dt.hour]
+    minute = event_id_number_table[dt.minute]
+    second = event_id_number_table[dt.second]
+    tag_num = int.from_bytes(urandom(bytes))
+    tag_parts = []
+    while tag_num > 0:
+        tag_num, rem = divmod(tag_num, event_id_number_table_len)
+        tag_parts.append(event_id_number_table[rem])
+    tag = "".join(reversed(tag_parts))
+    tag_pad = ceil(bytes * event_id_number_table_digit_ratio)
+    return dt.strftime(f"{year}{month}{day}{tag:0>{tag_pad}}{hour}{minute}{second}")
 
 
 class TaggedError(Exception):

{csu-2.6.5 → csu-2.6.7}/src/csu/service.py

@@ -113,13 +113,10 @@ class HTTPServiceContext[RTYPE = HTTPServiceResponse]:
         self.proxy = proxy
         self.logger = service.logger
         self.retries = service.retries
-        if event_id:
-            if ":" not in event_id:
-                raise ValueError("Expected a 'date:random:time' structured event id.")
-        else:
+        if event_id is None:
             event_id = get_event_id()
-        date, self.short_id = event_id.split(":", 1)
-        self.event_id = f"{date}:{self.short_id}"
+        self.event_id = event_id
+        self.short_id = event_id[3:-3]
 
     def __enter__(self) -> Self:
         self.client.__enter__()

{csu-2.6.5 → csu-2.6.7}/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.5 → csu-2.6.7}/src/csu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.6.5
+Version: 2.6.7
 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.5.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.6.7.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.6.5...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.6.7...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.5 → csu-2.6.7}/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.5/src/csu → csu-2.6.7/tests}/test_exceptions.py

@@ -1,14 +1,17 @@
+# ruff: noqa: DTZ001
 import traceback
 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
+from csu.exceptions import get_event_id_datetime
 
 
 class OpenFooError(OpenServiceError):
@@ -25,11 +28,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 +43,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__", []) == []
@@ -83,5 +92,20 @@ 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"
+    with time_machine.travel(datetime(2024, 12, 31, 12, 59, 59, microsecond=999999, tzinfo=ZoneInfo("Europe/Bucharest"))):
+        assert get_event_id() == snapshot("PCW0SPpVCzz")
+
+
+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("N1S0004I21f")
+
+    assert get_event_id_datetime("N1R0007620140") == snapshot(datetime(23, 1, 26, hour=1, minute=4))
+
+
+def test_get_event_id_datetime(monkeypatch):
+
+    assert get_event_id_datetime("N1R0007620140") == snapshot(datetime(23, 1, 26, hour=1, minute=4))
+    assert get_event_id_datetime("ZAT0007620AZZ") == snapshot(datetime(34, 10, 28, hour=10, minute=34, second=34))
+    assert get_event_id_datetime("TAT0007620Czz") == snapshot(datetime(28, 10, 28, hour=12, minute=59, second=59))