#2912 - Replace DONOTHING reference with do_nothing, tweaks following milpac actions

src/primaite/game/agent/actions/manager.py

@@ -28,7 +28,7 @@ class DoNothingAction(AbstractAction, identifier="do_nothing"):
     """Do Nothing Action."""
 
     class ConfigSchema(AbstractAction.ConfigSchema):
-        """Configuration Schema for DoNothingAction."""
+        """Configuration Schema for do_nothingAction."""
 
         type: str = "do_nothing"
 
@@ -44,6 +44,7 @@ class ActionManager:
     def __init__(
         self,
         actions: List[Dict],  # stores list of actions available to agent
+        nodes: List[Dict],  # extra configuration for each node
         act_map: Optional[
             Dict[int, Dict]
         ] = None,  # allows restricting set of possible actions - TODO: Refactor to be a list?
@@ -79,6 +80,8 @@ class ActionManager:
             self.action_map = {i: (a["action"], a["options"]) for i, a in act_map.items()}
         # make sure all numbers between 0 and N are represented as dict keys in action map
         assert all([i in self.action_map.keys() for i in range(len(self.action_map))])
+        self.node_names: List[str] = [n["node_name"] for n in nodes]
+        """List of node names in this action space. The list order is the mapping between node index and node name."""
 
     def get_action(self, action: int) -> Tuple[str, Dict]:
         """Produce action in CAOS format."""

src/primaite/game/agent/actions/node.py

@@ -34,7 +34,8 @@ class NodeAbstractAction(AbstractAction, identifier="node_abstract"):
     @classmethod
     def form_request(cls, config: ConfigSchema) -> RequestFormat:
         """Return the action formatted as a request which can be ingested by the PrimAITE simulation."""
-        return ["network", "node", config.node_name, cls.config.verb]
+        print(config)
+        return ["network", "node", config.node_name, config.verb]
 
 
 class NodeOSScanAction(NodeAbstractAction, identifier="node_os_scan"):

src/primaite/game/agent/rewards.py

@@ -447,7 +447,7 @@ class SharedReward(AbstractReward):
 
 
 class ActionPenalty(AbstractReward):
-    """Apply a negative reward when taking any action except DONOTHING."""
+    """Apply a negative reward when taking any action except do_nothing."""
 
     def __init__(self, action_penalty: float, do_nothing_penalty: float) -> None:
         """
@@ -455,9 +455,9 @@ class ActionPenalty(AbstractReward):
 
         Reward or penalise agents for doing nothing or taking actions.
 
-        :param action_penalty: Reward to give agents for taking any action except DONOTHING
+        :param action_penalty: Reward to give agents for taking any action except do_nothing
         :type action_penalty: float
-        :param do_nothing_penalty: Reward to give agent for taking the DONOTHING action
+        :param do_nothing_penalty: Reward to give agent for taking the do_nothing action
         :type do_nothing_penalty: float
         """
         self.action_penalty = action_penalty
@@ -473,7 +473,7 @@ class ActionPenalty(AbstractReward):
         :return: Reward value
         :rtype: float
         """
-        if last_action_response.action == "DONOTHING":
+        if last_action_response.action == "do_nothing":
             return self.do_nothing_penalty
         else:
             return self.action_penalty

src/primaite/game/agent/scripted_agents/data_manipulation_bot.py

@@ -39,7 +39,7 @@ class DataManipulationAgent(AbstractScriptedAgent):
         """
         if timestep < self.next_execution_timestep:
             self.logger.debug(msg="Performing do NOTHING")
-            return "DONOTHING", {}
+            return "do_nothing", {}
 
         self._set_next_execution_timestep(timestep + self.agent_settings.start_settings.frequency)
         self.logger.info(msg="Performing a data manipulation attack!")

src/primaite/game/agent/scripted_agents/random_agent.py

@@ -81,4 +81,4 @@ class PeriodicAgent(AbstractScriptedAgent):
             self._set_next_execution_timestep(timestep + self.settings.frequency, self.settings.variance)
             return "NODE_APPLICATION_EXECUTE", {"node_id": 0, "application_id": 0}
 
-        return "DONOTHING", {}
+        return "do_nothing", {}

src/primaite/game/agent/scripted_agents/tap001.py

@@ -46,7 +46,7 @@ class TAP001(AbstractScriptedAgent):
         :rtype: Tuple[str, Dict]
         """
         if timestep < self.next_execution_timestep:
-            return "DONOTHING", {}
+            return "do_nothing", {}
 
         self._set_next_execution_timestep(timestep + self.agent_settings.start_settings.frequency)