rasa-pro 3.12.1.dev2__py3-none-any.whl → 3.12.2__py3-none-any.whl

rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -12,6 +12,9 @@ from rasa.dialogue_understanding.commands import (
     SetSlotCommand,
     StartFlowCommand,
 )
+from rasa.dialogue_understanding.commands.handle_digressions_command import (
+    HandleDigressionsCommand,
+)
 from rasa.dialogue_understanding.constants import KEY_MINIMIZE_NUM_CALLS
 from rasa.dialogue_understanding.generator import CommandGenerator
 from rasa.dialogue_understanding.generator.constants import (
@@ -584,6 +587,24 @@ class LLMBasedCommandGenerator(
 
         return filtered_commands
 
+    def _should_merge_llm_commands(
+        self,
+        prior_commands: List[Command],
+        prior_start_flow_names: Set[str],
+    ) -> bool:
+        """Check if the LLM current commands should be merged with the prior commands.
+
+        This can be done if there are no prior start flow commands and
+        no prior handle digressions commands.
+        """
+        prior_handle_digressions = [
+            command
+            for command in prior_commands
+            if isinstance(command, HandleDigressionsCommand)
+        ]
+
+        return not prior_start_flow_names and not prior_handle_digressions
+
     def _check_start_flow_command_overlap(
         self,
         prior_commands: List[Command],
@@ -596,7 +617,9 @@ class LLMBasedCommandGenerator(
             prior_start_flow_names
         )
 
-        if not different_flow_names:
+        if not different_flow_names or self._should_merge_llm_commands(
+            prior_commands, prior_start_flow_names
+        ):
             return prior_commands + commands
 
         # discard the flow names that are different to prior start flow commands

rasa/dialogue_understanding/processor/command_processor.py

@@ -447,7 +447,14 @@ def clean_up_commands(
                 continue
 
             if should_add_handle_digressions_command(tracker, all_flows, top_flow_id):
-                clean_commands.append(HandleDigressionsCommand(flow=command.flow))
+                handle_digression_command = HandleDigressionsCommand(flow=command.flow)
+                if handle_digression_command in clean_commands:
+                    structlogger.debug(
+                        "command_processor.clean_up_commands.skip_handle_digressions.command_already_present",
+                        command=handle_digression_command,
+                    )
+                    continue
+                clean_commands.append(handle_digression_command)
                 structlogger.debug(
                     "command_processor.clean_up_commands.push_handle_digressions",
                     command=command,
@@ -487,6 +494,18 @@ def clean_up_commands(
     elif not tracker.has_coexistence_routing_slot and len(clean_commands) > 1:
         clean_commands = filter_cannot_handle_command_for_skipped_slots(clean_commands)
 
+    # remove cancel flow when there is a handle digression command
+    # otherwise the cancel command will cancel the active flow which defined a specific
+    # behavior for the digression
+    if contains_command(clean_commands, HandleDigressionsCommand) and contains_command(
+        clean_commands, CancelFlowCommand
+    ):
+        clean_commands = [
+            command
+            for command in clean_commands
+            if not isinstance(command, CancelFlowCommand)
+        ]
+
     clean_commands = ensure_max_number_of_command_type(
         clean_commands, RepeatBotMessagesCommand, 1
     )

rasa/keys

@@ -0,0 +1 @@
+{"segment": "CcvVD1I68Nkkxrv93cIqv1twIwrwG8nz", "sentry": "a283f1fde04347b099c8d729109dd450@o251570"}

rasa/shared/constants.py

@@ -183,6 +183,7 @@ OPENAI_API_VERSION_CONFIG_KEY = "openai_api_version"
 
 AWS_BEDROCK_PROVIDER = "bedrock"
 AWS_SAGEMAKER_PROVIDER = "sagemaker"
+AWS_SAGEMAKER_CHAT_PROVIDER = "sagemaker_chat"
 
 API_BASE_CONFIG_KEY = "api_base"
 API_TYPE_CONFIG_KEY = "api_type"

rasa/shared/providers/llm/default_litellm_llm_client.py

@@ -4,6 +4,7 @@ from typing import Any, Dict
 
 from rasa.shared.constants import (
     AWS_BEDROCK_PROVIDER,
+    AWS_SAGEMAKER_CHAT_PROVIDER,
     AWS_SAGEMAKER_PROVIDER,
 )
 from rasa.shared.providers._configs.default_litellm_client_config import (
@@ -100,7 +101,11 @@ class DefaultLiteLLMClient(_BaseLiteLLMClient):
         #       SageMaker) in Rasa by allowing AWS secrets to be provided as extra
         #       parameters without triggering validation errors due to missing AWS
         #       environment variables.
-        if self.provider.lower() in [AWS_BEDROCK_PROVIDER, AWS_SAGEMAKER_PROVIDER]:
+        if self.provider.lower() in [
+            AWS_BEDROCK_PROVIDER,
+            AWS_SAGEMAKER_PROVIDER,
+            AWS_SAGEMAKER_CHAT_PROVIDER,
+        ]:
             validate_aws_setup_for_litellm_clients(
                 self._litellm_model_name,
                 self._litellm_extra_parameters,

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.0"
+__version__ = "3.12.2"

{rasa_pro-3.12.1.dev2.dist-info → rasa_pro-3.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.12.1.dev2
+Version: 3.12.2
 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

{rasa_pro-3.12.1.dev2.dist-info → rasa_pro-3.12.2.dist-info}/RECORD

@@ -401,7 +401,7 @@ rasa/dialogue_understanding/generator/command_parser.py,sha256=wf6FSgqBw5F0legg0
 rasa/dialogue_understanding/generator/constants.py,sha256=nA184YgNRaoA9Q0XlLp7VKxGCX4nN_b3zLyDaL22rQw,1018
 rasa/dialogue_understanding/generator/flow_document_template.jinja2,sha256=f4H6vVd-_nX_RtutMh1xD3ZQE_J2OyuPHAtiltfiAPY,253
 rasa/dialogue_understanding/generator/flow_retrieval.py,sha256=wlGnMj17-X1-siQmdSvOd7K61sRzBf82MQEL2pqDQMI,17891
-rasa/dialogue_understanding/generator/llm_based_command_generator.py,sha256=SA7SG1TIgDImlOsX-9wUHQB2rOLs8zqZ7XP9Qtb7Gec,22420
+rasa/dialogue_understanding/generator/llm_based_command_generator.py,sha256=CksE7iUchYuKwCJBYhLhEaf4kMLtAOyUFBJOxYj_FFU,23237
 rasa/dialogue_understanding/generator/llm_command_generator.py,sha256=z7jhIJ3W_5GFH-p15kVoWbigMIoY8fIJjc_j_uX7yxw,2581
 rasa/dialogue_understanding/generator/multi_step/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/dialogue_understanding/generator/multi_step/fill_slots_prompt.jinja2,sha256=Y0m673tAML3cFPaLM-urMXDsBYUUcXIw9YUpkAhGUuA,2933
@@ -438,7 +438,7 @@ rasa/dialogue_understanding/patterns/skip_question.py,sha256=fJ1MC0WEEtS-BpnGJEf
 rasa/dialogue_understanding/patterns/user_silence.py,sha256=xP-QMnd-MsybH5z4g01hBv4OLOHcw6m3rc26LQfe2zo,1140
 rasa/dialogue_understanding/patterns/validate_slot.py,sha256=hqd5AEGT3M3HLNhMwuI9W9kZNCvgU6GyI-2xc2b4kz8,2085
 rasa/dialogue_understanding/processor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rasa/dialogue_understanding/processor/command_processor.py,sha256=s1zPmOfuP5bkus1spgjqN3f4HP2fXpW118zx-txlIYQ,31005
+rasa/dialogue_understanding/processor/command_processor.py,sha256=-uOr7z4EhIQl1ffD-q2xoTYA0qiFSDArdgdyo7kJHOA,31884
 rasa/dialogue_understanding/processor/command_processor_component.py,sha256=9NWJxMibKeaOBLDRT9lcylJr0ki5sQ0hJRtLlKHIlnI,1526
 rasa/dialogue_understanding/stack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/dialogue_understanding/stack/dialogue_stack.py,sha256=cYV6aQeh0EuOJHODDqK3biqXozYTX8baPgLwHhPxFqs,5244
@@ -534,6 +534,7 @@ rasa/graph_components/validators/default_recipe_validator.py,sha256=iOVoB7zVTKes
 rasa/graph_components/validators/finetuning_validator.py,sha256=VfCGytnweijKBG8bAqYp7zKZB2aRgi2ZI8R0eou5Ev4,12865
 rasa/hooks.py,sha256=5ZMrqNz323w56MMY6E8jeZ_YXgRqq8p-yi18S2XOmbo,4061
 rasa/jupyter.py,sha256=TCYVD4QPQIMmfA6ZwDUBOBTAECwCwbU2XOkosodLO9k,1782
+rasa/keys,sha256=2Stg1fstgJ203cOoW1B2gGMY29fhEnjIfTVxKv_fqPo,101
 rasa/llm_fine_tuning/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/llm_fine_tuning/annotation_module.py,sha256=6wBBjGwONVlikp79xAHp5g3rydEhPM6kP1bw1g-maYk,8578
 rasa/llm_fine_tuning/conversations.py,sha256=QZVaUsfXe5iIE830Bv-_3oo8luhGfHpirvubxzOoEvA,4116
@@ -626,7 +627,7 @@ rasa/nlu/utils/spacy_utils.py,sha256=5EnHR-MVAZhGbg2rq8VpOu7I0tagV3ThRTlM0-WO2Cg
 rasa/plugin.py,sha256=cSmFhSWr5WQyYXdJOWwgH4ra_2kbhoNLZAtnqcsGny4,3071
 rasa/server.py,sha256=eomGM_3SpBxaF_-VfZbkSO_bMk_vI1XLUZjt32f4gcI,59390
 rasa/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rasa/shared/constants.py,sha256=tguaOMTw-3w9evkNoc_aSfDvF1ac_WotHQ2t1pORwRc,11963
+rasa/shared/constants.py,sha256=RrlkeBkjZikbU0SDXAB6YnaSLbOrTB0puRBa3B5OS1g,12010
 rasa/shared/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/shared/core/command_payload_reader.py,sha256=puHYsp9xbX0YQm2L1NDBItOFmdzI7AzmfGefgcHiCc0,3871
 rasa/shared/core/constants.py,sha256=zT2zHFUqqbExPN9A0QmN3hKJic_YHoO9fBBP_np_iXs,6601
@@ -737,7 +738,7 @@ rasa/shared/providers/embedding/openai_embedding_client.py,sha256=XNRGE7apo2v3kW
 rasa/shared/providers/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/shared/providers/llm/_base_litellm_client.py,sha256=NQ_AxENfnUT_cEsshBLPh-4RtsZEVNAT2OaO8X7yQXk,11411
 rasa/shared/providers/llm/azure_openai_llm_client.py,sha256=tMHn0i7-HZb01__CuzKvzSbXAq2dE0Oov4U7qIl74no,14989
-rasa/shared/providers/llm/default_litellm_llm_client.py,sha256=e3f-YMS7-aariB5erRot7NReD-eaVPgeD45rypF-sUw,3974
+rasa/shared/providers/llm/default_litellm_llm_client.py,sha256=xx-o-NX_mtx6AszK--ZRj8n8JyEJuVu1-42dt8AynBM,4083
 rasa/shared/providers/llm/litellm_router_llm_client.py,sha256=_6vAdPLAVSI_sBJLaXLnE87M-0ip_klfQ78fQ_pyoyI,7947
 rasa/shared/providers/llm/llm_client.py,sha256=-hTCRsL-A3GCMRHtcyCgcCyra-9OJ8GUC-mURoRXH0k,3242
 rasa/shared/providers/llm/llm_response.py,sha256=8mOpZdmh4-3yM7aOmNO0yEYUmRDErfoP7ZDMUuHr2Cc,3504
@@ -821,9 +822,9 @@ rasa/utils/train_utils.py,sha256=ClJx-6x3-h3Vt6mskacgkcCUJTMXjFPe3zAcy_DfmaU,212
 rasa/utils/url_tools.py,sha256=dZ1HGkVdWTJB7zYEdwoDIrEuyX9HE5WsxKKFVsXBLE0,1218
 rasa/utils/yaml.py,sha256=KjbZq5C94ZP7Jdsw8bYYF7HASI6K4-C_kdHfrnPLpSI,2000
 rasa/validator.py,sha256=tAFzUKVbCPRPx0LjCUKY0zSCaX2hgINuaMfK123FCyc,88716
-rasa/version.py,sha256=xYQiV7i-4METOg7vg-CXdisxr-btULn10tq5mFoKb9E,117
-rasa_pro-3.12.1.dev2.dist-info/METADATA,sha256=ktHA_kAd6m1EugdZAZBGIZm7GkFtdl9ip0Up6-VhKfE,10693
-rasa_pro-3.12.1.dev2.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.12.1.dev2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rasa_pro-3.12.1.dev2.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.12.1.dev2.dist-info/RECORD,,
+rasa/version.py,sha256=xmNdUAHXciuCW_NNj2FUxUVh8kk0IW2lFAlF1P59j_4,117
+rasa_pro-3.12.2.dist-info/METADATA,sha256=WTM7ZDxzHBxholu0CZ1nC2_slKKcn4QUqH1ua7AOVMs,10688
+rasa_pro-3.12.2.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.12.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rasa_pro-3.12.2.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.12.2.dist-info/RECORD,,