layrz-sdk 3.1.18__tar.gz → 3.1.20__tar.gz

{layrz_sdk-3.1.18 → layrz_sdk-3.1.20}/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 3.1.20
+
+- Fixed condition of `StrEnum` on Python 3.11, for versions below 3.11 it will use `strenum.StrEnum` instead of `enum.StrEnum`
+
+## 3.1.19
+
+- Added serializers for messages
+
+## 3.1.18
+
+- Fixes
+
+## 3.1.17
+
+- Fixes
+
 ## 3.1.16
 
 - Added `primary_id` into `Asset`

{layrz_sdk-3.1.18/layrz_sdk.egg-info → layrz_sdk-3.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: layrz-sdk
-Version: 3.1.18
+Version: 3.1.20
 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>
@@ -26,6 +26,7 @@ Requires-Dist: pydantic>=2.10.6
 Requires-Dist: typing-extensions>=4.10.0
 Requires-Dist: geopy>=2.4.1
 Requires-Dist: shapely>=2.1.1
+Requires-Dist: strenum>=0.4.15
 Dynamic: license-file
 
 # Layrz SDK

{layrz_sdk-3.1.18 → layrz_sdk-3.1.20}/layrz_sdk/entities/modbus/schema.py

@@ -1,4 +1,9 @@
-from enum import StrEnum
+import sys
+
+if sys.version_info >= (3, 11):
+  from enum import StrEnum
+else:
+  from strenum import StrEnum
 
 
 class ModbusSchema(StrEnum):

{layrz_sdk-3.1.18 → layrz_sdk-3.1.20}/layrz_sdk/entities/modbus/status.py

@@ -1,4 +1,9 @@
-from enum import StrEnum
+import sys
+
+if sys.version_info >= (3, 11):
+  from enum import StrEnum
+else:
+  from strenum import StrEnum
 
 
 class ModbusStatus(StrEnum):

{layrz_sdk-3.1.18 → layrz_sdk-3.1.20}/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-3.1.18 → layrz_sdk-3.1.20}/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.18 → layrz_sdk-3.1.20/layrz_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: layrz-sdk
-Version: 3.1.18
+Version: 3.1.20
 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>
@@ -26,6 +26,7 @@ Requires-Dist: pydantic>=2.10.6
 Requires-Dist: typing-extensions>=4.10.0
 Requires-Dist: geopy>=2.4.1
 Requires-Dist: shapely>=2.1.1
+Requires-Dist: strenum>=0.4.15
 Dynamic: license-file
 
 # Layrz SDK

{layrz_sdk-3.1.18 → layrz_sdk-3.1.20}/layrz_sdk.egg-info/requires.txt

@@ -5,3 +5,4 @@ pydantic>=2.10.6
 typing-extensions>=4.10.0
 geopy>=2.4.1
 shapely>=2.1.1
+strenum>=0.4.15

{layrz_sdk-3.1.18 → layrz_sdk-3.1.20}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "layrz-sdk"
-version = "3.1.18"
+version = "3.1.20"
 description = "Layrz SDK for Python"
 authors = [
   {name = "Golden M, Inc.", email = "software@goldenm.com"}
@@ -42,6 +42,7 @@ dependencies = [
   "typing-extensions>=4.10.0",
   "geopy>=2.4.1",
   "shapely>=2.1.1",
+  "strenum>=0.4.15",
 ]
 
 [project.urls]

{layrz_sdk-3.1.18 → layrz_sdk-3.1.20}/uv.lock

@@ -343,13 +343,14 @@ wheels = [
 
 [[package]]
 name = "layrz-sdk"
-version = "3.1.18"
+version = "3.1.20"
 source = { editable = "." }
 dependencies = [
     { name = "geopy" },
     { name = "pydantic" },
     { name = "requests" },
     { name = "shapely" },
+    { name = "strenum" },
     { name = "typing-extensions" },
     { name = "tzdata" },
     { name = "xlsxwriter" },
@@ -371,6 +372,7 @@ requires-dist = [
     { name = "pydantic", specifier = ">=2.10.6" },
     { name = "requests" },
     { name = "shapely", specifier = ">=2.1.1" },
+    { name = "strenum", specifier = ">=0.4.15" },
     { name = "typing-extensions", specifier = ">=4.10.0" },
     { name = "tzdata" },
     { name = "xlsxwriter" },
@@ -943,6 +945,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/ea/f1/5e9b3ba5c7aa7ebfaf269657e728067d16a7c99401c7973ddf5f0cf121bd/shapely-2.1.1-cp313-cp313t-win_amd64.whl", hash = "sha256:8cb8f17c377260452e9d7720eeaf59082c5f8ea48cf104524d953e5d36d4bdb7", size = 1723061, upload-time = "2025-05-19T11:04:40.082Z" },
 ]
 
+[[package]]
+name = "strenum"
+version = "0.4.15"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/85/ad/430fb60d90e1d112a62ff57bdd1f286ec73a2a0331272febfddd21f330e1/StrEnum-0.4.15.tar.gz", hash = "sha256:878fb5ab705442070e4dd1929bb5e2249511c0bcf2b0eeacf3bcd80875c82eff", size = 23384, upload-time = "2023-06-29T22:02:58.399Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/81/69/297302c5f5f59c862faa31e6cb9a4cd74721cd1e052b38e464c5b402df8b/StrEnum-0.4.15-py3-none-any.whl", hash = "sha256:a30cda4af7cc6b5bf52c8055bc4bf4b2b6b14a93b574626da33df53cf7740659", size = 8851, upload-time = "2023-06-29T22:02:56.947Z" },
+]
+
 [[package]]
 name = "tomli"
 version = "2.2.1"