layrz-sdk 3.0.0__tar.gz → 3.0.1__tar.gz

{layrz_sdk-3.0.0 → layrz_sdk-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: layrz-sdk
-Version: 3.0.0
+Version: 3.0.1
 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.0.0 → layrz_sdk-3.0.1}/layrz_sdk/lcl/core.py

@@ -128,6 +128,9 @@ class LclCore:
     if len(args) > 2:
       return INVALID_NUMBER_OF_PARAMS.format(expected=2, received=len(args))
 
+    if args[0] is None:
+      return None
+
     if len(args) > 1:
       return self._payload.get(args[0], args[1])
     return self._payload.get(args[0], None)
@@ -146,6 +149,9 @@ class LclCore:
     if len(args) > 2:
       return INVALID_NUMBER_OF_PARAMS.format(expected=2, received=len(args))
 
+    if args[0] is None:
+      return None
+
     if len(args) > 1:
       return self._previous_sensors.get(args[0], args[1])
     return self._previous_sensors.get(args[0], None)
@@ -158,6 +164,9 @@ class LclCore:
     if len(args) > 2:
       return INVALID_NUMBER_OF_PARAMS.format(expected=2, received=len(args))
 
+    if args[0] is None:
+      return None
+
     if len(args) > 1:
       return self._sensors.get(args[0], args[1])
     return self._sensors.get(args[0], None)
@@ -183,7 +192,7 @@ class LclCore:
       return None
 
     if not isinstance(args[0], type(args[1])):
-      return DIFFERENT_TYPES.format(arg1=type(args[0]), arg2=type(args[1]))
+      return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] == args[1]
 
   def OR_OPERATOR(self, *args: list[Any]) -> bool:
@@ -206,6 +215,7 @@ class LclCore:
     for val in args:
       if val is None:
         return None
+
       if is_first:
         is_first = False
         result = val
@@ -220,7 +230,8 @@ class LclCore:
 
     for num in args:
       if num is None:
-        continue
+        return None
+
       try:
         result += float(num)
       except Exception:  # pylint: disable=broad-except
@@ -235,7 +246,8 @@ class LclCore:
 
     for num in args:
       if num is None:
-        continue
+        return None
+
       try:
         if is_first:
           result = float(num)
@@ -254,7 +266,8 @@ class LclCore:
 
     for num in args:
       if num is None:
-        continue
+        return None
+
       try:
         if is_first:
           is_first = False
@@ -273,7 +286,8 @@ class LclCore:
 
     for num in args:
       if num is None:
-        continue
+        return None
+
       try:
         if is_first:
           is_first = False
@@ -289,8 +303,10 @@ class LclCore:
     """ TO_BOOL Function """
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
+
     if args[0] is None:
       return None
+
     return bool(args[0])
 
   def TO_STR(self, *args: list[Any]) -> str | None:
@@ -300,22 +316,30 @@ class LclCore:
 
     if args[0] is None:
       return None
+
     return str(args[0])
 
   def TO_INT(self, *args: list[Any]) -> str | None | int:
     """ TO_INT Function """
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
+
     if args[0] is None:
       return None
+
     return int(args[0])
 
   def CEIL(self, *args: list[Any]) -> str | None | int:
     """ CEIL Function """
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
+
     if args[0] is None:
       return None
+
+    if not isinstance(args[0], (int, float)):
+      return f'Invalid arguments - must be real number, not {type(args[0]).__name__}'
+
     import math
     return math.ceil(args[0])
 
@@ -323,8 +347,13 @@ class LclCore:
     """ FLOOR Function """
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
+
     if args[0] is None:
       return None
+
+    if not isinstance(args[0], (int, float)):
+      return f'Invalid arguments - must be real number, not {type(args[0]).__name__}'
+
     import math
     return math.floor(args[0])
 
@@ -332,16 +361,23 @@ class LclCore:
     """ ROUND Function """
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
+
     if args[0] is None:
       return None
+
+    if not isinstance(args[0], (int, float)):
+      return f'Invalid arguments - must be real number, not {type(args[0]).__name__}'
+
     return round(args[0])
 
   def SQRT(self, *args: list[Any]) -> str | None | float:
     """ SQRT Function """
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
+
     if args[0] is None:
       return None
+
     import math
     return math.sqrt(args[0])
 
@@ -350,6 +386,7 @@ class LclCore:
     for val in args:
       if val is None:
         return None
+
     return ''.join([str(val) for val in args])
 
   def RANDOM(self, *args: list[Any]) -> float | str:
@@ -359,6 +396,9 @@ class LclCore:
     if len(args) < 2:
       return INVALID_NUMBER_OF_PARAMS.format(expected=2, received=len(args))
 
+    if args[0] is None or args[1] is None:
+      return None
+
     import random
     return random.random() * (float(args[1]) - float(args[0])) + float(args[0])
 
@@ -367,6 +407,9 @@ class LclCore:
     if len(args) != 2:
       return INVALID_NUMBER_OF_PARAMS.format(expected=2, received=len(args))
 
+    if args[0] is None or args[1] is None:
+      return None
+
     import random
     return random.randint(int(args[0]), int(args[1]))
 
@@ -381,7 +424,7 @@ class LclCore:
       return None
 
     if not isinstance(args[0], type(args[1])):
-      return DIFFERENT_TYPES.format(arg1=type(args[0]), arg2=type(args[1]))
+      return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] >= args[1]
 
   def GREATER_THAN(self, *args: list[Any]) -> str | None | bool:
@@ -395,7 +438,7 @@ class LclCore:
       return None
 
     if not isinstance(args[0], type(args[1])):
-      return DIFFERENT_TYPES.format(arg1=type(args[0]), arg2=type(args[1]))
+      return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] > args[1]
 
   def LESS_THAN_OR_EQUALS_TO(self, *args: list[Any]) -> str | None | bool:
@@ -409,7 +452,7 @@ class LclCore:
       return None
 
     if not isinstance(args[0], type(args[1])):
-      return DIFFERENT_TYPES.format(arg1=type(args[0]), arg2=type(args[1]))
+      return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] <= args[1]
 
   def LESS_THAN(self, *args: list[Any]) -> str | None | bool:
@@ -423,7 +466,7 @@ class LclCore:
       return None
 
     if not isinstance(args[0], type(args[1])):
-      return DIFFERENT_TYPES.format(arg1=type(args[0]), arg2=type(args[1]))
+      return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] < args[1]
 
   def DIFFERENT(self, *args: list[Any]) -> str | None | bool:
@@ -437,7 +480,7 @@ class LclCore:
       return None
 
     if not isinstance(args[0], type(args[1])):
-      return DIFFERENT_TYPES.format(arg1=type(args[0]), arg2=type(args[1]))
+      return DIFFERENT_TYPES.format(arg1=type(args[0]).__name__, arg2=type(args[1]).__name__)
     return args[0] != args[1]
 
   def HEX_TO_STR(self, *args: list[Any]) -> str | None:
@@ -447,46 +490,74 @@ class LclCore:
 
     if args[0] is None:
       return None
-    byte_array = bytes.fromhex(args[0])
-    return byte_array.decode('ASCII')
+
+    hexa = args[0]
+    if hexa.startswith('0x'):
+      hexa = hexa[2:]
+
+    try:
+      byte_array = bytes.fromhex(hexa)
+      return byte_array.decode('ASCII')
+    except Exception:  # pylint: disable=broad-except
+      return 'Invalid hex string'
 
   def STR_TO_HEX(self, *args: list[Any]) -> str | None:
     """ STR_TO_HEX Function """
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
+
     if args[0] is None:
       return None
+
     return str(args[0]).encode('ASCII').hex()
 
   def HEX_TO_INT(self, *args: list[Any]) -> str | None | int:
     """ HEX_TO_INT Function """
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
+
     if args[0] is None:
       return None
-    return int(int(args[0], 16))
+
+    try:
+      return int(int(args[0], 16))
+    except Exception:  # pylint: disable=broad-except
+      return 'Invalid hex string'
 
   def INT_TO_HEX(self, *args: list[Any]) -> str | None:
     """ INT_TO_HEX Function """
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
+
     if args[0] is None:
       return None
-    return hex(int(args[0]))[2:]
+
+    try:
+      return hex(int(args[0]))[2:]
+    except Exception:  # pylint: disable=broad-except
+      return 'Invalid int value'
 
   def TO_FLOAT(self, *args: list[Any]) -> str | None | float:
     """ TO_FLOAT Function """
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
+
     if args[0] is None:
       return None
-    return float(args[0])
+
+    try:
+      return float(args[0])
+    except Exception:  # pylint: disable=broad-except
+      return f'Invalid arguments - must be real number, not {type(args[0]).__name__}'
 
   def IS_PARAMETER_PRESENT(self, *args: list[Any]) -> str | bool:
     """ IS_PARAMETER_PRESENT Function """
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
 
+    if args[0] is None:
+      return None
+
     return args[0] in self._payload
 
   def IS_SENSOR_PRESENT(self, *args: list[Any]) -> str | bool:
@@ -494,6 +565,9 @@ class LclCore:
     if len(args) > 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
 
+    if args[0] is None:
+      return None
+
     return args[0] in self._sensors
 
   def INSIDE_RANGE(self, *args: list[Any]) -> str | None | bool:
@@ -503,8 +577,13 @@ class LclCore:
 
     if args[0] is None or args[1] is None or args[2] is None:
       return None
+
     if not isinstance(args[0], type(args[1])):
-      return DIFFERENT_TYPES_RANGES.format(arg1=type(args[0]), arg2=type(args[1]), arg3=type(args[2]))
+      return DIFFERENT_TYPES_RANGES.format(
+        arg1=type(args[0]).__name__,
+        arg2=type(args[1]).__name__,
+        arg3=type(args[2]).__name__,
+      )
 
     return args[1] <= args[0] <= args[2]
 
@@ -515,8 +594,13 @@ class LclCore:
 
     if args[0] is None or args[1] is None or args[2] is None:
       return None
+
     if not isinstance(args[0], type(args[1])):
-      return DIFFERENT_TYPES_RANGES.format(arg1=type(args[0]), arg2=type(args[1]), arg3=type(args[2]))
+      return DIFFERENT_TYPES_RANGES.format(
+        arg1=type(args[0]).__name__,
+        arg2=type(args[1]).__name__,
+        arg3=type(args[2]).__name__,
+      )
 
     return not args[1] <= args[0] <= args[2]
 
@@ -524,6 +608,7 @@ class LclCore:
     """ GET_TIME_DIFFERENCE Function """
     if len(args) > 0:
       return INVALID_NUMBER_OF_PARAMS.format(expected=0, received=len(args))
+
     return self._asset_constants.get('timeElapsed', 0)
 
   def IF(self, *args: list[Any]) -> Any:
@@ -531,6 +616,9 @@ class LclCore:
     if len(args) != 3:
       return INVALID_NUMBER_OF_PARAMS.format(expected=3, received=len(args))
 
+    if args[0] is None or args[1] is None or args[2] is None:
+      return None
+
     return args[1] if args[0] else args[2]
 
   def NOW(self, *args: list[Any]) -> float:  # pylint: disable=unused-argument
@@ -566,6 +654,9 @@ class LclCore:
     if len(args) != 1:
       return INVALID_NUMBER_OF_PARAMS.format(expected=1, received=len(args))
 
+    if args[0] is None:
+      return None
+
     return not args[0]
 
   def CONTAINS(self, *args: list[Any]) -> str | bool:
@@ -573,6 +664,9 @@ class LclCore:
     if len(args) != 2:
       return INVALID_NUMBER_OF_PARAMS.format(expected=2, received=len(args))
 
+    if args[0] is None or args[1] is None:
+      return None
+
     return str(args[0]) in str(args[1])
 
   def STARTS_WITH(self, *args: list[Any]) -> str | bool:
@@ -580,6 +674,9 @@ class LclCore:
     if len(args) != 2:
       return INVALID_NUMBER_OF_PARAMS.format(expected=2, received=len(args))
 
+    if args[0] is None or args[1] is None:
+      return None
+
     return str(args[1]).startswith(str(args[0]))
 
   def ENDS_WITH(self, *args: list[Any]) -> str | bool:
@@ -587,6 +684,9 @@ class LclCore:
     if len(args) != 2:
       return INVALID_NUMBER_OF_PARAMS.format(expected=2, received=len(args))
 
+    if args[0] is None or args[1] is None:
+      return None
+
     return str(args[1]).endswith(str(args[0]))
 
   def PRIMARY_DEVICE(self, *args: list[Any]) -> str:
@@ -610,15 +710,25 @@ class LclCore:
         received=len(args),
       )
 
-    if args[0] is None or not isinstance(args[0], str):
-      return DIFFERENT_TYPES.format(arg1='str', arg2=type(args[0]))
+    if args[0] is None:
+      return None
+
+    if not isinstance(args[0], str):
+      return DIFFERENT_TYPES.format(arg1='str', arg2=type(args[0]).__name__)
+
+    if args[1] is None:
+      return None
 
-    if args[1] is None or not isinstance(args[1], int):
-      return DIFFERENT_TYPES.format(arg1='int', arg2=type(args[1]))
+    if not isinstance(args[1], int):
+      return DIFFERENT_TYPES.format(arg1='int', arg2=type(args[1]).__name__)
 
     if len(args) == 3:
-      if args[2] is None or not isinstance(args[2], int):
-        return DIFFERENT_TYPES.format(arg1='str', arg2=type(args[2]))
+      if args[2] is None:
+        return None
+
+      if not isinstance(args[2], int):
+        return DIFFERENT_TYPES.format(arg1='str', arg2=type(args[2]).__name__)
+
       return args[0][args[1]:args[2]]
     return args[0][args[1]:]
 
@@ -626,12 +736,22 @@ class LclCore:
     """ Convert UNIX timestamp date (args[0]) to format (args[1]) string """
     if len(args) < 2:
       return INVALID_NUMBER_OF_PARAMS.format(expected=2, received=len(args))
+
+    if args[0] is None:
+      return None
+
+    if args[1] is None:
+      return None
+
     import zoneinfo
     from datetime import datetime
 
     tz = zoneinfo.ZoneInfo('UTC')
 
     if len(args) > 2:
+      if args[2] is None:
+        return None
+
       try:
         tz = zoneinfo.ZoneInfo(args[2])
       except zoneinfo.ZoneInfoNotFoundError:

{layrz_sdk-3.0.0 → layrz_sdk-3.0.1}/layrz_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: layrz-sdk
-Version: 3.0.0
+Version: 3.0.1
 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.0.0 → layrz_sdk-3.0.1}/layrz_sdk.egg-info/SOURCES.txt

@@ -67,4 +67,5 @@ layrz_sdk/entities/telemetry/position.py
 layrz_sdk/helpers/__init__.py
 layrz_sdk/helpers/color.py
 layrz_sdk/lcl/__init__.py
-layrz_sdk/lcl/core.py
+layrz_sdk/lcl/core.py
+tests/test_lcl.py

{layrz_sdk-3.0.0 → layrz_sdk-3.0.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "layrz-sdk"
-version = "3.0.0"
+version = "3.0.1"
 description = "Layrz SDK for Python"
 authors = [
   {name = "Golden M, Inc.", email = "software@goldenm.com"}