Fix typos and TODOs

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

@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from abc import ABC
-from typing import List, Literal, Union
+from typing import Literal, Union
 
 from primaite.game.agent.actions.manager import AbstractAction
 from primaite.interface.request import RequestFormat
@@ -59,7 +59,7 @@ class RouterACLAddRuleAction(ACLAddRuleAbstractAction, identifier="router_acl_ad
         target_router: str
 
     @classmethod
-    def form_request(cls, config: ConfigSchema) -> List[str]:
+    def form_request(cls, config: ConfigSchema) -> RequestFormat:
         """Return the action formatted as a request which can be ingested by the PrimAITE simulation."""
         return [
             "network",
@@ -143,7 +143,7 @@ class FirewallACLRemoveRuleAction(ACLRemoveRuleAbstractAction, identifier="firew
         firewall_port_direction: str
 
     @classmethod
-    def form_request(cls, config: ConfigSchema) -> List[str]:
+    def form_request(cls, config: ConfigSchema) -> RequestFormat:
         """Return the action formatted as a request which can be ingested by the PrimAITE simulation."""
         return [
             "network",

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

@@ -18,7 +18,6 @@ from typing import Dict, Tuple
 from gymnasium import spaces
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
-# from primaite.game.game import PrimaiteGame # TODO: Breaks things
 from primaite.game.agent.actions.abstract import AbstractAction
 from primaite.interface.request import RequestFormat
 

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

@@ -110,7 +110,7 @@ class NodeNMAPPingScanAction(NodeNMAPAbstractAction, identifier="node_nmap_ping_
     config: "NodeNMAPPingScanAction.ConfigSchema"
 
     @classmethod
-    def form_request(cls, config: "NodeNMAPPingScanAction.ConfigSchema") -> List[str]:  # noqa
+    def form_request(cls, config: "NodeNMAPPingScanAction.ConfigSchema") -> RequestFormat:
         """Return the action formatted as a request which can be ingested by the PrimAITE simulation."""
         return [
             "network",
@@ -137,10 +137,7 @@ class NodeNMAPPortScanAction(NodeNMAPAbstractAction, identifier="node_nmap_port_
         show: Optional[bool] = (False,)
 
     @classmethod
-    def form_request(
-        cls,
-        config: ConfigSchema,
-    ) -> List[str]:  # noqa
+    def form_request(cls, config: ConfigSchema) -> RequestFormat:
         """Return the action formatted as a request which can be ingested by the PrimAITE simulation."""
         return [
             "network",
@@ -171,10 +168,7 @@ class NodeNetworkServiceReconAction(NodeNMAPAbstractAction, identifier="node_net
         show: Optional[bool] = (False,)
 
     @classmethod
-    def form_request(
-        cls,
-        config: ConfigSchema,
-    ) -> List[str]:  # noqa
+    def form_request(cls, config: ConfigSchema) -> RequestFormat:
         """Return the action formatted as a request which can be ingested by the PrimAITE simulation."""
         return [
             "network",

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

@@ -2,7 +2,7 @@
 
 from typing import List, Optional, Union
 
-from pydantic import ConfigDict, Field, field_validator, ValidationInfo
+from pydantic import ConfigDict, Field
 
 from primaite.game.agent.actions.manager import AbstractAction
 from primaite.interface.request import RequestFormat
@@ -100,21 +100,6 @@ class ConfigureC2BeaconAction(AbstractAction, identifier="configure_c2_beacon"):
         masquerade_protocol: str = Field(default="TCP")
         masquerade_port: str = Field(default="HTTP")
 
-        # TODO: this validator should not be needed anymore, test what happens if removed.
-        @field_validator(
-            "c2_server_ip_address",
-            "keep_alive_frequency",
-            "masquerade_protocol",
-            "masquerade_port",
-            mode="before",
-        )
-        @classmethod
-        def not_none(cls, v: str, info: ValidationInfo) -> int:
-            """If None is passed, use the default value instead."""
-            if v is None:
-                return cls.model_fields[info.field_name].default
-            return v
-
     @classmethod
     def form_request(self, config: ConfigSchema) -> RequestFormat:
         """Return the action formatted as a request that can be ingested by the simulation."""

src/primaite/game/agent/interface.py

@@ -132,7 +132,7 @@ class AbstractAgent(BaseModel, ABC):
         # then use a bespoke conversion to take 1-40 int back into CAOS action
         return ("do_nothing", {})
 
-    def format_request(self, action: Tuple[str, Dict], options: Dict[str, int]) -> List[str]:
+    def format_request(self, action: Tuple[str, Dict], options: Dict[str, int]) -> RequestFormat:
         # this will take something like APPLICATION.EXECUTE and add things like target_ip_address in simulator.
         # therefore the execution definition needs to be a mapping from CAOS into SIMULATOR
         """Format action into format expected by the simulator, and apply execution definition if applicable."""