SIENTIAPDE-1312

SIENTIAPDE-1312: Refactor build_tag_config to accept a list of tags and return notifications for missing servers. Update Formatters to handle notifications during slot configuration. Enhance tests to validate new behavior and error reporting.

orchestrator/activities/formatters.py

@@ -163,36 +163,31 @@ class Formatters(BaseActivity):
         last_index = 0
 
         for i in range(1, number_of_slots):
-            slot_config[f'{i}'] = {}
-            for tag in tags[last_index : last_index + tags_per_slot]:
-                try:
-                    slot_config = build_tag_config(tag, slot_config.copy(), opc_servers, i)
-                except ValueError as e:
-                    self.send_notification(
-                        metadata=metadata,
-                        notification_id='ORCHESTRATOR_BUILD_TAG_CONFIG_ERROR',
-                        message=str(e),
-                        block='orchestrator',
-                        level=NotificationLevel.ERROR,
-                    )
+            slot_tags = tags[last_index : last_index + tags_per_slot]
+            slot_config[f'{i}'], notifications = build_tag_config(slot_tags, opc_servers)
 
-            last_index += tags_per_slot
-
-        slot_config[f'{number_of_slots}'] = {}
-        for tag in tags[last_index:]:
-            try:
-                slot_config = build_tag_config(
-                    tag, slot_config.copy(), opc_servers, number_of_slots
-                )
-            except ValueError as e:
+            if notifications:
                 self.send_notification(
                     metadata=metadata,
-                    notification_id='ORCHESTRATOR_BUILD_TAG_CONFIG_ERROR',
-                    message=str(e),
+                    notification_id='ORCHESTRATOR_SERVER_NOT_FOUND_DURING_SLOT_CONFIGURATION',
+                    message=f'Servers {", ".join(notifications)} not found in opc_servers',
                     block='orchestrator',
                     level=NotificationLevel.ERROR,
                 )
 
+            last_index += tags_per_slot
+
+        slot_tags = tags[last_index:]
+        slot_config[f'{number_of_slots}'], notifications = build_tag_config(slot_tags, opc_servers)
+        if notifications:
+            self.send_notification(
+                metadata=metadata,
+                notification_id='ORCHESTRATOR_SERVER_NOT_FOUND_DURING_SLOT_CONFIGURATION',
+                message=f'Servers {", ".join(notifications)} not found in opc_servers',
+                block='orchestrator',
+                level=NotificationLevel.ERROR,
+            )
+
         self.info('Processed slots', metadata=metadata)
         self.debug(json.dumps(slot_config, indent=4, sort_keys=True), metadata=metadata)
 

orchestrator/utils/orchestrator_functions.py

@@ -240,13 +240,13 @@ def gather_read_tags(pipelines: list[dict[str, Any]]) -> dict[str, Any]:
 
 
 def build_tag_config(
-    tag: dict[str, Any], slot_config: dict[str, Any], opc_servers: dict[str, Any], i: int
-):
+    tags: list[dict[str, Any]], opc_servers: dict[str, Any]
+) -> tuple[dict[str, Any], list]:
     """
     Build tag configuration for a specific slot and OPC server.
 
     Args:
-        tag (dict[str, Any]): Tag configuration containing:
+        tags (list[dict[str, Any]]): List of tag configurations containing:
             - server_id (str): ID of the OPC server
             - tag_address (str): Address of the tag
         slot_config (dict[str, Any]): Current slot configuration to update.
@@ -259,32 +259,39 @@ def build_tag_config(
     Raises:
         ValueError: If the specified server_id is not found in opc_servers.
     """
-    server_id = tag['server_id']
 
-    if server_id not in opc_servers:
-        raise ValueError(f'Server {server_id} not found in opc_servers')
+    slot_config = {}
+    notifications = []
 
-    server_name = opc_servers[server_id]['server_name']
-    if server_name not in slot_config[f'{i}']:
-        slot_config[f'{i}'][server_name] = {
-            'server_id': server_id,
-            'name': server_name,
-            'url': opc_servers[server_id]['url'],
-            'server_uri': opc_servers[server_id]['uri'],
-            'cert_path': opc_servers[server_id].get('cert_path', None),
-            'private_key_path': opc_servers[server_id].get('private_key_path', None),
-            'server_cert_path': opc_servers[server_id].get('server_cert_path', None),
-            'tags': {},
+    for tag in tags:
+        server_id = tag['server_id']
+
+        if server_id not in opc_servers:
+            notifications.append(server_id)
+            continue
+
+        server_name = opc_servers[server_id]['server_name']
+        if server_name not in slot_config:
+            slot_config[server_name] = {
+                'server_id': server_id,
+                'name': server_name,
+                'url': opc_servers[server_id]['url'],
+                'server_uri': opc_servers[server_id]['uri'],
+                'cert_path': opc_servers[server_id].get('cert_path', None),
+                'private_key_path': opc_servers[server_id].get('private_key_path', None),
+                'server_cert_path': opc_servers[server_id].get('server_cert_path', None),
+                'tags': {},
+            }
+
+        slot_config[server_name]['tags'][tag['tag_address']] = {
+            **tag,
         }
 
-    slot_config[f'{i}'][server_name]['tags'][tag['tag_address']] = {
-        **tag,
-    }
+    for server_name in slot_config:
+        frequencies = [int(x['frequency']) for x in slot_config[server_name]['tags'].values()]
 
-    frequencies = [int(x['frequency']) for x in slot_config[f'{i}'][server_name]['tags'].values()]
+        min_frequency = min(frequencies) if frequencies else 1000
 
-    min_frequency = min(frequencies) if frequencies else 1000
+        slot_config[server_name]['subscription_period_ms'] = min_frequency / 2
 
-    slot_config[f"{i}"][server_name]['subscription_period_ms'] = min_frequency/2
-
-    return slot_config
+    return slot_config, notifications