Python-3xui 0.0.11__tar.gz → 0.0.12__tar.gz

{python_3xui-0.0.11 → python_3xui-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Python-3xui
-Version: 0.0.11
+Version: 0.0.12
 Summary: 3x-ui wrapper for python
 Project-URL: Homepage, https://github.com/Artem-Potapov/3x-py
 Project-URL: Issues, https://github.com/Artem-Potapov/3x-py/issues
@@ -11,7 +11,7 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Requires-Dist: async-lru~=2.3.0
 Requires-Dist: httpx~=0.28.1
 Requires-Dist: pydantic<3,~=2.12.5
@@ -28,9 +28,5 @@ Description-Content-Type: text/markdown
 <p>I'm not expecting much to be honest, so please feel free to fork it if I abandon the project and you need it!</p>
 <p>Also, if you REALLY want it I can give you the ownership if I step down, you can find my email in the pyproject.toml (I don't check it that much but trust me I do)</p>
 
-<h2>0.0.10 Release Notes</h2>
-<ul>
-<li>HOTFIX: make models.SingleInboundClient default flow "", because turns out panel can not return it because of zombification...</li>
-<li>Add a custom uuid generator for XUIClient that <i>defaults</i> to method in util but you can make your own!</li>
-<li>Uncomplicate self.sub_gen into self._resolve_sub</li>
-</ul>
+<h2>0.0.12 Release Notes</h2>
+Mainly just bugfixes. Fix email fallback, fix adding clients, add inbound management.

python_3xui-0.0.12/README.md

@@ -0,0 +1,6 @@
+<h1>Hi! This is my example python 3x-ui wrapper!</h1>
+<p>I'm not expecting much to be honest, so please feel free to fork it if I abandon the project and you need it!</p>
+<p>Also, if you REALLY want it I can give you the ownership if I step down, you can find my email in the pyproject.toml (I don't check it that much but trust me I do)</p>
+
+<h2>0.0.12 Release Notes</h2>
+Mainly just bugfixes. Fix email fallback, fix adding clients, add inbound management.

{python_3xui-0.0.11 → python_3xui-0.0.12}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "Python-3xui"
-version = "0.0.11"
+version = "0.0.12"
 authors = [
   { name="JustMe_001", email="justme001.causation755@passinbox.com" },
 ]
 description = "3x-ui wrapper for python"
 readme = "README.md"
 
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 classifiers = [
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",

{python_3xui-0.0.11 → python_3xui-0.0.12}/python_3xui/__init__.py

@@ -4,7 +4,7 @@ from .api import XUIClient
 import python_3xui.custom_exceptions as exceptions
 
 __author__ = "JustMe_001"
-__version__ = "0.0.11"
+__version__ = "0.0.12"
 __email__ = ""
 
 

{python_3xui-0.0.11 → python_3xui-0.0.12}/python_3xui/api.py

@@ -470,7 +470,8 @@ class XUIClient:
                                           sub_id: str | None = None,
                                           comment: str | None = None,
                                           email: str | None = None,
-                                          verbose: bool = True) -> Response:
+                                          verbose: bool = True,
+                                          force_resolve_by_email: bool = False) -> Response:
         """
         Update a client in a specific inbound by Telegram ID. NOT optimized for multiple inbounds.
 
@@ -486,8 +487,9 @@ class XUIClient:
             enable: Whether the client is enabled (optional)
             sub_id: Subscription ID (optional)
             comment: Client comment/note (optional)
-            email: New client email (optional). USE WITH CAUTION BECAUSE THE PANEL WILL NOT TRACK THE NEW EMAIL.
-
+            email: New client email (optional). USE WITH CAUTION BECAUSE THE XUIClient WILL NOT TRACK THE NEW EMAIL.
+            verbose: Enables guardrails.
+            force_resolve_by_email: Whether to enable fetch-thru-email fallback when a client is not found, uses ~3 extra fetches but provides an extra layer of protection.
         Returns:
             Response from the API
         """
@@ -505,19 +507,22 @@ class XUIClient:
             comment=comment,
             email=email,
             verbose=verbose,
+            force_resolve_by_email=force_resolve_by_email,
         )
 
-    async def delete_client_by_tgid(self, telegram_id: int, inbound_id: int) -> Response:
+    async def delete_client_by_tgid(self, telegram_id: int, inbound_id: int, *, suffix: str = "") -> Response:
         """Delete a client from a specific inbound by Telegram ID.
 
         Args:
             telegram_id: The Telegram ID of the client
             inbound_id: The ID of the inbound
+            suffix: Appended to the generated email before deletion (use when the
+                target client was created with a custom email suffix).
 
         Returns:
             Response from the API
         """
-        return await self._tg_client_service.delete_client_by_tgid(telegram_id, inbound_id)
+        return await self._tg_client_service.delete_client_by_tgid(telegram_id, inbound_id, suffix=suffix)
 
     async def revoke_client_by_tgid_all_inbounds(self, telegram_id: int) -> List[Response]:
         """Delete a client from all production inbounds by Telegram ID.

{python_3xui-0.0.11 → python_3xui-0.0.12}/python_3xui/api_core/client_service.py

@@ -107,13 +107,29 @@ class TgIDClientService:
 
             if _update_exec:
                 update_results: list[Response] = await asyncio.gather(*_update_exec)
+                _search_update_exec: list[Task] = []
+                _search_update_resp: dict[int, Task] = {}
                 for i, inb_id in enumerate(update_inbound_ids):
-                    responses[inb_id] = update_results[i]
+                    _resp = update_results[i]
+                    _msg: str = _resp.json()["msg"]
+                    if "empty client id" in _msg.lower():
+                        t = asyncio.create_task(
+                            self._resolve_update_client(telegram_id, inb_id, clients_by_inbound[inb_id])
+                        )
+                        _search_update_exec.append(t)
+                        _search_update_resp[inb_id] = t
+                    else:
+                        responses[inb_id] = _resp
+
+                if _search_update_exec:
+                    await asyncio.gather(*_search_update_exec)
+                    for inb_id, task in _search_update_resp.items():
+                        responses[inb_id] = task.result()
 
         # --- Phase 3: raise on remaining duplicates if not exist_ok ---
         if not exist_ok:
             for inb_id, resp in responses.items():
-                json_resp = resp.json()
+                json_resp: dict = resp.json()
                 msg = json_resp.get("msg", "")
                 if "duplicate email" in msg.lower():
                     logging.error(
@@ -124,13 +140,22 @@ class TgIDClientService:
 
         return responses
 
+    async def _resolve_update_client(self, telegram_id: int, inb_id: int,
+                                     inbound_client: SingleInboundClient) -> Response:
+        _found = await self._clients.get_client_with_email(
+            util.generate_email_from_tgid_inbid(telegram_id, inb_id)
+        )
+        return await self._clients.request_update_client(
+            inbound_client, inb_id, original_uuid=_found.uuid,
+        )
+
     async def _find_client_in_inbound(self,
                                       client_uuid: str,
                                       inbound_id: int,
                                       *,
-                                      use_cache: bool = False,
+                                      use_prod_cache: bool = False,
                                       ) -> SingleInboundClient | None:
-        if use_cache:
+        if use_prod_cache:
             prod_inbs = await self._prod_cache.get()
             prod_inb_index = None
             for i, prod_inb in enumerate(prod_inbs):
@@ -256,7 +281,7 @@ class TgIDClientService:
                 )
 
         client_uuid = await self._identity.resolve_uuid(telegram_id)
-        found = await self._find_client_in_inbound(client_uuid, inbound_id)
+        found = await self._find_client_in_inbound(client_uuid, inbound_id, use_prod_cache=True)
         if not found:
             if force_resolve_by_email:
                 _email_to_search = util.generate_email_from_tgid_inbid(telegram_id, inbound_id)
@@ -264,6 +289,8 @@ class TgIDClientService:
                 if resp is None:
                     raise ClientDoesNotExistError(f"The target inbound was force-checked by email but client {_email_to_search} was not found.")
                 client_uuid = resp.uuid
+                found_inbound_id = resp.inboundId
+                found = await self._find_client_in_inbound(client_uuid, found_inbound_id, use_prod_cache=True)
             else:
                 raise ClientDoesNotExistError(
                     f"The target inbound was checked but client {client_uuid} was not found."
@@ -283,8 +310,8 @@ class TgIDClientService:
             comment=comment,
         )
 
-    async def delete_client_by_tgid(self, telegram_id: int, inbound_id: int) -> Response:
-        email = util.generate_email_from_tgid_inbid(telegram_id, inbound_id)
+    async def delete_client_by_tgid(self, telegram_id: int, inbound_id: int, *, suffix: str = "") -> Response:
+        email = util.generate_email_from_tgid_inbid(telegram_id, inbound_id) + suffix
         return await self._clients.delete_client_by_email(email, inbound_id)
 
     async def revoke_client_by_tgid_all_inbounds(self, telegram_id: int) -> List[Response]:

python_3xui-0.0.11/README.md

@@ -1,10 +0,0 @@
-<h1>Hi! This is my example python 3x-ui wrapper!</h1>
-<p>I'm not expecting much to be honest, so please feel free to fork it if I abandon the project and you need it!</p>
-<p>Also, if you REALLY want it I can give you the ownership if I step down, you can find my email in the pyproject.toml (I don't check it that much but trust me I do)</p>
-
-<h2>0.0.10 Release Notes</h2>
-<ul>
-<li>HOTFIX: make models.SingleInboundClient default flow "", because turns out panel can not return it because of zombification...</li>
-<li>Add a custom uuid generator for XUIClient that <i>defaults</i> to method in util but you can make your own!</li>
-<li>Uncomplicate self.sub_gen into self._resolve_sub</li>
-</ul>