rasa-pro 3.14.0.dev9__tar.gz → 3.14.0.dev10__tar.gz

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.14.0.dev9
+Version: 3.14.0.dev10
 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.14.0.dev9 → rasa_pro-3.14.0.dev10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.14.0.dev9"
+version = "3.14.0.dev10"
 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>",]
@@ -655,6 +655,7 @@ convention = "google"
 
 
 
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/agents/agent_factory.py

@@ -40,7 +40,7 @@ class AgentFactory:
             )
             if not cls._is_valid_custom_agent(agent_class, protocol_type):
                 raise ValueError(
-                    f"Agent class {agent_class} does not subclass the "
+                    f"Agent class `{agent_class}` does not subclass the "
                     f"{cls._get_agent_class_from_protocol(protocol_type).__name__} "
                     f"agent class."
                 )
@@ -87,7 +87,7 @@ class AgentFactory:
             protocol_class: The class that implements the protocol.
         """
         if cls.is_protocol_supported(protocol_type):
-            raise ValueError(f"Protocol {protocol_type} already registered.")
+            raise ValueError(f"Protocol {protocol_type.name} already registered.")
         cls._protocols[protocol_type] = protocol_class
 
     @classmethod

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/agents/protocol/a2a/a2a_agent.py

@@ -50,6 +50,7 @@ from rasa.agents.core.agent_protocol import AgentProtocol
 from rasa.agents.core.types import AgentStatus, ProtocolType
 from rasa.agents.schemas import AgentInput, AgentOutput
 from rasa.core.available_agents import AgentConfig
+from rasa.shared.agents.auth.agent_auth_manager import AgentAuthManager
 from rasa.shared.exceptions import (
     AgentInitializationException,
     InvalidParameterException,
@@ -78,12 +79,14 @@ class A2AAgent(AgentProtocol):
         agent_card_path: str,
         timeout: int,
         max_retries: int,
+        auth_config: Optional[Dict[str, Any]] = None,
     ) -> None:
         self._name = name
         self._description = description
         self._agent_card_path = agent_card_path
         self._timeout = timeout
         self._max_retries = max_retries
+        self._auth_config = auth_config
 
         self.agent_card: Optional[AgentCard] = None
         self._client: Optional[Client] = None
@@ -111,12 +114,14 @@ class A2AAgent(AgentProtocol):
             else AGENT_DEFAULT_MAX_RETRIES
         )
 
+        _auth_config = config.configuration.auth if config.configuration else None
         return cls(
             name=config.agent.name,
             description=config.agent.description,
             agent_card_path=agent_card_path,
             timeout=timeout,
             max_retries=max_retries,
+            auth_config=_auth_config,
         )
 
     @property
@@ -442,6 +447,16 @@ class A2AAgent(AgentProtocol):
         elif state == TaskState.submitted or state == TaskState.working:
             # The task is still in progress, return None to continue waiting for updates
             return None
+        elif state == TaskState.unknown:
+            # The task has an unknown state. Perhaps this is a transient condition.
+            # Return None to continue waiting for updates
+            structlogger.warning(
+                "a2a_agent.run_streaming_agent.unknown_task_state",
+                event_info="Task is in unknown state, continuing to wait for updates",
+                agent_name=self._name,
+                state=state,
+            )
+            return None
         else:
             structlogger.error(
                 "a2a_agent.run_streaming_agent.unexpected_task_state",
@@ -606,21 +621,21 @@ class A2AAgent(AgentProtocol):
         In case of completed tasks, the final message might be in
         the task status message or in the artifacts (or both).
         """
-        result = ""
+        # We need to preserve the order of the message,
+        # but also make sure to remove any duplicates.
+        result: List[str] = []
         if task.status.message:
-            result += (
-                A2AAgent._generate_response_message_from_parts(
-                    task.status.message.parts
-                )
-                + "\n"
+            message = A2AAgent._generate_response_message_from_parts(
+                task.status.message.parts
             )
+            if message and message not in result:
+                result.append(message)
         if task.artifacts:
             for artifact in task.artifacts:
-                result += (
-                    A2AAgent._generate_response_message_from_parts(artifact.parts)
-                    + "\n"
-                )
-        return result.strip()
+                message = A2AAgent._generate_response_message_from_parts(artifact.parts)
+                if message and message not in result:
+                    result.append(message)
+        return "\n".join(result)
 
     @staticmethod
     def _generate_structured_results_from_artifacts(
@@ -746,9 +761,13 @@ class A2AAgent(AgentProtocol):
         )
 
     def _init_client(self) -> Client:
+        _agent_manager = AgentAuthManager.load_auth(self._auth_config)
+        auth_strategy = _agent_manager.get_auth() if _agent_manager else None
         factory = ClientFactory(
             config=ClientConfig(
-                httpx_client=httpx.AsyncClient(timeout=self._timeout),
+                httpx_client=httpx.AsyncClient(
+                    timeout=self._timeout, auth=auth_strategy
+                ),
                 streaming=True,
                 supported_transports=[
                     TransportProtocol.jsonrpc,

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/agents/protocol/mcp/mcp_base_agent.py

@@ -1,5 +1,6 @@
 import json
 from abc import abstractmethod
+from datetime import datetime
 from inspect import isawaitable
 from typing import Any, Dict, List, Optional, Tuple
 
@@ -493,11 +494,25 @@ class MCPBaseAgent(AgentProtocol):
     # LLM & Prompt Management
     # ============================================================================
 
+    def _get_current_date_time_day(self) -> Tuple[str, str, str]:
+        """Get the current date, time, and day in standard formats."""
+        now = datetime.now()
+        current_date = now.strftime("%Y-%m-%d")  # e.g. 2025-09-14
+        current_time = now.strftime("%H:%M:%S")  # e.g. 16:45:12
+        current_day = now.strftime("%A")  # e.g. Sunday
+        return current_date, current_time, current_day
+
     def render_prompt_template(self, context: AgentInput) -> str:
         """Render the prompt template with the provided inputs."""
+        # Current date, time, and weekday in standard formats
+        current_date, current_time, current_day = self._get_current_date_time_day()
+
         return Template(self.prompt_template).render(
             **context.model_dump(exclude={"id", "timestamp", "events"}),
             description=self._description,
+            current_date=current_date,
+            current_time=current_time,
+            current_day=current_day,
         )
 
     def build_messages_for_llm_request(

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/agents/protocol/mcp/mcp_task_agent.py

@@ -253,11 +253,15 @@ class MCPTaskAgent(MCPBaseAgent):
     def render_prompt_template(self, context: AgentInput) -> str:
         """Render the prompt template with the provided inputs."""
         slot_names = self._get_slot_names_from_exit_conditions(context)
+        current_date, current_time, current_day = self._get_current_date_time_day()
 
         return Template(self.prompt_template).render(
             **context.model_dump(exclude={"id", "timestamp", "events"}),
             description=self._description,
             slot_names=slot_names,
+            current_date=current_date,
+            current_time=current_time,
+            current_day=current_day,
         )
 
     async def send_message(self, agent_input: AgentInput) -> AgentOutput:

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/agents/schemas/__init__.py

@@ -1,10 +1,11 @@
-from rasa.agents.schemas.agent_input import AgentInput
+from rasa.agents.schemas.agent_input import AgentInput, AgentInputSlot
 from rasa.agents.schemas.agent_output import AgentOutput
 from rasa.agents.schemas.agent_tool_result import AgentToolResult
 from rasa.agents.schemas.agent_tool_schema import AgentToolSchema, CustomToolSchema
 
 __all__ = [
     "AgentInput",
+    "AgentInputSlot",
     "AgentOutput",
     "AgentToolSchema",
     "AgentToolResult",

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/agents/templates/mcp_open_agent_prompt_template.jinja2

@@ -1,5 +1,10 @@
 You are a helpful assistant that should assist the user in the best possible way.
 
+### Context
+- Current date: {{ current_date }}   (YYYY-MM-DD)
+- Current time: {{ current_time }}   (HH:MM:SS, 24-hour format)
+- Current day: {{ current_day }}     (Day of week)
+
 ### Primary Task
 {{ description }}
 

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/agents/templates/mcp_task_agent_prompt_template.jinja2

@@ -1,5 +1,10 @@
 You are a helpful assistant that should assist the user in the best possible way.
 
+### Context
+- Current date: {{ current_date }}   (YYYY-MM-DD)
+- Current time: {{ current_time }}   (HH:MM:SS, 24-hour format)
+- Current day: {{ current_day }}     (Day of week)
+
 ### Description of your capabilities
 {{ description }}
 

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/agents/validation.py

@@ -84,7 +84,7 @@ def _validate_mcp_config(agent_config: AgentConfig) -> None:
     if agent_config.connections is None or agent_config.connections.mcp_servers is None:
         raise ValidationError(
             code="agent.validation.mcp.missing_connections",
-            event_info=f"For protocol 'MCP', agent '{agent_name}' must have "
+            event_info=f"For protocol 'RASA', agent '{agent_name}' must have "
             "'connections.mcp_servers' configured.",
         )
 
@@ -92,7 +92,7 @@ def _validate_mcp_config(agent_config: AgentConfig) -> None:
     if not agent_config.connections.mcp_servers:
         raise ValidationError(
             code="agent.validation.mcp.empty_servers_list",
-            event_info=f"For protocol 'MCP', agent '{agent_name}' must have "
+            event_info=f"For protocol 'RASA', agent '{agent_name}' must have "
             "at least one MCP server configured in 'connections.mcp_servers'.",
         )
 
@@ -101,7 +101,7 @@ def _validate_mcp_config(agent_config: AgentConfig) -> None:
         if not server.name:
             raise ValidationError(
                 code="agent.validation.mcp.server_missing_name",
-                event_info=f"For protocol 'MCP', agent '{agent_name}' MCP server "
+                event_info=f"For protocol 'RASA', agent '{agent_name}' MCP server "
                 f"at index {i} must have a 'name' field.",
             )
 
@@ -400,7 +400,7 @@ def validate_agent_config(agent_config: AgentConfig) -> None:
     protocol = agent_config.agent.protocol
 
     # Run protocol-specific validation
-    if protocol == ProtocolConfig.MCP:
+    if protocol == ProtocolConfig.RASA:
         _validate_mcp_config(agent_config)
     elif protocol == ProtocolConfig.A2A:
         _validate_a2a_config(agent_config)

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/core/available_agents.py

@@ -19,7 +19,7 @@ structlogger = structlog.get_logger()
 class ProtocolConfig(str, Enum):
     """Supported protocols for agents."""
 
-    MCP = "MCP"
+    RASA = "RASA"
     A2A = "A2A"
 
 
@@ -28,7 +28,8 @@ class AgentInfo(BaseModel):
 
     name: str = Field(..., description="Agent name")
     protocol: ProtocolConfig = Field(
-        ..., description="Protocol used to communicate with the agent."
+        default=ProtocolConfig.RASA,
+        description="Protocol used to communicate with the agent.",
     )
     description: str = Field(..., description="Agent description")
 
@@ -41,9 +42,9 @@ class AgentInfo(BaseModel):
             if isinstance(protocol_value, str):
                 # Map lowercase protocol names to uppercase enum values
                 protocol_mapping = {
-                    "mcp": ProtocolConfig.MCP,
+                    "rasa": ProtocolConfig.RASA,
                     "a2a": ProtocolConfig.A2A,
-                    "MCP": ProtocolConfig.MCP,
+                    "RASA": ProtocolConfig.RASA,
                     "A2A": ProtocolConfig.A2A,
                 }
 
@@ -65,6 +66,7 @@ class AgentConfiguration(BaseModel):
     timeout: Optional[int] = None  # timeout in seconds
     max_retries: Optional[int] = None
     agent_card: Optional[str] = None
+    auth: Optional[Dict[str, Any]] = None
 
 
 class AgentConnections(BaseModel):
@@ -122,7 +124,7 @@ class AvailableAgents(metaclass=Singleton):
                 return cls(agents)
 
         # First, load all agent configs into a temporary list for validation
-        agent_configs = []
+        agent_configs: List[AgentConfig] = []
         for agent_name in os.listdir(agent_folder):
             config_path = os.path.join(agent_folder, agent_name, "config.yml")
             if not os.path.isfile(config_path):

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/core/policies/flows/flow_executor.py

@@ -77,8 +77,8 @@ from rasa.shared.core.constants import (
     ACTION_METADATA_MESSAGE_KEY,
     ACTION_METADATA_TEXT_KEY,
     ACTION_SEND_TEXT_NAME,
-    FLOW_HASHES_SLOT,
     SILENCE_TIMEOUT_SLOT,
+    SLOTS_EXCLUDED_FOR_AGENT,
 )
 from rasa.shared.core.events import (
     AgentCancelled,
@@ -120,7 +120,6 @@ MAX_NUMBER_OF_STEPS = 250
 MAX_AGENT_RETRIES = 3
 
 # Slots that should not be forwarded to sub-agents via AgentInput
-SLOTS_EXCLUDED_FOR_AGENT = [FLOW_HASHES_SLOT]
 
 
 def render_template_variables(text: str, context: Dict[Text, Any]) -> str:

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/core/policies/flows/mcp_tool_executor.py

@@ -195,8 +195,9 @@ async def _connect_to_mcp_server(
         return None
 
     mcp_server_config = mcp_server_configs[0]
-    mcp_server_connection = MCPServerConnection(
-        mcp_server_config.name, mcp_server_config.url, mcp_server_config.type
+
+    mcp_server_connection = MCPServerConnection.from_config(
+        mcp_server_config.model_dump()
     )
 
     # Ensure the connection is established and return the connection object

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/shared/agents/auth/agent_auth_manager.py

@@ -51,7 +51,9 @@ class AgentAuthManager:
         )
 
     @classmethod
-    def load_auth(cls, config: Dict[str, Any]) -> "AgentAuthManager":
+    def load_auth(
+        cls, config: Optional[Dict[str, Any]]
+    ) -> Optional["AgentAuthManager"]:
         """Connect to authentication using specified strategy type and persist
         the auth instance to the manager in a ready-to-use state.
 
@@ -61,7 +63,8 @@ class AgentAuthManager:
         Raises:
             AgentAuthInitializationException: If the authentication connection fails.
         """
-        config = config or {}
+        if not config:
+            return None
         try:
             auth_type = AgentAuthManager.detect_auth_type(config)
 
@@ -83,4 +86,4 @@ class AgentAuthManager:
                 event_info=event_info,
                 config=config,
             )
-            raise AgentAuthInitializationException(e)
+            raise AgentAuthInitializationException(e) from e

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/shared/agents/auth/auth_strategy/oauth2_auth_strategy.py

@@ -10,6 +10,7 @@ from rasa.shared.agents.auth.auth_strategy import AgentAuthStrategy
 from rasa.shared.agents.auth.constants import (
     CONFIG_CLIENT_ID_KEY,
     CONFIG_CLIENT_SECRET_KEY,
+    CONFIG_OAUTH_KEY,
     CONFIG_SCOPE_KEY,
     CONFIG_TIMEOUT_KEY,
     CONFIG_TOKEN_URL_KEY,
@@ -56,11 +57,18 @@ class OAuth2AuthStrategy(AgentAuthStrategy):
     @classmethod
     def from_config(cls, config: Dict[str, Any]) -> "OAuth2AuthStrategy":
         """Create OAuth2AuthStrategy from configuration dictionary."""
-        token_url = config.get(CONFIG_TOKEN_URL_KEY)
-        client_id = config.get(CONFIG_CLIENT_ID_KEY)
-        client_secret = config.get(CONFIG_CLIENT_SECRET_KEY)
-        scope = config.get(CONFIG_SCOPE_KEY)
-        timeout = config.get(CONFIG_TIMEOUT_KEY) or cls.DEFAULT_ACCESS_TOKEN_TIMEOUT
+        # Extract OAuth2 config from nested "oauth" key if present
+        oauth_config = config.get(CONFIG_OAUTH_KEY, config)
+        if not oauth_config:
+            raise ValueError("OAuth2 configuration is required")
+
+        token_url = oauth_config.get(CONFIG_TOKEN_URL_KEY)
+        client_id = oauth_config.get(CONFIG_CLIENT_ID_KEY)
+        client_secret = oauth_config.get(CONFIG_CLIENT_SECRET_KEY)
+        scope = oauth_config.get(CONFIG_SCOPE_KEY)
+        timeout = (
+            oauth_config.get(CONFIG_TIMEOUT_KEY) or cls.DEFAULT_ACCESS_TOKEN_TIMEOUT
+        )
 
         if not token_url:
             raise ValueError("Token URL is required for OAuth2 authentication")

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/shared/core/constants.py

@@ -129,7 +129,7 @@ GLOBAL_SILENCE_TIMEOUT_KEY = "global_silence_timeout"
 SILENCE_TIMEOUT_SLOT = "silence_timeout"
 SLOT_CONSECUTIVE_SILENCE_TIMEOUTS = "consecutive_silence_timeouts"
 GLOBAL_SILENCE_TIMEOUT_DEFAULT_VALUE = 7.0
-SILENCE_SLOTS = [SILENCE_TIMEOUT_SLOT, SLOT_CONSECUTIVE_SILENCE_TIMEOUTS]
+SILENCE_SLOTS = {SILENCE_TIMEOUT_SLOT, SLOT_CONSECUTIVE_SILENCE_TIMEOUTS}
 # slots for knowledge base
 SLOT_LISTED_ITEMS = "knowledge_base_listed_objects"
 SLOT_LAST_OBJECT = "knowledge_base_last_object"
@@ -148,6 +148,10 @@ DEFAULT_SLOT_NAMES = {
     FLOW_HASHES_SLOT,
 }
 
+SLOTS_EXCLUDED_FOR_AGENT = (
+    SILENCE_SLOTS | DEFAULT_SLOT_NAMES | KNOWLEDGE_BASE_SLOT_NAMES
+)
+
 SLOT_MAPPINGS = "mappings"
 MAPPING_CONDITIONS = "conditions"
 KEY_MAPPING_TYPE = "type"

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/shared/utils/mcp/server_connection.py

@@ -67,7 +67,7 @@ class MCPServerConnection:
     def from_config(cls, server_config: Dict[str, Any]) -> "MCPServerConnection":
         """Initialize the MCP server connection from a configuration dictionary."""
         auth_config = server_config.get("additional_params")
-        _auth_manager = AgentAuthManager.load_auth(auth_config) if auth_config else None
+        _auth_manager = AgentAuthManager.load_auth(auth_config)
         return cls(
             server_config["name"],
             server_config["url"],

{rasa_pro-3.14.0.dev9 → rasa_pro-3.14.0.dev10}/rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.14.0.dev9"
+__version__ = "3.14.0.dev10"