marzban 0.2.7__py3-none-any.whl → 0.2.9__py3-none-any.whl

marzban/__init__.py

@@ -25,7 +25,9 @@ from .models import (
     ProxyInbound, 
     Token, 
     HTTPValidationError, 
-    ValidationError
+    ValidationError,
+    SubscriptionUserResponse,
+    SystemStats
 )
 
 __all__ = (
@@ -57,6 +59,8 @@ __all__ = (
     "Token", 
     "HTTPValidationError", 
     "ValidationError",
+    "SubscriptionUserResponse",
+    "SystemStats"
 )
 
-__version__ = "0.2.7"
+__version__ = "0.2.9"

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}"}
@@ -223,5 +223,45 @@ class MarzbanAPI:
         response = await self._request("GET", url, token, params=params)
         return NodesUsageResponse(**response.json())
 
+    async def get_user_subscription_info(self, url: str = None, token: str = None) -> SubscriptionUserResponse:
+        if url:
+            # Use the provided URL if it is given
+            final_url = url + "/info"
+        elif token:
+            # Form the URL using the token if it is provided
+            final_url = f"/sub/{token}/info"
+        else:
+            raise ValueError("Either url or token must be provided")
+        
+        response = await self._request("GET", final_url)
+        return SubscriptionUserResponse(**response.json())
+
+    async def get_user_usage(self, url: str = None, token: str = None, start: Optional[str] = None, end: Optional[str] = None) -> Any:
+        if url:
+            # Use the provided URL if it is given
+            final_url = url + "/usage"
+        elif token:
+            # Form the URL using the token if it is provided
+            final_url = f"/sub/{token}/usage"
+        else:
+            raise ValueError("Either url or token must be provided")
+        
+        params = {"start": start, "end": end}
+        response = await self._request("GET", final_url, params=params)
+        return response.json()
+
+    async def get_user_subscription_with_client_type(self, client_type: str, url: str = None, token: str = None) -> Any:
+        if url:
+            # Use the provided URL if it is given
+            final_url = url + f"/{client_type}"
+        elif token:
+            # Form the URL using the token if it is provided
+            final_url = f"/sub/{token}/{client_type}"
+        else:
+            raise ValueError("Either url or token must be provided")
+        
+        response = await self._request("GET", final_url)
+        return response.json()
+
     async def close(self):
         await self.client.aclose()

marzban/models.py

@@ -1,5 +1,5 @@
-from pydantic import BaseModel
-from typing import Optional, List, Dict, Any, ClassVar
+from pydantic import BaseModel, field_validator, ValidationInfo, AfterValidator, ValidationError
+from typing import Optional, List, Dict, Any, ClassVar, Annotated
 
 class Token(BaseModel):
     access_token: str
@@ -23,19 +23,6 @@ class AdminModify(BaseModel):
 class HTTPValidationError(BaseModel):
     detail: Optional[List[Dict[str, Any]]] = None
 
-class SystemStats(BaseModel):
-    version: str
-    mem_total: int
-    mem_used: int
-    cpu_cores: int
-    cpu_usage: float
-    total_user: int
-    users_active: int
-    incoming_bandwidth: int
-    outgoing_bandwidth: int
-    incoming_bandwidth_speed: int
-    outgoing_bandwidth_speed: int
-
 class ProxySettings(BaseModel):
     id: Optional[str] = None
     flow: Optional[str] = None
@@ -69,12 +56,19 @@ 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
     links: Optional[List[str]] = []
     subscription_url: Optional[str] = None
+    subscription_token: Optional[str] = None
     excluded_inbounds: Optional[Dict[str, List[str]]] = None
+    
+    def __init__(self, **data):
+        super().__init__(**data)
+        if not self.subscription_token and self.subscription_url:
+            self.subscription_token = self.subscription_url.split('/')[-1]
 
 class NodeCreate(BaseModel):
     name: str
@@ -195,4 +189,40 @@ class UserStatus(BaseModel):
 class ValidationError(BaseModel):
     loc: List[Any]
     msg: str
-    type: str
+    type: str
+
+class SubscriptionUserResponse(BaseModel):
+    proxies: Dict[str, Any]
+    expire: Optional[int] = None
+    data_limit: Optional[int] = None
+    data_limit_reset_strategy: str = "no_reset"
+    inbounds: Dict[str, List[str]] = {}
+    note: Optional[str] = None
+    sub_updated_at: Optional[str] = None
+    sub_last_user_agent: Optional[str] = None
+    online_at: Optional[str] = None
+    on_hold_expire_duration: Optional[int] = None
+    on_hold_timeout: Optional[str] = None
+    auto_delete_in_days: Optional[int] = None
+    username: str
+    status: str
+    used_traffic: int
+    lifetime_used_traffic: int = 0
+    created_at: str
+    links: List[str] = []
+    subscription_url: str = ""
+    excluded_inbounds: Dict[str, List[str]] = {}
+    admin: Optional[Admin] = None
+    
+class SystemStats(BaseModel):
+    version: Optional[str] = None
+    mem_total: Optional[int] = None
+    mem_used: Optional[int] = None
+    cpu_cores: Optional[int] = None
+    cpu_usage: Optional[float] = None
+    total_user: Optional[int] = None
+    users_active: Optional[int] = None
+    incoming_bandwidth: Optional[int] = None
+    outgoing_bandwidth: Optional[int] = None
+    incoming_bandwidth_speed: Optional[int] = None
+    outgoing_bandwidth_speed: Optional[int] = None

marzban-0.2.9.dist-info/METADATA

@@ -0,0 +1,53 @@
+Metadata-Version: 2.1
+Name: marzban
+Version: 0.2.9
+Summary: Асинхронная библиотека Python для взаимодействия с MarzbanAPI
+Home-page: https://github.com/sm1ky/marzban_api
+Author: Artem
+Author-email: contant@sm1ky.com
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: httpx >=0.23.0
+Requires-Dist: pydantic >=1.10.0
+
+
+# MarzbanAPI Client
+
+**MarzbanAPI Client** is an asynchronous Python library designed for interacting with [Marzban](https://github.com/Gozargah/Marzban). It provides comprehensive methods for managing administrators, users, nodes, and system statistics.
+
+## Installation
+
+To install the latest version of the library, use:
+
+```bash
+pip install marzban
+```
+
+## Project Links
+- **PyPI**: [marzban](https://pypi.org/project/marzban/)
+- **GitHub Repository**: [marzban_api](https://github.com/sm1ky/marzban_api)
+
+## Detailed Documentation
+
+For detailed documentation and usage examples, select your preferred language below:
+
+- [English](https://github.com/sm1ky/marzban_api/blob/production/.readme/README_en.md)
+- [Русский (Russian)](https://github.com/sm1ky/marzban_api/blob/production/.readme/README_ru.md)
+
+## Contributing
+
+We welcome contributions! If you encounter any issues or have suggestions for improvements, please feel free to [open an issue](https://github.com/sm1ky/marzban_api/issues) or submit a Pull Request (PR).
+
+## Support
+
+If you have any questions or need assistance, you can contact the author via:
+- **Email**: [contant@sm1ky.com](mailto:contant@sm1ky.com)
+- **Telegram**: [@sm1ky](https://t.me/sm1ky)
+
+## License
+
+This project is licensed under the MIT License. For more details, refer to the [LICENSE file](https://github.com/sm1ky/marzban_api/blob/production/LICENSE).

marzban-0.2.9.dist-info/RECORD

@@ -0,0 +1,8 @@
+marzban/__init__.py,sha256=x797eiZAH7Sr-2_dKKMOqSHbYF42FO410LKliHzTpPs,1302
+marzban/api.py,sha256=Do5W8v8yxMxb5-h6XHKSNM9B2zrCLDcfJIXi4fGmUYs,12474
+marzban/models.py,sha256=cNL3c_bfZKNp0EKuBDfPpO7vAFjQwK2e0VWqHjnJ64c,6931
+marzban-0.2.9.dist-info/LICENSE,sha256=e7OchdHfXoz2OZRHj8iltLIKYwdri9J4_9PMEnov418,1061
+marzban-0.2.9.dist-info/METADATA,sha256=OInLS2XnkrAJVuiLGc5HaT1IVL-GzYRwDot017IgI8s,1952
+marzban-0.2.9.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+marzban-0.2.9.dist-info/top_level.txt,sha256=KUmBWzTarBlzw2GZOuk-d-jM2GU4zPWo1iwvW_mXS-c,8
+marzban-0.2.9.dist-info/RECORD,,

marzban-0.2.7.dist-info/METADATA

@@ -1,30 +0,0 @@
-Metadata-Version: 2.1
-Name: marzban
-Version: 0.2.7
-Summary: Асинхронная библиотека Python для взаимодействия с MarzbanAPI
-Home-page: https://github.com/sm1ky/marzban_api
-Author: Artem
-Author-email: contant@sm1ky.com
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: httpx >=0.23.0
-Requires-Dist: pydantic >=1.10.0
-
-# MarzbanAPI Client
-
-Это асинхронная библиотека Python для взаимодействия с MarzbanAPI, предоставляющая методы для управления администраторами, пользователями, узлами и системной статистикой.
-
-## Установка
-
-```bash
-pip install marzban
-```
-
-Project in Pypi - https://pypi.org/project/marzban/
-
-If you notice an error, please create a PR and attach logs
-You can contact me by mail contant@sm1ky.com or in Telegram @sm1ky

marzban-0.2.7.dist-info/RECORD

@@ -1,8 +0,0 @@
-marzban/__init__.py,sha256=u1L0m8OfCX6zkSaUETHm99keaRs1WxwHMMdwzWiCP4E,1205
-marzban/api.py,sha256=30Fx1yzt2rh4BFqlTgP9naIfMW5DXxyOhkhPWFfBrQk,10683
-marzban/models.py,sha256=CmmrobcipIsv3m6Jc9XMPdgQMNMoYyJdmwn3NbVIjvU,5600
-marzban-0.2.7.dist-info/LICENSE,sha256=e7OchdHfXoz2OZRHj8iltLIKYwdri9J4_9PMEnov418,1061
-marzban-0.2.7.dist-info/METADATA,sha256=fnhqkUCqk8jyhetEnlMr2VRWdCry5bUsL7377RVUmZI,1111
-marzban-0.2.7.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-marzban-0.2.7.dist-info/top_level.txt,sha256=KUmBWzTarBlzw2GZOuk-d-jM2GU4zPWo1iwvW_mXS-c,8
-marzban-0.2.7.dist-info/RECORD,,