enhanced output formatting

src/agent_interfaces.py

@@ -100,12 +100,12 @@ class HumanAgentInterface(BaseAgentInterface):
 
     is_human = True
 
-    def respond_to_formatted(self, message: Message, output_format: Type[BaseModel], **kwargs) -> Type[BaseModel]:
+    def respond_to_formatted(self, message: Message, output_format: OutputFormat, **kwargs) -> OutputFormatModel:
         """For Human agents, we can trust them enough to format their own responses... for now"""
         response = super().respond_to(message)
         # only works because current outputs have only 1 field...
-        field_name = output_format.model_fields.copy().popitem()[0]
-        output = output_format.model_validate({field_name: response.content})
+        field_name = output_format.output_format_model.model_fields.copy().popitem()[0]
+        output = output_format.output_format_model.model_validate({field_name: response.content})
 
         return output
 

src/game.py

@@ -68,7 +68,7 @@ class Game:
             self.players.append(Player(name, player_id, interface))
 
         # Add Observer - an Agent who can see all the messages, but doesn't actually play
-        if self.verbose or self.debug and not self.human_index:
+        if (self.verbose or self.debug) and not self.human_index:
             self.observer = HumanAgentCLI("{self.game_id}-observer")
         else:
             self.observer = None
@@ -238,6 +238,7 @@ class Game:
         # Point Logic
         # If the Chameleon guesses the correct animal    =   +1 Point to the Chameleon
         if chameleon_animal_guess.lower() == herd_animal.lower():
+
             chameleon.points += 1
         # If the Chameleon guesses the incorrect animal  =   +1 Point to each Herd player
         else:

src/output_formats.py

@@ -79,10 +79,10 @@ class ChameleonGuessFormat(BaseModel):
 
 
 class HerdVoteFormat(BaseModel):
-    vote: str = Field("The name of the player you are voting for")
-    """The name of the player you are voting for"""
     player_names: List[str] = Field([], exclude=True)
     """The names of the players in the game"""
+    vote: str = Field("The name of the player you are voting for")
+    """The name of the player you are voting for"""
 
     @field_validator('vote')
     @classmethod

src/prompts.py

@@ -37,16 +37,9 @@ Below are the responses from all the other players.
 {player_responses}
 """
 
-_chameleon_guess_decision = """\
-You now have the opportunity to guess what animal the other players are pretending to be.
-If you guess correctly you will WIN, if you guess incorrectly you will LOSE.
-If you believe you know what animal the other players are pretending to be make choose to GUESS, otherwise choose to PASS.
-Your response should be one of ("GUESS", "PASS")
-Your Response: 
-"""
-
 _chameleon_guess_animal = """\
 What animal do you think the other players are pretending to be?
+Guess the name of the animal not it's plural form e.g. guess "animal" not "animals"
 """
 
 _vote_prompt = """\
@@ -58,7 +51,6 @@ prompts = {
     "assign_herd": _assign_herd,
     "assign_chameleon": _assign_chameleon,
     "player_describe_animal": _player_describe_animal,
-    "chameleon_guess_decision": _all_responses + _chameleon_guess_decision,
     "chameleon_guess_animal": _chameleon_guess_animal,
     "response": "Your response:",
     "vote": _all_responses + _vote_prompt