#2459 back-sync b8 changes into core

src/primaite/session/environment.py

@@ -26,6 +26,9 @@ class PrimaiteGymEnv(gymnasium.Env):
     def __init__(self, game_config: Dict):
         """Initialise the environment."""
         super().__init__()
+        self.io = PrimaiteIO.from_config(game_config.get("io_settings", {}))
+        """Handles IO for the environment. This produces sys logs, agent logs, etc."""
+
         self.game_config: Dict = game_config
         """PrimaiteGame definition. This can be changed between episodes to enable curriculum learning."""
         self.io = PrimaiteIO.from_config(game_config.get("io_settings", {}))
@@ -49,6 +52,7 @@ class PrimaiteGymEnv(gymnasium.Env):
         step = self.game.step_counter
         self.agent.store_action(action)
         # apply_agent_actions accesses the action we just stored
+        self.game.pre_timestep()
         self.game.apply_agent_actions()
         self.game.advance_timestep()
         state = self.game.get_sim_state()
@@ -224,6 +228,7 @@ class PrimaiteRayMARLEnv(MultiAgentEnv):
         # 1. Perform actions
         for agent_name, action in actions.items():
             self.agents[agent_name].store_action(action)
+        self.game.pre_timestep()
         self.game.apply_agent_actions()
 
         # 2. Advance timestep

src/primaite/session/io.py

@@ -29,10 +29,12 @@ class PrimaiteIO:
         """Whether to save a log of all agents' actions every step."""
         save_step_metadata: bool = False
         """Whether to save the RL agents' action, environment state, and other data at every single step."""
-        save_pcap_logs: bool = False
+        save_pcap_logs: bool = True
         """Whether to save PCAP logs."""
-        save_sys_logs: bool = False
+        save_sys_logs: bool = True
         """Whether to save system logs."""
+        write_sys_log_to_terminal: bool = False
+        """Whether to write the sys log to the terminal."""
 
     def __init__(self, settings: Optional[Settings] = None) -> None:
         """
@@ -47,6 +49,7 @@ class PrimaiteIO:
         SIM_OUTPUT.path = self.session_path / "simulation_output"
         SIM_OUTPUT.save_pcap_logs = self.settings.save_pcap_logs
         SIM_OUTPUT.save_sys_logs = self.settings.save_sys_logs
+        SIM_OUTPUT.write_sys_log_to_terminal = self.settings.write_sys_log_to_terminal
 
     def generate_session_path(self, timestamp: Optional[datetime] = None) -> Path:
         """Create a folder for the session and return the path to it."""
@@ -93,4 +96,5 @@ class PrimaiteIO:
     def from_config(cls, config: Dict) -> "PrimaiteIO":
         """Create an instance of PrimaiteIO based on a configuration dict."""
         new = cls(settings=cls.Settings(**config))
+
         return new