SIENTIAPDE-1163

Refactor OPC connection handling to improve error notifications and update GITHUB_BRANCH in values.yaml for MongoDB integration. Change requirements.txt to point to local dataops library path.

laborious/utils/repository/opc_repository.py

@@ -91,7 +91,7 @@ class OpcRepository():
         self.client.secure_channel_timeout = 10000000
         self.client.session_timeout = 10000000
 
-    def connect(self):
+    def connect(self) -> tuple[bool, dict[str, Any]]:
         """
         Establishes a connection to the OPC server.
         This method initializes the OPC client using the provided URL and
@@ -107,7 +107,7 @@ class OpcRepository():
         self.logger.info(f'Starting connection to OPC server {self.id}...')
         return self.try_connect()
 
-    def try_connect(self):
+    def try_connect(self) -> tuple[bool, dict[str, Any]]:
         """
         Tries to connect to the OPC server.
 
@@ -118,18 +118,18 @@ class OpcRepository():
         try:
             self.last_reconnection_time = datetime.now()
             self.client.connect()
-            return True
+            return True, {}
         except Exception as e:
             trace = traceback.format_exc()
-            self.notification_handler.build_and_send_notification(
-                notification_id=f"OPC_CONNECTION_ERROR_{self.id}",
-                message=f"Failed to connect to OPC server: {e}",
-                block="opc_repository",
-                level=NotificationLevel.ERROR,
-                attachment_content=trace
-            )
             self.logger.error(trace)
-            return False
+
+            return False, {
+                "notification_id": f"OPC_CONNECTION_ERROR_{self.id}",
+                "message": f"Failed to connect to OPC server: {e}",
+                "block": "opc_repository",
+                "level": NotificationLevel.ERROR,
+                "attachment_content": trace
+            }
 
     def disconnect(self):
         """
@@ -153,7 +153,7 @@ class OpcRepository():
         except Exception as e:
             self.logger.error(f"Error in destructor: {e}")
 
-    def validate_connection(self):
+    def validate_connection(self) -> tuple[bool, dict[str, Any]]:
         """
         Validates the connection to the OPC server.
         If the connection is not established, it attempts to reconnect.
@@ -193,12 +193,12 @@ class OpcRepository():
                     f"Trying to reconnect to OPC server {self.id}...")
                 return self.connect()
 
-            return False
+            return False, {}
 
-        return True
+        return True, {}
 
     def write_data(self, node: str, value: Any, data_type: str,
-                   logger: Logger, metadata: dict[str, Any]) -> bool:
+                   logger: Logger, metadata: dict[str, Any]) -> tuple[bool, dict[str, Any]]:
         """
         Writes data to the OPC server.
         If the connection is not established, it attempts to reconnect.
@@ -209,31 +209,33 @@ class OpcRepository():
         If the client is not connected, it attempts to reconnect.
         If the client is connected, it returns True.
         """
-        if not self.validate_connection():
-            return False
+
+        is_connected, error = self.validate_connection()
+
+        if not is_connected:
+            return False, error
+
         try:
             node = self.client.get_node(node)
         except Exception as e:
             trace = traceback.format_exc()
-            self.notification_handler.build_and_send_notification(
-                notification_id=f"OPC_WRITE_GET_NODE_ERROR_{self.id}",
-                message=f"Failed to get node from OPC server: {e} | metadata: {metadata}",
-                block="opc_repository",
-                level=NotificationLevel.ERROR,
-                attachment_content=trace
-            )
             logger.custom_error(trace, metadata.get('schedule_name', 'N/A'))
             self.error_count += 1
-            return False
+            return False, {
+                "notification_id": f"OPC_WRITE_GET_NODE_ERROR_{self.id}",
+                "message": f"Failed to get node from OPC server: {e} | metadata: {metadata}",
+                "block": "opc_repository",
+                "level": NotificationLevel.ERROR,
+                "attachment_content": trace
+            }
 
         if data_type not in data_type_map:
-            self.notification_handler.build_and_send_notification(
-                notification_id=f"OPC_WRITE_DATA_TYPE_ERROR_{self.id}",
-                message=f"Unsupported data type: {data_type} | metadata: {metadata}",
-                block="opc_repository",
-                level=NotificationLevel.ERROR
-            )
-            return False
+            return False, {
+                "notification_id": f"OPC_WRITE_DATA_TYPE_ERROR_{self.id}",
+                "message": f"Unsupported data type: {data_type} | metadata: {metadata}",
+                "block": "opc_repository",
+                "level": NotificationLevel.ERROR
+            }
 
         data = data_type_map[data_type]['converter'](value)
         logger.custom_info(
@@ -256,16 +258,15 @@ class OpcRepository():
             node.write_value(ua_data)
         except Exception as e:
             trace = traceback.format_exc()
-            self.notification_handler.build_and_send_notification(
-                notification_id=f"OPC_WRITE_DATA_ERROR_{self.id}",
-                message=f"Failed to write data to OPC server: {e} | metadata: {metadata}",
-                block="opc_repository",
-                level=NotificationLevel.ERROR,
-                attachment_content=trace
-            )
             logger.custom_error(trace, metadata.get('schedule_name', 'N/A'))
             self.error_count += 1
-            return False
+            return False, {
+                "notification_id": f"OPC_WRITE_DATA_ERROR_{self.id}",
+                "message": f"Failed to write data to OPC server: {e} | metadata: {metadata}",
+                "block": "opc_repository",
+                "level": NotificationLevel.ERROR,
+                "attachment_content": trace
+            }
         self.error_count = 0
 
-        return True
+        return True, {}