Python-3xui 0.0.4__tar.gz → 0.0.5__tar.gz

{python_3xui-0.0.4 → python_3xui-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Python-3xui
-Version: 0.0.4
+Version: 0.0.5
 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
@@ -16,6 +16,7 @@ Requires-Dist: async-lru~=2.2.0
 Requires-Dist: dotenv~=0.9.9
 Requires-Dist: httpx~=0.28.1
 Requires-Dist: pydantic<3,~=2.12.5
+Requires-Dist: pyotp~=2.9.0
 Provides-Extra: testing
 Requires-Dist: pytest; extra == 'testing'
 Requires-Dist: pytest-asyncio; extra == 'testing'

{python_3xui-0.0.4 → python_3xui-0.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Python-3xui"
-version = "0.0.4"
+version = "0.0.5"
 authors = [
   { name="JustMe_001", email="justme001.causation755@passinbox.com" },
 ]
@@ -23,7 +23,8 @@ dependencies = [
     "pydantic ~= 2.12.5, < 3",
     "httpx ~=0.28.1",
     "dotenv ~= 0.9.9",
-    "async_lru ~= 2.2.0"
+    "async_lru ~= 2.2.0",
+    "pyotp ~= 2.9.0"
 ]
 
 

{python_3xui-0.0.4 → python_3xui-0.0.5}/python_3xui/api.py

@@ -62,7 +62,8 @@ class XUIClient:
 
     def __init__(self, base_website: str, base_port: int, base_path: str,
                  *, username: str | None = None, password: str | None = None,
-                 two_fac_code: str | None = None, session_duration: int = 3600) -> None:
+                 two_fac_code: str | None = None, session_duration: int = 3600,
+                 custom_prod_string: str = "testing") -> None:
         """Initialize the XUIClient.
 
         Args:
@@ -76,7 +77,7 @@ class XUIClient:
         """
         from . import endpoints # look, I know it's bad, but we need to evade cyclical imports
         self.connected: bool = False
-        self.PROD_STRING = "tester-777"
+        self.PROD_STRING = custom_prod_string
         self.session: AsyncClient | None = None
         self.base_host: str = base_website
         self.base_port: int = base_port
@@ -97,9 +98,9 @@ class XUIClient:
         #init self.totp
         if self.two_fac_secret:
             if self.two_fac_secret.isdigit() and len(self.two_fac_secret) <= 8:
-                #print("WARNING: You seem to have entered a 2FA **code**, not a 2FA secret."
-                      #"Although entering the secret is dangerous, there is no other way to provide a consistent way"
-                      #"for continuous login. This code will only work for this specific login.")
+                print("WARNING: You seem to have entered a 2FA **code**, not a 2FA secret."
+                      "Although entering the secret is dangerous, there is no other way to provide a consistent way"
+                      "for continuous login. This code will only work for this specific login.")
                 self.totp = None
             else:
                 self.totp = pyotp.TOTP(self.two_fac_secret)
@@ -115,9 +116,9 @@ class XUIClient:
         Returns:
             The singleton XUIClient instance.
         """
-        #print("initializing client")
+        print("initializing client")
         if cls._instance is None:
-            #print("nu instance")
+            print("nu instance")
             cls._instance = super(XUIClient, cls).__new__(cls)
         return cls._instance
 
@@ -140,15 +141,15 @@ class XUIClient:
         Raises:
             RuntimeError: If max retries exceeded or session is invalid.
         """
-        #print(f"SAFE REQUEST, {method}, is running to a URL of {kwargs["url"]}")
-        #print(str(self.session.base_url) + str(kwargs["url"]))
+        print(f"SAFE REQUEST, {method}, is running to a URL of {kwargs["url"]}")
+        print(str(self.session.base_url) + str(kwargs["url"]))
         async for attempt in async_range(self.max_retries):
             resp = await self.session.request(method=method, **kwargs)
             if resp.status_code // 100 != 2:  #because it can return either 201 or 202
                 if resp.status_code == 404:
                     now: float = datetime.now(UTC).timestamp()
                     if self.session_start is None or now - self.session_start > self.session_duration:
-                        #print("Guys, we're not logged in, fixing that rn")
+                        print("Guys, we're not logged in, fixing that rn")
                         await self.login()
                         continue
                     else:
@@ -270,8 +271,8 @@ class XUIClient:
             if self.two_fac_secret:
                 payload["twoFactorCode"] = self.two_fac_secret
 
-        #print(self.session.base_url)
-        #print("WE'RE LOGGING IN")
+        print(self.session.base_url)
+        print("WE'RE LOGGING IN")
         resp = await self.session.post("/login", data=payload)
         if resp.status_code == 200:
             resp_json = resp.json()
@@ -329,7 +330,7 @@ class XUIClient:
             exc_val: The exception value, if an exception occurred.
             exc_tb: The exception traceback, if an exception occurred.
         """
-        #print("disconnectin'")
+        print("disconnectin'")
         await self.disconnect()
         return
 
@@ -350,6 +351,7 @@ class XUIClient:
         inbounds = await self.inbounds_end.get_all()
         usable_inbounds: list[Inbound] = []
         for inb in inbounds:
+            #TODO: make prod_strings regex instead of STR
             if self.PROD_STRING.lower() in inb.remark.lower():
                 usable_inbounds.append(inb)
         if len(usable_inbounds) == 0:
@@ -369,12 +371,12 @@ class XUIClient:
             timer from 5 to 60*60*24 in the code.
         """
         while self.connected:
-            #print("You're seeing this message because I forgot to remove it in api.update_inbounds() !")
-            #print("Please change the timer from 5 to 60*60*24!")
+            print("You're seeing this message because I forgot to remove it in api.update_inbounds() !")
+            print("Please change the timer from 5 to 60*60*24!")
             self.get_production_inbounds.cache_clear()
             await self.get_production_inbounds() #fill the cache
-            await asyncio.sleep(60*10)
-            ##print(stat)
+            await asyncio.sleep(10)
+            #print(stat)
 
     #========================clients management========================
     async def get_client_with_tgid(self, tgid: int, inbound_id: int | None = None) -> List[ClientStats]:
@@ -409,6 +411,7 @@ class XUIClient:
         This method creates a new client with the given Telegram ID and
         adds it to the production inbounds. The client is configured with
         default settings and the additional remark.
+        Note that the sub id is created by util.generate_email_from_tgid_inbid, so use that to retrieve.
 
         Args:
             telegram_id: The Telegram ID of the client.
@@ -510,7 +513,7 @@ class XUIClient:
             email = util.generate_email_from_tgid_inbid(telegram_id, inbound.id)
             resp = await self.clients_end.delete_client_by_email(email, inbound.id)
             responses.append(resp)
-        #print("Inbound deleted")
+        print("Inbound deleted")
 
         return responses
 

{python_3xui-0.0.4 → python_3xui-0.0.5}/python_3xui/base_model.py

@@ -28,7 +28,7 @@ class BaseModel(pydantic.BaseModel):
     model_config = pydantic.ConfigDict(ignored_types=(cached_property, ))
 
     def model_post_init(self, context: Any, /) -> None:
-        ##print(f"Model {self.__class__}, {self} initialized")
+        #print(f"Model {self.__class__}, {self} initialized")
         ...
 
 

{python_3xui-0.0.4 → python_3xui-0.0.5}/python_3xui/endpoints.py

@@ -232,17 +232,17 @@ class Clients(BaseEndpoint):
         else:
             raise TypeError
         # send request
-        #print(type(final))
-        #print(final)
+        print(type(final))
+        print(final)
         data = final.model_dump(by_alias=True)
-        #print(type(data))
-        #print(json.dumps(data))
-        #print(f"{self._url}{endpoint}")
+        print(type(data))
+        print(json.dumps(data))
+        print(f"{self._url}{endpoint}")
         resp = await self.client.safe_post(f"{self._url}{endpoint}", data=data)
 
         #YOU NEED TO PASS SETTINGS AS A STRING, NOT AS A DICT, YOU FUCKING DUMBASS!
-        #print(resp)
-        #print(resp.json())
+        print(resp)
+        print(resp.json())
         return resp
 
     async def _request_update_client(self, client: models.InboundClients | models.SingleInboundClient,

{python_3xui-0.0.4 → python_3xui-0.0.5}/python_3xui/util.py

@@ -218,7 +218,7 @@ async def check_xui_response_validity(response: JsonType | httpx.Response) -> st
             if "database" in msg.lower() and "locked" in msg.lower() and not success:
                 logging.log(logging.WARNING, "Database is locked, retrying...")
                 return "DB_LOCKED"
-            #print(f"Unsuccessful operation! Message: {json_resp["msg"]}")
+            print(f"Unsuccessful operation! Message: {json_resp["msg"]}")
             return "ERROR"
     raise RuntimeError("Validator got something very unexpected (Please don't shove responses with non-20X status codes in here...)")