fix: manage system prompt erase while added intents injected

Author: FlorentRvl

lib/abi/services/agent/Agent.py

@@ -519,11 +519,13 @@ def read_makefile() -> str:
             list_tools_available, 
             list_subagents_available, 
             list_intents_available,
-            get_current_active_agent,
-            get_supervisor_agent,
         ]
         if self.state.supervisor_agent and self.state.supervisor_agent != self.name:
             tools.append(request_help)
+
+        if self.state.supervisor_agent is not None or len(self._agents) > 0:
+            tools.append(get_current_active_agent)
+            tools.append(get_supervisor_agent)
 
         if self.state.supervisor_agent == self.name and os.getenv("ENV") == "dev":
             tools.append(read_makefile)
@@ -740,10 +742,12 @@ def current_active_agent(self, state: MessagesState) -> Command:
 
         if "CURRENT_DATE" not in self._system_prompt:
             from datetime import datetime
-            self._system_prompt += f"\n\n\nCURRENT_DATE: {datetime.now().strftime('%Y-%m-%d')}\n"
+            current_date_str = f"CURRENT_DATE: The current date is {datetime.now().strftime('%Y-%m-%d')}\n"
+            self._system_prompt = self._system_prompt + "\n" + current_date_str
             self.set_system_prompt(self._system_prompt)
+            return Command(goto="current_active_agent")
 
-        # logger.debug(f"System prompt: {self._system_prompt}")
+        logger.debug(f"💬 System prompt: {self._system_prompt}")
         return Command(goto="continue_conversation")
 
     def continue_conversation(self, state: MessagesState) -> Command:
@@ -886,17 +890,13 @@ def call_tools(self, state: MessagesState) -> list[Command]:
                 args = {"state": state, "tool_call": {**tool_call, "role": "tool_call"}}
 
             try:
-                            
-                logger.debug(f"tool_call: {tool_call}")
-                logger.debug(f"tool_input_fields: {tool_input_fields}")
-                logger.debug(f"args: {args}")
+                logger.debug(f"TOOL CALL ARGS: {args}")
                 tool_response = tool_.invoke(args)
                 called_tools.append(tool_)
-
+                logger.debug(f"TOOL CALL RESPONSE: {tool_response}, TYPE: {type(tool_response)}")
 
                 if isinstance(tool_response, ToolMessage):
                     results.append(Command(update={"messages": [tool_response]}))
-
                 # handle tools that return Command directly
                 elif isinstance(tool_response, Command):
                     results.append(tool_response)
@@ -923,13 +923,17 @@ def call_tools(self, state: MessagesState) -> list[Command]:
                 break
 
         # If the last response is a ToolMessage, we want the model to interpret it.
-        if isinstance(pd.get(results[-1], 'update.messages[-1]', None), ToolMessage) and not pd.get(results[-1], 'update.messages[-1]', None).name.startswith("transfer_to_"):
+        if (
+            isinstance(pd.get(results[-1], 'update.messages[-1]', None), ToolMessage) and 
+            not pd.get(results[-1], 'update.messages[-1]', None).name.startswith("transfer_to_")
+        ):
             if return_direct is False:
                 logger.debug(f"ToolMessage found in results SENDING TO CALL_MODEL: {results[-1]}")
                 results.append(Command(goto="call_model"))
             else:
                 logger.debug("Injecting ToolMessage into AIMessage for the user to see.")
                 last_message = pd.get(results[-1], 'update.messages[-1]', None)
+                logger.debug(f"last_message: {last_message}")
                 results.append(Command(update={"messages": [AIMessage(content=last_message.content)]}))
 
         if (

lib/abi/services/agent/IntentAgent.py

@@ -733,32 +733,39 @@ def inject_intents_in_system_prompt(self, state: IntentState):
         logger.debug("💉 Inject Intents in System Prompt")
 
         # We reset the system prompt to the original one.
-        self._system_prompt = self._configuration.system_prompt
+        # self._system_prompt = self._configuration.system_prompt
 
         if "intent_mapping" in state and len(state["intent_mapping"]["intents"]) > 0:
             intents = state["intent_mapping"]["intents"]
-            updated_system_prompt = f"""{self._configuration.system_prompt}
+            intents_str = ""
+            for intent in intents:
+                intents_str += f"-Mapped intent: `{intent['intent'].intent_value}`, tool to call: `{intent['intent'].intent_target}`\n"
+
+            if  "<intents_rules>" not in self._system_prompt:
+                updated_system_prompt = f"""{self._system_prompt}
 
----
-INTENT RULES:
+<intents_rules>
 Everytime a user is sending a message, a system is trying to map the prompt/message to an intent or a list of intents using a vector search.
 The following is the list of mapped intents. This list will change over time as new messages comes in.
 You must analyze if the user message and the mapped intents are related to each other. 
 If it's the case, you must take them into account, otherwise you must ignore the ones that are not related.
 If you endup with a single intent which is of type RAW, you must output the intent_target and nothing else as there will be tests asserting the correctness of the output.
 If you endup with a single intent which is of type TOOL, you must call this tool.
 
+<intents>\n{intents_str}\n</intents>
 
-
+</intents_rules>
 """
-            
-            for intent in intents:
-                updated_system_prompt += f"""
-                - {intent['intent']}
-                """
+            else:
+                import re
+                pattern = r'(<intents>)(.*?)(</intents>)'
+                def replace(match):
+                    return f"{match.group(1)}\n{intents_str}\n{match.group(3)}"
+                updated_system_prompt = re.sub(pattern, replace, self._system_prompt, flags=re.DOTALL)
 
-            updated_system_prompt += "\n\nEND INTENT RULES"
             self._system_prompt = updated_system_prompt
+            self.set_system_prompt(self._system_prompt)
+            logger.debug(f"Injected in system prompt: {self._system_prompt}")
 
 
     def duplicate(self, queue: Queue | None = None, agent_shared_state: AgentSharedState | None = None) -> "IntentAgent":