python-terminusgps 20.1.1__py3-none-any.whl → 20.3.0__py3-none-any.whl

{python_terminusgps-20.1.1.dist-info → python_terminusgps-20.3.0.dist-info}/METADATA

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

@@ -18,7 +18,7 @@ terminusgps/wialon/constants.py,sha256=u7y9MsA5LYvjPjxJnCMQdprTF3QhPPR9j4MvzoSNB
 terminusgps/wialon/flags.py,sha256=-OoH-eZM54yjRqxsAXL8VImdQu_7C0OAxCrFqaCEuko,13510
 terminusgps/wialon/logger.py,sha256=nUBsaLMaffSaAHGHAM6mFXDzix9hbNecVtA3INVtii8,968
 terminusgps/wialon/session.py,sha256=47Cq3cM4sF-lySPtafzizKHeHbfuDuK1CnR0Jrmwk-Q,10634
-terminusgps/wialon/utils.py,sha256=KeZmV-MEdGOHXrsyn6IIoyX0EgVYiWYjvacXyZVr1u8,6501
+terminusgps/wialon/utils.py,sha256=KhRgLcD4q2EXAGhi_OOdpo3Azvu65NAEQIvzClj9tbc,6494
 terminusgps/wialon/items/__init__.py,sha256=cfUC5sfVsTwmpgsR-w9wA4ay6_EZYAPgEeuw2k06RJM,256
 terminusgps/wialon/items/base.py,sha256=EAtzlnCvB7WTu3iX1bV1-S9TvwXc-Eez7e0X4TMiK9U,6943
 terminusgps/wialon/items/geofence.py,sha256=LOjWWtRpAFMhE_16SU4sqNEZphmswpeTNtiFCZBB5Ig,1740
@@ -26,10 +26,10 @@ terminusgps/wialon/items/notification.py,sha256=6IrswN6fdEkJErIqtMq45bTl9xVARQw8
 terminusgps/wialon/items/resource.py,sha256=79SwbCyE1zlaoeBfU0erEqvqBAYUC4KAKs8AOLJqflU,9652
 terminusgps/wialon/items/retranslator.py,sha256=8q9EDc92w92MElnHIeEzH3Ra4kiPXrx4t9V5nPDZuRU,3728
 terminusgps/wialon/items/route.py,sha256=PTJx1gmT_PGz7nlSSUS2VzjYD-aAuvkEOIdIFneUSSQ,1148
-terminusgps/wialon/items/unit.py,sha256=PwF7xlpDWI5MpM_u6TmYZjNHWk6TSKM4rJ4OB9CIn4A,7533
+terminusgps/wialon/items/unit.py,sha256=m--ZQp5qZ3LggLM0BFndFZIIw5ZlikOxPtGLzuC7HX0,8115
 terminusgps/wialon/items/unit_group.py,sha256=vGVJMBY1BrKK0tP-C1DCIz4Bh6P-HKRnKY1g8g95UIs,5031
 terminusgps/wialon/items/user.py,sha256=INwAibQVmjNNelepQXMfDevgJqMvIjHHgEjAMLRvhB0,7082
-python_terminusgps-20.1.1.dist-info/METADATA,sha256=h4LJfP4yrxrMf5VzFlyg_ArG_GvkRXoD3JkR35FZIWk,912
-python_terminusgps-20.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_terminusgps-20.1.1.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_terminusgps-20.1.1.dist-info/RECORD,,
+python_terminusgps-20.3.0.dist-info/METADATA,sha256=rondTaGLahN7lf0Xuz339CfVKv0gp5_7BgertPu9AZQ,912
+python_terminusgps-20.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_terminusgps-20.3.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_terminusgps-20.3.0.dist-info/RECORD,,

terminusgps/wialon/items/unit.py

@@ -36,12 +36,31 @@ class WialonUnit(WialonBase):
         )
         return int(response.get("item", {}).get("id")) if response.get("item") else None
 
+    def populate(self) -> None:
+        super().populate()
+        response = self.session.wialon_api.core_search_item(
+            **{"id": self.id, "flags": flags.DATAFLAG_UNIT_ADVANCED_PROPERTIES}
+        ).get("item", {})
+        self._imei_number = response.get("uid")
+        self._active = response.get("act", False)
+
     @property
     def available_commands(self) -> dict:
         return self.session.wialon_api.core_get_hw_cmds(
             **{"deviceTypeId": 0, "unitId": self.id}
         )
 
+    @property
+    def imei_number(self) -> int | None:
+        if self._imei_number:
+            return int(self._imei_number)
+
+    @property
+    def active(self) -> bool:
+        if self._active:
+            return bool(self._active)
+        return False
+
     def execute_command(
         self,
         name: str,

terminusgps/wialon/utils.py

@@ -50,10 +50,10 @@ def get_id_from_iccid(iccid: str, session: WialonSession) -> str | None:
         **{
             "spec": {
                 "itemsType": "avl_unit",
-                "propName": "rel_admin_field_value",
-                "propValueMask": str(iccid),
-                "sortType": "admin_fields",
-                "propType": "adminfield",
+                "propName": "sys_unique_id",
+                "propValueMask": f"*{iccid}*",
+                "sortType": "sys_unique_id",
+                "propType": "property",
                 "or_logic": 0,
             },
             "force": 0,