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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-terminusgps
-Version: 1.10.1
+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.1 → python_terminusgps-1.10.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-terminusgps"
-version = "1.10.1"
+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.1 → python_terminusgps-1.10.2}/terminusgps/twilio/caller.py

@@ -9,14 +9,14 @@ from twilio.http.async_http_client import AsyncTwilioHttpClient
 
 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
 
@@ -52,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.1 → 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.1 → python_terminusgps-1.10.2}/uv.lock

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