nlbone 0.1.31__py3-none-any.whl → 0.1.33__py3-none-any.whl

nlbone/adapters/http_clients/uploadchi.py

@@ -1,177 +1,92 @@
 from __future__ import annotations
-
 import json
-from typing import Any, AsyncIterator, Optional
-
+from typing import Any, Optional
 import httpx
 
 from nlbone.core.ports.files import FileServicePort
 from nlbone.config.settings import get_settings
 
-
-class FileServiceException(RuntimeError):
+class UploadchiError(RuntimeError):
     def __init__(self, status: int, detail: Any | None = None):
         super().__init__(f"Uploadchi HTTP {status}: {detail}")
         self.status = status
         self.detail = detail
 
+def _resolve_token(explicit: str | None) -> str | None:
+    if explicit is not None:
+        return explicit
+    s = get_settings()
+    return s.UPLOADCHI_TOKEN.get_secret_value() if s.UPLOADCHI_TOKEN else None
 
 def _auth_headers(token: str | None) -> dict[str, str]:
     return {"Authorization": f"Bearer {token}"} if token else {}
 
-
-def _build_list_query(
-        limit: int,
-        offset: int,
-        filters: dict[str, Any] | None,
-        sort: list[tuple[str, str]] | None,
-) -> dict[str, Any]:
+def _build_list_query(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:
-        # سرور شما `filters` را به صورت string می‌گیرد؛
-        # اگر سمت سرور JSON هم قبول می‌کند، این بهتر است:
         q["filters"] = json.dumps(filters)
     if sort:
-        # "created_at:desc,id:asc"
         q["sort"] = ",".join([f"{f}:{o}" for f, o in sort])
     return q
 
+def _filename_from_cd(cd: str | None, fallback: str) -> str:
+    if not cd:
+        return fallback
+    if "filename=" in cd:
+        return cd.split("filename=", 1)[1].strip("\"'")
+    return fallback
 
 class UploadchiClient(FileServicePort):
-    """
-    httpx-based client for the Uploadchi microservice.
-
-    Base URL نمونه: http://uploadchi.internal/api/v1/files
-    """
-
-    def __init__(
-            self,
-            base_url: Optional[str] = None,
-            timeout_seconds: Optional[float] = None,
-            client: httpx.AsyncClient | None = None,
-    ) -> None:
+    def __init__(self, base_url: Optional[str] = None, timeout_seconds: Optional[float] = None, client: httpx.Client | None = None) -> None:
         s = get_settings()
         self._base_url = base_url or str(s.UPLOADCHI_BASE_URL)
         self._timeout = timeout_seconds or float(s.HTTP_TIMEOUT_SECONDS)
-        # اگر کلاینت تزریق نشد، خودمان می‌سازیم
-        self._client = client or httpx.AsyncClient(
-            base_url=self._base_url,
-            timeout=self._timeout,
-            follow_redirects=True,
-        )
-
-    async def aclose(self) -> None:
-        await self._client.aclose()
+        self._client = client or httpx.Client(base_url=self._base_url, timeout=self._timeout, follow_redirects=True)
 
-    # ---------- Endpoints ----------
+    def close(self) -> None:
+        self._client.close()
 
-    async def upload_file(
-            self,
-            file_bytes: bytes,
-            filename: str,
-            params: dict[str, Any] | None = None,
-            token: str | None = None,
-    ) -> dict:
-        """
-        POST ""  →  returns FileOut (dict)
-        fields:
-          - file: Upload (multipart)
-          - other params (e.g., bucket, folder, content_type, ...)
-        """
+    def upload_file(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)}
         data = (params or {}).copy()
-        r = await self._client.post(
-            url="",
-            files=files,
-            data=data,
-            headers=_auth_headers(token),
-        )
+        r = self._client.post("", files=files, data=data, headers=_auth_headers(tok))
         if r.status_code >= 400:
-            raise FileServiceException(r.status_code, r.text)
+            raise UploadchiError(r.status_code, r.text)
         return r.json()
 
-    async def commit_file(
-            self,
-            file_id: int,
-            client_id: str,
-            token: str | None = None,
-    ) -> None:
-        """
-        POST "/{file_id}/commit" 204
-        """
-        r = await self._client.post(
-            f"/{file_id}/commit",
-            headers=_auth_headers(token),
-            params={"client_id": client_id} if client_id else None,
-        )
+    def commit_file(self, file_id: int, client_id: str, token: str | None = None) -> None:
+        tok = _resolve_token(token)
+        r = self._client.post(f"/{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 FileServiceException(r.status_code, r.text)
+            raise UploadchiError(r.status_code, r.text)
 
-    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,
-    ) -> dict:
-        """
-        GET "" → returns PaginateResponse-like dict
-          { "data": [...], "total_count": int | null, "total_page": int | null }
-        """
+    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) -> dict:
+        tok = _resolve_token(token)
         q = _build_list_query(limit, offset, filters, sort)
-        r = await self._client.get("", params=q, headers=_auth_headers(token))
+        r = self._client.get("", params=q, headers=_auth_headers(tok))
         if r.status_code >= 400:
-            raise FileServiceException(r.status_code, r.text)
+            raise UploadchiError(r.status_code, r.text)
         return r.json()
 
-    async def get_file(
-            self,
-            file_id: int,
-            token: str | None = None,
-    ) -> dict:
-        """
-        GET "/{file_id}" → FileOut dict
-        """
-        r = await self._client.get(f"/{file_id}", headers=_auth_headers(token))
+    def get_file(self, file_id: int, token: str | None = None) -> dict:
+        tok = _resolve_token(token)
+        r = self._client.get(f"/{file_id}", headers=_auth_headers(tok))
         if r.status_code >= 400:
-            raise FileServiceException(r.status_code, r.text)
+            raise UploadchiError(r.status_code, r.text)
         return r.json()
 
-    async def download_file(
-            self,
-            file_id: int,
-            token: str | None = None,
-    ) -> tuple[AsyncIterator[bytes], str, str]:
-        """
-        GET "/{file_id}/download" → stream + headers (filename, content-type)
-        """
-        r = await self._client.get(f"/{file_id}/download", headers=_auth_headers(token))
+    def download_file(self, file_id: int, token: str | None = None) -> tuple[bytes, str, str]:
+        tok = _resolve_token(token)
+        r = self._client.get(f"/{file_id}/download", headers=_auth_headers(tok))
         if r.status_code >= 400:
-            text = await r.aread()
-            raise FileServiceException(r.status_code, text.decode(errors="ignore"))
-
-        disp = r.headers.get("content-disposition", "")
-        filename = (
-            disp.split("filename=", 1)[1].strip("\"'") if "filename=" in disp else f"file-{file_id}"
-        )
+            raise UploadchiError(r.status_code, r.text)
+        filename = _filename_from_cd(r.headers.get("content-disposition"), fallback=f"file-{file_id}")
         media_type = r.headers.get("content-type", "application/octet-stream")
+        return r.content, filename, media_type
 
-        async def _aiter() -> AsyncIterator[bytes]:
-            async for chunk in r.aiter_bytes():
-                yield chunk
-            await r.aclose()
-
-        return _aiter(), filename, media_type
-
-    async def delete_file(
-            self,
-            file_id: int,
-            token: str | None = None,
-    ) -> None:
-        """
-        DELETE "/{file_id}" → 204
-        """
-        r = await self._client.delete(f"/{file_id}", headers=_auth_headers(token))
+    def delete_file(self, file_id: int, token: str | None = None) -> None:
+        tok = _resolve_token(token)
+        r = self._client.delete(f"/{file_id}", headers=_auth_headers(tok))
         if r.status_code not in (204, 200):
-            raise FileServiceException(r.status_code, r.text)
+            raise UploadchiError(r.status_code, r.text)

nlbone/adapters/http_clients/uploadchi_async.py

@@ -0,0 +1,72 @@
+from __future__ import annotations
+from typing import Any, Optional, AsyncIterator
+import httpx
+
+from nlbone.core.ports.files import AsyncFileServicePort
+from nlbone.config.settings import get_settings
+from .uploadchi import UploadchiError, _auth_headers, _build_list_query, _filename_from_cd, _resolve_token
+
+class UploadchiAsyncClient(AsyncFileServicePort):
+    def __init__(self, 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)
+        self._timeout = timeout_seconds or float(s.HTTP_TIMEOUT_SECONDS)
+        self._client = client or httpx.AsyncClient(base_url=self._base_url, timeout=self._timeout, follow_redirects=True)
+
+    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) -> dict:
+        tok = _resolve_token(token)
+        files = {"file": (filename, file_bytes)}
+        data = (params or {}).copy()
+        r = await self._client.post("", files=files, data=data, headers=_auth_headers(tok))
+        if r.status_code >= 400:
+            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:
+        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)
+        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) -> dict:
+        tok = _resolve_token(token)
+        q = _build_list_query(limit, offset, filters, sort)
+        r = await self._client.get("", params=q, headers=_auth_headers(tok))
+        if r.status_code >= 400:
+            raise UploadchiError(r.status_code, await r.aread())
+        return r.json()
+
+    async def get_file(self, file_id: int, 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]:
+        tok = _resolve_token(token)
+        r = await self._client.get(f"/{file_id}/download", headers=_auth_headers(tok), stream=True)
+        if r.status_code >= 400:
+            body = await r.aread()
+            raise UploadchiError(r.status_code, body.decode(errors="ignore"))
+        filename = _filename_from_cd(r.headers.get("content-disposition"), fallback=f"file-{file_id}")
+        media_type = r.headers.get("content-type", "application/octet-stream")
+
+        async def _aiter() -> AsyncIterator[bytes]:
+            try:
+                async for chunk in r.aiter_bytes():
+                    yield chunk
+            finally:
+                await r.aclose()
+
+        return _aiter(), filename, media_type
+
+    async def delete_file(self, file_id: int, 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):
+            body = await r.aread()
+            raise UploadchiError(r.status_code, body.decode(errors="ignore"))

nlbone/config/settings.py

@@ -2,7 +2,7 @@ import os
 from functools import lru_cache
 from pathlib import Path
 from typing import Literal
-from pydantic import AnyHttpUrl, Field, SecretStr
+from pydantic import AnyHttpUrl, Field, SecretStr, AliasChoices
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
@@ -54,7 +54,14 @@ class Settings(BaseSettings):
     # ---------------------------
     REDIS_URL: str = Field(default="redis://localhost:6379/0")
 
+    # ---------------------------
+    # UPLOADCHI 
+    # ---------------------------
     UPLOADCHI_BASE_URL: AnyHttpUrl = Field(default="https://uploadchi.numberland.ir/v1/files")
+    UPLOADCHI_TOKEN: SecretStr | None = Field(
+        default=None,
+        validation_alias=AliasChoices("NLBONE_UPLOADCHI_TOKEN", "UPLOADCHI_TOKEN"),
+    )
 
     model_config = SettingsConfigDict(
         env_prefix="NLBONE_",

nlbone/{di/container.py → container.py}

@@ -1,7 +1,8 @@
 from nlbone.adapters.http_clients.uploadchi import UploadchiClient
+from nlbone.adapters.http_clients.uploadchi_async import UploadchiAsyncClient
 from nlbone.config.settings import Settings
 from nlbone.adapters.auth.keycloak import KeycloakAuthService
-from nlbone.core.ports.files import FileServicePort
+from nlbone.core.ports.files import FileServicePort, AsyncFileServicePort
 
 
 class Container:
@@ -9,3 +10,4 @@ class Container:
         self.settings = settings or Settings()
         self.auth: KeycloakAuthService = KeycloakAuthService(self.settings)
         self.file_service: FileServicePort = UploadchiClient()
+        self.afiles_service: AsyncFileServicePort = UploadchiAsyncClient()

nlbone/core/ports/files.py

@@ -3,45 +3,18 @@ from typing import Protocol, runtime_checkable, AsyncIterator, Any
 
 @runtime_checkable
 class FileServicePort(Protocol):
-    async def upload_file(
-        self,
-        file_bytes: bytes,
-        filename: str,
-        params: dict[str, Any] | None = None,
-        token: str | None = None,
-    ) -> dict: ...
+    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 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) -> 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: ...
 
-    async def commit_file(
-        self,
-        file_id: int,
-        client_id: str,
-        token: str | None = None,
-    ) -> None: ...
-
-    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,
-    ) -> 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: ...
+@runtime_checkable
+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 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) -> 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: ...

{nlbone-0.1.31.dist-info → nlbone-0.1.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.1.31
+Version: 0.1.33
 Summary: Backbone package for interfaces and infrastructure in Python projects
 Author-email: Amir Hosein Kahkbazzadeh <a.khakbazzadeh@gmail.com>
 License: MIT

{nlbone-0.1.31.dist-info → nlbone-0.1.33.dist-info}/RECORD

@@ -1,4 +1,5 @@
 nlbone/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone/container.py,sha256=JLEiJSh7vZAl7kBY6bwqtL3IzHFOxhrfreaZDU6K9n0,663
 nlbone/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/auth/__init__.py,sha256=Eh9kWjY1I8vi17gK0oOzBLJwJX_GFuUcJIN7cLU6lJg,41
@@ -19,12 +20,13 @@ nlbone/adapters/db/sqlalchemy/query/ordering.py,sha256=THbuxZmoFZzJIa28KfDQ6ioS8
 nlbone/adapters/db/sqlalchemy/query/types.py,sha256=M2j6SOSyFkLuyXq4kvPYgZQYz5TKCBe3osoIIN1yfBI,287
 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=tr-huESnVDg08FQh3QTFST7_JQz7dPShr2CAX9CQYLU,5737
+nlbone/adapters/http_clients/uploadchi.py,sha256=k6d1JW9BLvY1aEjCMp8AJF6a-VVKOIVR0OsaYHxVnhc,4201
+nlbone/adapters/http_clients/uploadchi_async.py,sha256=u-CHisQoTjuhyXb5h-TLDnfeUnN47e-VEbKamUnkaYI,3710
 nlbone/adapters/messaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/adapters/messaging/redis.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/config/logging.py,sha256=68WRQejEpL6eHEY_cOgdlOjndKc-RWth0n4YmXnceC8,5041
-nlbone/config/settings.py,sha256=ElE--1waYQ2o_5u7HzHi800zsK9n_oJBz1VnewYm-Y0,2368
+nlbone/config/settings.py,sha256=IbjhevN_0TuO_on1-VxXH_aOaVwj3K7YBhU8X9tIWE4,2626
 nlbone/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/core/application/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/core/application/services.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -36,11 +38,9 @@ nlbone/core/domain/events.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 nlbone/core/domain/models.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/core/ports/__init__.py,sha256=J24ldeLIQ_AWqKpdNbtaEWq4-G4cyWx8XEG0Dt6keao,29
 nlbone/core/ports/auth.py,sha256=v2NiH8FzKXZ1MabzQxaK7AQvnt-GQindYIki90swTE4,492
-nlbone/core/ports/files.py,sha256=dYBMFsaesyIVaWxzTShGFMFzRZWbWcQtPdzhELY6t4A,1119
+nlbone/core/ports/files.py,sha256=yJwW0kFWxkrT4ntfXDdJYyKSEWB6daEuaI6zgmeg0Gg,1596
 nlbone/core/ports/messaging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/core/ports/repo.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone/di/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone/di/container.py,sha256=nzWx8nctyBMAERoqjolt0vWS38H2JH2QhqVaLvAvF8U,488
 nlbone/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/interfaces/api/exceptions.py,sha256=OczR1FND2nbCngwbfgaPrgDbDaz4Pc47mFSHgtL7tW8,313
@@ -57,7 +57,7 @@ nlbone/interfaces/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 nlbone/interfaces/jobs/sync_tokens.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nlbone/utils/time.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.1.31.dist-info/METADATA,sha256=AQxSX36K4Z747tRRCrLWQ0qpuZyI586sVHKK00WAooo,2256
-nlbone-0.1.31.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nlbone-0.1.31.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.1.31.dist-info/RECORD,,
+nlbone-0.1.33.dist-info/METADATA,sha256=Ug8O3AcnsrkA6y8ZBRZDGymAXaqjjIBW1Js-hQqvLHw,2256
+nlbone-0.1.33.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nlbone-0.1.33.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.1.33.dist-info/RECORD,,