marzban 0.2.6__tar.gz → 0.2.8__tar.gz

{marzban-0.2.6 → marzban-0.2.8}/PKG-INFO

@@ -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.6 → marzban-0.2.8}/marzban/__init__.py

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

{marzban-0.2.6 → marzban-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-0.2.6 → marzban-0.2.8}/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 → marzban-0.2.8}/marzban.egg-info/PKG-INFO

@@ -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.6 → marzban-0.2.8}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="marzban",
-    version="0.2.6",
+    version="0.2.8",
     packages=find_packages(),
     install_requires=[
         "httpx>=0.23.0",