Merge pull request #5 from CLSFramework/start_develop_nader

naderzare · web-flow · commit 251a23b6b1f9 · 2024-12-15T13:39:53.000-04:00
update code by adding use_starter_code
diff --git a/src/behaviors/bhv_block.py b/src/behaviors/bhv_block.py
@@ -1,11 +1,13 @@
-
+from typing import TYPE_CHECKING
 from src.interfaces.IAgent import IAgent
 from src.utils.convertor import Convertor
 from pyrusgeom.geom_2d import *
 from pyrusgeom.soccer_math import *
 from service_pb2 import *
 from src.interfaces.IBehavior import IBehavior
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class Bhv_Block(IBehavior):
     """
@@ -26,7 +28,7 @@ class Bhv_Block(IBehavior):
     def __init__(self):
         pass
     
-    def execute(self, agent: IAgent) -> bool:
+    def execute(self, agent: "SamplePlayerAgent") -> bool:
         """
             Executes the block behavior for the agent. Predicts the future position of the ball and checks if the agent or any teammate can block it within a certain number of cycles.
             Parameters:
@@ -38,9 +40,6 @@ def execute(self, agent: IAgent) -> bool:
                 - Calculate the first cycle that the agent or a teammate can block the ball.
                 - If the agent can block the ball, add a Body_GoToPoint action to the agent.
         """
-        from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
-        assert isinstance(agent, SamplePlayerAgent)
-        
         agent.logger.debug(f'------ Bhv_Block ------')
         wm = agent.wm
         sp = agent.server_params
diff --git a/src/behaviors/bhv_kick_planner.py b/src/behaviors/bhv_kick_planner.py
@@ -1,9 +1,12 @@
+from typing import TYPE_CHECKING
 from src.interfaces.IBehavior import IBehavior
 from src.interfaces.IAgent import IAgent
 from pyrusgeom.soccer_math import *
 from pyrusgeom.geom_2d import *
 from service_pb2 import *
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class BhvKickPlanner(IBehavior):
     """
@@ -33,10 +36,8 @@ class BhvKickPlanner(IBehavior):
     def __init__(self):
         pass
 
-    def execute(self, agent: IAgent):
+    def execute(self, agent: "SamplePlayerAgent"):
         agent.logger.debug("--- WithBallDecisionMaker ---")
-        from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
-        assert isinstance(agent, SamplePlayerAgent)
 
         agent.add_action(
             PlayerAction(helios_offensive_planner=self._get_helios_offensive_planner(agent))
diff --git a/src/behaviors/bhv_penalty.py b/src/behaviors/bhv_penalty.py
@@ -1,18 +1,18 @@
-
+from typing import TYPE_CHECKING
 from src.interfaces.IAgent import IAgent
 from src.utils.convertor import Convertor
 from pyrusgeom.geom_2d import *
 from pyrusgeom.soccer_math import *
 from service_pb2 import *
 from src.interfaces.IBehavior import IBehavior
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class BhvPenalty(IBehavior):
     def __init__(self):
         pass
     
-    def execute(self, agent: IAgent) -> bool:
+    def execute(self, agent: "SamplePlayerAgent"):
         agent.logger.debug("BhvPenalty.execute")
-        from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
-        assert isinstance(agent, SamplePlayerAgent)
         agent.add_action(PlayerAction(helios_penalty=HeliosPenalty()))
diff --git a/src/behaviors/bhv_setplay.py b/src/behaviors/bhv_setplay.py
@@ -1,18 +1,18 @@
-
+from typing import TYPE_CHECKING
 from src.interfaces.IAgent import IAgent
 from src.utils.convertor import Convertor
 from pyrusgeom.geom_2d import *
 from pyrusgeom.soccer_math import *
 from service_pb2 import *
 from src.interfaces.IBehavior import IBehavior
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class BhvSetPlay(IBehavior):
     def __init__(self):
         pass
     
-    def execute(self, agent: IAgent) -> bool:
+    def execute(self, agent: "SamplePlayerAgent"):
         agent.logger.debug("BhvSetPlay.execute")
-        from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
-        assert isinstance(agent, SamplePlayerAgent)
         agent.add_action(PlayerAction(helios_set_play=HeliosSetPlay()))
diff --git a/src/behaviors/bhv_starter_penalty.py b/src/behaviors/bhv_starter_penalty.py
@@ -1,3 +1,4 @@
+from typing import TYPE_CHECKING
 from src.interfaces.IBehavior import IBehavior
 import numpy as np
 from src.interfaces.IAgent import IAgent
@@ -14,11 +15,15 @@
 from src.utils.convertor import Convertor
 from src.behaviors.bhv_starter_clearball import BhvStarterClearBall
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
+
 class BhvStarterPenalty(IBehavior):
     def __init__(self):
         pass
     
-    def execute(self, agent: IAgent) -> bool:
+    def execute(self, agent: "SamplePlayerAgent"):
+        agent.logger.debug("BhvStarterPenalty.execute")
         wm = agent.wm
         state = wm.penalty_kick_state
         actions = []
diff --git a/src/behaviors/bhv_starter_setplay.py b/src/behaviors/bhv_starter_setplay.py
@@ -1,18 +1,18 @@
-
+from typing import TYPE_CHECKING
 from src.interfaces.IAgent import IAgent
 from src.utils.convertor import Convertor
 from pyrusgeom.geom_2d import *
 from pyrusgeom.soccer_math import *
 from service_pb2 import *
 from src.interfaces.IBehavior import IBehavior
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class BhvStarterSetPlay(IBehavior):
     def __init__(self):
         pass
     
-    def execute(self, agent: IAgent) -> bool:
+    def execute(self, agent: "SamplePlayerAgent"):
         agent.logger.debug("BhvSetPlay.execute")
-        from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
-        assert isinstance(agent, SamplePlayerAgent)
         raise NotImplementedError("BhvStarterSetPlay.execute not implemented")
diff --git a/src/behaviors/bhv_starter_tackle.py b/src/behaviors/bhv_starter_tackle.py
@@ -1,20 +1,21 @@
+from typing import TYPE_CHECKING
 from src.interfaces.IAgent import IAgent
 from src.utils.convertor import Convertor
 from pyrusgeom.geom_2d import *
 from pyrusgeom.soccer_math import *
 from service_pb2 import *
 from src.interfaces.IBehavior import IBehavior
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class BhvStarterTackle(IBehavior):
     def __init__(self, min_prob: float, body_thr: float):
         self.min_prob = min_prob
         self.body_thr = body_thr
     
-    def execute(self, agent: IAgent) -> bool:
+    def execute(self, agent: "SamplePlayerAgent"):
         agent.logger.debug("BhvStarterTackle.execute")
-        from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
-        assert isinstance(agent, SamplePlayerAgent)
         wm = agent.wm
         use_foul = False
         tackle_prob = wm.self.tackle_probability
diff --git a/src/behaviors/bhv_tackle.py b/src/behaviors/bhv_tackle.py
@@ -1,18 +1,18 @@
-
+from typing import TYPE_CHECKING
 from src.interfaces.IAgent import IAgent
 from src.utils.convertor import Convertor
 from pyrusgeom.geom_2d import *
 from pyrusgeom.soccer_math import *
 from service_pb2 import *
 from src.interfaces.IBehavior import IBehavior
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class BhvTackle(IBehavior):
     def __init__(self):
         pass
     
-    def execute(self, agent: IAgent) -> bool:
+    def execute(self, agent: "SamplePlayerAgent"):
         agent.logger.debug("BhvTackle.execute")
-        from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
-        assert isinstance(agent, SamplePlayerAgent)
         agent.add_action(PlayerAction(helios_basic_tackle=HeliosBasicTackle(min_prob=0.8, body_thr=100.0)))
diff --git a/src/behaviors/starter_setplay/bhv_starter_setplay.py b/src/behaviors/starter_setplay/bhv_starter_setplay.py
@@ -13,6 +13,8 @@
 from pyrusgeom.circle_2d import Circle2D
 from src.utils.convertor import Convertor
 from src.strategy.starter_strategy import StarterStrategy
+
+
 class BhvStarterSetPlay(IBehavior):
     def __init__(self):
         pass
diff --git a/src/decision_makers/decision_maker.py b/src/decision_makers/decision_maker.py
@@ -1,11 +1,13 @@
+from typing import TYPE_CHECKING
 from src.interfaces.IDecisionMaker import IDecisionMaker
 from .play_on_decision_maker import PlayOnDecisionMaker
 from .set_play_decision_maker import SetPlayDecisionMaker
 from .penalty_decision_maker import PenaltyDecisionMaker
-from src.interfaces.IAgent import IAgent
 from service_pb2 import *
 
-
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
+    
 class DecisionMaker(IDecisionMaker):
     """
     DecisionMaker is responsible for making decisions for an agent based on the current game state.
@@ -22,12 +24,12 @@ class DecisionMaker(IDecisionMaker):
             If the game mode is a penalty kick, it adds a penalty action using penalty_decision_maker.
             Otherwise, it adds a set play action using set_play_decision_maker.
     """
-    def __init__(self):
-        self.play_on_decision_maker = PlayOnDecisionMaker()
-        self.set_play_decision_maker = SetPlayDecisionMaker()
-        self.penalty_decision_maker = PenaltyDecisionMaker()
+    def __init__(self, agent: "SamplePlayerAgent"):
+        self.play_on_decision_maker = PlayOnDecisionMaker(agent)
+        self.set_play_decision_maker = SetPlayDecisionMaker(agent)
+        self.penalty_decision_maker = PenaltyDecisionMaker(agent)
     
-    def make_decision(self, agent: IAgent):
+    def make_decision(self, agent: "SamplePlayerAgent"):
         if agent.wm.self.is_goalie:
             agent.add_action(PlayerAction(helios_goalie=HeliosGoalie()))
         elif agent.wm.game_mode_type == GameModeType.PlayOn:
diff --git a/src/decision_makers/kick_decision_maker.py b/src/decision_makers/kick_decision_maker.py
@@ -1,3 +1,4 @@
+from typing import TYPE_CHECKING
 from src.interfaces.IDecisionMaker import IDecisionMaker
 from src.interfaces.IAgent import IAgent
 from pyrusgeom.soccer_math import *
@@ -6,14 +7,13 @@
 from src.behaviors.bhv_kick_planner import BhvKickPlanner
 from src.behaviors.bhv_starter_kick_planner import BhvStarterKickPlanner
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class KickDecisionMaker(IDecisionMaker):
-    def __init__(self):
-        self.bhv_kick_planner = BhvKickPlanner()
-        #self.bhv_kick_planner = BhvStarterKickPlanner()
+    def __init__(self, agent: "SamplePlayerAgent"):
+        self.bhv_kick_planner = BhvKickPlanner() if not agent.use_starter_code else BhvStarterKickPlanner()
 
-    def make_decision(self, agent: IAgent):
+    def make_decision(self, agent: "SamplePlayerAgent"):
         agent.logger.debug("--- WithBallDecisionMaker ---")
-        from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
-        assert isinstance(agent, SamplePlayerAgent)
         self.bhv_kick_planner.execute(agent)
diff --git a/src/decision_makers/move_decision_maker.py b/src/decision_makers/move_decision_maker.py
@@ -1,3 +1,4 @@
+from typing import TYPE_CHECKING
 from src.interfaces.IDecisionMaker import IDecisionMaker
 from src.interfaces.IAgent import IAgent
 from pyrusgeom.soccer_math import *
@@ -10,6 +11,9 @@
 from src.strategy.starter_strategy import StarterStrategy
 
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
+    
 class MoveDecisionMaker(IDecisionMaker):
     """
     A decision maker class for an agent when it does not have the ball.
@@ -24,13 +28,11 @@ class MoveDecisionMaker(IDecisionMaker):
         Parameters:
         agent (SamplePlayerAgent): The agent for which the decision is being made.
     """
-    def __init__(self):
-        self.bhv_tackle = BhvTackle()
-        #self.bhv_tackle = BhvStarterTackle(0.8, 80) Uncomment this for starter team
-        # self.bhv_tackle = BhvStarterTackle()
+    def __init__(self, agent: "SamplePlayerAgent"):
+        self.bhv_tackle = BhvTackle() if not agent.use_starter_code else BhvStarterTackle(0.8, 80)
         self.bhv_block = Bhv_Block()
     
-    def make_decision(self, agent: IAgent):
+    def make_decision(self, agent: "SamplePlayerAgent"):
         """
         Make a decision for the agent when it does not have the ball.
         This method determines the best course of action for the agent based on the current state of the game world.
@@ -54,9 +56,6 @@ def make_decision(self, agent: IAgent):
         Logging:
             - Logs debug information about the decisions made.
         """
-        from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
-        assert isinstance(agent, SamplePlayerAgent)
-        
         agent.logger.debug(f'------ NoBallDecisionMaker ------')
         wm: WorldModel = agent.wm
         
diff --git a/src/decision_makers/penalty_decision_maker.py b/src/decision_makers/penalty_decision_maker.py
@@ -1,17 +1,17 @@
+from typing import TYPE_CHECKING
 from src.interfaces.IDecisionMaker import IDecisionMaker
 from src.interfaces.IAgent import IAgent
 from service_pb2 import *
 # from src.behaviors.bhv_penalty import BhvPenalty
 from src.behaviors.bhv_starter_penalty import BhvStarterPenalty
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class PenaltyDecisionMaker(IDecisionMaker):
-    def __init__(self):
-        #self.bhv_penalty = BhvPenalty()
-        self.bhv_penalty = BhvStarterPenalty()
+    def __init__(self, agent: "SamplePlayerAgent"):
+        self.bhv_penalty = BhvPenalty() if not agent.use_starter_code else BhvStarterPenalty()
     
-    def make_decision(self, agent: IAgent):
+    def make_decision(self, agent: "SamplePlayerAgent"):
         agent.logger.debug("PenaltyDecisionMaker.make_decision")
-        from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
-        assert isinstance(agent, SamplePlayerAgent)
         self.bhv_penalty.execute(agent)
diff --git a/src/decision_makers/play_on_decision_maker.py b/src/decision_makers/play_on_decision_maker.py
@@ -1,8 +1,11 @@
+from typing import TYPE_CHECKING
 from src.interfaces.IDecisionMaker import IDecisionMaker
 from src.interfaces.IAgent import IAgent
 from src.decision_makers.kick_decision_maker import KickDecisionMaker
 from src.decision_makers.move_decision_maker import MoveDecisionMaker
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class PlayOnDecisionMaker(IDecisionMaker):
     """
@@ -16,12 +19,12 @@ class PlayOnDecisionMaker(IDecisionMaker):
             Makes a decision based on the agent's ability to kick the ball.
             Delegates the decision to either kick_decision_maker or move_decision_maker.
     """
-    def __init__(self):
-        self.kick_decision_maker = KickDecisionMaker()
-        self.move_decision_maker = MoveDecisionMaker()
+    def __init__(self, agent: "SamplePlayerAgent"):
+        self.kick_decision_maker = KickDecisionMaker(agent)
+        self.move_decision_maker = MoveDecisionMaker(agent)
         pass
     
-    def make_decision(self, agent: IAgent):
+    def make_decision(self, agent: "SamplePlayerAgent"):
         if agent.wm.self.is_kickable:
             self.kick_decision_maker.make_decision(agent)
         else:
diff --git a/src/decision_makers/set_play_decision_maker.py b/src/decision_makers/set_play_decision_maker.py
@@ -1,17 +1,17 @@
+from typing import TYPE_CHECKING
 from src.interfaces.IDecisionMaker import IDecisionMaker
 from src.interfaces.IAgent import IAgent
 from service_pb2 import *
 from src.behaviors.bhv_setplay import BhvSetPlay
 from src.behaviors.starter_setplay.bhv_starter_setplay import BhvStarterSetPlay
 
+if TYPE_CHECKING:
+    from src.sample_player_agent import SamplePlayerAgent
 
 class SetPlayDecisionMaker(IDecisionMaker):
-    def __init__(self):
-        self.bhv_setplay = BhvSetPlay()
-        #self.bhv_setplay = BhvStarterSetPlay()
+    def __init__(self, agent: "SamplePlayerAgent"):
+        self.bhv_setplay = BhvSetPlay() if not agent.use_starter_code else BhvStarterSetPlay()
     
-    def make_decision(self, agent: IAgent):
+    def make_decision(self, agent: "SamplePlayerAgent"):
         agent.logger.debug("SetPlayDecisionMaker.make_decision")
-        from src.sample_player_agent import SamplePlayerAgent  # Local import to avoid circular import
-        assert isinstance(agent, SamplePlayerAgent)
         self.bhv_setplay.execute(agent)
diff --git a/src/sample_player_agent.py b/src/sample_player_agent.py
