SIENTIAPDE-1110

Refactor notification handling in Gates and OPC activities to use send_notification method with metadata integration, enhancing error reporting and traceability.

tests/laborious/activities/test_opc.py

@@ -5,6 +5,15 @@ from laborious.activities.opc import NotificationLevel
 
 from laborious.activities.opc import OPC
 
+metadata = {
+    "metadata": {
+        "model_id": "test_model",
+        "model_name": "test_model",
+        "workflow_name": "test_workflow",
+        "schema_name": "test_schedule",
+    },
+}
+
 
 @patch("laborious.activities.opc.OpcRepository")
 def test___init__(mock_opc_repository):
@@ -15,6 +24,7 @@ def test___init__(mock_opc_repository):
     mock_notification_handler = MagicMock()
     servers = {
         'server1': {
+            'id': 'server1',
             'url': 'http://localhost:8080',
             'server_uri': 'opc.tcp://localhost:4840',
             'cert_path': '',
@@ -23,6 +33,7 @@ def test___init__(mock_opc_repository):
             'reconnection_interval': 60,
         },
         'server2': {
+            'id': 'server2',
             'url': 'http://localhost:8080',
             'server_uri': 'opc.tcp://localhost:4840',
             'cert_path': '',
@@ -45,7 +56,7 @@ def test___init__(mock_opc_repository):
 
     mock_opc_repository.assert_has_calls([
         call(
-            name="server1",
+            id="server1",
             url="http://localhost:8080",
             logger=mock_logger,
             server_uri="opc.tcp://localhost:4840",
@@ -58,7 +69,7 @@ def test___init__(mock_opc_repository):
     ])
     mock_opc_repository.assert_has_calls([
         call(
-            name="server2",
+            id="server2",
             url="http://localhost:8080",
             logger=mock_logger,
             server_uri="opc.tcp://localhost:4840",
@@ -79,6 +90,7 @@ def test___init__(mock_opc_repository):
 def opc(mock_opc_repository):
     servers = {
         'server1': {
+            'id': 'server1',
             'url': 'http://localhost:8080',
             'server_uri': 'opc.tcp://localhost:4840',
             'cert_path': '',
@@ -90,12 +102,15 @@ def opc(mock_opc_repository):
     mock_opc_repository.write_data = MagicMock(
         return_value=True
     )
-    return OPC(
+    opc = OPC(
         opc_servers=servers,
         logger=MagicMock(),
         notification_handler=MagicMock()
     )
 
+    opc.send_notification = MagicMock()
+    return opc
+
 
 WRITE_DATA_CASES = [
     ('tag1', 'int', 50),
@@ -107,10 +122,10 @@ WRITE_DATA_CASES = [
 
 @mark.parametrize('tag,data_type,data', WRITE_DATA_CASES)
 def test_write_data_success(opc, tag, data_type, data):
-    assert opc.write_data(server='server1', tag=tag, data=data,
-                          data_type=data_type, tag_type='prediction')
+    assert opc.write_data(server_id='server1', tag=tag, data=data,
+                          data_type=data_type, tag_type='prediction', metadata=metadata)
     opc.opc_repository['server1'].write_data.assert_called_once_with(
-        tag, data, data_type)
+        tag, data, data_type, opc.logger, metadata)
 
 
 def test_write_data_exception(opc):
@@ -118,11 +133,12 @@ def test_write_data_exception(opc):
         "Test error")
 
     try:
-        opc.write_data(server='server1', tag='tag1', data=50,
-                       data_type='int', tag_type='prediction')
+        opc.write_data(server_id='server1', tag='tag1', data=50,
+                       data_type='int', tag_type='prediction', metadata=metadata)
 
     except Exception:
-        opc.notification_handler.build_and_send_notification.assert_called_once_with(
+        opc.send_notification.assert_called_once_with(
+            metadata=metadata,
             notification_id="WRITE_OPC_PREDICTION_ERROR",
             message="Error writing data to OPC server: Test error",
             block="write_opc_data",
@@ -138,6 +154,7 @@ def test_write_data_exception(opc):
 async def test_write_opc_data_success(opc):
     # Arrange
     input_data = {
+        **metadata,
         'data': {
             'prediction': [0.75],
             'prediction_confidence': [0.95]
@@ -163,19 +180,21 @@ async def test_write_opc_data_success(opc):
     assert output == {'data': 'data'}
     opc.write_data.assert_has_calls([
         call(
-            server='server1',
+            server_id='server1',
             tag='tag1',
             data=0.75,
             data_type='float',
-            tag_type='prediction'
+            tag_type='prediction',
+            metadata=metadata['metadata']
         )])
     opc.write_data.assert_has_calls([
         call(
-            server='server1',
+            server_id='server1',
             tag='tag2',
             data=0.95,
             data_type='float',
-            tag_type='confidence'
+            tag_type='confidence',
+            metadata=metadata['metadata']
         )
     ])
     assert opc.write_data.call_count == 2
@@ -185,6 +204,7 @@ async def test_write_opc_data_success(opc):
 async def test_write_opc_data_empty_config(opc):
     # Arrange
     input_data = {
+        **metadata,
         'data': {
             'prediction': [0.75],
             'prediction_confidence': [0.95]
@@ -209,7 +229,7 @@ async def test_write_opc_data_empty_config(opc):
 ])
 def test_process_confidence(opc, data, success, expected):
     # Act
-    result = opc.process_confidence(data, success)
+    result = opc.process_confidence(data, success, metadata)
 
     # Assert
     assert result['prediction_confidence'][0] == expected