python-terminusgps 35.6.0__py3-none-any.whl → 36.1.0__py3-none-any.whl

{python_terminusgps-35.6.0.dist-info → python_terminusgps-36.1.0.dist-info}/METADATA

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

@@ -37,7 +37,7 @@ terminusgps/twilio/caller.py,sha256=l53-IxXn0wXc_oDcDxfhlrKPz-F4_KfMPV1dAzZjNo4,
 terminusgps/wialon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 terminusgps/wialon/constants.py,sha256=Ju2XL2A4DPFD-w8NjYqEfnnqregl1luPT0XGhGSUnO8,6316
 terminusgps/wialon/flags.py,sha256=M50EdhxQ8IMnJnU0mrHK7-h8Asc6tvNiTOOfd1dBW6A,12815
-terminusgps/wialon/session.py,sha256=09WYWvON_H844IFfdt7_x1we6tHhQSkt9K_BEedBjv0,10396
+terminusgps/wialon/session.py,sha256=jHMr3fQ5tuB3pic73sCZvAsitW3Hcoqzu4X3UblPzvw,10670
 terminusgps/wialon/utils.py,sha256=SwpcxLPBLy0u3AT84G-Co4wxmhRrPFyW3jo_9O6ICvk,11008
 terminusgps/wialon/validators.py,sha256=j5vrtcfClAzRdRkWTvRRAmrne1t0R6cKkmYdE7fAkSs,4247
 terminusgps/wialon/items/__init__.py,sha256=3BVthghekMvhMQSzQgBMlD_phxmKSmp3Zvmo-z0O8Bs,211
@@ -52,7 +52,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-35.6.0.dist-info/METADATA,sha256=X1DuwOhyOEoHoJjTMXXg5-6RpyXpB0F8m42BY8M4oUE,1616
-python_terminusgps-35.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_terminusgps-35.6.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_terminusgps-35.6.0.dist-info/RECORD,,
+python_terminusgps-36.1.0.dist-info/METADATA,sha256=l161qfkVe86AkFOLlo5tDOr0-S5fMj8WBIUlngZ0QIs,1616
+python_terminusgps-36.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_terminusgps-36.1.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_terminusgps-36.1.0.dist-info/RECORD,,

terminusgps/wialon/session.py

@@ -1,10 +1,10 @@
 import dataclasses
 import datetime
+import os
 import typing
 
 import wialon.api
 from django.conf import settings
-from django.utils import timezone
 from loguru import logger
 
 
@@ -20,7 +20,12 @@ class WialonAPICall:
 
 class Wialon(wialon.api.Wialon):
     def __init__(
-        self, log_level: int = 10, log_days: int = 10, *args, **kwargs
+        self,
+        debug: bool = False,
+        log_level: int = 10,
+        log_days: int = 10,
+        *args,
+        **kwargs,
     ) -> None:
         super().__init__(*args, **kwargs)
         self.call_history: list[WialonAPICall] = []
@@ -28,7 +33,7 @@ class Wialon(wialon.api.Wialon):
             f"logs/{self.__class__.__name__}.log",
             level=log_level,
             retention=f"{log_days} days",
-            diagnose=settings.DEBUG,
+            diagnose=debug,
         )
 
     @property
@@ -42,7 +47,10 @@ class Wialon(wialon.api.Wialon):
     def call(self, action_name: str, *argc, **kwargs) -> typing.Any:
         logger.debug(f"Executing '{action_name}'...")
         call_record = WialonAPICall(
-            action=action_name, timestamp=timezone.now(), args=argc, kwargs=kwargs
+            action=action_name,
+            timestamp=datetime.datetime.now(),
+            args=argc,
+            kwargs=kwargs,
         )
 
         try:
@@ -68,6 +76,7 @@ class WialonSession:
         port: int = 443,
         log_level: int = 10,
         log_days: int = 10,
+        debug: bool = False,
     ) -> None:
         """
         Starts or continues a Wialon API session.
@@ -93,9 +102,13 @@ class WialonSession:
             f"logs/{self.__class__.__name__}.log",
             level=log_level,
             retention=f"{log_days} days",
-            diagnose=settings.DEBUG,
+            diagnose=debug or settings.DEBUG if settings.configured else False,
+        )
+        self._token = (
+            token or settings.WIALON_TOKEN
+            if settings.configured
+            else os.getenv("WIALON_TOKEN")
         )
-        self._token = token or settings.WIALON_TOKEN
         self._username = None
         self._gis_sid = None
         self._hw_gp_ip = None
@@ -108,6 +121,7 @@ class WialonSession:
             sid=sid,
             log_level=log_level,
             log_days=log_days,
+            debug=debug,
         )
 
     def __str__(self) -> str: