layrz-sdk 4.0.23__py3-none-any.whl → 4.1.8__py3-none-any.whl

layrz_sdk/entities/message.py

@@ -1,9 +1,7 @@
-"""Message entity"""
-
 from datetime import datetime
 from typing import Any
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator
 
 from layrz_sdk.constants import UTC
 from layrz_sdk.entities.geofence import Geofence
@@ -13,13 +11,17 @@ from layrz_sdk.entities.position import Position
 class Message(BaseModel):
   """Message definition"""
 
-  model_config = {
-    'json_encoders': {
-      datetime: lambda v: v.timestamp(),
-    }
-  }
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
 
-  pk: int = Field(..., description='Message ID', alias='id')
+  pk: int = Field(
+    ...,
+    description='Message ID',
+    alias='id',
+  )
   asset_id: int = Field(..., description='Asset ID')
   position: Position = Field(
     default_factory=lambda: Position(),
@@ -38,6 +40,11 @@ class Message(BaseModel):
     description='Timestamp when the message was received',
   )
 
+  @field_serializer('received_at', when_used='always')
+  def serialize_received_at(self, value: datetime) -> float:
+    """Serialize received_at to a timestamp."""
+    return value.timestamp()
+
   geofences: list[Geofence] = Field(
     default_factory=list,
     description='List of geofences associated with the message',

layrz_sdk/entities/modbus/config.py

@@ -1,9 +1,15 @@
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 from .parameter import ModbusParameter
 
 
 class ModbusConfig(BaseModel):
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
+
   port_id: str = Field(
     ...,
     description='Port ID for Modbus communication',

layrz_sdk/entities/modbus/parameter.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 from .schema import ModbusSchema
 
@@ -8,6 +8,12 @@ from .schema import ModbusSchema
 class ModbusParameter(BaseModel):
   """Modbus parameter model"""
 
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
+
   schema_: ModbusSchema = Field(
     ...,
     description='Modbus schema',

layrz_sdk/entities/modbus/wait.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator
 
 from .schema import ModbusSchema
 from .status import ModbusStatus
@@ -9,11 +9,21 @@ from .status import ModbusStatus
 class ModbusWait(BaseModel):
   """Modbus parameter model"""
 
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
+
   status: ModbusStatus = Field(
     ...,
     description='Status of the Modbus command',
   )
 
+  @field_serializer('status', when_used='always')
+  def serialize_status(self, status: ModbusStatus) -> str:
+    return status.value
+
   structure: ModbusSchema = Field(
     ...,
     description='Modbus structure schema',

layrz_sdk/entities/notification_type.py

@@ -1,5 +1,3 @@
-"""Twilio Notification Type Enum"""
-
 from enum import StrEnum
 from typing import Self
 

layrz_sdk/entities/operation.py

@@ -1,9 +1,7 @@
-"""Operation entity"""
-
-from datetime import time, timedelta
+from datetime import timedelta
 from typing import Any, Self
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator
 
 from .destination_phone import DestinationPhone
 from .notification_type import TwilioNotificationType
@@ -17,18 +15,16 @@ from .timezone import Timezone
 class Operation(BaseModel):
   """Operation entity"""
 
-  model_config = {
-    'json_encoders': {
-      timedelta: lambda v: v.total_seconds(),
-      OperationType: lambda v: v.value,
-      HttpRequestType: lambda v: v.value,
-      TwilioNotificationType: lambda v: v.value,
-      SoundEffect: lambda v: v.value,
-      Platform: lambda v: v.value,
-    },
-  }
-
-  pk: int = Field(description='Defines the primary key of the trigger', alias='id')
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
+
+  pk: int = Field(
+    description='Defines the primary key of the trigger',
+    alias='id',
+  )
   name: str = Field(description='Defines the name of the trigger')
 
   cooldown_time: timedelta = Field(
@@ -36,11 +32,19 @@ class Operation(BaseModel):
     description='Defines the cooldown time of the trigger',
   )
 
+  @field_serializer('cooldown_time', when_used='always')
+  def serialize_cooldown_time(self, value: timedelta) -> float:
+    return value.total_seconds()
+
   operation_type: OperationType = Field(
     ...,
     description='Defines the kind of the operation',
   )
 
+  @field_serializer('operation_type', when_used='always')
+  def serialize_operation_type(self, value: OperationType) -> str:
+    return value.value
+
   @property
   def kind(self: Self) -> OperationType:
     """Get the kind of the operation"""
@@ -51,6 +55,10 @@ class Operation(BaseModel):
     description='Defines the HTTP method of the operation',
   )
 
+  @field_serializer('request_type', when_used='always')
+  def serialize_request_type(self, value: HttpRequestType | None) -> str | None:
+    return value.value if value else None
+
   @property
   def http_method(self: Self) -> HttpRequestType | None:
     """Get the HTTP method of the operation"""
@@ -125,6 +133,11 @@ class Operation(BaseModel):
     description='Defines the Twilio notification type of the operation',
   )
 
+  @field_serializer('notification_type', when_used='always')
+  def serialize_notification_type(self, value: TwilioNotificationType) -> str:
+    """Serialize notification_type to its value."""
+    return value.value
+
   @property
   def twilio_notification_type(self: Self) -> TwilioNotificationType:
     """Get the Twilio notification type of the operation"""
@@ -201,6 +214,10 @@ class Operation(BaseModel):
     description='Defines the sound effect for the operation',
   )
 
+  @field_serializer('sound_effect', when_used='always')
+  def serialize_sound_effect(self, value: SoundEffect) -> str:
+    return value.value
+
   sound_effect_uri: str | None = Field(
     default=None,
     description='Defines the URI for the sound effect of the operation. Only when sound_effect is set to CUSTOM.',
@@ -211,6 +228,10 @@ class Operation(BaseModel):
     description='Defines the duration of the operation',
   )
 
+  @field_serializer('duration', when_used='always')
+  def serialize_duration(self, value: timedelta | None) -> float | None:
+    return value.total_seconds() if value else None
+
   @field_validator('duration', mode='before')
   def validate_duration(cls, value: Any) -> timedelta:
     if value is None:

layrz_sdk/entities/operation_case_payload.py

@@ -1,9 +1,7 @@
-"""Operation case payload entity"""
-
 from datetime import datetime, timedelta
 from typing import Any
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator
 
 from layrz_sdk.constants import UTC
 from layrz_sdk.entities.trigger import Trigger
@@ -12,7 +10,17 @@ from layrz_sdk.entities.trigger import Trigger
 class OperationCaseCommentPayload(BaseModel):
   """Operation case comment payload entity"""
 
-  pk: int = Field(..., description='Defines the primary key of the operation case comment', alias='id')
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
+
+  pk: int = Field(
+    ...,
+    description='Defines the primary key of the operation case comment',
+    alias='id',
+  )
   user: str = Field(..., description='Defines the user who created the operation case comment')
   content: str = Field(..., description='Defines the content of the operation case comment')
   created_at: datetime = Field(
@@ -20,28 +28,42 @@ class OperationCaseCommentPayload(BaseModel):
     description='Defines the creation date of the operation case comment',
   )
 
+  @field_serializer('created_at', when_used='always')
+  def serialize_created_at(self, created_at: datetime) -> float:
+    return created_at.timestamp()
+
 
 class OperationCasePayload(BaseModel):
   """Operation case payload entity"""
 
-  model_config = {
-    'json_encoders': {
-      timedelta: lambda v: v.total_seconds(),
-      datetime: lambda v: v.timestamp(),
-      Trigger: lambda v: v.model_dump(by_alias=True, exclude_none=True),
-    },
-  }
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
 
-  pk: int = Field(description='Defines the primary key of the operation case payload', alias='id')
+  pk: int = Field(
+    description='Defines the primary key of the operation case payload',
+    alias='id',
+  )
   created_at: datetime = Field(
     default_factory=lambda: datetime.now(UTC),
     description='Defines the creation date of the operation case payload',
   )
+
+  @field_serializer('created_at', when_used='always')
+  def serialize_created_at(self, created_at: datetime) -> float:
+    return created_at.timestamp()
+
   updated_at: datetime = Field(
     default_factory=lambda: datetime.now(UTC),
     description='Defines the last update date of the operation case payload',
   )
 
+  @field_serializer('updated_at', when_used='always')
+  def serialize_updated_at(self, updated_at: datetime) -> float:
+    return updated_at.timestamp()
+
   trigger: Trigger = Field(
     ...,
     description='Defines the trigger associated with the operation case payload',
@@ -52,7 +74,7 @@ class OperationCasePayload(BaseModel):
     """Serialize trigger to a dictionary"""
     if isinstance(value, Trigger):
       return Trigger(
-        id=value.pk,
+        id=value.pk,  # ty: ignore
         name=value.name,
         code=value.code,
       )
@@ -71,6 +93,10 @@ class OperationCasePayload(BaseModel):
     description='Defines the creation date of the file associated with the operation case payload',
   )
 
+  @field_serializer('file_created_at', when_used='always')
+  def serialize_file_created_at(self, file_created_at: datetime | None) -> float | None:
+    return file_created_at.timestamp() if file_created_at else None
+
   comment: OperationCaseCommentPayload | None = Field(
     default=None,
     description='Defines the comment associated with the operation case payload',

layrz_sdk/entities/operation_payload.py

@@ -1,13 +1,12 @@
-"""Operation Payload entity"""
-
 from datetime import datetime, timedelta
-from typing import Any, Self
+from typing import Any
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_serializer, field_validator
 
 from layrz_sdk.entities.asset import Asset
 from layrz_sdk.entities.destination_phone import DestinationPhone
 from layrz_sdk.entities.geofence import Geofence
+from layrz_sdk.entities.locator import Locator
 from layrz_sdk.entities.notification_type import TwilioNotificationType
 from layrz_sdk.entities.operation import Operation
 from layrz_sdk.entities.operation_case_payload import OperationCasePayload
@@ -22,22 +21,11 @@ from layrz_sdk.entities.trigger import Trigger
 class OperationPayload(BaseModel):
   """Operation Payload entity"""
 
-  model_config = {
-    'json_encoders': {
-      timedelta: lambda v: v.total_seconds(),
-      datetime: lambda v: v.timestamp(),
-      Asset: lambda v: v.model_dump(by_alias=True, exclude_none=True),
-      Trigger: lambda v: v.model_dump(by_alias=True, exclude_none=True),
-      Operation: lambda v: v.model_dump(by_alias=True, exclude_none=True),
-      Geofence: lambda v: v.model_dump(by_alias=True, exclude_none=True),
-      OperationType: lambda v: v.value,
-      HttpRequestType: lambda v: v.value,
-      TwilioNotificationType: lambda v: v.value,
-      SoundEffect: lambda v: v.value,
-      Platform: lambda v: v.value,
-      PresenceType: lambda v: v.value,
-    },
-  }
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
 
   kind: OperationType = Field(
     ...,
@@ -45,14 +33,18 @@ class OperationPayload(BaseModel):
     alias='operationType',
   )
 
+  @field_serializer('kind', when_used='always')
+  def serialize_kind(self, value: OperationType) -> str:
+    return value.value
+
   asset: Asset = Field(..., description='Defines the asset associated with the operation')
 
   @field_validator('asset', mode='before')
-  def serialize_asset(cls, value: Any) -> Asset:
+  def validate_asset(cls, value: Any) -> Asset:
     """Serialize asset to a dictionary"""
     if isinstance(value, Asset):
       return Asset(
-        id=value.pk,
+        id=value.pk,  # ty: ignore
         name=value.name,
         operation_mode=value.operation_mode,
         vin=value.vin,
@@ -69,11 +61,11 @@ class OperationPayload(BaseModel):
   trigger: Trigger = Field(..., description='Defines the trigger associated with the operation')
 
   @field_validator('trigger', mode='before')
-  def serialize_trigger(cls, value: Any) -> Trigger:
+  def validate_trigger(cls, value: Any) -> Trigger:
     """Serialize trigger to a dictionary"""
     if isinstance(value, Trigger):
       return Trigger(
-        id=value.pk,
+        id=value.pk,  # ty: ignore
         name=value.name,
         code=value.code,
       )
@@ -86,11 +78,11 @@ class OperationPayload(BaseModel):
   operation: Operation = Field(..., description='Defines the operation associated with the payload')
 
   @field_validator('operation', mode='before')
-  def serialize_operation(cls, value: Any) -> Operation:
+  def validate_operation(cls, value: Any) -> Operation:
     """Serialize operation to a dictionary"""
     if isinstance(value, Operation):
       return Operation(
-        id=value.pk,
+        id=value.pk,  # ty: ignore
         name=value.name,
         operation_type=value.kind,
         timezone=value.timezone,
@@ -107,6 +99,10 @@ class OperationPayload(BaseModel):
     alias='activatedAt',
   )
 
+  @field_serializer('activated_at', when_used='always')
+  def serialize_activated_at(self, value: datetime) -> float:
+    return value.timestamp()
+
   position: dict[str, Any] = Field(
     default_factory=dict,
     description='Defines the position of the operation',
@@ -128,6 +124,10 @@ class OperationPayload(BaseModel):
     alias='presenceType',
   )
 
+  @field_serializer('presence_type', when_used='always')
+  def serialize_presence_type(self, value: PresenceType | None) -> Any:
+    return value.value if value else None
+
   case_: OperationCasePayload | None = Field(
     default=None,
     description='Defines the case of the operation',
@@ -167,6 +167,11 @@ class OperationPayload(BaseModel):
     description='Defines the HTTP method of the operation',
     alias='method',
   )
+
+  @field_serializer('http_method', when_used='always')
+  def serialize_http_method(self, value: HttpRequestType | None) -> Any:
+    return value.value if value else None
+
   http_headers: list[dict[str, Any]] = Field(
     default_factory=list,
     description='Defines the headers of the operation',
@@ -221,12 +226,27 @@ class OperationPayload(BaseModel):
     alias='hostPhone',
   )
 
+  @field_validator('twilio_host_phone', mode='before')
+  def serialize_twilio_host_phone(cls, value: Any) -> DestinationPhone | None:
+    """Serialize host phone to a DestinationPhone"""
+    if isinstance(value, DestinationPhone):
+      return value
+
+    if isinstance(value, dict):
+      return DestinationPhone.model_validate(value)
+
+    return None
+
   twilio_notification_type: TwilioNotificationType = Field(
     default=TwilioNotificationType.SMS,
     description='Defines the Twilio notification type of the operation',
     alias='notificationType',
   )
 
+  @field_serializer('twilio_notification_type', when_used='always')
+  def serialize_twilio_notification_type(self, value: TwilioNotificationType) -> str:
+    return value.value
+
   username: str | None = Field(
     default=None,
     description='Defines the username for the operation',
@@ -262,6 +282,10 @@ class OperationPayload(BaseModel):
     alias='pushPlatforms',
   )
 
+  @field_serializer('push_platforms', when_used='always')
+  def serialize_push_platforms(self, value: list[Platform]) -> list[str]:
+    return [platform.value for platform in value]
+
   ## For usage of In-app notifications operations
   destinations_ids: list[int] = Field(
     default_factory=list,
@@ -274,6 +298,10 @@ class OperationPayload(BaseModel):
     alias='soundEffect',
   )
 
+  @field_serializer('sound_effect', when_used='always')
+  def serialize_sound_effect(self, value: SoundEffect) -> str:
+    return value.value
+
   sound_effect_uri: str | None = Field(
     default=None,
     description='Defines the sound effect URI for the operation',
@@ -301,3 +329,12 @@ class OperationPayload(BaseModel):
     if isinstance(value, (int, float)):
       return timedelta(seconds=value)
     return timedelta(seconds=0)
+
+  @field_serializer('duration', when_used='always')
+  def serialize_duration(self, value: timedelta) -> float:
+    return value.total_seconds()
+
+  locator: Locator | None = Field(
+    default=None,
+    description='Defines the generated locator for the operation',
+  )

layrz_sdk/entities/operation_type.py

@@ -1,5 +1,3 @@
-"""Operation type"""
-
 from enum import StrEnum
 from typing import Self
 

layrz_sdk/entities/outbound_service.py

@@ -1,14 +1,21 @@
-"""Service entity"""
-
 from typing import Any
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 
 class OutboundService(BaseModel):
   """Outbound service definition"""
 
-  pk: int = Field(description='Service ID', alias='id')
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
+
+  pk: int = Field(
+    description='Service ID',
+    alias='id',
+  )
   name: str = Field(description='Service name')
 
   protocol_name: str | None = Field(

layrz_sdk/entities/parameter_update.py

@@ -0,0 +1,25 @@
+from datetime import datetime
+from typing import Any
+
+from pydantic import BaseModel, Field, field_serializer, field_validator
+
+
+class ParamData(BaseModel):
+  value: Any | None = Field(default=None, description='The current value of the parameter.')
+  updated_at: datetime = Field(..., description='The timestamp when the parameter was updated.')
+
+  @field_serializer('updated_at', when_used='always')
+  def serialize_updated_at(self, value: datetime) -> float:
+    return value.timestamp()
+
+
+class ParameterUpdate(BaseModel):
+  asset_id: int = Field(..., description='The unique identifier for the asset.')
+  parameters: dict[str, ParamData] = Field(
+    default_factory=dict,
+    description='A mapping of parameter names to their data.',
+  )
+
+  @field_validator('parameters', mode='before')
+  def validate_parameter(cls, value: dict[str, Any]) -> dict[str, Any]:
+    return {k.replace('__', '.'): v for k, v in value.items()}

layrz_sdk/entities/platform.py

@@ -1,5 +1,3 @@
-"""Platform"""
-
 from enum import StrEnum
 from typing import Self
 

layrz_sdk/entities/position.py

@@ -1,13 +1,17 @@
-"""Position entity"""
-
 from typing import Any, Self, cast
 
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 
 class Position(BaseModel):
   """Geographic position definition"""
 
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
+
   latitude: float | None = Field(default=None, description='Defines the latitude of the position')
   longitude: float | None = Field(default=None, description='Defines the longitude of the position')
   altitude: float | None = Field(default=None, description='Defines the altitude of the position')

layrz_sdk/entities/preset.py

@@ -1,25 +1,31 @@
-"""Preset entity"""
-
 from datetime import datetime
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field, field_serializer
 
 
 class Preset(BaseModel):
   """Preset entity"""
 
-  model_config = {
-    'json_encoders': {
-      datetime: lambda v: v.timestamp(),
-    },
-  }
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
 
-  pk: int = Field(description='Defines the primary key of the preset', alias='id')
+  pk: int = Field(
+    description='Defines the primary key of the preset',
+    alias='id',
+  )
   name: str = Field(description='Defines the name of the preset')
   valid_before: datetime = Field(
     ...,
     description='Defines the date and time before which the preset is valid',
   )
+
+  @field_serializer('valid_before', when_used='always')
+  def serialize_valid_before(self, valid_before: datetime) -> float:
+    return valid_before.timestamp()
+
   comment: str = Field(
     default='',
     description='Defines the comment of the preset',

layrz_sdk/entities/report.py

@@ -1,5 +1,3 @@
-"""Report class"""
-
 import logging
 import os
 import time
@@ -8,7 +6,7 @@ from pathlib import Path
 from typing import Any, Optional, Self
 
 import xlsxwriter
-from pydantic import BaseModel, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 
 from layrz_sdk.entities.custom_report_page import CustomReportPage
 from layrz_sdk.entities.report_data_type import ReportDataType
@@ -22,6 +20,12 @@ log = logging.getLogger(__name__)
 class Report(BaseModel):
   """Report definition"""
 
+  model_config = ConfigDict(
+    validate_by_name=False,
+    validate_by_alias=True,
+    serialize_by_alias=True,
+  )
+
   name: str = Field(description='Name of the report. Length should be less than 60 characters')
   pages: list[ReportPage | CustomReportPage] = Field(
     description='List of report pages',
@@ -113,10 +117,10 @@ class Report(BaseModel):
         for cell in row.content:
           cells.append(
             {
-              'content': cell.content,
+              'content': cell.content.timestamp() if cell.data_type == ReportDataType.DATETIME else cell.content,
               'text_color': '#000000' if use_black(cell.color) else '#ffffff',
               'color': cell.color,
-              'data_type': cell.data_type.value,
+              'data_type': cell.data_type.name,
             }
           )
         rows.append(