rasa-pro 3.11.3a1.dev5__tar.gz → 3.11.3a1.dev6__tar.gz

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.11.3a1.dev5
+Version: 3.11.3a1.dev6
 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.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.11.3a1.dev5"
+version = "3.11.3a1.dev6"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/core/actions/action.py

@@ -17,6 +17,15 @@ from jsonschema import Draft202012Validator
 
 import rasa.core
 import rasa.shared.utils.io
+from rasa.core.actions.constants import (
+    TEXT,
+    ELEMENTS,
+    QUICK_REPLIES,
+    BUTTONS,
+    ATTACHMENT,
+    IMAGE,
+    CUSTOM,
+)
 from rasa.core.actions.custom_action_executor import (
     CustomActionExecutor,
     NoEndpointCustomActionExecutor,
@@ -256,18 +265,18 @@ def action_for_name_or_text(
 def create_bot_utterance(message: Dict[Text, Any]) -> BotUttered:
     """Create BotUttered event from message."""
     bot_message = BotUttered(
-        text=message.pop("text", None),
+        text=message.pop(TEXT, None),
         data={
-            "elements": message.pop("elements", None),
-            "quick_replies": message.pop("quick_replies", None),
-            "buttons": message.pop("buttons", None),
+            ELEMENTS: message.pop(ELEMENTS, None),
+            QUICK_REPLIES: message.pop(QUICK_REPLIES, None),
+            BUTTONS: message.pop(BUTTONS, None),
             # for legacy / compatibility reasons we need to set the image
             # to be the attachment if there is no other attachment (the
             # `.get` is intentional - no `pop` as we still need the image`
             # property to set it in the following line)
-            "attachment": message.pop("attachment", None) or message.get("image", None),
-            "image": message.pop("image", None),
-            "custom": message.pop("custom", None),
+            ATTACHMENT: message.pop(ATTACHMENT, None) or message.get(IMAGE, None),
+            IMAGE: message.pop(IMAGE, None),
+            CUSTOM: message.pop(CUSTOM, None),
             PROMPTS: message.pop(PROMPTS, None),
         },
         metadata=message,

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/core/actions/constants.py

@@ -3,3 +3,11 @@ SELECTIVE_DOMAIN = "enable_selective_domain"
 
 SSL_CLIENT_CERT_FIELD = "ssl_client_cert"
 SSL_CLIENT_KEY_FIELD = "ssl_client_key"
+
+TEXT = "text"
+ELEMENTS = "elements"
+QUICK_REPLIES = "quick_replies"
+BUTTONS = "buttons"
+ATTACHMENT = "attachment"
+IMAGE = "image"
+CUSTOM = "custom"

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/core/nlg/contextual_response_rephraser.py

@@ -6,7 +6,6 @@ from jinja2 import Template
 from rasa import telemetry
 from rasa.core.nlg.response import TemplatedNaturalLanguageGenerator
 from rasa.core.nlg.summarize import summarize_conversation
-from rasa.dialogue_understanding.utils import record_commands_and_prompts
 from rasa.shared.constants import (
     LLM_CONFIG_KEY,
     MODEL_CONFIG_KEY,
@@ -148,6 +147,8 @@ class ContextualResponseRephraser(
             user_prompt: The user prompt that was sent to the LLM.
             llm_response: The response object from the LLM (None if no response).
         """
+        from rasa.dialogue_understanding.utils import record_commands_and_prompts
+
         if not record_commands_and_prompts:
             return response
 
@@ -157,17 +158,19 @@ class ContextualResponseRephraser(
 
         if llm_response is not None:
             prompt_data[KEY_LLM_RESPONSE_METADATA] = llm_response.to_dict()
+        else:
+            prompt_data[KEY_LLM_RESPONSE_METADATA] = None
 
         prompt_tuple = (prompt_name, prompt_data)
 
         component_name = cls.__name__
-        existing_prompts = response.get(PROMPTS, {})
-        if component_name in existing_prompts:
-            existing_prompts[component_name].append(prompt_tuple)
+        component_prompts = response.get(PROMPTS, {})
+        if component_name in component_prompts:
+            component_prompts[component_name].append(prompt_tuple)
         else:
-            existing_prompts[component_name] = [prompt_tuple]
+            component_prompts[component_name] = [prompt_tuple]
 
-        response[PROMPTS] = existing_prompts
+        response[PROMPTS] = component_prompts
         return response
 
     def _last_message_if_human(self, tracker: DialogueStateTracker) -> Optional[str]:
@@ -202,10 +205,7 @@ class ContextualResponseRephraser(
         llm = llm_factory(self.llm_config, DEFAULT_LLM_CONFIG)
 
         try:
-            raw_response = await llm.acompletion(prompt)
-            response_dict = raw_response.to_dict()
-            return LLMResponse.from_dict(response_dict)
-
+            return await llm.acompletion(prompt)
         except Exception as e:
             # unfortunately, langchain does not wrap LLM exceptions which means
             # we have to catch all exceptions here
@@ -306,6 +306,7 @@ class ContextualResponseRephraser(
             llm_model_group_id=self.llm_property(MODEL_GROUP_ID_CONFIG_KEY),
         )
         llm_response = await self._generate_llm_response(prompt)
+        llm_response = LLMResponse.ensure_llm_response(llm_response)
 
         response = self._add_prompt_and_llm_metadata_to_response(
             response=response,

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/core/policies/enterprise_search_policy.py

@@ -38,7 +38,6 @@ from rasa.dialogue_understanding.stack.frames import (
     SearchStackFrame,
 )
 from rasa.dialogue_understanding.stack.frames import PatternFlowStackFrame
-from rasa.dialogue_understanding.utils import record_commands_and_prompts
 from rasa.engine.graph import ExecutionContext
 from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
@@ -281,7 +280,7 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
         return _LangchainEmbeddingClientAdapter(client)
 
     @classmethod
-    def _store_prompt_and_llm_response_in_tracker(
+    def _add_prompt_and_llm_response_to_latest_message(
         cls,
         tracker: DialogueStateTracker,
         prompt_name: str,
@@ -296,6 +295,8 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
             user_prompt: The user prompt that was sent to the LLM.
             llm_response: The response object from the LLM (None if no response).
         """
+        from rasa.dialogue_understanding.utils import record_commands_and_prompts
+
         if not record_commands_and_prompts:
             return
 
@@ -307,17 +308,20 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
             parse_data[PROMPTS] = {}  # type: ignore[literal-required]
 
         component_name = cls.__name__
-        existing_prompts = parse_data[PROMPTS].get(component_name, [])  # type: ignore[literal-required]
+        component_prompts = parse_data[PROMPTS].get(component_name, [])  # type: ignore[literal-required]
 
         prompt_data: Dict[Text, Any] = {
             KEY_USER_PROMPT: user_prompt,
         }
+
         if llm_response is not None:
             prompt_data[KEY_LLM_RESPONSE_METADATA] = llm_response.to_dict()
+        else:
+            prompt_data[KEY_LLM_RESPONSE_METADATA] = None
 
         prompt_tuple = (prompt_name, prompt_data)
-        existing_prompts.append(prompt_tuple)
-        parse_data[PROMPTS][component_name] = existing_prompts  # type: ignore[literal-required]
+        component_prompts.append(prompt_tuple)
+        parse_data[PROMPTS][component_name] = component_prompts  # type: ignore[literal-required]
 
     def train(  # type: ignore[override]
         self,
@@ -545,9 +549,10 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
 
         if self.use_llm:
             prompt = self._render_prompt(tracker, documents.results)
-            llm_response = await self._generate_llm_answer(llm, prompt)
+            response = await self._generate_llm_answer(llm, prompt)
+            llm_response = LLMResponse.ensure_llm_response(response)
 
-            self._store_prompt_and_llm_response_in_tracker(
+            self._add_prompt_and_llm_response_to_latest_message(
                 tracker=tracker,
                 prompt_name="enterprise_search_prompt",
                 user_prompt=prompt,
@@ -651,10 +656,7 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
             An LLMResponse object, or None if the call fails.
         """
         try:
-            raw_response = await llm.acompletion(prompt)
-            response_dict = raw_response.to_dict()
-            return LLMResponse.from_dict(response_dict)
-
+            return await llm.acompletion(prompt)
         except Exception as e:
             # unfortunately, langchain does not wrap LLM exceptions which means
             # we have to catch all exceptions here

rasa_pro-3.11.3a1.dev6/rasa/dialogue_understanding/constants.py

@@ -0,0 +1 @@
+RASA_RECORD_COMMANDS_AND_PROMPTS_ENV_VAR_NAME = "RASA_RECORD_COMMANDS_AND_PROMPTS"

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/dialogue_understanding/generator/command_generator.py

@@ -453,6 +453,8 @@ class CommandGenerator:
 
         if llm_response is not None:
             prompt_data[KEY_LLM_RESPONSE_METADATA] = llm_response.to_dict()
+        else:
+            prompt_data[KEY_LLM_RESPONSE_METADATA] = None
 
         prompt_tuple = (prompt_name, prompt_data)
 

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -319,9 +319,7 @@ class LLMBasedCommandGenerator(
         """
         llm = llm_factory(self.config.get(LLM_CONFIG_KEY), DEFAULT_LLM_CONFIG)
         try:
-            raw_response = await llm.acompletion(prompt)
-            response_dict = raw_response.to_dict()
-            return LLMResponse.from_dict(response_dict)
+            return await llm.acompletion(prompt)
         except Exception as e:
             # unfortunately, langchain does not wrap LLM exceptions which means
             # we have to catch all exceptions here

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py

@@ -51,6 +51,7 @@ from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.nlu.constants import TEXT
 from rasa.shared.nlu.training_data.message import Message
+from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.io import deep_container_fingerprint
 from rasa.shared.utils.llm import (
     get_prompt_template,
@@ -535,7 +536,8 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=prompt,
         )
 
-        llm_response = await self.invoke_llm(prompt)
+        response = await self.invoke_llm(prompt)
+        llm_response = LLMResponse.ensure_llm_response(response)
         actions = None
         if llm_response and llm_response.choices:
             actions = llm_response.choices[0]
@@ -589,7 +591,8 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=prompt,
         )
 
-        llm_response = await self.invoke_llm(prompt)
+        response = await self.invoke_llm(prompt)
+        llm_response = LLMResponse.ensure_llm_response(response)
         actions = None
         if llm_response and llm_response.choices:
             actions = llm_response.choices[0]
@@ -678,7 +681,8 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=prompt,
         )
 
-        llm_response = await self.invoke_llm(prompt)
+        response = await self.invoke_llm(prompt)
+        llm_response = LLMResponse.ensure_llm_response(response)
         actions = None
         if llm_response and llm_response.choices:
             actions = llm_response.choices[0]

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py

@@ -46,6 +46,7 @@ from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.nlu.constants import TEXT, LLM_COMMANDS, LLM_PROMPT
 from rasa.shared.nlu.training_data.message import Message
+from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.io import deep_container_fingerprint
 from rasa.shared.utils.llm import (
     get_prompt_template,
@@ -264,7 +265,8 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=flow_prompt,
         )
 
-        llm_response = await self.invoke_llm(flow_prompt)
+        response = await self.invoke_llm(flow_prompt)
+        llm_response = LLMResponse.ensure_llm_response(response)
         # The check for 'None' maintains compatibility with older versions
         # of LLMCommandGenerator. In previous implementations, 'invoke_llm'
         # might return 'None' to indicate a failure to generate actions.

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/dialogue_understanding/utils.py

@@ -1,7 +1,14 @@
 from contextlib import contextmanager
 from typing import Generator
 
-record_commands_and_prompts = False
+from rasa.dialogue_understanding.constants import (
+    RASA_RECORD_COMMANDS_AND_PROMPTS_ENV_VAR_NAME,
+)
+from rasa.utils.common import get_bool_env_variable
+
+record_commands_and_prompts = get_bool_env_variable(
+    RASA_RECORD_COMMANDS_AND_PROMPTS_ENV_VAR_NAME, False
+)
 
 
 @contextmanager

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/model_manager/warm_rasa_process.py

@@ -1,12 +1,16 @@
+import os
 import shlex
 import subprocess
-from rasa.__main__ import main
-import os
+import uuid
+from dataclasses import dataclass
 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
 
@@ -43,6 +47,7 @@ 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_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/shared/providers/llm/llm_response.py

@@ -1,5 +1,8 @@
 from dataclasses import dataclass, field, asdict
-from typing import Dict, List, Optional, Text, Any
+from typing import Dict, List, Optional, Text, Any, Union
+import structlog
+
+structlogger = structlog.get_logger()
 
 
 @dataclass
@@ -59,7 +62,7 @@ class LLMResponse:
         """
         Creates an LLMResponse from a dictionary.
         """
-        usage_data = data.get("usage")
+        usage_data = data.get("usage", {})
         usage_obj = LLMUsage.from_dict(usage_data) if usage_data else None
 
         return cls(
@@ -71,6 +74,15 @@ class LLMResponse:
             additional_info=data.get("additional_info"),
         )
 
+    @classmethod
+    def ensure_llm_response(cls, response: Union[str, "LLMResponse"]) -> "LLMResponse":
+        if isinstance(response, LLMResponse):
+            return response
+
+        structlogger.warn("llm_response.deprecated_response_type", response=response)
+        data = {"id": None, "choices": [response], "created": None}
+        return LLMResponse.from_dict(data)
+
     def to_dict(self) -> dict:
         """Converts the LLMResponse dataclass instance into a dictionary."""
         result = asdict(self)

{rasa_pro-3.11.3a1.dev5 → rasa_pro-3.11.3a1.dev6}/rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.11.3a1.dev5"
+__version__ = "3.11.3a1.dev6"