nlbone 0.1.32__py3-none-any.whl → 0.1.34__py3-none-any.whl

nlbone/adapters/http_clients/uploadchi.py

@@ -1,21 +1,35 @@
 from __future__ import annotations
 import json
 from typing import Any, Optional
+from urllib.parse import urlparse, urlunparse
+
 import httpx
+import requests
 
 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]:
+
+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)
@@ -23,6 +37,7 @@ def _build_list_query(limit: int, offset: int, filters: dict[str, Any] | None, s
         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
@@ -30,45 +45,62 @@ def _filename_from_cd(cd: str | None, fallback: str) -> str:
         return cd.split("filename=", 1)[1].strip("\"'")
     return fallback
 
+
+def _normalize_https_base(url: str) -> str:
+    p = urlparse(url.strip())
+    p = p._replace(scheme="https")  # enforce https
+    if p.path.endswith("/"):
+        p = p._replace(path=p.path.rstrip("/"))
+    return str(urlunparse(p))
+
+
 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:
+    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._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 httpx.Client(base_url=self._base_url, timeout=self._timeout, follow_redirects=True)
+        self._client = client or requests.session()
 
     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:
+    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(self._base_url, 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"{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 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 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(self._base_url, 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"{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]:
-        r = self._client.get(f"/{file_id}/download", headers=_auth_headers(token))
+        tok = _resolve_token(token)
+        r = self._client.get(f"{self._base_url}/{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 +108,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"{self._base_url}/{file_id}", headers=_auth_headers(tok))
         if r.status_code not in (204, 200):
             raise UploadchiError(r.status_code, r.text)

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/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/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: ...

{nlbone-0.1.32.dist-info → nlbone-0.1.34.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.1.32
+Version: 0.1.34
 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.dist-info → nlbone-0.1.34.dist-info}/RECORD

@@ -20,13 +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=oioyxoxyOXsiJWZaDPiSCerB4ZURO5zfjO1d19rUMQE,3826
-nlbone/adapters/http_clients/uploadchi_async.py,sha256=0pL_7EV5T40v4Y8IW8rLgPrCEy_meO19YADaYvWpf_M,3499
+nlbone/adapters/http_clients/uploadchi.py,sha256=qguGDQ2NGNSN3BOFSFUINn8mKS4LI23UGURJNhDUH2E,4647
+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
@@ -38,7 +38,7 @@ 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=E_-bA5gURxiJpHWp9l9IliqCbf8P4BZ27ZynRHiAYRo,1739
+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/interfaces/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.32.dist-info/METADATA,sha256=qYFRUMJZdXjtxboUg3pAeeyUnMLtYrqXA9UlDyRMSck,2256
-nlbone-0.1.32.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-nlbone-0.1.32.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nlbone-0.1.32.dist-info/RECORD,,
+nlbone-0.1.34.dist-info/METADATA,sha256=5mgHF3w38N6ELApJK62fA5G_z_0eM_QSOwWpWkr-_vQ,2256
+nlbone-0.1.34.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+nlbone-0.1.34.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+nlbone-0.1.34.dist-info/RECORD,,