python-terminusgps 1.10.0__tar.gz → 1.10.2__tar.gz

{python_terminusgps-1.10.0 → python_terminusgps-1.10.2}/PKG-INFO

@@ -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 → python_terminusgps-1.10.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-terminusgps"
-version = "1.10.0"
+version = "1.10.2"
 description = "Provides abstractions/utilities for working with Wialon API, Authorize.NET API, AWS API, and more."
 readme = "README.md"
 authors = [ {name = "Blake Nall", email = "blake@terminusgps.com" } ]

python_terminusgps-1.10.2/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.")

{python_terminusgps-1.10.0 → python_terminusgps-1.10.2}/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:

python_terminusgps-1.10.2/terminusgps/twilio/__init__.py

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

{python_terminusgps-1.10.0 → python_terminusgps-1.10.2}/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,
         )

{python_terminusgps-1.10.0 → python_terminusgps-1.10.2}/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
 
 

{python_terminusgps-1.10.0 → python_terminusgps-1.10.2}/terminusgps/wialon/items/base.py

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

{python_terminusgps-1.10.0 → python_terminusgps-1.10.2}/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:
         """

{python_terminusgps-1.10.0 → python_terminusgps-1.10.2}/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):

{python_terminusgps-1.10.0 → python_terminusgps-1.10.2}/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

{python_terminusgps-1.10.0 → python_terminusgps-1.10.2}/terminusgps/wialon/utils.py

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

{python_terminusgps-1.10.0 → python_terminusgps-1.10.2}/uv.lock

@@ -504,7 +504,7 @@ wheels = [
 
 [[package]]
 name = "python-terminusgps"
-version = "1.10.0"
+version = "1.10.2"
 source = { editable = "." }
 dependencies = [
     { name = "argparse" },

python_terminusgps-1.10.0/requirements.txt

@@ -1,50 +0,0 @@
-# This file was autogenerated by uv via the following command:
-#    uv pip compile pyproject.toml -o requirements.txt
-argparse==1.4.0
-    # via python-terminusgps (pyproject.toml)
-asgiref==3.8.1
-    # via django
-authorizenet==1.1.5
-    # via python-terminusgps (pyproject.toml)
-boto3==1.35.80
-    # via python-terminusgps (pyproject.toml)
-botocore==1.35.80
-    # via
-    #   boto3
-    #   s3transfer
-certifi==2024.8.30
-    # via requests
-charset-normalizer==3.4.0
-    # via requests
-django==5.1.4
-    # via python-terminusgps (pyproject.toml)
-future==1.0.0
-    # via python-wialon
-idna==3.10
-    # via requests
-jmespath==1.0.1
-    # via
-    #   boto3
-    #   botocore
-lxml==4.9.4
-    # via authorizenet
-python-dateutil==2.9.0.post0
-    # via botocore
-python-wialon==1.2.4
-    # via python-terminusgps (pyproject.toml)
-pyxb-x==1.2.6.2
-    # via authorizenet
-requests==2.32.3
-    # via authorizenet
-s3transfer==0.10.4
-    # via boto3
-simplejson==3.19.3
-    # via python-wialon
-six==1.17.0
-    # via python-dateutil
-sqlparse==0.5.3
-    # via django
-urllib3==2.2.3
-    # via
-    #   botocore
-    #   requests