rasa-pro 3.13.0a1.dev4__py3-none-any.whl → 3.13.0a1.dev5__py3-none-any.whl

rasa/builder/llm_context.py

@@ -0,0 +1,81 @@
+import json
+from typing import Optional
+
+from rasa.shared.core.constants import DEFAULT_SLOT_NAMES
+from rasa.shared.core.events import (
+    ActionExecuted,
+    BotUttered,
+    FlowCompleted,
+    FlowStarted,
+    SlotSet,
+    UserUttered,
+)
+from rasa.shared.core.trackers import DialogueStateTracker
+
+
+def tracker_as_llm_context(tracker: Optional[DialogueStateTracker]) -> str:
+    """Convert a tracker to a string that can be used as context for the LLM."""
+    if not tracker or not tracker.events:
+        return "No conversation history available."
+
+    context_parts = []
+    current_turn = []
+
+    for event in tracker.events:
+        if isinstance(event, UserUttered):
+            if current_turn:
+                context_parts.append(" | ".join(current_turn))
+                current_turn = []
+            current_turn.append(f"User: {event.text}")
+            if event.intent:
+                current_turn.append(f"Intent: {event.intent.get('name')}")
+            if event.entities:
+                current_turn.append(
+                    f"Entities: {[e.get('entity') for e in event.entities]}"
+                )
+            if event.commands:
+                current_turn.append(
+                    f"Commands: {[cmd.get('name') for cmd in event.commands]}"
+                )
+
+        elif isinstance(event, BotUttered):
+            if event.text:
+                current_turn.append(f"Bot: {event.text}")
+
+        elif isinstance(event, ActionExecuted):
+            current_turn.append(f"Action: {event.action_name}")
+            if event.confidence:
+                current_turn.append(f"Confidence: {event.confidence:.2f}")
+
+        elif isinstance(event, SlotSet) and event.key not in DEFAULT_SLOT_NAMES:
+            current_turn.append(f"Slot Set: {event.key}={event.value}")
+
+        elif isinstance(event, FlowStarted):
+            current_turn.append(f"# Flow Started: {event.flow_id}")
+
+        elif isinstance(event, FlowCompleted):
+            current_turn.append(f"# Flow Completed: {event.flow_id}")
+
+    if current_turn:
+        context_parts.append(" | ".join(current_turn))
+
+    # Add final state information
+    context_parts.append("\nCurrent State:")
+    context_parts.append(f"Latest Message: {tracker.latest_message.text or '-'}")
+
+    # Add active flows from stack
+    if tracker.active_flow:
+        context_parts.append(f"Active Flow: {tracker.active_flow}")
+    if tracker.stack:
+        context_parts.append(f"Flow Stack: {json.dumps(tracker.stack.as_dict())}")
+
+    # Add slot values that are not None
+    non_empty_slots = {
+        k: str(v.value)
+        for k, v in tracker.slots.items()
+        if v is not None and k not in DEFAULT_SLOT_NAMES
+    }
+    if non_empty_slots:
+        context_parts.append(f"Slots: {json.dumps(non_empty_slots)}")
+
+    return "\n".join(context_parts)

rasa/builder/prompt_to_bot.py

@@ -1,4 +1,5 @@
 import asyncio
+import collections
 import importlib
 import json
 import logging
@@ -18,6 +19,7 @@ from sanic import Sanic, response
 from structlog.testing import capture_logs
 
 import rasa.core.utils
+from rasa.builder.llm_context import tracker_as_llm_context
 from rasa.cli.utils import validate_files
 from rasa.constants import PACKAGE_NAME
 from rasa.core import agent, channels
@@ -53,11 +55,6 @@ DEFAULT_SKILL_GENERATION_SYSTEM_PROMPT = importlib.resources.read_text(
 VECTOR_STORE_ID = "vs_685123376e288191a005b6b144d3026f"
 
 
-class PromptRequest(BaseModel):
-    prompt: str
-    client_id: Optional[str] = None
-
-
 default_credentials_yaml = """
 studio_chat:
   user_message_evt: "user_message"
@@ -65,6 +62,23 @@ studio_chat:
   session_persistence: true
 """
 
+# create a dict where we collect most recent logs. only collect the last 30 log lines
+# use a builtin type for this
+recent_logs = collections.deque(maxlen=30)
+
+
+def collecting_logs_processor(logger, log_level, event_dict):
+    if log_level != logging.getLevelName(logging.DEBUG).lower():
+        event_message = event_dict.get("event_info") or event_dict.get("event", "")
+        recent_logs.append(f"[{log_level}] {event_message}")
+
+    return event_dict
+
+
+class PromptRequest(BaseModel):
+    prompt: str
+    client_id: Optional[str] = None
+
 
 def default_credentials() -> Dict[str, Any]:
     return read_yaml(default_credentials_yaml)
@@ -255,7 +269,9 @@ class PromptToBotService:
             )
         except Exception as e:
             structlogger.error(
-                "prompt_to_bot.update_bot_data.validation_error", error=str(e)
+                "prompt_to_bot.update_bot_data.validation_error",
+                error=str(e),
+                event_info="Failed to validate the Rasa project. Error: " + str(e),
             )
             await response.send(
                 sse_event(
@@ -273,7 +289,9 @@ class PromptToBotService:
             await response.send(sse_event("train_success", {"status": "train_success"}))
         except Exception as e:
             structlogger.error(
-                "prompt_to_bot.update_bot_data.train_error", error=str(e)
+                "prompt_to_bot.update_bot_data.train_error",
+                error=str(e),
+                event_info="Failed to train the agent. Error: " + str(e),
             )
             await response.send(
                 sse_event("train_error", {"status": "train_error", "error": str(e)})
@@ -450,27 +468,40 @@ class PromptToBotService:
             ] = await self.app.ctx.agent.tracker_store.retrieve(
                 self.input_channel.latest_tracker_session_id
             )
-            if tracker is None:
-                test_conversation = []
-            else:
-                test_conversation = tracker.current_state()
+            return tracker_as_llm_context(tracker)
         else:
-            test_conversation = []
+            return tracker_as_llm_context(None)
 
-        chat_bot_files = self.bot_files
-
-        return {
-            "test_conversation": test_conversation,
-            "chat_bot_files": chat_bot_files,
-        }
+    def format_chat_dump(self, user_chat_history: List[Dict[str, Any]]) -> str:
+        """Format the chat dump for the LLM."""
+        result = ""
+        for message in user_chat_history:
+            if message.get("type") == "user":
+                result += f"User: {message.get('content')}\n"
+            else:
+                for part in message.get("content", []):
+                    if part.get("type") == "text":
+                        result += f"Assistant: {part.get('text')}\n"
+        return result
 
     async def llm_builder(self, request):
         chat_bot_context = await self.generate_chat_bot_context()
+        recent_logs_context = "\n".join(recent_logs)
+        chat_bot_files_context = json.dumps(self.bot_files)
         user_chat_history = request.json.get("messages", [])
-        last_user_message = (
-            user_chat_history[-1].get("content") if user_chat_history else ""
+        chat_dump = self.format_chat_dump(user_chat_history)
+
+        client = openai.AsyncOpenAI()
+
+        results = await client.vector_stores.search(
+            vector_store_id=VECTOR_STORE_ID,
+            query=chat_dump,
+            max_num_results=10,
+            rewrite_query=True,
         )
 
+        formatted_results = self.format_results(results.data)
+
         prompt = dedent(f"""
         You are a helpful assistant that helps users building chatbots using Rasa.
         Do not mention Rasa Studio - only ever refer to Rasa Pro.
@@ -516,8 +547,25 @@ class PromptToBotService:
 
         Create links to https://rasa.com/docs for the user to take a look at.
 
-        Chat bot context:
+        ----
+        Logs from chatbot framework:
+        {recent_logs_context}
+
+        ----
+        Most recent conversation of the user with the chatbot:
         {json.dumps(chat_bot_context)}
+
+        ----
+        Chat bot files for this project (name and content):
+        {json.dumps(chat_bot_files_context)}
+
+        ----
+        Documentation Context:
+        {formatted_results}
+
+        ----
+        Respond with a json array of content blocks. Keep the response
+        short and concise.
         """)
 
         past_messages = []
@@ -529,26 +577,9 @@ class PromptToBotService:
                 }
             )
 
-        client = openai.AsyncOpenAI()
-
-        results = await client.vector_stores.search(
-            vector_store_id=VECTOR_STORE_ID,
-            query=last_user_message,
-        )
-
-        formatted_results = self.format_results(results.data)
-
         messages = [
             {"role": "system", "content": prompt},
             *past_messages,
-            {
-                "role": "user",
-                "content": (
-                    f"Documentation Context: {formatted_results}\n\n"
-                    "Respond with a json array of content blocks. Keep the "
-                    "response short and concise."
-                ),
-            },
         ]
 
         llm_helper_schema = read_json_file(
@@ -622,7 +653,10 @@ class PromptToBotService:
         )
 
         if not agent_instance.is_ready():
-            raise Exception("Failed to load model.")
+            raise Exception(
+                "Generation of the chatbot failed with an error (model failed "
+                "to load). Please try again."
+            )
 
         structlogger.info(
             "prompt_to_bot.train_and_load_agent.agent_ready",
@@ -642,7 +676,13 @@ def main():
         warn_only_once=True,
         filter_repeated_logs=True,
     )
-    configure_structlog(log_level, include_time=True)
+    configure_structlog(
+        log_level,
+        include_time=True,
+        additional_processors=[
+            collecting_logs_processor,
+        ],
+    )
 
     service = PromptToBotService()
     register_custom_sanic_error_handler(service.app)

rasa/core/channels/studio_chat.py

@@ -206,9 +206,6 @@ class StudioChatInput(SocketIOInput, VoiceInputChannel):
 
     async def on_tracker_updated(self, tracker: "DialogueStateTracker") -> None:
         """Triggers a tracker update notification after a change to the tracker."""
-        # we need the latest session id to use it for the llm helper to get the
-        # most recent conversation the user had with the bot.
-        self.latest_tracker_session_id = tracker.sender_id
         await self.publish_tracker_update(tracker.sender_id, tracker_as_dump(tracker))
 
     async def publish_tracker_update(self, sender_id: str, tracker_dump: Dict) -> None:
@@ -216,6 +213,11 @@ class StudioChatInput(SocketIOInput, VoiceInputChannel):
         if not self.sio:
             structlogger.error("studio_chat.on_tracker_updated.sio_not_initialized")
             return
+
+        # we need the latest session id to use it for the llm helper to get the
+        # most recent conversation the user had with the bot.
+        self.latest_tracker_session_id = sender_id
+
         await self.sio.emit("tracker", tracker_dump, room=sender_id)
 
     async def on_message_proxy(

rasa/core/policies/flows/flow_executor.py

@@ -734,7 +734,14 @@ def _run_action_step(
             # do not log about non-existing validation actions of collect steps
             utter_action_name = render_template_variables("{{context.utter}}", context)
             if utter_action_name not in available_actions:
-                structlogger.warning("flow.step.run.action.unknown", action=action_name)
+                structlogger.warning(
+                    "flow.step.run.action.unknown",
+                    action=action_name,
+                    event_info=(
+                        f"The action '{action_name}' is not defined in the domain but "
+                        f"getting triggered by the flow '{step.flow_id}'."
+                    ),
+                )
         return ContinueFlowWithNextStep(events=initial_events)
 
 

rasa/utils/log_utils.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 import os
 import sys
-from typing import Any, Optional
+from typing import Any, List, Optional
 
 import structlog
 from structlog.dev import ConsoleRenderer
@@ -37,6 +37,7 @@ class HumanConsoleRenderer(ConsoleRenderer):
 def configure_structlog(
     log_level: Optional[int] = None,
     include_time: bool = False,
+    additional_processors: Optional[List[structlog.processors.Processor]] = None,
 ) -> None:
     """Configure logging of the server."""
     if log_level is None:  # Log level NOTSET is 0 so we use `is None` here
@@ -75,6 +76,9 @@ def configure_structlog(
     if include_time:
         shared_processors.append(structlog.processors.TimeStamper(fmt="iso"))
 
+    if additional_processors:
+        shared_processors.extend(additional_processors)
+
     if not FORCE_JSON_LOGGING and sys.stderr.isatty():
         # Pretty printing when we run in a terminal session.
         # Automatically prints pretty tracebacks when "rich" is installed

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.0a1.dev4"
+__version__ = "3.13.0a1.dev5"

{rasa_pro-3.13.0a1.dev4.dist-info → rasa_pro-3.13.0a1.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.0a1.dev4
+Version: 3.13.0a1.dev5
 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

{rasa_pro-3.13.0a1.dev4.dist-info → rasa_pro-3.13.0a1.dev5.dist-info}/RECORD

@@ -4,7 +4,8 @@ rasa/api.py,sha256=RY3SqtlOcdq4YZGgr6DOm-nUBpiA8l8uguUZOctL_7o,6320
 rasa/builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/builder/create_openai_vector_store.py,sha256=GeOV5Wa5snNr6PNOnRcLjltKrG2NyydeRgGvs81n37g,1929
 rasa/builder/llm-helper-schema.json,sha256=z5IJc_-2mZ9oQ-z-9WzTivOoqYsLXCAm8MIOTWy5rGs,1609
-rasa/builder/prompt_to_bot.py,sha256=ntATcck6MMHTNRQpzXQOB2tseMB21NgKi9QSzZddyiQ,22436
+rasa/builder/llm_context.py,sha256=zy7htrXgS_QWJWeEj4TfseQgTI65whFJR_4GKm_iOvE,2826
+rasa/builder/prompt_to_bot.py,sha256=s6zRBsL3jtdsorIbk01woXdvyYRXZAd0t5Ma9DhqfEc,23889
 rasa/builder/scrape_rasa_docs.py,sha256=HukkTCIh1rMCE8D_EtXGHy0aHtFBVrVTT_6Wpex3XQM,2428
 rasa/builder/skill_to_bot_prompt.jinja,sha256=h_HyrqPYMjLht8LJyw6vRChNkBTPM0uq2wopo9VjGc0,5345
 rasa/cli/__init__.py,sha256=eO5vp9rFCANtbTVU-pxN3iMBKw4p9WRcgzytt9MzinY,115
@@ -259,7 +260,7 @@ rasa/core/channels/rest.py,sha256=LWBYBdVzOz5Vv5tZCkB1QA7LxXJFTeC87CQLAi_ZGeI,73
 rasa/core/channels/rocketchat.py,sha256=hajaH6549CjEYFM5jSapw1DQKBPKTXbn7cVSuZzknmI,5999
 rasa/core/channels/slack.py,sha256=jVsTTUu9wUjukPoIsAhbee9o0QFUMCNlQHbR8LTcMBc,24406
 rasa/core/channels/socketio.py,sha256=ZEavmx2on9AH73cuIFSGMKn1LHJhzcQVaqrFz7SH-CE,11348
-rasa/core/channels/studio_chat.py,sha256=U4aDQ17asMv1m0gHYRb6PHJPkCNzG2MgvQZNIsbrDa8,19547
+rasa/core/channels/studio_chat.py,sha256=34KdZ9AtHtL9X-0E9gJpif1xeO4HrZ0pyOYfP--Xh64,19541
 rasa/core/channels/telegram.py,sha256=TKVknsk3U9tYeY1a8bzlhqkltWmZfGSOvrcmwa9qozc,12499
 rasa/core/channels/twilio.py,sha256=2BTQpyx0b0yPpc0A2BHYfxLPgodrLGLs8nq6i3lVGAM,5906
 rasa/core/channels/vier_cvg.py,sha256=5O4yx0TDQIMppvlCxTOzmPB60CA-vqQXqWQ7upfrTO0,13496
@@ -332,7 +333,7 @@ rasa/core/policies/enterprise_search_prompt_with_relevancy_check_and_citation_te
 rasa/core/policies/flow_policy.py,sha256=Rvx5MIGDHi9sVxGazf-dXs6F-hFHSi3UoVjjSP8ATik,7470
 rasa/core/policies/flows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/core/policies/flows/flow_exceptions.py,sha256=_FQuN-cerQDM1pivce9bz4zylh5UYkljvYS1gjDukHI,1527
-rasa/core/policies/flows/flow_executor.py,sha256=rdODUFtDRlpgFV7Wzd6UuSYpXbiqUIwaaVZkl1HueBg,28314
+rasa/core/policies/flows/flow_executor.py,sha256=MDYZ_XKl8LfzmBwcyEUL3Tnap0lcqpzknSgwTyJ_kpc,28592
 rasa/core/policies/flows/flow_step_result.py,sha256=agjPrD6lahGSe2ViO5peBeoMdI9ngVGRSgtytgxmJmg,1360
 rasa/core/policies/intentless_policy.py,sha256=1A7FSkI4PQdN3t1p3GQhSImmO-m6UVCUzzEsjxz4nKc,38040
 rasa/core/policies/intentless_prompt_template.jinja2,sha256=KhIL3cruMmkxhrs5oVbqgSvK6ZiN_6TQ_jXrgtEB-ZY,677
@@ -820,7 +821,7 @@ rasa/utils/endpoints.py,sha256=jX9xSI_3KJ-NpzymyfaO-Zj-ISaWbA4ql2Kx3NulBvE,10905
 rasa/utils/io.py,sha256=LIAdQQqUPA-V_mdpgeQzPDzA4rmsdZLyVKc8j_0Z70Y,7161
 rasa/utils/json_utils.py,sha256=SKtJzzsIRCAgNEQiBvWDDm9euMRBgJ-TyvCi2tXHH1w,1689
 rasa/utils/licensing.py,sha256=_YGELCUjBF9rzVwlKoP1YfnqskszHUqyd-_qVpXr5Kw,20508
-rasa/utils/log_utils.py,sha256=QR0R5Ezs9xOaESluelqdikViIypXSWVxCPJmJM4Ir3E,5440
+rasa/utils/log_utils.py,sha256=ihkghF8HQ-9nAH04OE433aaYXamSWuw8zBMBIRFewlY,5615
 rasa/utils/mapper.py,sha256=CZiD3fu7-W-OJgoB1R8JaOg-Hq13TK20D-zGVNgbF18,7726
 rasa/utils/ml_utils.py,sha256=y4Czr9GdRBj-a2npXU8ED2qC9bzw5olRyqQEmu5BB8k,4185
 rasa/utils/plotting.py,sha256=Dv7O58T4eu3XwwIFgptx4ay1ocjHLmeA7uReN2FIne4,12260
@@ -847,9 +848,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=IRhLfcgCpps0wSpokOvUGNaY8t8GsmeSmPOUVRKeOeE,83087
-rasa/version.py,sha256=jE1pYjm2152_i0qt5oD2cxd0kGGE-S9GshzD3iFuYfQ,124
-rasa_pro-3.13.0a1.dev4.dist-info/METADATA,sha256=df5eOzp5yQ8PeEp2nGD8xza-F0mW2ROkVGpjBS5-2Lc,10562
-rasa_pro-3.13.0a1.dev4.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.13.0a1.dev4.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rasa_pro-3.13.0a1.dev4.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.13.0a1.dev4.dist-info/RECORD,,
+rasa/version.py,sha256=FYrU5nK7ROc0P0pY4HA3QPd1MQFZ-Pkf-jy2jy20NV4,124
+rasa_pro-3.13.0a1.dev5.dist-info/METADATA,sha256=6dEcJ6rsZMNZ8hZ1C7Excc7o5dbcEeDGB7M_J61oXtU,10562
+rasa_pro-3.13.0a1.dev5.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.13.0a1.dev5.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rasa_pro-3.13.0a1.dev5.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.13.0a1.dev5.dist-info/RECORD,,