python3-commons 0.8.32__tar.gz → 0.8.34__tar.gz

{python3_commons-0.8.32 → python3_commons-0.8.34}/.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.7.3
+    rev: 0.7.13
     hooks:
       - id: uv-lock
-      - id: uv-export
+#      - id: uv-export
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.10
+    rev: v0.12.0
     hooks:
       # Run the linter.
       - id: ruff-check

{python3_commons-0.8.32/src/python3_commons.egg-info → python3_commons-0.8.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.32
+Version: 0.8.34
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -12,17 +12,17 @@ Requires-Python: ==3.13.*
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: aiohttp[speedups]~=3.12.2
+Requires-Dist: aiohttp[speedups]~=3.12.13
 Requires-Dist: asyncpg~=0.30.0
 Requires-Dist: fastapi-users-db-sqlalchemy~=7.0.0
 Requires-Dist: fastapi-users[sqlalchemy]~=14.0.1
 Requires-Dist: lxml~=5.4.0
 Requires-Dist: minio~=7.2.15
-Requires-Dist: msgpack~=1.1.0
+Requires-Dist: msgpack~=1.1.1
 Requires-Dist: msgspec~=0.19.0
-Requires-Dist: pydantic[email]~=2.11.5
-Requires-Dist: pydantic-settings~=2.9.1
-Requires-Dist: python-jose==3.4.0
+Requires-Dist: pydantic[email]~=2.11.7
+Requires-Dist: pydantic-settings~=2.10.0
+Requires-Dist: python-jose==3.5.0
 Requires-Dist: SQLAlchemy[asyncio]~=2.0.40
 Requires-Dist: valkey[libvalkey]~=6.1.0
 Requires-Dist: zeep~=4.3.1

{python3_commons-0.8.32 → python3_commons-0.8.34}/pyproject.toml

@@ -19,17 +19,17 @@ keywords = []
 requires-python = "==3.13.*"
 
 dependencies = [
-    "aiohttp[speedups]~=3.12.2",
+    "aiohttp[speedups]~=3.12.13",
     "asyncpg~=0.30.0",
     "fastapi-users-db-sqlalchemy~=7.0.0",
     "fastapi-users[sqlalchemy]~=14.0.1",
     "lxml~=5.4.0",
     "minio~=7.2.15",
-    "msgpack~=1.1.0",
+    "msgpack~=1.1.1",
     "msgspec~=0.19.0",
-    "pydantic[email]~=2.11.5",
-    "pydantic-settings~=2.9.1",
-    "python-jose==3.4.0",
+    "pydantic[email]~=2.11.7",
+    "pydantic-settings~=2.10.0",
+    "python-jose==3.5.0",
     "SQLAlchemy[asyncio]~=2.0.40",
     "valkey[libvalkey]~=6.1.0",
     "zeep~=4.3.1"
@@ -40,14 +40,15 @@ dev = [
     "build",
     "pip==25.1.1",
     "pre-commit==4.2.0",
-    "pyright==1.1.401",
-    "ruff==0.11.11",
-    "setuptools==80.8.0",
+    "pyright==1.1.402",
+    "ruff==0.12.0",
+    "setuptools==80.9.0",
     "setuptools_scm==8.3.1",
     "wheel==0.45.1",
 ]
 testing = [
     "pytest",
+    "pytest-asyncio",
     "pytest-cov",
     "pytest-mock"
 ]

{python3_commons-0.8.32 → python3_commons-0.8.34}/src/python3_commons/serializers/msgspec.py

@@ -2,16 +2,18 @@ import dataclasses
 import json
 import logging
 import struct
-from _decimal import Decimal
 from datetime import date, datetime
-from typing import Any
+from decimal import Decimal
+from typing import Any, Type, TypeVar
 
 from msgspec import msgpack
 from msgspec.msgpack import Ext, encode
+from pydantic import BaseModel
 
 from python3_commons.serializers.json import CustomJSONEncoder
 
 logger = logging.getLogger(__name__)
+T = TypeVar('T')
 
 
 def enc_hook(obj: Any) -> Any:
@@ -45,28 +47,44 @@ MSGPACK_DECODER = msgpack.Decoder(ext_hook=ext_hook)
 MSGPACK_DECODER_NATIVE = msgpack.Decoder()
 
 
-def serialize_msgpack_native(data) -> bytes:
-    return encode(data)
+def serialize_msgpack_native(data: Any) -> bytes:
+    if isinstance(data, BaseModel):
+        data = data.model_dump()
 
+    result = encode(data)
 
-def deserialize_msgpack_native(data: bytes, data_type=None):
+    return result
+
+
+def deserialize_msgpack_native(data: bytes, data_type: Type[T] | None = None) -> T | Any:
     if data_type:
-        result = msgpack.decode(data, type=data_type)
+        if issubclass(data_type, BaseModel):
+            decoded = MSGPACK_DECODER_NATIVE.decode(data)
+            result = data_type.model_validate(decoded)
+        else:
+            result = msgpack.decode(data, type=data_type)
     else:
         result = MSGPACK_DECODER_NATIVE.decode(data)
 
     return result
 
 
-def serialize_msgpack(data) -> bytes:
+def serialize_msgpack(data: Any) -> bytes:
+    if isinstance(data, BaseModel):
+        data = data.model_dump()
+
     result = MSGPACK_ENCODER.encode(data)
 
     return result
 
 
-def deserialize_msgpack(data: bytes, data_type=None):
+def deserialize_msgpack(data: bytes, data_type: Type[T] | None = None) -> T | Any:
     if data_type:
-        result = msgpack.decode(data, type=data_type)
+        if issubclass(data_type, BaseModel):
+            decoded = MSGPACK_DECODER.decode(data)
+            result = data_type.model_validate(decoded)
+        else:
+            result = msgpack.decode(data, type=data_type)
     else:
         result = MSGPACK_DECODER.decode(data)
 

{python3_commons-0.8.32 → python3_commons-0.8.34/src/python3_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.32
+Version: 0.8.34
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -12,17 +12,17 @@ Requires-Python: ==3.13.*
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: aiohttp[speedups]~=3.12.2
+Requires-Dist: aiohttp[speedups]~=3.12.13
 Requires-Dist: asyncpg~=0.30.0
 Requires-Dist: fastapi-users-db-sqlalchemy~=7.0.0
 Requires-Dist: fastapi-users[sqlalchemy]~=14.0.1
 Requires-Dist: lxml~=5.4.0
 Requires-Dist: minio~=7.2.15
-Requires-Dist: msgpack~=1.1.0
+Requires-Dist: msgpack~=1.1.1
 Requires-Dist: msgspec~=0.19.0
-Requires-Dist: pydantic[email]~=2.11.5
-Requires-Dist: pydantic-settings~=2.9.1
-Requires-Dist: python-jose==3.4.0
+Requires-Dist: pydantic[email]~=2.11.7
+Requires-Dist: pydantic-settings~=2.10.0
+Requires-Dist: python-jose==3.5.0
 Requires-Dist: SQLAlchemy[asyncio]~=2.0.40
 Requires-Dist: valkey[libvalkey]~=6.1.0
 Requires-Dist: zeep~=4.3.1

{python3_commons-0.8.32 → python3_commons-0.8.34}/src/python3_commons.egg-info/SOURCES.txt

@@ -48,6 +48,7 @@ src/python3_commons/serializers/msgpack.py
 src/python3_commons/serializers/msgspec.py
 tests/conftest.py
 tests/test_audit.py
+tests/test_cache.py
 tests/test_helpers.py
 tests/test_msgpack.py
 tests/test_msgspec.py

{python3_commons-0.8.32 → python3_commons-0.8.34}/src/python3_commons.egg-info/requires.txt

@@ -1,14 +1,14 @@
-aiohttp[speedups]~=3.12.2
+aiohttp[speedups]~=3.12.13
 asyncpg~=0.30.0
 fastapi-users-db-sqlalchemy~=7.0.0
 fastapi-users[sqlalchemy]~=14.0.1
 lxml~=5.4.0
 minio~=7.2.15
-msgpack~=1.1.0
+msgpack~=1.1.1
 msgspec~=0.19.0
-pydantic[email]~=2.11.5
-pydantic-settings~=2.9.1
-python-jose==3.4.0
+pydantic[email]~=2.11.7
+pydantic-settings~=2.10.0
+python-jose==3.5.0
 SQLAlchemy[asyncio]~=2.0.40
 valkey[libvalkey]~=6.1.0
 zeep~=4.3.1

python3_commons-0.8.34/tests/conftest.py

@@ -0,0 +1,117 @@
+from dataclasses import dataclass
+from datetime import date, datetime
+from decimal import Decimal
+from uuid import UUID, uuid4
+
+import msgspec
+import pytest
+from pydantic import BaseModel
+
+
+@pytest.fixture
+def data_dict():
+    return {
+        'A': 1,
+        'B': 'B',
+        'C': None,
+        'D': datetime(2023, 7, 25, 1, 2, 3),
+        'E': date(2023, 7, 24),
+        'F': Decimal('1.23'),
+    }
+
+
+@dataclass
+class TestData:
+    a: int
+    b: str
+    c: str | None
+    d: datetime
+    e: date
+    f: Decimal
+
+
+@pytest.fixture
+def data_dataclass():
+    return TestData(a=1, b='B', c=None, d=datetime(2023, 7, 25, 1, 2, 3), e=date(2023, 7, 24), f=Decimal('1.23'))
+
+
+class SubStruc(msgspec.Struct):
+    uid: UUID
+    name: str
+
+
+class TestStruct(msgspec.Struct):
+    a: int
+    b: str
+    c: str | None
+    d: datetime
+    e: date
+    f: Decimal
+    sub: SubStruc
+
+
+class PydanticSubStruc(BaseModel):
+    uid: UUID
+    name: str
+
+
+class PydanticTestStruct(BaseModel):
+    a: int
+    b: str
+    c: str | None
+    d: datetime
+    e: date
+    f: Decimal
+    sub: PydanticSubStruc
+
+
+@pytest.fixture
+def msgspec_struct() -> TestStruct:
+    return TestStruct(
+        a=1,
+        b='B',
+        c=None,
+        d=datetime(2023, 7, 25, 1, 2, 3),
+        e=date(2023, 7, 24),
+        f=Decimal('1.23'),
+        sub=SubStruc(uid=uuid4(), name='sub-struct'),
+    )
+
+
+@pytest.fixture
+def pydantic_struct() -> PydanticTestStruct:
+    return PydanticTestStruct(
+        a=1,
+        b='B',
+        c=None,
+        d=datetime(2023, 7, 25, 1, 2, 3),
+        e=date(2023, 7, 24),
+        f=Decimal('1.23'),
+        sub=PydanticSubStruc(uid=uuid4(), name='sub-struct'),
+    )
+
+
+@pytest.fixture
+def s3_file_objects() -> tuple:
+    return (
+        (
+            'file_a.txt',
+            datetime(2024, 1, 1),
+            b'ABCDE',
+        ),
+        (
+            'file_b.txt',
+            datetime(2024, 1, 2),
+            b'FGHIJ',
+        ),
+        (
+            'file_c.txt',
+            datetime(2024, 1, 3),
+            b'KLMNO',
+        ),
+        (
+            'file_d.txt',
+            datetime(2024, 1, 4),
+            b'PQRST',
+        ),
+    )

python3_commons-0.8.34/tests/test_cache.py

@@ -0,0 +1,8 @@
+import pytest
+
+from python3_commons import cache
+
+
+@pytest.mark.asyncio
+async def test_encode_decode_dict_to_msgpack(msgspec_struct):
+    await cache.store('test:key', msgspec_struct, 8 * 3600)

{python3_commons-0.8.32 → python3_commons-0.8.34}/tests/test_msgpack.py

@@ -1,4 +1,4 @@
-from datetime import datetime, date
+from datetime import date, datetime
 from decimal import Decimal
 
 from python3_commons.serializers import msgpack

{python3_commons-0.8.32 → python3_commons-0.8.34}/tests/test_msgspec.py

@@ -16,8 +16,9 @@ def test_encode_decode_dict_to_msgpack(data_dict):
         'F': '1.23',
     }
     binary_data = msgspec.serialize_msgpack(data_dict)
+    deserialized_data = msgspec.deserialize_msgpack(binary_data)
 
-    assert msgspec.deserialize_msgpack(binary_data) == data_dict
+    assert deserialized_data == expected_result
 
 
 def test_encode_decode_dataclass_to_msgpack(data_dataclass):
@@ -26,18 +27,18 @@ def test_encode_decode_dataclass_to_msgpack(data_dataclass):
     assert msgspec.deserialize_msgpack(binary_data, data_type=data_dataclass.__class__) == data_dataclass
 
 
-def test_encode_decode_struct_to_msgpack(data_struct):
-    binary_data = msgspec.serialize_msgpack(data_struct)
-    decoded_struct = msgspec.deserialize_msgpack(binary_data, data_struct.__class__)
+def test_encode_decode_struct_to_msgpack(msgspec_struct):
+    binary_data = msgspec.serialize_msgpack(msgspec_struct)
+    decoded_struct = msgspec.deserialize_msgpack(binary_data, msgspec_struct.__class__)
 
-    assert decoded_struct == data_struct
+    assert decoded_struct == msgspec_struct
 
 
-def test_encode_decode_struct_to_msgpack_native(data_struct):
-    binary_data = msgspec.serialize_msgpack_native(data_struct)
-    decoded_struct = msgspec.deserialize_msgpack_native(binary_data, data_struct.__class__)
+def test_encode_decode_struct_to_msgpack_native(msgspec_struct):
+    binary_data = msgspec.serialize_msgpack_native(msgspec_struct)
+    decoded_struct = msgspec.deserialize_msgpack_native(binary_data, msgspec_struct.__class__)
 
-    assert decoded_struct == data_struct
+    assert decoded_struct == msgspec_struct
 
 
 def test_encode_decode_decimal_to_msgpack():
@@ -54,3 +55,17 @@ def test_encode_decode_str_to_msgpack():
     decoded_value = msgspec.deserialize_msgpack(binary_data)
 
     assert decoded_value == value
+
+
+def test_encode_decode_pydantic_struct_to_msgpack(pydantic_struct):
+    binary_data = msgspec.serialize_msgpack(pydantic_struct)
+    decoded_struct = msgspec.deserialize_msgpack(binary_data, pydantic_struct.__class__)
+
+    assert decoded_struct == pydantic_struct
+
+
+def test_encode_decode_pydantic_struct_to_msgpack_native(pydantic_struct):
+    binary_data = msgspec.serialize_msgpack_native(pydantic_struct)
+    decoded_struct = msgspec.deserialize_msgpack_native(binary_data, pydantic_struct.__class__)
+
+    assert decoded_struct == pydantic_struct