Merge remote-tracking branch 'origin/dev' into feature/2840_LOCAL_TERMINAL_COMMAND

src/primaite/config/_package_data/data_manipulation.yaml

@@ -843,7 +843,6 @@ simulation:
       dns_server: 192.168.1.10
       services:
       - type: FTPServer
-
     - hostname: security_suite
       type: server
       ip_address: 192.168.1.110

src/primaite/game/agent/interface.py

@@ -38,6 +38,9 @@ class AgentHistoryItem(BaseModel):
 
     reward_info: Dict[str, Any] = {}
 
+    observation: Optional[ObsType] = None
+    """The observation space data for this step."""
+
 
 class AgentStartSettings(BaseModel):
     """Configuration values for when an agent starts performing actions."""
@@ -169,12 +172,23 @@ class AbstractAgent(ABC):
         return request
 
     def process_action_response(
-        self, timestep: int, action: str, parameters: Dict[str, Any], request: RequestFormat, response: RequestResponse
+        self,
+        timestep: int,
+        action: str,
+        parameters: Dict[str, Any],
+        request: RequestFormat,
+        response: RequestResponse,
+        observation: ObsType,
     ) -> None:
         """Process the response from the most recent action."""
         self.history.append(
             AgentHistoryItem(
-                timestep=timestep, action=action, parameters=parameters, request=request, response=response
+                timestep=timestep,
+                action=action,
+                parameters=parameters,
+                request=request,
+                response=response,
+                observation=observation,
             )
         )
 

src/primaite/game/game.py

@@ -17,6 +17,7 @@ from primaite.game.agent.scripted_agents.random_agent import PeriodicAgent
 from primaite.game.agent.scripted_agents.tap001 import TAP001
 from primaite.game.science import graph_has_cycle, topological_sort
 from primaite.simulator import SIM_OUTPUT
+from primaite.simulator.file_system.file_type import FileType
 from primaite.simulator.network.airspace import AirSpaceFrequency
 from primaite.simulator.network.hardware.base import NetworkInterface, NodeOperatingState, UserManager
 from primaite.simulator.network.hardware.nodes.host.computer import Computer
@@ -186,6 +187,7 @@ class PrimaiteGame:
                 parameters=parameters,
                 request=request,
                 response=response,
+                observation=obs,
             )
 
     def pre_timestep(self) -> None:
@@ -329,6 +331,26 @@ class PrimaiteGame:
                 _LOGGER.error(msg)
                 raise ValueError(msg)
 
+            # handle node file system
+            if node_cfg.get("file_system"):
+                for folder_idx, folder_obj in enumerate(node_cfg.get("file_system")):
+                    # if the folder is not a Dict, create an empty folder
+                    if not isinstance(folder_obj, Dict):
+                        new_node.file_system.create_folder(folder_name=folder_obj)
+                    else:
+                        folder_name = next(iter(folder_obj))
+                        for file_idx, file_obj in enumerate(node_cfg["file_system"][folder_idx][folder_name]):
+                            if not isinstance(file_obj, Dict):
+                                new_node.file_system.create_file(folder_name=folder_name, file_name=file_obj)
+                            else:
+                                file_name = next(iter(file_obj))
+                                new_node.file_system.create_file(
+                                    folder_name=folder_name,
+                                    file_name=file_name,
+                                    size=file_obj[file_name].get("size", 0),
+                                    file_type=FileType[file_obj[file_name].get("type", "UNKNOWN").upper()],
+                                )
+
             if "users" in node_cfg and new_node.software_manager.software.get("UserManager"):
                 user_manager: UserManager = new_node.software_manager.software["UserManager"]  # noqa
                 for user_cfg in node_cfg["users"]: