python3-commons 0.8.36__tar.gz → 0.8.38__tar.gz

{python3_commons-0.8.36 → python3_commons-0.8.38}/.pre-commit-config.yaml

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

python3_commons-0.8.38/.python-version

@@ -0,0 +1 @@
+==3.14.*

{python3_commons-0.8.36/src/python3_commons.egg-info → python3_commons-0.8.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.36
+Version: 0.8.38
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -8,20 +8,20 @@ Project-URL: Homepage, https://github.com/kamikaze/python3-commons
 Project-URL: Documentation, https://github.com/kamikaze/python3-commons/wiki
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
-Requires-Python: ==3.13.*
+Requires-Python: ==3.14.*
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: aiobotocore~=2.23.0
-Requires-Dist: aiohttp[speedups]~=3.12.14
+Requires-Dist: aiohttp[speedups]~=3.13.0
 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.0
+Requires-Dist: minio~=7.2.15
 Requires-Dist: msgpack~=1.1.1
 Requires-Dist: msgspec~=0.19.0
-Requires-Dist: pydantic[email]~=2.11.7
-Requires-Dist: pydantic-settings~=2.10.1
+Requires-Dist: pydantic[email]~=2.12.0
+Requires-Dist: pydantic-settings~=2.11.0
 Requires-Dist: python-jose==3.5.0
 Requires-Dist: SQLAlchemy[asyncio]~=2.0.40
 Requires-Dist: valkey[libvalkey]~=6.1.0

{python3_commons-0.8.36 → python3_commons-0.8.38}/pyproject.toml

@@ -16,19 +16,19 @@ classifiers = [
     "Programming Language :: Python"
 ]
 keywords = []
-requires-python = "==3.13.*"
+requires-python = "==3.14.*"
 
 dependencies = [
-    "aiobotocore~=2.23.0",
-    "aiohttp[speedups]~=3.12.14",
+    "aiohttp[speedups]~=3.13.0",
     "asyncpg~=0.30.0",
     "fastapi-users-db-sqlalchemy~=7.0.0",
     "fastapi-users[sqlalchemy]~=14.0.1",
     "lxml~=6.0.0",
+    "minio~=7.2.15",
     "msgpack~=1.1.1",
     "msgspec~=0.19.0",
-    "pydantic[email]~=2.11.7",
-    "pydantic-settings~=2.10.1",
+    "pydantic[email]~=2.12.0",
+    "pydantic-settings~=2.11.0",
     "python-jose==3.5.0",
     "SQLAlchemy[asyncio]~=2.0.40",
     "valkey[libvalkey]~=6.1.0",
@@ -38,14 +38,13 @@ dependencies = [
 [dependency-groups]
 dev = [
     "build",
-    "pip==25.1.1",
-    "pre-commit==4.2.0",
-    "pyright==1.1.403",
-    "ruff==0.12.3",
-    "setuptools==80.9.0",
-    "setuptools_scm==8.3.1",
-    "types-aiobotocore-s3",
-    "wheel==0.45.1",
+    "pip",
+    "pre-commit",
+    "pyright",
+    "ruff",
+    "setuptools",
+    "setuptools_scm",
+    "wheel",
 ]
 testing = [
     "pytest",

python3_commons-0.8.38/src/python3_commons/db/models/__init__.py

@@ -0,0 +1,2 @@
+from python3_commons.db.models.auth import ApiKey, User, UserGroup
+from python3_commons.db.models.rbac import RBACApiKeyRole, RBACPermission, RBACRole, RBACRolePermission, RBACUserRole

{python3_commons-0.8.36 → python3_commons-0.8.38}/src/python3_commons/helpers.py

@@ -1,8 +1,6 @@
 import logging
 import shlex
 import threading
-from abc import ABCMeta
-from collections import defaultdict
 from datetime import date, datetime, timedelta
 from decimal import ROUND_HALF_UP, Decimal
 from json import dumps
@@ -14,24 +12,24 @@ from python3_commons.serializers.json import CustomJSONEncoder
 logger = logging.getLogger(__name__)
 
 
-class SingletonMeta(ABCMeta):
+class SingletonMeta(type):
     """
     A metaclass that creates a Singleton base class when called.
     """
 
-    __instances = {}
-    __locks = defaultdict(threading.Lock)
+    _instances = {}
+    _lock = threading.Lock()
 
     def __call__(cls, *args, **kwargs):
         try:
-            return cls.__instances[cls]
+            return cls._instances[cls]
         except KeyError:
-            with cls.__locks[cls]:
+            with cls._lock:
                 try:
-                    return cls.__instances[cls]
+                    return cls._instances[cls]
                 except KeyError:
                     instance = super(SingletonMeta, cls).__call__(*args, **kwargs)
-                    cls.__instances[cls] = instance
+                    cls._instances[cls] = instance
 
                     return instance
 

python3_commons-0.8.38/src/python3_commons/object_storage.py

@@ -0,0 +1,127 @@
+import io
+import logging
+from contextlib import contextmanager
+from datetime import datetime
+from typing import Generator, Iterable
+
+from minio import Minio
+from minio.datatypes import Object
+from minio.deleteobjects import DeleteError, DeleteObject
+
+from python3_commons.conf import S3Settings, s3_settings
+from python3_commons.helpers import SingletonMeta
+
+logger = logging.getLogger(__name__)
+
+
+class ObjectStorage(metaclass=SingletonMeta):
+    def __init__(self, settings: S3Settings):
+        if not s3_settings.s3_endpoint_url:
+            raise ValueError('s3_settings.s3_endpoint_url must be set')
+
+        self._client = Minio(
+            settings.s3_endpoint_url,
+            region=settings.s3_region_name,
+            access_key=settings.s3_access_key_id.get_secret_value(),
+            secret_key=settings.s3_secret_access_key.get_secret_value(),
+            secure=settings.s3_secure,
+            cert_check=settings.s3_cert_verify,
+        )
+
+    def get_client(self) -> Minio:
+        return self._client
+
+
+def get_absolute_path(path: str) -> str:
+    if path.startswith('/'):
+        path = path[1:]
+
+    if bucket_root := s3_settings.s3_bucket_root:
+        path = f'{bucket_root[:1] if bucket_root.startswith("/") else bucket_root}/{path}'
+
+    return path
+
+
+def put_object(bucket_name: str, path: str, data: io.BytesIO, length: int, part_size: int = 0) -> str | None:
+    if s3_client := ObjectStorage(s3_settings).get_client():
+        result = s3_client.put_object(bucket_name, path, data, length, part_size=part_size)
+
+        logger.debug(f'Stored object into object storage: {bucket_name}:{path}')
+
+        return result.location
+    else:
+        logger.warning('No S3 client available, skipping object put')
+
+
+@contextmanager
+def get_object_stream(bucket_name: str, path: str):
+    if s3_client := ObjectStorage(s3_settings).get_client():
+        logger.debug(f'Getting object from object storage: {bucket_name}:{path}')
+
+        try:
+            response = s3_client.get_object(bucket_name, path)
+        except Exception as e:
+            logger.debug(f'Failed getting object from object storage: {bucket_name}:{path}', exc_info=e)
+
+            raise
+
+        yield response
+
+        response.close()
+        response.release_conn()
+    else:
+        logger.warning('No S3 client available, skipping object put')
+
+
+def get_object(bucket_name: str, path: str) -> bytes:
+    with get_object_stream(bucket_name, path) as stream:
+        body = stream.read()
+
+    logger.debug(f'Loaded object from object storage: {bucket_name}:{path}')
+
+    return body
+
+
+def list_objects(bucket_name: str, prefix: str, recursive: bool = True) -> Generator[Object, None, None]:
+    s3_client = ObjectStorage(s3_settings).get_client()
+
+    yield from s3_client.list_objects(bucket_name, prefix=prefix, recursive=recursive)
+
+
+def get_objects(
+    bucket_name: str, path: str, recursive: bool = True
+) -> Generator[tuple[str, datetime, bytes], None, None]:
+    for obj in list_objects(bucket_name, path, recursive):
+        object_name = obj.object_name
+
+        if obj.size:
+            data = get_object(bucket_name, object_name)
+        else:
+            data = b''
+
+        yield object_name, obj.last_modified, data
+
+
+def remove_object(bucket_name: str, object_name: str):
+    s3_client = ObjectStorage(s3_settings).get_client()
+    s3_client.remove_object(bucket_name, object_name)
+
+
+def remove_objects(
+    bucket_name: str, prefix: str = None, object_names: Iterable[str] = None
+) -> Iterable[DeleteError] | None:
+    s3_client = ObjectStorage(s3_settings).get_client()
+
+    if prefix:
+        delete_object_list = map(
+            lambda obj: DeleteObject(obj.object_name),
+            s3_client.list_objects(bucket_name, prefix=prefix, recursive=True),
+        )
+    elif object_names:
+        delete_object_list = map(DeleteObject, object_names)
+    else:
+        return None
+
+    errors = s3_client.remove_objects(bucket_name, delete_object_list)
+
+    return errors

{python3_commons-0.8.36 → python3_commons-0.8.38/src/python3_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.36
+Version: 0.8.38
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -8,20 +8,20 @@ Project-URL: Homepage, https://github.com/kamikaze/python3-commons
 Project-URL: Documentation, https://github.com/kamikaze/python3-commons/wiki
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
-Requires-Python: ==3.13.*
+Requires-Python: ==3.14.*
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: AUTHORS.rst
-Requires-Dist: aiobotocore~=2.23.0
-Requires-Dist: aiohttp[speedups]~=3.12.14
+Requires-Dist: aiohttp[speedups]~=3.13.0
 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.0
+Requires-Dist: minio~=7.2.15
 Requires-Dist: msgpack~=1.1.1
 Requires-Dist: msgspec~=0.19.0
-Requires-Dist: pydantic[email]~=2.11.7
-Requires-Dist: pydantic-settings~=2.10.1
+Requires-Dist: pydantic[email]~=2.12.0
+Requires-Dist: pydantic-settings~=2.11.0
 Requires-Dist: python-jose==3.5.0
 Requires-Dist: SQLAlchemy[asyncio]~=2.0.40
 Requires-Dist: valkey[libvalkey]~=6.1.0

{python3_commons-0.8.36 → python3_commons-0.8.38}/src/python3_commons.egg-info/requires.txt

@@ -1,13 +1,13 @@
-aiobotocore~=2.23.0
-aiohttp[speedups]~=3.12.14
+aiohttp[speedups]~=3.13.0
 asyncpg~=0.30.0
 fastapi-users-db-sqlalchemy~=7.0.0
 fastapi-users[sqlalchemy]~=14.0.1
 lxml~=6.0.0
+minio~=7.2.15
 msgpack~=1.1.1
 msgspec~=0.19.0
-pydantic[email]~=2.11.7
-pydantic-settings~=2.10.1
+pydantic[email]~=2.12.0
+pydantic-settings~=2.11.0
 python-jose==3.5.0
 SQLAlchemy[asyncio]~=2.0.40
 valkey[libvalkey]~=6.1.0