python-terminusgps 1.10.0__py3-none-any.whl → 1.10.2__py3-none-any.whl

{python_terminusgps-1.10.0.dist-info → python_terminusgps-1.10.2.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
-terminusgps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+terminusgps/__init__.py,sha256=BJidT8yzGBfc8PXQX7ZUjoV3SIAMJZrsbsleQryIGJU,1134
 terminusgps/settings.py,sha256=JMcMFqNQRIcljIZrEsU9pm9AhxG-gcnDC7EONKd3ShE,502
 terminusgps/authorizenet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-terminusgps/authorizenet/auth.py,sha256=kWsqRT9OVEAQuNxDzQNzY1x2SqmvJr-HAbLwgkILntk,997
+terminusgps/authorizenet/auth.py,sha256=JuP-l23PRnsnufda5f29Y61K9yhT6p6pRMEH5KGzmp0,564
 terminusgps/authorizenet/profiles/__init__.py,sha256=QKjMKcXpCSCEhv6LBCz0yGP8t0VxAyKyYRS4_HLYnxQ,114
 terminusgps/authorizenet/profiles/addresses.py,sha256=ffAi3LcEOB3Xsr9f4N_PfjSZcN3I9dTKNamoAmnLpo4,3838
 terminusgps/authorizenet/profiles/base.py,sha256=IooSz_PTeq23IIgq6upx2CcpWEOXgK3mFNylADYlF3I,2553
@@ -9,23 +9,23 @@ terminusgps/authorizenet/profiles/customers.py,sha256=iEuNFP6PHuGdFQftgxxKpQFYaG
 terminusgps/authorizenet/profiles/payments.py,sha256=qOWp-gO6qBCADP98WjoNCHm-jtq7DY5-moiPsOnT5yI,5263
 terminusgps/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 terminusgps/aws/secrets.py,sha256=kgRA77rs0mD4berWRLkPtJLOe4Grf--o5f8NzwQqXCk,360
-terminusgps/twilio/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-terminusgps/twilio/caller.py,sha256=VQecBgi-rI9UwHjz5RzyVdtkuNB52ftmcfIqymh0guk,2280
+terminusgps/twilio/__init__.py,sha256=dYo41F2jft_eHDWSUtSpKGSRG1bewq_qClqilUJZkYM,33
+terminusgps/twilio/caller.py,sha256=XLMONHnojYZ0QVS0UlJlBZkL2qw3LO2b53jWJ4uv6oM,1832
 terminusgps/wialon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-terminusgps/wialon/constants.py,sha256=aybYcNcHyar2lz_6BlQbMWpbcHW6eyJeq05QwuiqZQ0,3078
+terminusgps/wialon/constants.py,sha256=g06sNgWtSvY1pZljbH9KMsArhs8jFZRgJM9GT4Gluf0,3079
 terminusgps/wialon/errors.py,sha256=SV9pVwU6FZ_zGlGP6zJN6aLE2auF4TfHFISQLiPMKrI,1758
 terminusgps/wialon/flags.py,sha256=-OoH-eZM54yjRqxsAXL8VImdQu_7C0OAxCrFqaCEuko,13510
-terminusgps/wialon/session.py,sha256=AntMZQA7g5FAnEHzPCVopmfDgigP1JFp-zYv8_H7xEg,9792
-terminusgps/wialon/utils.py,sha256=vo5-md05VzyFtM98AxG7_gI2TVgOecqY9K78tQErxDU,3429
+terminusgps/wialon/session.py,sha256=YClz5dMQ4vshznngOYkW-kVPh4YAGDx4QHyOGpPwd-k,9474
+terminusgps/wialon/utils.py,sha256=9xJq5eAWm-vu0nJVJ7eUcwhJhMCrGjS1p__4CIBXYm4,3407
 terminusgps/wialon/items/__init__.py,sha256=3BVthghekMvhMQSzQgBMlD_phxmKSmp3Zvmo-z0O8Bs,211
-terminusgps/wialon/items/base.py,sha256=CuDctBbR0NwW9Fo--05iozSx7GkNysvAFXvdidggJjg,6693
+terminusgps/wialon/items/base.py,sha256=r0cDn7c1vKVARPmODbGPkeP2F-sktCqVofIb1Q_gsCQ,6694
 terminusgps/wialon/items/resource.py,sha256=xElMYSMyKA5y8rIP0EeF429MBV2hbLZcS6SokftvrOs,5641
 terminusgps/wialon/items/retranslator.py,sha256=zsQXqOhH1zFe5_e8DROPu60z3v6xPWOEPyMCi2IqJAo,3861
 terminusgps/wialon/items/route.py,sha256=qOHPN_rejwiGqvwWzlwmUIAIyc3lKavCalf8ki66rx0,760
-terminusgps/wialon/items/unit.py,sha256=mEYQRpICELQPR3dyDJVRzoKeIuFRnPgkqK-Oo6xuIP4,6306
+terminusgps/wialon/items/unit.py,sha256=AUPoECgjzxnBxTAjPCbSVL_OzqCP7Oa4vjprFT3gJJ8,7275
 terminusgps/wialon/items/unit_group.py,sha256=1yc7ldPIgGbtiTj0djRDWmt6Q9K_VT9sxOaioasbbLY,5212
-terminusgps/wialon/items/user.py,sha256=bkcMw_YiocaMuhP_pBfB7apjAZwnsOzGScnGkn8Ybbw,6107
-python_terminusgps-1.10.0.dist-info/METADATA,sha256=dPXjLEr-PHdgIL2lWYevYO4FhHwjk-DcwhxyXGXbQys,912
-python_terminusgps-1.10.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_terminusgps-1.10.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_terminusgps-1.10.0.dist-info/RECORD,,
+terminusgps/wialon/items/user.py,sha256=p_NA4iXLappr44RKwt9EHv_v0jc1XOQU_mJWe61s_qI,6077
+python_terminusgps-1.10.2.dist-info/METADATA,sha256=mOx5v7vNDP2-65IJpMHgC2epvklGGClRyb2FGrjPEjE,912
+python_terminusgps-1.10.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_terminusgps-1.10.2.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_terminusgps-1.10.2.dist-info/RECORD,,

terminusgps/__init__.py

@@ -0,0 +1,20 @@
+from django.conf import settings, ImproperlyConfigured
+
+if not hasattr(settings, "DEBUG"):
+    raise ImproperlyConfigured("'DEBUG' setting is required.")
+if not hasattr(settings, "MERCHANT_AUTH_LOGIN_ID"):
+    raise ImproperlyConfigured("'MERCHANT_AUTH_LOGIN_ID' setting is required.")
+if not hasattr(settings, "MERCHANT_AUTH_TRANSACTION_KEY"):
+    raise ImproperlyConfigured("'MERCHANT_AUTH_TRANSACTION_KEY' setting is required.")
+if not hasattr(settings, "TWILIO_FROM_NUMBER"):
+    raise ImproperlyConfigured("'TWILIO_FROM_NUMBER' setting is required.")
+if not hasattr(settings, "TWILIO_MESSAGING_SID"):
+    raise ImproperlyConfigured("'TWILIO_MESSAGING_SID' setting is required.")
+if not hasattr(settings, "TWILIO_SID"):
+    raise ImproperlyConfigured("'TWILIO_SID' setting is required.")
+if not hasattr(settings, "TWILIO_TOKEN"):
+    raise ImproperlyConfigured("'TWILIO_TOKEN' setting is required.")
+if not hasattr(settings, "WIALON_TOKEN"):
+    raise ImproperlyConfigured("'WIALON_TOKEN' setting is required.")
+if not hasattr(settings, "WIALON_ADMIN_ID"):
+    raise ImproperlyConfigured("'WIALON_ADMIN_ID' setting is required.")

terminusgps/authorizenet/auth.py

@@ -2,14 +2,6 @@ from authorizenet.apicontractsv1 import merchantAuthenticationType
 from authorizenet.constants import constants
 
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
-
-if not hasattr(settings, "DEBUG"):
-    raise ImproperlyConfigured("'DEBUG' setting is required.")
-if not hasattr(settings, "MERCHANT_AUTH_LOGIN_ID"):
-    raise ImproperlyConfigured("'MERCHANT_AUTH_LOGIN_ID' setting is required.")
-if not hasattr(settings, "MERCHANT_AUTH_TRANSACTION_KEY"):
-    raise ImproperlyConfigured("'MERCHANT_AUTH_TRANSACTION_KEY' setting is required.")
 
 
 def get_merchant_auth() -> merchantAuthenticationType:

terminusgps/twilio/__init__.py

@@ -0,0 +1 @@
+from .caller import TwilioCaller

terminusgps/twilio/caller.py

@@ -3,29 +3,20 @@ from typing import Any
 import asyncio
 import twilio.rest
 
-from django.conf import settings, ImproperlyConfigured
+from django.conf import settings
 from twilio.http.async_http_client import AsyncTwilioHttpClient
 
-if not hasattr(settings, "TWILIO_FROM_NUMBER"):
-    raise ImproperlyConfigured("'TWILIO_FROM_NUMBER' setting is required.")
-if not hasattr(settings, "TWILIO_MESSAGING_SID"):
-    raise ImproperlyConfigured("'TWILIO_MESSAGING_SID' setting is required.")
-if not hasattr(settings, "TWILIO_SID"):
-    raise ImproperlyConfigured("'TWILIO_SID' setting is required.")
-if not hasattr(settings, "TWILIO_TOKEN"):
-    raise ImproperlyConfigured("'TWILIO_TOKEN' setting is required.")
-
 
 class TwilioCaller:
     def __init__(self) -> None:
+        self.client_sid = settings.TWILIO_SID
+        self.client_token = settings.TWILIO_TOKEN
         self.from_number = settings.TWILIO_FROM_NUMBER
-        self.messaging_service_sid = settings.TWILIO_MESSAGING_SID
+        self.messaging_sid = settings.TWILIO_MESSAGING_SID
 
     def __enter__(self) -> "TwilioCaller":
         self.client = twilio.rest.Client(
-            settings.TWILIO_SID,
-            settings.TWILIO_TOKEN,
-            http_client=AsyncTwilioHttpClient(),
+            self.client_sid, self.client_token, http_client=AsyncTwilioHttpClient()
         )
         return self
 
@@ -61,5 +52,5 @@ class TwilioCaller:
             to=to_number,
             from_=self.from_number,
             body=message,
-            messaging_service_sid=self.messaging_service_sid,
+            messaging_service_sid=self.messaging_sid,
         )

terminusgps/wialon/constants.py

@@ -1,5 +1,6 @@
 from django.db import models
 from django.utils.translation import gettext_lazy as _
+
 from terminusgps.wialon import flags
 
 

terminusgps/wialon/items/base.py

@@ -1,4 +1,5 @@
 from abc import abstractmethod
+
 from terminusgps.wialon import flags
 from terminusgps.wialon.session import WialonSession
 

terminusgps/wialon/items/unit.py

@@ -144,9 +144,9 @@ class WialonUnit(WialonBase):
 
     def get_phone_numbers(self) -> list[str]:
         """
-        Retrieves all phone numbers assigned to this Wialon unit.
+        Retrieves all phone numbers assigned to the unit.
 
-        This includes any attached drivers, custom fields, and normally assigned unit phone numbers.
+        This includes any attached drivers, custom/admin fields, or otherwise assigned phone numbers.
 
         :raises WialonError: If something goes wrong with Wialon.
         :returns: A list of phone numbers.
@@ -154,28 +154,48 @@ class WialonUnit(WialonBase):
 
         """
 
-        phone_numbers = []
-        phones_0 = self._get_driver_phone_numbers()
-        phones_1 = self._get_cfield_phone_numbers()
+        phone_numbers: list[str] = []
+        phones_0: list[str] | None = self._get_driver_phone_numbers()
+        phones_1: list[str] | None = self._get_cfield_phone_numbers()
+        phones_2: list[str] | None = self._get_afield_phone_numbers()
 
-        if phones_0:
+        if phones_0 is not None:
             phone_numbers.extend(phones_0)
-        if phones_1:
+        if phones_1 is not None:
             phone_numbers.extend(phones_1)
+        if phones_2 is not None:
+            phone_numbers.extend(phones_2)
         return list(dict.fromkeys(phone_numbers))  # Removes duplicate phone numbers
 
-    def _get_cfield_phone_numbers(self) -> list[str] | None:
+    def _get_afield_phone_numbers(self, key: str = "to_number") -> list[str] | None:
         """
-        Retrives any phone numbers saved in the unit's custom 'to_number' field.
+        Retrives any phone numbers saved in an admin field by key.
 
+        :param key: An admin field key. Default is ``"to_number"``.
+        :type key: :py:obj:`str`
+        :raises WialonError: If something goes wrong with Wialon.
+        :returns: A list of phone numbers, if the unit has admin phone number fields.
+        :rtype: :py:obj:`list` | :py:obj:`None`
+
+        """
+        for field_name, field_val in self.afields.items():
+            if field_name == key:
+                return self.clean_phone_numbers([field_val])
+
+    def _get_cfield_phone_numbers(self, key: str = "to_number") -> list[str] | None:
+        """
+        Retrives any phone numbers saved in a custom field by key.
+
+        :param key: A custom field key. Default is ``"to_number"``.
+        :type key: :py:obj:`str`
         :raises WialonError: If something goes wrong with Wialon.
         :returns: A list of phone numbers, if the unit has custom phone number fields.
         :rtype: :py:obj:`list` | :py:obj:`None`
 
         """
-        for key, value in self.cfields.items():
-            if key == "to_number":
-                return self.clean_phone_numbers([value])
+        for field_name, field_val in self.cfields.items():
+            if field_name == key:
+                return self.clean_phone_numbers([field_val])
 
     def _get_driver_phone_numbers(self) -> list[str] | None:
         """

terminusgps/wialon/items/user.py

@@ -1,8 +1,7 @@
 from urllib.parse import quote_plus
 
-from terminusgps.wialon import flags
+from terminusgps.wialon import constants, flags
 from terminusgps.wialon.items.base import WialonBase
-from terminusgps.wialon import constants
 
 
 class WialonUser(WialonBase):

terminusgps/wialon/session.py

@@ -2,7 +2,6 @@ import threading
 
 from wialon.api import Wialon, WialonError
 from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
 
 from .errors import (
     WialonLogoutError,
@@ -34,10 +33,6 @@ class WialonSession:
         :rtype: :py:obj:`None`
 
         """
-        if not hasattr(settings, "WIALON_TOKEN"):
-            raise ImproperlyConfigured("'WIALON_TOKEN' setting is required.")
-        if not hasattr(settings, "WIALON_ADMIN_ID"):
-            raise ImproperlyConfigured("'WIALON_ADMIN_ID' setting is required.")
 
         self.wialon_api = Wialon(scheme=scheme, host=host, port=port, sid=sid)
         self.token = token

terminusgps/wialon/utils.py

@@ -1,4 +1,3 @@
-from enum import Enum
 import secrets
 import string