rasa-pro 3.13.0.dev8__py3-none-any.whl → 3.13.0.dev10__py3-none-any.whl

rasa/dialogue_understanding/stack/utils.py

@@ -209,7 +209,9 @@ def get_collect_steps_excluding_ask_before_filling_for_active_flow(
         All collect steps that are part of the current active flow,
         excluding the collect steps that have to be asked before filling.
     """
-    active_frame = top_user_flow_frame(dialogue_stack)
+    active_frame = top_user_flow_frame(
+        dialogue_stack, ignore_call_and_link_frames=False
+    )
     if active_frame is None:
         return set()
     active_flow = active_frame.flow(all_flows)

rasa/engine/graph.py

@@ -500,9 +500,9 @@ class GraphNode:
                 structlogger.warning(
                     "graph.node.input_not_resolved",
                     node_name=self._node_name,
-                    input_name=i,
+                    input_name=i,  # no PII
                     event_info=(
-                        "Node input was not resolved, there is no putput. "
+                        "Node input was not resolved, there is no output. "
                         "Another component should have provided this as an output."
                     ),
                 )

rasa/llm_fine_tuning/paraphrasing/conversation_rephraser.py

@@ -22,11 +22,7 @@ from rasa.shared.constants import (
 from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.providers.mappings import OPENAI_PROVIDER
 from rasa.shared.utils.constants import LOG_COMPONENT_SOURCE_METHOD_INIT
-from rasa.shared.utils.llm import (
-    USER,
-    get_prompt_template,
-    llm_factory,
-)
+from rasa.shared.utils.llm import USER, get_prompt_template, llm_factory
 
 SEPARATOR = "\n\n"
 BACKUP_SEPARATOR = "\nUSER:"

rasa/shared/constants.py

@@ -295,6 +295,7 @@ CONTEXT = "context"
 
 RASA_PATTERN_INTERNAL_ERROR = "pattern_internal_error"
 RASA_PATTERN_HUMAN_HANDOFF = "pattern_human_handoff"
+RASA_PATTERN_CHITCHAT = "pattern_chitchat"
 
 RASA_INTERNAL_ERROR_PREFIX = "rasa_internal_error_"
 RASA_PATTERN_INTERNAL_ERROR_DEFAULT = RASA_INTERNAL_ERROR_PREFIX + "default"
@@ -345,3 +346,13 @@ ROLE_SYSTEM = "system"
 # Used for key values in ValidateSlotPatternFlowStackFrame
 REFILL_UTTER = "refill_utter"
 REJECTIONS = "rejections"
+
+# Constants for extractive search FAQ parsing (QA pairs from input documents)
+FAQ_DOCUMENT_METADATA_TITLE = "title"
+FAQ_DOCUMENT_METADATA_ANSWER = "answer"
+FAQ_DOCUMENT_METADATA_TYPE = "type"
+DOCUMENT_TYPE_FAQ = "faq"
+FAQ_INPUT_DATA_QUESTION_LINE_PREFIX = "Q:"
+FAQ_INPUT_DATA_ANSWER_LINE_PREFIX = "A:"
+FAQ_DOCUMENT_ENTRY_SEPARATOR = "\n\n"
+FAQ_DOCUMENT_LINE_SEPARATOR = "\n"

rasa/shared/core/command_payload_reader.py

@@ -1,4 +1,3 @@
-import copy
 import re
 from typing import List, Optional
 
@@ -35,9 +34,7 @@ class CommandPayloadReader:
 
         matches = CommandPayloadReader.find_matches(user_text)
         if not matches:
-            structlogger.warning(
-                "message.parsing.failed", user_text=copy.deepcopy(user_text)
-            )
+            structlogger.warning("message.parsing.failed")
             return message
 
         return CommandPayloadReader.extract_commands_from_pattern_matches(
@@ -110,7 +107,6 @@ class CommandPayloadReader:
         if user_text.count("=") > MAX_NUMBER_OF_SLOTS:
             structlogger.warning(
                 "too.many.slots",
-                user_text=copy.deepcopy(user_text),
                 slot_limit=10,
             )
             return True

rasa/shared/core/events.py

@@ -126,9 +126,7 @@ def deserialise_events(serialized_events: List[Dict[Text, Any]]) -> List["Event"
             if event:
                 deserialised.append(event)
             else:
-                structlogger.warning(
-                    "event.deserialization.failed", rasa_event=copy.deepcopy(event)
-                )
+                structlogger.warning("event.deserialization.failed")
 
     return deserialised
 

rasa/shared/core/flows/validation.py

@@ -8,6 +8,7 @@ from typing import List, Optional, Set, Text
 
 from rasa.shared.constants import (
     RASA_DEFAULT_FLOW_PATTERN_PREFIX,
+    RASA_PATTERN_CHITCHAT,
     RASA_PATTERN_HUMAN_HANDOFF,
     RASA_PATTERN_INTERNAL_ERROR,
 )
@@ -186,8 +187,10 @@ class ReferenceToPatternException(RasaException):
             return message + "Patterns can not be used as a target for a call step."
         else:
             return message + (
-                "All patterns, except for 'pattern_human_handoff', can "
-                "not be used as a target for a link step."
+                "Patterns cannot be used as a target in link steps, except for "
+                "'pattern_human_handoff', which may be linked from both user-defined "
+                "flows and other patterns. 'pattern_chitchat' may only be linked "
+                "from other patterns."
             )
 
 
@@ -578,11 +581,18 @@ def validate_linked_flows_exists(flows: "FlowsList") -> None:
                 continue
 
             # It might be that the flows do not contain the default rasa patterns, but
-            # only the user flows. Manually check for `pattern_human_handoff` as this
-            # pattern can be linked to and it is part of the default patterns of rasa.
+            # only the user flows. Manually check for `pattern_human_handoff` and
+            # 'pattern_chitchat' as these patterns can be linked to and are part of the
+            # default patterns of rasa.
             if (
                 flows.flow_by_id(step.link) is None
+                # Allow linking to human-handoff from both patterns
+                # and user-defined flows
                 and step.link != RASA_PATTERN_HUMAN_HANDOFF
+                # Allow linking to 'pattern_chitchat' only from other patterns
+                and not (
+                    flow.is_rasa_default_flow and step.link == RASA_PATTERN_CHITCHAT
+                )
             ):
                 raise UnresolvedFlowException(step.link, flow.id, step.id)
 
@@ -597,7 +607,13 @@ def validate_patterns_are_not_called_or_linked(flows: "FlowsList") -> None:
             if (
                 isinstance(step, LinkFlowStep)
                 and step.link.startswith(RASA_DEFAULT_FLOW_PATTERN_PREFIX)
+                # Allow linking to human-handoff from both patterns
+                # and user-defined flows
                 and step.link != RASA_PATTERN_HUMAN_HANDOFF
+                # Allow linking to 'pattern_chitchat' only from other patterns
+                and not (
+                    flow.is_rasa_default_flow and step.link == RASA_PATTERN_CHITCHAT
+                )
             ):
                 raise ReferenceToPatternException(
                     step.link, flow.id, step.id, call_step=False
@@ -617,7 +633,8 @@ def validate_patterns_are_not_calling_or_linking_other_flows(
     """Validates that patterns do not contain call or link steps.
 
     Link steps to user flows are allowed for all patterns but 'pattern_internal_error'.
-    Link steps to other patterns, except for 'pattern_human_handoff', are forbidden.
+    Link steps to other patterns, except for 'pattern_human_handoff' and
+    'pattern_chitchat' are forbidden.
     """
     for flow in flows.underlying_flows:
         if not flow.is_rasa_default_flow:
@@ -627,6 +644,9 @@ def validate_patterns_are_not_calling_or_linking_other_flows(
                 if step.link == RASA_PATTERN_HUMAN_HANDOFF:
                     # links to 'pattern_human_handoff' are allowed
                     continue
+                if step.link == RASA_PATTERN_CHITCHAT:
+                    # links to 'pattern_chitchat' are allowed
+                    continue
                 if step.link.startswith(RASA_DEFAULT_FLOW_PATTERN_PREFIX):
                     # all other patterns are allowed to link to user flows, but not
                     # to other patterns

rasa/shared/core/training_data/story_reader/yaml_story_reader.py

@@ -1,4 +1,3 @@
-import copy
 import functools
 import json
 import logging
@@ -648,9 +647,7 @@ class YAMLStoryReader(StoryReader):
         # message text did start with the special prefix -- however, a user might
         # just have decided to start their text this way.
         if not match:
-            structlogger.warning(
-                "message.parsing.failed", user_text=copy.deepcopy(user_text)
-            )
+            structlogger.warning("message.parsing.failed")
             return message
 
         # Extract attributes from the match - and validate it via the domain.

rasa/shared/providers/_configs/azure_openai_client_config.py

@@ -46,13 +46,13 @@ from rasa.shared.providers._configs.oauth_config import (
     OAUTH_TYPE_FIELD,
     OAuth,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.common import class_from_module_path
+from rasa.shared.utils.configs import (
     raise_deprecation_warnings,
     resolve_aliases,
     validate_forbidden_keys,
     validate_required_keys,
 )
-from rasa.shared.utils.common import class_from_module_path
 
 structlogger = structlog.get_logger()
 

rasa/shared/providers/_configs/default_litellm_client_config.py

@@ -15,7 +15,7 @@ from rasa.shared.constants import (
     STREAM_CONFIG_KEY,
     TIMEOUT_CONFIG_KEY,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.configs import (
     raise_deprecation_warnings,
     resolve_aliases,
     validate_forbidden_keys,

rasa/shared/providers/_configs/huggingface_local_embedding_client_config.py

@@ -21,7 +21,7 @@ from rasa.shared.constants import (
     REQUEST_TIMEOUT_CONFIG_KEY,
     TIMEOUT_CONFIG_KEY,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.configs import (
     raise_deprecation_warnings,
     resolve_aliases,
     validate_required_keys,

rasa/shared/providers/_configs/openai_client_config.py

@@ -26,7 +26,7 @@ from rasa.shared.constants import (
     STREAM_CONFIG_KEY,
     TIMEOUT_CONFIG_KEY,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.configs import (
     raise_deprecation_warnings,
     resolve_aliases,
     validate_forbidden_keys,

rasa/shared/providers/_configs/rasa_llm_client_config.py

@@ -11,7 +11,7 @@ from rasa.shared.constants import (
     PROVIDER_CONFIG_KEY,
     RASA_PROVIDER,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.configs import (
     validate_required_keys,
 )
 

rasa/shared/providers/_configs/self_hosted_llm_client_config.py

@@ -25,7 +25,7 @@ from rasa.shared.constants import (
     TIMEOUT_CONFIG_KEY,
     USE_CHAT_COMPLETIONS_ENDPOINT_CONFIG_KEY,
 )
-from rasa.shared.providers._configs.utils import (
+from rasa.shared.utils.configs import (
     raise_deprecation_warnings,
     resolve_aliases,
     validate_forbidden_keys,

rasa/shared/providers/_configs/utils.py

@@ -1,107 +1,8 @@
 import structlog
 
-from rasa.shared.utils.io import raise_deprecation_warning
-
 structlogger = structlog.get_logger()
 
 
-def resolve_aliases(config: dict, deprecated_alias_mapping: dict) -> dict:
-    """
-    Resolve aliases in the configuration to standard keys.
-
-    Args:
-        config: Dictionary containing the configuration.
-        deprecated_alias_mapping: Dictionary mapping aliases to
-            their standard keys.
-
-    Returns:
-        New dictionary containing the processed configuration.
-    """
-    config = config.copy()
-
-    for alias, standard_key in deprecated_alias_mapping.items():
-        # We check for the alias instead of the standard key because our goal is to
-        # update the standard key when the alias is found. Since the standard key is
-        # always included in the default component configurations, we overwrite it
-        # with the alias value if the alias exists.
-        if alias in config:
-            config[standard_key] = config.pop(alias)
-
-    return config
-
-
-def raise_deprecation_warnings(config: dict, deprecated_alias_mapping: dict) -> None:
-    """
-    Raises warnings for deprecated keys in the configuration.
-
-    Args:
-        config: Dictionary containing the configuration.
-        deprecated_alias_mapping: Dictionary mapping deprecated keys to
-            their standard keys.
-
-    Raises:
-        DeprecationWarning: If any deprecated key is found in the config.
-    """
-    for alias, standard_key in deprecated_alias_mapping.items():
-        if alias in config:
-            raise_deprecation_warning(
-                message=(
-                    f"'{alias}' is deprecated and will be removed in "
-                    f"4.0.0. Use '{standard_key}' instead."
-                )
-            )
-
-
-def validate_required_keys(config: dict, required_keys: list) -> None:
-    """
-    Validates that the passed config contains all the required keys.
-
-    Args:
-        config: Dictionary containing the configuration.
-        required_keys: List of keys that must be present in the config.
-
-    Raises:
-        ValueError: If any required key is missing.
-    """
-    missing_keys = [key for key in required_keys if key not in config]
-    if missing_keys:
-        message = f"Missing required keys '{missing_keys}' for configuration."
-        structlogger.error(
-            "validate_required_keys",
-            message=message,
-            missing_keys=missing_keys,
-            config=config,
-        )
-        raise ValueError(message)
-
-
-def validate_forbidden_keys(config: dict, forbidden_keys: list) -> None:
-    """
-    Validates that the passed config doesn't contain any forbidden keys.
-
-    Args:
-        config: Dictionary containing the configuration.
-        forbidden_keys: List of keys that are forbidden in the config.
-
-    Raises:
-        ValueError: If any forbidden key is present.
-    """
-    forbidden_keys_in_config = set(config.keys()).intersection(set(forbidden_keys))
-
-    if forbidden_keys_in_config:
-        message = (
-            f"Forbidden keys '{forbidden_keys_in_config}' present "
-            f"in the configuration."
-        )
-        structlogger.error(
-            "validate_forbidden_keys",
-            message=message,
-            forbidden_keys=forbidden_keys_in_config,
-            config=config,
-        )
-        raise ValueError(message)
-
-
 def get_provider_prefixed_model_name(provider: str, model: str) -> str:
     """
     Returns the model name with the provider prefixed.

rasa/shared/utils/common.py

@@ -384,7 +384,7 @@ def display_research_study_prompt() -> None:
 {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
+Sign up at: https://rasa.com/book-feedback-call
 {separator}
 """
     print_success(message)

rasa/shared/utils/configs.py

@@ -0,0 +1,110 @@
+from typing import Optional
+
+import structlog
+
+from rasa.shared.utils.io import raise_deprecation_warning
+
+structlogger = structlog.get_logger()
+
+
+def resolve_aliases(config: dict, deprecated_alias_mapping: dict) -> dict:
+    """
+    Resolve aliases in the configuration to standard keys.
+
+    Args:
+        config: Dictionary containing the configuration.
+        deprecated_alias_mapping: Dictionary mapping aliases to
+            their standard keys.
+
+    Returns:
+        New dictionary containing the processed configuration.
+    """
+    config = config.copy()
+
+    for alias, standard_key in deprecated_alias_mapping.items():
+        # We check for the alias instead of the standard key because our goal is to
+        # update the standard key when the alias is found. Since the standard key is
+        # always included in the default component configurations, we overwrite it
+        # with the alias value if the alias exists.
+        if alias in config:
+            config[standard_key] = config.pop(alias)
+
+    return config
+
+
+def raise_deprecation_warnings(
+    config: dict,
+    deprecated_alias_mapping: dict,
+    source: Optional[str] = None,
+) -> None:
+    """
+    Raises warnings for deprecated keys in the configuration.
+
+    Args:
+        config: Dictionary containing the configuration.
+        deprecated_alias_mapping: Dictionary mapping deprecated keys to
+            their standard keys.
+
+    Raises:
+        DeprecationWarning: If any deprecated key is found in the config.
+    """
+    for alias, standard_key in deprecated_alias_mapping.items():
+        if alias in config:
+            source = f"{source}: " or ""
+            raise_deprecation_warning(
+                message=(
+                    f"{source}"
+                    f"'{alias}' is deprecated and will be removed in "
+                    f"4.0.0. Use '{standard_key}' instead."
+                )
+            )
+
+
+def validate_required_keys(config: dict, required_keys: list) -> None:
+    """
+    Validates that the passed config contains all the required keys.
+
+    Args:
+        config: Dictionary containing the configuration.
+        required_keys: List of keys that must be present in the config.
+
+    Raises:
+        ValueError: If any required key is missing.
+    """
+    missing_keys = [key for key in required_keys if key not in config]
+    if missing_keys:
+        message = f"Missing required keys '{missing_keys}' for configuration."
+        structlogger.error(
+            "validate_required_keys",
+            message=message,
+            missing_keys=missing_keys,
+            config=config,
+        )
+        raise ValueError(message)
+
+
+def validate_forbidden_keys(config: dict, forbidden_keys: list) -> None:
+    """
+    Validates that the passed config doesn't contain any forbidden keys.
+
+    Args:
+        config: Dictionary containing the configuration.
+        forbidden_keys: List of keys that are forbidden in the config.
+
+    Raises:
+        ValueError: If any forbidden key is present.
+    """
+    forbidden_keys_in_config = set(config.keys()).intersection(set(forbidden_keys))
+
+    if forbidden_keys_in_config:
+        message = (
+            f"Forbidden keys '{forbidden_keys_in_config}' present "
+            f"in the configuration."
+        )
+        structlogger.error(
+            "validate_forbidden_keys",
+            message=message,
+            forbidden_keys=forbidden_keys_in_config,
+            config=config,
+        )
+        raise ValueError(message)

rasa/shared/utils/llm.py

@@ -37,6 +37,8 @@ from rasa.shared.constants import (
     MODEL_GROUP_ID_CONFIG_KEY,
     MODEL_GROUPS_CONFIG_KEY,
     MODELS_CONFIG_KEY,
+    PROMPT_CONFIG_KEY,
+    PROMPT_TEMPLATE_CONFIG_KEY,
     PROVIDER_CONFIG_KEY,
     RASA_PATTERN_INTERNAL_ERROR_USER_INPUT_EMPTY,
     RASA_PATTERN_INTERNAL_ERROR_USER_INPUT_TOO_LONG,
@@ -950,6 +952,34 @@ async def create_tracker_for_user_step(
     await agent.tracker_store.save(tracker)
 
 
+def check_prompt_config_keys_and_warn_if_deprecated(
+    config: dict, component_source: str
+) -> None:
+    """Checks and warns about deprecated config parameters."""
+    if PROMPT_CONFIG_KEY in config and PROMPT_TEMPLATE_CONFIG_KEY in config:
+        structlogger.warning(
+            f"{component_source}.init"
+            ".both_deprecated_and_non_deprecated_config_keys_used_at_the_same_time",
+            event_info=(
+                f"Both '{PROMPT_CONFIG_KEY}' and '{PROMPT_TEMPLATE_CONFIG_KEY}' "
+                f"are present in the config. '{PROMPT_CONFIG_KEY}' will be ignored "
+                f"in favor of {PROMPT_TEMPLATE_CONFIG_KEY}."
+            ),
+        )
+
+    # 'prompt' config key is deprecated in favor of 'prompt_template'
+    if PROMPT_CONFIG_KEY in config:
+        structlogger.warning(
+            f"{component_source}.init.deprecated_config_key",
+            event_info=(
+                f"The config parameter '{PROMPT_CONFIG_KEY}' is deprecated "
+                "and will be removed in Rasa 4.0.0. "
+                f"Please use the config parameter '{PROMPT_TEMPLATE_CONFIG_KEY}'"
+                f" instead. "
+            ),
+        )
+
+
 def _get_llm_command_generator_config(
     config: Dict[Text, Any],
 ) -> Optional[Dict[Text, Any]]:

rasa/tracing/instrumentation/attribute_extractors.py

@@ -64,7 +64,10 @@ 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,
+    resolve_model_client_config,
+)
 from rasa.tracing.constants import (
     PROMPT_TOKEN_LENGTH_ATTRIBUTE_NAME,
     REQUEST_BODY_SIZE_IN_BYTES_ATTRIBUTE_NAME,
@@ -335,9 +338,8 @@ def extract_llm_config(
     else:
         config = self.config
 
-    llm_property = combine_custom_and_default_config(
-        config.get(LLM_CONFIG_KEY), default_llm_config
-    )
+    llm_config = resolve_model_client_config(config.get(LLM_CONFIG_KEY))
+    llm_property = combine_custom_and_default_config(llm_config, default_llm_config)
 
     if isinstance(self, LLMBasedCommandGenerator):
         flow_retrieval_config = config.get(FLOW_RETRIEVAL_KEY, {}) or {}
@@ -346,8 +348,11 @@ def extract_llm_config(
             default_embeddings_config,
         )
     else:
+        embeddings_config = resolve_model_client_config(
+            config.get(EMBEDDINGS_CONFIG_KEY)
+        )
         embeddings_property = combine_custom_and_default_config(
-            config.get(EMBEDDINGS_CONFIG_KEY), default_embeddings_config
+            embeddings_config, default_embeddings_config
         )
 
     attributes = {

rasa/version.py

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

{rasa_pro-3.13.0.dev8.dist-info → rasa_pro-3.13.0.dev10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.0.dev8
+Version: 3.13.0.dev10
 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
@@ -23,7 +23,7 @@ Provides-Extra: spacy
 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.40,<2.1.0)
+Requires-Dist: SQLAlchemy (>=2.0.41,<2.1.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)
@@ -91,7 +91,7 @@ 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)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
-Requires-Dist: python-engineio (>=4.12.0,<6,!=5.0.0)
+Requires-Dist: python-engineio (>=4.12.2,<4.13.0)
 Requires-Dist: python-keycloak (>=3.12.0,<4.0.0)
 Requires-Dist: python-socketio (>=5.8,<6)
 Requires-Dist: pytz (>=2022.7.1,<2023.0)