layrz-sdk 3.0.10__py3-none-any.whl → 3.0.12__py3-none-any.whl

layrz_sdk/entities/__init__.py

@@ -1,4 +1,5 @@
-""" Init file """
+"""Init file"""
+
 # Broadcast entities
 from .broadcasts import BroadcastRequest, BroadcastResponse, BroadcastResult, BroadcastStatus, OutboundService
 
@@ -7,41 +8,41 @@ from .cases import Case, CaseIgnoredStatus, CaseStatus, Comment, Trigger
 
 # Charts entities
 from .charts import (
-                     AreaChart,
-                     AxisConfig,
-                     BarChart,
-                     ChartAlignment,
-                     ChartColor,
-                     ChartConfiguration,
-                     ChartDataSerie,
-                     ChartDataSerieType,
-                     ChartDataType,
-                     ChartException,
-                     ChartRenderTechnology,
-                     ColumnChart,
-                     HTMLChart,
-                     LineChart,
-                     MapCenterType,
-                     MapChart,
-                     MapPoint,
-                     NumberChart,
-                     PieChart,
-                     RadarChart,
-                     RadialBarChart,
-                     ScatterChart,
-                     ScatterSerie,
-                     ScatterSerieItem,
-                     TableChart,
-                     TableHeader,
-                     TableRow,
-                     TimelineChart,
-                     TimelineSerie,
-                     TimelineSerieItem,
-                     get_color_list,
+  AreaChart,
+  AxisConfig,
+  BarChart,
+  ChartAlignment,
+  ChartColor,
+  ChartConfiguration,
+  ChartDataSerie,
+  ChartDataSerieType,
+  ChartDataType,
+  ChartException,
+  ChartRenderTechnology,
+  ColumnChart,
+  HTMLChart,
+  LineChart,
+  MapCenterType,
+  MapChart,
+  MapPoint,
+  NumberChart,
+  PieChart,
+  RadarChart,
+  RadialBarChart,
+  ScatterChart,
+  ScatterSerie,
+  ScatterSerieItem,
+  TableChart,
+  TableHeader,
+  TableRow,
+  TimelineChart,
+  TimelineSerie,
+  TimelineSerieItem,
+  get_color_list,
 )
 
 # Checkpoints entities
-from .checkpoints import Checkpoint, Geofence, Waypoint
+from .checkpoints import Checkpoint, Waypoint
 
 # Events entities
 from .events import Event
@@ -50,22 +51,22 @@ from .events import Event
 from .formatting import TextAlignment
 
 # General entities
-from .general import Asset, AssetOperationMode, CustomField, Device, Sensor, User
+from .general import Asset, AssetOperationMode, CustomField, Device, Geofence, PresenceType, Sensor, User
 
 # REPCOM entities
 from .repcom import Transaction
 
 # Reports entities
 from .reports import (
-                     CustomReportPage,
-                     Report,
-                     ReportCol,
-                     ReportConfiguration,
-                     ReportDataType,
-                     ReportFormat,
-                     ReportHeader,
-                     ReportPage,
-                     ReportRow,
+  CustomReportPage,
+  Report,
+  ReportCol,
+  ReportConfiguration,
+  ReportDataType,
+  ReportFormat,
+  ReportHeader,
+  ReportPage,
+  ReportRow,
 )
 
 # Telemetry entities

layrz_sdk/entities/checkpoints/__init__.py

@@ -1,4 +1,4 @@
-""" Checkpoints entities """
+"""Checkpoints entities"""
+
 from .checkpoint import Checkpoint
-from .geofence import Geofence
 from .waypoint import Waypoint

layrz_sdk/entities/checkpoints/waypoint.py

@@ -2,7 +2,7 @@
 
 from datetime import datetime
 
-from .geofence import Geofence
+from layrz_sdk.entities.general.geofence import Geofence
 
 
 class Waypoint:

layrz_sdk/entities/events/event.py

@@ -3,6 +3,7 @@
 from datetime import datetime
 
 from layrz_sdk.entities.cases.trigger import Trigger
+from layrz_sdk.entities.general.geofence import Geofence, PresenceType
 from layrz_sdk.entities.telemetry.message import Message
 
 
@@ -17,6 +18,8 @@ class Event:
     asset_id : ID of the Asset owner of the event
     message : Telemetry information of the event
     activated_at : Reception/triggered at
+    geofence : Geofence where the event occurred
+    presence_type : Presence type of the event
   """
 
   def __init__(
@@ -26,6 +29,8 @@ class Event:
     asset_id: int,
     message: Message,
     activated_at: datetime,
+    geofence: Geofence | None = None,
+    presence_type: PresenceType | None = None,
   ) -> None:
     """Constructor"""
     self.pk = pk
@@ -33,6 +38,8 @@ class Event:
     self.asset_id = asset_id
     self.message = message
     self.activated_at = activated_at
+    self.geofence = geofence
+    self.presence_type = presence_type
 
   @property
   def _readable(self) -> str | None | bool:

layrz_sdk/entities/general/__init__.py

@@ -1,7 +1,9 @@
-""" General entities """
+"""General entities"""
+
 from .asset import Asset
 from .asset_operation_mode import AssetOperationMode
 from .custom_field import CustomField
 from .device import Device
+from .geofence import Geofence, PresenceType
 from .sensor import Sensor
 from .user import User

layrz_sdk/entities/{checkpoints → general}/geofence.py

@@ -1,5 +1,7 @@
 """Geofence entity"""
 
+from enum import Enum
+
 
 class Geofence:
   """
@@ -29,3 +31,23 @@ class Geofence:
   def __repr__(self) -> str | None | bool:
     """Readable property"""
     return self._readable
+
+
+class PresenceType(Enum):
+  """Presence type enum"""
+
+  ENTRANCE = 'ENTRANCE'
+  EXIT = 'EXIT'
+
+  @property
+  def _readable(self) -> str | None | bool:
+    """Readable"""
+    return f'PresenceType.{self.value}'
+
+  def __str__(self) -> str | None | bool:
+    """Readable property"""
+    return self._readable
+
+  def __repr__(self) -> str | None | bool:
+    """Readable property"""
+    return self._readable

layrz_sdk/lcl/core.py

@@ -13,7 +13,7 @@ INVALID_ARGUMENTS = 'Invalid arguments - {e}'
 class LclCore:
   """Layrz Compute Language SDK"""
 
-  def __init__(  # pylint: disable=dangerous-default-value
+  def __init__(
     self,
     script: str = '',
     sensors: Dict = None,
@@ -40,7 +40,7 @@ class LclCore:
     self._custom_fields = custom_fields
     self._script = script
 
-  def perform(  # pylint: disable=dangerous-default-value, invalid-name
+  def perform(
     self,
     additional_globals: Dict = None,
     additional_locals: Dict = None,
@@ -122,14 +122,26 @@ class LclCore:
 
       import json
 
-      result = json.dumps(eval(self._script, global_functions, local_variables))  # pylint: disable=eval-used
+      result = json.dumps(eval(self._script, global_functions, local_variables))
 
       return result
-    except Exception as err:  # pylint: disable=broad-except
+    except Exception as err:
       import json
 
       return json.dumps(INVALID_ARGUMENTS.format(e=err))
 
+  def _standarize_datatypes(self, args: List[Any]) -> List[Any]:
+    """Standarize data types"""
+    result_args = []
+
+    for arg in args:
+      if isinstance(arg, (float, int)):
+        result_args.append(float(arg))
+      else:
+        result_args.append(arg)
+
+    return result_args
+
   def GET_PARAM(self, *args: List[Any]) -> Any:
     """GET_PARAM Function"""
     if len(args) > 2:
@@ -198,6 +210,8 @@ class LclCore:
     if args[0] is None or args[1] is None:
       return None
 
+    args = self._standarize_datatypes(args)
+
     if not isinstance(args[0], type(args[1])):
       return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] == args[1]
@@ -241,7 +255,7 @@ class LclCore:
 
       try:
         result += float(num)
-      except Exception:  # pylint: disable=broad-except
+      except Exception:
         pass
 
     return result
@@ -261,7 +275,7 @@ class LclCore:
           is_first = False
         else:
           result -= float(num)
-      except Exception:  # pylint: disable=broad-except
+      except Exception:
         pass
 
     return result
@@ -281,7 +295,7 @@ class LclCore:
           result = float(num)
         else:
           result *= float(num)
-      except Exception:  # pylint: disable=broad-except
+      except Exception:
         pass
 
     return result
@@ -301,7 +315,7 @@ class LclCore:
           result = float(num)
         else:
           result /= float(num)
-      except Exception:  # pylint: disable=broad-except
+      except Exception:
         pass
 
     return result
@@ -435,6 +449,8 @@ class LclCore:
     if args[0] is None or args[1] is None:
       return None
 
+    args = self._standarize_datatypes(args)
+
     if not isinstance(args[0], type(args[1])):
       return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] >= args[1]
@@ -449,6 +465,8 @@ class LclCore:
     if args[0] is None or args[1] is None:
       return None
 
+    args = self._standarize_datatypes(args)
+
     if not isinstance(args[0], type(args[1])):
       return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] > args[1]
@@ -463,6 +481,8 @@ class LclCore:
     if args[0] is None or args[1] is None:
       return None
 
+    args = self._standarize_datatypes(args)
+
     if not isinstance(args[0], type(args[1])):
       return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] <= args[1]
@@ -477,6 +497,8 @@ class LclCore:
     if args[0] is None or args[1] is None:
       return None
 
+    args = self._standarize_datatypes(args)
+
     if not isinstance(args[0], type(args[1])):
       return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] < args[1]
@@ -491,6 +513,8 @@ class LclCore:
     if args[0] is None or args[1] is None:
       return None
 
+    args = self._standarize_datatypes(args)
+
     if not isinstance(args[0], type(args[1])):
       return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] != args[1]
@@ -510,7 +534,7 @@ class LclCore:
     try:
       byte_array = bytes.fromhex(hexa)
       return byte_array.decode('ASCII')
-    except Exception:  # pylint: disable=broad-except
+    except Exception:
       return 'Invalid hex string'
 
   def STR_TO_HEX(self, *args: List[Any]) -> str | None:
@@ -533,7 +557,7 @@ class LclCore:
 
     try:
       return int(int(args[0], 16))
-    except Exception:  # pylint: disable=broad-except
+    except Exception:
       return 'Invalid hex string'
 
   def INT_TO_HEX(self, *args: List[Any]) -> str | None:
@@ -546,7 +570,7 @@ class LclCore:
 
     try:
       return hex(int(args[0]))[2:]
-    except Exception:  # pylint: disable=broad-except
+    except Exception:
       return 'Invalid int value'
 
   def TO_FLOAT(self, *args: List[Any]) -> str | None | float:
@@ -559,7 +583,7 @@ class LclCore:
 
     try:
       return float(args[0])
-    except Exception:  # pylint: disable=broad-except
+    except Exception:
       return f'Invalid arguments - must be real number, not {type(args[0]).__name__}'
 
   def IS_PARAMETER_PRESENT(self, *args: List[Any]) -> str | bool:
@@ -590,6 +614,8 @@ class LclCore:
     if args[0] is None or args[1] is None or args[2] is None:
       return None
 
+    args = self._standarize_datatypes(args)
+
     if not isinstance(args[0], type(args[1])):
       return DIFFERENT_TYPES_RANGES.format(
         arg1=type(args[0]).__name__,
@@ -607,6 +633,8 @@ class LclCore:
     if args[0] is None or args[1] is None or args[2] is None:
       return None
 
+    args = self._standarize_datatypes(args)
+
     if not isinstance(args[0], type(args[1])):
       return DIFFERENT_TYPES_RANGES.format(
         arg1=type(args[0]).__name__,

{layrz_sdk-3.0.10.dist-info → layrz_sdk-3.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: layrz-sdk
-Version: 3.0.10
+Version: 3.0.12
 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>
@@ -17,6 +17,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: xlsxwriter
+Requires-Dist: tzdata
 
 # Layrz SDK
 

{layrz_sdk-3.0.10.dist-info → layrz_sdk-3.0.12.dist-info}/RECORD

@@ -1,5 +1,5 @@
 layrz_sdk/__init__.py,sha256=OutylN0QazaeDVIA5NRDVyzwfYnZkAwVQzT-2F6iX2M,28
-layrz_sdk/entities/__init__.py,sha256=osv4J4OF2eIxe_h5u17y7nisdtNzluMD2L0xLpA05mI,2135
+layrz_sdk/entities/__init__.py,sha256=Tlzwpbb4g75ny_ustZd3XSIeIynAkKe5llnFjhdvJgw,1388
 layrz_sdk/entities/broadcasts/__init__.py,sha256=E-Mmr-UjpD5Jxkut4UX7XMqi6IUEYxb_5NP3xyDM_cg,215
 layrz_sdk/entities/broadcasts/request.py,sha256=7r6-68ies6l5F0lVVpYg2aI2uTtn9UkK5yND3rrutLs,631
 layrz_sdk/entities/broadcasts/response.py,sha256=_LDggLwSGsuG0EAAwQqSIMmNu_WA3eL7S77-_HFHeRA,664
@@ -31,19 +31,19 @@ layrz_sdk/entities/charts/serie.py,sha256=xAEegIPBqg4opfZxpwVfPbNQNhgatjs6tAn-mv
 layrz_sdk/entities/charts/serie_type.py,sha256=P7FnH7vugn8IxOIqPk86POr0DNnWb9YLNROVxwNby3E,499
 layrz_sdk/entities/charts/table.py,sha256=G-MQu9UBDZGnG_AvcOqY-MOXgrQ87E4myUgRHX6g3rE,1631
 layrz_sdk/entities/charts/timeline.py,sha256=Udyv7Fe9_5MYinazRRpIKxzWl0q9Gw5I4XghXrTEqpM,3911
-layrz_sdk/entities/checkpoints/__init__.py,sha256=Bn_L1GbWcWUuBDpSVHKDqpjGYeIWDbPNI-_OnD-jrJQ,126
+layrz_sdk/entities/checkpoints/__init__.py,sha256=LcSyaEJBaaGwvovNZ4ti_YGV2LoU3L7P2zUD7lBW5Cs,94
 layrz_sdk/entities/checkpoints/checkpoint.py,sha256=WtrwLZQy8Rf4czhDnpc1KsVNrL0tG8zQDYwEoFdcShk,1105
-layrz_sdk/entities/checkpoints/geofence.py,sha256=VWgfSoz6D1wshjK9w35Rnxg6_OhcIPKjInt0HTztzog,685
-layrz_sdk/entities/checkpoints/waypoint.py,sha256=WH8460Pd3SLXLViel4VqAiXGCq1WDlsxVBDxshhh_p8,1277
+layrz_sdk/entities/checkpoints/waypoint.py,sha256=P7bK_xqGsUb2-pSD4WvN7bjXoee2Xi0y4yIOeZeo1A4,1303
 layrz_sdk/entities/events/__init__.py,sha256=6W9HsNBCOvVDJl9_1cnX_YlsZRHaZbNBtnYTmST5-WU,49
-layrz_sdk/entities/events/event.py,sha256=SsnCuH3PC9czk7_Bkv8Z6prEYRZI-5q2AqFlm25vsb0,1216
+layrz_sdk/entities/events/event.py,sha256=_EfXT6pk6LozwU8IJY3eO6-aDNShUnMRej8s1Tc12Po,1536
 layrz_sdk/entities/formatting/__init__.py,sha256=cv-_epSLW_9RmUhs18caMo7XhvU12q-JvWPooYUNpJE,66
 layrz_sdk/entities/formatting/text_align.py,sha256=1kT8PE1WUjKhilgsQPU5XS5sSt76onWwfNNeKPvPv9E,501
-layrz_sdk/entities/general/__init__.py,sha256=qQSs86NUtxT3vC-gdEU05rBmKWRRQmOJcZBDaQgSUcw,218
+layrz_sdk/entities/general/__init__.py,sha256=sSOiwoNQpmERpQi0d1AdXm1WYr9MVfFU5s-gCHag-s0,262
 layrz_sdk/entities/general/asset.py,sha256=wcqI-ogJEdhIrtDMavNgOTF3kep2Ipw7H95zFfq3lbw,1949
 layrz_sdk/entities/general/asset_operation_mode.py,sha256=LOAReg3qpx_xOGgBOZpHSZCrYxX9ssSUeWGib0n-97g,621
 layrz_sdk/entities/general/custom_field.py,sha256=6Bk9IWOzxcmo1kCTu3_0eg16cDyqZ0a_gAVCBtdxjjs,638
 layrz_sdk/entities/general/device.py,sha256=b15Oczfx7zXvR4T88Fh4EmUAB2WrYXgABmFBBsAE2tc,1013
+layrz_sdk/entities/general/geofence.py,sha256=Ep6Rkjzk-L2VD-wrxF-0GvuWMGQl5ooD1A2QGFuI8zE,1115
 layrz_sdk/entities/general/sensor.py,sha256=N9smg5FmRQYuF1oGUxw9diJ4vVbFRg89v1h67Rk9RQM,647
 layrz_sdk/entities/general/user.py,sha256=cE-oasv3yObNdCAvb6w1Yoo-0U3_lhE6s12t4FY5Mwg,559
 layrz_sdk/entities/repcom/__init__.py,sha256=vXRvt0pzBIMeEGXNj8SEzejzMJg4t9uAakMMumKpg4U,61
@@ -61,9 +61,9 @@ layrz_sdk/entities/telemetry/position.py,sha256=sg7k6Etyu1ZtuFQfmfZq00_7WxRMmLgt
 layrz_sdk/helpers/__init__.py,sha256=v3WbYVr9ygyDtxEIi59kGVXuirNswhhkG4BQv5iESRo,72
 layrz_sdk/helpers/color.py,sha256=gfMuO627E7zdLXcK0WAgEwzmQOMrIdLFFv3ktI-UYbE,1129
 layrz_sdk/lcl/__init__.py,sha256=nmfOnbot49pvfR8xyqvs0tg7ZwzxunhWJbwA805w20M,67
-layrz_sdk/lcl/core.py,sha256=xaEcnP8aTuzFuzRNiS0tI_LZ6Hv4MTzZtYDKEAry-vo,22934
-layrz_sdk-3.0.10.dist-info/LICENSE,sha256=d5ZrU--lIPER7QByXDKcrtOTOMk1JvN_9FdYDuoWi7Y,1057
-layrz_sdk-3.0.10.dist-info/METADATA,sha256=CjWcXCvvV9Inq9QUcDX0I2iPfyh5_ORN83jAcds1yuM,1678
-layrz_sdk-3.0.10.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-layrz_sdk-3.0.10.dist-info/top_level.txt,sha256=yUTMMzfdZ0HDWQH5TaSlFM4xtwmP1fSGxmlL1dmu4l4,10
-layrz_sdk-3.0.10.dist-info/RECORD,,
+layrz_sdk/lcl/core.py,sha256=yG25WLCq_nnPiTgaCFCTteNL1-_mYKLc0VAwLT0D_6Q,23165
+layrz_sdk-3.0.12.dist-info/LICENSE,sha256=d5ZrU--lIPER7QByXDKcrtOTOMk1JvN_9FdYDuoWi7Y,1057
+layrz_sdk-3.0.12.dist-info/METADATA,sha256=D4MTxVjRaxX7M28_Lg-8slczvKSvjL_k1k6pnTrB-sI,1700
+layrz_sdk-3.0.12.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+layrz_sdk-3.0.12.dist-info/top_level.txt,sha256=yUTMMzfdZ0HDWQH5TaSlFM4xtwmP1fSGxmlL1dmu4l4,10
+layrz_sdk-3.0.12.dist-info/RECORD,,

{layrz_sdk-3.0.10.dist-info → layrz_sdk-3.0.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any