python-terminusgps 20.7.0__py3-none-any.whl → 21.2.0__py3-none-any.whl

{python_terminusgps-20.7.0.dist-info → python_terminusgps-21.2.0.dist-info}/METADATA

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

@@ -18,16 +18,16 @@ terminusgps/wialon/constants.py,sha256=n1ux68oWYWnzeZdN811Iw_Lk78KBM0YMJMoonn67u
 terminusgps/wialon/flags.py,sha256=_NIL3mrEGhvI5YISVjimjYtUatdgOqhZPJX368MtKSU,13959
 terminusgps/wialon/logger.py,sha256=nUBsaLMaffSaAHGHAM6mFXDzix9hbNecVtA3INVtii8,968
 terminusgps/wialon/session.py,sha256=6xg65LZz6cebWclTQp1KRLvPss0aM-bWhAmmwiDOlMg,10267
-terminusgps/wialon/utils.py,sha256=IN45hASI6iP3Wd35ejGeoIYDIQ_w65-W05eVUdWFRxo,5712
+terminusgps/wialon/utils.py,sha256=HUuBgkqJzzsFHGKPgf_YAE0e5Oui8xdaYtb9fv_ibOc,6344
 terminusgps/wialon/items/__init__.py,sha256=3BVthghekMvhMQSzQgBMlD_phxmKSmp3Zvmo-z0O8Bs,211
 terminusgps/wialon/items/base.py,sha256=EAtzlnCvB7WTu3iX1bV1-S9TvwXc-Eez7e0X4TMiK9U,6943
-terminusgps/wialon/items/resource.py,sha256=z264-upqaAWjrI7Mv2Ryy8yRy7XQLBR26GCCswLsdx4,13567
+terminusgps/wialon/items/resource.py,sha256=J2HRSbGwGcfTcaurMI0oms5XcmUjf887GJVaXLfyA-o,14551
 terminusgps/wialon/items/retranslator.py,sha256=8q9EDc92w92MElnHIeEzH3Ra4kiPXrx4t9V5nPDZuRU,3728
 terminusgps/wialon/items/route.py,sha256=PTJx1gmT_PGz7nlSSUS2VzjYD-aAuvkEOIdIFneUSSQ,1148
-terminusgps/wialon/items/unit.py,sha256=K5IoGSRoH_JiAZoKK6Wb9DToaDScaL7mPKqSOAwtg0A,8618
+terminusgps/wialon/items/unit.py,sha256=oNqLdblY6uWd08FCInSix9gzDYk-O1YdgbkENZ-1vjs,8541
 terminusgps/wialon/items/unit_group.py,sha256=vGVJMBY1BrKK0tP-C1DCIz4Bh6P-HKRnKY1g8g95UIs,5031
 terminusgps/wialon/items/user.py,sha256=INwAibQVmjNNelepQXMfDevgJqMvIjHHgEjAMLRvhB0,7082
-python_terminusgps-20.7.0.dist-info/METADATA,sha256=_VCihk48_Dh60rQSGjKm-PP6A26obKdUENWPQCij17E,912
-python_terminusgps-20.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-python_terminusgps-20.7.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-python_terminusgps-20.7.0.dist-info/RECORD,,
+python_terminusgps-21.2.0.dist-info/METADATA,sha256=eSyk_vdKqPA1np55nwimM-J2Wnq8c9j0pZdlK5XgQs8,912
+python_terminusgps-21.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+python_terminusgps-21.2.0.dist-info/licenses/COPYING,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+python_terminusgps-21.2.0.dist-info/RECORD,,

terminusgps/wialon/items/resource.py

@@ -287,8 +287,6 @@ class WialonResource(WialonBase):
         desc: str = "",
         phone: str = "",
         mobile_auth_code: str = "",
-        image_checksum: str = "",
-        image_ratio: str = "",
         custom_fields: dict[str, str] | None = None,
     ) -> None:
         """
@@ -304,10 +302,6 @@ class WialonResource(WialonBase):
         :type phone: :py:obj:`str`
         :param mobile_auth_code: Authentication code for Wialon mobile app.
         :type mobile_auth_code: :py:obj:`str`
-        :param image_checksum: Checksum for driver image.
-        :type image_checksum: :py:obj:`str`
-        :param image_ratio: Driver image aspect ratio.
-        :type image_ratio: :py:obj:`float` | :py:obj:`None`
         :param custom_fields: Additional custom fields to add to the driver.
         :type custom_fields: :py:obj:`dict` | :py:obj:`None`
         :raises WialonError: If something goes wrong calling the Wialon API.
@@ -331,17 +325,13 @@ class WialonResource(WialonBase):
             params.update({"p": quote_plus(phone)})
         if custom_fields:
             params.update({"jp": custom_fields})
-        response = self.session.wialon_api.resource_update_driver(**params)
-        print(f"{response = }")
+        self.session.wialon_api.resource_update_driver(**params)
 
     def create_passenger(
         self,
         name: str,
         code: str,
         phone: str = "",
-        timezone: int | None = None,
-        image_checksum: str = "",
-        image_ratio: float | None = None,
         custom_fields: dict[str, str] | None = None,
     ) -> None:
         """
@@ -353,12 +343,6 @@ class WialonResource(WialonBase):
         :type code: :py:obj:`str`
         :param phone: A phone number beginning in a country code. No spaces.
         :type phone: :py:obj:`str`
-        :param timezone: A timezone integer.
-        :type timezone: :py:obj:`int` | :py:obj:`None`
-        :param image_checksum: Checksum for passenger image.
-        :type image_checksum: :py:obj:`str`
-        :param image_ratio: Passenger image aspect ratio.
-        :type image_ratio: :py:obj:`float` | :py:obj:`None`
         :param custom_fields: Additional custom fields to add to the passenger.
         :type custom_fields: :py:obj:`dict` | :py:obj:`None`
         :raises WialonError: If something goes wrong calling the Wialon API.
@@ -371,14 +355,61 @@ class WialonResource(WialonBase):
             "id": 0,
             "callMode": "create",
             "c": code,
-            "ck": image_checksum,
-            "r": image_ratio,
             "n": name,
         }
         if phone:
             params.update({"p": quote_plus(phone)})
-        if timezone:
-            params.update({"tz": timezone})
         if custom_fields:
             params.update({"jp": custom_fields})
         self.session.wialon_api.resource_update_tag(**params)
+
+    def update_attachable_drivers(self, units: list[str | int]) -> None:
+        """Updates the pool of units for the resource to attach drivers to the new unit list."""
+        self.session.wialon_api.update_driver_units(
+            **{"itemId": self.id, "units": units}
+        )
+
+    def update_attachable_passengers(self, units: list[str | int]) -> None:
+        """Updates the pool of units for the resource to attach passengers to the new unit list."""
+        self.session.wialon_api.update_tag_units(**{"itemId": self.id, "units": units})
+
+    def create_trailer(
+        self,
+        name: str,
+        code: str,
+        desc: str = "",
+        phone: str = "",
+        custom_fields: dict[str, str] | None = None,
+    ) -> None:
+        """
+        Creates a trailer for the resource.
+
+        :param name: A name for the new trailer.
+        :type name: :py:obj:`str`
+        :param code: A unique code for the new trailer.
+        :type code: :py:obj:`str`
+        :param desc: A description for the trailer.
+        :type desc: :py:obj:`str`
+        :param phone: A phone number beginning in a country code. No spaces.
+        :type phone: :py:obj:`str`
+        :param custom_fields: Additional custom fields to add to the trailer.
+        :type custom_fields: :py:obj:`dict` | :py:obj:`None`
+        :raises WialonError: If something goes wrong calling the Wialon API.
+        :returns: Nothing.
+        :rtype: :py:obj:`None`
+
+        """
+        params = {
+            "itemId": self.id,
+            "id": 0,
+            "callMode": "create",
+            "c": code,
+            "ds": desc,
+            "n": name,
+            "f": 1,
+        }
+        if phone:
+            params.update({"p": quote_plus(phone)})
+        if custom_fields:
+            params.update({"jp": custom_fields})
+        self.session.wialon_api.resource_update_trailer(**params)

terminusgps/wialon/items/unit.py

@@ -200,13 +200,11 @@ class WialonUnit(WialonBase):
 
     def clean_phone_numbers(self, phones: list[str]) -> list[str]:
         """Takes a list of phone numbers and returns a list of clean phone numbers."""
-        cleaned_phones = []
-        for num in phones:
-            if "," in num:
-                cleaned_phones.extend(num.split(","))
-            else:
-                cleaned_phones.append(num)
-        return cleaned_phones
+        return [
+            clean_num
+            for num in phones
+            for clean_num in (num.split(",") if "," in num else [num])
+        ]
 
     def _get_afield_phone_numbers(self, key: str = "to_number") -> list[str] | None:
         """

terminusgps/wialon/utils.py

@@ -32,7 +32,7 @@ def get_hw_type_id(name: str, session: WialonSession) -> int | None:
     return int(hw_types.get(name)) if name in hw_types.keys() else None
 
 
-def get_id_from_iccid(iccid: str, session: WialonSession) -> str | None:
+def get_id_from_imei(imei: str, session: WialonSession) -> str | None:
     """
     Takes a Wialon unit's IMEI # and returns its unit id, if it exists.
 
@@ -50,7 +50,7 @@ def get_id_from_iccid(iccid: str, session: WialonSession) -> str | None:
             "spec": {
                 "itemsType": "avl_unit",
                 "propName": "sys_unique_id",
-                "propValueMask": f"*{iccid}*",
+                "propValueMask": f"*{imei}*",
                 "sortType": "sys_unique_id",
                 "propType": "property",
                 "or_logic": 0,
@@ -66,6 +66,24 @@ def get_id_from_iccid(iccid: str, session: WialonSession) -> str | None:
         return response["items"][0].get("id")
 
 
+def get_id_from_iccid(iccid: str, session: WialonSession) -> str | None:
+    """
+    DEPRECATED: Use :py:func:`~terminusgps.wialon.utils.get_id_from_imei`.
+
+    Takes a Wialon unit's IMEI # and returns its unit id, if it exists.
+
+    :param iccid: A unique id.
+    :type iccid: :py:obj:`str`
+    :param session: A valid Wialon API session.
+    :type session: :py:obj:`~terminusgps.wialon.session.WialonSession`
+    :raises WialonError: If something goes wrong with Wialon.
+    :returns: A Wialon object id, if it was found.
+    :rtype: :py:obj:`str` | :py:obj:`None`
+
+    """
+    return get_id_from_imei(imei=iccid, session=session)
+
+
 def get_wialon_cls(items_type: str) -> typing.Type[WialonBase]:
     """
     Returns a Wialon object class based on items_type.