python-terminusgps 31.7.1__py3-none-any.whl → 31.7.2__py3-none-any.whl

{python_terminusgps-31.7.1.dist-info → python_terminusgps-31.7.2.dist-info}/METADATA

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

@@ -30,8 +30,7 @@ terminusgps/twilio/tests/test_validators.py,sha256=CETv7Mcr19UMMfh1UaWSV26FiOeh2
 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/logger.py,sha256=nUBsaLMaffSaAHGHAM6mFXDzix9hbNecVtA3INVtii8,968
-terminusgps/wialon/session.py,sha256=Ata_eDn4fzTkvl0A1MNHwlFx-G9aVayXMo40lcS3pY4,10007
+terminusgps/wialon/session.py,sha256=09WYWvON_H844IFfdt7_x1we6tHhQSkt9K_BEedBjv0,10396
 terminusgps/wialon/utils.py,sha256=JWHZ7VEeo8VNBH67gjOAQk5ITKuPllWDlJ4dVSQ5blA,11002
 terminusgps/wialon/validators.py,sha256=CVEpFsxqplEcpv4U2ipA6v9y5cSrMKFUXLvze-3vs4U,4223
 terminusgps/wialon/items/__init__.py,sha256=3BVthghekMvhMQSzQgBMlD_phxmKSmp3Zvmo-z0O8Bs,211
@@ -45,8 +44,8 @@ terminusgps/wialon/items/user.py,sha256=5LgwalGO8KS_7psmAVmAlnC0S6SPBDZMOuT5ZqPK
 terminusgps/wialon/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=dEcGDP_mVbT_uEMfdodAxc6Dcehn_ZwZswp8nYtdNvA,1669
-python_terminusgps-31.7.1.dist-info/METADATA,sha256=nph4QwpwpHjYR-rz25kOtOlWPuMvvu5t_YsBzq0QtT8,1581
-python_terminusgps-31.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_terminusgps-31.7.1.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_terminusgps-31.7.1.dist-info/RECORD,,
+terminusgps/wialon/tests/test_utils.py,sha256=SK4PxJQGECFnzx_EQeRAQfsQ5_3FLaVcis2W9u_ibuI,1730
+python_terminusgps-31.7.2.dist-info/METADATA,sha256=t9yLXs5VwoG9MV9BpmEvx5HCt-MpX2cjXumX4lT0M10,1581
+python_terminusgps-31.7.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_terminusgps-31.7.2.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_terminusgps-31.7.2.dist-info/RECORD,,

terminusgps/wialon/session.py

@@ -1,6 +1,5 @@
 import dataclasses
 import datetime
-import logging
 import typing
 
 import wialon.api
@@ -20,10 +19,17 @@ class WialonAPICall:
 
 
 class Wialon(wialon.api.Wialon):
-    def __init__(self, log_level: int = logging.INFO, *args, **kwargs) -> None:
+    def __init__(
+        self, log_level: int = 10, log_days: int = 10, *args, **kwargs
+    ) -> None:
         super().__init__(*args, **kwargs)
         self.call_history: list[WialonAPICall] = []
-        logger.add(self.__class__.__name__, level=log_level)
+        logger.add(
+            f"logs/{self.__class__.__name__}.log",
+            level=log_level,
+            retention=f"{log_days} days",
+            diagnose=settings.DEBUG,
+        )
 
     @property
     def total_calls(self) -> int:
@@ -60,7 +66,8 @@ class WialonSession:
         scheme: str = "https",
         host: str = "hst-api.wialon.com",
         port: int = 443,
-        log_level: int = logging.INFO,
+        log_level: int = 10,
+        log_days: int = 10,
     ) -> None:
         """
         Starts or continues a Wialon API session.
@@ -75,21 +82,33 @@ class WialonSession:
         :type host: :py:obj:`str`
         :param port: Wialon API host port. Default is ``443``.
         :type port: :py:obj:`int`
-        :param log_level: Level of emitted logs. Default is :py:obj:`~logging.INFO`.
+        :param log_level: Level of emitted logs. Default is ``10``.
         :type log_level: :py:obj:`int`
         :returns: Nothing.
         :rtype: :py:obj:`None`
 
         """
 
-        logger.add(self.__class__.__name__, level=log_level)
+        logger.add(
+            f"logs/{self.__class__.__name__}.log",
+            level=log_level,
+            retention=f"{log_days} days",
+            diagnose=settings.DEBUG,
+        )
         self._token = token or settings.WIALON_TOKEN
         self._username = None
         self._gis_sid = None
         self._hw_gp_ip = None
         self._wsdk_version = None
         self._uid = None
-        self.wialon_api = Wialon(scheme=scheme, host=host, port=port, sid=sid)
+        self.wialon_api = Wialon(
+            scheme=scheme,
+            host=host,
+            port=port,
+            sid=sid,
+            log_level=log_level,
+            log_days=log_days,
+        )
 
     def __str__(self) -> str:
         return str(self.id)

terminusgps/wialon/tests/test_utils.py

@@ -1,7 +1,7 @@
 import string
 import unittest
 
-from .. import utils
+from terminusgps.wialon import utils
 
 
 class WialonUtilsTestCase(unittest.TestCase):
@@ -34,6 +34,7 @@ class WialonUtilsTestCase(unittest.TestCase):
             self.fail("Generated password did not contain an uppercase letter.")
         if not any([c for c in password if c in s1]):
             self.fail("Generated password did not contain a lowercase letter.")
+        # TODO: Make this check for 3 digits
         if not any([c for c in password if c in s2]):
             self.fail("Generated password did not contain a digit.")
         if not any([c for c in password if c in s3]):

terminusgps/wialon/logger.py

@@ -1,29 +0,0 @@
-import logging
-
-
-class WialonLogger:
-    def __init__(
-        self,
-        logger: logging.Logger,
-        level: int = logging.DEBUG,
-        format: str = "%(name)s - %(levelname)s - %(asctime)s - %(message)s",
-        use_stream_handler: bool = True,
-        use_file_handler: bool = False,
-        filename: str = "wialon_debug.log",
-    ) -> None:
-        self.logger = logger
-        self.logger.setLevel(level)
-        formatter = logging.Formatter(format)
-
-        if use_stream_handler and not self.logger.handlers:
-            stream_handler = logging.StreamHandler()
-            stream_handler.setFormatter(formatter)
-            self.logger.addHandler(stream_handler)
-
-        if use_file_handler and not self.logger.handlers:
-            file_handler = logging.FileHandler(filename)
-            file_handler.setFormatter(formatter)
-            self.logger.addHandler(file_handler)
-
-    def get_logger(self) -> logging.Logger:
-        return self.logger