rasa-pro 3.11.0rc1__py3-none-any.whl → 3.11.0rc2__py3-none-any.whl

rasa/studio/constants.py

@@ -10,6 +10,7 @@ RASA_STUDIO_AUTH_SERVER_URL_ENV = "RASA_STUDIO_AUTH_SERVER_URL"
 RASA_STUDIO_CLI_STUDIO_URL_ENV = "RASA_STUDIO_CLI_STUDIO_URL"
 RASA_STUDIO_CLI_REALM_NAME_KEY_ENV = "RASA_STUDIO_CLI_REALM_NAME_KEY"
 RASA_STUDIO_CLI_CLIENT_ID_KEY_ENV = "RASA_STUDIO_CLI_CLIENT_ID_KEY"
+RASA_STUDIO_CLI_DISABLE_VERIFY_KEY_ENV = "RASA_STUDIO_CLI_DISABLE_VERIFY_KEY"
 
 STUDIO_NLU_FILENAME = "studio_nlu.yml"
 STUDIO_DOMAIN_FILENAME = "studio_domain.yml"

rasa/studio/data_handler.py

@@ -76,7 +76,9 @@ class StudioDataHandler:
 
         return request
 
-    def _make_request(self, GQL_req: Dict[Any, Any]) -> Dict[Any, Any]:
+    def _make_request(
+        self, GQL_req: Dict[Any, Any], verify: bool = True
+    ) -> Dict[Any, Any]:
         token = KeycloakTokenReader().get_token()
         if token.is_expired():
             token = self.refresh_token(token)
@@ -93,6 +95,7 @@ class StudioDataHandler:
                 "Authorization": f"{token.token_type} {token.access_token}",
                 "Content-Type": "application/json",
             },
+            verify=verify,
         )
 
         if res.status_code != 200:
@@ -128,7 +131,9 @@ class StudioDataHandler:
             The data from Rasa Studio.
         """
         GQL_req = self._build_request()
-        response = self._make_request(GQL_req)
+        verify = not self.studio_config.disable_verify
+
+        response = self._make_request(GQL_req, verify=verify)
         self._extract_data(response)
 
     def request_data(
@@ -145,7 +150,9 @@ class StudioDataHandler:
             The data from Rasa Studio.
         """
         GQL_req = self._build_request(intent_names, entity_names)
-        response = self._make_request(GQL_req)
+        verify = not self.studio_config.disable_verify
+
+        response = self._make_request(GQL_req, verify=verify)
         self._extract_data(response)
 
     def get_config(self) -> Optional[str]:

rasa/studio/upload.py

@@ -56,14 +56,17 @@ def _get_selected_entities_and_intents(
 
 def handle_upload(args: argparse.Namespace) -> None:
     """Uploads primitives to rasa studio."""
-    endpoint = StudioConfig.read_config().studio_url
+    studio_config = StudioConfig.read_config()
+    endpoint = studio_config.studio_url
+    verify = not studio_config.disable_verify
+
     if not endpoint:
         rasa.shared.utils.cli.print_error_and_exit(
             "No GraphQL endpoint found in config. Please run `rasa studio config`."
         )
         return
 
-    if not is_auth_working(endpoint):
+    if not is_auth_working(endpoint, verify):
         rasa.shared.utils.cli.print_error_and_exit(
             "Authentication is invalid or expired. Please run `rasa studio login`."
         )
@@ -81,9 +84,9 @@ def handle_upload(args: argparse.Namespace) -> None:
 
     # check safely if args.calm is set and not fail if not
     if hasattr(args, "calm") and args.calm:
-        upload_calm_assistant(args, endpoint)
+        upload_calm_assistant(args, endpoint, verify=verify)
     else:
-        upload_nlu_assistant(args, endpoint)
+        upload_nlu_assistant(args, endpoint, verify=verify)
 
 
 config_keys = [
@@ -135,7 +138,9 @@ def _get_assistant_name(config: Dict[Text, Any]) -> str:
 
 
 @with_studio_error_handler
-def upload_calm_assistant(args: argparse.Namespace, endpoint: str) -> StudioResult:
+def upload_calm_assistant(
+    args: argparse.Namespace, endpoint: str, verify: bool = True
+) -> StudioResult:
     """Uploads the CALM assistant data to Rasa Studio.
 
     Args:
@@ -227,11 +232,13 @@ def upload_calm_assistant(args: argparse.Namespace, endpoint: str) -> StudioResu
     structlogger.info(
         "rasa.studio.upload.calm", event_info="Uploading to Rasa Studio..."
     )
-    return make_request(endpoint, graphql_req)
+    return make_request(endpoint, graphql_req, verify)
 
 
 @with_studio_error_handler
-def upload_nlu_assistant(args: argparse.Namespace, endpoint: str) -> StudioResult:
+def upload_nlu_assistant(
+    args: argparse.Namespace, endpoint: str, verify: bool = True
+) -> StudioResult:
     """Uploads the classic (dm1) assistant data to Rasa Studio.
 
     Args:
@@ -241,6 +248,7 @@ def upload_nlu_assistant(args: argparse.Namespace, endpoint: str) -> StudioResul
             - intents: The intents to upload
             - entities: The entities to upload
         endpoint: The studio endpoint
+        verify: Whether to verify SSL
     Returns:
         None
     """
@@ -286,10 +294,10 @@ def upload_nlu_assistant(args: argparse.Namespace, endpoint: str) -> StudioResul
     structlogger.info(
         "rasa.studio.upload.nlu", event_info="Uploading to Rasa Studio..."
     )
-    return make_request(endpoint, graphql_req)
+    return make_request(endpoint, graphql_req, verify)
 
 
-def is_auth_working(endpoint: str) -> bool:
+def is_auth_working(endpoint: str, verify: bool = True) -> bool:
     """Send a test request to Studio to check if auth is working."""
     result = make_request(
         endpoint,
@@ -306,16 +314,18 @@ def is_auth_working(endpoint: str) -> bool:
             ),
             "variables": {},
         },
+        verify,
     )
     return result.was_successful
 
 
-def make_request(endpoint: str, graphql_req: Dict) -> StudioResult:
+def make_request(endpoint: str, graphql_req: Dict, verify: bool = True) -> StudioResult:
     """Makes a request to the studio endpoint to upload data.
 
     Args:
         endpoint: The studio endpoint
         graphql_req: The graphql request
+        verify: Whether to verify SSL
     """
     token = KeycloakTokenReader().get_token()
     res = requests.post(
@@ -325,6 +335,7 @@ def make_request(endpoint: str, graphql_req: Dict) -> StudioResult:
             "Authorization": f"{token.token_type} {token.access_token}",
             "Content-Type": "application/json",
         },
+        verify=verify,
     )
 
     if results_logger.response_has_errors(res.json()):

rasa/telemetry.py

@@ -112,6 +112,7 @@ TELEMETRY_INTERACTIVE_LEARNING_STARTED_EVENT = "Interactive Learning Started"
 TELEMETRY_SERVER_STARTED_EVENT = "Server Started"
 TELEMETRY_PROJECT_CREATED_EVENT = "Project Created"
 TELEMETRY_SHELL_STARTED_EVENT = "Shell Started"
+TELEMETRY_INSPECT_STARTED_EVENT = "Inspect Started"
 TELEMETRY_VISUALIZATION_STARTED_EVENT = "Story Visualization Started"
 TELEMETRY_TEST_CORE_EVENT = "Model Core Tested"
 TELEMETRY_TEST_NLU_EVENT = "Model NLU Tested"
@@ -1378,6 +1379,17 @@ def track_shell_started(model_type: Text) -> None:
     _track(TELEMETRY_SHELL_STARTED_EVENT, {"type": model_type})
 
 
+@ensure_telemetry_enabled
+def track_inspect_started(model_type: Text) -> None:
+    """Track when a user starts a bot using rasa inspect.
+
+    Args:
+        channel: Channel name `socketio` (used for chat assistants)
+         or `browser_audio` (used for voice).
+    """
+    _track(TELEMETRY_INSPECT_STARTED_EVENT, {"type": model_type})
+
+
 @ensure_telemetry_enabled
 def track_visualization() -> None:
     """Track when a user runs the visualization."""

rasa/tracing/config.py

@@ -33,6 +33,7 @@ from rasa.dialogue_understanding.generator import (
     SingleStepLLMCommandGenerator,
     MultiStepLLMCommandGenerator,
 )
+from rasa.dialogue_understanding.generator.flow_retrieval import FlowRetrieval
 from rasa.dialogue_understanding.generator.nlu_command_adapter import NLUCommandAdapter
 from rasa.engine.graph import GraphNode
 from rasa.engine.training.graph_trainer import GraphTrainer
@@ -111,6 +112,7 @@ def configure_tracing(tracer_provider: Optional[TracerProvider]) -> None:
         single_step_llm_command_generator_class=SingleStepLLMCommandGenerator,
         multi_step_llm_command_generator_class=MultiStepLLMCommandGenerator,
         custom_action_executor_subclasses=custom_action_executor_subclasses,
+        flow_retrieval_class=FlowRetrieval,
     )
 
 

rasa/tracing/instrumentation/attribute_extractors.py

@@ -414,6 +414,26 @@ def extract_attrs_for_generate(
     }
 
 
+def extract_attrs_for_performing_health_check(
+    custom_config: Optional[Dict[str, Any]],
+    default_config: Dict[str, Any],
+    log_source_method: str,
+    log_source_component: str,
+) -> Dict[str, Any]:
+    from rasa.shared.utils.health_check.health_check import is_api_health_check_enabled
+
+    attrs = {
+        "api_health_check_enabled": is_api_health_check_enabled(),
+        "health_check_trigger_component": log_source_component,
+        "health_check_trigger_method": log_source_method,
+    }
+    if is_api_health_check_enabled():
+        attrs["config"] = json.dumps(
+            combine_custom_and_default_config(custom_config, default_config)
+        )
+    return attrs
+
+
 def extract_attrs_for_execute_commands(
     tracker: DialogueStateTracker,
     all_flows: FlowsList,

rasa/tracing/instrumentation/instrumentation.py

@@ -45,6 +45,7 @@ from rasa.dialogue_understanding.generator import (
     MultiStepLLMCommandGenerator,
     SingleStepLLMCommandGenerator,
 )
+from rasa.dialogue_understanding.generator.flow_retrieval import FlowRetrieval
 from rasa.dialogue_understanding.generator.nlu_command_adapter import NLUCommandAdapter
 from rasa.engine.graph import GraphNode
 from rasa.engine.training.graph_trainer import GraphTrainer
@@ -283,6 +284,7 @@ SingleStepLLMCommandGeneratorType = TypeVar(
 MultiStepLLMCommandGeneratorType = TypeVar(
     "MultiStepLLMCommandGeneratorType", bound=MultiStepLLMCommandGenerator
 )
+FlowRetrievalType = TypeVar("FlowRetrievalType", bound=FlowRetrieval)
 CommandType = TypeVar("CommandType", bound=Command)
 PolicyType = TypeVar("PolicyType", bound=Policy)
 InformationRetrievalType = TypeVar(
@@ -317,6 +319,7 @@ def instrument(
     custom_action_executor_subclasses: Optional[
         List[Type[CustomActionExecutor]]
     ] = None,
+    flow_retrieval_class: Optional[Type[FlowRetrievalType]] = None,
 ) -> None:
     """Substitute methods to be traced by their traced counterparts.
 
@@ -445,6 +448,12 @@ def instrument(
             "_check_commands_against_startable_flows",
             attribute_extractors.extract_attrs_for_check_commands_against_startable_flows,
         )
+        _instrument_perform_health_check_method_for_component(
+            tracer_provider.get_tracer(llm_command_generator_class.__module__),
+            llm_command_generator_class,
+            "perform_llm_health_check",
+            attribute_extractors.extract_attrs_for_performing_health_check,
+        )
         mark_class_as_instrumented(llm_command_generator_class)
 
     if (
@@ -468,6 +477,14 @@ def instrument(
             "_check_commands_against_startable_flows",
             attribute_extractors.extract_attrs_for_check_commands_against_startable_flows,
         )
+        _instrument_perform_health_check_method_for_component(
+            tracer_provider.get_tracer(
+                single_step_llm_command_generator_class.__module__
+            ),
+            single_step_llm_command_generator_class,
+            "perform_llm_health_check",
+            attribute_extractors.extract_attrs_for_performing_health_check,
+        )
         mark_class_as_instrumented(single_step_llm_command_generator_class)
 
     if multi_step_llm_command_generator_class is not None and not class_is_instrumented(
@@ -488,8 +505,36 @@ def instrument(
             ),
             multi_step_llm_command_generator_class,
         )
+        _instrument_perform_health_check_method_for_component(
+            tracer_provider.get_tracer(
+                multi_step_llm_command_generator_class.__module__
+            ),
+            multi_step_llm_command_generator_class,
+            "perform_llm_health_check",
+            attribute_extractors.extract_attrs_for_performing_health_check,
+        )
         mark_class_as_instrumented(multi_step_llm_command_generator_class)
 
+    if (
+        any(
+            llm_based_command_generator_class is not None
+            for llm_based_command_generator_class in (
+                llm_command_generator_class,
+                single_step_llm_command_generator_class,
+                multi_step_llm_command_generator_class,
+            )
+        )
+        and flow_retrieval_class is not None
+        and not class_is_instrumented(flow_retrieval_class)
+    ):
+        _instrument_perform_health_check_method_for_component(
+            tracer_provider.get_tracer(flow_retrieval_class.__module__),
+            flow_retrieval_class,
+            "perform_embeddings_health_check",
+            attribute_extractors.extract_attrs_for_performing_health_check,
+        )
+        mark_class_as_instrumented(flow_retrieval_class)
+
     if command_subclasses:
         for command_subclass in command_subclasses:
             if command_subclass is not None and not class_is_instrumented(
@@ -524,6 +569,12 @@ def instrument(
             "generate",
             attribute_extractors.extract_attrs_for_generate,
         )
+        _instrument_perform_health_check_method_for_component(
+            tracer_provider.get_tracer(contextual_response_rephraser_class.__module__),
+            contextual_response_rephraser_class,
+            "perform_llm_health_check",
+            attribute_extractors.extract_attrs_for_performing_health_check,
+        )
         mark_class_as_instrumented(contextual_response_rephraser_class)
 
     if not module_is_instrumented(COMMAND_PROCESSOR_MODULE_NAME):
@@ -755,6 +806,18 @@ def _instrument_enterprise_search_policy(
         "_generate_llm_answer",
         attribute_extractors.extract_attrs_for_enterprise_search_generate_llm_answer,
     )
+    _instrument_perform_health_check_method_for_component(
+        tracer_provider.get_tracer(policy_class.__module__),
+        policy_class,
+        "perform_embeddings_health_check",
+        attribute_extractors.extract_attrs_for_performing_health_check,
+    )
+    _instrument_perform_health_check_method_for_component(
+        tracer_provider.get_tracer(policy_class.__module__),
+        policy_class,
+        "perform_llm_health_check",
+        attribute_extractors.extract_attrs_for_performing_health_check,
+    )
 
 
 def _instrument_intentless_policy(
@@ -787,6 +850,18 @@ def _instrument_intentless_policy(
         "_generate_llm_answer",
         attribute_extractors.extract_attrs_for_intentless_policy_generate_llm_answer,
     )
+    _instrument_perform_health_check_method_for_component(
+        tracer_provider.get_tracer(policy_class.__module__),
+        policy_class,
+        "perform_embeddings_health_check",
+        attribute_extractors.extract_attrs_for_performing_health_check,
+    )
+    _instrument_perform_health_check_method_for_component(
+        tracer_provider.get_tracer(policy_class.__module__),
+        policy_class,
+        "perform_llm_health_check",
+        attribute_extractors.extract_attrs_for_performing_health_check,
+    )
 
 
 def _instrument_processor(
@@ -1139,6 +1214,52 @@ def _instrument_grpc_custom_action_executor(
     logger.debug(f"Instrumented '{grpc_custom_action_executor_class.__name__}.run.")
 
 
+def _instrument_perform_health_check_method_for_component(
+    tracer: Tracer,
+    instrumented_class: Type,
+    method_name: Text,
+    attr_extractor: Optional[Callable] = None,
+    return_value_attr_extractor: Optional[Callable] = None,
+) -> None:
+    def tracing_perform_health_check_for_component(
+        fn: Callable[..., S],
+    ) -> Callable[..., S]:
+        @functools.wraps(fn)
+        def wrapper(*args: Any, **kwargs: Any) -> S:
+            # Check the first argument to adjust for self/cls depending on how
+            # the static method from LLMHealthCheckMixin / EmbeddingsLLMHealthCheckMixin
+            # is called.
+            if args and isinstance(
+                args[0], (instrumented_class, type(instrumented_class))
+            ):
+                # The first argument is self/cls; align args to match the signature
+                args = args[1:]
+
+            span_name = f"{instrumented_class.__name__}.{fn.__name__}"
+            extracted_attrs = attr_extractor(*args, **kwargs) if attr_extractor else {}
+
+            with tracer.start_as_current_span(span_name) as span:
+                result = fn(*args, **kwargs)
+
+                # Extract attributes from the return value, if an extractor is provided
+                return_value_attributes = (
+                    return_value_attr_extractor(result, *args, **kwargs)
+                    if return_value_attr_extractor
+                    else {}
+                )
+
+                span.set_attributes({**extracted_attrs, **return_value_attributes})
+                return result
+
+        return wrapper
+
+    method_to_trace = getattr(instrumented_class, method_name)
+    traced_method = tracing_perform_health_check_for_component(method_to_trace)
+    setattr(instrumented_class, method_name, traced_method)
+
+    logger.debug(f"Instrumented '{instrumented_class.__name__}.{method_name}'.")
+
+
 def _mangled_instrumented_boolean_attribute_name(instrumented_class: Type) -> Text:
     # see https://peps.python.org/pep-0008/#method-names-and-instance-variables
     # and https://stackoverflow.com/a/50401073

rasa/utils/common.py

@@ -90,6 +90,11 @@ EXPECTED_WARNINGS: List[Tuple[Type[Warning], str]] = [
     # Ignore Keras DeprecationWarning since it requires that we
     # upgrade tensorflow-macos to 2.13.0 version.
     (DeprecationWarning, "invalid escape sequence*"),
+    # Ignore importlib open_text and read_text warnings for now
+    (
+        DeprecationWarning,
+        "https://importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy",
+    ),
 ]
 
 PYTHON_LOGGING_SCHEMA_DOCS = (

rasa/utils/io.py

@@ -18,7 +18,6 @@ from typing import (
     Type,
     Callable,
     TYPE_CHECKING,
-    Pattern,
 )
 
 from ruamel import yaml
@@ -167,21 +166,14 @@ def create_validator(
     return FunctionValidator
 
 
-def get_emoji_regex() -> Pattern:
-    """Returns regex to identify emojis."""
-    return re.compile(
-        "["
-        "\U0001f600-\U0001f64f"  # emoticons
-        "\U0001f300-\U0001f5ff"  # symbols & pictographs
-        "\U0001f680-\U0001f6ff"  # transport & map symbols
-        "\U0001f1e0-\U0001f1ff"  # flags (iOS)
-        "\U00002702-\U000027b0"
-        "\U000024c2-\U0001f251"
-        "\u200d"  # zero width joiner
-        "\u200c"  # zero width non-joiner
-        "]+",
-        flags=re.UNICODE,
-    )
+def remove_emojis(s: str) -> str:
+    import demoji
+
+    replaced = demoji.replace(s)
+    if replaced == s:
+        return s
+    # remove duplicate or trailing whitespaces if emojis were removed
+    return re.sub(r" +", " ", replaced).strip()
 
 
 def are_directories_equal(dir1: Path, dir2: Path) -> bool:

rasa/utils/sanic_error_handler.py

@@ -0,0 +1,32 @@
+from sanic import Sanic
+from sanic.handlers import ErrorHandler
+from sanic.request import Request
+from sanic.exceptions import ServerError
+
+
+# TODO: remove custom handler when upgrading to sanic >= 24
+#       the underlying issue https://github.com/sanic-org/sanic/issues/2572
+#       has been fixed in sanic 24
+class IgnoreWSServerErrorHandler(ErrorHandler):
+    @staticmethod
+    def log(request: Request, exception: Exception) -> None:
+        try:
+            if (
+                request.url.startswith("ws")
+                and isinstance(exception, ServerError)
+                and exception.args
+                and (
+                    exception.args[0]
+                    == "Invalid response type None (need HTTPResponse)"
+                )
+            ):
+                # in case we are in a websocket connection, we don't want to log the
+                # the error, as this is a bug in sanic
+                return
+        except Exception:
+            pass
+        ErrorHandler.log(request, exception)  # type: ignore
+
+
+def register_custom_sanic_error_handler(app: Sanic) -> None:
+    app.error_handler = IgnoreWSServerErrorHandler()

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.11.0rc1"
+__version__ = "3.11.0rc2"

{rasa_pro-3.11.0rc1.dist-info → rasa_pro-3.11.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.11.0rc1
+Version: 3.11.0rc2
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Home-page: https://rasa.com
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
@@ -43,6 +43,7 @@ Requires-Dist: confluent-kafka (>=2.3.0,<3.0.0)
 Requires-Dist: cryptography (>=42.0.5)
 Requires-Dist: cvg-python-sdk (>=0.5.1,<0.6.0)
 Requires-Dist: dask (>=2024.7.0,<2024.8.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)
@@ -69,7 +70,7 @@ Requires-Dist: mattermostwrapper (>=2.2,<2.3)
 Requires-Dist: mlflow (>=2.15.1,<3.0.0) ; extra == "mlflow"
 Requires-Dist: networkx (>=3.1,<3.2)
 Requires-Dist: numpy (>=1.26.4,<1.27.0)
-Requires-Dist: openai (>=1.54.0,<1.55.0)
+Requires-Dist: openai (>=1.55.3,<1.56.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)