#1859 - As disccused

src/primaite/game/agent/actions.py

@@ -634,7 +634,6 @@ class ActionManager:
         :type act_map: Optional[Dict[int, Dict]]
         """
         self.game: "PrimaiteGame" = game
-        self.sim: Simulation = self.game.simulation
         self.node_uuids: List[str] = node_uuids
         self.application_uuids: List[List[str]] = application_uuids
         self.protocols: List[str] = protocols
@@ -646,7 +645,7 @@ class ActionManager:
         else:
             self.ip_address_list = []
             for node_uuid in self.node_uuids:
-                node_obj = self.sim.network.nodes[node_uuid]
+                node_obj = self.game.simulation.network.nodes[node_uuid]
                 nics = node_obj.nics
                 for nic_uuid, nic_obj in nics.items():
                     self.ip_address_list.append(nic_obj.ip_address)
@@ -770,7 +769,7 @@ class ActionManager:
         :rtype: Optional[str]
         """
         node_uuid = self.get_node_uuid_by_idx(node_idx)
-        node = self.sim.network.nodes[node_uuid]
+        node = self.game.simulation.network.nodes[node_uuid]
         folder_uuids = list(node.file_system.folders.keys())
         return folder_uuids[folder_idx] if len(folder_uuids) > folder_idx else None
 
@@ -788,7 +787,7 @@ class ActionManager:
         :rtype: Optional[str]
         """
         node_uuid = self.get_node_uuid_by_idx(node_idx)
-        node = self.sim.network.nodes[node_uuid]
+        node = self.game.simulation.network.nodes[node_uuid]
         folder_uuids = list(node.file_system.folders.keys())
         if len(folder_uuids) <= folder_idx:
             return None
@@ -807,7 +806,7 @@ class ActionManager:
         :rtype: Optional[str]
         """
         node_uuid = self.get_node_uuid_by_idx(node_idx)
-        node = self.sim.network.nodes[node_uuid]
+        node = self.game.simulation.network.nodes[node_uuid]
         service_uuids = list(node.services.keys())
         return service_uuids[service_idx] if len(service_uuids) > service_idx else None
 
@@ -867,7 +866,7 @@ class ActionManager:
         :rtype: str
         """
         node_uuid = self.get_node_uuid_by_idx(node_idx)
-        node_obj = self.sim.network.nodes[node_uuid]
+        node_obj = self.game.simulation.network.nodes[node_uuid]
         nics = list(node_obj.nics.keys())
         if len(nics) <= nic_idx:
             return None

src/primaite/game/agent/observations.py

@@ -162,7 +162,7 @@ class ServiceObservation(AbstractObservation):
         :return: Constructed service observation
         :rtype: ServiceObservation
         """
-        return cls(where=parent_where + ["services", game.ref_map_services[config["service_ref"]].uuid])
+        return cls(where=parent_where + ["services", game.ref_map_services[config["service_ref"]]])
 
 
 class LinkObservation(AbstractObservation):

src/primaite/game/agent/rewards.py

@@ -25,6 +25,7 @@ the structure:
                 service_ref: web_server_database_client
 ```
 """
+import json
 from abc import abstractmethod
 from typing import Dict, List, Tuple, Type, TYPE_CHECKING
 
@@ -213,7 +214,7 @@ class WebServer404Penalty(AbstractReward):
             _LOGGER.warn(msg)
             return DummyReward()  # TODO: should we error out with incorrect inputs? Probably!
         node_uuid = game.ref_map_nodes[node_ref]
-        service_uuid = game.ref_map_services[service_ref].uuid
+        service_uuid = game.ref_map_services[service_ref]
         if not (node_uuid and service_uuid):
             msg = (
                 f"{cls.__name__} could not be initialised because node {node_ref} and service {service_ref} were not"