rasa-pro 3.12.6.dev2__py3-none-any.whl → 3.12.7__py3-none-any.whl

rasa/shared/core/flows/steps/collect.py

@@ -1,15 +1,10 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from typing import Any, Dict, List, Set, Text
 
 from rasa.shared.constants import ACTION_ASK_PREFIX, UTTER_ASK_PREFIX
-from rasa.shared.core.constants import (
-    KEY_ASK_CONFIRM_DIGRESSIONS,
-    KEY_BLOCK_DIGRESSIONS,
-)
 from rasa.shared.core.flows.flow_step import FlowStep
-from rasa.shared.core.flows.utils import extract_digression_prop
 from rasa.shared.core.slots import SlotRejection
 
 
@@ -29,10 +24,8 @@ class CollectInformationFlowStep(FlowStep):
     """Whether to always ask the question even if the slot is already filled."""
     reset_after_flow_ends: bool = True
     """Whether to reset the slot value at the end of the flow."""
-    ask_confirm_digressions: List[str] = field(default_factory=list)
-    """The flow id digressions for which the assistant should ask for confirmation."""
-    block_digressions: List[str] = field(default_factory=list)
-    """The flow id digressions that should be blocked during the flow step."""
+    force_slot_filling: bool = False
+    """Whether to keep only the SetSlot command for the collected slot."""
 
     @classmethod
     def from_json(
@@ -60,10 +53,7 @@ class CollectInformationFlowStep(FlowStep):
                 SlotRejection.from_dict(rejection)
                 for rejection in data.get("rejections", [])
             ],
-            ask_confirm_digressions=extract_digression_prop(
-                KEY_ASK_CONFIRM_DIGRESSIONS, data
-            ),
-            block_digressions=extract_digression_prop(KEY_BLOCK_DIGRESSIONS, data),
+            force_slot_filling=data.get("force_slot_filling", False),
             **base.__dict__,
         )
 
@@ -79,10 +69,7 @@ class CollectInformationFlowStep(FlowStep):
         data["ask_before_filling"] = self.ask_before_filling
         data["reset_after_flow_ends"] = self.reset_after_flow_ends
         data["rejections"] = [rejection.as_dict() for rejection in self.rejections]
-        data["ask_confirm_digressions"] = self.ask_confirm_digressions
-        data["block_digressions"] = (
-            self.block_digressions if self.block_digressions else False
-        )
+        data["force_slot_filling"] = self.force_slot_filling
 
         return data
 

rasa/shared/core/flows/utils.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Dict, List, Set, Text
+from typing import TYPE_CHECKING, Any, Dict, Set, Text
 
 from rasa.shared.utils.io import raise_deprecation_warning
 
@@ -8,7 +8,6 @@ if TYPE_CHECKING:
 
 RESET_PROPERTY_NAME = "reset_after_flow_ends"
 PERSIST_PROPERTY_NAME = "persisted_slots"
-ALL_LABEL = "ALL"
 
 
 def warn_deprecated_collect_step_config() -> None:
@@ -45,20 +44,6 @@ def get_invalid_slot_persistence_config_error_message(
     )
 
 
-def extract_digression_prop(prop: str, data: Dict[str, Any]) -> List[str]:
-    """Extracts the digression property from the data.
-
-    There can be two types of properties: ask_confirm_digressions and
-    block_digressions.
-    """
-    digression_property = data.get(prop, [])
-
-    if isinstance(digression_property, bool):
-        digression_property = [ALL_LABEL] if digression_property else []
-
-    return digression_property
-
-
 def extract_translations(
     translation_data: Dict[Text, Any],
 ) -> Dict[Text, "FlowLanguageTranslation"]:

rasa/shared/core/slot_mappings.py

@@ -648,12 +648,14 @@ class SlotFillingManager:
         output_channel: "OutputChannel",
         nlg: "NaturalLanguageGenerator",
         recreate_tracker: bool = False,
+        slot_events: Optional[List[Event]] = None,
     ) -> List[Event]:
         from rasa.core.actions.action import RemoteAction
         from rasa.shared.core.trackers import DialogueStateTracker
         from rasa.utils.endpoints import ClientResponseError
 
-        slot_events: List[Event] = []
+        validated_slot_events: List[Event] = []
+        slot_events = slot_events if slot_events is not None else []
         remote_action = RemoteAction(custom_action, self._action_endpoint)
         disallowed_types = set()
 
@@ -673,9 +675,9 @@ class SlotFillingManager:
             )
             for event in custom_events:
                 if isinstance(event, SlotSet):
-                    slot_events.append(event)
+                    validated_slot_events.append(event)
                 elif isinstance(event, BotUttered):
-                    slot_events.append(event)
+                    validated_slot_events.append(event)
                 else:
                     disallowed_types.add(event.type_name)
         except (RasaException, ClientResponseError) as e:
@@ -699,7 +701,7 @@ class SlotFillingManager:
                 f"updated with this event.",
             )
 
-        return slot_events
+        return validated_slot_events
 
     async def execute_validation_action(
         self,
@@ -722,7 +724,11 @@ class SlotFillingManager:
             return cast(List[Event], slot_events)
 
         validate_events = await self._run_custom_action(
-            ACTION_VALIDATE_SLOT_MAPPINGS, output_channel, nlg, recreate_tracker=True
+            ACTION_VALIDATE_SLOT_MAPPINGS,
+            output_channel,
+            nlg,
+            recreate_tracker=True,
+            slot_events=cast(List[Event], slot_events),
         )
         validated_slot_names = [
             event.key for event in validate_events if isinstance(event, SlotSet)

rasa/shared/nlu/constants.py

@@ -55,4 +55,3 @@ SPLIT_ENTITIES_BY_COMMA_DEFAULT_VALUE = True
 SINGLE_ENTITY_ALLOWED_INTERLEAVING_CHARSET = {".", ",", " ", ";"}
 
 SET_SLOT_COMMAND = "set slot"
-HANDLE_DIGRESSIONS_COMMAND = "handle digressions"

rasa/shared/providers/constants.py

@@ -4,12 +4,3 @@ LITE_LLM_API_KEY_FIELD = "api_key"
 LITE_LLM_API_VERSION_FIELD = "api_version"
 LITE_LLM_MODEL_FIELD = "model"
 LITE_LLM_AZURE_AD_TOKEN = "azure_ad_token"
-
-# Enable or disable Langfuse integration
-RASA_LANGFUSE_INTEGRATION_ENABLED_ENV_VAR = "RASA_LANGFUSE_INTEGRATION_ENABLED"
-# Langfuse configuration
-LANGFUSE_CALLBACK_NAME = "langfuse"
-LANGFUSE_HOST_ENV_VAR = "LANGFUSE_HOST"
-LANGFUSE_PROJECT_ID_ENV_VAR = "LANGFUSE_PROJECT_ID"
-LANGFUSE_PUBLIC_KEY_ENV_VAR = "LANGFUSE_PUBLIC_KEY"
-LANGFUSE_SECRET_KEY_ENV_VAR = "LANGFUSE_SECRET_KEY"

rasa/shared/providers/llm/_base_litellm_client.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import logging
 from abc import abstractmethod
-from typing import Any, Dict, List, Optional, Union, cast
+from typing import Any, Dict, List, Union, cast
 
 import structlog
 from litellm import acompletion, completion, validate_environment
@@ -120,11 +120,7 @@ class _BaseLiteLLMClient:
             raise ProviderClientValidationError(event_info)
 
     @suppress_logs(log_level=logging.WARNING)
-    def completion(
-        self,
-        messages: Union[List[dict], List[str], str],
-        metadata: Optional[Dict[str, Any]] = None,
-    ) -> LLMResponse:
+    def completion(self, messages: Union[List[dict], List[str], str]) -> LLMResponse:
         """Synchronously generate completions for given list of messages.
 
         Args:
@@ -136,7 +132,6 @@ class _BaseLiteLLMClient:
                 - a list of messages. Each message is a string and will be formatted
                     as a user message.
                 - a single message as a string which will be formatted as user message.
-            metadata: Optional metadata to be passed to the LLM call.
 
         Returns:
             List of message completions.
@@ -154,9 +149,7 @@ class _BaseLiteLLMClient:
 
     @suppress_logs(log_level=logging.WARNING)
     async def acompletion(
-        self,
-        messages: Union[List[dict], List[str], str],
-        metadata: Optional[Dict[str, Any]] = None,
+        self, messages: Union[List[dict], List[str], str]
     ) -> LLMResponse:
         """Asynchronously generate completions for given list of messages.
 
@@ -169,7 +162,6 @@ class _BaseLiteLLMClient:
                 - a list of messages. Each message is a string and will be formatted
                     as a user message.
                 - a single message as a string which will be formatted as user message.
-            metadata: Optional metadata to be passed to the LLM call.
 
         Returns:
             List of message completions.
@@ -180,9 +172,7 @@ class _BaseLiteLLMClient:
         try:
             formatted_messages = self._get_formatted_messages(messages)
             arguments = resolve_environment_variables(self._completion_fn_args)
-            response = await acompletion(
-                messages=formatted_messages, metadata=metadata, **arguments
-            )
+            response = await acompletion(messages=formatted_messages, **arguments)
             return self._format_response(response)
         except Exception as e:
             message = ""

rasa/shared/providers/llm/litellm_router_llm_client.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Union
 
 import structlog
 
@@ -122,12 +122,9 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
             raise ProviderClientAPIException(e)
 
     @suppress_logs(log_level=logging.WARNING)
-    def completion(
-        self,
-        messages: Union[List[dict], List[str], str],
-        metadata: Optional[Dict[str, Any]] = None,
-    ) -> LLMResponse:
-        """Synchronously generate completions for given list of messages.
+    def completion(self, messages: Union[List[dict], List[str], str]) -> LLMResponse:
+        """
+        Synchronously generate completions for given list of messages.
 
         Method overrides the base class method to call the appropriate
         completion method based on the configuration. If the chat completions
@@ -143,11 +140,8 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
                 - a list of messages. Each message is a string and will be formatted
                     as a user message.
                 - a single message as a string which will be formatted as user message.
-            metadata: Optional metadata to be passed to the LLM call.
-
         Returns:
             List of message completions.
-
         Raises:
             ProviderClientAPIException: If the API request fails.
         """
@@ -164,11 +158,10 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
 
     @suppress_logs(log_level=logging.WARNING)
     async def acompletion(
-        self,
-        messages: Union[List[dict], List[str], str],
-        metadata: Optional[Dict[str, Any]] = None,
+        self, messages: Union[List[dict], List[str], str]
     ) -> LLMResponse:
-        """Asynchronously generate completions for given list of messages.
+        """
+        Asynchronously generate completions for given list of messages.
 
         Method overrides the base class method to call the appropriate
         completion method based on the configuration. If the chat completions
@@ -184,11 +177,8 @@ class LiteLLMRouterLLMClient(_BaseLiteLLMRouterClient, _BaseLiteLLMClient):
                 - a list of messages. Each message is a string and will be formatted
                     as a user message.
                 - a single message as a string which will be formatted as user message.
-            metadata: Optional metadata to be passed to the LLM call.
-
         Returns:
             List of message completions.
-
         Raises:
             ProviderClientAPIException: If the API request fails.
         """

rasa/shared/providers/llm/llm_client.py

@@ -1,19 +1,21 @@
 from __future__ import annotations
 
-from typing import Any, Dict, List, Optional, Protocol, Union, runtime_checkable
+from typing import Dict, List, Protocol, Union, runtime_checkable
 
 from rasa.shared.providers.llm.llm_response import LLMResponse
 
 
 @runtime_checkable
 class LLMClient(Protocol):
-    """Protocol for an LLM client that specifies the interface for interacting
+    """
+    Protocol for an LLM client that specifies the interface for interacting
     with the API.
     """
 
     @classmethod
     def from_config(cls, config: dict) -> LLMClient:
-        """Initializes the llm client with the given configuration.
+        """
+        Initializes the llm client with the given configuration.
 
         This class method should be implemented to parse the given
         configuration and create an instance of an llm client.
@@ -22,24 +24,17 @@ class LLMClient(Protocol):
 
     @property
     def config(self) -> Dict:
-        """Returns the configuration for that the llm client is initialized with.
+        """
+        Returns the configuration for that the llm client is initialized with.
 
         This property should be implemented to return a dictionary containing
         the configuration settings for the llm client.
         """
         ...
 
-    def completion(
-        self,
-        messages: Union[List[dict], List[str], str],
-        metadata: Optional[Dict[str, Any]] = None,
-    ) -> LLMResponse:
-        """Synchronously generate completions for given list of messages.
-        def completion(
-        self,
-        messages: Union[List[dict], List[str], str],
-        metadata: Optional[Dict[str, Any]] = None,
-        ) -> LLMResponse:
+    def completion(self, messages: Union[List[dict], List[str], str]) -> LLMResponse:
+        """
+        Synchronously generate completions for given list of messages.
 
         This method should be implemented to take a list of messages (as
         strings) and return a list of completions (as strings).
@@ -53,19 +48,16 @@ class LLMClient(Protocol):
                 - a list of messages. Each message is a string and will be formatted
                     as a user message.
                 - a single message as a string which will be formatted as user message.
-            metadata: Optional metadata to be passed to the LLM call.
-
         Returns:
             LLMResponse
         """
         ...
 
     async def acompletion(
-        self,
-        messages: Union[List[dict], List[str], str],
-        metadata: Optional[Dict[str, Any]] = None,
+        self, messages: Union[List[dict], List[str], str]
     ) -> LLMResponse:
-        """Asynchronously generate completions for given list of messages.
+        """
+        Asynchronously generate completions for given list of messages.
 
         This method should be implemented to take a list of messages (as
         strings) and return a list of completions (as strings).
@@ -79,15 +71,14 @@ class LLMClient(Protocol):
                 - a list of messages. Each message is a string and will be formatted
                     as a user message.
                 - a single message as a string which will be formatted as user message.
-            metadata: Optional metadata to be passed to the LLM call.
-
         Returns:
             LLMResponse
         """
         ...
 
     def validate_client_setup(self, *args, **kwargs) -> None:  # type: ignore
-        """Perform client setup validation.
+        """
+        Perform client setup validation.
 
         This method should be implemented to validate whether the client can be
         used with the parameters provided through configuration or environment

rasa/shared/providers/llm/self_hosted_llm_client.py

@@ -237,9 +237,7 @@ class SelfHostedLLMClient(_BaseLiteLLMClient):
             raise ProviderClientAPIException(e)
 
     async def acompletion(
-        self,
-        messages: Union[List[dict], List[str], str],
-        metadata: Optional[Dict[str, Any]] = None,
+        self, messages: Union[List[dict], List[str], str]
     ) -> LLMResponse:
         """Asynchronous completion of the model with the given messages.
 
@@ -257,7 +255,6 @@ class SelfHostedLLMClient(_BaseLiteLLMClient):
                 - a list of messages. Each message is a string and will be formatted
                     as a user message.
                 - a single message as a string which will be formatted as user message.
-            metadata: Optional metadata to be passed to the LLM call.
 
         Returns:
             The completion response.
@@ -266,11 +263,7 @@ class SelfHostedLLMClient(_BaseLiteLLMClient):
             return await super().acompletion(messages)
         return await self._atext_completion(messages)
 
-    def completion(
-        self,
-        messages: Union[List[dict], List[str], str],
-        metadata: Optional[Dict[str, Any]] = None,
-    ) -> LLMResponse:
+    def completion(self, messages: Union[List[dict], List[str], str]) -> LLMResponse:
         """Completion of the model with the given messages.
 
         Method overrides the base class method to call the appropriate
@@ -280,7 +273,6 @@ class SelfHostedLLMClient(_BaseLiteLLMClient):
 
         Args:
             messages: The messages to be used for completion.
-            metadata: Optional metadata to be passed to the LLM call.
 
         Returns:
             The completion response.

rasa/shared/utils/common.py

@@ -7,7 +7,17 @@ import os
 import pkgutil
 import sys
 from types import ModuleType
-from typing import Any, Callable, Collection, Dict, List, Optional, Sequence, Text, Type
+from typing import (
+    Any,
+    Callable,
+    Collection,
+    Dict,
+    List,
+    Optional,
+    Sequence,
+    Text,
+    Type,
+)
 
 import rasa.shared.utils.io
 from rasa.exceptions import MissingDependencyException

rasa/shared/utils/health_check/health_check.py

@@ -3,7 +3,6 @@ import sys
 from typing import Any, Dict, Optional
 
 from rasa.shared.constants import (
-    LANGFUSE_CUSTOM_METADATA_DICT,
     LLM_API_HEALTH_CHECK_DEFAULT_VALUE,
     LLM_API_HEALTH_CHECK_ENV_VAR,
     MODELS_CONFIG_KEY,
@@ -199,12 +198,7 @@ def send_test_llm_api_request(
         config=llm_client.config,
     )
     try:
-        llm_client.completion(
-            "hello",
-            metadata={
-                LANGFUSE_CUSTOM_METADATA_DICT: {"component": log_source_component}
-            },
-        )
+        llm_client.completion("hello")
     except Exception as e:
         structlogger.error(
             f"{log_source_function}.send_test_llm_api_request_failed",

rasa/tracing/instrumentation/attribute_extractors.py

@@ -372,7 +372,6 @@ def extract_llm_config(
 def extract_attrs_for_llm_based_command_generator(
     self: "LLMBasedCommandGenerator",
     prompt: str,
-    metadata: Optional[Dict[str, Any]] = None,
 ) -> Dict[str, Any]:
     from rasa.dialogue_understanding.generator.flow_retrieval import (
         DEFAULT_EMBEDDINGS_CONFIG,
@@ -388,7 +387,8 @@ def extract_attrs_for_llm_based_command_generator(
 
 
 def extract_attrs_for_contextual_response_rephraser(
-    self: Any, prompt: str, sender_id: str
+    self: Any,
+    prompt: str,
 ) -> Dict[str, Any]:
     from rasa.core.nlg.contextual_response_rephraser import DEFAULT_LLM_CONFIG
 
@@ -721,7 +721,7 @@ def extract_attrs_for_intentless_policy_find_closest_response(
 
 
 def extract_attrs_for_intentless_policy_generate_llm_answer(
-    self: "IntentlessPolicy", llm: "BaseLLM", prompt: str, sender_id: str
+    self: "IntentlessPolicy", llm: "BaseLLM", prompt: str
 ) -> Dict[str, Any]:
     from rasa.core.policies.intentless_policy import (
         DEFAULT_EMBEDDINGS_CONFIG,
@@ -738,7 +738,7 @@ def extract_attrs_for_intentless_policy_generate_llm_answer(
 
 
 def extract_attrs_for_enterprise_search_generate_llm_answer(
-    self: "EnterpriseSearchPolicy", llm: "BaseLLM", prompt: str, sender_id: str
+    self: "EnterpriseSearchPolicy", llm: "BaseLLM", prompt: str
 ) -> Dict[str, Any]:
     from rasa.core.policies.enterprise_search_policy import (
         DEFAULT_EMBEDDINGS_CONFIG,

rasa/tracing/instrumentation/intentless_policy_instrumentation.py

@@ -121,13 +121,12 @@ def _instrument_generate_answer(
             response_examples: List[str],
             conversation_samples: List[str],
             history: str,
-            sender_id: str,
         ) -> Optional[str]:
             with tracer.start_as_current_span(
                 f"{self.__class__.__name__}.{fn.__name__}"
             ) as span:
                 llm_response = await fn(
-                    self, response_examples, conversation_samples, history, sender_id
+                    self, response_examples, conversation_samples, history
                 )
                 span.set_attributes(
                     {

rasa/utils/licensing.py

@@ -539,18 +539,3 @@ async def _count_conversations_after(
         return 0
 
     return await tracker_store.count_conversations(after_timestamp=after_timestamp)
-
-
-def get_human_readable_licence_owner() -> str:
-    user_id = "unknown"
-
-    try:
-        retrieved_license = retrieve_license_from_env()
-        if retrieved_license:
-            decoded = License.decode(retrieved_license)
-            if decoded:
-                user_id = (
-                    f"{decoded.company or ''}_{decoded.email or ''}_{decoded.jti or ''}"
-                )
-    finally:
-        return user_id