rasa-pro 3.12.0rc2__py3-none-any.whl → 3.12.1.dev1__py3-none-any.whl

rasa/shared/providers/_configs/azure_entra_id_config.py

@@ -8,7 +8,7 @@ from functools import lru_cache
 from typing import Any, Callable, Dict, List, Optional, Set, Type
 
 import structlog
-from azure.core.credentials import TokenProvider
+from azure.core.credentials import TokenCredential
 from azure.identity import (
     CertificateCredential,
     ClientSecretCredential,
@@ -77,7 +77,7 @@ class AzureEntraIDTokenProviderConfig(abc.ABC):
     """Interface for Azure Entra ID OAuth credential configuration."""
 
     @abc.abstractmethod
-    def create_azure_token_provider(self) -> TokenProvider:
+    def create_azure_token_provider(self) -> TokenCredential:
         """Create an Azure Entra ID token provider."""
         ...
 
@@ -159,7 +159,7 @@ class AzureEntraIDClientCredentialsConfig(AzureEntraIDTokenProviderConfig, BaseM
             ),
         )
 
-    def create_azure_token_provider(self) -> TokenProvider:
+    def create_azure_token_provider(self) -> TokenCredential:
         """Create a ClientSecretCredential for Azure Entra ID."""
         return create_azure_entra_id_client_credentials(
             client_id=self.client_id,
@@ -286,7 +286,7 @@ class AzureEntraIDClientCertificateConfig(AzureEntraIDTokenProviderConfig, BaseM
             ),
         )
 
-    def create_azure_token_provider(self) -> TokenProvider:
+    def create_azure_token_provider(self) -> TokenCredential:
         """Creates a CertificateCredential for Azure Entra ID."""
         return create_azure_entra_id_certificate_credentials(
             client_id=self.client_id,
@@ -369,7 +369,7 @@ class AzureEntraIDDefaultCredentialsConfig(AzureEntraIDTokenProviderConfig, Base
         """
         return cls(authority_host=config.pop(AZURE_AUTHORITY_FIELD, None))
 
-    def create_azure_token_provider(self) -> TokenProvider:
+    def create_azure_token_provider(self) -> TokenCredential:
         """Creates a DefaultAzureCredential."""
         return create_azure_entra_id_default_credentials(
             authority_host=self.authority_host
@@ -530,12 +530,12 @@ class AzureEntraIDOAuthConfig(OAuth, BaseModel):
         azure_oauth_class = AzureEntraIDOAuthConfig._get_azure_oauth_by_type(oauth_type)
         return azure_oauth_class.from_dict(oauth_config)
 
-    def _create_azure_credential(
+    def create_azure_credential(
         self,
-    ) -> TokenProvider:
+    ) -> TokenCredential:
         """Create an Azure Entra ID client which can be used to get a bearer token."""
         return self.azure_entra_id_token_provider_config.create_azure_token_provider()
 
     def get_bearer_token(self) -> str:
         """Returns a bearer token."""
-        return self._create_azure_credential().get_token(*self.scopes).token  # type: ignore
+        return self.create_azure_credential().get_token(*self.scopes).token

rasa/shared/providers/llm/litellm_router_llm_client.py

@@ -198,6 +198,7 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
         """Returns the completion arguments for invoking a call through
         LiteLLM's completion functions.
         """
+
         return {
             **self._litellm_extra_parameters,
             LITE_LLM_MODEL_FIELD: self.model_group_id,

rasa/shared/providers/router/_base_litellm_router_client.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+from copy import deepcopy
 from typing import Any, Dict, List
 
 import structlog
@@ -18,6 +19,7 @@ from rasa.shared.constants import (
     USE_CHAT_COMPLETIONS_ENDPOINT_CONFIG_KEY,
 )
 from rasa.shared.exceptions import ProviderClientValidationError
+from rasa.shared.providers._configs.azure_entra_id_config import AzureEntraIDOAuthConfig
 from rasa.shared.providers._configs.litellm_router_client_config import (
     LiteLLMRouterClientConfig,
 )
@@ -61,12 +63,8 @@ class _BaseLiteLLMRouterClient:
         self._extra_parameters = kwargs or {}
         self.additional_client_setup()
         try:
-            resolved_model_configurations = (
-                self._resolve_env_vars_in_model_configurations()
-            )
-            self._router_client = Router(
-                model_list=resolved_model_configurations, **router_settings
-            )
+            # We instantiate a router client here to validate the configuration.
+            self._router_client = self._create_router_client()
         except Exception as e:
             event_info = "Cannot instantiate a router client."
             structlogger.error(
@@ -145,6 +143,14 @@ class _BaseLiteLLMRouterClient:
     @property
     def router_client(self) -> Router:
         """Returns the instantiated LiteLLM Router client."""
+        # In ca se oauth is used, due to a bug in LiteLLM,
+        # azure_ad_token_provider is not working as expected.
+        # To work around this, we create a new client every
+        # time we need to make a call which will
+        # ensure that the token is always fresh.
+        # GitHub issue for LiteLLm: https://github.com/BerriAI/litellm/issues/4417
+        if self._has_oauth():
+            return self._create_router_client()
         return self._router_client
 
     @property
@@ -175,11 +181,36 @@ class _BaseLiteLLMRouterClient:
             **self._litellm_extra_parameters,
         }
 
+    def _create_router_client(self) -> Router:
+        resolved_model_configurations = self._resolve_env_vars_in_model_configurations()
+        return Router(model_list=resolved_model_configurations, **self.router_settings)
+
+    def _has_oauth(self) -> bool:
+        for model_configuration in self.model_configurations:
+            if model_configuration.get("litellm_params", {}).get("oauth", None):
+                return True
+        return False
+
     def _resolve_env_vars_in_model_configurations(self) -> List:
         model_configuration_with_resolved_keys = []
         for model_configuration in self.model_configurations:
             resolved_model_configuration = resolve_environment_variables(
-                model_configuration
+                deepcopy(model_configuration)
             )
+
+            if not isinstance(resolved_model_configuration, dict):
+                continue
+
+            lite_llm_params = resolved_model_configuration.get("litellm_params", {})
+            if lite_llm_params.get("oauth", None):
+                oauth_config_dict = lite_llm_params.pop("oauth")
+                oauth_config = AzureEntraIDOAuthConfig.from_dict(oauth_config_dict)
+                credential = oauth_config.create_azure_credential()
+                # token_provider = get_bearer_token_provider(
+                #     credential, *oauth_config.scopes
+                # )
+                resolved_model_configuration["litellm_params"]["azure_ad_token"] = (
+                    credential.get_token(*oauth_config.scopes).token
+                )
             model_configuration_with_resolved_keys.append(resolved_model_configuration)
         return model_configuration_with_resolved_keys

rasa/shared/utils/common.py

@@ -13,6 +13,7 @@ import rasa.shared.utils.io
 from rasa.exceptions import MissingDependencyException
 from rasa.shared.constants import DOCS_URL_MIGRATION_GUIDE
 from rasa.shared.exceptions import ProviderClientValidationError, RasaException
+from rasa.shared.utils.cli import print_success
 
 logger = logging.getLogger(__name__)
 
@@ -322,3 +323,16 @@ def validate_environment(
             raise MissingDependencyException(
                 f"Missing package for {component_name}: {p}"
             )
+
+
+def display_research_study_prompt() -> None:
+    """Logs a prompt to get users to participate in a UX Improvement research study."""
+    separator = "-" * 54
+    message = f"""
+{separator}
+Want to help shape the future of Rasa Pro?
+Share your feedback in a short conversation with our team.
+Sign up at: https://calendly.com/alvaro-rasa/rasa-pro-installation
+{separator}
+"""
+    print_success(message)

rasa/shared/utils/llm.py

@@ -667,38 +667,94 @@ def get_prompt_template(
     """
     try:
         if jinja_file_path is not None:
-            return rasa.shared.utils.io.read_file(jinja_file_path)
+            prompt_template = rasa.shared.utils.io.read_file(jinja_file_path)
+            structlogger.info(
+                "utils.llm.get_prompt_template.custom_prompt_template_read_successfull",
+                event_info=(
+                    f"Custom prompt template read successfully from "
+                    f"`{jinja_file_path}`."
+                ),
+                prompt_file_path=jinja_file_path,
+            )
+            return prompt_template
     except (FileIOException, FileNotFoundException):
         structlogger.warning(
-            "Failed to read custom prompt template. Using default template instead.",
-            jinja_file_path=jinja_file_path,
+            "utils.llm.get_prompt_template.failed_to_read_custom_prompt_template",
+            event_info=(
+                "Failed to read custom prompt template. Using default template instead."
+            ),
         )
     return default_prompt_template
 
 
 def get_default_prompt_template_based_on_model(
-    config: Dict[str, Any],
+    llm_config: Dict[str, Any],
     model_prompt_mapping: Dict[str, Any],
+    default_prompt_path: str,
     fallback_prompt_path: str,
 ) -> Text:
     """Returns the default prompt template based on the model name.
 
     Args:
-        config: The model config.
+        llm_config: The model config.
         model_prompt_mapping: The mapping of model name to prompt template.
-        fallback_prompt_path: The fallback prompt path.
+        default_prompt_path: The default prompt path of the component.
+        fallback_prompt_path: The fallback prompt path for all other models
+            that do not have a mapping in the model_prompt_mapping.
 
     Returns:
         The default prompt template.
     """
-    _config = deepcopy(config)
-    if MODELS_CONFIG_KEY in _config:
-        _config = _config[MODELS_CONFIG_KEY][0]
-    provider = _config.get(PROVIDER_CONFIG_KEY)
-    model = _config.get(MODEL_CONFIG_KEY, "")
+    _llm_config = deepcopy(llm_config)
+    if MODELS_CONFIG_KEY in _llm_config:
+        _llm_config = _llm_config[MODELS_CONFIG_KEY][0]
+    provider = _llm_config.get(PROVIDER_CONFIG_KEY)
+    model = _llm_config.get(MODEL_CONFIG_KEY)
+    if not model:
+        # If the model is not defined, we default to the default prompt template.
+        structlogger.info(
+            "utils.llm.get_default_prompt_template_based_on_model.using_default_prompt_template",
+            event_info=(
+                f"Model not defined in the config. Default prompt template read from"
+                f" - `{default_prompt_path}`."
+            ),
+            default_prompt_path=default_prompt_path,
+        )
+        return importlib.resources.read_text(
+            DEFAULT_PROMPT_PACKAGE_NAME, default_prompt_path
+        )
+
     model_name = model if provider and provider in model else f"{provider}/{model}"
-    prompt_file_path = model_prompt_mapping.get(model_name, fallback_prompt_path)
-    return importlib.resources.read_text(DEFAULT_PROMPT_PACKAGE_NAME, prompt_file_path)
+    if prompt_file_path := model_prompt_mapping.get(model_name):
+        # If the model is found in the mapping, we use the model-specific prompt
+        # template.
+        structlogger.info(
+            "utils.llm.get_default_prompt_template_based_on_model.using_model_specific_prompt_template",
+            event_info=(
+                f"Using model-specific default prompt template. Default prompt "
+                f"template read from - `{prompt_file_path}`."
+            ),
+            default_prompt_path=prompt_file_path,
+            model_name=model_name,
+        )
+        return importlib.resources.read_text(
+            DEFAULT_PROMPT_PACKAGE_NAME, prompt_file_path
+        )
+
+    # If the model is not found in the mapping, we default to the fallback prompt
+    # template.
+    structlogger.info(
+        "utils.llm.get_default_prompt_template_based_on_model.using_fallback_prompt_template",
+        event_info=(
+            f"Model not found in the model prompt mapping. Fallback prompt template "
+            f"read from - `{fallback_prompt_path}`."
+        ),
+        fallback_prompt_path=fallback_prompt_path,
+        model_name=model_name,
+    )
+    return importlib.resources.read_text(
+        DEFAULT_PROMPT_PACKAGE_NAME, fallback_prompt_path
+    )
 
 
 def allowed_values_for_slot(slot: Slot) -> Union[str, None]:

rasa/telemetry.py

@@ -15,7 +15,7 @@ from collections import defaultdict
 from datetime import datetime
 from functools import wraps
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional, Text, Tuple
+from typing import Any, Callable, Dict, List, Optional, Text, Tuple, Type, cast
 
 import importlib_resources
 import requests
@@ -1126,12 +1126,12 @@ def _get_llm_command_generator_config(config: Dict[str, Any]) -> Optional[Dict]:
     """
     from rasa.dialogue_understanding.generator import (
         CompactLLMCommandGenerator,
+        LLMBasedCommandGenerator,
         LLMCommandGenerator,
         MultiStepLLMCommandGenerator,
         SingleStepLLMCommandGenerator,
     )
     from rasa.dialogue_understanding.generator.constants import (
-        DEFAULT_LLM_CONFIG,
         FLOW_RETRIEVAL_KEY,
         LLM_CONFIG_KEY,
     )
@@ -1162,6 +1162,12 @@ def _get_llm_command_generator_config(config: Dict[str, Any]) -> Optional[Dict]:
 
     def extract_llm_command_generator_llm_client_settings(component: Dict) -> Dict:
         """Extracts settings related to LLM command generator."""
+        component_class_lookup = {
+            LLMCommandGenerator.__name__: LLMCommandGenerator,
+            SingleStepLLMCommandGenerator.__name__: SingleStepLLMCommandGenerator,
+            MultiStepLLMCommandGenerator.__name__: MultiStepLLMCommandGenerator,
+            CompactLLMCommandGenerator.__name__: CompactLLMCommandGenerator,
+        }
         llm_config = component.get(LLM_CONFIG_KEY, {})
         # Config at this stage is not yet resolved, so read from `model_group`
         llm_model_group_id = llm_config.get(MODEL_GROUP_CONFIG_KEY)
@@ -1169,7 +1175,11 @@ def _get_llm_command_generator_config(config: Dict[str, Any]) -> Optional[Dict]:
             MODEL_NAME_CONFIG_KEY
         )
         if llm_model_group_id is None and llm_model_name is None:
-            llm_model_name = DEFAULT_LLM_CONFIG[MODEL_CONFIG_KEY]
+            component_clz = cast(
+                Type[LLMBasedCommandGenerator],
+                component_class_lookup[component["name"]],
+            )
+            llm_model_name = component_clz.get_default_llm_config()[MODEL_CONFIG_KEY]
 
         custom_prompt_used = (
             PROMPT_CONFIG_KEY in component or PROMPT_TEMPLATE_CONFIG_KEY in component

rasa/tracing/instrumentation/attribute_extractors.py

@@ -58,9 +58,7 @@ from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.core.training_data.structures import StoryGraph
 from rasa.shared.importers.importer import TrainingDataImporter
 from rasa.shared.nlu.constants import INTENT_NAME_KEY, SET_SLOT_COMMAND
-from rasa.shared.utils.llm import (
-    combine_custom_and_default_config,
-)
+from rasa.shared.utils.llm import combine_custom_and_default_config
 from rasa.tracing.constants import (
     PROMPT_TOKEN_LENGTH_ATTRIBUTE_NAME,
     REQUEST_BODY_SIZE_IN_BYTES_ATTRIBUTE_NAME,
@@ -375,14 +373,13 @@ def extract_attrs_for_llm_based_command_generator(
     self: "LLMBasedCommandGenerator",
     prompt: str,
 ) -> Dict[str, Any]:
-    from rasa.dialogue_understanding.generator.constants import DEFAULT_LLM_CONFIG
     from rasa.dialogue_understanding.generator.flow_retrieval import (
         DEFAULT_EMBEDDINGS_CONFIG,
     )
 
     attributes = extract_llm_config(
         self,
-        default_llm_config=DEFAULT_LLM_CONFIG,
+        default_llm_config=self.get_default_llm_config(),
         default_embeddings_config=DEFAULT_EMBEDDINGS_CONFIG,
     )
 

rasa/validator.py

@@ -1429,7 +1429,7 @@ class Validator:
                     event_info=(
                         f"{count} response{' is' if count == 1 else 's are'} "
                         f"missing translations for some languages. "
-                        "Run 'rasa data validate language' for details."
+                        "Run 'rasa data validate translations' for details."
                     ),
                 )
             if flow_warnings:
@@ -1440,7 +1440,7 @@ class Validator:
                     event_info=(
                         f"{count} flow{' is' if count == 1 else 's are'} "
                         f"missing translations for some languages. "
-                        "Run 'rasa data validate language' for details."
+                        "Run 'rasa data validate translations' for details."
                     ),
                 )
         else:
@@ -2061,7 +2061,7 @@ class Validator:
 
     def validate_conditional_response_variation_predicates(self) -> bool:
         """Validate the conditional response variation predicates."""
-        context = {"slots": {slot.name: None for slot in self.domain.slots}}
+        context = {SLOTS: {slot.name: None for slot in self.domain.slots}}
         all_good = True
 
         for utter_name, variations in self.domain.responses.items():
@@ -2115,7 +2115,7 @@ class Validator:
 
                 if (
                     slot_namespace is not None
-                    and slot_namespace[1] not in self.domain.slots
+                    and slot_namespace[1] not in context[SLOTS]
                 ):
                     structlogger.error(
                         "validator.validate_conditional_response_variation_predicates.invalid_slot",

rasa/version.py

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

{rasa_pro-3.12.0rc2.dist-info → rasa_pro-3.12.1.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.12.0rc2
+Version: 3.12.1.dev1
 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
@@ -103,7 +103,7 @@ Requires-Dist: pyyaml (>=6.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.12.0.dev2)
+Requires-Dist: rasa-sdk (==3.12.0)
 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)