marzban 0.3.2__tar.gz → 0.4.0__tar.gz

{marzban-0.3.2 → marzban-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: marzban
-Version: 0.3.2
+Version: 0.4.0
 Summary: Асинхронная библиотека Python для взаимодействия с MarzbanAPI | Поддерживает работу через HTTPS/SSH
 Home-page: https://github.com/sm1ky/marzban_api
 Author: Artem
@@ -20,6 +20,7 @@ Requires-Dist: httpx>=0.23.0
 Requires-Dist: pydantic>=1.10.0
 Requires-Dist: paramiko>=3.5.0
 Requires-Dist: sshtunnel>=0.4.0
+Requires-Dist: datetime>=5.5
 
 
 # MarzbanAPI Client
@@ -30,8 +31,13 @@ Requires-Dist: sshtunnel>=0.4.0
 [![Supported python versions](https://img.shields.io/pypi/pyversions/marzban.svg)](https://pypi.python.org/pypi/marzban)
 [![Downloads](https://img.shields.io/pypi/dm/marzban.svg)](https://pypi.python.org/pypi/marzban)
 [![PyPi Package Version](https://img.shields.io/pypi/v/marzban)](https://pypi.python.org/pypi/marzban)
+[![Supported Marzban Version](https://img.shields.io/badge/Marzban-0.8.0-brightgreen)](https://github.com/Gozargah/Marzban)
+
 
 **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.
+It supports **Marzban version 0.8.0**, providing comprehensive methods for managing administrators, users, nodes, and system statistics.
+
+To see the list of supported Marzban versions and corresponding API compatibility, check out our [Supported Versions](https://github.com/sm1ky/marzban_api/blob/production/.readme/supported_version.md) file.
 
 ## Installation
 

{marzban-0.3.2 → marzban-0.4.0}/README.md

@@ -7,8 +7,13 @@
 [![Supported python versions](https://img.shields.io/pypi/pyversions/marzban.svg)](https://pypi.python.org/pypi/marzban)
 [![Downloads](https://img.shields.io/pypi/dm/marzban.svg)](https://pypi.python.org/pypi/marzban)
 [![PyPi Package Version](https://img.shields.io/pypi/v/marzban)](https://pypi.python.org/pypi/marzban)
+[![Supported Marzban Version](https://img.shields.io/badge/Marzban-0.8.0-brightgreen)](https://github.com/Gozargah/Marzban)
+
 
 **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.
+It supports **Marzban version 0.8.0**, providing comprehensive methods for managing administrators, users, nodes, and system statistics.
+
+To see the list of supported Marzban versions and corresponding API compatibility, check out our [Supported Versions](https://github.com/sm1ky/marzban_api/blob/production/.readme/supported_version.md) file.
 
 ## Installation
 

{marzban-0.3.2 → marzban-0.4.0}/marzban/__init__.py

@@ -27,7 +27,8 @@ from .models import (
     HTTPValidationError, 
     ValidationError,
     SubscriptionUserResponse,
-    SystemStats
+    SystemStats,
+    NextPlanModel
 )
 
 __all__ = (
@@ -60,7 +61,8 @@ __all__ = (
     "HTTPValidationError", 
     "ValidationError",
     "SubscriptionUserResponse",
-    "SystemStats"
+    "SystemStats",
+    "NextPlanModel"
 )
 
-__version__ = "0.3.2"
+__version__ = "0.4.0"

{marzban-0.3.2 → marzban-0.4.0}/marzban/api.py

@@ -2,10 +2,9 @@ import httpx
 import paramiko
 from paramiko.ssh_exception import SSHException
 from sshtunnel import SSHTunnelForwarder
-
+from datetime import datetime
 from .models import *
-
-
+from typing import Optional
 class MarzbanAPI:
     def __init__(self,
                  base_url: str, *,
@@ -219,6 +218,11 @@ 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)
+        return UserResponse(**response.json())
 
     async def remove_user(self, username: str, token: str) -> None:
         url = f"/api/user/{username}"
@@ -235,16 +239,31 @@ class MarzbanAPI:
         return UserResponse(**response.json())
 
     async def get_users(self, token: str, offset: Optional[int] = None, limit: Optional[int] = None,
-                        username: Optional[List[str]] = None, status: Optional[str] = None,
-                        sort: Optional[str] = None) -> UsersResponse:
+                        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, "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:
+        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} 
+        url = f"/api/user/{username}/usage"
+        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?admin_username={admin_username}"

{marzban-0.3.2 → marzban-0.4.0}/marzban/models.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, field_validator, ValidationInfo, AfterValidator, ValidationError
-from typing import Optional, List, Dict, Any, ClassVar, Annotated
+from typing import Optional, List, Dict, Any, ClassVar, Annotated, Literal
 
 
 class Token(BaseModel):
@@ -33,6 +33,17 @@ 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  
+    fire_on_either: bool = True
+
+    @field_validator("data_limit", mode="before")
+    def validate_data_limit(cls, value):
+        if value is not None and value < 0:
+            raise ValueError("Data limit in the next plan must be 0 or greater")
+        return value
 
 class UserCreate(BaseModel):
     username: str
@@ -47,7 +58,8 @@ class UserCreate(BaseModel):
     online_at: Optional[str] = None
     on_hold_expire_duration: Optional[int] = 0
     on_hold_timeout: Optional[str] = None
-    status: Optional[str] = "active"
+    status: Literal["active", "on_hold"] = "active"
+    next_plan: Optional[NextPlanModel] = None
 
 
 class UserResponse(BaseModel):
@@ -63,15 +75,16 @@ class UserResponse(BaseModel):
     online_at: Optional[str] = None
     on_hold_expire_duration: Optional[int] = None
     on_hold_timeout: Optional[str] = None
-    status: Optional[str] = None
-    admin: Optional[Admin] = None
+    status: Literal["active", "disabled", "limited", "expired", "on_hold"] = "active"
     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
+    next_plan: Optional[NextPlanModel] = None
+    admin: Optional[Admin] = None
+    created_at: Optional[str] = None
 
     def __init__(self, **data):
         super().__init__(**data)
@@ -152,7 +165,7 @@ class UserModify(BaseModel):
     proxies: Optional[Dict[str, ProxySettings]] = {}
     expire: Optional[int] = None
     data_limit: Optional[int] = None
-    data_limit_reset_strategy: Optional[str] = None
+    data_limit_reset_strategy: Optional[Literal["no_reset", "day", "week", "month", "year"]] = None
     inbounds: Optional[Dict[str, List[str]]] = None
     note: Optional[str] = None
     sub_updated_at: Optional[str] = None
@@ -160,7 +173,8 @@ class UserModify(BaseModel):
     online_at: Optional[str] = None
     on_hold_expire_duration: Optional[int] = None
     on_hold_timeout: Optional[str] = None
-    status: Optional[str] = None
+    status: Optional[Literal["active", "disabled", "limited", "expired", "on_hold"]] = None
+    next_plan: Optional[NextPlanModel] = None
 
 
 class UserTemplateCreate(BaseModel):

{marzban-0.3.2 → marzban-0.4.0}/marzban.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: marzban
-Version: 0.3.2
+Version: 0.4.0
 Summary: Асинхронная библиотека Python для взаимодействия с MarzbanAPI | Поддерживает работу через HTTPS/SSH
 Home-page: https://github.com/sm1ky/marzban_api
 Author: Artem
@@ -20,6 +20,7 @@ Requires-Dist: httpx>=0.23.0
 Requires-Dist: pydantic>=1.10.0
 Requires-Dist: paramiko>=3.5.0
 Requires-Dist: sshtunnel>=0.4.0
+Requires-Dist: datetime>=5.5
 
 
 # MarzbanAPI Client
@@ -30,8 +31,13 @@ Requires-Dist: sshtunnel>=0.4.0
 [![Supported python versions](https://img.shields.io/pypi/pyversions/marzban.svg)](https://pypi.python.org/pypi/marzban)
 [![Downloads](https://img.shields.io/pypi/dm/marzban.svg)](https://pypi.python.org/pypi/marzban)
 [![PyPi Package Version](https://img.shields.io/pypi/v/marzban)](https://pypi.python.org/pypi/marzban)
+[![Supported Marzban Version](https://img.shields.io/badge/Marzban-0.8.0-brightgreen)](https://github.com/Gozargah/Marzban)
+
 
 **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.
+It supports **Marzban version 0.8.0**, providing comprehensive methods for managing administrators, users, nodes, and system statistics.
+
+To see the list of supported Marzban versions and corresponding API compatibility, check out our [Supported Versions](https://github.com/sm1ky/marzban_api/blob/production/.readme/supported_version.md) file.
 
 ## Installation
 

{marzban-0.3.2 → marzban-0.4.0}/marzban.egg-info/requires.txt

@@ -2,3 +2,4 @@ httpx>=0.23.0
 pydantic>=1.10.0
 paramiko>=3.5.0
 sshtunnel>=0.4.0
+datetime>=5.5

{marzban-0.3.2 → marzban-0.4.0}/setup.py

@@ -5,13 +5,14 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="marzban",
-    version="0.3.2",
+    version="0.4.0",
     packages=find_packages(),
     install_requires=[
         "httpx>=0.23.0",
         "pydantic>=1.10.0",
         "paramiko>=3.5.0",
-        "sshtunnel>=0.4.0"
+        "sshtunnel>=0.4.0",
+        "datetime>=5.5",
     ],
     author="Artem",
     author_email="contant@sm1ky.com",