python-terminusgps 47.0.0__tar.gz → 47.1.0__tar.gz

{python_terminusgps-47.0.0 → python_terminusgps-47.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-terminusgps
-Version: 47.0.0
+Version: 47.1.0
 Summary: Provides abstractions/utilities for working with Wialon API, Authorize.NET API, AWS API, and more.
 Project-URL: Documentation, https://terminusgps.github.io/python-terminusgps
 Project-URL: Repository, https://github.com/terminusgps/python-terminusgps

{python_terminusgps-47.0.0 → python_terminusgps-47.1.0}/pyproject.toml

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

@@ -16,3 +16,4 @@ MERCHANT_AUTH_VALIDATION_MODE = ValidationMode.TEST
 MERCHANT_AUTH_LOGIN_ID = os.getenv("MERCHANT_AUTH_LOGIN_ID")
 MERCHANT_AUTH_TRANSACTION_KEY = os.getenv("MERCHANT_AUTH_TRANSACTION_KEY")
 WIALON_TOKEN = os.getenv("WIALON_TOKEN")
+WIALON_USERNAME = os.getenv("WIALON_USERNAME")

{python_terminusgps-47.0.0 → python_terminusgps-47.1.0}/terminusgps/wialon/session.py

@@ -57,7 +57,7 @@ class WialonSession:
         :type token: str | None
         :param auth_hash: A Wialon API authentication hash. Default is environment variable ``"WIALON_TOKEN"``.
         :type auth_hash: str | None
-        :param username: A Wialon user id to operate as during the session. Default is :py:obj:`None`.
+        :param username: A Wialon user id to operate as during the session. Default is environment variable ``"WIALON_USERNAME"``.
         :type username: str | None
         :param check_service: A Wialon service name to check before calling the Wialon API. Default is :py:obj:`None`.
         :type check_service: str | None
@@ -69,7 +69,7 @@ class WialonSession:
         self._wialon_api = Wialon(scheme=scheme, host=host, port=port, sid=sid)
 
         self._token = token if token else os.getenv("WIALON_TOKEN")
-        self._username = username
+        self._username = username if username else os.getenv("WIALON_USERNAME")
         self._auth_hash = auth_hash
         self._check_service = check_service
 

{python_terminusgps-47.0.0 → python_terminusgps-47.1.0}/terminusgps/wialon/utils.py

@@ -64,9 +64,9 @@ def get_user_by_name(name: str, session: WialonSession) -> WialonUser:
         raise ValueError(f"Multiple users returned for '{name}'.")
     elif num_items <= 0:
         raise ValueError(f"Couldn't find a Wialon user named '{name}'.")
-
     factory = WialonObjectFactory(session)
-    return factory.get("user", id=int(response.get("items")[0].get("id")))
+    user_id = response.get("items")[0].get("id")
+    return factory.get("user", id=int(user_id))
 
 
 def get_carrier_names(session: WialonSession) -> list[str]:
@@ -89,7 +89,8 @@ def get_carrier_names(session: WialonSession) -> list[str]:
                 "propType": "propitemname",
             },
             "force": 0,
-            "flags": flags.DataFlag.UNIT_BASE | flags.DataFlag.UNIT_ADMIN_FIELDS,
+            "flags": flags.DataFlag.UNIT_BASE
+            | flags.DataFlag.UNIT_ADMIN_FIELDS,
             "from": 0,
             "to": 0,
         }
@@ -103,7 +104,9 @@ def get_carrier_names(session: WialonSession) -> list[str]:
     return sorted(list(frozenset(carrier_names)))
 
 
-def get_units_by_carrier(carrier_name: str, session: WialonSession) -> list[WialonUnit]:
+def get_units_by_carrier(
+    carrier_name: str, session: WialonSession
+) -> list[WialonUnit]:
     """
     Returns a list of all units by telecommunications carrier company name.
 
@@ -125,14 +128,17 @@ def get_units_by_carrier(carrier_name: str, session: WialonSession) -> list[Wial
                 "propType": "propitemname",
             },
             "force": 0,
-            "flags": flags.DataFlag.UNIT_BASE | flags.DataFlag.UNIT_ADMIN_FIELDS,
+            "flags": flags.DataFlag.UNIT_BASE
+            | flags.DataFlag.UNIT_ADMIN_FIELDS,
             "from": 0,
             "to": 0,
         }
     )
     num_items: int = int(response.get("totalItemsCount"))
     if num_items <= 0:
-        raise ValueError(f"Couldn't find any units by carrier '{carrier_name}'.")
+        raise ValueError(
+            f"Couldn't find any units by carrier '{carrier_name}'."
+        )
 
     factory = WialonObjectFactory(session)
     unit_ids = [int(unit.get("id")) for unit in response.get("items")]
@@ -161,7 +167,8 @@ def get_unit_by_iccid(iccid: str, session: WialonSession) -> WialonUnit:
                 "propType": "propitemname",
             },
             "force": 0,
-            "flags": flags.DataFlag.UNIT_BASE | flags.DataFlag.UNIT_ADMIN_FIELDS,
+            "flags": flags.DataFlag.UNIT_BASE
+            | flags.DataFlag.UNIT_ADMIN_FIELDS,
             "from": 0,
             "to": 0,
         }
@@ -177,7 +184,9 @@ def get_unit_by_iccid(iccid: str, session: WialonSession) -> WialonUnit:
     return factory.get("avl_unit", id=int(response.get("items")[0].get("id")))
 
 
-def get_unit_by_imei(imei: int | str, session: WialonSession) -> WialonUnit | None:
+def get_unit_by_imei(
+    imei: int | str, session: WialonSession
+) -> WialonUnit | None:
     """
     Takes a Wialon unit's IMEI # and returns its unit id.
 
@@ -218,7 +227,9 @@ def get_unit_by_imei(imei: int | str, session: WialonSession) -> WialonUnit | No
     return factory.get("avl_unit", id=int(response.get("items")[0].get("id")))
 
 
-def get_vin_info(vin_number: str, session: WialonSession) -> dict[str, typing.Any]:
+def get_vin_info(
+    vin_number: str, session: WialonSession
+) -> dict[str, typing.Any]:
     """
     Retrieves vehicle data from a VIN number.
 
@@ -279,7 +290,9 @@ def generate_wialon_password(length: int = 32) -> str:
     s3 = list("!@#$%^*()[]-_+")
 
     while True:
-        password = "".join([secrets.choice(s0 + s1 + s2 + s3) for _ in range(length)])
+        password = "".join(
+            [secrets.choice(s0 + s1 + s2 + s3) for _ in range(length)]
+        )
         if (
             any(c.islower() for c in password)
             and any(c.isupper() for c in password)

{python_terminusgps-47.0.0 → python_terminusgps-47.1.0}/uv.lock

@@ -323,7 +323,7 @@ wheels = [
 
 [[package]]
 name = "python-terminusgps"
-version = "47.0.0"
+version = "47.1.0"
 source = { editable = "." }
 dependencies = [
     { name = "authorizenet" },

python_terminusgps-47.0.0/terminusgps/wialon/validators.py

@@ -1,114 +0,0 @@
-import string
-
-from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured, ValidationError
-from django.utils.translation import gettext_lazy as _
-
-from .session import WialonSession
-
-if settings.configured and not hasattr(settings, "WIALON_TOKEN"):
-    raise ImproperlyConfigured("'WIALON_TOKEN' setting is required.")
-
-
-class WialonValidatorBase:
-    def __init__(self) -> None:
-        self.session = WialonSession()
-        self.session.login(self.session.token)
-
-    def __call__(self, value: str) -> None:
-        raise NotImplementedError("Subclasses must implement this method.")
-
-
-class WialonVinNumberValidator(WialonValidatorBase):
-    def __call__(self, value: str) -> None:
-        response = self.session.wialon_api.unit_get_vin_info(vin=value)
-        if "error" in response["vin_lookup_result"].keys():
-            raise ValidationError(
-                _("Failed to get info for VIN # '%(value)s': '%(message)s'"),
-                code="invalid",
-                params={
-                    "value": value,
-                    "message": response["vin_lookup_result"].get("message", ""),
-                },
-            )
-
-
-class WialonImeiNumberValidator(WialonValidatorBase):
-    def __call__(self, value: str) -> None:
-        response = self.session.wialon_api.core_search_items(
-            **{
-                "spec": {
-                    "itemsType": "avl_unit",
-                    "propName": "sys_id,sys_unique_id",
-                    "propValueMask": f"*,*{value}*",
-                    "sortType": "sys_id,sys_unique_id",
-                },
-                "force": 0,
-                "flags": 1,
-                "from": 0,
-                "to": 0,
-            }
-        )
-        if response is None or not response.get("items"):
-            raise ValidationError(
-                _("IMEI # '%(value)s' wasn't found in Wialon."),
-                code="invalid",
-                params={"value": value},
-            )
-
-
-def validate_imei_number(value: str) -> None:
-    """Raises :py:exec:`ValidationError` if the value is an invalid IMEI number."""
-    WialonImeiNumberValidator()(value)
-
-
-def validate_vin_number(value: str) -> None:
-    """Raises :py:exec:`ValidationError` if the value is an invalid VIN number."""
-    if len(value) != 17:
-        raise ValidationError(
-            _("Whoops! VIN # must be exactly 17 characters in length, got %(length)s."),
-            code="invalid",
-            params={"length": len(value)},
-        )
-    WialonVinNumberValidator()(value)
-
-
-def validate_wialon_password(value: str) -> None:
-    """Raises :py:exec:`ValidationError` if the value represents an invalid Wialon password."""
-    special_symbols_0: list[str] = ["!", "@", "#", "$", "%", "^", "*"]
-    special_symbols_1: list[str] = ["(", ")", "[", "]", "-", "_", "+"]
-    forbidden_symbols: list[str] = [",", ":", "&", "<", ">", "'"]
-
-    if len(value) < 4:
-        raise ValidationError(
-            _("Password cannot be less than 4 characters in length, got %(len)s."),
-            code="invalid",
-            params={"len": len(value)},
-        )
-    if len(value) > 64:
-        raise ValidationError(
-            _("Password cannot be greater than 64 characters in length, got %(len)s."),
-            code="invalid",
-            params={"len": len(value)},
-        )
-    if not any([char for char in value if char in string.ascii_uppercase]):
-        raise ValidationError(
-            _("Password must contain at least one uppercase letter."), code="invalid"
-        )
-    if not any([char for char in value if char in string.ascii_lowercase]):
-        raise ValidationError(
-            _("Password must contain at least one lowercase letter."), code="invalid"
-        )
-    if not any(
-        [char for char in value if char in special_symbols_0 + special_symbols_1]
-    ):
-        raise ValidationError(
-            _("Password must contain at least one special symbol."), code="invalid"
-        )
-    for char in value:
-        if char in forbidden_symbols:
-            raise ValidationError(
-                _("Password cannot contain forbidden character '%(char)s'."),
-                code="invalid",
-                params={"char": char},
-            )