python3-commons 0.9.22__tar.gz → 0.10.1__tar.gz

{python3_commons-0.9.22 → python3_commons-0.10.1}/.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.8.20
+    rev: 0.8.22
     hooks:
       - id: uv-lock
 #      - id: uv-export
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.1
+    rev: v0.13.2
     hooks:
       # Run the linter.
       - id: ruff-check

{python3_commons-0.9.22 → python3_commons-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.9.22
+Version: 0.10.1
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0

{python3_commons-0.9.22 → python3_commons-0.10.1}/pyproject.toml

@@ -114,9 +114,9 @@ select = [
     "PT",
     "PTH",
     "Q",
-#    "RET",
+    "RET",
     "RSE",
-#    "RUF",
+    "RUF",
     "S",
     "SIM",
     "SLF",
@@ -132,7 +132,7 @@ ignore = [
 ]
 
 [tool.ruff.lint.per-file-ignores]
-"tests/*.py" = ["S101"]
+"tests/*.py" = ["DTZ", "S101"]
 
 [tool.ruff.lint.flake8-quotes]
 docstring-quotes = "double"

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons/audit.py

@@ -138,7 +138,7 @@ logger = logging.getLogger(__name__)
 
 
 async def write_audit_data(settings: S3Settings, key: str, data: bytes):
-    if settings.s3_secret_access_key:
+    if settings.aws_secret_access_key:
         try:
             absolute_path = object_storage.get_absolute_path(f'audit/{key}')
 

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons/auth.py

@@ -81,7 +81,7 @@ def get_token_verifier[T](
         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)}') from e
+            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail=f'Token is invalid: {e!s}') from e
 
         return token_data
 

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons/cache.py

@@ -37,8 +37,7 @@ class AsyncValkeyClient(metaclass=SingletonMeta):
     def _get_keepalive_options():
         if platform in {'linux', 'darwin'}:
             return {socket.TCP_KEEPIDLE: 10, socket.TCP_KEEPINTVL: 5, socket.TCP_KEEPCNT: 5}
-        else:
-            return {}
+        return {}
 
     def _initialize_sentinel(self, dsn: RedisDsn):
         sentinel = Sentinel(
@@ -89,7 +88,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 = None, *, if_not_set: bool = False):
     r = get_valkey_client()
 
     return await r.set(name, data, ex=ttl, nx=if_not_set)
@@ -101,18 +100,18 @@ 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):
+async def store(name: str, obj: Any, ttl: int | None = 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:
+async def get(name: str, default: Any | None = None, data_type: Any = None) -> Any | None:
     if data := await get_bytes(name):
         return deserialize_msgpack_native(data, data_type)
 
     return default
 
 
-async def store_string(name: str, data: str, ttl: int = None):
+async def store_string(name: str, data: str, ttl: int | None = None):
     await store_bytes(name, data.encode(), ttl)
 
 
@@ -123,7 +122,7 @@ async def get_string(name: str) -> str | None:
     return None
 
 
-async def store_sequence(name: str, data: Sequence, ttl: int = None):
+async def store_sequence(name: str, data: Sequence, ttl: int | None = None):
     if data:
         try:
             r = get_valkey_client()
@@ -142,7 +141,7 @@ async def get_sequence(name: str, _type: type = list) -> Sequence:
     return _type(map(deserialize_msgpack_native, lrange))
 
 
-async def store_dict(name: str, data: Mapping, ttl: int = None):
+async def store_dict(name: str, data: Mapping, ttl: int | None = None):
     if data:
         try:
             r = get_valkey_client()
@@ -159,14 +158,12 @@ async def get_dict(name: str, value_data_type=None) -> dict | None:
     r = get_valkey_client()
 
     if data := await r.hgetall(name):
-        data = {k.decode(): deserialize_msgpack(v, value_data_type) for k, v in data.items()}
-
-        return data
+        return {k.decode(): deserialize_msgpack(v, value_data_type) for k, v in data.items()}
 
     return None
 
 
-async def set_dict(name: str, mapping: dict, ttl: int = None):
+async def set_dict(name: str, mapping: dict, ttl: int | None = None):
     if mapping:
         try:
             r = get_valkey_client()
@@ -209,7 +206,7 @@ async def delete_dict_item(name: str, *keys):
         logger.exception('Failed to delete dict item from cache.')
 
 
-async def store_set(name: str, value: set, ttl: int = None):
+async def store_set(name: str, value: set, ttl: int | None = None):
     try:
         r = get_valkey_client()
         await r.sadd(name, *map(serialize_msgpack_native, value))

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons/conf.py

@@ -64,10 +64,11 @@ class DBSettings(BaseSettings):
 
 
 class S3Settings(BaseSettings):
+    aws_region: str | None = None
+    aws_access_key_id: SecretStr | None = None
+    aws_secret_access_key: SecretStr | None = None
+
     s3_endpoint_url: str | None = None
-    s3_region_name: str | None = Field(default=None, alias='AWS_REGION')
-    s3_access_key_id: SecretStr | None = None
-    s3_secret_access_key: SecretStr | None = None
     s3_addressing_style: Literal['path', 'virtual'] = 'virtual'
     s3_secure: bool = True
     s3_bucket: str | None = None

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons/db/__init__.py

@@ -38,9 +38,8 @@ class AsyncSessionManager:
             'pool_timeout': db_settings.pool_timeout,
             'pool_recycle': db_settings.pool_recycle,
         }
-        engine = async_engine_from_config(configuration, prefix='')
 
-        return engine
+        return async_engine_from_config(configuration, prefix='')
 
     def get_engine(self, name: str) -> AsyncEngine:
         try:

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons/helpers.py

@@ -6,12 +6,12 @@ import threading
 import time
 from abc import ABCMeta
 from collections import defaultdict
-from collections.abc import Mapping, Sequence
+from collections.abc import Mapping, MutableMapping, 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
+from typing import ClassVar, Literal
 from urllib.parse import urlencode
 
 from python3_commons.serializers.json import CustomJSONEncoder
@@ -24,8 +24,8 @@ class SingletonMeta(ABCMeta):
     A metaclass that creates a Singleton base class when called.
     """
 
-    __instances = {}
-    __locks = defaultdict(threading.Lock)
+    __instances: ClassVar[MutableMapping] = {}
+    __locks: ClassVar[defaultdict] = defaultdict(threading.Lock)
 
     def __call__(cls, *args, **kwargs):
         try:
@@ -70,6 +70,7 @@ def tries(times):
                 except Exception:
                     if _time >= times:
                         raise
+            return None
 
         return wrapper
 

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons/object_storage.py

@@ -25,7 +25,7 @@ class ObjectStorage(metaclass=SingletonMeta):
     def __init__(self, settings: S3Settings):
         self._session = aiobotocore.session.get_session()
         config = {
-            'region_name': settings.s3_region_name,
+            'region_name': settings.aws_region,
             'use_ssl': settings.s3_secure,
             'verify': settings.s3_cert_verify,
             'config': Config(s3={'addressing_style': settings.s3_addressing_style}, signature_version='s3v4'),
@@ -34,11 +34,11 @@ class ObjectStorage(metaclass=SingletonMeta):
         if s3_endpoint_url := settings.s3_endpoint_url:
             config['endpoint_url'] = s3_endpoint_url
 
-        if s3_access_key_id := settings.s3_access_key_id:
-            config['aws_access_key_id'] = s3_access_key_id.get_secret_value()
+        if aws_access_key_id := settings.aws_access_key_id:
+            config['aws_access_key_id'] = aws_access_key_id.get_secret_value()
 
-        if s3_secret_access_key := settings.s3_secret_access_key:
-            config['aws_secret_access_key'] = s3_secret_access_key.get_secret_value()
+        if aws_secret_access_key := settings.aws_secret_access_key:
+            config['aws_secret_access_key'] = aws_secret_access_key.get_secret_value()
 
         self._config = config
 
@@ -150,7 +150,7 @@ async def remove_object(bucket_name: str, object_name: str):
 
 
 async def remove_objects(
-    bucket_name: str, prefix: str = None, object_names: Iterable[str] = None
+    bucket_name: str, prefix: str | None = None, object_names: Iterable[str] | None = None
 ) -> Sequence[Mapping] | None:
     storage = ObjectStorage(s3_settings)
 

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons/permissions.py

@@ -24,9 +24,8 @@ async def has_api_key_permission(session: AsyncSession, api_key_uid: UUID, permi
     )
 
     cursor = await session.execute(query)
-    result = cursor.scalar()
 
-    return result
+    return bool(cursor.scalar())
 
 
 async def has_user_permission(session: AsyncSession, user_id: UUID, permission: str) -> bool:
@@ -43,6 +42,5 @@ async def has_user_permission(session: AsyncSession, user_id: UUID, permission:
     )
 
     cursor = await session.execute(query)
-    result = cursor.scalar()
 
-    return result
+    return bool(cursor.scalar())

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons/serializers/json.py

@@ -14,11 +14,11 @@ class CustomJSONEncoder(json.JSONEncoder):
         except TypeError:
             if isinstance(o, (datetime, date)):
                 return o.isoformat()
-            elif isinstance(o, bytes):
+            if isinstance(o, bytes):
                 return base64.b64encode(o).decode('ascii')
-            elif dataclasses.is_dataclass(o):
+            if dataclasses.is_dataclass(o):
                 return dataclasses.asdict(o)
-            elif isinstance(o, (Decimal, socket, type, Exception)):
+            if isinstance(o, (Decimal, socket, type, Exception)):
                 return str(o)
 
         return type(o).__name__

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons/serializers/msgpack.py

@@ -16,11 +16,11 @@ logger = logging.getLogger(__name__)
 def msgpack_encoder(obj):
     if isinstance(obj, Decimal):
         return ExtType(ExtendedType.DECIMAL, str(obj).encode())
-    elif isinstance(obj, datetime):
+    if isinstance(obj, datetime):
         return ExtType(ExtendedType.DATETIME, obj.isoformat().encode())
-    elif isinstance(obj, date):
+    if isinstance(obj, date):
         return ExtType(ExtendedType.DATE, obj.isoformat().encode())
-    elif dataclasses.is_dataclass(obj):
+    if dataclasses.is_dataclass(obj):
         return ExtType(ExtendedType.DATACLASS, json.dumps(dataclasses.asdict(obj), cls=CustomJSONEncoder).encode())
 
     return f'no encoder for {obj}'
@@ -41,12 +41,8 @@ def msgpack_decoder(code, data):
 
 
 def serialize_msgpack(data) -> bytes:
-    result = msgpack.packb(data, default=msgpack_encoder)
-
-    return result
+    return msgpack.packb(data, default=msgpack_encoder)
 
 
 def deserialize_msgpack(data: bytes):
-    result = msgpack.unpackb(data, ext_hook=msgpack_decoder)
-
-    return result
+    return msgpack.unpackb(data, ext_hook=msgpack_decoder)

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons/serializers/msgspec.py

@@ -20,11 +20,11 @@ T = TypeVar('T')
 def enc_hook(obj: Any) -> Any:
     if isinstance(obj, Decimal):
         return Ext(ExtendedType.DECIMAL, struct.pack('b', str(obj).encode()))
-    elif isinstance(obj, datetime):
+    if isinstance(obj, datetime):
         return Ext(ExtendedType.DATETIME, struct.pack('b', obj.isoformat().encode()))
-    elif isinstance(obj, date):
+    if isinstance(obj, date):
         return Ext(ExtendedType.DATE, struct.pack('b', obj.isoformat().encode()))
-    elif dataclasses.is_dataclass(obj):
+    if dataclasses.is_dataclass(obj):
         return Ext(
             ExtendedType.DATACLASS,
             struct.pack('b', json.dumps(dataclasses.asdict(obj), cls=CustomJSONEncoder).encode()),
@@ -60,9 +60,7 @@ def serialize_msgpack_native(data: Any) -> bytes:
     if isinstance(data, BaseModel):
         data = data.model_dump()
 
-    result = encode(data)
-
-    return result
+    return encode(data)
 
 
 def deserialize_msgpack_native[T](data: bytes, data_type: type[T] | None = None) -> T | Any:
@@ -82,9 +80,7 @@ def serialize_msgpack(data: Any) -> bytes:
     if isinstance(data, BaseModel):
         data = data.model_dump()
 
-    result = MSGPACK_ENCODER.encode(data)
-
-    return result
+    return MSGPACK_ENCODER.encode(data)
 
 
 def deserialize_msgpack[T](data: bytes, data_type: type[T] | None = None) -> T | Any:

{python3_commons-0.9.22 → python3_commons-0.10.1}/src/python3_commons.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.9.22
+Version: 0.10.1
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0