rasa-pro 3.13.7__py3-none-any.whl → 3.14.0.dev1__py3-none-any.whl

rasa/tracing/instrumentation/instrumentation.py

@@ -1088,13 +1088,15 @@ def _instrument_advance_flows_until_next_action(
 ) -> None:
     def tracing_advance_flows_until_next_action_wrapper(fn: Callable) -> Callable:
         @functools.wraps(fn)
-        def wrapper(
+        async def wrapper(
             tracker: DialogueStateTracker,
             available_actions: List[str],
             flows: FlowsList,
         ) -> FlowActionPrediction:
             with tracer.start_as_current_span(f"{module_name}.{fn.__name__}") as span:
-                prediction: FlowActionPrediction = fn(tracker, available_actions, flows)
+                prediction: FlowActionPrediction = await fn(
+                    tracker, available_actions, flows
+                )
 
                 span.set_attributes(
                     {

rasa/utils/common.py

@@ -34,7 +34,9 @@ from rasa.constants import (
     ENV_LOG_LEVEL_KAFKA,
     ENV_LOG_LEVEL_LIBRARIES,
     ENV_LOG_LEVEL_MATPLOTLIB,
+    ENV_LOG_LEVEL_MCP,
     ENV_LOG_LEVEL_RABBITMQ,
+    ENV_MCP_LOGGING_ENABLED,
 )
 from rasa.shared.constants import DEFAULT_LOG_LEVEL, ENV_LOG_LEVEL, TCP_PROTOCOL
 from rasa.shared.exceptions import RasaException
@@ -281,6 +283,7 @@ def configure_library_logging() -> None:
     update_kafka_log_level(library_log_level)
     update_rabbitmq_log_level(library_log_level)
     update_websockets_log_level(library_log_level)
+    update_mcp_log_level()
 
 
 def update_apscheduler_log_level() -> None:
@@ -415,6 +418,56 @@ def update_websockets_log_level(library_log_level: Text) -> None:
     logging.getLogger("websockets").propagate = False
 
 
+def update_mcp_log_level() -> None:
+    """Set the log level for MCP-related loggers.
+
+    This function configures logging levels for MCP (Model Context Protocol) related
+    loggers to reduce noise from HTTP and MCP client libraries.
+
+    Environment Variables:
+        LOG_LEVEL_MCP: Set the log level for MCP-related loggers.
+                       Valid values: DEBUG, INFO, WARNING, ERROR, CRITICAL
+                       Default: ERROR
+
+        MCP_LOGGING_ENABLED: Enable or disable MCP logging completely.
+                             Valid values: true, false
+                             Default: true
+
+    Examples:
+        # Show only ERROR and above for MCP logs
+        export LOG_LEVEL_MCP=ERROR
+
+        # Show DEBUG level MCP logs (very verbose)
+        export LOG_LEVEL_MCP=DEBUG
+
+        # Completely disable MCP logging
+        export MCP_LOGGING_ENABLED=false
+    """
+    # Check if MCP logging is completely disabled
+    mcp_logging_enabled = (
+        os.environ.get(ENV_MCP_LOGGING_ENABLED, "true").lower() == "true"
+    )
+
+    # Default to ERROR level for MCP logs to reduce noise
+    mcp_log_level: Union[int, str] = os.environ.get(ENV_LOG_LEVEL_MCP, "ERROR")
+    if not mcp_logging_enabled:
+        # Completely disable MCP logging
+        mcp_log_level = logging.CRITICAL + 1  # Higher than CRITICAL to disable all logs
+
+    # MCP client and HTTP-related loggers that are commonly noisy
+    mcp_loggers = [
+        "mcp.client.streamable_http",
+        "mcp.client",
+        "httpcore.connection",
+        "httpcore.http11",
+        "httpx",
+    ]
+
+    for logger_name in mcp_loggers:
+        logging.getLogger(logger_name).setLevel(mcp_log_level)
+        logging.getLogger(logger_name).propagate = False
+
+
 def sort_list_of_dicts_by_first_key(dicts: List[Dict]) -> List[Dict]:
     """Sorts a list of dictionaries by their first key."""
     return sorted(dicts, key=lambda d: next(iter(d.keys())))

rasa/utils/licensing.py

@@ -20,7 +20,8 @@ from rasa.shared.utils.cli import print_error_and_exit
 if typing.TYPE_CHECKING:
     from rasa.core.tracker_stores.tracker_store import TrackerStore
 
-LICENSE_ENV_VAR = "RASA_PRO_LICENSE"
+LICENSE_ENV_VAR = "RASA_LICENSE"
+LICENSE_ENV_VAR_LEGACY = "RASA_PRO_LICENSE"
 ALGORITHM = "RS256"
 # deepcode ignore HardcodedKey: This is a public key - not a security issue.
 PUBLIC_KEY = """-----BEGIN PUBLIC KEY-----
@@ -265,12 +266,22 @@ class License:
 
 def retrieve_license_from_env() -> Text:
     """Return the license found in the env var."""
+    # Check environment variables first
+    license_value = os.environ.get(LICENSE_ENV_VAR) or os.environ.get(
+        LICENSE_ENV_VAR_LEGACY
+    )
+    if license_value:
+        return license_value
+
+    # Fall back to .env file
     stored_env_values = dotenv_values(".env")
-    license_from_env = os.environ.get(LICENSE_ENV_VAR)
-    license = license_from_env or stored_env_values.get(LICENSE_ENV_VAR)
-    if not license:
-        raise LicenseNotFoundException()
-    return license
+    license_value = stored_env_values.get(LICENSE_ENV_VAR) or stored_env_values.get(
+        LICENSE_ENV_VAR_LEGACY
+    )
+    if license_value:
+        return license_value
+
+    raise LicenseNotFoundException()
 
 
 def is_license_expiring_soon(license: License) -> bool:
@@ -297,15 +308,15 @@ def validate_license_from_env(product_area: Text = PRODUCT_AREA) -> None:
     except LicenseNotFoundException:
         structlogger.error("license.not_found.error")
         raise SystemExit(
-            f"A Rasa Pro license is required. "
-            f"Please set the environmental variable "
+            f"A Rasa license is required. "
+            f"Please set the environment variable "
             f"`{LICENSE_ENV_VAR}` to a valid license string. "
         )
     except LicenseValidationException as e:
         structlogger.error("license.validation.error", error=e)
         raise SystemExit(
-            f"Failed to validate Rasa Pro license "
-            f"which was read from environmental variable `{LICENSE_ENV_VAR}`. "
+            f"Failed to validate Rasa license "
+            f"which was read from environment variable `{LICENSE_ENV_VAR}`. "
             f"Please ensure `{LICENSE_ENV_VAR}` is set to a valid license string. "
         )
 

rasa/utils/plotting.py

@@ -99,7 +99,7 @@ def plot_confusion_matrix(
     zmax = confusion_matrix.max() if len(confusion_matrix) > 0 else 1
     plt.clf()
     if not color_map:
-        color_map = plt.cm.Blues
+        color_map = plt.cm.get_cmap("Blues")
     plt.imshow(
         confusion_matrix,
         interpolation="nearest",

rasa/version.py

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

{rasa_pro-3.13.7.dist-info → rasa_pro-3.14.0.dev1.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.7
+Version: 3.14.0.dev1
 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
 Author-email: hi@rasa.com
 Maintainer: Tom Bocklisch
 Maintainer-email: tom@rasa.com
-Requires-Python: >=3.9.2,<3.12
+Requires-Python: >=3.10,<3.12
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3
@@ -23,7 +23,7 @@ Provides-Extra: spacy
 Provides-Extra: transformers
 Requires-Dist: CacheControl (>=0.14.2,<0.15.0)
 Requires-Dist: PyJWT[crypto] (>=2.8.0,<3.0.0)
-Requires-Dist: SQLAlchemy (>=2.0.41,<2.1.0)
+Requires-Dist: SQLAlchemy (>=2.0.42,<2.1.0)
 Requires-Dist: absl-py (>=2.0,<2.1)
 Requires-Dist: aio-pika (>=8.2.3,<9.4.4)
 Requires-Dist: aiogram (>=3.15,<3.16)
@@ -38,14 +38,14 @@ Requires-Dist: colorama (>=0.4.6,<0.5.0) ; sys_platform == "win32"
 Requires-Dist: colorclass (>=2.2,<2.3)
 Requires-Dist: coloredlogs (>=15,<16)
 Requires-Dist: colorhash (>=2.0,<2.1.0)
-Requires-Dist: confluent-kafka (>=2.10.0,<3.0.0)
+Requires-Dist: confluent-kafka (>=2.11.0,<3.0.0)
 Requires-Dist: cryptography (>=44.0.1)
 Requires-Dist: cvg-python-sdk (>=0.5.1,<0.6.0)
-Requires-Dist: dask (>=2024.7.0,<2024.8.0)
+Requires-Dist: dask (>=2024.8.0,<2024.9.0)
 Requires-Dist: demoji (>=1.1.0,<2.0.0)
 Requires-Dist: diskcache (>=5.6.3,<5.7.0)
 Requires-Dist: dnspython (==2.6.1)
-Requires-Dist: faiss-cpu (>=1.7.4,<2.0.0)
+Requires-Dist: faiss-cpu (>=1.11.0,<1.12.0)
 Requires-Dist: fbmessenger (>=6.0.0,<6.1.0)
 Requires-Dist: github3.py (>=3.2.0,<3.3.0) ; extra == "gh-release-notes"
 Requires-Dist: gitpython (>=3.1.41,<3.2.0) ; extra == "full"
@@ -65,8 +65,9 @@ Requires-Dist: langchain (>=0.2.17,<0.3.0)
 Requires-Dist: langchain-community (>=0.2.19,<0.3.0)
 Requires-Dist: langcodes (>=3.5.0,<4.0.0)
 Requires-Dist: litellm (>=1.69.0,<1.70.0)
-Requires-Dist: matplotlib (>=3.7,<3.8)
+Requires-Dist: matplotlib (>=3.9.4,<3.10.0)
 Requires-Dist: mattermostwrapper (>=2.2,<2.3)
+Requires-Dist: mcp (>=1.12.0,<1.13.0)
 Requires-Dist: networkx (>=3.1,<3.2)
 Requires-Dist: numpy (>=1.26.4,<1.27.0)
 Requires-Dist: onnxruntime (==1.19.2) ; extra == "pii"
@@ -93,13 +94,13 @@ Requires-Dist: python-dateutil (>=2.8.2,<2.9.0)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: python-engineio (>=4.12.2,<4.13.0)
 Requires-Dist: python-keycloak (>=3.12.0,<4.0.0)
-Requires-Dist: python-socketio (>=5.8,<6)
+Requires-Dist: python-socketio (>=5.13,<6)
 Requires-Dist: pytz (>=2022.7.1,<2023.0)
-Requires-Dist: pyyaml (>=6.0)
+Requires-Dist: pyyaml (>=6.0.2,<6.1.0)
 Requires-Dist: qdrant-client (>=1.9.1,<1.10.0)
 Requires-Dist: questionary (>=1.10.0,<2.1.0)
 Requires-Dist: randomname (>=0.2.1,<0.3.0)
-Requires-Dist: rasa-sdk (==3.13.0)
+Requires-Dist: rasa-sdk (==3.14.0.dev2)
 Requires-Dist: redis (>=4.6.0,<6.0)
 Requires-Dist: regex (>=2024.7.24,<2024.8.0)
 Requires-Dist: requests (>=2.32.3,<2.33.0)
@@ -111,16 +112,16 @@ Requires-Dist: sanic (>=22.12,<22.13)
 Requires-Dist: sanic-cors (>=2.2.0,<2.3.0)
 Requires-Dist: sanic-jwt (>=1.8.0,<2.0.0)
 Requires-Dist: sanic-routing (>=22.8.0,<23.0.0)
-Requires-Dist: scikit-learn (>=1.5.1,<1.6.0)
+Requires-Dist: scikit-learn (>=1.6.1,<1.7.0)
 Requires-Dist: scipy (>=1.13.1,<1.14.0)
 Requires-Dist: sentencepiece[sentencepiece] (>=0.1.99,<0.2.0) ; extra == "transformers" or extra == "full"
 Requires-Dist: sentry-sdk (>=2.8.0,<3)
 Requires-Dist: setuptools (>=78.1.1,<78.2.0)
-Requires-Dist: sklearn-crfsuite (>=0.3.6,<0.4.0)
-Requires-Dist: skops (>=0.10.0,<0.11.0)
+Requires-Dist: sklearn-crfsuite (>=0.5.0,<0.6.0)
+Requires-Dist: skops (>=0.11.0,<0.12.0)
 Requires-Dist: slack-sdk (>=3.27.1,<3.28.0)
 Requires-Dist: spacy (>=3.5.4,<4.0.0) ; extra == "spacy" or extra == "full"
-Requires-Dist: structlog (>=23.1.0,<23.2.0)
+Requires-Dist: structlog (>=25.4.0,<25.5.0)
 Requires-Dist: structlog-sentry (>=2.0.3,<2.1.0)
 Requires-Dist: tarsafe (>=0.0.5,<0.0.6)
 Requires-Dist: tenacity (>=8.4.1,<8.5.0)
@@ -135,7 +136,7 @@ Requires-Dist: tensorflow-metal (==1.1.0) ; (sys_platform == "darwin" and platfo
 Requires-Dist: tensorflow-text (==2.14.0) ; sys_platform != "win32" and platform_machine != "arm64" and platform_machine != "aarch64"
 Requires-Dist: tensorflow_hub (>=0.13.0,<0.14.0)
 Requires-Dist: terminaltables (>=3.1.10,<3.2.0)
-Requires-Dist: tiktoken (>=0.7.0,<0.8.0)
+Requires-Dist: tiktoken (>=0.9.0,<0.10.0)
 Requires-Dist: tqdm (>=4.66.2,<5.0.0)
 Requires-Dist: transformers (>=4.38.2,<4.39.0) ; extra == "transformers" or extra == "full"
 Requires-Dist: twilio (>=8.4,<8.5)