feat: Update connector classes to use Config from adf_core_python.core.config.config

Author: shima004

adf_core_python/core/launcher/connect/connector.py

@@ -1,9 +1,9 @@
 from abc import ABC, abstractmethod
 
 from rcrs_core.connection.componentLauncher import ComponentLauncher
-from rcrs_core.config.config import Config
 
 from adf_core_python.core.component.abstract_loader import AbstractLoader
+from adf_core_python.core.config.config import Config
 
 
 class Connector(ABC):

adf_core_python/core/launcher/connect/connector_ambulance_centre.py

@@ -1,12 +1,12 @@
 from logging import Logger, getLogger
 
 from rcrs_core.agents.ambulanceCenterAgent import AmbulanceCenterAgent
-from rcrs_core.config.config import Config
 from rcrs_core.connection.componentLauncher import ComponentLauncher
 
 from adf_core_python.core.agent.config.module_config import ModuleConfig
 from adf_core_python.core.agent.develop.develop_data import DevelopData
 from adf_core_python.core.component.abstract_loader import AbstractLoader
+from adf_core_python.core.config.config import Config
 from adf_core_python.core.launcher.config_key import ConfigKey
 from adf_core_python.core.launcher.connect.connector import Connector
 
@@ -22,31 +22,29 @@ def connect(
         config: Config,
         loader: AbstractLoader,
     ) -> None:
-        count: int = config.get_int_value_or_default(
-            ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0
-        )
+        count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
             return
 
         for _ in range(count):
             # tactics_ambulance_centre: TacticsAmbulanceCentre
-            if loader.get_tactics_ambulance_centre() is not None:
+            if loader.get_tactics_ambulance_center() is not None:
                 self.logger.error("Cannot load ambulance centre tactics")
                 # tactics_ambulance_centre = loader.get_tactics_ambulance_centre()
             else:
                 # tactics_ambulance_centre = DummyTacticsAmbulanceCentre()
                 pass
 
             module_config: ModuleConfig = ModuleConfig(  # noqa: F841
-                config.get_value_or_default(
+                config.get_value(
                     ConfigKey.KEY_MODULE_CONFIG_FILE_NAME,
                     ModuleConfig.DEFAULT_CONFIG_FILE_NAME,
                 )
             )
 
             develop_data: DevelopData = DevelopData(  # noqa: F841
-                config.get_boolean_value_or_default(ConfigKey.KEY_DEBUG_FLAG, False),
-                config.get_value_or_default(
+                config.get_value(ConfigKey.KEY_DEBUG_FLAG, False),
+                config.get_value(
                     ConfigKey.KEY_DEVELOP_DATA_FILE_NAME, DevelopData.DEFAULT_FILE_NAME
                 ),
             )
@@ -55,9 +53,7 @@ def connect(
             component_launcher.connect(
                 # TODO: AmbulanceCenterAgent is not implemented precompute method and other methods
                 AmbulanceCenterAgent(
-                    config.get_boolean_value_or_default(
-                        ConfigKey.KEY_PRECOMPUTE, False
-                    ),
+                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
                 ),  # type: ignore
                 component_launcher.generate_request_ID(),
             )

adf_core_python/core/launcher/connect/connector_ambulance_team.py

@@ -1,12 +1,15 @@
 from logging import Logger, getLogger
 
 from rcrs_core.agents.ambulanceTeamAgent import AmbulanceTeamAgent
-from rcrs_core.config.config import Config
 from rcrs_core.connection.componentLauncher import ComponentLauncher
 
 from adf_core_python.core.agent.config.module_config import ModuleConfig
 from adf_core_python.core.agent.develop.develop_data import DevelopData
 from adf_core_python.core.component.abstract_loader import AbstractLoader
+from adf_core_python.core.component.tactics.tactics_ambulance_team import (
+    TacticsAmbulanceTeam,
+)
+from adf_core_python.core.config.config import Config
 from adf_core_python.core.launcher.config_key import ConfigKey
 from adf_core_python.core.launcher.connect.connector import Connector
 
@@ -22,41 +25,36 @@ def connect(
         config: Config,
         loader: AbstractLoader,
     ) -> None:
-        count: int = config.get_int_value_or_default(
-            ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0
-        )
+        count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
             return
 
         for _ in range(count):
-            # tactics_ambulance_team: TacticsAmbulanceTeam
-            if loader.get_tactics_ambulance_team() is not None:
+            if loader.get_tactics_ambulance_team() is None:
                 self.logger.error("Cannot load ambulance team tactics")
-                # tactics_ambulance_team = loader.get_tactics_ambulance_team()
-            else:
-                # tactics_ambulance_team = DummyTacticsAmbulanceTeam()
-                pass
+
+            tactics_ambulance_team: TacticsAmbulanceTeam = (
+                loader.get_tactics_ambulance_team()
+            )
 
             module_config: ModuleConfig = ModuleConfig(  # noqa: F841
-                config.get_value_or_default(
+                config.get_value(
                     ConfigKey.KEY_MODULE_CONFIG_FILE_NAME,
                     ModuleConfig.DEFAULT_CONFIG_FILE_NAME,
                 )
             )
 
             develop_data: DevelopData = DevelopData(  # noqa: F841
-                config.get_boolean_value_or_default(ConfigKey.KEY_DEBUG_FLAG, False),
-                config.get_value_or_default(
+                config.get_value(ConfigKey.KEY_DEBUG_FLAG, False),
+                config.get_value(
                     ConfigKey.KEY_DEVELOP_DATA_FILE_NAME, DevelopData.DEFAULT_FILE_NAME
                 ),
             )
 
             # TODO: component_launcher.generate_request_ID can cause race condition
             component_launcher.connect(
                 AmbulanceTeamAgent(
-                    config.get_boolean_value_or_default(
-                        ConfigKey.KEY_PRECOMPUTE, False
-                    ),
+                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
                 ),
                 component_launcher.generate_request_ID(),
             )

adf_core_python/core/launcher/connect/connector_fire_brigade.py

@@ -1,12 +1,12 @@
 from logging import Logger, getLogger
 
 from rcrs_core.agents.fireBrigadeAgent import FireBrigadeAgent
-from rcrs_core.config.config import Config
 from rcrs_core.connection.componentLauncher import ComponentLauncher
 
 from adf_core_python.core.agent.config.module_config import ModuleConfig
 from adf_core_python.core.agent.develop.develop_data import DevelopData
 from adf_core_python.core.component.abstract_loader import AbstractLoader
+from adf_core_python.core.config.config import Config
 from adf_core_python.core.launcher.config_key import ConfigKey
 from adf_core_python.core.launcher.connect.connector import Connector
 
@@ -22,9 +22,7 @@ def connect(
         config: Config,
         loader: AbstractLoader,
     ) -> None:
-        count: int = config.get_int_value_or_default(
-            ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0
-        )
+        count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
             return
 
@@ -38,25 +36,23 @@ def connect(
                 pass
 
             module_config: ModuleConfig = ModuleConfig(  # noqa: F841
-                config.get_value_or_default(
+                config.get_value(
                     ConfigKey.KEY_MODULE_CONFIG_FILE_NAME,
                     ModuleConfig.DEFAULT_CONFIG_FILE_NAME,
                 )
             )
 
             develop_data: DevelopData = DevelopData(  # noqa: F841
-                config.get_boolean_value_or_default(ConfigKey.KEY_DEBUG_FLAG, False),
-                config.get_value_or_default(
+                config.get_value(ConfigKey.KEY_DEBUG_FLAG, False),
+                config.get_value(
                     ConfigKey.KEY_DEVELOP_DATA_FILE_NAME, DevelopData.DEFAULT_FILE_NAME
                 ),
             )
 
             # TODO: component_launcher.generate_request_ID can cause race condition
             component_launcher.connect(
                 FireBrigadeAgent(
-                    config.get_boolean_value_or_default(
-                        ConfigKey.KEY_PRECOMPUTE, False
-                    ),
+                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
                 ),
                 component_launcher.generate_request_ID(),
             )

adf_core_python/core/launcher/connect/connector_fire_station.py

@@ -1,12 +1,12 @@
 from logging import Logger, getLogger
 
 from rcrs_core.agents.fireStationAgent import FireStationAgent
-from rcrs_core.config.config import Config
 from rcrs_core.connection.componentLauncher import ComponentLauncher
 
 from adf_core_python.core.agent.config.module_config import ModuleConfig
 from adf_core_python.core.agent.develop.develop_data import DevelopData
 from adf_core_python.core.component.abstract_loader import AbstractLoader
+from adf_core_python.core.config.config import Config
 from adf_core_python.core.launcher.config_key import ConfigKey
 from adf_core_python.core.launcher.connect.connector import Connector
 
@@ -22,9 +22,7 @@ def connect(
         config: Config,
         loader: AbstractLoader,
     ) -> None:
-        count: int = config.get_int_value_or_default(
-            ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0
-        )
+        count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
             return
 
@@ -38,25 +36,23 @@ def connect(
                 pass
 
             module_config: ModuleConfig = ModuleConfig(  # noqa: F841
-                config.get_value_or_default(
+                config.get_value(
                     ConfigKey.KEY_MODULE_CONFIG_FILE_NAME,
                     ModuleConfig.DEFAULT_CONFIG_FILE_NAME,
                 )
             )
 
             develop_data: DevelopData = DevelopData(  # noqa: F841
-                config.get_boolean_value_or_default(ConfigKey.KEY_DEBUG_FLAG, False),
-                config.get_value_or_default(
+                config.get_value(ConfigKey.KEY_DEBUG_FLAG, False),
+                config.get_value(
                     ConfigKey.KEY_DEVELOP_DATA_FILE_NAME, DevelopData.DEFAULT_FILE_NAME
                 ),
             )
 
             # TODO: component_launcher.generate_request_ID can cause race condition
             component_launcher.connect(
                 FireStationAgent(
-                    config.get_boolean_value_or_default(
-                        ConfigKey.KEY_PRECOMPUTE, False
-                    ),
+                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
                 ),  # type: ignore
                 component_launcher.generate_request_ID(),
             )

adf_core_python/core/launcher/connect/connector_police_force.py

@@ -1,12 +1,12 @@
 from logging import Logger, getLogger
 
 from rcrs_core.agents.policeForceAgent import PoliceForceAgent
-from rcrs_core.config.config import Config
 from rcrs_core.connection.componentLauncher import ComponentLauncher
 
 from adf_core_python.core.agent.config.module_config import ModuleConfig
 from adf_core_python.core.agent.develop.develop_data import DevelopData
 from adf_core_python.core.component.abstract_loader import AbstractLoader
+from adf_core_python.core.config.config import Config
 from adf_core_python.core.launcher.config_key import ConfigKey
 from adf_core_python.core.launcher.connect.connector import Connector
 
@@ -22,9 +22,7 @@ def connect(
         config: Config,
         loader: AbstractLoader,
     ) -> None:
-        count: int = config.get_int_value_or_default(
-            ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0
-        )
+        count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
             return
 
@@ -38,25 +36,23 @@ def connect(
                 pass
 
             module_config: ModuleConfig = ModuleConfig(  # noqa: F841
-                config.get_value_or_default(
+                config.get_value(
                     ConfigKey.KEY_MODULE_CONFIG_FILE_NAME,
                     ModuleConfig.DEFAULT_CONFIG_FILE_NAME,
                 )
             )
 
             develop_data: DevelopData = DevelopData(  # noqa: F841
-                config.get_boolean_value_or_default(ConfigKey.KEY_DEBUG_FLAG, False),
-                config.get_value_or_default(
+                config.get_value(ConfigKey.KEY_DEBUG_FLAG, False),
+                config.get_value(
                     ConfigKey.KEY_DEVELOP_DATA_FILE_NAME, DevelopData.DEFAULT_FILE_NAME
                 ),
             )
 
             # TODO: component_launcher.generate_request_ID can cause race condition
             component_launcher.connect(
                 PoliceForceAgent(
-                    config.get_boolean_value_or_default(
-                        ConfigKey.KEY_PRECOMPUTE, False
-                    ),
+                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
                 ),
                 component_launcher.generate_request_ID(),
             )

adf_core_python/core/launcher/connect/connector_police_office.py

@@ -1,12 +1,12 @@
 from logging import Logger, getLogger
 
 from rcrs_core.agents.policeOfficeAgent import PoliceOfficeAgent
-from rcrs_core.config.config import Config
 from rcrs_core.connection.componentLauncher import ComponentLauncher
 
 from adf_core_python.core.agent.config.module_config import ModuleConfig
 from adf_core_python.core.agent.develop.develop_data import DevelopData
 from adf_core_python.core.component.abstract_loader import AbstractLoader
+from adf_core_python.core.config.config import Config
 from adf_core_python.core.launcher.config_key import ConfigKey
 from adf_core_python.core.launcher.connect.connector import Connector
 
@@ -22,9 +22,7 @@ def connect(
         config: Config,
         loader: AbstractLoader,
     ) -> None:
-        count: int = config.get_int_value_or_default(
-            ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0
-        )
+        count: int = config.get_value(ConfigKey.KEY_AMBULANCE_CENTRE_COUNT, 0)
         if count == 0:
             return
 
@@ -38,25 +36,23 @@ def connect(
                 pass
 
             module_config: ModuleConfig = ModuleConfig(  # noqa: F841
-                config.get_value_or_default(
+                config.get_value(
                     ConfigKey.KEY_MODULE_CONFIG_FILE_NAME,
                     ModuleConfig.DEFAULT_CONFIG_FILE_NAME,
                 )
             )
 
             develop_data: DevelopData = DevelopData(  # noqa: F841
-                config.get_boolean_value_or_default(ConfigKey.KEY_DEBUG_FLAG, False),
-                config.get_value_or_default(
+                config.get_value(ConfigKey.KEY_DEBUG_FLAG, False),
+                config.get_value(
                     ConfigKey.KEY_DEVELOP_DATA_FILE_NAME, DevelopData.DEFAULT_FILE_NAME
                 ),
             )
 
             # TODO: component_launcher.generate_request_ID can cause race condition
             component_launcher.connect(
                 PoliceOfficeAgent(
-                    config.get_boolean_value_or_default(
-                        ConfigKey.KEY_PRECOMPUTE, False
-                    ),
+                    config.get_value(ConfigKey.KEY_PRECOMPUTE, False),
                 ),
                 component_launcher.generate_request_ID(),
             )