python-terminusgps 41.3.0__py3-none-any.whl → 42.0.0__py3-none-any.whl

{python_terminusgps-41.3.0.dist-info → python_terminusgps-42.0.0.dist-info}/METADATA

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

@@ -29,14 +29,14 @@ terminusgps/wialon/validators.py,sha256=o5__H9HHnGYth8QAKErJG5rEub7FnT8ue0S3IQ8b
 terminusgps/wialon/items/__init__.py,sha256=RTiY9ziXqKCB8VWGoExOIErDlUMBBfzzsA7nlOlCZ2w,41
 terminusgps/wialon/items/account.py,sha256=OSTTbw-nBFqzL1AnGYQ7-Gaymr-S5wx1a0uDzOFlxCM,7888
 terminusgps/wialon/items/base.py,sha256=579Dmapm_v8QDJYa0NJhdqSWYR0X6aVx53slD38pltw,8639
-terminusgps/wialon/items/factory.py,sha256=a2XNiSsFR0zagYx9gYTNj8LyQMSXsQrv-C4RzTCtSvU,2156
+terminusgps/wialon/items/factory.py,sha256=VoQgbw9r_5qdpKPQ3GPc_DQY_34m3kJPaze8eBk3RKs,2144
 terminusgps/wialon/items/resource.py,sha256=eW33Jt5gnkeUKXUhf3TIfufgD2IfVc9qmJy8-pF4apA,4516
-terminusgps/wialon/items/retranslator.py,sha256=nJvYsvRCyb8hIx2qmUUcXfYeNiBUMW018xnOfv2w-Fg,1753
+terminusgps/wialon/items/retranslator.py,sha256=nxp_SNsd9VBqEJcKOVLF6fxq4XS3gGjBX_Xk9h5zrEc,1850
 terminusgps/wialon/items/route.py,sha256=xixlex6bUeFHXucVQdbfQUSLxI1Rhwk6slhoFP2odp0,1307
-terminusgps/wialon/items/unit.py,sha256=kfiqysdPxiU_8fHomKZEz3Ypbkaoc5HevOzpqr7R7rI,5189
+terminusgps/wialon/items/unit.py,sha256=kIjnMOjjI3siCaA6wXojzEK2xqFIm5mN4xNqzKDUa1Q,5473
 terminusgps/wialon/items/unit_group.py,sha256=L7-PAVCj8Bf50fa04Ials4VHg8LOWkw6hwNhtSyMksE,2133
 terminusgps/wialon/items/user.py,sha256=hZlFeXCgOAdivl_Anjp_We6Cy5U8IxWNDAgm5MFZfp0,5194
-python_terminusgps-41.3.0.dist-info/METADATA,sha256=9BHo1xTbDTjTZJmo6xJhAyboF8MopV0ILY9ff4U-Dlw,976
-python_terminusgps-41.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_terminusgps-41.3.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_terminusgps-41.3.0.dist-info/RECORD,,
+python_terminusgps-42.0.0.dist-info/METADATA,sha256=3vJ_3IV5mqPZ6vxw9ZVyLte-UlAQYzREpEE2dYnEhJE,976
+python_terminusgps-42.0.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_terminusgps-42.0.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_terminusgps-42.0.0.dist-info/RECORD,,

terminusgps/wialon/items/factory.py

@@ -27,24 +27,27 @@ class WialonObjectFactory:
         # TODO: Add session refreshing
         self.session = session
 
-    def get(self, id: int | str, items_type: str) -> WialonObject:
-        """Returns a Wialon object that already exists in Wialon by id."""
-        if isinstance(id, str) and not id.isdigit():
-            raise ValueError(f"'id' can only be digits, got '{id}'.")
-        if items_type not in WIALON_ITEMSTYPE_MAP:
-            raise ValueError(f"Invalid Wialon items type: '{items_type}'.")
-        cls = WIALON_ITEMSTYPE_MAP.get(items_type)
-        if cls is None:
-            raise ValueError(f"Wialon items type '{items_type}' is not implemented.")
-        return cls(session=self.session, id=int(id))
-
     def create(self, items_type: str, *args, **kwargs) -> WialonObject:
-        """Returns a Wialon object after creating it in Wialon."""
-        if items_type not in WIALON_ITEMSTYPE_MAP:
+        """Creates a Wialon object in Wialon and returns its Python equivalent."""
+        cls = self._get_wialon_cls(items_type)
+        if cls is None:
             raise ValueError(f"Invalid Wialon items type: '{items_type}'.")
-        cls = WIALON_ITEMSTYPE_MAP.get(items_type)
+        return self._create_wialon_obj(cls, *args, **kwargs)
+
+    def get(self, items_type: str, id: int | str) -> WialonObject:
+        """Retrieves a Wialon object from Wialon and returns its Python equivalent."""
+        cls = self._get_wialon_cls(items_type)
         if cls is None:
-            raise ValueError(f"Wialon items type '{items_type}' is not implemented.")
+            raise ValueError(f"Invalid Wialon items type: '{items_type}'.")
+        return self._retrieve_wialon_obj(cls, id)
+
+    def _get_wialon_cls(self, items_type) -> WialonObject | None:
+        return WIALON_ITEMSTYPE_MAP.get(items_type)
+
+    def _create_wialon_obj(self, cls, *args, **kwargs) -> WialonObject:
         obj = cls(session=self.session, id=None)
         obj.create(*args, **kwargs)
         return obj
+
+    def _retrieve_wialon_obj(self, cls, id) -> WialonObject:
+        return cls(session=self.session, id=int(id))

terminusgps/wialon/items/retranslator.py

@@ -3,15 +3,18 @@ from typing import TypedDict
 from terminusgps.wialon import flags
 from terminusgps.wialon.items.base import WialonObject
 
-
-class WialonRetranslatorConfiguration(TypedDict):
-    protocol: str
-    server: str
-    port: int
-    auth: str
-    ssl: int
-    debug: int
-    v6type: int
+WialonRetranslatorConfiguration = TypedDict(
+    "WialonRetranslatorConfiguration",
+    {
+        "protocol": str,
+        "server": str,
+        "port": int,
+        "auth": str,
+        "ssl": int,
+        "debug": int,
+        "v6type": int,
+    },
+)
 
 
 class WialonRetranslator(WialonObject):

terminusgps/wialon/items/unit.py

@@ -132,3 +132,13 @@ class WialonUnit(WialonObject):
             if command_ids is not None
             else {"itemId": self.id}
         )
+
+    @requires_id
+    def get_imei(self) -> str:
+        return str(
+            self.session.wialon_api.core_search_item(
+                **{"id": self.id, "flags": flags.DataFlag.UNIT_ADVANCED_PROPERTIES}
+            )
+            .get("item", {})
+            .get("uid")
+        )