nlbone 0.1.31__tar.gz → 0.1.33__tar.gz

{nlbone-0.1.31 → nlbone-0.1.33}/PKG-INFO

@@ -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 → nlbone-0.1.33}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nlbone"
-version = "0.1.31"
+version = "0.1.33"
 description = "Backbone package for interfaces and infrastructure in Python projects"
 readme = "README.md"
 requires-python = ">=3.10"

nlbone-0.1.33/src/nlbone/adapters/http_clients/uploadchi.py

@@ -0,0 +1,92 @@
+from __future__ import annotations
+import json
+from typing import Any, Optional
+import httpx
+
+from nlbone.core.ports.files import FileServicePort
+from nlbone.config.settings import get_settings
+
+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]:
+    q: dict[str, Any] = {"limit": limit, "offset": offset}
+    if filters:
+        q["filters"] = json.dumps(filters)
+    if sort:
+        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):
+    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.Client(base_url=self._base_url, timeout=self._timeout, follow_redirects=True)
+
+    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) -> dict:
+        tok = _resolve_token(token)
+        files = {"file": (filename, file_bytes)}
+        data = (params or {}).copy()
+        r = self._client.post("", files=files, data=data, headers=_auth_headers(tok))
+        if r.status_code >= 400:
+            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:
+        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 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) -> dict:
+        tok = _resolve_token(token)
+        q = _build_list_query(limit, offset, filters, sort)
+        r = self._client.get("", params=q, headers=_auth_headers(tok))
+        if r.status_code >= 400:
+            raise UploadchiError(r.status_code, r.text)
+        return r.json()
+
+    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 UploadchiError(r.status_code, r.text)
+        return r.json()
+
+    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:
+            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
+
+    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 UploadchiError(r.status_code, r.text)

nlbone-0.1.33/src/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-0.1.31 → nlbone-0.1.33}/src/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-0.1.31/src/nlbone/di → nlbone-0.1.33/src/nlbone}/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-0.1.33/src/nlbone/core/ports/files.py

@@ -0,0 +1,20 @@
+from __future__ import annotations
+from typing import Protocol, runtime_checkable, AsyncIterator, Any
+
+@runtime_checkable
+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 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: ...
+
+@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/src/nlbone/adapters/http_clients/uploadchi.py

@@ -1,177 +0,0 @@
-from __future__ import annotations
-
-import json
-from typing import Any, AsyncIterator, Optional
-
-import httpx
-
-from nlbone.core.ports.files import FileServicePort
-from nlbone.config.settings import get_settings
-
-
-class FileServiceException(RuntimeError):
-    def __init__(self, status: int, detail: Any | None = None):
-        super().__init__(f"Uploadchi HTTP {status}: {detail}")
-        self.status = status
-        self.detail = detail
-
-
-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]:
-    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
-
-
-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:
-        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()
-
-    # ---------- Endpoints ----------
-
-    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, ...)
-        """
-        files = {"file": (filename, file_bytes)}
-        data = (params or {}).copy()
-        r = await self._client.post(
-            url="",
-            files=files,
-            data=data,
-            headers=_auth_headers(token),
-        )
-        if r.status_code >= 400:
-            raise FileServiceException(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,
-        )
-        if r.status_code not in (204, 200):
-            raise FileServiceException(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 }
-        """
-        q = _build_list_query(limit, offset, filters, sort)
-        r = await self._client.get("", params=q, headers=_auth_headers(token))
-        if r.status_code >= 400:
-            raise FileServiceException(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))
-        if r.status_code >= 400:
-            raise FileServiceException(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))
-        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}"
-        )
-        media_type = r.headers.get("content-type", "application/octet-stream")
-
-        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))
-        if r.status_code not in (204, 200):
-            raise FileServiceException(r.status_code, r.text)

nlbone-0.1.31/src/nlbone/core/ports/files.py

@@ -1,47 +0,0 @@
-from __future__ import annotations
-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: ...
-
-    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: ...