refactor: Replace Any with specific types in agent_info and tactics_agent classes for improved type safety

Author: shima004

adf_core_python/core/agent/info/agent_info.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from time import time
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
 
 from rcrs_core.commands.Command import Command
 from rcrs_core.entities.civilian import Civilian
@@ -18,13 +18,12 @@
 
 
 class AgentInfo:
-    # TODO: Replace Any with the actual type
     def __init__(self, agent: Agent, world_model: WorldModel):
         self._agent: Agent = agent
         self._world_model: WorldModel = world_model
         self._time: int = 0
         self._action_history: dict[int, Action] = {}
-        self._heard_commands: list[Any] = []
+        self._heard_commands: list[Command] = []
         self._change_set: ChangeSet = ChangeSet()
         self._start_think_time: float = 0.0
 

adf_core_python/core/agent/info/world_info.py

@@ -17,7 +17,6 @@ def __init__(self, world_model: WorldModel):
         self._rollback: dict[EntityID, dict[int, dict[int, Any]]] = {}
         self._change_set: ChangeSet
 
-    # TODO: Implement the worldmodel access methods
     def get_world_model(self) -> WorldModel:
         """
         Get the world model

adf_core_python/core/component/tactics/tactics_agent.py

@@ -2,8 +2,9 @@
 
 import time
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Optional
 
+from adf_core_python.core.component.centralized.command_executor import CommandExecutor
 from adf_core_python.core.logger.logger import get_agent_logger
 
 if TYPE_CHECKING:
@@ -24,7 +25,7 @@ def __init__(self, parent: Optional[TacticsAgent] = None) -> None:
         self._parent = parent
         self._modules: list[AbstractModule] = []
         self._actions: list[ExtendAction] = []
-        self._command_executor: Any = None
+        self._command_executor: list[CommandExecutor] = []
 
     @abstractmethod
     def initialize(
@@ -107,27 +108,27 @@ def register_action(self, action: ExtendAction) -> None:
     def unregister_action(self, action: ExtendAction) -> None:
         self._actions.remove(action)
 
-    def register_command_executor(self, command_executor: Any) -> None:
-        self._command_executor = command_executor
+    def register_command_executor(self, command_executor: CommandExecutor) -> None:
+        self._command_executor.append(command_executor)
 
-    def unregister_command_executor(self) -> None:
-        self._command_executor = None
+    def unregister_command_executor(self, command_executor: CommandExecutor) -> None:
+        self._command_executor.remove(command_executor)
 
     def module_precompute(self, precompute_data: PrecomputeData) -> None:
         for module in self._modules:
             module.precompute(precompute_data)
         for action in self._actions:
             action.precompute(precompute_data)
-        # for executor in self._command_executor:
-        #     executor.precompute(precompute_data)
+        for executor in self._command_executor:
+            executor.precompute(precompute_data)
 
     def module_resume(self, precompute_data: PrecomputeData) -> None:
         for module in self._modules:
             module.resume(precompute_data)
         for action in self._actions:
             action.resume(precompute_data)
-        # for executor in self._command_executor:
-        #     executor.resume(precompute_data)
+        for executor in self._command_executor:
+            executor.resume(precompute_data)
 
     def module_prepare(self) -> None:
         for module in self._modules:
@@ -142,16 +143,16 @@ def module_prepare(self) -> None:
             self._logger.debug(
                 f"module {action.__class__.__name__} prepare time: {time.time() - start_time:.3f}",
             )
-        # for executor in self._command_executor:
-        #     executor.prepare()
+        for executor in self._command_executor:
+            executor.prepare()
 
     def module_update_info(self, message_manager: MessageManager) -> None:
         for module in self._modules:
             module.update_info(message_manager)
         for action in self._actions:
             action.update_info(message_manager)
-        # for executor in self._command_executor:
-        #     executor.update_info(message_manager)
+        for executor in self._command_executor:
+            executor.update_info(message_manager)
 
     def reset_count(self) -> None:
         for module in self._modules:
@@ -164,5 +165,8 @@ def reset_count(self) -> None:
             action.reset_count_resume()
             action.reset_count_prepare()
             action.reset_count_update_info()
-        # for executor in self._command_executor:
-        #     executor.reset_count()
+        for executor in self._command_executor:
+            executor.reset_count_precompute()
+            executor.reset_count_resume()
+            executor.reset_count_prepare()
+            executor.reset_count_update_info()

adf_core_python/core/logger/logger.py

@@ -72,7 +72,7 @@ def configure_logger() -> None:
     handler_stdout.setLevel(logging.INFO)
 
     handler_file = RotatingFileHandler(
-        "agent.log", maxBytes=10 * 1024 * 1024, backupCount=5
+        "agent.log", maxBytes=1024 * 1024 * 1024, backupCount=5
     )
     handler_file.doRollover()
     handler_file.setFormatter(

adf_core_python/implement/action/default_extend_action_transport.py

@@ -24,7 +24,6 @@
 from adf_core_python.core.logger.logger import get_agent_logger
 
 
-# TODO: refactor this class
 class DefaultExtendActionTransport(ExtendAction):
     def __init__(
         self,

adf_core_python/implement/tactics/default_tactics_ambulance_team.py

@@ -141,8 +141,7 @@ def think(
         entity_id = agent_info.get_entity_id()  # noqa: F841
 
         self._logger.debug(
-            f"received messages: {[str(message) for message in message_manager.get_received_message_list()]}, help: {message_manager.get_heard_agent_help_message_count()}",
-            message_manager=message_manager,
+            f"received messages: {[str(message) for message in message_manager.get_received_message_list()]}, help: {message_manager.get_heard_agent_help_message_count()}"
         )
 
         for message in message_manager.get_received_message_list():