python3-commons 0.9.18__py3-none-any.whl → 0.9.20__py3-none-any.whl

python3_commons/api_client.py

@@ -1,10 +1,12 @@
+import errno
 import logging
+from collections.abc import AsyncGenerator, Mapping, Sequence
 from contextlib import asynccontextmanager
 from datetime import UTC, datetime
 from enum import Enum
 from http import HTTPStatus
 from json import dumps
-from typing import AsyncGenerator, Literal, Mapping, Sequence
+from typing import Literal
 from uuid import uuid4
 
 from aiohttp import ClientResponse, ClientSession, ClientTimeout, client_exceptions
@@ -52,8 +54,8 @@ async def request(
     date_path = now.strftime('%Y/%m/%d')
     timestamp = now.strftime('%H%M%S_%f')
     request_id = str(uuid4())[-12:]
-    uri_path = uri[:-1] if uri.endswith('/') else uri
-    uri_path = uri_path[1:] if uri_path.startswith('/') else uri_path
+    uri_path = uri.removesuffix('/')
+    uri_path = uri_path.removeprefix('/')
     url = f'{u[:-1] if (u := str(base_url)).endswith("/") else u}{uri}'
 
     if audit_name:
@@ -90,15 +92,25 @@ async def request(
                 else:
                     match response.status:
                         case HTTPStatus.UNAUTHORIZED:
-                            raise PermissionError('Unauthorized')
+                            msg = 'Unauthorized'
+
+                            raise PermissionError(msg)
                         case HTTPStatus.FORBIDDEN:
-                            raise PermissionError('Forbidden')
+                            msg = 'Forbidden'
+
+                            raise PermissionError(msg)
                         case HTTPStatus.NOT_FOUND:
-                            raise LookupError('Not found')
+                            msg = 'Not found'
+
+                            raise LookupError(msg)
                         case HTTPStatus.BAD_REQUEST:
-                            raise ValueError('Bad request')
+                            msg = 'Bad request'
+
+                            raise ValueError(msg)
                         case HTTPStatus.TOO_MANY_REQUESTS:
-                            raise InterruptedError('Too many requests')
+                            msg = 'Too many requests'
+
+                            raise InterruptedError(msg)
                         case _:
                             response.raise_for_status()
         else:
@@ -116,13 +128,21 @@ async def request(
 
                 yield response
     except client_exceptions.ClientConnectorError as e:
-        raise ConnectionRefusedError('Cient connection error') from e
+        msg = 'Cient connection error'
+
+        raise ConnectionRefusedError(msg) from e
     except client_exceptions.ClientOSError as e:
-        if e.errno == 32:
-            raise ConnectionResetError('Broken pipe') from e
-        elif e.errno == 104:
-            raise ConnectionResetError('Connection reset by peer') from e
+        if e.errno == errno.EPIPE:
+            msg = 'Broken pipe'
+
+            raise ConnectionResetError(msg) from e
+        elif e.errno == errno.ECONNRESET:
+            msg = 'Connection reset by peer'
+
+            raise ConnectionResetError(msg) from e
 
         raise
     except client_exceptions.ServerDisconnectedError as e:
-        raise ConnectionResetError('Server disconnected') from e
+        msg = 'Server disconnected'
+
+        raise ConnectionResetError(msg) from e

python3_commons/audit.py

@@ -143,8 +143,8 @@ async def write_audit_data(settings: S3Settings, key: str, data: bytes):
             absolute_path = object_storage.get_absolute_path(f'audit/{key}')
 
             await object_storage.put_object(settings.s3_bucket, absolute_path, io.BytesIO(data), len(data))
-        except Exception as e:
-            logger.error(f'Failed storing object in storage: {e}')
+        except Exception:
+            logger.exception('Failed storing object in storage.')
         else:
             logger.debug(f'Stored object in storage: {key}')
     else:

python3_commons/auth.py

@@ -1,6 +1,7 @@
 import logging
+from collections.abc import Callable, Coroutine, MutableMapping, Sequence
 from http import HTTPStatus
-from typing import Annotated, Any, Callable, Coroutine, Sequence, Type, TypeVar
+from typing import Annotated, Any, TypeVar
 
 import aiohttp
 import msgspec
@@ -21,10 +22,7 @@ class TokenData(msgspec.Struct):
 
 
 T = TypeVar('T', bound=TokenData)
-
 OIDC_CONFIG_URL = f'{oidc_settings.authority_url}/.well-known/openid-configuration'
-_JWKS: dict | None = None
-
 bearer_security = HTTPBearer(auto_error=oidc_settings.enabled)
 
 
@@ -32,58 +30,59 @@ async def fetch_openid_config() -> dict:
     """
     Fetch the OpenID configuration (including JWKS URI) from OIDC authority.
     """
-    async with aiohttp.ClientSession() as session:
-        async with session.get(OIDC_CONFIG_URL) as response:
-            if response.status != HTTPStatus.OK:
-                raise HTTPException(
-                    status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail='Failed to fetch OpenID configuration'
-                )
+    async with aiohttp.ClientSession() as session, session.get(OIDC_CONFIG_URL) as response:
+        if response.status != HTTPStatus.OK:
+            raise HTTPException(
+                status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail='Failed to fetch OpenID configuration'
+            )
 
-            return await response.json()
+        return await response.json()
 
 
 async def fetch_jwks(jwks_uri: str) -> dict:
     """
     Fetch the JSON Web Key Set (JWKS) for validating the token's signature.
     """
-    async with aiohttp.ClientSession() as session:
-        async with session.get(jwks_uri) as response:
-            if response.status != HTTPStatus.OK:
-                raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail='Failed to fetch JWKS')
+    async with aiohttp.ClientSession() as session, session.get(jwks_uri) as response:
+        if response.status != HTTPStatus.OK:
+            raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail='Failed to fetch JWKS')
 
-            return await response.json()
+        return await response.json()
 
 
-def get_token_verifier(token_cls: Type[T]) -> Callable[[HTTPAuthorizationCredentials], Coroutine[Any, Any, T | None]]:
+def get_token_verifier[T](
+    token_cls: type[T],
+    jwks: MutableMapping,
+) -> Callable[[HTTPAuthorizationCredentials], Coroutine[Any, Any, T | None]]:
     async def get_verified_token(
         authorization: Annotated[HTTPAuthorizationCredentials, Depends(bearer_security)],
     ) -> T | None:
         """
         Verify the JWT access token using OIDC authority JWKS.
         """
-        global _JWKS
-
         if not oidc_settings.enabled:
             return None
 
         token = authorization.credentials
 
         try:
-            if not _JWKS:
+            if not jwks:
                 openid_config = await fetch_openid_config()
-                _JWKS = await fetch_jwks(openid_config['jwks_uri'])
+                _jwks = await fetch_jwks(openid_config['jwks_uri'])
+                jwks.clear()
+                jwks.update(_jwks)
 
             if oidc_settings.client_id:
-                payload = jwt.decode(token, _JWKS, algorithms=['RS256'], audience=oidc_settings.client_id)
+                payload = jwt.decode(token, jwks, algorithms=['RS256'], audience=oidc_settings.client_id)
             else:
-                payload = jwt.decode(token, _JWKS, algorithms=['RS256'])
+                payload = jwt.decode(token, jwks, algorithms=['RS256'])
 
             token_data = token_cls(**payload)
-
-            return token_data
-        except jwt.ExpiredSignatureError:
-            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail='Token has expired')
+        except jwt.ExpiredSignatureError as e:
+            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail='Token has expired') from e
         except JWTError as e:
-            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail=f'Token is invalid: {str(e)}')
+            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail=f'Token is invalid: {str(e)}') from e
+
+        return token_data
 
     return get_verified_token

python3_commons/cache.py

@@ -1,7 +1,8 @@
 import logging
 import socket
+from collections.abc import Mapping, Sequence
 from platform import platform
-from typing import Any, Mapping, Sequence
+from typing import Any
 
 import valkey
 from pydantic import RedisDsn
@@ -34,7 +35,7 @@ class AsyncValkeyClient(metaclass=SingletonMeta):
 
     @staticmethod
     def _get_keepalive_options():
-        if platform == 'linux' or platform == 'darwin':
+        if platform in {'linux', 'darwin'}:
             return {socket.TCP_KEEPIDLE: 10, socket.TCP_KEEPINTVL: 5, socket.TCP_KEEPCNT: 5}
         else:
             return {}
@@ -88,7 +89,7 @@ async def delete(*names: str | bytes | memoryview):
     await get_valkey_client().delete(*names)
 
 
-async def store_bytes(name: str, data: bytes, ttl: int = None, if_not_set: bool = False):
+async def store_bytes(name: str, data: bytes, ttl: int = None, *, if_not_set: bool = False):
     r = get_valkey_client()
 
     return await r.set(name, data, ex=ttl, nx=if_not_set)
@@ -100,8 +101,8 @@ async def get_bytes(name: str) -> bytes | None:
     return await r.get(name)
 
 
-async def store(name: str, obj: Any, ttl: int = None, if_not_set: bool = False):
-    return await store_bytes(name, serialize_msgpack_native(obj), ttl, if_not_set)
+async def store(name: str, obj: Any, ttl: int = None, *, if_not_set: bool = False):
+    return await store_bytes(name, serialize_msgpack_native(obj), ttl, if_not_set=if_not_set)
 
 
 async def get(name: str, default=None, data_type: Any = None) -> Any:
@@ -130,8 +131,8 @@ async def store_sequence(name: str, data: Sequence, ttl: int = None):
 
             if ttl:
                 await r.expire(name, ttl)
-        except valkey.exceptions.ConnectionError as e:
-            logger.error(f'Failed to store sequence in cache: {e}')
+        except valkey.exceptions.ConnectionError:
+            logger.exception('Failed to store sequence in cache.')
 
 
 async def get_sequence(name: str, _type: type = list) -> Sequence:
@@ -150,8 +151,8 @@ async def store_dict(name: str, data: Mapping, ttl: int = None):
 
             if ttl:
                 await r.expire(name, ttl)
-        except valkey.exceptions.ConnectionError as e:
-            logger.error(f'Failed to store dict in cache: {e}')
+        except valkey.exceptions.ConnectionError:
+            logger.exception('Failed to store dict in cache.')
 
 
 async def get_dict(name: str, value_data_type=None) -> dict | None:
@@ -174,8 +175,8 @@ async def set_dict(name: str, mapping: dict, ttl: int = None):
 
             if ttl:
                 await r.expire(name, ttl)
-        except valkey.exceptions.ConnectionError as e:
-            logger.error(f'Failed to set dict in cache: {e}')
+        except valkey.exceptions.ConnectionError:
+            logger.exception('Failed to set dict in cache.')
 
 
 async def get_dict_item(name: str, key: str, data_type=None, default=None):
@@ -184,28 +185,28 @@ async def get_dict_item(name: str, key: str, data_type=None, default=None):
 
         if data := await r.hget(name, key):
             return deserialize_msgpack_native(data, data_type)
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to get dict item from cache.')
 
-        return default
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to get dict item from cache: {e}')
+        return None
 
-    return None
+    return default
 
 
 async def set_dict_item(name: str, key: str, obj: Any):
     try:
         r = get_valkey_client()
         await r.hset(name, key, serialize_msgpack_native(obj))
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to set dict item in cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to set dict item in cache.')
 
 
 async def delete_dict_item(name: str, *keys):
     try:
         r = get_valkey_client()
         await r.hdel(name, *keys)
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to delete dict item from cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to delete dict item from cache.')
 
 
 async def store_set(name: str, value: set, ttl: int = None):
@@ -215,8 +216,8 @@ async def store_set(name: str, value: set, ttl: int = None):
 
         if ttl:
             await r.expire(name, ttl)
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to store set in cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to store set in cache.')
 
 
 async def has_set_item(name: str, value: str) -> bool:
@@ -224,8 +225,8 @@ async def has_set_item(name: str, value: str) -> bool:
         r = get_valkey_client()
 
         return await r.sismember(name, serialize_msgpack_native(value)) == 1
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to check if set has item in cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to check if set has item in cache.')
 
     return False
 
@@ -234,8 +235,8 @@ async def add_set_item(name: str, *values: str):
     try:
         r = get_valkey_client()
         await r.sadd(name, *map(serialize_msgpack_native, values))
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to add set item into cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to add set item into cache.')
 
 
 async def delete_set_item(name: str, value: str):
@@ -249,8 +250,8 @@ async def get_set_members(name: str) -> set[str] | None:
         smembers = await r.smembers(name)
 
         return set(map(deserialize_msgpack_native, smembers))
-    except valkey.exceptions.ConnectionError as e:
-        logger.error(f'Failed to get set members from cache: {e}')
+    except valkey.exceptions.ConnectionError:
+        logger.exception('Failed to get set members from cache.')
 
     return None
 

python3_commons/db/__init__.py

@@ -1,6 +1,6 @@
 import contextlib
 import logging
-from typing import AsyncGenerator, Callable, Mapping
+from collections.abc import AsyncGenerator, Callable, Mapping
 
 from sqlalchemy import MetaData
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, async_engine_from_config
@@ -24,7 +24,7 @@ class AsyncSessionManager:
         try:
             return self.db_settings[name]
         except KeyError:
-            logger.error(f'Missing database settings: {name}')
+            logger.exception(f'Missing database settings: {name}')
 
             raise
 
@@ -63,8 +63,8 @@ class AsyncSessionManager:
 
         return session_maker
 
-    def get_async_session(self, name: str) -> Callable[[], AsyncGenerator[AsyncSession, None]]:
-        async def get_session() -> AsyncGenerator[AsyncSession, None]:
+    def get_async_session(self, name: str) -> Callable[[], AsyncGenerator[AsyncSession]]:
+        async def get_session() -> AsyncGenerator[AsyncSession]:
             session_maker = self.get_session_maker(name)
 
             async with session_maker() as session:
@@ -83,7 +83,7 @@ async def is_healthy(engine: AsyncEngine) -> bool:
             result = await conn.execute('SELECT 1;')
 
             return result.scalar() == 1
-    except Exception as e:
-        logger.error(f'Database connection is not healthy: {e}')
+    except Exception:
+        logger.exception('Database connection is not healthy.')
 
         return False

python3_commons/db/helpers.py

@@ -1,5 +1,5 @@
 import logging
-from typing import Mapping
+from collections.abc import Mapping
 
 import sqlalchemy as sa
 from sqlalchemy import asc, desc, func
@@ -26,11 +26,12 @@ def get_query(
         for order_by_col in order_by.split(','):
             if order_by_col.startswith('-'):
                 direction = desc
-                order_by_col = order_by_col[1:]
+                order_by_col_clean = order_by_col[1:]
             else:
                 direction = asc
+                order_by_col_clean = order_by_col
 
-            order_by_cols[order_by_col] = direction
+            order_by_cols[order_by_col_clean] = direction
 
         order_by_clauses = tuple(
             direction(columns[order_by_col][0]) for order_by_col, direction in order_by_cols.items()
@@ -54,9 +55,6 @@ def get_query(
     else:
         where_parts = None
 
-    if where_parts:
-        where_clause = sa.and_(*where_parts)
-    else:
-        where_clause = None
+    where_clause = sa.and_(*where_parts) if where_parts else None
 
     return where_clause, order_by_clauses

python3_commons/fs.py

@@ -1,8 +1,8 @@
+from collections.abc import Generator
 from pathlib import Path
-from typing import Generator
 
 
-def iter_files(root: Path, recursive: bool = True) -> Generator[Path, None, None]:
+def iter_files(root: Path, *, recursive: bool = True) -> Generator[Path]:
     for item in root.iterdir():
         if item.is_file():
             yield item

python3_commons/helpers.py

@@ -6,11 +6,12 @@ import threading
 import time
 from abc import ABCMeta
 from collections import defaultdict
+from collections.abc import Mapping, Sequence
 from datetime import date, datetime, timedelta
 from decimal import ROUND_HALF_UP, Decimal
 from http.cookies import BaseCookie
 from json import dumps
-from typing import Literal, Mapping, Sequence
+from typing import Literal
 from urllib.parse import urlencode
 
 from python3_commons.serializers.json import CustomJSONEncoder
@@ -34,7 +35,7 @@ class SingletonMeta(ABCMeta):
                 try:
                     return cls.__instances[cls]
                 except KeyError:
-                    instance = super(SingletonMeta, cls).__call__(*args, **kwargs)
+                    instance = super().__call__(*args, **kwargs)
                     cls.__instances[cls] = instance
 
                     return instance
@@ -66,9 +67,9 @@ def tries(times):
                 # noinspection PyBroadException
                 try:
                     return await f(*args, **kwargs)
-                except Exception as exc:
+                except Exception:
                     if _time >= times:
-                        raise exc
+                        raise
 
         return wrapper
 

python3_commons/object_storage.py

@@ -1,16 +1,18 @@
 from __future__ import annotations
 
-import io
 import logging
 from contextlib import asynccontextmanager
-from datetime import datetime
-from typing import TYPE_CHECKING, AsyncGenerator, Iterable, Mapping, Sequence
+from typing import TYPE_CHECKING
 
 import aiobotocore.session
-from aiobotocore.response import StreamingBody
 from botocore.config import Config
 
 if TYPE_CHECKING:
+    import io
+    from collections.abc import AsyncGenerator, Iterable, Mapping, Sequence
+    from datetime import datetime
+
+    from aiobotocore.response import StreamingBody
     from types_aiobotocore_s3.client import S3Client
 
 from python3_commons.conf import S3Settings, s3_settings
@@ -41,14 +43,13 @@ class ObjectStorage(metaclass=SingletonMeta):
         self._config = config
 
     @asynccontextmanager
-    async def get_client(self) -> AsyncGenerator[S3Client, None]:
+    async def get_client(self) -> AsyncGenerator[S3Client]:
         async with self._session.create_client('s3', **self._config) as client:
             yield client
 
 
 def get_absolute_path(path: str) -> str:
-    if path.startswith('/'):
-        path = path[1:]
+    path = path.removeprefix('/')
 
     if bucket_root := s3_settings.s3_bucket_root:
         path = f'{bucket_root[:1] if bucket_root.startswith("/") else bucket_root}/{path}'
@@ -66,14 +67,13 @@ async def put_object(bucket_name: str, path: str, data: io.BytesIO, length: int,
             await s3_client.put_object(Bucket=bucket_name, Key=path, Body=data, ContentLength=length)
 
             logger.debug(f'Stored object into object storage: {bucket_name}:{path}')
-
-            return f's3://{bucket_name}/{path}'
-
         except Exception as e:
-            logger.error(f'Failed to put object to object storage: {bucket_name}:{path}', exc_info=e)
+            logger.exception(f'Failed to put object to object storage: {bucket_name}:{path}', exc_info=e)
 
             raise
 
+        return f's3://{bucket_name}/{path}'
+
 
 @asynccontextmanager
 async def get_object_stream(bucket_name: str, path: str) -> AsyncGenerator[StreamingBody]:
@@ -88,7 +88,7 @@ async def get_object_stream(bucket_name: str, path: str) -> AsyncGenerator[Strea
             async with response['Body'] as stream:
                 yield stream
         except Exception as e:
-            logger.debug(f'Failed getting object from object storage: {bucket_name}:{path}', exc_info=e)
+            logger.exception(f'Failed getting object from object storage: {bucket_name}:{path}', exc_info=e)
 
             raise
 
@@ -102,7 +102,7 @@ async def get_object(bucket_name: str, path: str) -> bytes:
     return body
 
 
-async def list_objects(bucket_name: str, prefix: str, recursive: bool = True) -> AsyncGenerator[Mapping, None]:
+async def list_objects(bucket_name: str, prefix: str, *, recursive: bool = True) -> AsyncGenerator[Mapping]:
     storage = ObjectStorage(s3_settings)
 
     async with storage.get_client() as s3_client:
@@ -117,9 +117,9 @@ async def list_objects(bucket_name: str, prefix: str, recursive: bool = True) ->
 
 
 async def get_object_streams(
-    bucket_name: str, path: str, recursive: bool = True
-) -> AsyncGenerator[tuple[str, datetime, StreamingBody], None]:
-    async for obj in list_objects(bucket_name, path, recursive):
+    bucket_name: str, path: str, *, recursive: bool = True
+) -> AsyncGenerator[tuple[str, datetime, StreamingBody]]:
+    async for obj in list_objects(bucket_name, path, recursive=recursive):
         object_name = obj['Key']
         last_modified = obj['LastModified']
 
@@ -128,9 +128,9 @@ async def get_object_streams(
 
 
 async def get_objects(
-    bucket_name: str, path: str, recursive: bool = True
-) -> AsyncGenerator[tuple[str, datetime, bytes], None]:
-    async for object_name, last_modified, stream in get_object_streams(bucket_name, path, recursive):
+    bucket_name: str, path: str, *, recursive: bool = True
+) -> AsyncGenerator[tuple[str, datetime, bytes]]:
+    async for object_name, last_modified, stream in get_object_streams(bucket_name, path, recursive=recursive):
         data = await stream.read()
 
         yield object_name, last_modified, data
@@ -144,7 +144,7 @@ async def remove_object(bucket_name: str, object_name: str):
             await s3_client.delete_object(Bucket=bucket_name, Key=object_name)
             logger.debug(f'Removed object from object storage: {bucket_name}:{object_name}')
         except Exception as e:
-            logger.error(f'Failed to remove object from object storage: {bucket_name}:{object_name}', exc_info=e)
+            logger.exception(f'Failed to remove object from object storage: {bucket_name}:{object_name}', exc_info=e)
 
             raise
 
@@ -155,13 +155,12 @@ async def remove_objects(
     storage = ObjectStorage(s3_settings)
 
     async with storage.get_client() as s3_client:
-        objects_to_delete = []
-
         if prefix:
-            async for obj in list_objects(bucket_name, prefix, recursive=True):
-                objects_to_delete.append({'Key': obj['Key']})
+            objects_to_delete = tuple(
+                {'Key': obj['Key']} async for obj in list_objects(bucket_name, prefix, recursive=True)
+            )
         elif object_names:
-            objects_to_delete = [{'Key': name} for name in object_names]
+            objects_to_delete = tuple({'Key': name} for name in object_names)
         else:
             return None
 
@@ -182,9 +181,9 @@ async def remove_objects(
                     errors.extend(response['Errors'])
 
             logger.debug(f'Removed {len(objects_to_delete)} objects from object storage: {bucket_name}')
-
-            return errors if errors else None
         except Exception as e:
-            logger.error(f'Failed to remove objects from object storage: {bucket_name}', exc_info=e)
+            logger.exception(f'Failed to remove objects from object storage: {bucket_name}', exc_info=e)
 
             raise
+
+        return errors if errors else None

python3_commons/serializers/common.py

@@ -0,0 +1,8 @@
+from enum import IntEnum
+
+
+class ExtendedType(IntEnum):
+    DECIMAL = 1
+    DATETIME = 2
+    DATE = 3
+    DATACLASS = 4

python3_commons/serializers/json.py

@@ -10,11 +10,9 @@ from typing import Any
 class CustomJSONEncoder(json.JSONEncoder):
     def default(self, o) -> Any:
         try:
-            return super(CustomJSONEncoder, self).default(o)
+            return super().default(o)
         except TypeError:
-            if isinstance(o, datetime):
-                return o.isoformat()
-            elif isinstance(o, date):
+            if isinstance(o, (datetime, date)):
                 return o.isoformat()
             elif isinstance(o, bytes):
                 return base64.b64encode(o).decode('ascii')

python3_commons/serializers/msgpack.py

@@ -7,6 +7,7 @@ from decimal import Decimal
 import msgpack
 from msgpack import ExtType
 
+from python3_commons.serializers.common import ExtendedType
 from python3_commons.serializers.json import CustomJSONEncoder
 
 logger = logging.getLogger(__name__)
@@ -14,26 +15,27 @@ logger = logging.getLogger(__name__)
 
 def msgpack_encoder(obj):
     if isinstance(obj, Decimal):
-        return ExtType(1, str(obj).encode())
+        return ExtType(ExtendedType.DECIMAL, str(obj).encode())
     elif isinstance(obj, datetime):
-        return ExtType(2, obj.isoformat().encode())
+        return ExtType(ExtendedType.DATETIME, obj.isoformat().encode())
     elif isinstance(obj, date):
-        return ExtType(3, obj.isoformat().encode())
+        return ExtType(ExtendedType.DATE, obj.isoformat().encode())
     elif dataclasses.is_dataclass(obj):
-        return ExtType(4, json.dumps(dataclasses.asdict(obj), cls=CustomJSONEncoder).encode())
+        return ExtType(ExtendedType.DATACLASS, json.dumps(dataclasses.asdict(obj), cls=CustomJSONEncoder).encode())
 
     return f'no encoder for {obj}'
 
 
 def msgpack_decoder(code, data):
-    if code == 1:
-        return Decimal(data.decode())
-    elif code == 2:
-        return datetime.fromisoformat(data.decode())
-    elif code == 3:
-        return date.fromisoformat(data.decode())
-    elif code == 4:
-        return json.loads(data)
+    match code:
+        case ExtendedType.DECIMAL:
+            return Decimal(data.decode())
+        case ExtendedType.DATETIME:
+            return datetime.fromisoformat(data.decode())
+        case ExtendedType.DATE:
+            return date.fromisoformat(data.decode())
+        case ExtendedType.DATACLASS:
+            return json.loads(data)
 
     return f'no decoder for type {code}'
 

python3_commons/serializers/msgspec.py

@@ -4,12 +4,13 @@ import logging
 import struct
 from datetime import date, datetime
 from decimal import Decimal
-from typing import Any, Type, TypeVar
+from typing import Any, TypeVar
 
 from msgspec import msgpack
 from msgspec.msgpack import Ext, encode
 from pydantic import BaseModel
 
+from python3_commons.serializers.common import ExtendedType
 from python3_commons.serializers.json import CustomJSONEncoder
 
 logger = logging.getLogger(__name__)
@@ -18,28 +19,36 @@ T = TypeVar('T')
 
 def enc_hook(obj: Any) -> Any:
     if isinstance(obj, Decimal):
-        return Ext(1, struct.pack('b', str(obj).encode()))
+        return Ext(ExtendedType.DECIMAL, struct.pack('b', str(obj).encode()))
     elif isinstance(obj, datetime):
-        return Ext(2, struct.pack('b', obj.isoformat().encode()))
+        return Ext(ExtendedType.DATETIME, struct.pack('b', obj.isoformat().encode()))
     elif isinstance(obj, date):
-        return Ext(3, struct.pack('b', obj.isoformat().encode()))
+        return Ext(ExtendedType.DATE, struct.pack('b', obj.isoformat().encode()))
     elif dataclasses.is_dataclass(obj):
-        return Ext(4, struct.pack('b', json.dumps(dataclasses.asdict(obj), cls=CustomJSONEncoder).encode()))
+        return Ext(
+            ExtendedType.DATACLASS,
+            struct.pack('b', json.dumps(dataclasses.asdict(obj), cls=CustomJSONEncoder).encode()),
+        )
 
-    raise NotImplementedError(f'Objects of type {type(obj)} are not supported')
+    msg = f'Objects of type {type(obj)} are not supported'
+
+    raise NotImplementedError(msg)
 
 
 def ext_hook(code: int, data: memoryview) -> Any:
-    if code == 1:
-        return Decimal(data.tobytes().decode())
-    elif code == 2:
-        return datetime.fromisoformat(data.tobytes().decode())
-    elif code == 3:
-        return date.fromisoformat(data.tobytes().decode())
-    elif code == 4:
-        return json.loads(data.tobytes())
+    match code:
+        case ExtendedType.DECIMAL:
+            return Decimal(data.tobytes().decode())
+        case ExtendedType.DATETIME:
+            return datetime.fromisoformat(data.tobytes().decode())
+        case ExtendedType.DATE:
+            return date.fromisoformat(data.tobytes().decode())
+        case ExtendedType.DATACLASS:
+            return json.loads(data.tobytes())
+        case _:
+            msg = f'Extension type code {code} is not supported'
 
-    raise NotImplementedError(f'Extension type code {code} is not supported')
+            raise NotImplementedError(msg)
 
 
 MSGPACK_ENCODER = msgpack.Encoder(enc_hook=enc_hook)
@@ -56,7 +65,7 @@ def serialize_msgpack_native(data: Any) -> bytes:
     return result
 
 
-def deserialize_msgpack_native(data: bytes, data_type: Type[T] | None = None) -> T | Any:
+def deserialize_msgpack_native[T](data: bytes, data_type: type[T] | None = None) -> T | Any:
     if data_type:
         if issubclass(data_type, BaseModel):
             decoded = MSGPACK_DECODER_NATIVE.decode(data)
@@ -78,7 +87,7 @@ def serialize_msgpack(data: Any) -> bytes:
     return result
 
 
-def deserialize_msgpack(data: bytes, data_type: Type[T] | None = None) -> T | Any:
+def deserialize_msgpack[T](data: bytes, data_type: type[T] | None = None) -> T | Any:
     if data_type:
         if issubclass(data_type, BaseModel):
             decoded = MSGPACK_DECODER.decode(data)

{python3_commons-0.9.18.dist-info → python3_commons-0.9.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.9.18
+Version: 0.9.20
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -17,15 +17,15 @@ Requires-Dist: aiohttp[speedups]~=3.12.15
 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~=6.0.1
+Requires-Dist: lxml~=6.0.2
 Requires-Dist: msgpack~=1.1.1
 Requires-Dist: msgspec~=0.19.0
-Requires-Dist: pydantic[email]~=2.11.7
+Requires-Dist: pydantic[email]~=2.11.9
 Requires-Dist: pydantic-settings~=2.10.1
 Requires-Dist: python-jose==3.5.0
 Requires-Dist: SQLAlchemy[asyncio]~=2.0.43
 Requires-Dist: valkey[libvalkey]~=6.1.1
-Requires-Dist: zeep~=4.3.1
+Requires-Dist: zeep~=4.3.2
 Dynamic: license-file
 
 Re-usable Python3 code

python3_commons-0.9.20.dist-info/RECORD

@@ -0,0 +1,30 @@
+python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
+python3_commons/api_client.py,sha256=0PE8iYW5zq7n89veC6afSkwj_fzD_nldBc5wdXyg5jo,5266
+python3_commons/audit.py,sha256=kfUaSiNAg9NJuUhnBXqplNiyuPQuDFM9NcD-HZV2qd4,6077
+python3_commons/auth.py,sha256=fWfoh5665F-YnGTgG9wDAosYIM9vFoTsQXEcCyzD72M,2951
+python3_commons/cache.py,sha256=Hib86F1k1SviF-a2RyoTxRrFi0XV2KaWOfBi5TlOu-g,7697
+python3_commons/conf.py,sha256=GOvR1oYss6AKnNlyj9JbT0mSrfQFrnzmgm0IiGVahho,2428
+python3_commons/fs.py,sha256=dn8ZcwsQf9xcAEg6neoxLN6IzJbWpprfm8wV8S55BL0,337
+python3_commons/helpers.py,sha256=utcorGvXvZLsC4H_H8WGwzeIMgCOCHac2jbKpVCeixA,3928
+python3_commons/object_storage.py,sha256=pvA-gJehnbIJmqu8ebT6oSqW-dR-uZl3E1AV86ffUpY,6568
+python3_commons/permissions.py,sha256=bhjTp-tq-oaTGFMHNnSBlcVX5XQCTL0nWcu6SdPEAB4,1555
+python3_commons/db/__init__.py,sha256=PZTIC0RPzYzZ2Fh4HeyKtYIHaUPB7A92yeOK--PGxnw,2942
+python3_commons/db/helpers.py,sha256=n56yYCE0fvzvU7nL1936NfZhbaQmvfumzRsGimBlNV4,1776
+python3_commons/db/models/__init__.py,sha256=zjZCf0DNDkqmPZ49quJ6KZohtKH87viI_ijDG3E0PVE,554
+python3_commons/db/models/auth.py,sha256=NMHirujigpaRR0Bhhe2gzy8Q8PPABuaA-D8ZY7aaqeE,1177
+python3_commons/db/models/common.py,sha256=nRLQVi7Y0SsXo3qMIwQX6GuDO9kHnlma4O_mYXQVtHQ,1512
+python3_commons/db/models/rbac.py,sha256=BIB7nJXQkCes0XA-fg-oCHP6YU0_rXIm29O73j4pNUg,3160
+python3_commons/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python3_commons/log/filters.py,sha256=fuyjXZAUm-i2MNrxvFYag8F8Rr27x8W8MdV3ke6miSs,175
+python3_commons/log/formatters.py,sha256=p2AtZD4Axp3Em0e9gWzW8U_yOR5entD7xn7Edvc-IuM,719
+python3_commons/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python3_commons/serializers/common.py,sha256=VkA7C6wODvHk0QBXVX_x2JieDstihx3U__UFbTYf654,120
+python3_commons/serializers/json.py,sha256=Dae0gouk9jiUOkmh8z1AcTIHD52OgBn2aXK9JLKMMms,718
+python3_commons/serializers/msgpack.py,sha256=AwzBSUdbdq8yYdGzmEsiWw0bnL9XRQFa1Vh-nt2s56k,1499
+python3_commons/serializers/msgspec.py,sha256=yp3LvsxDUTIv__3AaLed5ddZ0rHm7BYqmrrehVAJb14,3000
+python3_commons-0.9.20.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.9.20.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.9.20.dist-info/METADATA,sha256=BfW_2kWlG3QkN3fmzHlmXrkNjHZGLM_WiXujw6BTTjc,1134
+python3_commons-0.9.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_commons-0.9.20.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.9.20.dist-info/RECORD,,

python3_commons-0.9.18.dist-info/RECORD

@@ -1,29 +0,0 @@
-python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
-python3_commons/api_client.py,sha256=vIWt6QIbHw_x-1yKhXyJEN3Aj22KMsZwJXMsdWR7oaQ,4970
-python3_commons/audit.py,sha256=p4KRKt0ogkHhJSulg6j5GU-JKBBE903H2c0nuW16GtM,6083
-python3_commons/auth.py,sha256=fINE7zeq-oaEk2lwkdP1KOhfCpcIBaC8P9UzXQI37J0,2922
-python3_commons/cache.py,sha256=lf27LTD4Z9Iqi5GaK8jH8UC0cL9sHH8wicZ88YDp6Mg,7725
-python3_commons/conf.py,sha256=GOvR1oYss6AKnNlyj9JbT0mSrfQFrnzmgm0IiGVahho,2428
-python3_commons/fs.py,sha256=wfLjybXndwLqNlOxTpm_HRJnuTcC4wbrHEOaEeCo9Wc,337
-python3_commons/helpers.py,sha256=9m9Q_ImXzOsKmt7ObLUhd11vnGfwUH_KO4IwLaTMrFA,3930
-python3_commons/object_storage.py,sha256=6jESNzI__r9wJdTWJQRXhpbdmC2QrZVUoZyvetfQNwY,6544
-python3_commons/permissions.py,sha256=bhjTp-tq-oaTGFMHNnSBlcVX5XQCTL0nWcu6SdPEAB4,1555
-python3_commons/db/__init__.py,sha256=5nArsGm17e-pelpOwAeBKy2n_Py20XqklZsNgkcJ-DQ,2947
-python3_commons/db/helpers.py,sha256=PY0h08aLiGx-J54wmP3GHPCgGCcLd60rayAUnR3aWdI,1742
-python3_commons/db/models/__init__.py,sha256=zjZCf0DNDkqmPZ49quJ6KZohtKH87viI_ijDG3E0PVE,554
-python3_commons/db/models/auth.py,sha256=NMHirujigpaRR0Bhhe2gzy8Q8PPABuaA-D8ZY7aaqeE,1177
-python3_commons/db/models/common.py,sha256=nRLQVi7Y0SsXo3qMIwQX6GuDO9kHnlma4O_mYXQVtHQ,1512
-python3_commons/db/models/rbac.py,sha256=BIB7nJXQkCes0XA-fg-oCHP6YU0_rXIm29O73j4pNUg,3160
-python3_commons/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python3_commons/log/filters.py,sha256=fuyjXZAUm-i2MNrxvFYag8F8Rr27x8W8MdV3ke6miSs,175
-python3_commons/log/formatters.py,sha256=p2AtZD4Axp3Em0e9gWzW8U_yOR5entD7xn7Edvc-IuM,719
-python3_commons/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python3_commons/serializers/json.py,sha256=91UaXLGKGj0yPyrnuMeNrkG2GuPUgcgAsmIokUgEwpU,808
-python3_commons/serializers/msgpack.py,sha256=WrvaPE187shSK8zkH4UHHMimEZNMv9RaDSwsBE2HlCw,1269
-python3_commons/serializers/msgspec.py,sha256=0AliXlEl5sewi0UENjI8St5ZScXE5DNRERKzqWKy2Ps,2674
-python3_commons-0.9.18.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.9.18.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.9.18.dist-info/METADATA,sha256=H1oSSmkAcQc8WxKeBi7A8JNIs12sFpxHa-exEMlyoWo,1134
-python3_commons-0.9.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python3_commons-0.9.18.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.9.18.dist-info/RECORD,,