Add service patch and fix other bugs

src/primaite/game/agent/actions.py

@@ -89,7 +89,7 @@ class NodeServiceAbstractAction(AbstractAction):
         service_uuid = self.manager.get_service_uuid_by_idx(node_id, service_id)
         if node_uuid is None or service_uuid is None:
             return ["do_nothing"]
-        return ["network", "node", node_uuid, "services", service_uuid, self.verb]
+        return ["network", "node", node_uuid, "service", service_uuid, self.verb]
 
 
 class NodeServiceScanAction(NodeServiceAbstractAction):
@@ -156,6 +156,14 @@ class NodeServiceEnableAction(NodeServiceAbstractAction):
         self.verb: str = "enable"
 
 
+class NodeServicePatchAction(NodeServiceAbstractAction):
+    """Action which patches a service."""
+
+    def __init__(self, manager: "ActionManager", num_nodes: int, num_services: int, **kwargs) -> None:
+        super().__init__(manager=manager, num_nodes=num_nodes, num_services=num_services)
+        self.verb: str = "patch"
+
+
 class NodeApplicationAbstractAction(AbstractAction):
     """
     Base class for application actions.
@@ -262,7 +270,7 @@ class NodeFileAbstractAction(AbstractAction):
         file_uuid = self.manager.get_file_uuid_by_idx(node_idx=node_id, folder_idx=folder_id, file_idx=file_id)
         if node_uuid is None or folder_uuid is None or file_uuid is None:
             return ["do_nothing"]
-        return ["network", "node", node_uuid, "file_system", "folder", folder_uuid, "files", file_uuid, self.verb]
+        return ["network", "node", node_uuid, "file_system", "folder", folder_uuid, "file", file_uuid, self.verb]
 
 
 class NodeFileScanAction(NodeFileAbstractAction):
@@ -566,6 +574,7 @@ class ActionManager:
         "NODE_SERVICE_RESTART": NodeServiceRestartAction,
         "NODE_SERVICE_DISABLE": NodeServiceDisableAction,
         "NODE_SERVICE_ENABLE": NodeServiceEnableAction,
+        "NODE_SERVICE_PATCH": NodeServicePatchAction,
         "NODE_APPLICATION_EXECUTE": NodeApplicationExecuteAction,
         "NODE_FILE_SCAN": NodeFileScanAction,
         "NODE_FILE_CHECKHASH": NodeFileCheckhashAction,
@@ -594,6 +603,7 @@ class ActionManager:
         actions: List[str],  # stores list of actions available to agent
         node_uuids: List[str],  # allows mapping index to node
         application_uuids: List[List[str]],  # allows mapping index to application
+        service_uuids: List[List[str]],  # allows mapping index to service
         max_folders_per_node: int = 2,  # allows calculating shape
         max_files_per_folder: int = 2,  # allows calculating shape
         max_services_per_node: int = 2,  # allows calculating shape
@@ -635,6 +645,7 @@ class ActionManager:
         self.game: "PrimaiteGame" = game
         self.node_uuids: List[str] = node_uuids
         self.application_uuids: List[List[str]] = application_uuids
+        self.service_uuids: List[List[str]] = service_uuids
         self.protocols: List[str] = protocols
         self.ports: List[str] = ports
 
@@ -804,6 +815,11 @@ class ActionManager:
         :return: The UUID of the service. Or None if the node has fewer services than the given index.
         :rtype: Optional[str]
         """
+        # if a mapping was specified, use that mapping, otherwise just use the list of all installed services
+        if self.service_uuids:
+            if self.service_uuids[node_idx]:
+                return self.service_uuids[node_idx][service_idx]
+
         node_uuid = self.get_node_uuid_by_idx(node_idx)
         node = self.game.simulation.network.nodes[node_uuid]
         service_uuids = list(node.services.keys())

src/primaite/game/game.py

@@ -361,6 +361,7 @@ class PrimaiteGame:
             # CREATE ACTION SPACE
             action_space_cfg["options"]["node_uuids"] = []
             action_space_cfg["options"]["application_uuids"] = []
+            action_space_cfg["options"]["service_uuids"] = []
 
             # if a list of nodes is defined, convert them from node references to node UUIDs
             for action_node_option in action_space_cfg.get("options", {}).pop("nodes", {}):
@@ -375,10 +376,21 @@ class PrimaiteGame:
                         #  node_uuid, whereas here the application gets added by uuid.
                         application_uuid = game.ref_map_applications[application_option["application_ref"]]
                         node_application_uuids.append(application_uuid)
-
                     action_space_cfg["options"]["application_uuids"].append(node_application_uuids)
+
                 else:
                     action_space_cfg["options"]["application_uuids"].append([])
+
+                if "services" in action_node_option:
+                    node_service_uuids = []
+                    for service_option in action_node_option["services"]:
+                        service_uuid = game.ref_map_services[service_option["service_ref"]]
+                        node_service_uuids.append(service_uuid)
+                    action_space_cfg["options"]["service_uuids"].append(node_service_uuids)
+
+                else:
+                    action_space_cfg["options"]["service_uuids"].append([])
+
             # Each action space can potentially have a different list of nodes that it can apply to. Therefore,
             # we will pass node_uuids as a part of the action space config.
             # However, it's not possible to specify the node uuids directly in the config, as they are generated