nlbone 0.4.2__py3-none-any.whl → 0.4.3__py3-none-any.whl

nlbone/adapters/auth/token_provider.py

@@ -0,0 +1,40 @@
+import threading
+import time
+from typing import Optional, Dict, Any
+
+from nlbone.adapters.auth.keycloak import KeycloakAuthService
+
+
+class ClientTokenProvider:
+    """Caches Keycloak client-credentials token and refreshes before expiry."""
+
+    def __init__(self, auth: KeycloakAuthService, *, skew_seconds: int = 30) -> None:
+        self._auth = auth
+        self._skew = skew_seconds
+        self._lock = threading.Lock()
+        self._token: Optional[str] = None  # access_token
+        self._expires_at: float = 0.0  # epoch seconds
+
+    def _needs_refresh(self) -> bool:
+        return not self._token or time.time() >= (self._expires_at - self._skew)
+
+    def get_access_token(self) -> str:
+        """Return a valid access token; refresh if needed."""
+        if not self._needs_refresh():
+            return self._token
+
+        with self._lock:
+            if not self._needs_refresh():
+                return self._token
+
+            data: Dict[str, Any] = self._auth.get_client_token()
+            access_token = data.get("access_token")
+            if not access_token:
+                raise RuntimeError("Keycloak: missing access_token")
+            expires_in = int(data.get("expires_in", 60))
+            self._token = access_token
+            self._expires_at = time.time() + max(1, expires_in)
+            return self._token
+
+    def get_auth_header(self) -> str:
+        return f"Bearer {self.get_access_token()}"

nlbone/adapters/db/postgres/audit.py

@@ -22,6 +22,8 @@ def _get_ops_for(obj) -> set[str]:
 
 
 def _is_audit_disabled(obj) -> bool:
+    if not DEFAULT_ENABLED:
+        return True
     if getattr(obj, "__audit_disable__", False):
         return True
     if hasattr(obj, "__audit_enable__") and not getattr(obj, "__audit_enable__"):

nlbone/adapters/http_clients/uploadchi.py

@@ -7,6 +7,7 @@ from urllib.parse import urlparse, urlunparse
 import httpx
 import requests
 
+from nlbone.adapters.auth.token_provider import ClientTokenProvider
 from nlbone.config.settings import get_settings
 from nlbone.core.ports.files import FileServicePort
 
@@ -30,7 +31,7 @@ def _auth_headers(token: str | None) -> dict[str, str]:
 
 
 def _build_list_query(
-    limit: int, offset: int, filters: dict[str, Any] | None, sort: list[tuple[str, str]] | None
+        limit: int, offset: int, filters: dict[str, Any] | None, sort: list[tuple[str, str]] | None
 ) -> dict[str, Any]:
     q: dict[str, Any] = {"limit": limit, "offset": offset}
     if filters:
@@ -58,21 +59,23 @@ def _normalize_https_base(url: str) -> str:
 
 class UploadchiClient(FileServicePort):
     def __init__(
-        self,
-        base_url: Optional[str] = None,
-        timeout_seconds: Optional[float] = None,
-        client: httpx.Client | None = None,
+            self,
+            token_provider: ClientTokenProvider | None = None,
+            base_url: Optional[str] = None,
+            timeout_seconds: Optional[float] = None,
+            client: httpx.Client | None = None,
     ) -> None:
         s = get_settings()
         self._base_url = _normalize_https_base(base_url or str(s.UPLOADCHI_BASE_URL))
         self._timeout = timeout_seconds or float(s.HTTP_TIMEOUT_SECONDS)
         self._client = client or requests.session()
+        self._token_provider = token_provider
 
     def close(self) -> None:
         self._client.close()
 
     def upload_file(
-        self, file_bytes: bytes, filename: str, params: dict[str, Any] | None = None, token: str | None = None
+            self, file_bytes: bytes, filename: str, params: dict[str, Any] | None = None, token: str | None = None
     ) -> dict:
         tok = _resolve_token(token)
         files = {"file": (filename, file_bytes)}
@@ -82,23 +85,35 @@ class UploadchiClient(FileServicePort):
             raise UploadchiError(r.status_code, r.text)
         return r.json()
 
-    def commit_file(self, file_id: int, client_id: str, token: str | None = None) -> None:
+    def commit_file(self, file_id: str, token: str | None = None) -> None:
+        if not token and not self._token_provider:
+            raise UploadchiError(detail="token_provider is not provided", status=400)
         tok = _resolve_token(token)
         r = self._client.post(
             f"{self._base_url}/{file_id}/commit",
             headers=_auth_headers(tok),
-            params={"client_id": client_id} if client_id else None,
+        )
+        if r.status_code not in (204, 200):
+            raise UploadchiError(r.status_code, r.text)
+
+    def rollback(self, file_id: str, token: str | None = None) -> None:
+        if not token and not self._token_provider:
+            raise UploadchiError(detail="token_provider is not provided", status=400)
+        tok = _resolve_token(token)
+        r = self._client.post(
+            f"{self._base_url}/{file_id}/rollback",
+            headers=_auth_headers(tok),
         )
         if r.status_code not in (204, 200):
             raise UploadchiError(r.status_code, r.text)
 
     def list_files(
-        self,
-        limit: int = 10,
-        offset: int = 0,
-        filters: dict[str, Any] | None = None,
-        sort: list[tuple[str, str]] | None = None,
-        token: str | None = None,
+            self,
+            limit: int = 10,
+            offset: int = 0,
+            filters: dict[str, Any] | None = None,
+            sort: list[tuple[str, str]] | None = None,
+            token: str | None = None,
     ) -> dict:
         tok = _resolve_token(token)
         q = _build_list_query(limit, offset, filters, sort)
@@ -107,14 +122,14 @@ class UploadchiClient(FileServicePort):
             raise UploadchiError(r.status_code, r.text)
         return r.json()
 
-    def get_file(self, file_id: int, token: str | None = None) -> dict:
+    def get_file(self, file_id: str, token: str | None = None) -> dict:
         tok = _resolve_token(token)
         r = self._client.get(f"{self._base_url}/{file_id}", headers=_auth_headers(tok))
         if r.status_code >= 400:
             raise UploadchiError(r.status_code, r.text)
         return r.json()
 
-    def download_file(self, file_id: int, token: str | None = None) -> tuple[bytes, str, str]:
+    def download_file(self, file_id: str, token: str | None = None) -> tuple[bytes, str, str]:
         tok = _resolve_token(token)
         r = self._client.get(f"{self._base_url}/{file_id}/download", headers=_auth_headers(tok))
         if r.status_code >= 400:
@@ -123,7 +138,7 @@ class UploadchiClient(FileServicePort):
         media_type = r.headers.get("content-type", "application/octet-stream")
         return r.content, filename, media_type
 
-    def delete_file(self, file_id: int, token: str | None = None) -> None:
+    def delete_file(self, file_id: str, token: str | None = None) -> None:
         tok = _resolve_token(token)
         r = self._client.delete(f"{self._base_url}/{file_id}", headers=_auth_headers(tok))
         if r.status_code not in (204, 200):

nlbone/adapters/http_clients/uploadchi_async.py

@@ -8,14 +8,16 @@ from nlbone.config.settings import get_settings
 from nlbone.core.ports.files import AsyncFileServicePort
 
 from .uploadchi import UploadchiError, _auth_headers, _build_list_query, _filename_from_cd, _resolve_token
+from ..auth.token_provider import ClientTokenProvider
 
 
 class UploadchiAsyncClient(AsyncFileServicePort):
     def __init__(
-        self,
-        base_url: Optional[str] = None,
-        timeout_seconds: Optional[float] = None,
-        client: httpx.AsyncClient | None = None,
+            self,
+            token_provider: ClientTokenProvider | None = None,
+            base_url: Optional[str] = None,
+            timeout_seconds: Optional[float] = None,
+            client: httpx.AsyncClient | None = None,
     ) -> None:
         s = get_settings()
         self._base_url = base_url or str(s.UPLOADCHI_BASE_URL)
@@ -23,12 +25,13 @@ class UploadchiAsyncClient(AsyncFileServicePort):
         self._client = client or httpx.AsyncClient(
             base_url=self._base_url, timeout=self._timeout, follow_redirects=True
         )
+        self._token_provider = token_provider
 
     async def aclose(self) -> None:
         await self._client.aclose()
 
     async def upload_file(
-        self, file_bytes: bytes, filename: str, params: dict[str, Any] | None = None, token: str | None = None
+            self, file_bytes: bytes, filename: str, params: dict[str, Any] | None = None, token: str | None = None
     ) -> dict:
         tok = _resolve_token(token)
         files = {"file": (filename, file_bytes)}
@@ -38,21 +41,33 @@ class UploadchiAsyncClient(AsyncFileServicePort):
             raise UploadchiError(r.status_code, await r.aread())
         return r.json()
 
-    async def commit_file(self, file_id: int, client_id: str, token: str | None = None) -> None:
+    async def commit_file(self, file_id: str, token: str | None = None) -> None:
+        if not token and not self._token_provider:
+            raise UploadchiError(detail="token_provider is not provided", status=400)
         tok = _resolve_token(token)
         r = await self._client.post(
-            f"/{file_id}/commit", headers=_auth_headers(tok), params={"client_id": client_id} if client_id else None
+            f"/{file_id}/commit", headers=_auth_headers(tok)
+        )
+        if r.status_code not in (204, 200):
+            raise UploadchiError(r.status_code, await r.aread())
+
+    async def rollback(self, file_id: str, token: str | None = None) -> None:
+        if not token and not self._token_provider:
+            raise UploadchiError(detail="token_provider is not provided", status=400)
+        tok = _resolve_token(token)
+        r = await self._client.post(
+            f"/{file_id}/rollback", headers=_auth_headers(tok)
         )
         if r.status_code not in (204, 200):
             raise UploadchiError(r.status_code, await r.aread())
 
     async def list_files(
-        self,
-        limit: int = 10,
-        offset: int = 0,
-        filters: dict[str, Any] | None = None,
-        sort: list[tuple[str, str]] | None = None,
-        token: str | None = None,
+            self,
+            limit: int = 10,
+            offset: int = 0,
+            filters: dict[str, Any] | None = None,
+            sort: list[tuple[str, str]] | None = None,
+            token: str | None = None,
     ) -> dict:
         tok = _resolve_token(token)
         q = _build_list_query(limit, offset, filters, sort)
@@ -61,14 +76,14 @@ class UploadchiAsyncClient(AsyncFileServicePort):
             raise UploadchiError(r.status_code, await r.aread())
         return r.json()
 
-    async def get_file(self, file_id: int, token: str | None = None) -> dict:
+    async def get_file(self, file_id: str, token: str | None = None) -> dict:
         tok = _resolve_token(token)
         r = await self._client.get(f"/{file_id}", headers=_auth_headers(tok))
         if r.status_code >= 400:
             raise UploadchiError(r.status_code, await r.aread())
         return r.json()
 
-    async def download_file(self, file_id: int, token: str | None = None) -> tuple[AsyncIterator[bytes], str, str]:
+    async def download_file(self, file_id: str, token: str | None = None) -> tuple[AsyncIterator[bytes], str, str]:
         tok = _resolve_token(token)
         r = await self._client.get(f"/{file_id}/download", headers=_auth_headers(tok), stream=True)
         if r.status_code >= 400:
@@ -86,7 +101,7 @@ class UploadchiAsyncClient(AsyncFileServicePort):
 
         return _aiter(), filename, media_type
 
-    async def delete_file(self, file_id: int, token: str | None = None) -> None:
+    async def delete_file(self, file_id: str, token: str | None = None) -> None:
         tok = _resolve_token(token)
         r = await self._client.delete(f"/{file_id}", headers=_auth_headers(tok))
         if r.status_code not in (204, 200):

nlbone/container.py

@@ -5,6 +5,7 @@ from typing import Any, Mapping, Optional
 from dependency_injector import containers, providers
 
 from nlbone.adapters.auth.keycloak import KeycloakAuthService
+from nlbone.adapters.auth.token_provider import ClientTokenProvider
 from nlbone.adapters.db.postgres import AsyncSqlAlchemyUnitOfWork, SqlAlchemyUnitOfWork
 from nlbone.adapters.db.postgres.engine import get_async_session_factory, get_sync_session_factory
 from nlbone.adapters.http_clients.uploadchi import UploadchiClient
@@ -29,8 +30,11 @@ class Container(containers.DeclarativeContainer):
 
     # --- Services ---
     auth: providers.Singleton[KeycloakAuthService] = providers.Singleton(KeycloakAuthService, settings=config)
-    file_service: providers.Singleton[FileServicePort] = providers.Singleton(UploadchiClient)
-    afiles_service: providers.Singleton[AsyncFileServicePort] = providers.Singleton(UploadchiAsyncClient)
+    token_provider = providers.Singleton(ClientTokenProvider, auth=auth, skew_seconds=30)
+    file_service: providers.Singleton[FileServicePort] = providers.Singleton(UploadchiClient,
+                                                                             token_provider=token_provider)
+    afiles_service: providers.Singleton[AsyncFileServicePort] = providers.Singleton(UploadchiAsyncClient,
+                                                                                    token_provider=token_provider)
 
 
 def create_container(settings: Optional[Any] = None) -> Container:

nlbone/core/ports/files.py

@@ -8,7 +8,8 @@ class FileServicePort(Protocol):
     def upload_file(
         self, file_bytes: bytes, filename: str, params: dict[str, Any] | None = None, token: str | None = None
     ) -> dict: ...
-    def commit_file(self, file_id: int, client_id: str, token: str | None = None) -> None: ...
+    def commit_file(self, file_id: str, token: str | None = None) -> None: ...
+    def rollback(self, file_id: str, token: str | None = None) -> None: ...
     def list_files(
         self,
         limit: int = 10,
@@ -17,9 +18,9 @@ class FileServicePort(Protocol):
         sort: list[tuple[str, str]] | None = None,
         token: str | None = None,
     ) -> dict: ...
-    def get_file(self, file_id: int, token: str | None = None) -> dict: ...
-    def download_file(self, file_id: int, token: str | None = None) -> tuple[bytes, str, str]: ...
-    def delete_file(self, file_id: int, token: str | None = None) -> None: ...
+    def get_file(self, file_id: str, token: str | None = None) -> dict: ...
+    def download_file(self, file_id: str, token: str | None = None) -> tuple[bytes, str, str]: ...
+    def delete_file(self, file_id: str, token: str | None = None) -> None: ...
 
 
 @runtime_checkable
@@ -27,7 +28,8 @@ class AsyncFileServicePort(Protocol):
     async def upload_file(
         self, file_bytes: bytes, filename: str, params: dict[str, Any] | None = None, token: str | None = None
     ) -> dict: ...
-    async def commit_file(self, file_id: int, client_id: str, token: str | None = None) -> None: ...
+    async def commit_file(self, file_id: str, token: str | None = None) -> None: ...
+    async def rollback(self, file_id: str, token: str | None = None) -> None: ...
     async def list_files(
         self,
         limit: int = 10,
@@ -36,6 +38,6 @@ class AsyncFileServicePort(Protocol):
         sort: list[tuple[str, str]] | None = None,
         token: str | None = None,
     ) -> dict: ...
-    async def get_file(self, file_id: int, token: str | None = None) -> dict: ...
-    async def download_file(self, file_id: int, token: str | None = None) -> tuple[AsyncIterator[bytes], str, str]: ...
-    async def delete_file(self, file_id: int, token: str | None = None) -> None: ...
+    async def get_file(self, file_id: str, token: str | None = None) -> dict: ...
+    async def download_file(self, file_id: str, token: str | None = None) -> tuple[AsyncIterator[bytes], str, str]: ...
+    async def delete_file(self, file_id: str, token: str | None = None) -> None: ...

{nlbone-0.4.2.dist-info → nlbone-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.4.2
+Version: 0.4.3
 Summary: Backbone package for interfaces and infrastructure in Python projects
 Author-email: Amir Hosein Kahkbazzadeh <a.khakbazzadeh@gmail.com>
 License: MIT
@@ -79,4 +79,8 @@ async def main():
 
 
 anyio.run(main)
-```
+```
+
+## 📦 Used In
+- **Explore**
+- **Pricing**

{nlbone-0.4.2.dist-info → nlbone-0.4.3.dist-info}/RECORD

@@ -1,12 +1,13 @@
 nlbone/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone/container.py,sha256=Jw5XMBmmrgkd_iZwItVfGCj1vkOiedpn8eIdYHpjWsk,2100
+nlbone/container.py,sha256=wmamsFU0Be6DlEqhLW30J2w4zVCwNlcZDd7HxkzWil0,2481
 nlbone/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/auth/__init__.py,sha256=hkDHvsFhw_UiOHG9ZSMqjiAhK4wumEforitveSZswVw,42
 nlbone/adapters/auth/keycloak.py,sha256=dfAxODiARfR8y3FKoWNo9fjfb6QyWd_Qr7AbJ0E78AM,2729
+nlbone/adapters/auth/token_provider.py,sha256=NhqjqTUsoZO4gbK-cybs0OkKydFN7CPTxAiypEw081o,1433
 nlbone/adapters/db/__init__.py,sha256=saW-wN4E0NZ2_ldi-nrm5AgsH7EULNSa62lYMwfy1oo,252
 nlbone/adapters/db/postgres/__init__.py,sha256=6JYJH0xZs3aR-zuyMpRhsdzFugmqz8nprwTQLprqhZc,313
-nlbone/adapters/db/postgres/audit.py,sha256=OYPQTDC0p27D3X8iQ-g3fu7Cno3bDm8egodLMPDcn3k,4627
+nlbone/adapters/db/postgres/audit.py,sha256=zFzL-pXmfjcp5YLx6vBYczprsJjEPxSYKhQNR3WjKL0,4675
 nlbone/adapters/db/postgres/base.py,sha256=kha9xmklzhuQAK8QEkNBn-mAHq8dUKbOM-3abaBpWmQ,71
 nlbone/adapters/db/postgres/engine.py,sha256=UCegauVB1gvo42ThytYnn5VIcQBwR-5xhcXYFApRFNk,3448
 nlbone/adapters/db/postgres/query_builder.py,sha256=U5pqpCfJKuMIxIEHyodoHuPgE8jf53slC1ScKZR5xa4,8653
@@ -17,8 +18,8 @@ nlbone/adapters/db/redis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 nlbone/adapters/db/redis/client.py,sha256=XAKcmU0lpPvWPMS0fChVQ3iSJfHV1g4bMOCgJaj2bCI,512
 nlbone/adapters/http_clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/http_clients/email_gateway.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone/adapters/http_clients/uploadchi.py,sha256=BGdGC-p8EmXYn29da577Kas2CzZVDAb9XJ9xx2LJioY,4713
-nlbone/adapters/http_clients/uploadchi_async.py,sha256=hBx0jzYYZAX1DCkImZ98zdUob8D9PQH7jykDXIjwG9I,3866
+nlbone/adapters/http_clients/uploadchi.py,sha256=iMLbXUXqi60gQMEI7wfaqWG0G7p9fQN7otT9c8npnLQ,5470
+nlbone/adapters/http_clients/uploadchi_async.py,sha256=wmb2XIUNkowh48GJwttNZ_STgsFQdGKKRZc_luYNCu8,4609
 nlbone/adapters/messaging/__init__.py,sha256=UDAwu3s-JQmOZjWz2Nu0SgHhnkbeOhKDH_zLD75oWMY,40
 nlbone/adapters/messaging/event_bus.py,sha256=w-NPwDiPMLFPU_enRQCtfQXOALsXfg31u57R8sG_-1U,781
 nlbone/adapters/messaging/redis.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,7 +42,7 @@ nlbone/core/domain/models.py,sha256=e2ig7PMBBpmc8pdHLNMnXhucMXr9OUq-G7bKGTq9Qj0,
 nlbone/core/ports/__init__.py,sha256=gx-Ubj7h-1vvnu56sNnRqmer7HHfW3rX2WLl-0AX5U0,214
 nlbone/core/ports/auth.py,sha256=Gh0yQsxx2OD6pDH2_p-khsA-bVoypP1juuqMoSfjZUo,493
 nlbone/core/ports/event_bus.py,sha256=_Om1GOOT-F325oV6_LJXtLdx4vu5i7KrpTDD3qPJXU0,325
-nlbone/core/ports/files.py,sha256=1k-Vm0ld89EnFK2wybSXIJm5gQNpeuO92PD7d4VMh8s,1737
+nlbone/core/ports/files.py,sha256=7Ov2ITYRpPwwDTZGCeNVISg8e3A9l08jbOgpTImgfK8,1863
 nlbone/core/ports/messaging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/core/ports/repo.py,sha256=zOw8CTMAu5DKKy2wZpT3_6JWWjaJCDt7q4dOiJYrCOQ,651
 nlbone/core/ports/uow.py,sha256=SmBdRf0NvSdIjQ3Le1QGz8kNGBk7jgNHtNguvXRwmgs,557
@@ -71,8 +72,8 @@ nlbone/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/utils/context.py,sha256=MmclJ24BG2uvSTg1IK7J-Da9BhVFDQ5ag4Ggs2FF1_w,1600
 nlbone/utils/redactor.py,sha256=JbbPs2Qtnz0zHN85BGPYQNWwBigXMSzmMEmmZZOTs_U,1277
 nlbone/utils/time.py,sha256=6e0A4_hG1rYDCrWoOklEGVJstBf8j9XSSTT7VNV2K9Y,1272
-nlbone-0.4.2.dist-info/METADATA,sha256=nriPe98XsiI5atrlh8I13Z1dFPW-sRP_iF7B658Q0GE,2117
-nlbone-0.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nlbone-0.4.2.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
-nlbone-0.4.2.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.4.2.dist-info/RECORD,,
+nlbone-0.4.3.dist-info/METADATA,sha256=dKKof0RuBfc3ONT-R1n5qD_oJXaE4BIhqcezwx8NH8Q,2163
+nlbone-0.4.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nlbone-0.4.3.dist-info/entry_points.txt,sha256=CpIL45t5nbhl1dGQPhfIIDfqqak3teK0SxPGBBr7YCk,59
+nlbone-0.4.3.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.4.3.dist-info/RECORD,,