rasa-pro 3.14.0.dev11__tar.gz → 3.14.0.dev12__tar.gz

{rasa_pro-3.14.0.dev11 → rasa_pro-3.14.0.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.14.0.dev11
+Version: 3.14.0.dev12
 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
@@ -85,12 +85,9 @@ Requires-Dist: numpy (>=1.23.5,<2.2.0)
 Requires-Dist: onnxruntime (==1.22.1) ; extra == "full" or extra == "pii"
 Requires-Dist: openai (>=1.68.2,<1.69.0)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
-Requires-Dist: opentelemetry-api (>=1.16.0,<1.17.0) ; python_version < "3.12"
-Requires-Dist: opentelemetry-api (>=1.33.0,<1.34.0) ; python_version >= "3.12"
-Requires-Dist: opentelemetry-exporter-otlp (>=1.16.0,<1.17.0) ; python_version < "3.12"
-Requires-Dist: opentelemetry-exporter-otlp (>=1.33.0,<1.34.0) ; python_version >= "3.12"
-Requires-Dist: opentelemetry-sdk (>=1.16.0,<1.17.0) ; python_version < "3.12"
-Requires-Dist: opentelemetry-sdk (>=1.33.0,<1.34.0) ; python_version >= "3.12"
+Requires-Dist: opentelemetry-api (>=1.16.0,<2.0.0)
+Requires-Dist: opentelemetry-exporter-otlp (>=1.16.0,<2.0.0)
+Requires-Dist: opentelemetry-sdk (>=1.16.0,<2.0.0)
 Requires-Dist: packaging (>=23.2,<23.3)
 Requires-Dist: pep440-version-utils (>=1.1.0,<1.2.0) ; python_version < "3.13"
 Requires-Dist: pluggy (>=1.2.0,<2.0.0)

{rasa_pro-3.14.0.dev11 → rasa_pro-3.14.0.dev12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.14.0.dev11"
+version = "3.14.0.dev12"
 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>",]
@@ -212,18 +212,9 @@ cryptography = "~45.0.6"
 jsonpatch = "^1.33"
 importlib-resources = "^6.5.2"
 importlib-metadata = "~8.5.0"
-opentelemetry-sdk = [
-    { version = "~1.16.0", markers = "python_version < '3.12'" },
-    { version = "~1.33.0", markers = "python_version >= '3.12'" }
-]
-opentelemetry-exporter-otlp = [
-    { version = "~1.16.0", markers = "python_version < '3.12'" },
-    { version = "~1.33.0", markers = "python_version >= '3.12'" }
-]
-opentelemetry-api = [
-    { version = "~1.16.0", markers = "python_version < '3.12'" },
-    { version = "~1.33.0", markers = "python_version >= '3.12'" }
-]
+opentelemetry-sdk = ">=1.16.0,<2.0.0"
+opentelemetry-exporter-otlp = ">=1.16.0,<2.0.0"
+opentelemetry-api = ">=1.16.0,<2.0.0"
 python-dotenv = "^1.0.1"
 hvac = "~2.3.0"
 rich = "^13.4.2"
@@ -544,6 +535,7 @@ convention = "google"
 
 
 
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.14.0.dev11 → rasa_pro-3.14.0.dev12}/rasa/agents/agent_factory.py

@@ -15,7 +15,7 @@ class AgentFactory:
     """Factory for creating agent instances based on the protocol type."""
 
     _protocols: ClassVar[Dict[ProtocolType, Type[AgentProtocol]]] = {
-        ProtocolType.A2A: A2AAgent,
+        **({ProtocolType.A2A: A2AAgent} if A2AAgent is not None else {}),
         ProtocolType.MCP_OPEN: MCPOpenAgent,
         ProtocolType.MCP_TASK: MCPTaskAgent,
     }

{rasa_pro-3.14.0.dev11 → rasa_pro-3.14.0.dev12}/rasa/agents/agent_manager.py

@@ -2,7 +2,6 @@ from typing import ClassVar, Dict
 
 import structlog
 
-from rasa.agents.agent_factory import AgentFactory
 from rasa.agents.core.agent_protocol import AgentProtocol
 from rasa.agents.core.types import AgentIdentifier, ProtocolType
 from rasa.agents.schemas import AgentInput, AgentOutput
@@ -78,6 +77,8 @@ class AgentManager(metaclass=Singleton):
         Raises:
             ConnectionError: If the agent connection fails.
         """
+        from rasa.agents.agent_factory import AgentFactory
+
         # Add the agent to the manager
         agent_identifier = make_agent_identifier(agent_name, protocol_type)
         if agent_identifier in self.agents:

rasa_pro-3.14.0.dev12/rasa/agents/protocol/__init__.py

@@ -0,0 +1,13 @@
+# Import agents conditionally based on available dependencies
+__all__ = []
+
+try:
+    from rasa.agents.protocol.a2a.a2a_agent import A2AAgent
+    __all__.append("A2AAgent")
+except ImportError:
+    A2AAgent = None
+
+# MCP is always available (in default dependencies)
+from rasa.agents.protocol.mcp.mcp_open_agent import MCPOpenAgent
+from rasa.agents.protocol.mcp.mcp_task_agent import MCPTaskAgent
+__all__.extend(["MCPOpenAgent", "MCPTaskAgent"])

{rasa_pro-3.14.0.dev11 → rasa_pro-3.14.0.dev12}/rasa/core/actions/grpc_custom_action_executor.py

@@ -1,3 +1,4 @@
+import importlib.metadata
 import json
 from typing import TYPE_CHECKING, Any, Dict, List, Tuple
 from urllib.parse import urlparse
@@ -6,7 +7,14 @@ import grpc
 import structlog
 from google.protobuf.json_format import MessageToDict, Parse, ParseDict
 from rasa_sdk.grpc_errors import ResourceNotFound, ResourceNotFoundType
-from rasa_sdk.grpc_py import action_webhook_pb2, action_webhook_pb2_grpc
+
+if importlib.metadata.version("protobuf") >= "5.0.0":
+    from rasa_sdk.grpc_py.pb5 import action_webhook_pb2, action_webhook_pb2_grpc
+else:
+    from rasa_sdk.grpc_py.pb4 import (
+        action_webhook_pb2,
+        action_webhook_pb2_grpc,
+    )
 
 from rasa.core.actions.action_exceptions import DomainNotFound
 from rasa.core.actions.constants import SSL_CLIENT_CERT_FIELD, SSL_CLIENT_KEY_FIELD
@@ -102,7 +110,6 @@ class GRPCCustomActionExecutor(CustomActionExecutor):
         Returns:
             Response from the action server.
         """
-
         request = self._create_payload(
             tracker=tracker, domain=domain, include_domain=include_domain
         )
@@ -121,7 +128,6 @@ class GRPCCustomActionExecutor(CustomActionExecutor):
         Returns:
             Response from the action server.
         """
-
         client = self._create_grpc_client()
         metadata = self._build_metadata()
         try:
@@ -234,7 +240,6 @@ class GRPCCustomActionExecutor(CustomActionExecutor):
         Returns:
             gRPC channel for the action server.
         """
-
         compression = grpc.Compression.Gzip
 
         if self.cert_ca:

{rasa_pro-3.14.0.dev11 → rasa_pro-3.14.0.dev12}/rasa/tracing/instrumentation/attribute_extractors.py

@@ -1,3 +1,4 @@
+import importlib.metadata
 import json
 import logging
 from pathlib import Path
@@ -5,7 +6,11 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional, Text, Tuple, Union
 
 import tiktoken
 from numpy import ndarray
-from rasa_sdk.grpc_py import action_webhook_pb2
+
+if importlib.metadata.version("protobuf") >= "5.0.0":
+    from rasa_sdk.grpc_py.pb5 import action_webhook_pb2
+else:
+    from rasa_sdk.grpc_py.pb4 import action_webhook_pb2
 
 from rasa.core.actions.action import DirectCustomActionExecutor
 from rasa.core.actions.grpc_custom_action_executor import GRPCCustomActionExecutor

{rasa_pro-3.14.0.dev11 → rasa_pro-3.14.0.dev12}/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.dev11"
+__version__ = "3.14.0.dev12"

rasa_pro-3.14.0.dev11/rasa/agents/protocol/__init__.py

@@ -1,5 +0,0 @@
-from rasa.agents.protocol.a2a.a2a_agent import A2AAgent
-from rasa.agents.protocol.mcp.mcp_open_agent import MCPOpenAgent
-from rasa.agents.protocol.mcp.mcp_task_agent import MCPTaskAgent
-
-__all__ = ["A2AAgent", "MCPOpenAgent", "MCPTaskAgent"]