Python-3xui 0.0.1__tar.gz → 0.0.2__tar.gz

{python_3xui-0.0.1 → python_3xui-0.0.2}/.gitignore

@@ -1,7 +1,8 @@
-../.idea/
-__pycache__/
-.env
-./tests/response_stubs/
-response*
-!response*.py
+../.idea/
+__pycache__/
+.env
+.editorconfig
+./tests/response_stubs/
+response*
+!response*.py
 dist/

{python_3xui-0.0.1 → python_3xui-0.0.2}/LICENSE

@@ -1,201 +1,201 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
    limitations under the License.

{python_3xui-0.0.1 → python_3xui-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Python-3xui
-Version: 0.0.1
+Version: 0.0.2
 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

{python_3xui-0.0.1 → python_3xui-0.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Python-3xui"
-version = "0.0.1"
+version = "0.0.2"
 authors = [
   { name="JustMe_001", email="justme001.causation755@passinbox.com" },
 ]

{python_3xui-0.0.1 → python_3xui-0.0.2}/python_3xui/api.py

@@ -47,8 +47,8 @@ class XUIClient:
         base_url: The full base URL for API requests.
         session_start: Timestamp of when the session was created.
         session_duration: Maximum session duration in seconds.
-        xui_username: Username for authentication.
-        xui_password: Password for authentication.
+        username: Username for authentication.
+        password: Password for authentication.
         two_fac_code: Two-factor authentication code (if enabled).
         max_retries: Maximum number of retry attempts for failed requests.
         retry_delay: Delay in seconds between retries.
@@ -59,7 +59,7 @@ class XUIClient:
     _instance = None
 
     def __init__(self, base_website: str, base_port: int, base_path: str,
-                 *, xui_username: str | None = None, xui_password: str | None = None,
+                 *, username: str | None = None, password: str | None = None,
                  two_fac_code: str | None = None, session_duration: int = 3600) -> None:
         """Initialize the XUIClient.
 
@@ -67,8 +67,8 @@ class XUIClient:
             base_website: The server hostname (e.g., "example.com").
             base_port: The server port (e.g., 443).
             base_path: The base path for the API (e.g., "/panel").
-            xui_username: Username for authentication.
-            xui_password: Password for authentication.
+            username: Username for authentication.
+            password: Password for authentication.
             two_fac_code: Two-factor authentication code (if enabled).
             session_duration: Maximum session duration in seconds. Defaults to 3600.
         """
@@ -81,8 +81,8 @@ class XUIClient:
         self.base_url: str = f"https://{self.base_host}:{self.base_port}{self.base_path}"
         self.session_start: float | None = None
         self.session_duration: int = session_duration
-        self.xui_username: str | None = xui_username
-        self.xui_password: str | None = xui_password
+        self.xui_username: str | None = username
+        self.xui_password: str | None = password
         self.two_fac_code: str | None = two_fac_code
         self.max_retries: int = 5
         self.retry_delay: int = 1
@@ -102,9 +102,9 @@ class XUIClient:
         Returns:
             The singleton XUIClient instance.
         """
-        
+        #print("initializing client")
         if cls._instance is None:
-            
+            #print("nu instance")
             cls._instance = super(XUIClient, cls).__new__(cls)
         return cls._instance
 
@@ -127,15 +127,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"]))
         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")
                         await self.login()
                         continue
                     else:
@@ -250,8 +250,8 @@ class XUIClient:
             "password": self.xui_password,
         }
 
-        
-        
+        #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()
@@ -307,7 +307,7 @@ class XUIClient:
             exc_val: The exception value, if an exception occurred.
             exc_tb: The exception traceback, if an exception occurred.
         """
-        
+        #print("disconnectin'")
         await self.disconnect()
         return
 
@@ -346,12 +346,16 @@ class XUIClient:
             This method currently runs every 10 seconds. Please change the
             timer from 5 to 60*60*24 in the code.
         """
+        #This is useless for now, but later get_production_inbounds() will be cached,
+        # and this will clear the cache every 24 hours or so, to make sure the client
+        # always has the most up-to-date inbounds list
         while True:
-            
-            
+            #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(3600) #every hour
+            await asyncio.sleep(10)
+            ##print(stat)
 
     #========================clients management========================
     async def get_client_with_tgid(self, tgid: int, inbound_id: int | None = None) -> List[ClientStats]:
@@ -376,7 +380,7 @@ class XUIClient:
             email = util.generate_email_from_tgid_inbid(tgid, inbound_id)
             resp = [await self.clients_end.get_client_with_email(email)]
             return resp
-        uuid = util.get_telegram_uuid(tgid)
+        uuid = util.get_uuid_from_tgid(tgid)
         resp = await self.clients_end.get_client_with_uuid(uuid)
         return resp
 
@@ -400,7 +404,7 @@ class XUIClient:
         responses = []
         for inb in production_inbounds:
             client = SingleInboundClient.model_construct(
-                uuid=util.get_telegram_uuid(telegram_id),
+                uuid=util.get_uuid_from_tgid(telegram_id),
                 flow="",
                 email=util.generate_email_from_tgid_inbid(telegram_id, inb.id),
                 limit_gb=0,

{python_3xui-0.0.1 → python_3xui-0.0.2}/python_3xui/base_model.py

@@ -28,6 +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")
         ...
 
 

{python_3xui-0.0.1 → python_3xui-0.0.2}/python_3xui/endpoints.py

@@ -232,17 +232,17 @@ class Clients(BaseEndpoint):
         else:
             raise TypeError
         # send request
-        
-        
+        #print(type(final))
+        #print(final)
         data = final.model_dump(by_alias=True)
-        
-        
-        
+        #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())
         return resp
 
     async def _request_update_client(self, client: models.InboundClients | models.SingleInboundClient,
@@ -283,7 +283,7 @@ class Clients(BaseEndpoint):
                                    email: str | None = None,
                                    limit_ip: int | None = None,
                                    limit_gb: int | None = None,
-                                   expiry_time: models.timestamp | None = None,
+                                   expiry_time: models.timestamp_seconds | None = None,
                                    enable: bool | None = None,
                                    sub_id: str | None = None,
                                    comment: str | None = None,
@@ -342,7 +342,7 @@ class Clients(BaseEndpoint):
         Returns:
             The HTTP response from the API.
         """
-        _endpoint = f"{inbound_id}/delClient/{email}"
+        _endpoint = f"{inbound_id}/delClientByEmail/{email}"
         resp = await self.client.safe_post(f"{self._url}{_endpoint}")
         return resp
 

{python_3xui-0.0.1 → python_3xui-0.0.2}/python_3xui/models.py

@@ -1,15 +1,15 @@
 import json
 from types import NoneType
 from datetime import datetime, UTC
-from typing import Union, Optional, TypeAlias, Any, Annotated, Literal, List, Dict
+from typing import Union, Optional, TypeAlias, Any, Annotated, Literal, List, Dict, ClassVar
 
-from pydantic import field_validator, Field, field_serializer
+from pydantic import field_validator, Field, field_serializer, AfterValidator
 import pydantic
 
 from . import base_model
-from .util import JsonType
+from .util import JsonType, auto_s_to_ms_timestamp, s_to_ms_timestamp, ms_to_s_timestamp, auto_ms_to_s_timestamp
 
-timestamp: TypeAlias = int
+timestamp_seconds: TypeAlias = int
 ip_address: TypeAlias = str
 json_string: TypeAlias = str
 
@@ -48,20 +48,41 @@ class SingleInboundClient(pydantic.BaseModel):
         created_at: Timestamp of client creation.
         updated_at: Timestamp of last client update.
     """
+    TIME_FIELDS: ClassVar[List[str]] = ["expiry_time", "created_at", "updated_at"]
     uuid:  Annotated[str, Field(alias="id")] #yes they really did that...
     security: str = ""
     password: str = ""
     flow: Literal["", "xtls-rprx-vision", "xtls-rprx-vision-udp443"]
     email: Annotated[str, Field(alias="email")]
     limit_ip: Annotated[int, Field(alias="limitIp")] = 20
+    #Interestingly, the API expects this value to be called GB but it's actually bytes.
     limit_gb: Annotated[int, Field(alias="totalGB")] # total flow
-    expiry_time: Annotated[timestamp, Field(alias="expiryTime")] = 0
+    expiry_time: Annotated[timestamp_seconds, Field(alias="expiryTime")] = 0
     enable: bool = True
     tg_id: Annotated[Union[int, str], Field(alias="tgId")] = ""
     subscription_id: Annotated[str, Field(alias="subId")]
     comment: str = ""
-    created_at: Annotated[timestamp, Field(default_factory=(lambda: int(datetime.now(UTC).timestamp())))]
-    updated_at: Annotated[timestamp, Field(default_factory=(lambda: int(datetime.now(UTC).timestamp())))]
+    created_at: Annotated[timestamp_seconds, Field(
+        default_factory=(lambda: int(datetime.now(UTC).timestamp())))
+    ]
+    updated_at: Annotated[timestamp_seconds, Field(
+        default_factory=(lambda: int(datetime.now(UTC).timestamp())))
+    ]
+
+    @classmethod
+    @field_validator(TIME_FIELDS[0], *TIME_FIELDS[1:], mode="after")
+    def ensure_s_timestamp(cls, value: int) -> int:
+        return auto_ms_to_s_timestamp(value)
+
+    @classmethod
+    @field_serializer(TIME_FIELDS[0], *TIME_FIELDS[1:])
+    def serialize_ms_timestamp(cls, value: int) -> int:
+        return auto_s_to_ms_timestamp(value)
+
+    @field_serializer("limit_gb")
+    def serialize_total_gb(self, value: int) -> int:
+        return value * (1024 ** 2)  # Convert GB to bytes for API
+
 
 class InboundClients(pydantic.BaseModel):
     """Represents a collection of clients for an inbound connection.
@@ -90,12 +111,6 @@ class InboundClients(pydantic.BaseModel):
         """Serialize the settings object to a JSON string.
 
         The 3X-UI API expects settings as a JSON string, not an object.
-
-        Args:
-            value: The Settings object to serialize.
-
-        Returns:
-            A JSON string representation of the settings.
         """
         return json.dumps(value.model_dump(by_alias=True), ensure_ascii=False)
 
@@ -174,11 +189,12 @@ class ClientStats(base_model.BaseModel):
         up: Total uploaded bytes.
         down: Total downloaded bytes.
         allTime: Total bytes transferred (up + down).
-        expiryTime: Client expiry time as UNIX timestamp.
+        expiryTime: Client expiry time as UNIX timestamp in MILLISECONDS.
         total: Total data limit in bytes.
         reset: Counter for traffic resets.
         lastOnline: UNIX timestamp of last connection.
     """
+    TIME_FIELDS: ClassVar[List[str]] = ["expiryTime", "lastOnline"]
     id: int
     inboundId: int
     enable: bool
@@ -188,10 +204,20 @@ class ClientStats(base_model.BaseModel):
     up: int  # bytes
     down: int  # bytes
     allTime: int  # bytes
-    expiryTime: timestamp  # UNIX timestamp
+    expiryTime: timestamp_seconds  # UNIX timestamp
     total: int
     reset: int
-    lastOnline: timestamp
+    lastOnline: timestamp_seconds
+
+    @classmethod
+    @field_validator(TIME_FIELDS[0], *TIME_FIELDS[1:], mode="after")
+    def ensure_s_timestamp(cls, value: int) -> int:
+        return auto_ms_to_s_timestamp(value)
+
+    @classmethod
+    @field_serializer(TIME_FIELDS[0], *TIME_FIELDS[1:])
+    def serialize_ms_timestamp(cls, value: int) -> int:
+        return auto_s_to_ms_timestamp(value)
 
 
 class Inbound(base_model.BaseModel):
@@ -220,6 +246,7 @@ class Inbound(base_model.BaseModel):
         tag: Internal tag identifier for routing.
         sniffing: JSON sniffing configuration (auto-parsed from string).
     """
+    TIME_FIELDS: ClassVar[List[str]] = ["expiryTime", "lastTrafficResetTime"]
     id: int
     up: int  # bytes
     down: int  # bytes
@@ -227,9 +254,9 @@ class Inbound(base_model.BaseModel):
     allTime: int  # bytes
     remark: str
     enable: bool
-    expiryTime: timestamp  # UNIX timestamp
+    expiryTime: timestamp_seconds  # UNIX timestamp
     trafficReset: str  # "Never", "Weekly", "Monthly", "Daily"
-    lastTrafficResetTime: timestamp  # UNIX timestamp
+    lastTrafficResetTime: timestamp_seconds  # UNIX timestamp
     clientStats: Union[list[ClientStats], None]
     listen: str
     port: int
@@ -247,12 +274,6 @@ class Inbound(base_model.BaseModel):
 
         The 3X-UI API returns settings, streamSettings, and sniffing as
         JSON strings. This validator automatically parses them into dicts.
-
-        Args:
-            value: The JSON string to parse, or empty string.
-
-        Returns:
-            Parsed dictionary, or empty string if input was empty.
         """
         if value == "":
             return ""
@@ -265,13 +286,17 @@ class Inbound(base_model.BaseModel):
         """Serialize dictionary fields back to JSON strings.
 
         When sending data back to the API, these fields must be JSON strings.
-
-        Args:
-            value: The dictionary to serialize, or empty string.
-
-        Returns:
-            JSON string representation, or empty string if input was empty.
         """
         if value == "":
             return ""
         return json.dumps(value, ensure_ascii=False)
+
+    @classmethod
+    @field_validator(TIME_FIELDS[0], *TIME_FIELDS[1:], mode="after")
+    def ensure_s_timestamp(cls, value: int) -> int:
+        return auto_ms_to_s_timestamp(value)
+
+    @classmethod
+    @field_serializer(TIME_FIELDS[0], *TIME_FIELDS[1:])
+    def serialize_ms_timestamp(cls, value: int) -> int:
+        return auto_s_to_ms_timestamp(value)

{python_3xui-0.0.1 → python_3xui-0.0.2}/python_3xui/util.py

@@ -13,7 +13,7 @@ import base64
 import logging
 import random
 import re
-from datetime import UTC, datetime
+from datetime import UTC, datetime, tzinfo
 from typing import TypeAlias, Union, Dict, Any, List
 
 import httpx
@@ -94,7 +94,7 @@ def sub_from_tgid(telegram_id: int) -> str:
 ensure_2_digits = lambda x: str(x) if x >= 10 else f"0{x}"
 
 
-def get_telegram_uuid(telegram_id: int, fixed: bool = True) -> str:
+def get_uuid_from_tgid(telegram_id: int, fixed: bool = True) -> str:
     """Generate a UUID v4 format string from a Telegram ID.
 
     Creates a deterministic UUID based on the Telegram ID, useful for
@@ -109,9 +109,9 @@ def get_telegram_uuid(telegram_id: int, fixed: bool = True) -> str:
         A UUID-formatted string with the Telegram ID embedded in the last segment.
 
     Examples:
-        >>> get_telegram_uuid(12345)
+        >>> get_uuid_from_tgid(12345)
         '11111111-1111-1111-1111-0000000012345'
-        >>> get_telegram_uuid(12345, fixed=False)  # Uses current timestamp
+        >>> get_uuid_from_tgid(12345, fixed=False)  # Uses current timestamp
         '20260222-1230-1111-1111-0000000012345'
     """
     zeros = 12 - len(str(telegram_id))
@@ -142,7 +142,7 @@ def generate_random_email(length: int = 8) -> str:
     return s
 
 
-def generate_email_from_tgid_inbid(telegram_id: int, inbound_id: int) -> str:
+def generate_email_from_tgid_inbid(telegram_id: int, /, inbound_id: int) -> str:
     """Generate a deterministic email from Telegram ID and inbound ID.
 
     Creates a unique email identifier that combines the Telegram ID and
@@ -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"]}")
             return "ERROR"
     raise RuntimeError("Validator got something very unexpected (Please don't shove responses with non-20X status codes in here...)")
 
@@ -234,7 +234,7 @@ def get_days_until_expiry(expiry_time: int) -> float:
         Returns a very large number (infinity) if expiry_time is 0 (no expiry).
 
     Examples:
-        >>> get_days_until_expiry(int(datetime.now(UTC).timestamp()) + 86400)  # 1 day from now
+        >>> get_days_until_expiry(int(datetime.now(UTC).timestamp_seconds()) + 86400)  # 1 day from now
         1.0
         >>> get_days_until_expiry(0)  # No expiry
         inf
@@ -263,3 +263,27 @@ class DBLockedError(Exception):
             message: Explanation of the error.
         """
         super().__init__(message)
+
+def s_to_ms_timestamp(s: int|float) -> int:
+    """Convert a UNIX timestamp in seconds to milliseconds."""
+    return int(s * 1000)
+
+def ms_to_s_timestamp(ms: int|float) -> int:
+    """Convert a UNIX timestamp in milliseconds to seconds."""
+    return ms // 1000
+
+def auto_s_to_ms_timestamp(s_or_ms: int) -> int:
+    """Automatically convert a UNIX timestamp to milliseconds if it's in seconds."""
+    if s_or_ms < 1e12:  # If the timestamp is less than 1 trillion, it's likely in seconds
+        return s_to_ms_timestamp(s_or_ms)
+    return s_or_ms
+
+def auto_ms_to_s_timestamp(ms_or_s: int) -> int:
+    """Automatically convert a UNIX timestamp to seconds if it's in milliseconds."""
+    if ms_or_s > 1e12:  # If the timestamp is greater than 1 trillion, it's likely in milliseconds
+        return ms_to_s_timestamp(ms_or_s)
+    return ms_or_s
+
+def datetime_now_ms(tzinfo: tzinfo|None) -> int:
+    """Get the current time as a UNIX timestamp in milliseconds."""
+    return int(datetime.now(tzinfo).timestamp()) * 1000

{python_3xui-0.0.1 → python_3xui-0.0.2}/tests/conftest.py

@@ -48,7 +48,7 @@ async def xui_client() -> XUIClient:
     # Reset singleton for clean test state
     XUIClient._instance = None
 
-    client = XUIClient(base_url, port, base_path, xui_username=username, xui_password=password)
+    client = XUIClient(base_url, port, base_path, username=username, password=password)
     client.connect()
 
     # Authenticate

{python_3xui-0.0.1 → python_3xui-0.0.2}/tests/test_non_idempotent_endpoints_clients.py

@@ -1,8 +1,15 @@
+import asyncio
+import time
+
 import pytest
 from datetime import datetime, UTC
+
+from pydantic import ValidationError
+
 from python_3xui.api import XUIClient
 from python_3xui.models import SingleInboundClient, ClientStats
-from python_3xui.util import get_telegram_uuid, sub_from_tgid
+from python_3xui.util import get_uuid_from_tgid, sub_from_tgid, s_to_ms_timestamp, datetime_now_ms, generate_email_from_tgid_inbid, \
+    generate_random_email
 
 
 class TestClientsEndpoint:
@@ -49,8 +56,8 @@ class TestClientsEndpoint:
         assert inbound_id is not None, "Test inbound should be available"
 
         # Generate unique test data
-        timestamp = int(datetime.now(UTC).timestamp())
-        test_uuid = get_telegram_uuid(TestClientsEndpoint.test_telegram_id)
+        timestamp = datetime_now_ms(UTC)
+        test_uuid = get_uuid_from_tgid(TestClientsEndpoint.test_telegram_id)
         test_email = f"testclient_{timestamp}@example.com"
 
         # Create a test client
@@ -61,12 +68,12 @@ class TestClientsEndpoint:
             flow="",
             email=test_email,
             limitIp=20,  # Using alias 'limitIp' for 'limit_ip'
-            totalGB=10,  # Using alias 'totalGB' for 'limit_gb'
-            expiryTime=timestamp + 86400,  # Using alias 'expiryTime' for 'expiry_time'
+            totalGB=10000,  # Using alias 'totalGB' for 'limit_gb'
+            expiryTime=timestamp + 86400*1000,  # Using alias 'expiryTime' for 'expiry_time'
             enable=True,
             tgId="",  # Using alias 'tgId' for 'tg_id'
             subId=sub_from_tgid(TestClientsEndpoint.test_telegram_id),  # Using alias 'subId' for 'subscription_id'
-            comment=f"Test client created at {timestamp}",
+            comment=f"Test client created at {timestamp}, TEST SUITE",
             created_at=timestamp,
             updated_at=timestamp
         )
@@ -111,30 +118,27 @@ class TestClientsEndpoint:
         try:
             client_stats = await xui_client.clients_end.get_client_with_email(email)
             assert client_stats.email == email
-        except Exception as e:
+        except ValidationError as e:
             pytest.skip(f"Test client with email {email} no longer exists: {e}")
 
         # Delete the client by email
+        print(f"Attempting to delete client with email: {email} from inbound: {inbound_id}")
+
         response = await xui_client.clients_end.delete_client_by_email(email, inbound_id)
 
         # Validate response
         assert response.status_code == 200
         response_json = response.json()
         assert response_json["success"] == True
-        assert "Inbound client has been deleted." in response_json["msg"]
+        assert "Client deleted successfully" in response_json["msg"]
 
-        # Verify deletion by trying to get the deleted client
-        # Note: 3x-ui might return an error or null response for deleted client
         try:
             await xui_client.clients_end.get_client_with_email(email)
-            # If we get here, the client still exists
-            print(f"Warning: Client with email {email} might still exist after deletion")
-            # For test purposes, we'll consider this acceptable if it's a timing issue
-        except Exception:
-            # Expected - client should be deleted
-            pass
-
-        print(f"Successfully deleted test client by email: {email}")
+            #if there's no error meaning the client still exists, fail the test
+            await asyncio.sleep(1)  # Wait a moment
+            pytest.fail("The client still exists after deletion attempt")
+        except ValidationError:
+            print(f"Successfully deleted test client by email: {email}")
 
         # Only clear email, keep UUID for next test
         TestClientsEndpoint.created_client_email = None
@@ -148,8 +152,8 @@ class TestClientsEndpoint:
         assert inbound_id is not None, "Test inbound should be available"
 
         # Generate new test data
-        timestamp = int(datetime.now(UTC).timestamp())
-        test_uuid = get_telegram_uuid(TestClientsEndpoint.test_telegram_id + 1)  # Different UUID
+        timestamp = datetime_now_ms(UTC)
+        test_uuid = get_uuid_from_tgid(TestClientsEndpoint.test_telegram_id + 1)  # Different UUID
         test_email = f"testclient_uuid_{timestamp}@example.com"
 
         # Create a new test client
@@ -160,8 +164,8 @@ class TestClientsEndpoint:
             flow="",
             email=test_email,
             limitIp=20,  # Using alias 'limitIp' for 'limit_ip'
-            totalGB=10,  # Using alias 'totalGB' for 'limit_gb'
-            expiryTime=timestamp + 86400,  # Using alias 'expiryTime' for 'expiry_time'
+            totalGB=0,  # Using alias 'totalGB' for 'limit_gb'
+            expiryTime=timestamp + 86400*1000,  # Using alias 'expiryTime' for 'expiry_time'
             enable=True,
             tgId="",  # Using alias 'tgId' for 'tg_id'
             subId=f"test_sub_{timestamp}",  # Using alias 'subId' for 'subscription_id'
@@ -175,6 +179,7 @@ class TestClientsEndpoint:
         assert response.status_code == 200
 
         # Delete the client by UUID
+        print(f"Attempting to delete client with UUID: {test_uuid} from inbound: {inbound_id}")
         response = await xui_client.clients_end.delete_client_by_uuid(test_uuid, inbound_id)
 
         # Validate response
@@ -183,7 +188,12 @@ class TestClientsEndpoint:
         assert response_json["success"] == True
         assert "Inbound client has been deleted." in response_json["msg"]
 
-        print(f"Successfully deleted test client by UUID: {test_uuid}")
+        print(f"The API said it deleted the client: {test_uuid}")
+        check_clients = await xui_client.clients_end.get_client_with_uuid(test_uuid)
+        for client in check_clients:
+            if client.inboundId == inbound_id and client.uuid == test_uuid:
+                pytest.fail("The client still exists after deletion attempt")
+        print("Check complete, client not found as expected")
 
     @pytest.mark.asyncio
     @pytest.mark.dependency(depends=["test_add_client", "test_delete_client_email"])
@@ -193,11 +203,12 @@ class TestClientsEndpoint:
         production_inbounds = await xui_client.get_production_inbounds()
         if not production_inbounds:
             pytest.skip("No production inbounds found for testing")
+        TEST_TELEGRAM_ID = 420
 
         # Generate unique test data
-        timestamp = int(datetime.now(UTC).timestamp())
-        test_uuid = get_telegram_uuid(TestClientsEndpoint.test_telegram_id + 2)  # Different UUID
-        test_email = f"testclient_tgid_{timestamp}@example.com"
+        timestamp = datetime_now_ms(UTC)
+        test_uuid = get_uuid_from_tgid(TEST_TELEGRAM_ID)  # Different UUID
+        test_email = "IF_YOU_SEE_THIS_SOMETHING_IS_WRONG"
 
         # Create a test client
         test_client = SingleInboundClient.model_construct(
@@ -207,8 +218,8 @@ class TestClientsEndpoint:
             flow="",
             email=test_email,
             limitIp=20,  # Using alias 'limitIp' for 'limit_ip'
-            totalGB=10,  # Using alias 'totalGB' for 'limit_gb'
-            expiryTime=timestamp + 86400,  # Using alias 'expiryTime' for 'expiry_time'
+            totalGB=0,  # Using alias 'totalGB' for 'limit_gb'
+            expiryTime=timestamp + 86400 * 1000,  # Using alias 'expiryTime' for 'expiry_time'
             enable=True,
             tgId="",  # Using alias 'tgId' for 'tg_id'
             subId=f"test_tgid_{timestamp}",  # Using alias 'subId' for 'subscription_id'
@@ -220,14 +231,18 @@ class TestClientsEndpoint:
         # Add client to all production inbounds
         added_responses = []
         for inbound in production_inbounds:
-            response = await xui_client.clients_end.add_client(test_client, inbound.id)
+            #same email = exception, so we need to generate a new email for each inbound
+            send_client = test_client.model_copy(
+                update={"email": generate_email_from_tgid_inbid(TEST_TELEGRAM_ID, inbound.id)}
+            )
+            response = await xui_client.clients_end.add_client(send_client, inbound.id)
             assert response.status_code == 200
             added_responses.append(response)
 
         print(f"Added test client with email: {test_email}, UUID: {test_uuid} to {len(production_inbounds)} production inbounds")
 
         # Now delete the client from all production inbounds by Telegram ID
-        responses = await xui_client.delete_client_by_tgid_all_inbounds(TestClientsEndpoint.test_telegram_id + 2)
+        responses = await xui_client.delete_client_by_tgid_all_inbounds(TEST_TELEGRAM_ID)
 
         # Validate responses
         assert len(responses) == len(production_inbounds)
@@ -235,16 +250,17 @@ class TestClientsEndpoint:
             assert response.status_code == 200
             response_json = response.json()
             assert response_json["success"] == True
-            assert "Inbound client has been deleted." in response_json["msg"]
+            assert "Client deleted successfully" in response_json["msg"]
 
         print(f"Successfully deleted test client by Telegram ID from {len(responses)} production inbounds")
 
         # Verify deletion by trying to get the deleted client from each inbound
-        for inbound in production_inbounds:
+        for _ in production_inbounds:
             try:
                 await xui_client.clients_end.get_client_with_email(test_email)
                 # If we get here, the client still exists in at least one inbound
-                print(f"Warning: Client with email {test_email} might still exist in inbound {inbound.id} after deletion")
+                await asyncio.sleep(1)  # Wait a moment in case of timing issues
+                pytest.fail("The client still exists after deletion attempt in at least one inbound")
             except Exception:
                 # Expected - client should be deleted
                 pass