rasa-pro 3.11.3a1.dev2__py3-none-any.whl → 3.11.3a1.dev4__py3-none-any.whl

rasa/core/actions/action.py

@@ -93,7 +93,6 @@ from rasa.shared.nlu.constants import (
     INTENT_NAME_KEY,
     INTENT_RANKING_KEY,
 )
-from rasa.shared.nlu.constants import PROMPTS
 from rasa.shared.utils.io import raise_warning
 from rasa.shared.utils.schemas.events import EVENTS_SCHEMA
 from rasa.utils.endpoints import ClientResponseError, EndpointConfig
@@ -268,7 +267,6 @@ def create_bot_utterance(message: Dict[Text, Any]) -> BotUttered:
             "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/core/channels/socketio.py

@@ -1,3 +1,4 @@
+import asyncio
 import inspect
 import logging
 import uuid
@@ -6,6 +7,7 @@ from typing import Any, Awaitable, Callable, Dict, Iterable, List, Optional, Tex
 
 import rasa.core.channels.channel
 from rasa.core.channels.channel import InputChannel, OutputChannel, UserMessage
+from rasa.shared.core.trackers import EventVerbosity
 import rasa.shared.utils.io
 from sanic import Blueprint, response, Sanic
 from sanic.request import Request
@@ -188,6 +190,8 @@ class SocketIOInput(InputChannel):
         metadata_key: Optional[Text] = "metadata",
     ):
         """Creates a ``SocketIOInput`` object."""
+        from rasa.core.agent import Agent
+
         self.bot_message_evt = bot_message_evt
         self.session_persistence = session_persistence
         self.user_message_evt = user_message_evt
@@ -199,6 +203,8 @@ class SocketIOInput(InputChannel):
         self.jwt_key = jwt_key
         self.jwt_algorithm = jwt_method
 
+        self.agent: Optional[Agent] = None
+
     def get_output_channel(self) -> Optional["OutputChannel"]:
         """Creates socket.io output channel object."""
         if self.sio is None:
@@ -212,7 +218,7 @@ class SocketIOInput(InputChannel):
             return None
         return SocketIOOutput(self.sio, self.bot_message_evt)
 
-    async def on_new_tracker_dump(self, sender_id: str, tracker_dump: str) -> None:
+    async def on_new_tracker_dump(self, sender_id: str, tracker_dump: str):
         if self.sio:
             await self.sio.emit("tracker", tracker_dump, room=sender_id)
 
@@ -227,6 +233,11 @@ class SocketIOInput(InputChannel):
             sio, self.socketio_path, "socketio_webhook", __name__
         )
 
+        @socketio_webhook.listener("after_server_start")  # type: ignore[misc]
+        async def after_server_start(app: Sanic, _: asyncio.AbstractEventLoop) -> None:
+            """Prints a message after the server has started with inspect URL."""
+            self.agent = app.ctx.agent
+
         # make sio object static to use in get_output_channel
         self.sio = sio
 
@@ -272,6 +283,30 @@ class SocketIOInput(InputChannel):
             await sio.emit("session_confirm", data["session_id"], room=sid)
             logger.debug(f"User {sid} connected to socketIO endpoint.")
 
+        @sio.on("tracker", namespace=self.namespace)
+        async def handle_tracker(sid: Text, data: Dict) -> None:
+            from rasa.shared.core.trackers import DialogueStateTracker
+
+            if self.agent is None:
+                raise ValueError("Agent is not initialized")
+
+            async with self.agent.lock_store.lock(data["sender_id"]):
+                tracker = DialogueStateTracker.from_dict(
+                    data["sender_id"], data["events"], self.agent.domain.slots
+                )
+
+                # will override an existing tracker with the same id!
+                await self.agent.tracker_store.save(tracker)
+
+            # TODO: rather figure out how to trigger the on_tracker_updated
+            #   of the development inspector channel
+            state = tracker.current_state(EventVerbosity.AFTER_RESTART)
+            await sio.emit(
+                "tracker",
+                json.dumps(state),
+                room=sid,
+            )
+
         @sio.on(self.user_message_evt, namespace=self.namespace)
         async def handle_message(sid: Text, data: Dict) -> None:
             output_channel = SocketIOOutput(sio, self.bot_message_evt)

rasa/core/nlg/contextual_response_rephraser.py

@@ -2,11 +2,9 @@ from typing import Any, Dict, Optional, Text
 
 import structlog
 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,
@@ -20,12 +18,6 @@ from rasa.shared.constants import (
 from rasa.shared.core.domain import KEY_RESPONSES_TEXT, Domain
 from rasa.shared.core.events import BotUttered, UserUttered
 from rasa.shared.core.trackers import DialogueStateTracker
-from rasa.shared.nlu.constants import (
-    PROMPTS,
-    KEY_USER_PROMPT,
-    KEY_LLM_RESPONSE_METADATA,
-)
-from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.health_check.llm_health_check_mixin import LLMHealthCheckMixin
 from rasa.shared.utils.llm import (
     DEFAULT_OPENAI_GENERATE_MODEL_NAME,
@@ -132,44 +124,6 @@ class ContextualResponseRephraser(
             ContextualResponseRephraser.__name__,
         )
 
-    @classmethod
-    def _add_prompt_and_llm_metadata_to_response(
-        cls,
-        response: Dict[str, Any],
-        prompt_name: str,
-        user_prompt: str,
-        llm_response: Optional["LLMResponse"] = None,
-    ) -> Dict[str, Any]:
-        """Stores the prompt and LLMResponse metadata to response.
-
-        Args:
-            response: The response to add the prompt and LLMResponse metadata to.
-            prompt_name: A name identifying prompt usage.
-            user_prompt: The user prompt that was sent to the LLM.
-            llm_response: The response object from the LLM (None if no response).
-        """
-        if not record_commands_and_prompts:
-            return response
-
-        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()
-
-        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)
-        else:
-            existing_prompts[component_name] = [prompt_tuple]
-
-        response[PROMPTS] = existing_prompts
-        return response
-
     def _last_message_if_human(self, tracker: DialogueStateTracker) -> Optional[str]:
         """Returns the latest message from the tracker.
 
@@ -188,24 +142,20 @@ class ContextualResponseRephraser(
                 return None
         return None
 
-    async def _generate_llm_response(self, prompt: str) -> Optional[LLMResponse]:
-        """
-        Use LLM to generate a response, returning an LLMResponse object
-        containing both the generated text (choices) and metadata.
+    async def _generate_llm_response(self, prompt: str) -> Optional[str]:
+        """Use LLM to generate a response.
 
         Args:
-            prompt: The prompt to send to the LLM.
+            prompt: the prompt to send to the LLM
 
         Returns:
-            An LLMResponse object if successful, otherwise None.
+            generated text
         """
         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)
-
+            llm_response = await llm.acompletion(prompt)
+            return llm_response.choices[0]
         except Exception as e:
             # unfortunately, langchain does not wrap LLM exceptions which means
             # we have to catch all exceptions here
@@ -305,20 +255,11 @@ class ContextualResponseRephraser(
             or self.llm_property(MODEL_NAME_CONFIG_KEY),
             llm_model_group_id=self.llm_property(MODEL_GROUP_ID_CONFIG_KEY),
         )
-        llm_response = await self._generate_llm_response(prompt)
-
-        response = self._add_prompt_and_llm_metadata_to_response(
-            response=response,
-            prompt_name="rephrase_prompt",
-            user_prompt=prompt,
-            llm_response=llm_response,
-        )
-
-        if llm_response is None or not llm_response.choices:
-            # If the LLM fails to generate a response, return the original response.
+        if not (updated_text := await self._generate_llm_response(prompt)):
+            # If the LLM fails to generate a response, we
+            # return the original response.
             return response
 
-        updated_text = llm_response.choices[0]
         structlogger.debug(
             "nlg.rewrite.complete",
             response_text=response_text,

rasa/core/policies/enterprise_search_policy.py

@@ -2,7 +2,6 @@ import importlib.resources
 import json
 import re
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Text
-
 import dotenv
 import structlog
 from jinja2 import Template
@@ -38,7 +37,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
@@ -65,17 +63,11 @@ from rasa.shared.core.events import Event, UserUttered, BotUttered
 from rasa.shared.core.generator import TrackerWithCachedStates
 from rasa.shared.core.trackers import DialogueStateTracker, EventVerbosity
 from rasa.shared.exceptions import RasaException, FileIOException
-from rasa.shared.nlu.constants import (
-    PROMPTS,
-    KEY_USER_PROMPT,
-    KEY_LLM_RESPONSE_METADATA,
-)
 from rasa.shared.nlu.training_data.training_data import TrainingData
 from rasa.shared.providers.embedding._langchain_embedding_client_adapter import (
     _LangchainEmbeddingClientAdapter,
 )
 from rasa.shared.providers.llm.llm_client import LLMClient
-from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.cli import print_error_and_exit
 from rasa.shared.utils.health_check.embeddings_health_check_mixin import (
     EmbeddingsHealthCheckMixin,
@@ -280,45 +272,6 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
         # Wrap the embedding client in the adapter
         return _LangchainEmbeddingClientAdapter(client)
 
-    @classmethod
-    def _store_prompt_and_llm_response_in_tracker(
-        cls,
-        tracker: DialogueStateTracker,
-        prompt_name: str,
-        user_prompt: str,
-        llm_response: Optional[LLMResponse] = None,
-    ) -> None:
-        """Stores the prompt and LLMResponse metadata in the tracker.
-
-        Args:
-            tracker: The DialogueStateTracker containing the current conversation state.
-            prompt_name: A name identifying prompt usage.
-            user_prompt: The user prompt that was sent to the LLM.
-            llm_response: The response object from the LLM (None if no response).
-        """
-        if not record_commands_and_prompts:
-            return
-
-        if not tracker.latest_message:
-            return
-
-        parse_data = tracker.latest_message.parse_data
-        if parse_data is not None and PROMPTS not in parse_data:
-            parse_data[PROMPTS] = {}  # type: ignore[literal-required]
-
-        component_name = cls.__name__
-        existing_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()
-
-        prompt_tuple = (prompt_name, prompt_data)
-        existing_prompts.append(prompt_tuple)
-        parse_data[PROMPTS][component_name] = existing_prompts  # type: ignore[literal-required]
-
     def train(  # type: ignore[override]
         self,
         training_trackers: List[TrackerWithCachedStates],
@@ -545,26 +498,13 @@ 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)
-
-            self._store_prompt_and_llm_response_in_tracker(
-                tracker=tracker,
-                prompt_name="enterprise_search_prompt",
-                user_prompt=prompt,
-                llm_response=llm_response,
-            )
+            llm_answer = await self._generate_llm_answer(llm, prompt)
 
-            if llm_response is None or not llm_response.choices:
-                logger.debug(f"{logger_key}.no_llm_response")
-                response = None
-            else:
-                llm_answer = llm_response.choices[0]
+            if self.citation_enabled:
+                llm_answer = self.post_process_citations(llm_answer)
 
-                if self.citation_enabled:
-                    llm_answer = self.post_process_citations(llm_answer)
-
-                logger.debug(f"{logger_key}.llm_answer", llm_answer=llm_answer)
-                response = llm_answer
+            logger.debug(f"{logger_key}.llm_answer", llm_answer=llm_answer)
+            response = llm_answer
         else:
             response = documents.results[0].metadata.get("answer", None)
             if not response:
@@ -576,6 +516,7 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
                 "enterprise_search_policy.predict_action_probabilities.no_llm",
                 search_results=documents,
             )
+
         if response is None:
             return self._create_prediction_internal_error(domain, tracker)
 
@@ -640,21 +581,10 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
 
     async def _generate_llm_answer(
         self, llm: LLMClient, prompt: Text
-    ) -> Optional[LLMResponse]:
-        """Fetches an LLM completion for the provided prompt.
-
-        Args:
-            llm: The LLM client used to get the completion.
-            prompt: The prompt text to send to the model.
-
-        Returns:
-            An LLMResponse object, or None if the call fails.
-        """
+    ) -> Optional[Text]:
         try:
-            raw_response = await llm.acompletion(prompt)
-            response_dict = raw_response.to_dict()
-            return LLMResponse.from_dict(response_dict)
-
+            llm_response = await llm.acompletion(prompt)
+            llm_answer = llm_response.choices[0]
         except Exception as e:
             # unfortunately, langchain does not wrap LLM exceptions which means
             # we have to catch all exceptions here
@@ -662,7 +592,9 @@ class EnterpriseSearchPolicy(LLMHealthCheckMixin, EmbeddingsHealthCheckMixin, Po
                 "enterprise_search_policy._generate_llm_answer.llm_error",
                 error=e,
             )
-            return None
+            llm_answer = None
+
+        return llm_answer
 
     def _create_prediction(
         self,

rasa/dialogue_understanding/generator/command_generator.py

@@ -26,10 +26,8 @@ from rasa.shared.nlu.constants import (
     PROMPTS,
     KEY_USER_PROMPT,
     KEY_SYSTEM_PROMPT,
-    KEY_LLM_RESPONSE_METADATA,
 )
 from rasa.shared.nlu.training_data.message import Message
-from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.llm import DEFAULT_MAX_USER_INPUT_CHARACTERS
 
 structlogger = structlog.get_logger()
@@ -401,7 +399,6 @@ class CommandGenerator:
         prompt_name: str,
         user_prompt: str,
         system_prompt: Optional[str] = None,
-        llm_response: Optional[LLMResponse] = None,
     ) -> None:
         """Add prompt to the message parse data.
 
@@ -414,16 +411,14 @@ class CommandGenerator:
                         "fill_slots_prompt",
                         {
                             "user_prompt": <prompt content>",
-                            "system_prompt": <prompt content>",
-                            "llm_response_metadata": <metadata dict from LLMResponse>
+                            "system_prompt": <prompt content>"
                         }
                     ),
                     (
                         "handle_flows_prompt",
                         {
                             "user_prompt": <prompt content>",
-                            "system_prompt": <prompt content>",
-                            "llm_response_metadata": <metadata dict from LLMResponse>
+                            "system_prompt": <prompt content>"
                         }
                     ),
                 ],
@@ -432,8 +427,7 @@ class CommandGenerator:
                         "prompt_template",
                         {
                             "user_prompt": <prompt content>",
-                            "system_prompt": <prompt content>",
-                            "llm_response_metadata": <metadata dict from LLMResponse>
+                            "system_prompt": <prompt content>"
                         }
                     ),
                 ]
@@ -446,15 +440,13 @@ class CommandGenerator:
         if not record_commands_and_prompts:
             return
 
-        prompt_data: Dict[Text, Any] = {
-            KEY_USER_PROMPT: user_prompt,
-            **({KEY_SYSTEM_PROMPT: system_prompt} if system_prompt else {}),
-        }
-
-        if llm_response is not None:
-            prompt_data[KEY_LLM_RESPONSE_METADATA] = llm_response.to_dict()
-
-        prompt_tuple = (prompt_name, prompt_data)
+        prompt_tuple = (
+            prompt_name,
+            {
+                KEY_USER_PROMPT: user_prompt,
+                **({KEY_SYSTEM_PROMPT: system_prompt} if system_prompt else {}),
+            },
+        )
 
         if message.get(PROMPTS) is not None:
             prompts = message.get(PROMPTS)

rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -32,7 +32,6 @@ from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.nlu.constants import FLOWS_IN_PROMPT
 from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.nlu.training_data.training_data import TrainingData
-from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.health_check.llm_health_check_mixin import LLMHealthCheckMixin
 from rasa.shared.utils.llm import (
     allowed_values_for_slot,
@@ -305,23 +304,22 @@ class LLMBasedCommandGenerator(
         )
         return filtered_flows
 
-    async def invoke_llm(self, prompt: Text) -> Optional[LLMResponse]:
+    async def invoke_llm(self, prompt: Text) -> Optional[Text]:
         """Use LLM to generate a response.
 
         Args:
             prompt: The prompt to send to the LLM.
 
         Returns:
-            An LLMResponse object.
+            The generated text.
 
         Raises:
-            ProviderClientAPIException: If an error occurs during the LLM API call.
+            ProviderClientAPIException if an error during API call.
         """
         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)
+            llm_response = await llm.acompletion(prompt)
+            return llm_response.choices[0]
         except Exception as e:
             # unfortunately, langchain does not wrap LLM exceptions which means
             # we have to catch all exceptions here

rasa/dialogue_understanding/generator/llm_command_generator.py

@@ -10,7 +10,6 @@ from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.exceptions import ProviderClientAPIException
-from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.shared.utils.io import raise_deprecation_warning
 
 structlogger = structlog.get_logger()
@@ -54,7 +53,7 @@ class LLMCommandGenerator(SingleStepLLMCommandGenerator):
             **kwargs,
         )
 
-    async def invoke_llm(self, prompt: Text) -> Optional[LLMResponse]:
+    async def invoke_llm(self, prompt: Text) -> Optional[Text]:
         try:
             return await super().invoke_llm(prompt)
         except ProviderClientAPIException:

rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py

@@ -535,11 +535,7 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=prompt,
         )
 
-        llm_response = await self.invoke_llm(prompt)
-        actions = None
-        if llm_response and llm_response.choices:
-            actions = llm_response.choices[0]
-
+        actions = await self.invoke_llm(prompt)
         structlogger.debug(
             "multi_step_llm_command_generator"
             ".predict_commands_for_active_flow"
@@ -551,11 +547,10 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
 
         if commands:
             self._add_prompt_to_message_parse_data(
-                message=message,
-                component_name=MultiStepLLMCommandGenerator.__name__,
-                prompt_name="fill_slots_for_active_flow_prompt",
-                user_prompt=prompt,
-                llm_response=llm_response,
+                message,
+                MultiStepLLMCommandGenerator.__name__,
+                "fill_slots_for_active_flow_prompt",
+                prompt,
             )
 
         return commands
@@ -589,11 +584,7 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=prompt,
         )
 
-        llm_response = await self.invoke_llm(prompt)
-        actions = None
-        if llm_response and llm_response.choices:
-            actions = llm_response.choices[0]
-
+        actions = await self.invoke_llm(prompt)
         structlogger.debug(
             "multi_step_llm_command_generator"
             ".predict_commands_for_handling_flows"
@@ -607,11 +598,10 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
 
         if commands:
             self._add_prompt_to_message_parse_data(
-                message=message,
-                component_name=MultiStepLLMCommandGenerator.__name__,
-                prompt_name="handle_flows_prompt",
-                user_prompt=prompt,
-                llm_response=llm_response,
+                message,
+                MultiStepLLMCommandGenerator.__name__,
+                "handle_flows_prompt",
+                prompt,
             )
 
         return commands
@@ -678,11 +668,7 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=prompt,
         )
 
-        llm_response = await self.invoke_llm(prompt)
-        actions = None
-        if llm_response and llm_response.choices:
-            actions = llm_response.choices[0]
-
+        actions = await self.invoke_llm(prompt)
         structlogger.debug(
             "multi_step_llm_command_generator"
             ".predict_commands_for_newly_started_flow"
@@ -709,11 +695,10 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
 
         if commands:
             self._add_prompt_to_message_parse_data(
-                message=message,
-                component_name=MultiStepLLMCommandGenerator.__name__,
-                prompt_name="fill_slots_for_new_flow_prompt",
-                user_prompt=prompt,
-                llm_response=llm_response,
+                message,
+                MultiStepLLMCommandGenerator.__name__,
+                "fill_slots_for_new_flow_prompt",
+                prompt,
             )
 
         return commands

rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py

@@ -264,15 +264,13 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=flow_prompt,
         )
 
-        llm_response = await self.invoke_llm(flow_prompt)
+        action_list = await self.invoke_llm(flow_prompt)
         # 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.
-        if llm_response is None or not llm_response.choices:
+        if action_list is None:
             return [ErrorCommand()]
 
-        action_list = llm_response.choices[0]
-
         log_llm(
             logger=structlogger,
             log_module="SingleStepLLMCommandGenerator",
@@ -287,11 +285,10 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
             message, SingleStepLLMCommandGenerator.__name__, commands
         )
         self._add_prompt_to_message_parse_data(
-            message=message,
-            component_name=SingleStepLLMCommandGenerator.__name__,
-            prompt_name="command_generator_prompt",
-            user_prompt=flow_prompt,
-            llm_response=llm_response,
+            message,
+            SingleStepLLMCommandGenerator.__name__,
+            "command_generator_prompt",
+            flow_prompt,
         )
 
         return commands

rasa/shared/core/events.py

@@ -2,10 +2,14 @@ import abc
 import copy
 import json
 import logging
+import structlog
 import re
+from abc import ABC
+
+import jsonpickle
 import time
 import uuid
-from abc import ABC
+from dateutil import parser
 from datetime import datetime
 from typing import (
     List,
@@ -20,14 +24,11 @@ from typing import (
     Tuple,
     TypeVar,
 )
-from typing import Union
-
-import jsonpickle
-import structlog
-from dateutil import parser
 
 import rasa.shared.utils.common
 import rasa.shared.utils.io
+from typing import Union
+
 from rasa.shared.constants import DOCS_URL_TRAINING_DATA
 from rasa.shared.core.constants import (
     LOOP_NAME,
@@ -61,7 +62,7 @@ from rasa.shared.nlu.constants import (
     ENTITY_ATTRIBUTE_END,
     FULL_RETRIEVAL_INTENT_NAME_KEY,
 )
-from rasa.shared.nlu.constants import PROMPTS
+
 
 if TYPE_CHECKING:
     from typing_extensions import TypedDict
@@ -97,7 +98,6 @@ if TYPE_CHECKING:
             ENTITIES: List[EntityPrediction],
             "message_id": Optional[Text],
             "metadata": Dict,
-            PROMPTS: Dict,
         },
         total=False,
     )

rasa/shared/nlu/constants.py

@@ -6,7 +6,6 @@ PREDICTED_COMMANDS = "predicted_commands"
 PROMPTS = "prompts"
 KEY_USER_PROMPT = "user_prompt"
 KEY_SYSTEM_PROMPT = "system_prompt"
-KEY_LLM_RESPONSE_METADATA = "llm_response_metadata"
 LLM_COMMANDS = "llm_commands"  # needed for fine-tuning
 LLM_PROMPT = "llm_prompt"  # needed for fine-tuning
 FLOWS_FROM_SEMANTIC_SEARCH = "flows_from_semantic_search"

rasa/shared/providers/llm/llm_response.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field, asdict
-from typing import Dict, List, Optional, Text, Any
+from typing import Dict, List, Optional
 
 
 @dataclass
@@ -16,18 +16,6 @@ class LLMUsage:
     def __post_init__(self) -> None:
         self.total_tokens = self.prompt_tokens + self.completion_tokens
 
-    @classmethod
-    def from_dict(cls, data: Dict[Text, Any]) -> "LLMUsage":
-        """
-        Creates an LLMUsage object from a dictionary.
-        If any keys are missing, they will default to zero
-        or whatever default you prefer.
-        """
-        return cls(
-            prompt_tokens=data.get("prompt_tokens"),
-            completion_tokens=data.get("completion_tokens"),
-        )
-
     def to_dict(self) -> dict:
         """Converts the LLMUsage dataclass instance into a dictionary."""
         return asdict(self)
@@ -54,23 +42,6 @@ class LLMResponse:
     """Optional dictionary for storing additional information related to the
     completion that may not be covered by other fields."""
 
-    @classmethod
-    def from_dict(cls, data: Dict[Text, Any]) -> "LLMResponse":
-        """
-        Creates an LLMResponse from a dictionary.
-        """
-        usage_data = data.get("usage")
-        usage_obj = LLMUsage.from_dict(usage_data) if usage_data else None
-
-        return cls(
-            id=data["id"],
-            choices=data["choices"],
-            created=data["created"],
-            model=data.get("model"),
-            usage=usage_obj,
-            additional_info=data.get("additional_info"),
-        )
-
     def to_dict(self) -> dict:
         """Converts the LLMResponse dataclass instance into a dictionary."""
         result = asdict(self)

rasa/shared/utils/schemas/events.py

@@ -161,7 +161,7 @@ FLOW_CANCELLED = {
     }
 }
 DIALOGUE_STACK_UPDATED = {
-    "properties": {"event": {"const": "stack"}, "update": {"type": "string"}}
+    "properties": {"event": {"const": "stack"}, "update": {"type": "array"}}
 }
 ROUTING_SESSION_ENDED = {"properties": {"event": {"const": "routing_session_ended"}}}
 

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.dev2"
+__version__ = "3.11.3a1.dev4"

{rasa_pro-3.11.3a1.dev2.dist-info → rasa_pro-3.11.3a1.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.11.3a1.dev2
+Version: 3.11.3a1.dev4
 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.dev2.dist-info → rasa_pro-3.11.3a1.dev4.dist-info}/RECORD

@@ -92,7 +92,7 @@ rasa/cli/x.py,sha256=C7dLtYXAkD-uj7hNj7Pz5YbOupp2yRcMjQbsEVqXUJ8,6825
 rasa/constants.py,sha256=YrrBiJUc0cL5Xrsap6IioNbQ6dKaqDiueqHmMIYkpF0,1348
 rasa/core/__init__.py,sha256=DYHLve7F1yQBVOZTA63efVIwLiULMuihOfdpzw1j0os,457
 rasa/core/actions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rasa/core/actions/action.py,sha256=H4Mr5WvXHwgZ5ws7ZyAlQ_ESx5ryZvv7cAgNjtyYCn8,45381
+rasa/core/actions/action.py,sha256=3tXb_DAKEzguq5zDuV1j04Fd5uYvwQckc4GR_EoDVYE,45286
 rasa/core/actions/action_clean_stack.py,sha256=xUP-2ipPsPAnAiwP17c-ezmHPSrV4JSUZr-eSgPQwIs,2279
 rasa/core/actions/action_exceptions.py,sha256=hghzXYN6VeHC-O_O7WiPesCNV86ZTkHgG90ZnQcbai8,724
 rasa/core/actions/action_hangup.py,sha256=wpXunkGC71krAYZD3BbqzlHLZxNg1mIviwWz0j9Go-c,994
@@ -254,7 +254,7 @@ rasa/core/channels/rasa_chat.py,sha256=XGZ7QLyQHhB-m7EjetDNEBSjAa2mEFqU-e-FuS9z3
 rasa/core/channels/rest.py,sha256=YDBnbdrlvaYL7Efy3cm2LbbSm7cBAFDhmcypojHXbog,7227
 rasa/core/channels/rocketchat.py,sha256=HWOMxXLuwadYEYIMMP-z6RqAJzMGZDLklpgqLOipXF0,5998
 rasa/core/channels/slack.py,sha256=3b8OZQ_gih5XBwhQ1q4BbBUC1SCAPaO9AoJEn2NaoQE,24405
-rasa/core/channels/socketio.py,sha256=OW3TLcilMccP8W3t4UjXgdgLQhU8jBSLVu6ge2TbBpk,11921
+rasa/core/channels/socketio.py,sha256=g8IfIFjcAVC1MZve2N8IKXVPpEQzpFaCQ4q3pECS0j4,13334
 rasa/core/channels/telegram.py,sha256=5BrNECFM3qe9XjNpDb8Q9fbqCT5aKr5L6IH21W8sum8,10651
 rasa/core/channels/twilio.py,sha256=GsdjfplZdBj0fRB60bSggPF1DXFZ_x18V_dlcDy5VFs,5943
 rasa/core/channels/vier_cvg.py,sha256=PfvSluQqgJbP0JzZPFUvum3z7H55JPPeobcD-z5zCkw,13544
@@ -307,7 +307,7 @@ rasa/core/lock_store.py,sha256=fgdufUYXHEiTcD7NCCqgDAQRRtt7jrKafENHqFKOyi0,12504
 rasa/core/migrate.py,sha256=XNeYdiRytBmBNubOQ8KZOT_wR1o9aOpHHfBU9PCB2eg,14626
 rasa/core/nlg/__init__.py,sha256=0eQOZ0fB35b18oVhRFczcH30jJHgO8WXFhnbXGOxJek,240
 rasa/core/nlg/callback.py,sha256=rFkDe7CSAETASRefpERUT6-DHWPs0UXhx8x4tZ1QE0M,5238
-rasa/core/nlg/contextual_response_rephraser.py,sha256=YGBmSyXnaZMXC6AHQNuDEnP19Ak_rP6FzZHTTCdTk9E,13134
+rasa/core/nlg/contextual_response_rephraser.py,sha256=RqYig6NFnaXcW5vkAUSb54XWoBkeVWm2WYDCsafthBY,11055
 rasa/core/nlg/generator.py,sha256=YZ_rh--MeyzA6oXRqr_Ng-jcmPgbCmWMJJrquPmo__8,8436
 rasa/core/nlg/interpolator.py,sha256=Dc-J2Vf6vPPUbwIgZQm3AJDGvMaFTsh9Citd4CYuA9U,5189
 rasa/core/nlg/response.py,sha256=aHpy9BgjO7ub6v-sVPiQqutUA_7-UD1l3DJGVeQyp4k,5888
@@ -315,7 +315,7 @@ rasa/core/nlg/summarize.py,sha256=JO6VCfM_RnU0QX8Us42YkNOxC0ESKV1xcVH_sCW27ZU,21
 rasa/core/persistor.py,sha256=0BZvrA1xObxVtADWLVapj4NOmvqIEen1LKoMOdtZ63s,20337
 rasa/core/policies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/core/policies/ensemble.py,sha256=AjNOEy2Iubbe-LdKaoFUXG8ch6yPrg3bTvcTcAPmeOs,12959
-rasa/core/policies/enterprise_search_policy.py,sha256=-gcmJ8rS0tFMHXs_w_RTlVhhXHss_VqyS44OfkcWhEw,36674
+rasa/core/policies/enterprise_search_policy.py,sha256=nG1vgZO5woxvXCZWayYXQzZkmxPemfsL0c62QkZcgcI,34126
 rasa/core/policies/enterprise_search_prompt_template.jinja2,sha256=dCS_seyBGxMQoMsOjjvPp0dd31OSzZCJSZeev1FJK5Q,1187
 rasa/core/policies/enterprise_search_prompt_with_citation_template.jinja2,sha256=vRQBs3q13UmvRRgqA8-DmRtM7tqZP2ngwMVJ4gy7lE0,3302
 rasa/core/policies/flow_policy.py,sha256=wGb1l_59cGM9ZaexSIK5uXFi618739oNfLOxx2FC0_Y,7490
@@ -379,20 +379,20 @@ rasa/dialogue_understanding/commands/start_flow_command.py,sha256=a0Yk8xpBpFgC3H
 rasa/dialogue_understanding/commands/user_silence_command.py,sha256=QtqsMU5mrbUp5dla2yGSpxXfIfi_h6Eu72mTDZQ_aTU,1724
 rasa/dialogue_understanding/commands/utils.py,sha256=OiyLFGEsrfFSIJcvBY6lTIIXqDY9OxaikVGtcl4Kokk,1911
 rasa/dialogue_understanding/generator/__init__.py,sha256=Ykeb2wQ1DuiUWAWO0hLIPSTK1_Ktiq9DZXF6D3ugN78,764
-rasa/dialogue_understanding/generator/command_generator.py,sha256=RCrfvsvIGl9TlhJtiicHoondNb5DAjNvlo3zv0qZ_1w,16500
+rasa/dialogue_understanding/generator/command_generator.py,sha256=Egdy-g46BGBw-iP-dKBM3sca-X-2SyBQL5NPyKTiHWw,15974
 rasa/dialogue_understanding/generator/constants.py,sha256=9Nwjo2Qobioetr9SyyQxsGvEPSbKCVS5ZX1GGJtbA0E,716
 rasa/dialogue_understanding/generator/flow_document_template.jinja2,sha256=f4H6vVd-_nX_RtutMh1xD3ZQE_J2OyuPHAtiltfiAPY,253
 rasa/dialogue_understanding/generator/flow_retrieval.py,sha256=MkwUgQA9xRlAQUdWF2cBEX2tW2PQhBsq2Jsy2vmqWY4,17891
-rasa/dialogue_understanding/generator/llm_based_command_generator.py,sha256=O9sIoDTup2g7l1Uqy6LqMBi-hwZ3OpJk90ZwzhltMtc,17707
-rasa/dialogue_understanding/generator/llm_command_generator.py,sha256=QpNXhjB9ugtPV8XAHmKjbJtOiI1yE9rC2osbsI_A4ZY,2529
+rasa/dialogue_understanding/generator/llm_based_command_generator.py,sha256=hzHUUMPmIZaLZkFRBgVK42l2nTUn04H4W8GpBBF1XIs,17554
+rasa/dialogue_understanding/generator/llm_command_generator.py,sha256=yQ8aAMsTKGSARroJq0TfKVLe3ShYl8K8oklDk_KGies,2459
 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
 rasa/dialogue_understanding/generator/multi_step/handle_flows_prompt.jinja2,sha256=8l93_QBKBYnqLICVdiTu5ejZDE8F36BU8-qwba0px44,1927
-rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py,sha256=E80aJUrvDgsWcAF3IphpYVT2x0-DcsI-ISwOY38vOlg,34172
+rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py,sha256=zw1N0UyEOzYfgm3sFP8ptZ92fSLszwiACM4Vqwt8lIo,33527
 rasa/dialogue_understanding/generator/nlu_command_adapter.py,sha256=pzd1q-syU_QuqTRcfd_GsXyOJaxfApqh_LsOKuEN46g,9332
 rasa/dialogue_understanding/generator/single_step/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/dialogue_understanding/generator/single_step/command_prompt_template.jinja2,sha256=nMayu-heJYH1QmcL1cFmXb8SeiJzfdDR_9Oy5IRUXsM,3937
-rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py,sha256=a72P3SzuSaF0Mmm4b3k4jT4zOGE_RFXBDRlHOI7Px0g,18656
+rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py,sha256=hhFnxzc8lji7UZsFaVK-GTkyJ-34jaN-IhWcebDJhBI,18493
 rasa/dialogue_understanding/patterns/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/dialogue_understanding/patterns/cancel.py,sha256=IQ4GVHNnNCqwKRLlAqBtLsgolcbPPnHsHdb3aOAFhEs,3868
 rasa/dialogue_understanding/patterns/cannot_handle.py,sha256=pg0zJHl-hDBnl6y9IyxZzW57yuMdfD8xI8eiK6EVrG8,1406
@@ -591,7 +591,7 @@ rasa/shared/core/command_payload_reader.py,sha256=Vhiop9LWFawaEruRifBBrVmoEJ-fj1
 rasa/shared/core/constants.py,sha256=WNFzABG-eiVREBL6aDZAmcNDiSmuSbvWuxXIMoX2Iv8,5704
 rasa/shared/core/conversation.py,sha256=tw1fD2XB3gOdQjDI8hHo5TAAmE2JYNogQGWe3rE929w,1385
 rasa/shared/core/domain.py,sha256=SsRLbLIEZ-coPTEwr-XxU_O-X-0mR466YLvXJJOAEpc,81247
-rasa/shared/core/events.py,sha256=989wHh_6d6XF8PQkeCZfY3MNgePCbLK9BiY8JQVXmQ0,83790
+rasa/shared/core/events.py,sha256=6yuOrZs8hZaR0FV1nC58l1u6qE4fegwrvL5nH1w7xY4,83719
 rasa/shared/core/flows/__init__.py,sha256=HszhIvEARpmyxABFc1MKYvj8oy04WiZW1xmCdToakbs,181
 rasa/shared/core/flows/flow.py,sha256=XzF9RUxLNyiGndnpvECV4pMczzc6g7UtgwokyXAoaTY,21496
 rasa/shared/core/flows/flow_path.py,sha256=xstwahZBU5cfMY46mREA4NoOGlKLBRAqeP_mJ3UZqOI,2283
@@ -643,7 +643,7 @@ rasa/shared/importers/rasa.py,sha256=877EU8qPZSMBk5VAVAAUhfsh6vatRJrYOqWz1YGR6p8
 rasa/shared/importers/remote_importer.py,sha256=fKLQskaCVPpD5cCMQ9sR71cZZlSIP-SSv3J3o2kra2w,7696
 rasa/shared/importers/utils.py,sha256=Gi3BM5RUr-9nX_Ujf-g-tt19_bKPizmQIi6eAflDAmo,1289
 rasa/shared/nlu/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rasa/shared/nlu/constants.py,sha256=oq-eaTMXRvT1mE8pFhxf1Jvc8vlZGIeOSdY7YQlKd2Q,1825
+rasa/shared/nlu/constants.py,sha256=KUYpaGAjwBwdUV8TZupei-xWAcb8RmaqhXNF8SMVwqU,1773
 rasa/shared/nlu/interpreter.py,sha256=eCNJp61nQYTGVf4aJi8SCWb46jxZY6-C1M1LFxMyQTM,188
 rasa/shared/nlu/training_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/shared/nlu/training_data/entities_parser.py,sha256=fC-VIso07so6E9b6KrQXOBC-ZUGCQGvnMvzVwiAO1GQ,6729
@@ -695,7 +695,7 @@ rasa/shared/providers/llm/azure_openai_llm_client.py,sha256=A6sg2bvulNczuzu1J0V7
 rasa/shared/providers/llm/default_litellm_llm_client.py,sha256=1oiUIXr_U5ldyBQZ8cnrV3P7Qw9kMw1yvaVg6mjKkHU,3940
 rasa/shared/providers/llm/litellm_router_llm_client.py,sha256=llko2DfOpiLMpHxnW26I1Hb1wTn7VmZ_yu43GRXhqwQ,6815
 rasa/shared/providers/llm/llm_client.py,sha256=6-gMsEJqquhUPGXzNiq_ybM_McLWxAJ_QhbmWcLnb_Q,2358
-rasa/shared/providers/llm/llm_response.py,sha256=HedtASFXW2GFWS4OAmk-wSjn5dRDFWB8dAkAO2Kdd_M,2426
+rasa/shared/providers/llm/llm_response.py,sha256=Ltmc8yk9cAqtK8QgwfZZywudM5ZQsT4y_AKAQ3q05hA,1490
 rasa/shared/providers/llm/openai_llm_client.py,sha256=uDdcugBcO3sfxbduc00eqaZdrJP0VFX5dkBd2Dem47M,4844
 rasa/shared/providers/llm/rasa_llm_client.py,sha256=SpgWn3uHHEezIcyvMfi468zRLw_W8VF6sIs-VIhElPc,3357
 rasa/shared/providers/llm/self_hosted_llm_client.py,sha256=98FaF0-lYnytC46ulhrCAQjUKy9TI0U2QILml__UCzc,9170
@@ -717,7 +717,7 @@ rasa/shared/utils/pykwalify_extensions.py,sha256=4W8gde8C6QpGCY_t9IEmaZSgjMuie1x
 rasa/shared/utils/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/shared/utils/schemas/config.yml,sha256=czxSADw9hOIZdhvFP8pVUQo810hs9_C8ZGfCPx17taM,27
 rasa/shared/utils/schemas/domain.yml,sha256=b2k4ZYSV-QL3hGjDaRg8rfoqaTh4hbhDc_hBlMB8cuI,3409
-rasa/shared/utils/schemas/events.py,sha256=T8kSex2UpgmToqib6KyrgNYBK5WS8OwqdO4Jv-TEJ4I,6913
+rasa/shared/utils/schemas/events.py,sha256=9sg_w4VeFMksyl-uscUht1TErf1gfKR56agyYSvl2c4,6912
 rasa/shared/utils/schemas/model_config.yml,sha256=OravyVWalSwjiXYRarRzg0tiRnUFHe1q4-5Wj1TEeFk,811
 rasa/shared/utils/schemas/stories.yml,sha256=DV3wAFnv1leD7kV-FH-GQihF1QX5oKHc8Eb24mxjizc,4737
 rasa/shared/utils/yaml.py,sha256=HpG4whRyFMEJ39YEMd-X1HBJL6C2cAwvPlMGzqq74z0,37638
@@ -776,9 +776,9 @@ rasa/utils/train_utils.py,sha256=f1NWpp5y6al0dzoQyyio4hc4Nf73DRoRSHDzEK6-C4E,212
 rasa/utils/url_tools.py,sha256=JQcHL2aLqLHu82k7_d9imUoETCm2bmlHaDpOJ-dKqBc,1218
 rasa/utils/yaml.py,sha256=KjbZq5C94ZP7Jdsw8bYYF7HASI6K4-C_kdHfrnPLpSI,2000
 rasa/validator.py,sha256=wl5IKiyDmk6FlDcGO2Js-H-gHPeqVqUJ6hB4fgN0xjI,66796
-rasa/version.py,sha256=i3Hq54aXzMWJ1ssnr5lSMo7H3D0HoOiyztswlvAyF7o,124
-rasa_pro-3.11.3a1.dev2.dist-info/METADATA,sha256=pElCn7OAoN2Y52erNSA1s8_OnzFnIv0n8TX5YxlC60A,10798
-rasa_pro-3.11.3a1.dev2.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.11.3a1.dev2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-rasa_pro-3.11.3a1.dev2.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.11.3a1.dev2.dist-info/RECORD,,
+rasa/version.py,sha256=GA1IzBOw2Is9Gh8r2ooq5d5oRHY4Cr5V2c_YGCN_jaI,124
+rasa_pro-3.11.3a1.dev4.dist-info/METADATA,sha256=UoBAUZRnGQGLH0j91R1nxARNIGeoD7wlzdqqMuPmb_U,10798
+rasa_pro-3.11.3a1.dev4.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.11.3a1.dev4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+rasa_pro-3.11.3a1.dev4.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.11.3a1.dev4.dist-info/RECORD,,