marzban 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl
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.
- marzban/__init__.py +1 -1
- marzban/api.py +3 -10
- {marzban-0.3.1.dist-info → marzban-0.3.3.dist-info}/METADATA +5 -5
- marzban-0.3.3.dist-info/RECORD +8 -0
- {marzban-0.3.1.dist-info → marzban-0.3.3.dist-info}/WHEEL +1 -1
- marzban-0.3.1.dist-info/RECORD +0 -8
- {marzban-0.3.1.dist-info → marzban-0.3.3.dist-info}/LICENSE +0 -0
- {marzban-0.3.1.dist-info → marzban-0.3.3.dist-info}/top_level.txt +0 -0
marzban/__init__.py
CHANGED
marzban/api.py
CHANGED
@@ -235,10 +235,10 @@ class MarzbanAPI:
|
|
235
235
|
return UserResponse(**response.json())
|
236
236
|
|
237
237
|
async def get_users(self, token: str, offset: Optional[int] = None, limit: Optional[int] = None,
|
238
|
-
username: Optional[List[str]] = None,
|
239
|
-
sort: Optional[str] = None) -> UsersResponse:
|
238
|
+
username: Optional[List[str]] = None, search: Optional[str] = None,
|
239
|
+
status: Optional[str] = None, sort: Optional[str] = None) -> UsersResponse:
|
240
240
|
url = "/api/users"
|
241
|
-
params = {"offset": offset, "limit": limit, "username": username, "status": status, "sort": sort}
|
241
|
+
params = {"offset": offset, "limit": limit, "username": username, "search": search, "status": status, "sort": sort}
|
242
242
|
response = await self._request("GET", url, token, params=params)
|
243
243
|
return UsersResponse(**response.json())
|
244
244
|
|
@@ -246,13 +246,6 @@ class MarzbanAPI:
|
|
246
246
|
url = "/api/users/reset"
|
247
247
|
await self._request("POST", url, token)
|
248
248
|
|
249
|
-
async def get_user_usage(self, username: str, token: str, start: Optional[str] = None,
|
250
|
-
end: Optional[str] = None) -> UserUsagesResponse:
|
251
|
-
url = f"/api/user/{username}/usage"
|
252
|
-
params = {"start": start, "end": end}
|
253
|
-
response: httpx.Response = await self._request("GET", url, token, params=params)
|
254
|
-
return UserUsagesResponse(**response.json())
|
255
|
-
|
256
249
|
async def set_owner(self, username: str, admin_username: str, token: str) -> UserResponse:
|
257
250
|
url = f"/api/user/{username}/set-owner?admin_username={admin_username}"
|
258
251
|
response = await self._request("PUT", url, token)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: marzban
|
3
|
-
Version: 0.3.
|
3
|
+
Version: 0.3.3
|
4
4
|
Summary: Асинхронная библиотека Python для взаимодействия с MarzbanAPI | Поддерживает работу через HTTPS/SSH
|
5
5
|
Home-page: https://github.com/sm1ky/marzban_api
|
6
6
|
Author: Artem
|
@@ -16,10 +16,10 @@ Classifier: Operating System :: OS Independent
|
|
16
16
|
Requires-Python: >=3.9
|
17
17
|
Description-Content-Type: text/markdown
|
18
18
|
License-File: LICENSE
|
19
|
-
Requires-Dist: httpx
|
20
|
-
Requires-Dist: pydantic
|
21
|
-
Requires-Dist: paramiko
|
22
|
-
Requires-Dist: sshtunnel
|
19
|
+
Requires-Dist: httpx>=0.23.0
|
20
|
+
Requires-Dist: pydantic>=1.10.0
|
21
|
+
Requires-Dist: paramiko>=3.5.0
|
22
|
+
Requires-Dist: sshtunnel>=0.4.0
|
23
23
|
|
24
24
|
|
25
25
|
# MarzbanAPI Client
|
@@ -0,0 +1,8 @@
|
|
1
|
+
marzban/__init__.py,sha256=j8R4BtzQfxUTiJYGEe_QMV2fFbcukPhw9-VKiVcBwLM,1302
|
2
|
+
marzban/api.py,sha256=fKxxyJx_Hm6iM7jFmJIYdA4GiSI_7zEP7DzawxfZiN4,17912
|
3
|
+
marzban/models.py,sha256=p9QWCmNcDJQZO1EZm4ihgwS7ZJpayaMjo4fFGOpW3cE,6947
|
4
|
+
marzban-0.3.3.dist-info/LICENSE,sha256=e7OchdHfXoz2OZRHj8iltLIKYwdri9J4_9PMEnov418,1061
|
5
|
+
marzban-0.3.3.dist-info/METADATA,sha256=QNdYzqDND3Pp6H6KiI6aEXyZnyQCGZ-o7xK-VYiMkdM,3159
|
6
|
+
marzban-0.3.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
|
7
|
+
marzban-0.3.3.dist-info/top_level.txt,sha256=KUmBWzTarBlzw2GZOuk-d-jM2GU4zPWo1iwvW_mXS-c,8
|
8
|
+
marzban-0.3.3.dist-info/RECORD,,
|
marzban-0.3.1.dist-info/RECORD
DELETED
@@ -1,8 +0,0 @@
|
|
1
|
-
marzban/__init__.py,sha256=zItcSPeCEd4rUrwdPSMAgsuyQAuUFekCf-IF3g7SMqI,1302
|
2
|
-
marzban/api.py,sha256=nRVRyvWbFlKGh9w5HvfPvRqrTSKfiaEAHvC7qskZPTs,18267
|
3
|
-
marzban/models.py,sha256=p9QWCmNcDJQZO1EZm4ihgwS7ZJpayaMjo4fFGOpW3cE,6947
|
4
|
-
marzban-0.3.1.dist-info/LICENSE,sha256=e7OchdHfXoz2OZRHj8iltLIKYwdri9J4_9PMEnov418,1061
|
5
|
-
marzban-0.3.1.dist-info/METADATA,sha256=C6qjMy5G6-LvjkjfuCrjIm_6d2A0obk6cq2Y-oPHcUs,3163
|
6
|
-
marzban-0.3.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
|
7
|
-
marzban-0.3.1.dist-info/top_level.txt,sha256=KUmBWzTarBlzw2GZOuk-d-jM2GU4zPWo1iwvW_mXS-c,8
|
8
|
-
marzban-0.3.1.dist-info/RECORD,,
|
File without changes
|
File without changes
|