Merge remote-tracking branch 'origin/dev' into feature/2319-database-admin

src/primaite/game/agent/actions.py

@@ -572,7 +572,7 @@ class NetworkNICDisableAction(NetworkNICAbstractAction):
 class ActionManager:
     """Class which manages the action space for an agent."""
 
-    _act_class_identifiers: Dict[str, type] = {
+    act_class_identifiers: Dict[str, type] = {
         "DONOTHING": DoNothingAction,
         "NODE_SERVICE_SCAN": NodeServiceScanAction,
         "NODE_SERVICE_STOP": NodeServiceStopAction,
@@ -733,7 +733,7 @@ class ActionManager:
             # and `options` is an optional dict of options to pass to the init method of the action class
             act_type = act_spec.get("type")
             act_options = act_spec.get("options", {})
-            self.actions[act_type] = self._act_class_identifiers[act_type](self, **global_action_args, **act_options)
+            self.actions[act_type] = self.act_class_identifiers[act_type](self, **global_action_args, **act_options)
 
         self.action_map: Dict[int, Tuple[str, Dict]] = {}
         """

src/primaite/game/agent/rewards.py

@@ -13,7 +13,7 @@ the structure:
             - type: DATABASE_FILE_INTEGRITY
             weight: 0.5
             options:
-                node_ref: database_server
+                node_name: database_server
                 folder_name: database
                 file_name: database.db
 
@@ -21,7 +21,7 @@ the structure:
             - type: WEB_SERVER_404_PENALTY
             weight: 0.5
             options:
-                node_ref: web_server
+                node_name: web_server
                 service_ref: web_server_database_client
 ```
 """
@@ -184,7 +184,7 @@ class WebServer404Penalty(AbstractReward):
         service_name = config.get("service_name")
         if not (node_hostname and service_name):
             msg = (
-                f"{cls.__name__} could not be initialised from config because node_ref and service_ref were not "
+                f"{cls.__name__} could not be initialised from config because node_name and service_ref were not "
                 "found in reward config."
             )
             _LOGGER.warning(msg)
@@ -285,13 +285,14 @@ class GreenAdminDatabaseUnreachablePenalty(AbstractReward):
 class RewardFunction:
     """Manages the reward function for the agent."""
 
-    __rew_class_identifiers: Dict[str, Type[AbstractReward]] = {
+    rew_class_identifiers: Dict[str, Type[AbstractReward]] = {
         "DUMMY": DummyReward,
         "DATABASE_FILE_INTEGRITY": DatabaseFileIntegrity,
         "WEB_SERVER_404_PENALTY": WebServer404Penalty,
         "WEBPAGE_UNAVAILABLE_PENALTY": WebpageUnavailablePenalty,
         "GREEN_ADMIN_DATABASE_UNREACHABLE_PENALTY": GreenAdminDatabaseUnreachablePenalty,
     }
+    """List of reward class identifiers."""
 
     def __init__(self):
         """Initialise the reward function object."""
@@ -338,7 +339,7 @@ class RewardFunction:
         for rew_component_cfg in config["reward_components"]:
             rew_type = rew_component_cfg["type"]
             weight = rew_component_cfg.get("weight", 1.0)
-            rew_class = cls.__rew_class_identifiers[rew_type]
+            rew_class = cls.rew_class_identifiers[rew_type]
             rew_instance = rew_class.from_config(config=rew_component_cfg.get("options", {}))
             new.register_component(component=rew_instance, weight=weight)
         return new