plantstar-shared 2.0.3.0.2.16__py3-none-any.whl → 2.0.3.0.2.18__py3-none-any.whl

plantstar_shared/api_types.py

@@ -97,16 +97,7 @@ class DataCollectionModuleApiTypes(SysconType):
 class ApuApiTypes(SysconType):
     SET_IS_INITIALIZING_STATUS = ("data_collection_module_manager/set_is_initializing_status", "data_collection_module_manager/set_is_initializing_status", True)
     SET_IS_COLDBOOTING_STATUS = ("data_collection_module_manager/set_is_coldbooting_status", "data_collection_module_manager/set_is_coldbooting_status", True)
-    REGISTER_HMI = ("data_collection_module_manager/register_hmi", "data_collection_module_manager/register_hmi", True)
-    REGISTER_DCM = ("data_collection_module_manager/register_dcm", "data_collection_module_manager/register_dcm", True)
 
 
 class CosmosApiTypes(SysconType):
     SEND_DATA_DICTIONARY = ("send_data_dictionary", "send_data_dictionary", True)
-
-
-class HmiApiTypes(SysconType):
-    GET_HMI_SYSTEM_INFORMATION = ("get_hmi_system_information", "get_hmi_system_information", True)
-    SET_HMI_SYSTEM_INFORMATION = ("set_hmi_system_information", "set_hmi_system_information", True)
-    REBOOT_HMI = ("reboot_hmi", "reboot_hmi", True)
-

plantstar_shared/convert_bytes_to_object.py

@@ -2,9 +2,9 @@ import msgpack
 
 from plantstar_shared.errors import SocketConnectionError
 
+
 # Converts bytes into an object using msgpack, with a parameter for strict_map_key
 def convert_bytes_to_object(object_as_bytes, strict_map_key=False):
-    
     if not object_as_bytes:
         raise SocketConnectionError
     

plantstar_shared/syscon_json.py

@@ -90,8 +90,11 @@ class SysconDecoder(json.JSONDecoder):
             # This is here for a weird bug that was happening
             if dictionary["tzinfo"] is None or dictionary["tzinfo"] in ["None", "tzlocal()", "tzutc()"]:
                 dictionary["tzinfo"] = "UTC"
-
-            dictionary["tzinfo"] = pytz.timezone(dictionary["tzinfo"])
+            else:
+                tzinfo_to_localize = pytz.timezone(dictionary["tzinfo"])
+                dictionary.pop('tzinfo')
+                localized_datetime = tzinfo_to_localize.localize(datetime.datetime(**dictionary))
+                return localized_datetime
 
         if type_name == "datetime":
             return datetime.datetime(**dictionary)

plantstar_shared/tcp_socket_utils.py

@@ -2,47 +2,100 @@ import struct
 
 from plantstar_shared.convert_bytes_to_object import convert_bytes_to_object
 from plantstar_shared.convert_object_to_bytes import convert_object_to_bytes
-from plantstar_shared.errors import SocketConnectionError
+from plantstar_shared.errors import SocketConnectionError, SysconProgrammingError
 
-SIZE_OF_UNSIGNED_INT_STRUCT = 4
+SIZE_OF_UNSIGNED_INT_FOR_HUSKY = 2  # size of the integer value that precedes data coming from Husky OIs
+SIZE_OF_UNSIGNED_INT_STRUCT = 4  # size of the integer value that precedes data coming from most sockets (DeviceController, DCM, etc)
 
 
-def read_size_value_from_socket(*, remote_socket):
-    size_struct = remote_socket.recv(SIZE_OF_UNSIGNED_INT_STRUCT)
+def read_size_value_from_socket(*, remote_socket, is_big_endian, number_of_bytes_for_size_prefix, size_value_includes_size_prefix_bytes=False):
+    size_bytes = remote_socket.recv(number_of_bytes_for_size_prefix)
 
-    if not size_struct:
-        return None
-
-    try:
-        message_length = struct.unpack('>I', size_struct)[0]
-    except struct.error as error:
+    if not size_bytes:
         raise SocketConnectionError
 
-    return message_length
+    if number_of_bytes_for_size_prefix == SIZE_OF_UNSIGNED_INT_FOR_HUSKY:
+        size_for_message = int.from_bytes(size_bytes, 'big') if is_big_endian else int.from_bytes(size_bytes, 'little')
+    elif number_of_bytes_for_size_prefix == SIZE_OF_UNSIGNED_INT_STRUCT:
+        number_format = ">I" if is_big_endian else "<I"
+
+        try:
+            size_for_message = struct.unpack(number_format, size_bytes)[0]
+        except struct.error as error:
+            raise SocketConnectionError
+    else:
+        raise SysconProgrammingError("A size prefix was set to something other than 2 or 4")
+
+    if size_value_includes_size_prefix_bytes:
+        size_for_message = size_for_message - number_of_bytes_for_size_prefix
+
+    return size_for_message, size_bytes
+
+
+def get_bytes_from_socket(
+    *, remote_socket, number_of_bytes_to_read=None, is_big_endian=True, number_of_bytes_for_size_prefix=0, size_value_includes_size_prefix_bytes=False,
+    size_value_should_be_included_in_final_message=False
+):
+    """Obtains a number of bytes from a provided socket, with options for different configurations and situations.
+    Returns byte sequence, and the size value that was obtained from the prefix bytes.
+
+    Keywords / Example Configurations:
+        remote_socket -- the connection that bytes will be read from
+
+        number_of_bytes_to_read -- the number of bytes to read on the socket, if this is known, this is the only optional parameter needed (default: 0)
+
+        is_big_endian -- bool: what format string should be used for unpacking the size value (default: True)
+
+        number_of_bytes_for_size_prefix -- the number of bytes to read to determine the total size of the message to pass (default: 0)
+
+        size_value_includes_size_prefix_bytes -- bool: if size value includes the size_prefix_bytes based on the systems implementation
 
+        size_value_should_be_included_in_final_message  -- bool: if size value should be prepended to the byte sequence, likely only Husky logic wants this (default: False)
 
-def get_message_from_socket(*, remote_socket):
-    message_length = read_size_value_from_socket(remote_socket=remote_socket)
+        -----
 
-    if not message_length:
-        return None
+        get_bytes_from_socket(remote_socket=conn, number_of_bytes_to_read=100) - likely would not be called directly, in most cases
+
+        get_bytes_from_socket(remote_socket=conn, is_big_endian=True, number_of_bytes_for_size_prefix=4) - reads 4 bytes to get the size, then reads that amount (DCM socket, etc)
+
+        get_bytes_from_socket(remote_socket=conn, is_big_endian=False, number_of_bytes_for_size_prefix=2, should_remove_prefix_size_from_read=True) - reads 2 bytes to get the size,
+        then reads that calculated amount minus 2 (Husky socket, etc)
+
+    """
 
     packets = []
+
+    if not number_of_bytes_to_read:
+        if number_of_bytes_for_size_prefix:
+            number_of_bytes_to_read, size_bytes = read_size_value_from_socket(
+                remote_socket=remote_socket, is_big_endian=is_big_endian, number_of_bytes_for_size_prefix=number_of_bytes_for_size_prefix,
+                size_value_includes_size_prefix_bytes=size_value_includes_size_prefix_bytes
+            )
+
+            if not number_of_bytes_to_read:
+                raise SocketConnectionError
+
+            if size_value_should_be_included_in_final_message:
+                packets.append(size_bytes)
+
+        else:
+            raise SysconProgrammingError("get_bytes_from_socket was called with no parameters for number_of_bytes_to_read or number_of_bytes_for_size_prefix")
+
     bytes_received = 0
 
     # While loop that will stream in data if the full request is not available yet
-    while bytes_received < message_length:
-        buffer_size = message_length - bytes_received
+    while bytes_received < number_of_bytes_to_read:
+        buffer_size = number_of_bytes_to_read - bytes_received
         packet = remote_socket.recv(buffer_size)
 
         if not packet:
-            return None
+            raise SocketConnectionError
 
         packets.append(packet)
         bytes_received = bytes_received + len(packet)
 
     data = b''.join(packets)
-    return data
+    return data, number_of_bytes_to_read
 
 
 def send_message_on_socket(*, remote_socket, dumpsable_object):
@@ -62,7 +115,18 @@ def send_encoded_message_on_socket(*, remote_socket, encoded_message):
         bytes_sent += new_bytes_sent
 
 
-def get_object_from_socket(*, remote_socket):
-    object_from_interface_as_bytes = get_message_from_socket(remote_socket=remote_socket)
+def get_object_from_socket(
+    *, remote_socket, number_of_bytes_to_read=None, is_big_endian=True, number_of_bytes_for_size_prefix=SIZE_OF_UNSIGNED_INT_STRUCT,
+    size_value_includes_size_prefix_bytes=False
+):
+    """Function that is used between the APU and DCM to send dictionaries. Returns a tuple of the object and its size in bytes."""
+    object_from_interface_as_bytes, size_of_object_in_bytes = get_bytes_from_socket(
+        remote_socket=remote_socket, number_of_bytes_to_read=number_of_bytes_to_read, is_big_endian=is_big_endian, number_of_bytes_for_size_prefix=number_of_bytes_for_size_prefix,
+        size_value_includes_size_prefix_bytes=size_value_includes_size_prefix_bytes
+    )
+
+    if not object_from_interface_as_bytes:
+        raise SocketConnectionError
+
     object_from_interface = convert_bytes_to_object(object_from_interface_as_bytes)
-    return object_from_interface
+    return object_from_interface, size_of_object_in_bytes

{plantstar_shared-2.0.3.0.2.16.dist-info → plantstar_shared-2.0.3.0.2.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: plantstar-shared
-Version: 2.0.3.0.2.16
+Version: 2.0.3.0.2.18
 Summary: Shared code used in plantstar_apu and plantstar_dcm
 Home-page: https://github.com/SYSCON-International/plantstar_shared
 Author: SYSCON International

{plantstar_shared-2.0.3.0.2.16.dist-info → plantstar_shared-2.0.3.0.2.18.dist-info}/RECORD

@@ -1,22 +1,21 @@
 plantstar_shared/DataCollectionModuleProcessNames.py,sha256=L21K4eznLCIYAbb4g7qKhyHKS1aK4w9dSu5r6LGewGs,441
-plantstar_shared/HmiKeyConstants.py,sha256=nVzZim026r2-UplsgS6swMeCYgOhl_OE_RQ-yjcDTUs,319
 plantstar_shared/HuskyInterfacePacketTypes.py,sha256=tUWcWKpaBgYs2S8zll9E5-YTMqGfOIU4kj5mroQe344,1372
 plantstar_shared/MockRawDataProcessor.py,sha256=Gc2CfteJdLZwYPj73FuyEv16uTzoJsUB479Xc74S5ow,5382
 plantstar_shared/RawDataProcessorInterfaceActions.py,sha256=XnXuFW3BFSa89-VmhGAKQxDBPalsQWapw4h0P5q0IXw,632
 plantstar_shared/SysconType.py,sha256=6Ae9F0fBr0vpXAmP8fYqoWyFUGTEECtS55zAYMkeKlY,1581
 plantstar_shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 plantstar_shared/add_size_onto_string_and_return.py,sha256=j7XSs5ubKKo5LCMVljzZudK2nw8CZh-zMSLT_t30aGg,385
-plantstar_shared/api_types.py,sha256=farJcD_bETXyGTYM1roACDB85xy8LHxJ4vPS_df8kLc,5527
-plantstar_shared/convert_bytes_to_object.py,sha256=MVOKqJJeUjvEKJL_ELNPkxZEgqwlk3zT8CwfVtpwOgU,409
+plantstar_shared/api_types.py,sha256=gKN2LmUFBcpa7gJSNwCJ0eSv4IqkIP01pCLfy8-mT50,5001
+plantstar_shared/convert_bytes_to_object.py,sha256=YKf410EWUpeyyeBhJ3kl6PYIAcHJKKkhp8JkE-CuSv0,405
 plantstar_shared/convert_object_to_bytes.py,sha256=vVS3dKkPynOJ2NV2LgLHdEOZflK_0hhdS-NuU_gcfHs,206
 plantstar_shared/errors.py,sha256=qEUHh2d7pqZHoag6YJjnVfRWzWAzjuyGZH7stT_-Nzk,341
 plantstar_shared/global_definitions.py,sha256=mj59nU21DYza4XgZQxLX2lTvJYooN_-ZFrh8SVXFBRs,1153
 plantstar_shared/is_valid_signed_string.py,sha256=5ZiEsPRz30J8yxN4A1dHq-hlz7VI9ru_fRH4A5JjuGQ,276
 plantstar_shared/obtain_raw_data_processor_function_for_action_name.py,sha256=DYo307PraRRD8zGiSO6Fn03bZ4X9aDOYV9rwaRm8mXM,1134
 plantstar_shared/syscon_image_field.py,sha256=GlTTudqFT5EsWM5sPRO0p5SDascX7gI1BEOeF1OG7Tw,441
-plantstar_shared/syscon_json.py,sha256=8OG9_55d52V9e2fFNguDtQ_pnw1YwyYsg2pnUkhjW6g,4213
-plantstar_shared/tcp_socket_utils.py,sha256=sI5IJXMTsQuTPzm8V5T1nsY5aMF-78zGL69aIDLCD_A,2250
-plantstar_shared-2.0.3.0.2.16.dist-info/METADATA,sha256=wyt2aQYCrws1rK0OYqoFDzyqevg1S6gaCVxDmJTM4_Q,659
-plantstar_shared-2.0.3.0.2.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-plantstar_shared-2.0.3.0.2.16.dist-info/top_level.txt,sha256=9ZTCr_aP1GqYGt7EVmlSIUF72bdMZErapyhbik-MWVQ,17
-plantstar_shared-2.0.3.0.2.16.dist-info/RECORD,,
+plantstar_shared/syscon_json.py,sha256=CnsWfpyFuFx2OLVLNschvGI0fFGDXzb_fq-K1zlODRM,4413
+plantstar_shared/tcp_socket_utils.py,sha256=Z8KY4Sc_SX4XDunPxeAk2IMfYZi5HenGE8SBU8U-KTk,6364
+plantstar_shared-2.0.3.0.2.18.dist-info/METADATA,sha256=rYZBi0sV5wu0C4Sy1VmPwA3Sz2ED6ORqL7IsvbkwjJ8,659
+plantstar_shared-2.0.3.0.2.18.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+plantstar_shared-2.0.3.0.2.18.dist-info/top_level.txt,sha256=9ZTCr_aP1GqYGt7EVmlSIUF72bdMZErapyhbik-MWVQ,17
+plantstar_shared-2.0.3.0.2.18.dist-info/RECORD,,

plantstar_shared/HmiKeyConstants.py

@@ -1,9 +0,0 @@
-class HmiKeyConstants:
-    APU_IP_ADDRESS = "apu_ip_address"
-    HMI_HOSTNAME = "hmi_hostname"
-    HMI_HOMEPAGE = "hmi_homepage"
-    HMI_IP_ADDRESS_TYPE = "hmi_ip_address_type"
-    HMI_IP_ADDRESS = "hmi_ip_address"
-    HMI_NETMASK = "hmi_netmask"
-    HMI_DEFAULT_GATEWAY = "hmi_default_gateway"
-    HMI_DNS = "hmi_dns"