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

marzban/__init__.py

@@ -1,4 +1,5 @@
 from .api import MarzbanAPI
+from .utils import MarzbanTokenCache
 from .models import (
     Admin, 
     AdminCreate, 
@@ -34,6 +35,7 @@ from .models import (
 __all__ = (
     "__version__",
     "MarzbanAPI",
+    "MarzbanTokenCache",
     "Admin", 
     "AdminCreate", 
     "AdminModify", 
@@ -65,4 +67,4 @@ __all__ = (
     "NextPlanModel"
 )
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"

marzban/utils.py

@@ -0,0 +1,35 @@
+import logging
+from datetime import datetime, timedelta
+from typing import Optional
+
+from marzban import MarzbanAPI
+
+
+class MarzbanTokenCache:
+    def __init__(self, client: MarzbanAPI,
+                 username: str, password: str,
+                 token_expire_minutes: int = 1440):
+        self._client = client
+        self._username = username
+        self._password = password
+        self._token_expire_minutes = token_expire_minutes
+        self._token: Optional[str] = None
+        self._exp_at: Optional[datetime] = None
+
+    async def get_token(self):
+        if not self._exp_at or self._exp_at < datetime.now():
+            logging.info(f'Get new token')
+            self._token = await self.get_new_token()
+            self._exp_at = datetime.now() + timedelta(minutes=self._token_expire_minutes - 1)
+        return self._token
+
+    async def get_new_token(self):
+        try:
+            token = await self._client.get_token(
+                username=self._username,
+                password=self._password
+            )
+            return token.access_token
+        except Exception as e:
+            logging.error(f'{e}', exc_info=True)
+            raise e

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: marzban
-Version: 0.4.1
+Version: 0.4.2
 Summary: Асинхронная библиотека Python для взаимодействия с MarzbanAPI | Поддерживает работу через HTTPS/SSH
 Home-page: https://github.com/sm1ky/marzban_api
 Author: Artem
@@ -41,11 +41,12 @@ Dynamic: summary
 [![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)
+[![Supported Marzban Version](https://img.shields.io/github/v/release/Gozargah/Marzban?label=Marzban)](https://github.com/Gozargah/Marzban)
+[![Publish Python Package](https://github.com/sm1ky/marzban_api/actions/workflows/deploy.yml/badge.svg?branch=production)](https://github.com/sm1ky/marzban_api/actions/workflows/deploy.yml)
 
 
 **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.
+It supports **Marzban version 0.8.4**, 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.
 

marzban-0.4.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+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,,

marzban-0.4.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-marzban/__init__.py,sha256=UT9a6gf12H0h-uxuSb_mkELVusJrxqjCxpxDxIoirkk,1342
-marzban/api.py,sha256=Prk-CyDqBQmztZaWzBmTMa4sewmutsEQiLloA27gXUs,19843
-marzban/models.py,sha256=Mver2ne18efsrT8xHzZjuqhTQr-f6OqJJfziI4V39Us,7754
-marzban-0.4.1.dist-info/LICENSE,sha256=e7OchdHfXoz2OZRHj8iltLIKYwdri9J4_9PMEnov418,1061
-marzban-0.4.1.dist-info/METADATA,sha256=OQ3AAFGezmGNVzUiFDAFnku2U0FK1FUYb9fvhnCSgDY,3876
-marzban-0.4.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-marzban-0.4.1.dist-info/top_level.txt,sha256=KUmBWzTarBlzw2GZOuk-d-jM2GU4zPWo1iwvW_mXS-c,8
-marzban-0.4.1.dist-info/RECORD,,