python-terminusgps 37.1.0__py3-none-any.whl → 37.2.1__py3-none-any.whl

{python_terminusgps-37.1.0.dist-info → python_terminusgps-37.2.1.dist-info}/METADATA

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

{python_terminusgps-37.1.0.dist-info → python_terminusgps-37.2.1.dist-info}/RECORD

@@ -43,7 +43,7 @@ terminusgps/twilio/caller.py,sha256=RQax2iZ6SYHiuCvBxXkrooRWQ9J8DwKGAjxa8RYjrLI,
 terminusgps/wialon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 terminusgps/wialon/constants.py,sha256=05pLc_0S-x0tT87cQcxOmr8plesjOQxoXfUdjIHwI90,7732
 terminusgps/wialon/flags.py,sha256=M50EdhxQ8IMnJnU0mrHK7-h8Asc6tvNiTOOfd1dBW6A,12815
-terminusgps/wialon/session.py,sha256=eWRAWEikYdGr-0xa6yGHfTAxlCx9-1vsZDNwNZUJjZM,13771
+terminusgps/wialon/session.py,sha256=kkfeqXg2akH_kytcTHsuga3RGpKn8bNcD8NeE3199F8,14843
 terminusgps/wialon/utils.py,sha256=ntHLAVJSJBdIgJK704xxFNFRopaFz-No9YZZOMmvWO8,11627
 terminusgps/wialon/validators.py,sha256=Z2eci8NzKDHU6oXl5ncgeYXmBYg336k-0R2m0DIxsDY,4346
 terminusgps/wialon/items/__init__.py,sha256=3BVthghekMvhMQSzQgBMlD_phxmKSmp3Zvmo-z0O8Bs,211
@@ -58,7 +58,7 @@ terminusgps/wialon/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 terminusgps/wialon/tests/test_items.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 terminusgps/wialon/tests/test_session.py,sha256=9mBlYchMo9NeqRIZsmxYzrM1zBHorqu4ooxqSNppLpI,1336
 terminusgps/wialon/tests/test_utils.py,sha256=SK4PxJQGECFnzx_EQeRAQfsQ5_3FLaVcis2W9u_ibuI,1730
-python_terminusgps-37.1.0.dist-info/METADATA,sha256=0dWu_0SrsHQ1Vv9vaPQ-BBk9rikAnCBl023Jp2Yg4Lg,1329
-python_terminusgps-37.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_terminusgps-37.1.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_terminusgps-37.1.0.dist-info/RECORD,,
+python_terminusgps-37.2.1.dist-info/METADATA,sha256=wAaM5nJUS8JGi3lRfXbpvkTIoDQ7g6mk3VZoTyl7hMg,1329
+python_terminusgps-37.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_terminusgps-37.2.1.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_terminusgps-37.2.1.dist-info/RECORD,,

terminusgps/wialon/session.py

@@ -299,7 +299,7 @@ class WialonSession:
             response = self.wialon_api.token_login(**{"token": token, "fl": flags})
             self._set_login_response(response)
             return response.get("eid")
-        except (wialon.api.WialonError, AssertionError):
+        except (wialon.api.WialonError, ValueError):
             raise
 
     def logout(self) -> None:
@@ -316,16 +316,20 @@ class WialonSession:
         if response.get("error") != 0:
             print(f"Failed to logout of session: '{response.get('message')}'")
 
-    def _set_login_response(self, login_response: dict) -> None:
+    def _set_login_response(self, login_response: dict | None) -> None:
         """
         Sets the Wialon API session's attributes based on a login response.
 
         :param login_response: A response returned from :py:meth:`login` or :py:meth:`duplicate`.
         :type login_response: :py:obj:`dict`
+        :raises ValueError: If ``login_response`` wasn't provided.
         :returns: Nothing.
         :rtype: :py:obj:`None`
 
         """
+        if login_response is None:
+            raise ValueError("Failed to login to Wialon.")
+
         self.wialon_api.sid = login_response.get("eid")
         self._gis_geocode = login_response.get("gis_geocode")
         self._gis_render = login_response.get("gis_render")
@@ -345,7 +349,13 @@ class WialonSession:
 class WialonSessionManager:
     """Provides an interface for generating automatically activated Wialon sessions."""
 
-    def __init__(self, token: str | None = None, lifetime: int = 500) -> None:
+    def __init__(
+        self,
+        token: str | None = None,
+        lifetime: int = 500,
+        session: WialonSession | None = None,
+        session_id: str | None = None,
+    ) -> None:
         """
         Sets :py:attr:`token` and :py:attr:`lifetime`.
 
@@ -357,10 +367,13 @@ class WialonSessionManager:
         :rtype: :py:obj:`None`
 
         """
-        self._token = token
-        self._lifetime = lifetime
-        self._session = WialonSession(sid=None)
-        self.session.login(token=self.token)
+        self.token = token
+        self.lifetime = lifetime
+
+        target_sid = session.id if session and session.id else session_id
+        self.session = WialonSession(sid=target_sid)
+        if not target_sid or not self.validate_session():
+            self.session.login(token=self.token)
 
     def check_active(self) -> bool:
         """
@@ -370,13 +383,18 @@ class WialonSessionManager:
         :rtype: :py:obj:`bool`
 
         """
+        if not self.session.id:
+            return False
         if not self.session.wialon_api.last_call_datetime:
-            return True
+            return self.validate_session()
 
         now = datetime.datetime.now()
         last_call = self.session.wialon_api.last_call_datetime
         session_expiry = last_call + datetime.timedelta(seconds=self.lifetime)
-        return now <= session_expiry
+
+        if now > session_expiry:
+            return False
+        return self.validate_session()
 
     def get_session(self, sid: str | None = None) -> WialonSession:
         """
@@ -391,12 +409,23 @@ class WialonSessionManager:
 
         """
         if sid is not None:
-            self.sid = sid
+            self.session = WialonSession(sid=sid)
+            if not self.validate_session():
+                self.session = WialonSession()
+                self.session.login(token=self.token)
+                return self.session
         if not self.check_active():
-            self.session = WialonSession(sid=None)
-            self.session.login(self.token)
+            self.session = WialonSession()
+            self.session.login(token=self.token)
         return self.session
 
+    def validate_session(self) -> bool:
+        try:
+            result = self.session.wialon_api.core_duplicate()
+            return result is not None
+        except wialon.api.WialonError:
+            return False
+
     @property
     def sid(self) -> str | None:
         """
@@ -405,7 +434,7 @@ class WialonSessionManager:
         :type: :py:obj:`str` | :py:obj:`None`
 
         """
-        return self.session.wialon_api.sid
+        return self.session.wialon_api.sid if self.session else None
 
     @sid.setter
     def sid(self, other: str) -> None:
@@ -418,7 +447,10 @@ class WialonSessionManager:
         :rtype: :py:obj:`None`
 
         """
-        self.session.wialon_api.sid = other
+        if self.session:
+            self.session.wialon_api.sid = other
+        else:
+            self.session = WialonSession(sid=other)
 
     @property
     def token(self) -> str:
@@ -443,9 +475,7 @@ class WialonSessionManager:
         :rtype: :py:obj:`None`
 
         """
-        if other is None:
-            self._token = settings.WIALON_TOKEN
-        self._token = other
+        self._token = other if other is not None else settings.WIALON_TOKEN
 
     @property
     def session(self) -> WialonSession: