rasa-pro 3.14.0.dev5__py3-none-any.whl → 3.14.0.dev7__py3-none-any.whl

rasa/utils/common.py

@@ -1,5 +1,6 @@
 import copy
 import inspect
+import json
 import logging
 import logging.config
 import logging.handlers
@@ -34,7 +35,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 +284,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 +419,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())))
@@ -646,3 +700,28 @@ def get_bool_env_variable(variable_name: str, default_variable_value: bool) -> b
             f"Available values are `{true_values + false_values}`"
         )
     return value.lower() in true_values
+
+
+def try_parse_json(value: Any) -> Any:
+    """If value is a JSON string, parse it into a dict/list, else return as-is."""
+    if isinstance(value, str):
+        try:
+            return json.loads(value)
+        except json.JSONDecodeError:
+            return value
+    return value
+
+
+def ensure_jsonified_iterable(value: Any) -> Any:
+    """Convert iterables to JSON strings, flatten nested JSON strings in dicts/lists."""
+    if isinstance(value, dict):
+        # Recursively process dict values
+        return {
+            key: ensure_jsonified_iterable(try_parse_json(val))
+            for key, val in value.items()
+        }
+    elif isinstance(value, list):
+        # Recursively process each item
+        return [ensure_jsonified_iterable(try_parse_json(val)) for val in value]
+    # Keep primitives as-is
+    return value

rasa/utils/io.py

@@ -26,7 +26,6 @@ from typing_extensions import Protocol
 
 import rasa.shared.constants
 import rasa.shared.utils.io
-from rasa.shared.exceptions import RasaException
 
 if TYPE_CHECKING:
     from prompt_toolkit.validation import Validator
@@ -125,7 +124,9 @@ def create_path(file_path: Text) -> None:
 def file_type_validator(
     valid_file_types: List[Text], error_message: Text
 ) -> Type["Validator"]:
-    """Creates a file type validator class for the questionary package."""
+    """Creates a `Validator` class which can be used with `questionary` to validate
+    file paths.
+    """
 
     def is_valid(path: Text) -> bool:
         return path is not None and any(
@@ -136,7 +137,9 @@ def file_type_validator(
 
 
 def not_empty_validator(error_message: Text) -> Type["Validator"]:
-    """Creates a not empty validator class for the questionary package."""
+    """Creates a `Validator` class which can be used with `questionary` to validate
+    that the user entered something other than whitespace.
+    """
 
     def is_valid(input: Text) -> bool:
         return input is not None and input.strip() != ""
@@ -147,7 +150,9 @@ def not_empty_validator(error_message: Text) -> Type["Validator"]:
 def create_validator(
     function: Callable[[Text], bool], error_message: Text
 ) -> Type["Validator"]:
-    """Helper method to create a validator class from a callable function."""
+    """Helper method to create `Validator` classes from callable functions. Should be
+    removed when questionary supports `Validator` objects.
+    """
     from prompt_toolkit.document import Document
     from prompt_toolkit.validation import ValidationError, Validator
 
@@ -245,26 +250,3 @@ def write_yaml(
 
     with Path(target).open("w", encoding="utf-8") as outfile:
         dumper.dump(data, outfile, transform=transform)
-
-
-class InvalidPathException(RasaException):
-    """Raised if a path is invalid - e.g. path traversal is detected."""
-
-
-def subpath(parent: str, child: str) -> str:
-    """Return the path to the child directory of the parent directory.
-
-    Ensures, that child doesn't navigate to parent directories. Prevents
-    path traversal. Raises an InvalidPathException if the path is invalid.
-
-    Based on Snyk's directory traversal mitigation:
-    https://learn.snyk.io/lesson/directory-traversal/
-    """
-    safe_path = os.path.abspath(os.path.join(parent, child))
-    parent = os.path.abspath(parent)
-
-    common_base = os.path.commonpath([parent, safe_path])
-    if common_base != parent:
-        raise InvalidPathException(f"Invalid path: {safe_path}")
-
-    return safe_path

rasa/utils/json_utils.py

@@ -1,6 +1,6 @@
 import json
 from decimal import Decimal
-from typing import Any, Dict, List, Text
+from typing import Any, Text
 
 
 class DecimalEncoder(json.JSONEncoder):
@@ -58,8 +58,3 @@ def replace_decimals_with_floats(obj: Any) -> Any:
         Input `obj` with all `Decimal` types replaced by `float`s.
     """
     return json.loads(json.dumps(obj, cls=DecimalEncoder))
-
-
-def extract_values(data: Dict, keys: List[Text]) -> Dict:
-    """Extracts values for given keys from a dictionary."""
-    return {key: data.get(key) for key in keys if data.get(key)}

rasa/utils/log_utils.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 import os
 import sys
-from typing import Any, List, Optional
+from typing import Any, Optional
 
 import structlog
 from structlog.dev import ConsoleRenderer
@@ -37,7 +37,6 @@ class HumanConsoleRenderer(ConsoleRenderer):
 def configure_structlog(
     log_level: Optional[int] = None,
     include_time: bool = False,
-    additional_processors: Optional[List[structlog.typing.Processor]] = None,
 ) -> None:
     """Configure logging of the server."""
     if log_level is None:  # Log level NOTSET is 0 so we use `is None` here
@@ -76,9 +75,6 @@ def configure_structlog(
     if include_time:
         shared_processors.append(structlog.processors.TimeStamper(fmt="iso"))
 
-    if additional_processors:
-        shared_processors.extend(additional_processors)
-
     if not FORCE_JSON_LOGGING and sys.stderr.isatty():
         # Pretty printing when we run in a terminal session.
         # Automatically prints pretty tracebacks when "rich" is installed
@@ -94,7 +90,7 @@ def configure_structlog(
         ]
 
     structlog.configure(
-        processors=processors,  # type: ignore
+        processors=processors,
         context_class=dict,
         # `logger_factory` is used to create wrapped loggers that are used for
         # OUTPUT. This one returns a `logging.Logger`. The final value (a JSON

rasa/utils/ml_utils.py

@@ -119,7 +119,7 @@ def response_for_template(
     rsps = responses.get(template_name, [])
     usuable_responses = [r for r in rsps if r.get(KEY_RESPONSES_TEXT)]
     if usuable_responses:
-        selected_response = np.random.choice(usuable_responses)  # type: ignore
+        selected_response = np.random.choice(usuable_responses)
         return selected_response.get(KEY_RESPONSES_TEXT)
     else:
         structlogger.warning(

rasa/utils/tensorflow/rasa_layers.py

@@ -291,7 +291,7 @@ class ConcatenateSparseDenseFeatures(RasaCustomLayer):
             [
                 config[DENSE_DIMENSION][attribute]
                 if signature.is_sparse
-                else signature.units
+                else (signature.units or 0)
                 for signature in feature_type_signature
             ]
         )

rasa/utils/train_utils.py

@@ -11,7 +11,7 @@ from rasa.nlu.constants import NUMBER_OF_SUB_TOKENS
 from rasa.shared.constants import NEXT_MAJOR_VERSION_FOR_DEPRECATIONS
 from rasa.shared.exceptions import InvalidConfigException
 from rasa.shared.nlu.constants import SPLIT_ENTITIES_BY_COMMA
-from rasa.utils.tensorflow.callback import RasaModelCheckpoint, RasaTrainingLogger
+from rasa.utils.tensorflow.callback import RasaModelCheckpoint
 from rasa.utils.tensorflow.constants import (
     AUTO,
     CHECKPOINT_MODEL,
@@ -371,20 +371,20 @@ def create_common_callbacks(
     Returns:
         A list of callbacks.
     """
-    import tensorflow as tf
-
-    callbacks = [RasaTrainingLogger(epochs, silent=False)]
-
-    if tensorboard_log_dir:
-        callbacks.append(
-            tf.keras.callbacks.TensorBoard(
-                log_dir=tensorboard_log_dir,
-                update_freq=tensorboard_log_level,
-                write_graph=True,
-                write_images=True,
-                histogram_freq=10,
-            )
-        )
+    # import tensorflow as tf
+
+    callbacks = []
+
+    # if tensorboard_log_dir:
+    #     callbacks.append(
+    #         tf.keras.callbacks.TensorBoard(
+    #             log_dir=tensorboard_log_dir,
+    #             update_freq=tensorboard_log_level,
+    #             write_graph=True,
+    #             write_images=True,
+    #             histogram_freq=10,
+    #         )
+    #     )
 
     if checkpoint_dir:
         callbacks.append(RasaModelCheckpoint(checkpoint_dir))

rasa/validator.py

@@ -9,7 +9,7 @@ from jinja2 import Template
 from pypred import Predicate
 from pypred.ast import CompareOperator, Literal, NegateOperator
 
-import rasa.core.training.story_conflict
+# import rasa.core.training.story_conflict
 import rasa.shared.nlu.constants
 import rasa.shared.utils.cli
 import rasa.shared.utils.io
@@ -60,7 +60,8 @@ from rasa.shared.core.flows.utils import (
     get_invalid_slot_persistence_config_error_message,
     warn_deprecated_collect_step_config,
 )
-from rasa.shared.core.generator import TrainingDataGenerator
+
+# from rasa.shared.core.generator import TrainingDataGenerator
 from rasa.shared.core.slot_mappings import CoexistenceSystemType
 from rasa.shared.core.slots import BooleanSlot, CategoricalSlot, ListSlot, Slot
 from rasa.shared.core.training_data.story_reader.yaml_story_reader import (
@@ -70,7 +71,7 @@ from rasa.shared.core.training_data.structures import StoryGraph
 from rasa.shared.data import create_regex_pattern_reader
 from rasa.shared.exceptions import RasaException
 from rasa.shared.importers.importer import TrainingDataImporter
-from rasa.shared.nlu.constants import COMMANDS
+from rasa.shared.nlu.constants import COMMANDS, INTENT
 from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.nlu.training_data.training_data import TrainingData
 from rasa.telemetry import track_validation_error_log
@@ -130,7 +131,7 @@ class Validator:
         """Compares list of intents in domain with intents in NLU training data."""
         everything_is_alright = True
 
-        nlu_data_intents = {e.data["intent"] for e in self.intents.intent_examples}
+        nlu_data_intents = {e.data[INTENT] for e in self.intents.intent_examples}
 
         for intent in self._non_default_intents():
             if intent not in nlu_data_intents:
@@ -172,7 +173,7 @@ class Validator:
         duplication_hash = defaultdict(set)
         for example in self.intents.intent_examples:
             text = example.get(rasa.shared.nlu.constants.TEXT)
-            duplication_hash[text].add(example.get("intent"))
+            duplication_hash[text].add(example.get(INTENT))
 
         for text, intents in duplication_hash.items():
             if len(duplication_hash[text]) > 1:
@@ -446,17 +447,18 @@ class Validator:
             event_info="Story structure validation...",
         )
 
-        trackers = TrainingDataGenerator(
-            self.story_graph,
-            domain=self.domain,
-            remove_duplicates=False,
-            augmentation_factor=0,
-        ).generate_story_trackers()
+        # trackers = TrainingDataGenerator(
+        #     self.story_graph,
+        #     domain=self.domain,
+        #     remove_duplicates=False,
+        #     augmentation_factor=0,
+        # ).generate_story_trackers()
 
         # Create a list of `StoryConflict` objects
-        conflicts = rasa.core.training.story_conflict.find_story_conflicts(
-            trackers, self.domain, max_history
-        )
+        # conflicts = rasa.core.training.story_conflict.find_story_conflicts(
+        #     trackers, self.domain, max_history
+        # )
+        conflicts = None
 
         if not conflicts:
             structlogger.info(
@@ -629,14 +631,11 @@ class Validator:
         flow_id: str,
     ) -> bool:
         """Validates that a collect step can have either an action or an utterance.
-
         Also logs an error if neither an action nor an utterance is defined.
 
         Args:
             collect: the name of the slot to collect
             all_good: boolean value indicating the validation status
-            domain_slots: the slots of the domain
-            flow_id: the id of the flow
 
         Returns:
             False, if validation failed, true, otherwise
@@ -685,10 +684,9 @@ class Validator:
                 has_action_defined=has_action_defined,
                 flow=flow_id,
                 event_info=(
-                    f"The collect step '{collect.collect}' has neither a response "
-                    f"nor an action defined, nor an initial value defined in the "
-                    f"domain. You can fix this by adding a response named "
-                    f"'{collect.utter}' used in the collect step."
+                    f"The collect step '{collect.collect}' has neither an utterance "
+                    f"nor an action defined, or an initial value defined in the domain."
+                    f"You need to define either an utterance or an action."
                 ),
             )
             all_good = False

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.dev5"
+__version__ = "3.14.0.dev7"

{rasa_pro-3.14.0.dev5.dist-info → rasa_pro-3.14.0.dev7.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.14.0.dev5
+Version: 3.14.0.dev7
 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
@@ -24,9 +24,10 @@ 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.42,<2.1.0)
+Requires-Dist: a2a-sdk (>=0.3.2,<0.4.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)
+Requires-Dist: aiogram (>=3.20.0,<3.21.0)
 Requires-Dist: aiohttp (>=3.10,<3.11)
 Requires-Dist: apscheduler (>=3.10,<3.11)
 Requires-Dist: attrs (>=23.1,<23.2)
@@ -60,33 +61,34 @@ Requires-Dist: jinja2 (>=3.1.6,<3.2.0)
 Requires-Dist: jsonpatch (>=1.33,<2.0)
 Requires-Dist: jsonpickle (>=3.3.0,<3.4)
 Requires-Dist: jsonschema (>=4.22)
-Requires-Dist: keras (==2.14.0)
+Requires-Dist: keras (>=3.5.0,<3.6.0)
 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.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"
 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)
-Requires-Dist: opentelemetry-exporter-jaeger (>=1.16.0,<1.17.0)
-Requires-Dist: opentelemetry-exporter-otlp (>=1.16.0,<1.17.0)
-Requires-Dist: opentelemetry-sdk (>=1.16.0,<1.17.0)
+Requires-Dist: opentelemetry-api (>=1.33.0,<1.34.0)
+Requires-Dist: opentelemetry-exporter-jaeger (>=1.21.0,<1.22.0)
+Requires-Dist: opentelemetry-exporter-otlp (>=1.33.0,<1.34.0)
+Requires-Dist: opentelemetry-sdk (>=1.33.0,<1.34.0)
 Requires-Dist: packaging (>=23.2,<23.3)
 Requires-Dist: pep440-version-utils (>=1.1.0,<1.2.0)
 Requires-Dist: pluggy (>=1.2.0,<2.0.0)
 Requires-Dist: portalocker (>=2.7.0,<3.0.0)
 Requires-Dist: prompt-toolkit (>=3.0.28,<3.0.29)
-Requires-Dist: protobuf (>=4.25.8,<4.26.0)
+Requires-Dist: protobuf (>=5.29.5,<5.30.0)
 Requires-Dist: psutil (>=5.9.5,<6.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.10,<2.10.0)
 Requires-Dist: pydot (>=1.4,<1.5)
 Requires-Dist: pykwalify (>=1.8,<1.9)
-Requires-Dist: pymilvus (>=2.4.1,<2.4.2)
+Requires-Dist: pymilvus (>=2.5.0,<2.6.0)
 Requires-Dist: pymongo (>=4.10.1,<4.11.0)
 Requires-Dist: pypred (>=0.4.0,<0.5.0)
 Requires-Dist: python-dateutil (>=2.8.2,<2.9.0)
@@ -99,7 +101,7 @@ 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.14.0.dev2)
+Requires-Dist: rasa-sdk (==3.14.0.dev3)
 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)
@@ -110,7 +112,6 @@ Requires-Dist: safetensors (>=0.4.5,<0.5.0)
 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-openapi (>=21.12.0,<22.0.0)
 Requires-Dist: sanic-routing (>=22.8.0,<23.0.0)
 Requires-Dist: scikit-learn (>=1.6.1,<1.7.0)
 Requires-Dist: scipy (>=1.13.1,<1.14.0)
@@ -125,15 +126,10 @@ 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)
-Requires-Dist: tensorflow (==2.14.1) ; sys_platform != "darwin" or platform_machine != "arm64"
-Requires-Dist: tensorflow-cpu-aws (==2.14.1) ; sys_platform == "linux" and (platform_machine == "arm64" or platform_machine == "aarch64")
-Requires-Dist: tensorflow-intel (==2.14.1) ; sys_platform == "win32"
 Requires-Dist: tensorflow-io-gcs-filesystem (==0.31) ; sys_platform == "win32"
 Requires-Dist: tensorflow-io-gcs-filesystem (==0.34) ; sys_platform == "darwin" and platform_machine != "arm64"
 Requires-Dist: tensorflow-io-gcs-filesystem (==0.34) ; sys_platform == "linux"
-Requires-Dist: tensorflow-macos (==2.14.1) ; sys_platform == "darwin" and platform_machine == "arm64"
 Requires-Dist: tensorflow-metal (==1.1.0) ; (sys_platform == "darwin" and platform_machine == "arm64") and (extra == "metal")
-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.9.0,<0.10.0)
@@ -146,6 +142,7 @@ Requires-Dist: typing-utils (>=0.1.0,<0.2.0)
 Requires-Dist: ujson (>=5.8,<6.0)
 Requires-Dist: webexteamssdk (>=1.6.1,<1.7.0)
 Requires-Dist: websockets (>=10.4,<11.0)
+Requires-Dist: werkzeug (>=1.0.1)
 Requires-Dist: wheel (>=0.40.0)
 Project-URL: Documentation, https://rasa.com/docs
 Project-URL: Homepage, https://rasa.com