marzban 0.1.10__py3-none-any.whl → 0.2.1__py3-none-any.whl

marzban/__init__.py

@@ -1,4 +1,4 @@
 from .api import MarzbanAPI
 from .models import *
 
-__version__ = "0.1.10"
+__version__ = "0.2.1"

marzban/api.py

@@ -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]
         response = await self.client.request(method, url, headers=headers, json=json_data, params=params)
         response.raise_for_status()
         return response
@@ -139,13 +139,12 @@ class MarzbanAPI:
     async def get_user_usage(self, username: str, token: str, start: Optional[str] = None, end: Optional[str] = None) -> UserUsagesResponse:
         url = f"/api/user/{username}/usage"
         params = {"start": start, "end": end}
-        response = await self._request("GET", url, token, params=params)
+        response: httpx.Response = await self._request("GET", url, token, params=params)
         return UserUsagesResponse(**response.json())
 
     async def set_owner(self, username: str, admin_username: str, token: str) -> UserResponse:
-        url = f"/api/user/{username}/set-owner"
-        params = {"admin_username": admin_username}
-        response = await self._request("PUT", url, token, params=params)
+        url = f"/api/user/{username}/set-owner?admin_username={admin_username}"
+        response = await self._request("PUT", url, token)
         return UserResponse(**response.json())
 
     async def get_expired_users(self, token: str, expired_before: Optional[str] = None, expired_after: Optional[str] = None) -> List[str]:
@@ -225,4 +224,4 @@ class MarzbanAPI:
         return NodesUsageResponse(**response.json())
 
     async def close(self):
-        await self.client.aclose()
+        await self.client.aclose()

marzban/models.py

@@ -8,20 +8,20 @@ class Token(BaseModel):
 class Admin(BaseModel):
     username: str
     is_sudo: bool
-    telegram_id: Optional[int]
-    discord_webhook: Optional[str]
+    telegram_id: Optional[int] = None
+    discord_webhook: Optional[str] = None
 
 class AdminCreate(Admin):
     password: str
 
 class AdminModify(BaseModel):
     is_sudo: bool
-    password: Optional[str]
-    telegram_id: Optional[int]
-    discord_webhook: Optional[str]
+    password: Optional[str] = None
+    telegram_id: Optional[int] = None
+    discord_webhook: Optional[str] = None
 
 class HTTPValidationError(BaseModel):
-    detail: Optional[List[Dict[str, Any]]]
+    detail: Optional[List[Dict[str, Any]]] = None
 
 class SystemStats(BaseModel):
     version: str
@@ -39,7 +39,7 @@ class SystemStats(BaseModel):
 class ProxySettings(BaseModel):
     id: Optional[str] = None
     flow: Optional[str] = None
-
+    
 class UserCreate(BaseModel):
     username: str
     proxies: Optional[Dict[str, ProxySettings]] = {}
@@ -61,7 +61,7 @@ class UserResponse(BaseModel):
     expire: Optional[int] = None
     data_limit: Optional[int] = None
     data_limit_reset_strategy: Optional[str] = None
-    inbounds: Optional[Dict[str, List[str]]] = {}
+    inbounds: Optional[Dict[str, List[str]]] = None
     note: Optional[str] = None
     sub_updated_at: Optional[str] = None
     sub_last_user_agent: Optional[str] = None
@@ -74,7 +74,7 @@ class UserResponse(BaseModel):
     created_at: Optional[str] = None
     links: Optional[List[str]] = []
     subscription_url: Optional[str] = None
-    excluded_inbounds: Optional[Dict[str, List[str]]] = {}
+    excluded_inbounds: Optional[Dict[str, List[str]]] = None
 
 class NodeCreate(BaseModel):
     name: str
@@ -85,12 +85,12 @@ class NodeCreate(BaseModel):
     add_as_new_host: bool = True
 
 class NodeModify(BaseModel):
-    name: Optional[str]
-    address: Optional[str]
-    port: Optional[int]
-    api_port: Optional[int]
-    usage_coefficient: Optional[float]
-    status: Optional[str]
+    name: Optional[str] = None
+    address: Optional[str] = None
+    port: Optional[int] = None
+    api_port: Optional[int] = None
+    usage_coefficient: Optional[float] = None
+    status: Optional[str] = None
 
 class NodeResponse(BaseModel):
     name: str
@@ -99,15 +99,15 @@ class NodeResponse(BaseModel):
     api_port: int
     usage_coefficient: float
     id: int
-    xray_version: Optional[str]
+    xray_version: Optional[str] = None
     status: str
-    message: Optional[str]
+    message: Optional[str] = None
 
 class NodeUsageResponse(BaseModel):
-    node_id: int
-    node_name: str
-    uplink: int
-    downlink: int
+    node_id: Optional[int] = None
+    node_name: Optional[str] = None
+    uplink: Optional[int] = None
+    downlink: Optional[int] = None
 
 class NodesUsageResponse(BaseModel):
     usages: List[NodeUsageResponse]
@@ -115,10 +115,10 @@ class NodesUsageResponse(BaseModel):
 class ProxyHost(BaseModel):
     remark: str
     address: str
-    port: Optional[int]
-    sni: Optional[str]
-    host: Optional[str]
-    path: Optional[str]
+    port: Optional[int] = None
+    sni: Optional[str] = None
+    host: Optional[str] = None
+    path: Optional[str] = None
     security: str = "inbound_default"
     alpn: str = ""
     fingerprint: str = ""
@@ -142,7 +142,7 @@ class UserModify(BaseModel):
     expire: Optional[int] = None
     data_limit: Optional[int] = None
     data_limit_reset_strategy: Optional[str] = None
-    inbounds: Optional[Dict[str, List[str]]] = {}
+    inbounds: Optional[Dict[str, List[str]]] = None
     note: Optional[str] = None
     sub_updated_at: Optional[str] = None
     sub_last_user_agent: Optional[str] = None
@@ -152,34 +152,34 @@ class UserModify(BaseModel):
     status: Optional[str] = None
 
 class UserTemplateCreate(BaseModel):
-    name: Optional[str]
+    name: Optional[str] = None
     data_limit: int = 0
     expire_duration: int = 0
-    username_prefix: Optional[str]
-    username_suffix: Optional[str]
+    username_prefix: Optional[str] = None
+    username_suffix: Optional[str] = None
     inbounds: Optional[Dict[str, List[str]]] = {}
 
 class UserTemplateResponse(BaseModel):
     id: int
-    name: Optional[str]
+    name: Optional[str] = None
     data_limit: int
     expire_duration: int
-    username_prefix: Optional[str]
-    username_suffix: Optional[str]
+    username_prefix: Optional[str] = None
+    username_suffix: Optional[str] = None
     inbounds: Dict[str, List[str]]
 
 class UserTemplateModify(BaseModel):
-    name: Optional[str]
-    data_limit: Optional[int]
-    expire_duration: Optional[int]
-    username_prefix: Optional[str]
-    username_suffix: Optional[str]
-    inbounds: Optional[Dict[str, List[str]]]
+    name: Optional[str] = None
+    data_limit: Optional[int] = None
+    expire_duration: Optional[int] = None
+    username_prefix: Optional[str] = None
+    username_suffix: Optional[str] = None
+    inbounds: Optional[Dict[str, List[str]]] = None
 
 class UserUsageResponse(BaseModel):
-    node_id: int
-    node_name: str
-    used_traffic: int
+    node_id: Optional[int]
+    node_name: Optional[str]
+    used_traffic: Optional[int]
 
 class UserUsagesResponse(BaseModel):
     username: str

{marzban-0.1.10.dist-info → marzban-0.2.1.dist-info}/METADATA

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

marzban-0.2.1.dist-info/RECORD

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

{marzban-0.1.10.dist-info → marzban-0.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

marzban-0.1.10.dist-info/RECORD

@@ -1,8 +0,0 @@
-marzban/__init__.py,sha256=ciudM83BFaA1fW_PVYq4W-HuE3qDor-6s55gTXpSIaQ,73
-marzban/api.py,sha256=B_Dni2-9a41oxzNbLVVh1SyqIo8aSWU4DYc-BPFu-0E,10626
-marzban/models.py,sha256=RwVSr4tfQIb3LYx_vwdbJueiyzS6ay8scdIpsV9FAts,5282
-marzban-0.1.10.dist-info/LICENSE,sha256=e7OchdHfXoz2OZRHj8iltLIKYwdri9J4_9PMEnov418,1061
-marzban-0.1.10.dist-info/METADATA,sha256=oTeZlBMWmYatdCc_gK8qbCY1XLHBC_Cx6RZpPbKBanQ,1112
-marzban-0.1.10.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-marzban-0.1.10.dist-info/top_level.txt,sha256=KUmBWzTarBlzw2GZOuk-d-jM2GU4zPWo1iwvW_mXS-c,8
-marzban-0.1.10.dist-info/RECORD,,