marzban 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

marzban/__init__.py

@@ -59,4 +59,4 @@ __all__ = (
     "ValidationError",
 )
 
-__version__ = "0.2.6"
+__version__ = "0.2.8"

marzban/api.py

@@ -4,9 +4,9 @@ from pydantic import BaseModel
 from .models import *
 
 class MarzbanAPI:
-    def __init__(self, base_url: str):
+    def __init__(self, base_url: str, *, timeout: float = 10.0, verify: bool = False):
         self.base_url = base_url
-        self.client = httpx.AsyncClient(base_url=base_url)
+        self.client = httpx.AsyncClient(base_url=base_url, verify=verify, timeout=timeout)
 
     def _get_headers(self, token: str) -> Dict[str, str]:
         return {"Authorization": f"Bearer {token}"}
@@ -14,7 +14,7 @@ class MarzbanAPI:
     async def _request(self, method: str, url: str, token: Optional[str] = None, data: Optional[BaseModel] = None, params: Optional[Dict[str, Any]] = None) -> httpx.Response:
         headers = self._get_headers(token) if token else {}
         json_data = data.model_dump(exclude_none=True) if data else None
-        params = [param for param in (params or []) if param is not None]
+        params = {k: v for k, v in (params or {}).items() if v is not None}
         response = await self.client.request(method, url, headers=headers, json=json_data, params=params)
         response.raise_for_status()
         return response

marzban/models.py

@@ -69,6 +69,7 @@ class UserResponse(BaseModel):
     on_hold_expire_duration: Optional[int] = None
     on_hold_timeout: Optional[str] = None
     status: Optional[str] = None
+    admin: Optional[Admin] = None
     used_traffic: Optional[int] = None
     lifetime_used_traffic: Optional[int] = None
     created_at: Optional[str] = None
@@ -195,4 +196,4 @@ class UserStatus(BaseModel):
 class ValidationError(BaseModel):
     loc: List[Any]
     msg: str
-    type: str
+    type: str

{marzban-0.2.6.dist-info → marzban-0.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: marzban
-Version: 0.2.6
+Version: 0.2.8
 Summary: Асинхронная библиотека Python для взаимодействия с MarzbanAPI
 Home-page: https://github.com/sm1ky/marzban_api
 Author: Artem

marzban-0.2.8.dist-info/RECORD

@@ -0,0 +1,8 @@
+marzban/__init__.py,sha256=C_Py0ya2lJIGKUjXy6kN3gVmEdC-PVgXWSZaXaoKoXA,1205
+marzban/api.py,sha256=-NfYamr8XFr2TTnZ7clN-LrLZvrVmTxcehSyRqyUvrg,10763
+marzban/models.py,sha256=mtWiF5t6Be-oLULQ1VyhQ2sQyX4BhfTNPBth70VxWLg,5635
+marzban-0.2.8.dist-info/LICENSE,sha256=e7OchdHfXoz2OZRHj8iltLIKYwdri9J4_9PMEnov418,1061
+marzban-0.2.8.dist-info/METADATA,sha256=dSuyQgRw9ryskuHfIbT7uswG_gdvpeHorpaO5nF0g3E,1111
+marzban-0.2.8.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+marzban-0.2.8.dist-info/top_level.txt,sha256=KUmBWzTarBlzw2GZOuk-d-jM2GU4zPWo1iwvW_mXS-c,8
+marzban-0.2.8.dist-info/RECORD,,

marzban-0.2.6.dist-info/RECORD

@@ -1,8 +0,0 @@
-marzban/__init__.py,sha256=F7_zxFWoa18F7R3UAmIN5GbRYNHtpA794XPrtDhoWAk,1205
-marzban/api.py,sha256=m8Uv0dgN0gg4yeCu_u5RBWw1hhz5dRSSOvp7SffjW80,10681
-marzban/models.py,sha256=CmmrobcipIsv3m6Jc9XMPdgQMNMoYyJdmwn3NbVIjvU,5600
-marzban-0.2.6.dist-info/LICENSE,sha256=e7OchdHfXoz2OZRHj8iltLIKYwdri9J4_9PMEnov418,1061
-marzban-0.2.6.dist-info/METADATA,sha256=RxxzJygFfgBMa-FOTYUZefmUs6KDJrHJW8x3xHE_5wo,1111
-marzban-0.2.6.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-marzban-0.2.6.dist-info/top_level.txt,sha256=KUmBWzTarBlzw2GZOuk-d-jM2GU4zPWo1iwvW_mXS-c,8
-marzban-0.2.6.dist-info/RECORD,,