nlbone 0.1.33__tar.gz → 0.1.34__tar.gz

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

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

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

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

@@ -1,27 +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)
@@ -29,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
@@ -36,49 +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):
-    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(tok))
+        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:
         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)
+        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(tok))
+        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:
         tok = _resolve_token(token)
-        r = self._client.get(f"/{file_id}", headers=_auth_headers(tok))
+        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]:
         tok = _resolve_token(token)
-        r = self._client.get(f"/{file_id}/download", headers=_auth_headers(tok))
+        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}")
@@ -87,6 +109,6 @@ class UploadchiClient(FileServicePort):
 
     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))
+        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)