Refactor class constructors to include type hints

Author: shima004

adf_core_python/core/component/module/complex/human_detector.py

@@ -1,22 +1,31 @@
 from __future__ import annotations
 
 from abc import abstractmethod
+from typing import TYPE_CHECKING
 
 from rcrs_core.entities.human import Human
 
-from adf_core_python.core.agent.precompute.precompute_data import PrecomputeData
-from adf_core_python.core.component.module.complex.target_detector import TargetDetector
+if TYPE_CHECKING:
+    from adf_core_python.core.agent.develop.develop_data import DevelopData
+    from adf_core_python.core.agent.info.agent_info import AgentInfo
+    from adf_core_python.core.agent.info.scenario_info import ScenarioInfo
+    from adf_core_python.core.agent.info.world_info import WorldInfo
+    from adf_core_python.core.agent.module.module_manager import ModuleManager
+    from adf_core_python.core.agent.precompute.precompute_data import PrecomputeData
+    from adf_core_python.core.component.module.complex.target_detector import (
+        TargetDetector,
+    )
 
 
 class HumanDetector(TargetDetector[Human]):
     def __init__(
         self,
-        agent_info,
-        world_info,
-        scenario_info,
-        module_manager,
-        develop_data,
-    ):
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        develop_data: DevelopData,
+    ) -> None:
         super().__init__(
             agent_info, world_info, scenario_info, module_manager, develop_data
         )

adf_core_python/core/component/module/complex/search.py

@@ -1,22 +1,31 @@
 from __future__ import annotations
 
 from abc import abstractmethod
+from typing import TYPE_CHECKING
 
 from rcrs_core.entities.area import Area
 
-from adf_core_python.core.agent.precompute.precompute_data import PrecomputeData
-from adf_core_python.core.component.module.complex.target_detector import TargetDetector
+if TYPE_CHECKING:
+    from adf_core_python.core.agent.develop.develop_data import DevelopData
+    from adf_core_python.core.agent.info.agent_info import AgentInfo
+    from adf_core_python.core.agent.info.scenario_info import ScenarioInfo
+    from adf_core_python.core.agent.info.world_info import WorldInfo
+    from adf_core_python.core.agent.module.module_manager import ModuleManager
+    from adf_core_python.core.agent.precompute.precompute_data import PrecomputeData
+    from adf_core_python.core.component.module.complex.target_detector import (
+        TargetDetector,
+    )
 
 
 class Search(TargetDetector[Area]):
     def __init__(
         self,
-        agent_info,
-        world_info,
-        scenario_info,
-        module_manager,
-        develop_data,
-    ):
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        develop_data: DevelopData,
+    ) -> None:
         super().__init__(
             agent_info, world_info, scenario_info, module_manager, develop_data
         )

adf_core_python/core/config/config.py

@@ -10,7 +10,7 @@ def __init__(self, config_file: Optional[str] = None) -> None:
             self.config = self.read_from_yaml(config_file)
             self.config = self.flatten(self.config)
 
-    def set_value(self, key: str, value: Any):
+    def set_value(self, key: str, value: Any) -> None:
         self.config[key] = value
 
     def get_value(self, key: str, default: Any = None) -> Any:

adf_core_python/core/launcher/agent_launcher.py

@@ -35,7 +35,7 @@ def __init__(self, config: Config):
         self.connectors: list[Connector] = []
         self.thread_list: list[threading.Thread] = []
 
-    def initConnector(self):
+    def initConnector(self) -> None:
         loader_name, loader_class_name = self.config.get_value(
             ConfigKey.KEY_LOADER_CLASS,
             "adf_core_python.implement.default_loader.DefaultLoader",
@@ -55,7 +55,7 @@ def initConnector(self):
         self.connectors.append(ConnectorPoliceForce())
         self.connectors.append(ConnectorPoliceOffice())
 
-    def launch(self):
+    def launch(self) -> None:
         host: str = self.config.get_value(ConfigKey.KEY_KERNEL_HOST, "localhost")
         port: int = self.config.get_value(ConfigKey.KEY_KERNEL_PORT, 27931)
         self.logger.info(f"Start agent launcher (host: {host}, port: {port})")

adf_core_python/core/launcher/connect/connector_ambulance_team.py

@@ -33,7 +33,7 @@ def connect(
             if loader.get_tactics_ambulance_team() is None:
                 self.logger.error("Cannot load ambulance team tactics")
 
-            tactics_ambulance_team: TacticsAmbulanceTeam = (
+            tactics_ambulance_team: TacticsAmbulanceTeam = (  # noqa: F841
                 loader.get_tactics_ambulance_team()
             )
 

adf_core_python/implement/default_loader.py

@@ -1,9 +1,24 @@
 from typing import TYPE_CHECKING
 
 from adf_core_python.core.component.abstract_loader import AbstractLoader
+from adf_core_python.implement.tactics.default_tactics_ambulance_center import (
+    DefaultTacticsAmbulanceCenter,
+)
 from adf_core_python.implement.tactics.default_tactics_ambulance_team import (
     DefaultTacticsAmbulanceTeam,
 )
+from adf_core_python.implement.tactics.default_tactics_fire_brigade import (
+    DefaultTacticsFireBrigade,
+)
+from adf_core_python.implement.tactics.default_tactics_fire_station import (
+    DefaultTacticsFireStation,
+)
+from adf_core_python.implement.tactics.default_tactics_police_force import (
+    DefaultTacticsPoliceForce,
+)
+from adf_core_python.implement.tactics.default_tactics_police_office import (
+    DefaultTacticsPoliceOffice,
+)
 
 if TYPE_CHECKING:
     from adf_core_python.core.component.tactics.tactics_ambulance_center import (
@@ -30,17 +45,17 @@ class DefaultLoader(AbstractLoader):
     def get_tactics_ambulance_team(self) -> TacticsAmbulanceTeam:
         return DefaultTacticsAmbulanceTeam()
 
-    # def get_tactics_fire_brigade(self) -> TacticsFireBrigade:
-    #     pass
+    def get_tactics_fire_brigade(self) -> TacticsFireBrigade:
+        return DefaultTacticsFireBrigade()
 
-    # def get_tactics_police_force(self) -> TacticsPoliceForce:
-    #     pass
+    def get_tactics_police_force(self) -> TacticsPoliceForce:
+        return DefaultTacticsPoliceForce()
 
-    # def get_tactics_ambulance_centre(self) -> TacticsAmbulanceCenter:
-    #     pass
+    def get_tactics_ambulance_centre(self) -> TacticsAmbulanceCenter:
+        return DefaultTacticsAmbulanceCenter()
 
-    # def get_tactics_fire_station(self) -> TacticsFireStation:
-    #     pass
+    def get_tactics_fire_station(self) -> TacticsFireStation:
+        return DefaultTacticsFireStation()
 
-    # def get_tactics_police_office(self) -> TacticsPoliceOffice:
-    #     pass
+    def get_tactics_police_office(self) -> TacticsPoliceOffice:
+        return DefaultTacticsPoliceOffice()

adf_core_python/implement/tactics/default_tactics_ambulance_center.py

@@ -0,0 +1,59 @@
+from adf_core_python.core.agent.communication.message_manager import MessageManager
+from adf_core_python.core.agent.develop.develop_data import DevelopData
+from adf_core_python.core.agent.info.agent_info import AgentInfo
+from adf_core_python.core.agent.info.scenario_info import ScenarioInfo
+from adf_core_python.core.agent.info.world_info import WorldInfo
+from adf_core_python.core.agent.module.module_manager import ModuleManager
+from adf_core_python.core.agent.precompute.precompute_data import PrecomputeData
+from adf_core_python.core.component.tactics.tactics_ambulance_center import (
+    TacticsAmbulanceCenter,
+)
+
+
+class DefaultTacticsAmbulanceCenter(TacticsAmbulanceCenter):
+    def initialize(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        message_manager: MessageManager,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError
+
+    def resume(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        message_manager: MessageManager,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError
+
+    def prepare(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError
+
+    def think(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        message_manager: MessageManager,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError

adf_core_python/implement/tactics/default_tactics_ambulance_team.py

@@ -106,8 +106,8 @@ def think(
     ) -> Action:
         self.module_update_info(message_manager)
 
-        agent: AmbulanceTeamEntity = cast(AmbulanceTeamEntity, agent_info.get_myself())
-        entity_id = agent_info.get_entity_id()
+        agent: AmbulanceTeamEntity = cast(AmbulanceTeamEntity, agent_info.get_myself())  # noqa: F841
+        entity_id = agent_info.get_entity_id()  # noqa: F841
 
         target_entity_id = self._human_detector.calculate().get_target_entity_id()
         action = (

adf_core_python/implement/tactics/default_tactics_fire_brigade.py

@@ -0,0 +1,72 @@
+from adf_core_python.core.agent.action.action import Action
+from adf_core_python.core.agent.communication.message_manager import MessageManager
+from adf_core_python.core.agent.develop.develop_data import DevelopData
+from adf_core_python.core.agent.info.agent_info import AgentInfo
+from adf_core_python.core.agent.info.scenario_info import ScenarioInfo
+from adf_core_python.core.agent.info.world_info import WorldInfo
+from adf_core_python.core.agent.module.module_manager import ModuleManager
+from adf_core_python.core.agent.precompute.precompute_data import PrecomputeData
+from adf_core_python.core.component.tactics.tactics_fire_brigade import (
+    TacticsFireBrigade,
+)
+
+
+class DefaultTacticsFireBrigade(TacticsFireBrigade):
+    def initialize(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        message_manager: MessageManager,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError
+
+    def precompute(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        message_manager: MessageManager,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError
+
+    def resume(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        message_manager: MessageManager,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError
+
+    def prepare(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError
+
+    def think(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        message_manager: MessageManager,
+        develop_data: DevelopData,
+    ) -> Action:
+        raise NotImplementedError

adf_core_python/implement/tactics/default_tactics_fire_station.py

@@ -0,0 +1,59 @@
+from adf_core_python.core.agent.communication.message_manager import MessageManager
+from adf_core_python.core.agent.develop.develop_data import DevelopData
+from adf_core_python.core.agent.info.agent_info import AgentInfo
+from adf_core_python.core.agent.info.scenario_info import ScenarioInfo
+from adf_core_python.core.agent.info.world_info import WorldInfo
+from adf_core_python.core.agent.module.module_manager import ModuleManager
+from adf_core_python.core.agent.precompute.precompute_data import PrecomputeData
+from adf_core_python.core.component.tactics.tactics_fire_station import (
+    TacticsFireStation,
+)
+
+
+class DefaultTacticsFireStation(TacticsFireStation):
+    def initialize(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        message_manager: MessageManager,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError
+
+    def resume(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        message_manager: MessageManager,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError
+
+    def prepare(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError
+
+    def think(
+        self,
+        agent_info: AgentInfo,
+        world_info: WorldInfo,
+        scenario_info: ScenarioInfo,
+        module_manager: ModuleManager,
+        precompute_data: PrecomputeData,
+        message_manager: MessageManager,
+        develop_data: DevelopData,
+    ) -> None:
+        raise NotImplementedError