naas-abi-core 1.4.2__tar.gz → 1.5.0__tar.gz

naas_abi_core-1.5.0/=0.9.13

@@ -0,0 +1,6 @@
+Collecting uv
+  Downloading uv-0.9.25-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (11 kB)
+Downloading uv-0.9.25-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (22.3 MB)
+   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 22.3/22.3 MB 241.0 MB/s  0:00:00
+Installing collected packages: uv
+Successfully installed uv-0.9.25

{naas_abi_core-1.4.2 → naas_abi_core-1.5.0}/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 <!-- version list -->
 
+## v1.5.0 (2026-01-15)
+
+
 ## v1.4.2 (2026-01-08)
 
 ### Bug Fixes

{naas_abi_core-1.4.2 → naas_abi_core-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-core
-Version: 1.4.2
+Version: 1.5.0
 Summary: Abi framework allowing you to build your AI system.
 Project-URL: Homepage, https://github.com/jupyter-naas/abi
 Project-URL: Repository, https://github.com/jupyter-naas/abi/tree/main/libs/naas-abi-core

{naas_abi_core-1.4.2 → naas_abi_core-1.5.0}/naas_abi_core/apps/terminal_agent/main.py

@@ -182,7 +182,9 @@ def on_ai_message(message: Any, agent_name: str) -> None:
     print("\r" + " " * 15 + "\r", end="", flush=True)
 
     from rich.markdown import Markdown
-
+    if not isinstance(message.content, str):
+        message.content = str(message.content)
+        
     # Filter out think tags and their content
     think_content = re.findall(r"<think>.*?</think>", message.content, flags=re.DOTALL)
 

{naas_abi_core-1.4.2 → naas_abi_core-1.5.0}/naas_abi_core/services/agent/Agent.py

@@ -182,6 +182,9 @@ class AgentSharedState:
     def set_requesting_help(self, requesting_help: bool):
         self._requesting_help = requesting_help
 
+class ABIAgentState(MessagesState):
+    system_prompt: str = Field(default="")
+
 
 @dataclass
 class Event:
@@ -219,10 +222,13 @@ class AgentConfiguration:
     on_ai_message: Callable[[AnyMessage, str], None] = field(
         default_factory=lambda: lambda _, __: None
     )
-    system_prompt: str = field(
+    system_prompt: str | Callable[[list[AnyMessage]], str] = field(
         default="You are a helpful assistant. If a tool you used did not return the result you wanted, look for another tool that might be able to help you. If you don't find a suitable tool. Just output 'I DONT KNOW'"
     )
 
+    def get_system_prompt(self, messages: list[AnyMessage]) -> str:
+        return self.system_prompt(messages) if callable(self.system_prompt) else self.system_prompt
+
 
 class CompletionQuery(BaseModel):
     prompt: str = Field(..., description="The prompt to send to the agent")
@@ -244,7 +250,6 @@ class Agent(Expose):
     Attributes:
         _name (str): Unique identifier for the agent
         _description (str): Human-readable description of the agent's purpose
-        _system_prompt (str): System prompt that defines the agent's behavior
         _chat_model (BaseChatModel): The underlying language model with tool binding
         _chat_model_with_tools (Runnable): Language model configured with available tools
         _tools (list[Union[Tool, Agent]]): Original list of provided tools and agents
@@ -262,7 +267,6 @@ class Agent(Expose):
 
     _name: str
     _description: str
-    _system_prompt: str
 
     _chat_model: BaseChatModel
     _chat_model_with_tools: Runnable[
@@ -338,7 +342,6 @@ class Agent(Expose):
         logger.debug(f"Initializing agent: {name}")
         self._name = name
         self._description = description
-        self._system_prompt = configuration.system_prompt
         self._state = state
         self._original_tools = tools
         self._original_agents = agents
@@ -613,13 +616,6 @@ class Agent(Expose):
             tools.append(read_makefile)
         return tools
 
-    @property
-    def system_prompt(self) -> str:
-        return self._system_prompt
-
-    def set_system_prompt(self, system_prompt: str):
-        self._system_prompt = system_prompt
-
     @property
     def structured_tools(self) -> list[Tool | BaseTool]:
         return self._structured_tools
@@ -688,11 +684,18 @@ class Agent(Expose):
     def as_tools(self, parent_graph: bool = False) -> list[BaseTool]:
         return [make_handoff_tool(agent=self, parent_graph=parent_graph)]
 
+    def render_system_prompt(self, state: ABIAgentState) -> Command:
+        system_prompt = self._configuration.get_system_prompt(state["messages"])
+        return Command(update={"system_prompt": system_prompt})
+
     def build_graph(self, patcher: Optional[Callable] = None):
-        graph = StateGraph(MessagesState)
+        graph = StateGraph(ABIAgentState)
+
+        graph.add_node(self.render_system_prompt)
+        graph.add_edge(START, "render_system_prompt")
 
         graph.add_node(self.current_active_agent)
-        graph.add_edge(START, "current_active_agent")
+        graph.add_edge("render_system_prompt", "current_active_agent")
 
         graph.add_node(self.continue_conversation)
 
@@ -710,11 +713,11 @@ class Agent(Expose):
 
         self.graph = graph.compile(checkpointer=self._checkpointer)
 
-    def get_last_human_message(self, state: MessagesState) -> Any | None:
+    def get_last_human_message(self, state: ABIAgentState) -> Any | None:
         """Get the appropriate human message based on AI message context.
 
         Args:
-            state (MessagesState): Current conversation state
+            state (ABIAgentState): Current conversation state
 
         Returns:
             Any | None: The relevant human message
@@ -743,11 +746,11 @@ class Agent(Expose):
                 state["messages"][::-1], lambda m: isinstance(m, HumanMessage)
             )
 
-    def current_active_agent(self, state: MessagesState) -> Command:
+    def current_active_agent(self, state: ABIAgentState) -> Command:
         """Goto the current active agent.
 
         Args:
-            state (MessagesState): Current conversation state
+            state (ABIAgentState): Current conversation state
 
         Returns:
             Command: Command to goto the current active agent
@@ -804,9 +807,10 @@ class Agent(Expose):
 
         # self._state.set_current_active_agent(self.name)
         logger.debug(f"💬 Starting chatting with agent '{self.name}'")
+        updated_system_prompt = state["system_prompt"]
         if (
             self.state.supervisor_agent != self.name
-            and "SUPERVISOR SYSTEM PROMPT" not in self._system_prompt
+            and "SUPERVISOR SYSTEM PROMPT" not in state["system_prompt"]
         ):
             # This agent is a subagent with a supervisor
             subagent_prompt = f"""
@@ -836,14 +840,14 @@ Your supervisor will help ensure you operate effectively within your role while
 
 SUBAGENT SYSTEM PROMPT:
 
-{self._system_prompt}
+{state["system_prompt"]}
 """
-            self.set_system_prompt(subagent_prompt)
+            updated_system_prompt = subagent_prompt
 
         if (
             self.state.supervisor_agent == self.name
             and os.getenv("ENV") == "dev"
-            and "DEVELOPPER SYSTEM PROMPT" not in self._system_prompt
+            and "DEVELOPPER SYSTEM PROMPT" not in state["system_prompt"]
         ):
             dev_prompt = f"""
 DEVELOPPER SYSTEM PROMPT:
@@ -854,23 +858,23 @@ For any questions/commands related to the project, use tool: `read_makefile` to
 
 AGENT SYSTEM PROMPT:
 
-{self._system_prompt}
+{state["system_prompt"]}
 """
 
-            self.set_system_prompt(dev_prompt)
+            updated_system_prompt = dev_prompt
 
-        if "CURRENT_DATE" not in self._system_prompt:
+        if "CURRENT_DATE" not in state["system_prompt"]:
             from datetime import datetime
 
             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")
+            #self._system_prompt = self._system_prompt + "\n" + current_date_str
+            updated_system_prompt = updated_system_prompt + "\n" + current_date_str
+            return Command(goto="current_active_agent", update={"system_prompt": updated_system_prompt})
 
         # logger.debug(f"💬 System prompt: {self._system_prompt}")
-        return Command(goto="continue_conversation")
+        return Command(goto="continue_conversation", update={"system_prompt": updated_system_prompt})
 
-    def continue_conversation(self, state: MessagesState) -> Command:
+    def continue_conversation(self, state: ABIAgentState) -> Command:
         return Command(goto="call_model")
 
     def handle_openai_response_v1(self, response: BaseMessage) -> Command:
@@ -935,16 +939,16 @@ AGENT SYSTEM PROMPT:
 
     def call_model(
         self,
-        state: MessagesState,
+        state: ABIAgentState,
     ) -> Command[Literal["call_tools", "__end__"]]:
         self._state.set_current_active_agent(self.name)
         logger.debug(f"🧠 Calling model on current active agent: {self.name}")
 
         # Inserting system prompt before messages.
         messages = state["messages"]
-        if self._system_prompt:
+        if state["system_prompt"]:
             messages = [
-                SystemMessage(content=self._system_prompt),
+                SystemMessage(content=state["system_prompt"]),
             ] + messages
         logger.debug(f"Messages before calling model: {messages}")
 
@@ -975,7 +979,7 @@ AGENT SYSTEM PROMPT:
 
         return Command(goto="__end__", update={"messages": [response]})
 
-    def call_tools(self, state: MessagesState) -> list[Command]:
+    def call_tools(self, state: ABIAgentState) -> list[Command]:
         # Check if messages are present in the state.
         if (
             "messages" not in state

{naas_abi_core-1.4.2 → naas_abi_core-1.5.0}/naas_abi_core/services/agent/IntentAgent.py

@@ -15,7 +15,7 @@ from naas_abi_core import logger
 from naas_abi_core.models.Model import ChatModel
 from spacy.cli import download as spacy_download
 
-from .Agent import Agent, AgentConfiguration, AgentSharedState, create_checkpointer
+from .Agent import Agent, AgentConfiguration, AgentSharedState, create_checkpointer, ABIAgentState
 from .beta.IntentMapper import Intent, IntentMapper, IntentScope, IntentType
 
 _nlp = None
@@ -394,7 +394,7 @@ DEV_INTENTS: list = [
 ]
 
 
-class IntentState(MessagesState):
+class IntentState(ABIAgentState):
     """State class for intent-based conversations.
 
     Extends MessagesState to include intent mapping information that tracks
@@ -475,7 +475,24 @@ class IntentAgent(Agent):
             threshold_neighbor (float, optional): Maximum score difference for similar intents.
                 Defaults to 0.05.
         """
+        
+        
+        @tool(return_direct=True)
+        def list_available_agents() -> str:
+            """Displays a formatted list of all available agents."""
+            return "\n".join([agent.name for agent in self._agents])
+        
+        tools.append(list_available_agents)
+        
         # Add default intents while avoiding duplicates
+        intents.append(
+            Intent(
+                intent_value="agents",
+                intent_type=IntentType.TOOL,
+                intent_target="list_available_agents",
+            )
+        )
+        
         intent_values = {
             (intent.intent_value, intent.intent_type, intent.intent_target)
             for intent in intents
@@ -539,8 +556,11 @@ class IntentAgent(Agent):
         """
         graph = StateGraph(IntentState)
 
+        graph.add_node(self.render_system_prompt)
+        graph.add_edge(START, "render_system_prompt")
+
         graph.add_node(self.current_active_agent)
-        graph.add_edge(START, "current_active_agent")
+        graph.add_edge("render_system_prompt", "current_active_agent")
 
         graph.add_node(self.continue_conversation)
 
@@ -1107,8 +1127,8 @@ Last user message: "{last_human_message.content}"
             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}
+            if "<intents_rules>" not in state["system_prompt"]:
+                updated_system_prompt = f"""{state["system_prompt"]}
 
 <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.
@@ -1131,12 +1151,11 @@ If you endup with a single intent which is of type TOOL, you must call this tool
                     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
+                    pattern, replace, state["system_prompt"], flags=re.DOTALL
                 )
 
-            self._system_prompt = updated_system_prompt
-            self.set_system_prompt(self._system_prompt)
-            logger.debug(f"Injected in system prompt: {self._system_prompt}")
+            logger.debug(f"Injected in system prompt: {updated_system_prompt}")
+            return Command(update={"system_prompt": updated_system_prompt})
 
     def duplicate(
         self,

{naas_abi_core-1.4.2 → naas_abi_core-1.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "naas-abi-core"
-version = "1.4.2"
+version = "1.5.0"
 description = "Abi framework allowing you to build your AI system."
 authors = [{ name = "Maxime Jublou", email = "maxime@naas.ai" },{ name = "Florent Ravenel", email = "florent@naas.ai" }, { name = "Jeremy Ravenel", email = "jeremy@naas.ai" }]
 requires-python = ">=3.10,<4"

naas_abi_core-1.4.2/=0.9.13

@@ -1,6 +0,0 @@
-Collecting uv
-  Downloading uv-0.9.22-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (11 kB)
-Downloading uv-0.9.22-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (22.2 MB)
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 22.2/22.2 MB 161.1 MB/s  0:00:00
-Installing collected packages: uv
-Successfully installed uv-0.9.22