nlbone 0.1.29__tar.gz → 0.1.30__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {nlbone-0.1.29 → nlbone-0.1.30}/PKG-INFO +1 -1
- {nlbone-0.1.29 → nlbone-0.1.30}/pyproject.toml +1 -1
- nlbone-0.1.30/src/nlbone/adapters/http_clients/uploadchi.py +177 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/config/settings.py +2 -0
- nlbone-0.1.30/src/nlbone/core/ports/files.py +47 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/di/container.py +5 -1
- nlbone-0.1.30/src/nlbone/utils/time.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/.gitignore +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/LICENSE +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/README.md +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/auth/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/auth/keycloak.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/memory.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/postgres.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/query_builder.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/sqlalchemy/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/sqlalchemy/base.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/sqlalchemy/engine.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/sqlalchemy/query/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/sqlalchemy/query/builder.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/sqlalchemy/query/coercion.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/sqlalchemy/query/filters.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/sqlalchemy/query/ordering.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/sqlalchemy/query/types.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/db/sqlalchemy/schema.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/http_clients/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/http_clients/email_gateway.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/messaging/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/adapters/messaging/redis.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/config/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/config/logging.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/core/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/core/application/__init__.py +0 -0
- {nlbone-0.1.29/src/nlbone/core/application/use_cases → nlbone-0.1.30/src/nlbone/core/application/services}/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/core/application/services.py +0 -0
- {nlbone-0.1.29/src/nlbone/core/domain → nlbone-0.1.30/src/nlbone/core/application/use_cases}/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/core/application/use_cases/register_user.py +0 -0
- {nlbone-0.1.29/src/nlbone/di → nlbone-0.1.30/src/nlbone/core/domain}/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/core/domain/events.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/core/domain/models.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/core/ports/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/core/ports/auth.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/core/ports/messaging.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/core/ports/repo.py +0 -0
- {nlbone-0.1.29/src/nlbone/interfaces → nlbone-0.1.30/src/nlbone/di}/__init__.py +0 -0
- {nlbone-0.1.29/src/nlbone/interfaces/api → nlbone-0.1.30/src/nlbone/interfaces}/__init__.py +0 -0
- {nlbone-0.1.29/src/nlbone/interfaces/cli → nlbone-0.1.30/src/nlbone/interfaces/api}/__init__.py +0 -0
- {nlbone-0.1.29/src/nlbone/interfaces/jobs → nlbone-0.1.30/src/nlbone/interfaces/api/dependencies}/__init__.py +0 -0
- /nlbone-0.1.29/src/nlbone/interfaces/api/dependencies.py → /nlbone-0.1.30/src/nlbone/interfaces/api/dependencies/db.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/interfaces/api/exceptions.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/interfaces/api/pagination/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/interfaces/api/pagination/offset_base.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/interfaces/api/routers.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/interfaces/api/schemas.py +0 -0
- {nlbone-0.1.29/src/nlbone/utils → nlbone-0.1.30/src/nlbone/interfaces/cli}/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/interfaces/cli/init_db.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/interfaces/cli/main.py +0 -0
- /nlbone-0.1.29/src/nlbone/core/{__init__.py} → /nlbone-0.1.30/src/nlbone/interfaces/jobs/__init__.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/interfaces/jobs/sync_tokens.py +0 -0
- {nlbone-0.1.29 → nlbone-0.1.30}/src/nlbone/types.py +0 -0
- /nlbone-0.1.29/src/nlbone/utils/time.py → /nlbone-0.1.30/src/nlbone/utils/__init__.py +0 -0
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
from __future__ import annotations
|
|
2
|
+
|
|
3
|
+
import json
|
|
4
|
+
from typing import Any, AsyncIterator, Optional
|
|
5
|
+
|
|
6
|
+
import httpx
|
|
7
|
+
|
|
8
|
+
from nlbone.core.ports.files import FileServicePort
|
|
9
|
+
from nlbone.config.settings import get_settings
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
class FileServiceException(RuntimeError):
|
|
13
|
+
def __init__(self, status: int, detail: Any | None = None):
|
|
14
|
+
super().__init__(f"Uploadchi HTTP {status}: {detail}")
|
|
15
|
+
self.status = status
|
|
16
|
+
self.detail = detail
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
def _auth_headers(token: str | None) -> dict[str, str]:
|
|
20
|
+
return {"Authorization": f"Bearer {token}"} if token else {}
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
def _build_list_query(
|
|
24
|
+
limit: int,
|
|
25
|
+
offset: int,
|
|
26
|
+
filters: dict[str, Any] | None,
|
|
27
|
+
sort: list[tuple[str, str]] | None,
|
|
28
|
+
) -> dict[str, Any]:
|
|
29
|
+
q: dict[str, Any] = {"limit": limit, "offset": offset}
|
|
30
|
+
if filters:
|
|
31
|
+
# سرور شما `filters` را به صورت string میگیرد؛
|
|
32
|
+
# اگر سمت سرور JSON هم قبول میکند، این بهتر است:
|
|
33
|
+
q["filters"] = json.dumps(filters)
|
|
34
|
+
if sort:
|
|
35
|
+
# "created_at:desc,id:asc"
|
|
36
|
+
q["sort"] = ",".join([f"{f}:{o}" for f, o in sort])
|
|
37
|
+
return q
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
class UploadchiClient(FileServicePort):
|
|
41
|
+
"""
|
|
42
|
+
httpx-based client for the Uploadchi microservice.
|
|
43
|
+
|
|
44
|
+
Base URL نمونه: http://uploadchi.internal/api/v1/files
|
|
45
|
+
"""
|
|
46
|
+
|
|
47
|
+
def __init__(
|
|
48
|
+
self,
|
|
49
|
+
base_url: Optional[str] = None,
|
|
50
|
+
timeout_seconds: Optional[float] = None,
|
|
51
|
+
client: httpx.AsyncClient | None = None,
|
|
52
|
+
) -> None:
|
|
53
|
+
s = get_settings()
|
|
54
|
+
self._base_url = base_url or str(s.UPLOADCHI_BASE_URL)
|
|
55
|
+
self._timeout = timeout_seconds or float(s.HTTP_TIMEOUT_SECONDS)
|
|
56
|
+
# اگر کلاینت تزریق نشد، خودمان میسازیم
|
|
57
|
+
self._client = client or httpx.AsyncClient(
|
|
58
|
+
base_url=self._base_url,
|
|
59
|
+
timeout=self._timeout,
|
|
60
|
+
follow_redirects=True,
|
|
61
|
+
)
|
|
62
|
+
|
|
63
|
+
async def aclose(self) -> None:
|
|
64
|
+
await self._client.aclose()
|
|
65
|
+
|
|
66
|
+
# ---------- Endpoints ----------
|
|
67
|
+
|
|
68
|
+
async def upload_file(
|
|
69
|
+
self,
|
|
70
|
+
file_bytes: bytes,
|
|
71
|
+
filename: str,
|
|
72
|
+
params: dict[str, Any] | None = None,
|
|
73
|
+
token: str | None = None,
|
|
74
|
+
) -> dict:
|
|
75
|
+
"""
|
|
76
|
+
POST "" → returns FileOut (dict)
|
|
77
|
+
fields:
|
|
78
|
+
- file: Upload (multipart)
|
|
79
|
+
- other params (e.g., bucket, folder, content_type, ...)
|
|
80
|
+
"""
|
|
81
|
+
files = {"file": (filename, file_bytes)}
|
|
82
|
+
data = (params or {}).copy()
|
|
83
|
+
r = await self._client.post(
|
|
84
|
+
url="",
|
|
85
|
+
files=files,
|
|
86
|
+
data=data,
|
|
87
|
+
headers=_auth_headers(token),
|
|
88
|
+
)
|
|
89
|
+
if r.status_code >= 400:
|
|
90
|
+
raise FileServiceException(r.status_code, r.text)
|
|
91
|
+
return r.json()
|
|
92
|
+
|
|
93
|
+
async def commit_file(
|
|
94
|
+
self,
|
|
95
|
+
file_id: int,
|
|
96
|
+
client_id: str,
|
|
97
|
+
token: str | None = None,
|
|
98
|
+
) -> None:
|
|
99
|
+
"""
|
|
100
|
+
POST "/{file_id}/commit" 204
|
|
101
|
+
"""
|
|
102
|
+
r = await self._client.post(
|
|
103
|
+
f"/{file_id}/commit",
|
|
104
|
+
headers=_auth_headers(token),
|
|
105
|
+
params={"client_id": client_id} if client_id else None,
|
|
106
|
+
)
|
|
107
|
+
if r.status_code not in (204, 200):
|
|
108
|
+
raise FileServiceException(r.status_code, r.text)
|
|
109
|
+
|
|
110
|
+
async def list_files(
|
|
111
|
+
self,
|
|
112
|
+
limit: int = 10,
|
|
113
|
+
offset: int = 0,
|
|
114
|
+
filters: dict[str, Any] | None = None,
|
|
115
|
+
sort: list[tuple[str, str]] | None = None,
|
|
116
|
+
token: str | None = None,
|
|
117
|
+
) -> dict:
|
|
118
|
+
"""
|
|
119
|
+
GET "" → returns PaginateResponse-like dict
|
|
120
|
+
{ "data": [...], "total_count": int | null, "total_page": int | null }
|
|
121
|
+
"""
|
|
122
|
+
q = _build_list_query(limit, offset, filters, sort)
|
|
123
|
+
r = await self._client.get("", params=q, headers=_auth_headers(token))
|
|
124
|
+
if r.status_code >= 400:
|
|
125
|
+
raise FileServiceException(r.status_code, r.text)
|
|
126
|
+
return r.json()
|
|
127
|
+
|
|
128
|
+
async def get_file(
|
|
129
|
+
self,
|
|
130
|
+
file_id: int,
|
|
131
|
+
token: str | None = None,
|
|
132
|
+
) -> dict:
|
|
133
|
+
"""
|
|
134
|
+
GET "/{file_id}" → FileOut dict
|
|
135
|
+
"""
|
|
136
|
+
r = await self._client.get(f"/{file_id}", headers=_auth_headers(token))
|
|
137
|
+
if r.status_code >= 400:
|
|
138
|
+
raise FileServiceException(r.status_code, r.text)
|
|
139
|
+
return r.json()
|
|
140
|
+
|
|
141
|
+
async def download_file(
|
|
142
|
+
self,
|
|
143
|
+
file_id: int,
|
|
144
|
+
token: str | None = None,
|
|
145
|
+
) -> tuple[AsyncIterator[bytes], str, str]:
|
|
146
|
+
"""
|
|
147
|
+
GET "/{file_id}/download" → stream + headers (filename, content-type)
|
|
148
|
+
"""
|
|
149
|
+
r = await self._client.get(f"/{file_id}/download", headers=_auth_headers(token))
|
|
150
|
+
if r.status_code >= 400:
|
|
151
|
+
text = await r.aread()
|
|
152
|
+
raise FileServiceException(r.status_code, text.decode(errors="ignore"))
|
|
153
|
+
|
|
154
|
+
disp = r.headers.get("content-disposition", "")
|
|
155
|
+
filename = (
|
|
156
|
+
disp.split("filename=", 1)[1].strip("\"'") if "filename=" in disp else f"file-{file_id}"
|
|
157
|
+
)
|
|
158
|
+
media_type = r.headers.get("content-type", "application/octet-stream")
|
|
159
|
+
|
|
160
|
+
async def _aiter() -> AsyncIterator[bytes]:
|
|
161
|
+
async for chunk in r.aiter_bytes():
|
|
162
|
+
yield chunk
|
|
163
|
+
await r.aclose()
|
|
164
|
+
|
|
165
|
+
return _aiter(), filename, media_type
|
|
166
|
+
|
|
167
|
+
async def delete_file(
|
|
168
|
+
self,
|
|
169
|
+
file_id: int,
|
|
170
|
+
token: str | None = None,
|
|
171
|
+
) -> None:
|
|
172
|
+
"""
|
|
173
|
+
DELETE "/{file_id}" → 204
|
|
174
|
+
"""
|
|
175
|
+
r = await self._client.delete(f"/{file_id}", headers=_auth_headers(token))
|
|
176
|
+
if r.status_code not in (204, 200):
|
|
177
|
+
raise FileServiceException(r.status_code, r.text)
|
|
@@ -54,6 +54,8 @@ class Settings(BaseSettings):
|
|
|
54
54
|
# ---------------------------
|
|
55
55
|
REDIS_URL: str = Field(default="redis://localhost:6379/0")
|
|
56
56
|
|
|
57
|
+
UPLOADCHI_BASE_URL: AnyHttpUrl = Field(default="https://uploadchi.numberland.ir/v1/files")
|
|
58
|
+
|
|
57
59
|
model_config = SettingsConfigDict(
|
|
58
60
|
env_prefix="NLBONE_",
|
|
59
61
|
env_file=None,
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
from __future__ import annotations
|
|
2
|
+
from typing import Protocol, runtime_checkable, AsyncIterator, Any
|
|
3
|
+
|
|
4
|
+
@runtime_checkable
|
|
5
|
+
class FileServicePort(Protocol):
|
|
6
|
+
async def upload_file(
|
|
7
|
+
self,
|
|
8
|
+
file_bytes: bytes,
|
|
9
|
+
filename: str,
|
|
10
|
+
params: dict[str, Any] | None = None,
|
|
11
|
+
token: str | None = None,
|
|
12
|
+
) -> dict: ...
|
|
13
|
+
|
|
14
|
+
async def commit_file(
|
|
15
|
+
self,
|
|
16
|
+
file_id: int,
|
|
17
|
+
client_id: str,
|
|
18
|
+
token: str | None = None,
|
|
19
|
+
) -> None: ...
|
|
20
|
+
|
|
21
|
+
async def list_files(
|
|
22
|
+
self,
|
|
23
|
+
limit: int = 10,
|
|
24
|
+
offset: int = 0,
|
|
25
|
+
filters: dict[str, Any] | None = None,
|
|
26
|
+
sort: list[tuple[str, str]] | None = None,
|
|
27
|
+
token: str | None = None,
|
|
28
|
+
) -> dict: ...
|
|
29
|
+
|
|
30
|
+
async def get_file(
|
|
31
|
+
self,
|
|
32
|
+
file_id: int,
|
|
33
|
+
token: str | None = None,
|
|
34
|
+
) -> dict: ...
|
|
35
|
+
|
|
36
|
+
async def download_file(
|
|
37
|
+
self,
|
|
38
|
+
file_id: int,
|
|
39
|
+
token: str | None = None,
|
|
40
|
+
) -> tuple[AsyncIterator[bytes], str, str]:
|
|
41
|
+
...
|
|
42
|
+
|
|
43
|
+
async def delete_file(
|
|
44
|
+
self,
|
|
45
|
+
file_id: int,
|
|
46
|
+
token: str | None = None,
|
|
47
|
+
) -> None: ...
|
|
@@ -1,7 +1,11 @@
|
|
|
1
|
+
from nlbone.adapters.http_clients.uploadchi import UploadchiClient
|
|
1
2
|
from nlbone.config.settings import Settings
|
|
2
3
|
from nlbone.adapters.auth.keycloak import KeycloakAuthService
|
|
4
|
+
from nlbone.core.ports.files import FileServicePort
|
|
5
|
+
|
|
3
6
|
|
|
4
7
|
class Container:
|
|
5
8
|
def __init__(self, settings: Settings | None = None):
|
|
6
9
|
self.settings = settings or Settings()
|
|
7
|
-
self.auth: KeycloakAuthService = KeycloakAuthService(self.settings)
|
|
10
|
+
self.auth: KeycloakAuthService = KeycloakAuthService(self.settings)
|
|
11
|
+
self.file_service: FileServicePort = UploadchiClient()
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{nlbone-0.1.29/src/nlbone/interfaces/cli → nlbone-0.1.30/src/nlbone/interfaces/api}/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
/nlbone-0.1.29/src/nlbone/core/{__init__.py} → /nlbone-0.1.30/src/nlbone/interfaces/jobs/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|