Finalise the refactor. It works well now.

src/primaite/simulator/network/container.py

@@ -48,9 +48,9 @@ class Network(SimComponent):
     def setup_for_episode(self, episode: int):
         """Reset the original state of the SimComponent."""
         for node in self.nodes.values():
-            node.setup_for_episode(episode)
+            node.setup_for_episode(episode=episode)
         for link in self.links.values():
-            link.setup_for_episode(episode)
+            link.setup_for_episode(episode=episode)
 
         for node in self.nodes.values():
             node.power_on()
@@ -172,7 +172,7 @@ class Network(SimComponent):
     def clear_links(self):
         """Clear all the links in the network by resetting their component state for the episode."""
         for link in self.links.values():
-            link.setup_for_episode()
+            link.setup_for_episode(episode=0)  # TODO: shouldn't be using this method here.
 
     def draw(self, seed: int = 123):
         """

src/primaite/simulator/network/hardware/base.py

@@ -90,7 +90,7 @@ class NetworkInterface(SimComponent, ABC):
 
     def setup_for_episode(self, episode: int):
         """Reset the original state of the SimComponent."""
-        super().setup_for_episode(episode)
+        super().setup_for_episode(episode=episode)
         if episode and self.pcap:
             self.pcap.current_episode = episode
             self.pcap.setup_logger()
@@ -643,17 +643,17 @@ class Node(SimComponent):
 
     def setup_for_episode(self, episode: int):
         """Reset the original state of the SimComponent."""
-        super().setup_for_episode(episode)
+        super().setup_for_episode(episode=episode)
 
         # Reset File System
-        self.file_system.setup_for_episode(episode)
+        self.file_system.setup_for_episode(episode=episode)
 
         # Reset all Nics
         for network_interface in self.network_interfaces.values():
-            network_interface.setup_for_episode(episode)
+            network_interface.setup_for_episode(episode=episode)
 
         for software in self.software_manager.software.values():
-            software.setup_for_episode(episode)
+            software.setup_for_episode(episode=episode)
 
         if episode and self.sys_log:
             self.sys_log.current_episode = episode

src/primaite/simulator/network/hardware/nodes/network/router.py

@@ -1078,7 +1078,7 @@ class Router(NetworkNode):
         for i, _ in self.network_interface.items():
             self.enable_port(i)
 
-        super().setup_for_episode(episode)
+        super().setup_for_episode(episode=episode)
 
     def _init_request_manager(self) -> RequestManager:
         rm = super()._init_request_manager()

src/primaite/simulator/sim_container.py

@@ -23,7 +23,7 @@ class Simulation(SimComponent):
 
     def setup_for_episode(self, episode: int):
         """Reset the original state of the SimComponent."""
-        self.network.setup_for_episode(episode)
+        self.network.setup_for_episode(episode=episode)
 
     def _init_request_manager(self) -> RequestManager:
         rm = super()._init_request_manager()

src/primaite/simulator/system/services/web_server/web_server.py

@@ -118,7 +118,7 @@ class WebServer(Service):
                     self.set_health_state(SoftwareHealthState.COMPROMISED)
 
             return response
-        except Exception:
+        except Exception:  # TODO: refactor this. Likely to cause silent bugs.
             # something went wrong on the server
             response.status_code = HttpStatusCode.INTERNAL_SERVER_ERROR
             return response

src/primaite/simulator/system/software.py

@@ -3,7 +3,7 @@ from abc import abstractmethod
 from datetime import datetime
 from enum import Enum
 from ipaddress import IPv4Address, IPv4Network
-from typing import Any, Dict, Optional, Union
+from typing import Any, Dict, Optional, TYPE_CHECKING, Union
 
 from primaite.simulator.core import _LOGGER, RequestManager, RequestType, SimComponent
 from primaite.simulator.file_system.file_system import FileSystem, Folder
@@ -13,6 +13,9 @@ from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.core.session_manager import Session
 from primaite.simulator.system.core.sys_log import SysLog
 
+if TYPE_CHECKING:
+    from primaite.simulator.system.core.software_manager import SoftwareManager
+
 
 class SoftwareType(Enum):
     """
@@ -84,7 +87,7 @@ class Software(SimComponent):
     "The count of times the software has been scanned, defaults to 0."
     revealed_to_red: bool = False
     "Indicates if the software has been revealed to red agent, defaults is False."
-    software_manager: Any = None
+    software_manager: "SoftwareManager" = None
     "An instance of Software Manager that is used by the parent node."
     sys_log: SysLog = None
     "An instance of SysLog that is used by the parent node."