nlbone 0.1.32__tar.gz → 0.1.33__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.1.32
+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.32 → nlbone-0.1.33}/pyproject.toml

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

{nlbone-0.1.32 → nlbone-0.1.33}/src/nlbone/adapters/http_clients/uploadchi.py

@@ -12,6 +12,12 @@ class UploadchiError(RuntimeError):
         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 {}
 
@@ -31,7 +37,6 @@ def _filename_from_cd(cd: str | None, fallback: str) -> str:
     return fallback
 
 class UploadchiClient(FileServicePort):
-    """Sync client using httpx.Client"""
     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)
@@ -42,33 +47,38 @@ class UploadchiClient(FileServicePort):
         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(token))
+        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:
-        r = self._client.post(f"/{file_id}/commit", headers=_auth_headers(token), params={"client_id": client_id} if client_id else 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(token))
+        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:
-        r = self._client.get(f"/{file_id}", headers=_auth_headers(token))
+        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]:
-        r = self._client.get(f"/{file_id}/download", headers=_auth_headers(token))
+        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}")
@@ -76,6 +86,7 @@ class UploadchiClient(FileServicePort):
         return r.content, filename, media_type
 
     def delete_file(self, file_id: int, token: str | None = None) -> None:
-        r = self._client.delete(f"/{file_id}", headers=_auth_headers(token))
+        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.32 → nlbone-0.1.33}/src/nlbone/adapters/http_clients/uploadchi_async.py

@@ -1,14 +1,12 @@
 from __future__ import annotations
-import json
 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
+from .uploadchi import UploadchiError, _auth_headers, _build_list_query, _filename_from_cd, _resolve_token
 
 class UploadchiAsyncClient(AsyncFileServicePort):
-    """Async client using httpx.AsyncClient; method names prefixed with a_"""
     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)
@@ -18,34 +16,39 @@ class UploadchiAsyncClient(AsyncFileServicePort):
     async def aclose(self) -> None:
         await self._client.aclose()
 
-    async def a_upload_file(self, file_bytes: bytes, filename: str, params: dict[str, Any] | None = None, token: str | None = None) -> dict:
+    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(token))
+        r = await self._client.post("", files=files, data=data, headers=_auth_headers(tok))
         if r.status_code >= 400:
-            raise UploadchiError(r.status_code, r.text)
+            raise UploadchiError(r.status_code, await r.aread())
         return r.json()
 
-    async def a_commit_file(self, file_id: int, client_id: str, token: str | None = None) -> None:
-        r = await self._client.post(f"/{file_id}/commit", headers=_auth_headers(token), params={"client_id": client_id} if client_id else None)
+    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, r.text)
+            raise UploadchiError(r.status_code, await r.aread())
 
-    async def a_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 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 = await self._client.get("", params=q, headers=_auth_headers(tok))
         if r.status_code >= 400:
-            raise UploadchiError(r.status_code, r.text)
+            raise UploadchiError(r.status_code, await r.aread())
         return r.json()
 
-    async def a_get_file(self, file_id: int, token: str | None = None) -> dict:
-        r = await self._client.get(f"/{file_id}", headers=_auth_headers(token))
+    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, r.text)
+            raise UploadchiError(r.status_code, await r.aread())
         return r.json()
 
-    async def a_download_file(self, file_id: int, token: str | None = None) -> tuple[AsyncIterator[bytes], str, str]:
-        r = await self._client.get(f"/{file_id}/download", headers=_auth_headers(token), stream=True)
+    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"))
@@ -61,7 +64,9 @@ class UploadchiAsyncClient(AsyncFileServicePort):
 
         return _aiter(), filename, media_type
 
-    async def a_delete_file(self, file_id: int, token: str | None = None) -> None:
-        r = await self._client.delete(f"/{file_id}", headers=_auth_headers(token))
+    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):
-            raise UploadchiError(r.status_code, r.text)
+            body = await r.aread()
+            raise UploadchiError(r.status_code, body.decode(errors="ignore"))

{nlbone-0.1.32 → 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.32 → nlbone-0.1.33}/src/nlbone/core/ports/files.py

@@ -3,20 +3,18 @@ from typing import Protocol, runtime_checkable, AsyncIterator, Any
 
 @runtime_checkable
 class FileServicePort(Protocol):
-    # ---- Sync API ----
     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]: ...  # (content_bytes, filename, media_type)
+    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 API (with a_-prefix) ----
     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]: ...  # (stream, filename, media_type)
+    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: ...