feat: update connector methods to return threading.Thread lists

Author: shima004

adf_core_python/core/launcher/connect/connector.py

@@ -1,3 +1,4 @@
+import threading
 from abc import ABC, abstractmethod
 
 from rcrs_core.connection.componentLauncher import ComponentLauncher
@@ -16,7 +17,7 @@ def connect(
         component_launcher: ComponentLauncher,
         config: Config,
         loader: AbstractLoader,
-    ) -> None:
+    ) -> list[threading.Thread]:
         raise NotImplementedError
 
     def get_connected_agent_count(self) -> int:

adf_core_python/core/launcher/connect/connector_ambulance_centre.py

@@ -1,3 +1,4 @@
+import threading
 from logging import Logger, getLogger
 
 from rcrs_core.agents.ambulanceCenterAgent import AmbulanceCenterAgent
@@ -21,10 +22,12 @@ def connect(
         component_launcher: ComponentLauncher,
         config: Config,
         loader: AbstractLoader,
-    ) -> None:
+    ) -> list[threading.Thread]:
         count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
-            return
+            return []
+
+        threads: list[threading.Thread] = []
 
         for _ in range(count):
             # tactics_ambulance_centre: TacticsAmbulanceCentre
@@ -50,12 +53,16 @@ def connect(
             )
 
             # TODO: component_launcher.generate_request_ID can cause race condition
-            component_launcher.connect(
-                # TODO: AmbulanceCenterAgent is not implemented precompute method and other methods
-                AmbulanceCenterAgent(
-                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
-                ),  # type: ignore
-                component_launcher.generate_request_ID(),
+            thread = threading.Thread(
+                target=component_launcher.connect,
+                args=(
+                    AmbulanceCenterAgent(
+                        config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
+                    ),  # type: ignore
+                    component_launcher.generate_request_ID(),
+                ),
             )
+            threads.append(thread)
 
         self.logger.info("Connected ambulance centre (count: %d)" % count)
+        return threads

adf_core_python/core/launcher/connect/connector_ambulance_team.py

@@ -1,3 +1,4 @@
+import threading
 from logging import Logger, getLogger
 
 from rcrs_core.connection.componentLauncher import ComponentLauncher
@@ -24,10 +25,12 @@ def connect(
         component_launcher: ComponentLauncher,
         config: Config,
         loader: AbstractLoader,
-    ) -> None:
+    ) -> list[threading.Thread]:
         count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
-            return
+            return []
+
+        threads: list[threading.Thread] = []
 
         for _ in range(count):
             if loader.get_tactics_ambulance_team() is None:
@@ -52,17 +55,23 @@ def connect(
             )
 
             # TODO: component_launcher.generate_request_ID can cause race condition
-            component_launcher.connect(
-                PlatoonAmbulance(
-                    tactics_ambulance_team,
-                    "ambulance_team",
-                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
-                    config.get_value(ConfigKey.KEY_DEBUG_FLAG, False),
-                    "test",
-                    module_config,
-                    develop_data,
+            # threading
+            thread = threading.Thread(
+                target=component_launcher.connect,
+                args=(
+                    PlatoonAmbulance(
+                        tactics_ambulance_team,
+                        "ambulance_team",
+                        config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
+                        config.get_value(ConfigKey.KEY_DEBUG_FLAG, False),
+                        "test",
+                        module_config,
+                        develop_data,
+                    ),
+                    component_launcher.generate_request_ID(),
                 ),
-                component_launcher.generate_request_ID(),
             )
+            threads.append(thread)
 
         self.logger.info("Connected ambulance team (count: %d)" % count)
+        return threads

adf_core_python/core/launcher/connect/connector_fire_brigade.py

@@ -1,3 +1,4 @@
+import threading
 from logging import Logger, getLogger
 
 from rcrs_core.agents.fireBrigadeAgent import FireBrigadeAgent
@@ -21,10 +22,12 @@ def connect(
         component_launcher: ComponentLauncher,
         config: Config,
         loader: AbstractLoader,
-    ) -> None:
+    ) -> list[threading.Thread]:
         count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
-            return
+            return []
+
+        threads: list[threading.Thread] = []
 
         for _ in range(count):
             # tactics_fire_brigade: TacticsFireBrigade
@@ -50,11 +53,16 @@ def connect(
             )
 
             # TODO: component_launcher.generate_request_ID can cause race condition
-            component_launcher.connect(
-                FireBrigadeAgent(
-                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
+            thread = threading.Thread(
+                target=component_launcher.connect,
+                args=(
+                    FireBrigadeAgent(
+                        config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
+                    ),
+                    component_launcher.generate_request_ID(),
                 ),
-                component_launcher.generate_request_ID(),
             )
+            threads.append(thread)
 
         self.logger.info("Connected fire brigade (count: %d)" % count)
+        return threads

adf_core_python/core/launcher/connect/connector_fire_station.py

@@ -1,3 +1,4 @@
+import threading
 from logging import Logger, getLogger
 
 from rcrs_core.agents.fireStationAgent import FireStationAgent
@@ -21,10 +22,12 @@ def connect(
         component_launcher: ComponentLauncher,
         config: Config,
         loader: AbstractLoader,
-    ) -> None:
+    ) -> list[threading.Thread]:
         count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
-            return
+            return []
+
+        threads: list[threading.Thread] = []
 
         for _ in range(count):
             # tactics_fire_station: TacticsFireStation
@@ -50,11 +53,16 @@ def connect(
             )
 
             # TODO: component_launcher.generate_request_ID can cause race condition
-            component_launcher.connect(
-                FireStationAgent(
-                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
-                ),  # type: ignore
-                component_launcher.generate_request_ID(),
+            thread = threading.Thread(
+                target=component_launcher.connect,
+                args=(
+                    FireStationAgent(
+                        config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
+                    ),  # type: ignore
+                    component_launcher.generate_request_ID(),
+                ),
             )
+            threads.append(thread)
 
         self.logger.info("Connected fire station (count: %d)" % count)
+        return threads

adf_core_python/core/launcher/connect/connector_police_force.py

@@ -1,3 +1,4 @@
+import threading
 from logging import Logger, getLogger
 
 from rcrs_core.agents.policeForceAgent import PoliceForceAgent
@@ -21,10 +22,12 @@ def connect(
         component_launcher: ComponentLauncher,
         config: Config,
         loader: AbstractLoader,
-    ) -> None:
+    ) -> list[threading.Thread]:
         count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
-            return
+            return []
+
+        threads: list[threading.Thread] = []
 
         for _ in range(count):
             # tactics_police_force: TacticsPoliceForce
@@ -50,11 +53,16 @@ def connect(
             )
 
             # TODO: component_launcher.generate_request_ID can cause race condition
-            component_launcher.connect(
-                PoliceForceAgent(
-                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
+            thread = threading.Thread(
+                target=component_launcher.connect,
+                args=(
+                    PoliceForceAgent(
+                        config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
+                    ),
+                    component_launcher.generate_request_ID(),
                 ),
-                component_launcher.generate_request_ID(),
             )
+            threads.append(thread)
 
         self.logger.info("Connected ambulance centre (count: %d)" % count)
+        return threads

adf_core_python/core/launcher/connect/connector_police_office.py

@@ -1,3 +1,4 @@
+import threading
 from logging import Logger, getLogger
 
 from rcrs_core.agents.policeOfficeAgent import PoliceOfficeAgent
@@ -21,10 +22,12 @@ def connect(
         component_launcher: ComponentLauncher,
         config: Config,
         loader: AbstractLoader,
-    ) -> None:
+    ) -> list[threading.Thread]:
         count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
-            return
+            return []
+
+        threads: list[threading.Thread] = []
 
         for _ in range(count):
             # tactics_police_office: TacticsPoliceOffice
@@ -50,11 +53,16 @@ def connect(
             )
 
             # TODO: component_launcher.generate_request_ID can cause race condition
-            component_launcher.connect(
-                PoliceOfficeAgent(
-                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
+            thread = threading.Thread(
+                target=component_launcher.connect,
+                args=(
+                    PoliceOfficeAgent(
+                        config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
+                    ),  # type: ignore
+                    component_launcher.generate_request_ID(),
                 ),
-                component_launcher.generate_request_ID(),
             )
+            threads.append(thread)
 
         self.logger.info("Connected ambulance centre (count: %d)" % count)
+        return threads