rasa-pro 3.11.3a1.dev7__py3-none-any.whl → 3.12.0.dev2__py3-none-any.whl

rasa/e2e_test/e2e_test_runner.py

@@ -1041,11 +1041,13 @@ class E2ETestRunner:
         return conversations
 
     @staticmethod
-    def _action_server_is_reachable(endpoints: AvailableEndpoints) -> None:
+    def _action_server_is_reachable(
+        endpoints: AvailableEndpoints, module: str = "e2e_test_runner"
+    ) -> None:
         """Calls the action server health endpoint."""
         if not endpoints.action:
             structlogger.debug(
-                "e2e_test_runner._action_server_is_reachable",
+                f"{module}._action_server_is_reachable",
                 message="No action endpoint configured. Skipping the health check "
                 "of the action server.",
             )
@@ -1053,7 +1055,7 @@ class E2ETestRunner:
 
         if endpoints.action.actions_module:
             structlogger.debug(
-                "e2e_test_runner._action_server_is_reachable",
+                f"{module}._action_server_is_reachable",
                 message="Rasa server is configured to run custom actions directly. "
                 "Skipping the health check of the action server.",
             )
@@ -1061,14 +1063,14 @@ class E2ETestRunner:
 
         if not endpoints.action.url:
             structlogger.debug(
-                "e2e_test_runner._action_server_is_reachable",
+                f"{module}._action_server_is_reachable",
                 message="Action endpoint URL is not defined in the endpoint "
                 "configuration.",
             )
             return
 
         structlogger.debug(
-            "e2e_test_runner._action_server_is_reachable",
+            f"{module}._action_server_is_reachable",
             message="Detected action URL in the endpoint configuration.\n"
             f"Action Server URL: {endpoints.action.url}\n"
             "Sending a health request to the action endpoint.",
@@ -1084,7 +1086,7 @@ class E2ETestRunner:
                 "Actions server URL is defined in your endpoint configuration as "
                 f"'{endpoints.action.url}'.\n"
                 "Please make sure your action server is running and properly "
-                "configured. Since running e2e tests without a action server may "
+                "configured. Since running tests without a action server may "
                 f"lead to unpredictable results.\n{error}"
             )
 
@@ -1096,7 +1098,7 @@ class E2ETestRunner:
             )
 
         structlogger.debug(
-            "e2e_test_runner._action_server_is_reachable",
+            f"{module}._action_server_is_reachable",
             message="Action endpoint has responded successfully.\n"
             f"Response message: {response.text}\n"
             f"Response status code: {response.status_code}.",

rasa/hooks.py

@@ -4,13 +4,14 @@ from typing import Optional, TYPE_CHECKING, List, Text, Union
 
 import pluggy
 
-# IMPORTANT: do not import anything from rasa here - use scoped imports
-#  this avoids circular imports, as the hooks are used in different places
-#  across the codebase.
+from rasa.cli import SubParsersAction
+from rasa.cli import x as rasa_x
+from rasa.core.auth_retry_tracker_store import AuthRetryTrackerStore
+from rasa.core.secrets_manager.factory import load_secret_manager
+from rasa.tracing import config
+from rasa.utils.endpoints import EndpointConfig
 
 if TYPE_CHECKING:
-    from rasa.cli import SubParsersAction
-    from rasa.utils.endpoints import EndpointConfig
     from rasa.core.brokers.broker import EventBroker
     from rasa.core.tracker_store import TrackerStore
     from rasa.shared.core.domain import Domain
@@ -22,15 +23,16 @@ logger = logging.getLogger(__name__)
 
 @hookimpl  # type: ignore[misc]
 def refine_cli(
-    subparsers: "SubParsersAction",
+    subparsers: SubParsersAction,
     parent_parsers: List[argparse.ArgumentParser],
 ) -> None:
-    from rasa.cli import e2e_test, inspect, markers
+    from rasa.cli import e2e_test, inspect, markers, dialogue_understanding_test
     from rasa.cli.studio import studio
 
     from rasa.cli import license as license_cli
 
     e2e_test.add_subparser(subparsers, parent_parsers)
+    dialogue_understanding_test.add_subparser(subparsers, parent_parsers)
     studio.add_subparser(subparsers, parent_parsers)
     license_cli.add_subparser(subparsers, parent_parsers)
     markers.add_subparser(subparsers, parent_parsers)
@@ -40,9 +42,6 @@ def refine_cli(
 
 @hookimpl  # type: ignore[misc]
 def configure_commandline(cmdline_arguments: argparse.Namespace) -> Optional[Text]:
-    from rasa.tracing import config
-    from rasa.cli import x as rasa_x
-
     endpoints_file = None
 
     if cmdline_arguments.func.__name__ == "rasa_x":
@@ -69,8 +68,6 @@ def init_telemetry(endpoints_file: Optional[Text]) -> None:
 
 @hookimpl  # type: ignore[misc]
 def init_managers(endpoints_file: Optional[Text]) -> None:
-    from rasa.core.secrets_manager.factory import load_secret_manager
-
     load_secret_manager(endpoints_file)
 
 
@@ -80,9 +77,6 @@ def create_tracker_store(
     domain: "Domain",
     event_broker: Optional["EventBroker"],
 ) -> "TrackerStore":
-    from rasa.utils.endpoints import EndpointConfig
-    from rasa.core.auth_retry_tracker_store import AuthRetryTrackerStore
-
     if isinstance(endpoint_config, EndpointConfig):
         return AuthRetryTrackerStore(
             endpoint_config=endpoint_config, domain=domain, event_broker=event_broker

rasa/model_manager/socket_bridge.py

@@ -1,4 +1,3 @@
-import json
 from typing import Any, Dict, Optional
 
 from socketio import AsyncServer
@@ -93,7 +92,7 @@ def create_bridge_server(sio: AsyncServer, running_bots: Dict[str, BotSession])
 
     @sio.on("*")
     async def handle_message(event: str, sid: str, data: Dict[str, Any]) -> None:
-        """Bridge messages between user and bot.
+        """ "Bridge messages between user and bot.
 
         Both incoming user messages to the bot_url and
         bot responses sent back to the client need to
@@ -112,7 +111,7 @@ async def create_bridge_client(
 ) -> AsyncClient:
     """Create a new socket bridge client.
 
-    Forwards messages coming from the bot to the user.
+    Forwards messages comming from the bot to the user.
     """
     client = AsyncClient()
 
@@ -130,10 +129,6 @@ async def create_bridge_client(
         structlogger.debug("model_runner.bot_message", deployment_id=deployment_id)
         await sio.emit("bot_message", data, room=sid)
 
-    @client.event  # type: ignore[misc]
-    async def tracker(data: Dict[str, Any]) -> None:
-        await sio.emit("tracker", json.loads(data), room=sid)
-
     @client.event  # type: ignore[misc]
     async def disconnect() -> None:
         structlogger.debug(

rasa/model_manager/warm_rasa_process.py

@@ -1,16 +1,12 @@
-import os
 import shlex
 import subprocess
-import uuid
-from dataclasses import dataclass
+from rasa.__main__ import main
+import os
 from typing import List
-
 import structlog
+from dataclasses import dataclass
+import uuid
 
-from rasa.__main__ import main
-from rasa.dialogue_understanding.constants import (
-    RASA_RECORD_COMMANDS_AND_PROMPTS_ENV_VAR_NAME,
-)
 from rasa.model_manager import config
 from rasa.model_manager.utils import ensure_base_directory_exists, logs_path
 
@@ -47,7 +43,6 @@ def _create_warm_rasa_process() -> WarmRasaProcess:
 
     envs = os.environ.copy()
     envs["RASA_TELEMETRY_ENABLED"] = "false"
-    envs[RASA_RECORD_COMMANDS_AND_PROMPTS_ENV_VAR_NAME] = "true"
 
     log_id = uuid.uuid4().hex
     log_path = logs_path(log_id)

rasa/plugin.py

@@ -14,7 +14,6 @@ if TYPE_CHECKING:
     from rasa.core.tracker_store import TrackerStore
     from rasa.shared.core.domain import Domain
     from rasa.utils.endpoints import EndpointConfig
-    from rasa.shared.core.trackers import DialogueStateTracker
 
 
 hookspec = pluggy.HookspecMarker("rasa")
@@ -89,13 +88,3 @@ def after_server_stop() -> None:
     Use this hook to de-initialize any resources that require explicit cleanup like,
     thread shutdown, closing connections, etc.
     """
-
-
-@hookspec  # type: ignore[misc]
-def after_new_user_message(tracker: "DialogueStateTracker") -> None:
-    """Hook specification for after a new user message is received."""
-
-
-@hookspec  # type: ignore[misc]
-def after_action_executed(tracker: "DialogueStateTracker") -> None:
-    """Hook specification for after an action is executed."""

rasa/shared/constants.py

@@ -161,6 +161,7 @@ AZURE_AD_TOKEN_ENV_VAR = "AZURE_AD_TOKEN"
 AZURE_API_BASE_ENV_VAR = "AZURE_API_BASE"
 AZURE_API_VERSION_ENV_VAR = "AZURE_API_VERSION"
 AZURE_API_TYPE_ENV_VAR = "AZURE_API_TYPE"
+AZURE_AD_SCOPES_ENV_VAR = "AZURE_AD_SCOPES"
 AZURE_SPEECH_API_KEY_ENV_VAR = "AZURE_SPEECH_API_KEY"
 
 DEEPGRAM_API_KEY_ENV_VAR = "DEEPGRAM_API_KEY"
@@ -197,7 +198,6 @@ MODEL_CONFIG_KEY = "model"
 MODEL_NAME_CONFIG_KEY = "model_name"
 PROMPT_CONFIG_KEY = "prompt"
 PROMPT_TEMPLATE_CONFIG_KEY = "prompt_template"
-
 STREAM_CONFIG_KEY = "stream"
 N_REPHRASES_CONFIG_KEY = "n"
 USE_CHAT_COMPLETIONS_ENDPOINT_CONFIG_KEY = "use_chat_completions_endpoint"
@@ -231,12 +231,6 @@ LITELLM_PARAMS_KEY = "litellm_params"
 LLM_API_HEALTH_CHECK_ENV_VAR = "LLM_API_HEALTH_CHECK"
 LLM_API_HEALTH_CHECK_DEFAULT_VALUE = "false"
 
-AZURE_API_KEY_ENV_VAR = "AZURE_API_KEY"
-AZURE_AD_TOKEN_ENV_VAR = "AZURE_AD_TOKEN"
-AZURE_API_BASE_ENV_VAR = "AZURE_API_BASE"
-AZURE_API_VERSION_ENV_VAR = "AZURE_API_VERSION"
-AZURE_API_TYPE_ENV_VAR = "AZURE_API_TYPE"
-
 AWS_REGION_NAME_CONFIG_KEY = "aws_region_name"
 AWS_ACCESS_KEY_ID_CONFIG_KEY = "aws_access_key_id"
 AWS_SECRET_ACCESS_KEY_CONFIG_KEY = "aws_secret_access_key"
@@ -272,17 +266,11 @@ RASA_PROVIDER = "rasa"
 SELF_HOSTED_VLLM_PREFIX = "hosted_vllm"
 SELF_HOSTED_VLLM_API_KEY_ENV_VAR = "HOSTED_VLLM_API_KEY"
 
-SELF_HOSTED_VLLM_PREFIX = "hosted_vllm"
-SELF_HOSTED_VLLM_API_KEY_ENV_VAR = "HOSTED_VLLM_API_KEY"
-
 VALID_PROVIDERS_FOR_API_TYPE_CONFIG_KEY = [
     OPENAI_PROVIDER,
     AZURE_OPENAI_PROVIDER,
 ]
 
-SELF_HOSTED_VLLM_PREFIX = "hosted_vllm"
-SELF_HOSTED_VLLM_API_KEY_ENV_VAR = "HOSTED_VLLM_API_KEY"
-
 AZURE_API_TYPE = "azure"
 OPENAI_API_TYPE = "openai"
 
@@ -320,11 +308,4 @@ SENSITIVE_DATA = [
     AWS_SESSION_TOKEN_CONFIG_KEY,
 ]
 
-# Used for key values in BotUtterance.data
-TEXT = "text"
-ELEMENTS = "elements"
-QUICK_REPLIES = "quick_replies"
-BUTTONS = "buttons"
-ATTACHMENT = "attachment"
-IMAGE = "image"
-CUSTOM = "custom"
+AZURE_AD_KEY = "azure_ad"

rasa/shared/core/events.py

@@ -2,10 +2,14 @@ import abc
 import copy
 import json
 import logging
+import structlog
 import re
+from abc import ABC
+
+import jsonpickle
 import time
 import uuid
-from abc import ABC
+from dateutil import parser
 from datetime import datetime
 from typing import (
     List,
@@ -20,14 +24,11 @@ from typing import (
     Tuple,
     TypeVar,
 )
-from typing import Union
-
-import jsonpickle
-import structlog
-from dateutil import parser
 
 import rasa.shared.utils.common
 import rasa.shared.utils.io
+from typing import Union
+
 from rasa.shared.constants import DOCS_URL_TRAINING_DATA
 from rasa.shared.core.constants import (
     LOOP_NAME,
@@ -61,7 +62,7 @@ from rasa.shared.nlu.constants import (
     ENTITY_ATTRIBUTE_END,
     FULL_RETRIEVAL_INTENT_NAME_KEY,
 )
-from rasa.shared.nlu.constants import PROMPTS
+
 
 if TYPE_CHECKING:
     from typing_extensions import TypedDict
@@ -97,7 +98,6 @@ if TYPE_CHECKING:
             ENTITIES: List[EntityPrediction],
             "message_id": Optional[Text],
             "metadata": Dict,
-            PROMPTS: Dict,
         },
         total=False,
     )

rasa/shared/nlu/constants.py

@@ -6,9 +6,6 @@ PREDICTED_COMMANDS = "predicted_commands"
 PROMPTS = "prompts"
 KEY_USER_PROMPT = "user_prompt"
 KEY_SYSTEM_PROMPT = "system_prompt"
-KEY_LLM_RESPONSE_METADATA = "llm_response_metadata"
-KEY_PROMPT_NAME = "prompt_name"
-KEY_COMPONENT_NAME = "component_name"
 LLM_COMMANDS = "llm_commands"  # needed for fine-tuning
 LLM_PROMPT = "llm_prompt"  # needed for fine-tuning
 FLOWS_FROM_SEMANTIC_SEARCH = "flows_from_semantic_search"

rasa/shared/providers/_configs/azure_entra_id_client_creds.py

@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+from typing import Any, Dict, List
+
+from azure.identity import ClientSecretCredential
+
+from rasa.shared.providers._configs.oauth_config import OAuth
+
+
+@dataclass
+class AzureEntraIDClientCreds(OAuth):
+    client_id: str
+    client_secret: str
+    tenant_id: str
+    scopes: List[str] = field(default_factory=list)
+
+    @classmethod
+    def from_config(cls, config: Dict[str, Any]) -> AzureEntraIDClientCreds:
+        scopes = config.get("scopes")
+        if isinstance(scopes, str):
+            scopes = [scopes]
+
+        return cls(
+            client_id=config.get("client_id"),
+            client_secret=config.get("client_secret"),
+            tenant_id=config.get("tenant_id"),
+            scopes=scopes,
+        )
+
+    def get_bearer_token(self) -> str:
+        return (
+            ClientSecretCredential(
+                client_id=self.client_id,
+                client_secret=self.client_secret,
+                tenant_id=self.tenant_id,
+            )
+            .get_token(*self.scopes)
+            .token
+        )