marzban 0.4.2__py3-none-any.whl → 0.4.3__py3-none-any.whl

marzban/__init__.py

@@ -67,4 +67,4 @@ __all__ = (
     "NextPlanModel"
 )
 
-__version__ = "0.4.2"
+__version__ = "0.4.3"

marzban/api.py

@@ -5,6 +5,8 @@ from sshtunnel import SSHTunnelForwarder
 from datetime import datetime
 from .models import *
 from typing import Optional
+
+
 class MarzbanAPI:
     def __init__(self,
                  base_url: str, *,
@@ -168,21 +170,21 @@ class MarzbanAPI:
     async def disable_all_users_admin(self, username: str, token: str) -> None:
         url = f"/api/admin/{username}/users/disable"
         await self._request("POST", url, token)
-        
+
     async def activate_all_users_admin(self, username: str, token: str) -> None:
         url = f"/api/admin/{username}/users/activate"
         await self._request("POST", url, token)
-   
+
     async def reset_admin_usage(self, username: str, token: str) -> Admin:
         url = f"/api/admin/usage/reset/{username}"
         response = await self._request("POST", url, token)
         return Admin(**response.json())
-    
+
     async def get_admin_usage(self, username: str, token: str) -> Admin:
         url = f"/api/admin/usage/{username}"
         response = await self._request("GET", url, token)
         return response.json()
-    
+
     async def get_system_stats(self, token: str) -> SystemStats:
         url = "/api/system"
         response = await self._request("GET", url, token)
@@ -200,7 +202,9 @@ class MarzbanAPI:
 
     async def modify_hosts(self, hosts: Dict[str, List[ProxyHost]], token: str) -> Dict[str, List[ProxyHost]]:
         url = "/api/hosts"
-        response = await self._request("PUT", url, token, data=hosts)
+
+        hosts_model = HostsModel(root=hosts)
+        response = await self._request("PUT", url, token, data=hosts_model)
         return response.json()
 
     async def get_core_stats(self, token: str) -> CoreStats:
@@ -217,7 +221,7 @@ class MarzbanAPI:
         response = await self._request("GET", url, token)
         return response.json()
 
-    async def modify_core_config(self, config: Dict[str, Any], token: str) -> Dict[str, Any]:
+    async def modify_core_config(self, config: CoreConfig, token: str) -> Dict[str, Any]:
         url = "/api/core/config"
         response = await self._request("PUT", url, token, data=config)
         return response.json()
@@ -236,7 +240,7 @@ class MarzbanAPI:
         url = f"/api/user/{username}"
         response = await self._request("PUT", url, token, data=user)
         return UserResponse(**response.json())
-    
+
     async def activate_next_plan(self, username: str, token: str) -> UserResponse:
         url = f"/api/user/{username}/active-next"
         response = await self._request("POST", url, token)
@@ -260,25 +264,27 @@ class MarzbanAPI:
                         username: Optional[List[str]] = None, search: Optional[str] = None,
                         status: Optional[str] = None, sort: Optional[str] = None) -> UsersResponse:
         url = "/api/users"
-        params = {"offset": offset, "limit": limit, "username": username, "search": search, "status": status, "sort": sort}
+        params = {"offset": offset, "limit": limit, "username": username, "search": search, "status": status,
+                  "sort": sort}
         response = await self._request("GET", url, token, params=params)
         return UsersResponse(**response.json())
 
     async def reset_users_data_usage(self, token: str) -> None:
         url = "/api/users/reset"
         await self._request("POST", url, token)
-        
-    async def get_user_data_usage(self, username: str, token: str, start_date: Optional[datetime] = None, end_date: Optional[datetime] = None) -> UserUsagesResponse:
+
+    async def get_user_data_usage(self, username: str, token: str, start_date: Optional[datetime] = None,
+                                  end_date: Optional[datetime] = None) -> UserUsagesResponse:
         if isinstance(start_date, str):
             start_date = datetime.fromisoformat(start_date)
         if isinstance(end_date, str):
             end_date = datetime.fromisoformat(end_date)
-        
+
         params = {
             "start": start_date.isoformat(timespec="seconds") if start_date else None,
             "end": end_date.isoformat(timespec="seconds") if end_date else None
         }
-        params = {k: v for k, v in params.items() if v is not None} 
+        params = {k: v for k, v in params.items() if v is not None}
         url = f"/api/user/{username}/usage"
         response = await self._request("GET", url, token, params=params)
         return UserUsagesResponse(**response.json())

marzban/models.py

@@ -1,5 +1,6 @@
-from pydantic import BaseModel, field_validator, ValidationInfo, AfterValidator, ValidationError
-from typing import Optional, List, Dict, Any, ClassVar, Annotated, Literal
+from typing import Optional, List, Dict, Any, ClassVar, Literal
+
+from pydantic import BaseModel, field_validator, RootModel
 
 
 class Token(BaseModel):
@@ -35,10 +36,11 @@ class ProxySettings(BaseModel):
     id: Optional[str] = None
     flow: Optional[str] = None
 
+
 class NextPlanModel(BaseModel):
     add_remaining_traffic: bool = False
-    data_limit: Optional[int] = 0 
-    expire: Optional[int] = 0  
+    data_limit: Optional[int] = 0
+    expire: Optional[int] = 0
     fire_on_either: bool = True
 
     @field_validator("data_limit", mode="before")
@@ -47,6 +49,7 @@ class NextPlanModel(BaseModel):
             raise ValueError("Data limit in the next plan must be 0 or greater")
         return value
 
+
 class UserCreate(BaseModel):
     username: str
     proxies: Optional[Dict[str, ProxySettings]] = {}
@@ -149,6 +152,10 @@ class ProxyHost(BaseModel):
     is_disabled: bool
 
 
+class HostsModel(RootModel):
+    root: Dict[str, List[ProxyHost]]
+
+
 class ProxyInbound(BaseModel):
     tag: str
     protocol: str
@@ -269,3 +276,54 @@ class SystemStats(BaseModel):
     outgoing_bandwidth: Optional[int] = None
     incoming_bandwidth_speed: Optional[int] = None
     outgoing_bandwidth_speed: Optional[int] = None
+
+
+class Settings(BaseModel):
+    clients: Optional[List[Dict[str, Any]]] = []
+    decryption: Optional[str] = None
+    network: Optional[str] = None
+
+
+class StreamSettings(BaseModel):
+    network: Optional[str] = None
+    security: Optional[str] = None
+    tcpSettings: Optional[Dict[str, Any]] = {}
+    wsSettings: Optional[Dict[str, Any]] = {}
+    grpcSettings: Optional[Dict[str, Any]] = {}
+    tlsSettings: Optional[Dict[str, Any]] = {}
+    realitySettings: Optional[Dict[str, Any]] = {}
+
+
+class Inbound(BaseModel):
+    port: Optional[int] = None
+    protocol: Optional[str] = None
+    settings: Optional[Settings] = Settings()
+    streamSettings: Optional[StreamSettings] = StreamSettings()
+    sniffing: Optional[Dict[str, Any]] = {}
+    tag: Optional[str] = None
+
+
+class Outbound(BaseModel):
+    protocol: Optional[str] = None
+    settings: Optional[Dict[str, Any]] = {}
+    tag: Optional[str] = None
+
+
+class RoutingRule(BaseModel):
+    type: Optional[str] = None
+    ip: Optional[List[str]] = []
+    domain: Optional[List[str]] = []
+    protocol: Optional[List[str]] = []
+    outboundTag: Optional[str] = None
+
+
+class Routing(BaseModel):
+    domainStrategy: Optional[str] = None
+    rules: Optional[List[RoutingRule]] = []
+
+
+class CoreConfig(BaseModel):
+    log: Optional[Dict[str, Any]] = {}
+    inbounds: Optional[List[Inbound]] = []
+    outbounds: Optional[List[Outbound]] = []
+    routing: Optional[Routing] = Routing()

{marzban-0.4.2.dist-info → marzban-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: marzban
-Version: 0.4.2
+Version: 0.4.3
 Summary: Асинхронная библиотека Python для взаимодействия с MarzbanAPI | Поддерживает работу через HTTPS/SSH
 Home-page: https://github.com/sm1ky/marzban_api
 Author: Artem
@@ -27,6 +27,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
 Dynamic: requires-python

marzban-0.4.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+marzban/__init__.py,sha256=WU4NjKb2i_Cm9ylQmVea-sPvyoBXM0X_YbvTxx4gNUE,1404
+marzban/api.py,sha256=rQY4TOjW1WofLWIg1iVZN6u7ltyc_PwAgazwEfu4m8Q,19905
+marzban/models.py,sha256=AVpAbcY2uqkEMfwlFff8H-lhxSY2v_CzIW7OU8fwNs0,9205
+marzban/utils.py,sha256=1oweg75j_w2uuZXw96W-ZKn3WiQniqKGqj6PBU6ds74,1174
+marzban-0.4.3.dist-info/licenses/LICENSE,sha256=e7OchdHfXoz2OZRHj8iltLIKYwdri9J4_9PMEnov418,1061
+marzban-0.4.3.dist-info/METADATA,sha256=XT3u3us6oUocfD6sDappFWp2Fd949cA8JuEjp-nRJI4,4104
+marzban-0.4.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+marzban-0.4.3.dist-info/top_level.txt,sha256=KUmBWzTarBlzw2GZOuk-d-jM2GU4zPWo1iwvW_mXS-c,8
+marzban-0.4.3.dist-info/RECORD,,

{marzban-0.4.2.dist-info → marzban-0.4.3.dist-info}/WHEEL

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

marzban-0.4.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-marzban/__init__.py,sha256=jKrQxf2UMpmvvKvt5r6GkHTDF30xZoSO9RJic_ofGwg,1404
-marzban/api.py,sha256=Prk-CyDqBQmztZaWzBmTMa4sewmutsEQiLloA27gXUs,19843
-marzban/models.py,sha256=Mver2ne18efsrT8xHzZjuqhTQr-f6OqJJfziI4V39Us,7754
-marzban/utils.py,sha256=1oweg75j_w2uuZXw96W-ZKn3WiQniqKGqj6PBU6ds74,1174
-marzban-0.4.2.dist-info/LICENSE,sha256=e7OchdHfXoz2OZRHj8iltLIKYwdri9J4_9PMEnov418,1061
-marzban-0.4.2.dist-info/METADATA,sha256=cWLn-DA0Qy5Rp5-rte9l2l2LrBroAJ79X75b3BeHlFs,4082
-marzban-0.4.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-marzban-0.4.2.dist-info/top_level.txt,sha256=KUmBWzTarBlzw2GZOuk-d-jM2GU4zPWo1iwvW_mXS-c,8
-marzban-0.4.2.dist-info/RECORD,,