layrz-sdk 3.1.17__py3-none-any.whl → 3.1.19__py3-none-any.whl

layrz_sdk/entities/device.py

@@ -11,7 +11,10 @@ class Device(BaseModel):
   pk: int = Field(description='Defines the primary key of the device')
   name: str = Field(description='Defines the name of the device')
   ident: str = Field(description='Defines the identifier of the device')
-  protocol_id: int | None = Field(description='Defines the protocol ID of the device')
+  protocol_id: int | None = Field(
+    description='Defines the protocol ID of the device',
+    default=None,
+  )
   protocol: str = Field(description='Defines the protocol of the device')
   is_primary: bool = Field(default=False, description='Defines if the device is the primary device')
 

layrz_sdk/entities/telemetry/assetmessage.py

@@ -15,7 +15,7 @@ else:
   from typing_extensions import Self
 
 from geopy.distance import geodesic
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_serializer
 from shapely.geometry import MultiPoint
 
 from layrz_sdk.constants import UTC
@@ -28,6 +28,14 @@ from layrz_sdk.entities.telemetry.devicemessage import DeviceMessage
 class AssetMessage(BaseModel):
   """Asset message model"""
 
+  model_config = {
+    'json_encoders': {
+      datetime: lambda v: v.timestamp(),
+      timedelta: lambda v: v.total_seconds(),
+      Position: lambda v: json.loads(v.model_dump_json(exclude_none=True)),
+    }
+  }
+
   pk: int | None = Field(
     default=None,
     description='Message ID',
@@ -69,11 +77,21 @@ class AssetMessage(BaseModel):
     description='Timestamp when the message was received',
   )
 
+  @field_serializer('received_at')
+  def serialize_received_at(self: Self, value: datetime) -> float:
+    """Serialize received_at to a timestamp."""
+    return value.timestamp()
+
   elapsed_time: timedelta = Field(
     default_factory=lambda: timedelta(seconds=0),
     description='Elapsed time since the last message',
   )
 
+  @field_serializer('elapsed_time')
+  def serialize_elapsed_time(self: Self, value: timedelta) -> float:
+    """Serialize elapsed_time to total seconds."""
+    return value.total_seconds()
+
   @property
   def datum_gis(self: Self) -> int:
     """Get the GIS datum of the message."""

layrz_sdk/entities/telemetry/devicemessage.py

@@ -15,7 +15,7 @@ if sys.version_info >= (3, 11):
 else:
   from typing_extensions import Self
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_serializer
 
 from layrz_sdk.constants import REJECTED_KEYS, UTC
 from layrz_sdk.entities.device import Device
@@ -59,6 +59,11 @@ class DeviceMessage(BaseModel):
     description='Timestamp when the message was received',
   )
 
+  @field_serializer('received_at')
+  def serialize_received_at(self: Self, value: datetime) -> float:
+    """Serialize received_at to a timestamp."""
+    return value.timestamp()
+
   @property
   def datum_gis(self: Self) -> int:
     """Get the GIS datum of the message."""
@@ -105,7 +110,7 @@ class DeviceMessage(BaseModel):
     return cls(
       ident=device.ident,
       device_id=device.pk,
-      protocol_id=device.protocol_id,
+      protocol_id=device.protocol_id,  # type: ignore
       position=position,
       payload=payload,
       received_at=received_at,

{layrz_sdk-3.1.17.dist-info → layrz_sdk-3.1.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: layrz-sdk
-Version: 3.1.17
+Version: 3.1.19
 Summary: Layrz SDK for Python
 Author-email: "Golden M, Inc." <software@goldenm.com>
 Maintainer-email: Kenny Mochizuki <kenny@goldenm.com>, Luis Reyes <lreyes@goldenm.com>, Kasen Li <kli@goldenm.com>

{layrz_sdk-3.1.17.dist-info → layrz_sdk-3.1.19.dist-info}/RECORD

@@ -15,7 +15,7 @@ layrz_sdk/entities/checkpoint.py,sha256=Y_LduHugWdn3sLvXmiqjaIXnGzoJ5aN_qLCzD9YX
 layrz_sdk/entities/comment.py,sha256=1YSWVxXlpoicVVHv3mvkNlfUTfcOMxZYfb4YmwrxchY,414
 layrz_sdk/entities/custom_field.py,sha256=jurONu01Ph-Qq8uuxdzxoQ6i7BqbZe64vO2ESvQDSFg,277
 layrz_sdk/entities/custom_report_page.py,sha256=eqtoFOgip0z4_cMql1tHgaR4JiVEYlfbzd9ZJ7ZLyrM,1231
-layrz_sdk/entities/device.py,sha256=Caexewu9KHrSholJQBUqNvue6RE7prH1I_11RApJmJ0,705
+layrz_sdk/entities/device.py,sha256=rqBJf0L-cIfxE6ONwGHVx_L0StyQL-ycvSVzug4iIwQ,732
 layrz_sdk/entities/event.py,sha256=cFjFRrKQp4TykPkrCoXy5PYPykcAzrcHtAhRl_V4hdk,754
 layrz_sdk/entities/geofence.py,sha256=jPuG5OCknkM37Q4h5haOXdV4OpVyd4gX77dFjd-FaP4,326
 layrz_sdk/entities/last_message.py,sha256=QNgF0xCQ6uLFDMmKQCjSRhGS1Bq7akw5pv6ZIiFlwfY,268
@@ -72,14 +72,14 @@ layrz_sdk/entities/modbus/schema.py,sha256=gyL0VyGSXTZWzsamjLUGoW5cqhn7MfXisCbH_
 layrz_sdk/entities/modbus/status.py,sha256=VnsWAR7C2dz7Y6_dPCnvS3CBaMaP7odZSu6db2KaTlE,611
 layrz_sdk/entities/modbus/wait.py,sha256=n3p_miYfGde1sxo4OznqWJAOb_WKblOnwFRib3RY_uM,4031
 layrz_sdk/entities/telemetry/__init__.py,sha256=hfyekj-4_iB-aEbw43DXtSuMLBtMR1uoL8vvkRa_nJg,149
-layrz_sdk/entities/telemetry/assetmessage.py,sha256=dChtlZfjlXxB_Ci4nHzaJuZEcoq2LaAI73Vtty3tMxc,4672
-layrz_sdk/entities/telemetry/devicemessage.py,sha256=IHJD-euFFqtex9cPIdS2Qb-_VB2-U78fjCpGJipGYqo,3128
+layrz_sdk/entities/telemetry/assetmessage.py,sha256=ltnJCizwHSyTck0vrbRaf1BfQqlh_8Ckrtc3sGz3psk,5276
+layrz_sdk/entities/telemetry/devicemessage.py,sha256=gR32FnEUbjONcGgAJMEsuum3-LJRcHtOTtQNikkkxYs,3342
 layrz_sdk/helpers/__init__.py,sha256=5iW3z2m3jrYhvTfxX-p-QTkR9X9oTKfEsbtVOg9jFFY,115
 layrz_sdk/helpers/color.py,sha256=dlpMafbM-4Wd9D9hMbbnZJf4ALkpie_ZmBR2Vz_YCmM,1203
 layrz_sdk/lcl/__init__.py,sha256=U967AWANkL3u_YVxMNAYlh8jkZ6hqHfStacz7yz6sOA,89
 layrz_sdk/lcl/core.py,sha256=T80A3hL7SeqRNSfl5SrPAgwIEf-enoAVv9ldwJNzqsA,24786
-layrz_sdk-3.1.17.dist-info/licenses/LICENSE,sha256=d5ZrU--lIPER7QByXDKcrtOTOMk1JvN_9FdYDuoWi7Y,1057
-layrz_sdk-3.1.17.dist-info/METADATA,sha256=poT32kQHJ7rvE2ElvR-pgOTjsYDplM8I_68YOsHgs7k,2053
-layrz_sdk-3.1.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-layrz_sdk-3.1.17.dist-info/top_level.txt,sha256=yUTMMzfdZ0HDWQH5TaSlFM4xtwmP1fSGxmlL1dmu4l4,10
-layrz_sdk-3.1.17.dist-info/RECORD,,
+layrz_sdk-3.1.19.dist-info/licenses/LICENSE,sha256=d5ZrU--lIPER7QByXDKcrtOTOMk1JvN_9FdYDuoWi7Y,1057
+layrz_sdk-3.1.19.dist-info/METADATA,sha256=iz4O8QKcvED_U-mdYhimh0m2zdxFdzBnLOvMtqXi1gI,2053
+layrz_sdk-3.1.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+layrz_sdk-3.1.19.dist-info/top_level.txt,sha256=yUTMMzfdZ0HDWQH5TaSlFM4xtwmP1fSGxmlL1dmu4l4,10
+layrz_sdk-3.1.19.dist-info/RECORD,,