python-terminusgps 1.5.9__py3-none-any.whl → 1.6.0__py3-none-any.whl

{python_terminusgps-1.5.9.dist-info → python_terminusgps-1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-terminusgps
-Version: 1.5.9
+Version: 1.6.0
 Summary: Provides abstractions/utilities for working with Wialon API, Authorize.NET API, AWS API, and more.
 Project-URL: Documentation, https://app.terminusgps.com/docs/apps/python-terminusgps/index.html
 Project-URL: Repository, https://github.com/terminusgps/python-terminusgps

{python_terminusgps-1.5.9.dist-info → python_terminusgps-1.6.0.dist-info}/RECORD

@@ -8,8 +8,8 @@ terminusgps/wialon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 terminusgps/wialon/constants.py,sha256=dsQaNt3TIjIZbr_m94KmBGFdrqe6HER2r6lol3X8QpU,2802
 terminusgps/wialon/errors.py,sha256=SV9pVwU6FZ_zGlGP6zJN6aLE2auF4TfHFISQLiPMKrI,1758
 terminusgps/wialon/flags.py,sha256=-OoH-eZM54yjRqxsAXL8VImdQu_7C0OAxCrFqaCEuko,13510
-terminusgps/wialon/session.py,sha256=x5aXxqLcBe4e0Zj3enUvWd1_Ufmd_MxXInC_d_GMn3E,9446
-terminusgps/wialon/utils.py,sha256=UEz8IurgTV1ltuBbR3LHKjFXtUGFrMoEJIGEjN9yIOA,2099
+terminusgps/wialon/session.py,sha256=PNtEooiJln3yZ_hSZXglciyN-H1W6_X5NbLFP5Ju0Ns,9987
+terminusgps/wialon/utils.py,sha256=cDz00d5Jopdh-Al-554-yD5LrKQ37hq4YBXvPunnmIg,2715
 terminusgps/wialon/items/__init__.py,sha256=3BVthghekMvhMQSzQgBMlD_phxmKSmp3Zvmo-z0O8Bs,211
 terminusgps/wialon/items/base.py,sha256=MN4FG6U1nWkYAjNfXQJRVrWJoiW4Y64tyqxUO0mhv_w,6593
 terminusgps/wialon/items/resource.py,sha256=ADjGsQaCqD6Y3_AaD8vLgYzGaMK69MpxCZojnylS4GE,815
@@ -18,7 +18,7 @@ terminusgps/wialon/items/route.py,sha256=qOHPN_rejwiGqvwWzlwmUIAIyc3lKavCalf8ki6
 terminusgps/wialon/items/unit.py,sha256=tLAWPfHUUS6_Feh1aYBMFPgyuGlSiAnfumJJmGt3bKw,4662
 terminusgps/wialon/items/unit_group.py,sha256=1yc7ldPIgGbtiTj0djRDWmt6Q9K_VT9sxOaioasbbLY,5212
 terminusgps/wialon/items/user.py,sha256=bkcMw_YiocaMuhP_pBfB7apjAZwnsOzGScnGkn8Ybbw,6107
-python_terminusgps-1.5.9.dist-info/METADATA,sha256=PqykTLQWtwJqVJfFai86PgDOkGOslGiG_6bsRkJZbUE,882
-python_terminusgps-1.5.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_terminusgps-1.5.9.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_terminusgps-1.5.9.dist-info/RECORD,,
+python_terminusgps-1.6.0.dist-info/METADATA,sha256=VBNWqHqXEN2Ig3nLeZrGOPrt_0Hrja2YPYfpMPdfrhA,882
+python_terminusgps-1.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_terminusgps-1.6.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_terminusgps-1.6.0.dist-info/RECORD,,

terminusgps/wialon/session.py

@@ -1,3 +1,5 @@
+import threading
+
 from wialon.api import Wialon, WialonError
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
@@ -307,13 +309,24 @@ class WialonSession:
         self._wsdk_version = login_response.get("wsdk_version")
 
 
-def main() -> None:
-    session = WialonSession()
-    session.login(token=settings.WIALON_TOKEN)
-    session.duplicate(username="chrissyron@gmail.com", continued=False)
-    session.logout()
-    return
+class WialonSessionManager:
+    _instance = None
+    _lock = threading.Lock()
+    _session = None
+
+    def __new__(cls) -> "WialonSessionManager":
+        with cls._lock:
+            if not cls._instance:
+                cls._instance = super().__new__(cls)
+        return cls._instance
 
+    def get_session(self, sid: str | None = None) -> WialonSession:
+        if not hasattr(settings, "WIALON_TOKEN"):
+            raise ImproperlyConfigured("'WIALON_TOKEN' setting is required.")
 
-if __name__ == "__main__":
-    main()
+        with self._lock:
+            if not self._session or not self._session.active:
+                self._session = WialonSession(sid=sid)
+                if not self._session.active:
+                    self._session.login(settings.WIALON_TOKEN)
+        return self._session

terminusgps/wialon/utils.py

@@ -1,9 +1,33 @@
 import secrets
 import string
 
+from typing import Any
 from .session import WialonSession
 from .flags import DATAFLAG_UNIT_BASE
 
+from terminusgps.wialon.items import (
+    WialonUser,
+    WialonUnit,
+    WialonUnitGroup,
+    WialonResource,
+)
+
+
+def get_wialon_cls(items_type: str) -> Any:
+    """Returns a Wialon object class based on items_type."""
+    match items_type:
+        case "user":
+            wialon_cls = WialonUser
+        case "avl_unit":
+            wialon_cls = WialonUnit
+        case "avl_unit_group":
+            wialon_cls = WialonUnitGroup
+        case "avl_resource":
+            wialon_cls = WialonResource
+        case _:
+            raise ValueError(f"Invalid items_type '{items_type}'")
+    return wialon_cls
+
 
 def is_unique(value: str, session: WialonSession, items_type: str = "avl_unit") -> bool:
     """Determines if the value is unique among Wialon objects of type 'items_type'."""
@@ -50,9 +74,9 @@ def get_id_from_iccid(iccid: str, session: WialonSession) -> str | None:
             "to": 0,
         }
     )
-    if response.get("totalItemsCount", 0) != 1:
-        return None
-    return response["items"][0].get("id")
+
+    if response.get("totalItemsCount", 0) == 1:
+        return response["items"][0].get("id")
 
 
 def main() -> None: