python-terminusgps 37.4.0__py3-none-any.whl → 37.4.2__py3-none-any.whl

{python_terminusgps-37.4.0.dist-info → python_terminusgps-37.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-terminusgps
-Version: 37.4.0
+Version: 37.4.2
 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.4.0.dist-info → python_terminusgps-37.4.2.dist-info}/RECORD

@@ -44,9 +44,9 @@ terminusgps/wialon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 terminusgps/wialon/constants.py,sha256=05pLc_0S-x0tT87cQcxOmr8plesjOQxoXfUdjIHwI90,7732
 terminusgps/wialon/flags.py,sha256=M50EdhxQ8IMnJnU0mrHK7-h8Asc6tvNiTOOfd1dBW6A,12815
 terminusgps/wialon/renderer.py,sha256=ubmaLjdJyksO2qiWHbIBvYeDqlFya2br7oJYsdfoyV8,7046
-terminusgps/wialon/session.py,sha256=cMpAdGQQZG8uLYJcGB9NFXk5JBaMNpY6T_QuQffsB_k,10096
+terminusgps/wialon/session.py,sha256=YDwJycSM0jqWypP4NUw-59iyIE2Duh745yfFDP6kkvA,10123
 terminusgps/wialon/utils.py,sha256=ntHLAVJSJBdIgJK704xxFNFRopaFz-No9YZZOMmvWO8,11627
-terminusgps/wialon/validators.py,sha256=Z2eci8NzKDHU6oXl5ncgeYXmBYg336k-0R2m0DIxsDY,4346
+terminusgps/wialon/validators.py,sha256=o5__H9HHnGYth8QAKErJG5rEub7FnT8ue0S3IQ8b67o,4232
 terminusgps/wialon/items/__init__.py,sha256=3BVthghekMvhMQSzQgBMlD_phxmKSmp3Zvmo-z0O8Bs,211
 terminusgps/wialon/items/base.py,sha256=vS8xIo5WLiwzpB81i7aHFnwOHzCf4lQG6azjq79HDM4,11775
 terminusgps/wialon/items/resource.py,sha256=Rhy2ig-yxznNhi6ZSaUBbu8ViVx0Sg4n_XS08ijgXsA,18280
@@ -59,7 +59,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.4.0.dist-info/METADATA,sha256=4abh8CpLW2WBcK5GuX4OhzUJGewoOCK7_60AuwefS64,1329
-python_terminusgps-37.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_terminusgps-37.4.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_terminusgps-37.4.0.dist-info/RECORD,,
+python_terminusgps-37.4.2.dist-info/METADATA,sha256=TSV8Y5Jk0AShk21KLbQYmGivghytk-1c4UdTeeeGlmk,1329
+python_terminusgps-37.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_terminusgps-37.4.2.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_terminusgps-37.4.2.dist-info/RECORD,,

terminusgps/wialon/session.py

@@ -299,11 +299,11 @@ class WialonSession:
                 | wialon_flags.TokenFlag.MANAGE_NONSENSITIVE
             )
         try:
-            print(f"{type(flags) = }")
             response = self.wialon_api.token_login(**{"token": token, "fl": flags})
             self._set_login_response(response)
             return response.get("eid", "")
         except (wialon.api.WialonError, ValueError):
+            logger.critical("Failed to login to the Wialon API.")
             raise
 
     def logout(self) -> None:

terminusgps/wialon/validators.py

@@ -4,7 +4,7 @@ from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.utils.translation import gettext_lazy as _
 
-from .session import WialonSessionManager
+from .session import WialonSession
 
 if settings.configured and not hasattr(settings, "WIALON_TOKEN"):
     raise ImproperlyConfigured("'WIALON_TOKEN' setting is required.")
@@ -12,7 +12,8 @@ if settings.configured and not hasattr(settings, "WIALON_TOKEN"):
 
 class WialonValidatorBase:
     def __init__(self) -> None:
-        self.session_manager = WialonSessionManager(token=settings.WIALON_TOKEN)
+        self.session = WialonSession()
+        self.session.login(self.session.token)
 
     def __call__(self, value: str) -> None:
         raise NotImplementedError("Subclasses must implement this method.")
@@ -20,8 +21,7 @@ class WialonValidatorBase:
 
 class WialonVinNumberValidator(WialonValidatorBase):
     def __call__(self, value: str) -> None:
-        session = self.session_manager.get_session(sid=None)
-        response = session.wialon_api.unit_get_vin_info(vin=value)
+        response = self.session.wialon_api.unit_get_vin_info(vin=value)
         if "error" in response["vin_lookup_result"].keys():
             raise ValidationError(
                 _("Failed to get info for VIN # '%(value)s': '%(message)s'"),
@@ -35,8 +35,7 @@ class WialonVinNumberValidator(WialonValidatorBase):
 
 class WialonImeiNumberValidator(WialonValidatorBase):
     def __call__(self, value: str) -> None:
-        session = self.session_manager.get_session(sid=None)
-        response = session.wialon_api.core_search_items(
+        response = self.session.wialon_api.core_search_items(
             **{
                 "spec": {
                     "itemsType": "avl_unit",