rasa-pro 3.16.1.dev3__tar.gz → 3.16.1.dev4__tar.gz

{rasa_pro-3.16.1.dev3 → rasa_pro-3.16.1.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.16.1.dev3
+Version: 3.16.1.dev4
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
 Author: Rasa Technologies GmbH

{rasa_pro-3.16.1.dev3 → rasa_pro-3.16.1.dev4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.16.1.dev3"
+version = "3.16.1.dev4"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]

{rasa_pro-3.16.1.dev3 → rasa_pro-3.16.1.dev4}/rasa/agents/protocol/a2a/a2a_agent.py

@@ -239,6 +239,22 @@ class A2AAgent(AgentProtocol):
         cancellation_token: Optional[CancellationToken] = None,
     ) -> AgentOutput:
         """Send a message to Agent/server and return response."""
+        self._last_message_sent: Optional[str] = None
+        output = await self._run_core(
+            agent_input, output_channel, cancellation_token
+        )
+        if self._last_message_sent is not None:
+            output.metadata = output.metadata or {}
+            output.metadata["message_sent"] = self._last_message_sent
+        return output
+
+    async def _run_core(
+        self,
+        agent_input: AgentInput,
+        output_channel: Optional[OutputChannel] = None,
+        cancellation_token: Optional[CancellationToken] = None,
+    ) -> AgentOutput:
+        """Core implementation of agent run logic."""
         generated_events: List[Event] = []
         if not self._client or not self.agent_card:
             structlogger.error(
@@ -258,6 +274,9 @@ class A2AAgent(AgentProtocol):
             agent_name=self._name,
         )
         message = self._prepare_message(agent_input)
+        self._last_message_sent = "\n".join(
+            p.root.text for p in message.parts if hasattr(p.root, "text")
+        )
 
         try:
             stream = self._client.send_message(message)

{rasa_pro-3.16.1.dev3 → rasa_pro-3.16.1.dev4}/rasa/agents/protocol/mcp/mcp_base_agent.py

@@ -44,6 +44,7 @@ from rasa.agents.schemas import (
     CustomToolSchema,
 )
 from rasa.agents.utils import get_slot_value_from_agent_input
+from rasa.builder.telemetry.langfuse.langfuse_compat import observe
 from rasa.core.available_agents import AgentConfig, AgentMCPServerConfig, ProtocolConfig
 from rasa.core.channels import OutputChannel
 from rasa.core.constants import (
@@ -112,6 +113,7 @@ from rasa.shared.utils.llm import (
 )
 from rasa.shared.utils.mcp.server_connection import MCPServerConnection
 from rasa.shared.utils.mcp.utils import build_mcp_meta, call_tool_with_meta
+from rasa.tracing.langfuse_telemetry import update_current_span_metadata
 
 # Marker text for "previous run (completed)" in message content when agent restarted.
 # Must match the instruction text in MCP prompt templates.
@@ -763,6 +765,7 @@ class MCPBaseAgent(AgentProtocol):
             List of message dicts with "role" and "content" for the LLM.
         """
         system_content = self.render_prompt_template(context)
+        self._last_rendered_prompt = system_content
         messages = [{KEY_ROLE: ROLE_SYSTEM, KEY_CONTENT: system_content}]
 
         is_restarted = bool(
@@ -1340,6 +1343,12 @@ class MCPBaseAgent(AgentProtocol):
         result = custom_tool.tool_executor(executor_args, context)
         return await result if isawaitable(result) else result
 
+    @observe(
+        name="mcp_agent.execute_tool_call",
+        as_type="generation",
+        capture_input=False,
+        capture_output=False,
+    )
     async def _execute_tool_call(
         self,
         tool_name: str,
@@ -1359,6 +1368,15 @@ class MCPBaseAgent(AgentProtocol):
         Returns:
             The result of the tool execution as an AgentToolResult object.
         """
+        update_current_span_metadata(
+            metadata={
+                "prompt_type": "agent_tool_call",
+                "agent_name": self._name,
+                "tool_name": tool_name,
+                "has_agent_input": agent_input is not None,
+            }
+        )
+
         try:
             for custom_tool in self._custom_tools:
                 if custom_tool.tool_name == tool_name:
@@ -1714,7 +1732,11 @@ class MCPBaseAgent(AgentProtocol):
         cancellation_token: Optional["CancellationToken"] = None,
     ) -> AgentOutput:
         """Send a message to Agent/server and return response."""
-        return await self.send_message(input, output_channel)
+        output = await self.send_message(input, output_channel)
+        output.metadata = output.metadata or {}
+        if getattr(self, "_last_rendered_prompt", None):
+            output.metadata["rendered_prompt"] = self._last_rendered_prompt
+        return output
 
     # ============================================================================
     # Message Processing

{rasa_pro-3.16.1.dev3 → rasa_pro-3.16.1.dev4}/rasa/core/available_agents.py

@@ -231,21 +231,55 @@ class AvailableAgents:
         data = read_config_file(config_path)
         return cls.from_dict(data)
 
-    def as_json_list(self) -> List[Dict[str, Any]]:
-        """Convert the available agents to a JSON-serializable list."""
-        return [
-            {
-                "name": agent_name,
-                "agent": agent_config.agent.model_dump(),
-                "configuration": agent_config.configuration.model_dump()
+    def as_json_list(
+        self,
+        model_groups: Optional[List[Dict[str, Any]]] = None,
+    ) -> List[Dict[str, Any]]:
+        """Convert the available agents to a JSON-serializable list.
+
+        Args:
+            model_groups: Optional list of model group configs from endpoints.yml.
+                When provided, each agent entry will include a
+                ``resolved_llm_config`` field with the full model group definition
+                that matches the agent's ``configuration.llm.model_group`` name.
+        """
+        model_groups_by_name: Dict[str, Any] = {}
+        if model_groups:
+            for group in model_groups:
+                if isinstance(group, dict):
+                    # model_groups use "id" as the key in endpoints.yml
+                    group_key = group.get("id") or group.get("name")
+                    if group_key:
+                        model_groups_by_name[group_key] = group
+
+        result = []
+        for agent_name, agent_config in self.agents.items():
+            configuration = (
+                agent_config.configuration.model_dump()
                 if agent_config.configuration
-                else None,
-                "connections": agent_config.connections.model_dump()
-                if agent_config.connections
-                else None,
-            }
-            for agent_name, agent_config in self.agents.items()
-        ]
+                else None
+            )
+
+            resolved_llm_config = None
+            if configuration and model_groups_by_name:
+                model_group_name = (configuration.get("llm") or {}).get(
+                    "model_group"
+                )
+                if model_group_name:
+                    resolved_llm_config = model_groups_by_name.get(model_group_name)
+
+            result.append(
+                {
+                    "name": agent_name,
+                    "agent": agent_config.agent.model_dump(),
+                    "configuration": configuration,
+                    "connections": agent_config.connections.model_dump()
+                    if agent_config.connections
+                    else None,
+                    "resolved_llm_config": resolved_llm_config,
+                }
+            )
+        return result
 
     def get_agent_config(self, agent_id: str) -> Optional[AgentConfig]:
         return self.agents.get(agent_id)

rasa_pro-3.16.1.dev4/rasa/core/channels/inspector-nextgen/.gitignore

@@ -0,0 +1 @@
+coverage/

{rasa_pro-3.16.1.dev3 → rasa_pro-3.16.1.dev4}/rasa/core/channels/inspector-nextgen/README.md

@@ -30,7 +30,7 @@ Example `.npmrc` (replace `TOKEN` with your actual font awesome token, available
 
 ## Installation
 
-In the `/rasa/core/channels/inspector` directory:
+In the `/rasa/core/channels/inspector-nextgen` directory:
 
 ```
 yarn install
@@ -47,7 +47,7 @@ yarn dev
 In another terminal, start the Rasa Inspector server, specifying the port used by Vite:
 
 ```
-RASA_INSPECTOR_DEV_PORT=<port-of-the-served-vite-app> rasa inspect
+RASA_INSPECTOR_DEV_PORT=<port-of-the-served-vite-app> rasa inspect --nextgen
 ```
 
 Visit `http://localhost:<port-of-the-served-vite-app>/` for the Vite app, or use the Rasa Inspector at the link printed by the CLI. The Inspector frontend will live-reload on changes.
@@ -65,7 +65,7 @@ yarn build
 To serve the production Inspector, run:
 
 ```
-rasa inspect
+rasa inspect --nextgen
 ```
 
 This will serve the built frontend (`dist/index.html`).