rasa-pro 3.13.1a17__py3-none-any.whl → 3.13.1a19__py3-none-any.whl

rasa/builder/constants.py

@@ -0,0 +1,4 @@
+ROLE_SYSTEM = "system"
+ROLE_USER = "user"
+ROLE_ASSISTANT = "assistant"
+ROLE_RASA_COPILOT = "copilot"

rasa/builder/{llm-helper-schema.json → copilot-llm-structured-output-response-schema.json}

@@ -35,16 +35,16 @@
           },
           {
             "type": "object",
-            "required": ["type", "file", "content"],
+            "required": ["type", "file_path", "file_content"],
             "properties": {
               "type": {
                 "type": "string",
                 "enum": ["file"]
               },
-              "file": {
+              "file_path": {
                 "type": "string"
               },
-              "content": {
+              "file_content": {
                 "type": "string"
               }
             }

rasa/builder/copilot.py

@@ -0,0 +1,233 @@
+import asyncio
+import importlib
+import json
+from contextlib import asynccontextmanager
+from typing import Any, Dict, List
+
+import importlib_resources
+import openai
+import structlog
+from jinja2 import Template
+from pydantic import ValidationError
+from typing_extensions import AsyncGenerator
+
+from rasa.builder import config
+from rasa.builder.constants import ROLE_SYSTEM, ROLE_USER
+from rasa.builder.exceptions import DocumentRetrievalError, LLMGenerationError
+from rasa.builder.inkeep_document_retrieval import InKeepDocumentRetrieval
+from rasa.builder.llm_context import tracker_as_llm_context
+from rasa.builder.models import CopilotChatMessage, CopilotContext, Document
+from rasa.shared.constants import PACKAGE_NAME
+from rasa.shared.utils.io import read_json_file
+
+COPILOT_LLM_STRUCTURED_OUTPUT_SCHEMA_PATH = str(
+    importlib_resources.files(PACKAGE_NAME).joinpath(
+        "builder/copilot-llm-structured-output-response-schema.json"
+    )
+)
+
+structlogger = structlog.get_logger()
+
+
+class Copilot:
+    def __init__(self):
+        self._client = None
+        self._copilot_response_schema = read_json_file(
+            COPILOT_LLM_STRUCTURED_OUTPUT_SCHEMA_PATH
+        )
+        self._inkeep_document_retrieval = InKeepDocumentRetrieval()
+        self._system_message_prompt_template = Template(
+            importlib.resources.read_text(
+                "rasa.builder",
+                "copilot_system_prompt.jinja2",
+            )
+        )
+
+    @asynccontextmanager
+    async def _get_client(self) -> AsyncGenerator[openai.AsyncOpenAI, None]:
+        """Get or lazy create OpenAI client with proper resource management."""
+        if self._client is None:
+            self._client = openai.AsyncOpenAI(timeout=config.OPENAI_TIMEOUT)
+
+        try:
+            yield self._client
+        except Exception as e:
+            structlogger.error("copilot.llm_client_error", error=str(e))
+            raise
+
+    async def generate_response(self, context: CopilotContext) -> CopilotChatMessage:
+        """Generate copilot response using OpenAI."""
+        try:
+            async with self._get_client() as client:
+                response_format = {
+                    "type": "json_schema",
+                    "json_schema": {
+                        "name": "copilot_response",
+                        "schema": self._copilot_response_schema,
+                    },
+                }  # type: ignore[arg-type]
+                messages = await self._create_llm_request_messages(context)
+
+                response = await client.chat.completions.create(
+                    model=config.OPENAI_MODEL,
+                    messages=messages,
+                    response_format=response_format,
+                )
+
+                content = response.choices[0].message.content
+                if not content:
+                    structlogger.error(
+                        "copilot.generate_response.empty_llm_response",
+                        event_info="Copilot: Empty response from LLM",
+                        messages=messages,
+                        response=response,
+                    )
+                    raise LLMGenerationError("Copilot: Empty response from LLM")
+
+                try:
+                    # Parse the JSON response and create a CopilotChatMessage
+                    llm_response = json.loads(content)
+                    structlogger.debug(
+                        "copilot.generate_response.llm_response",
+                        event_info="Copilot: LLM response",
+                        llm_response=llm_response,
+                    )
+                    return CopilotChatMessage.from_llm_response(llm_response)
+                except (json.JSONDecodeError, ValidationError) as e:
+                    structlogger.error(
+                        "copilot.generate_response.llm_response_invalid_json_format",
+                        content=content,
+                        event_info=f"Copilot: Invalid JSON from LLM: {e}",
+                        error=str(e),
+                    )
+                    raise LLMGenerationError(f"Copilot: Invalid JSON from LLM: {e}")
+
+        except openai.OpenAIError as e:
+            structlogger.error(
+                "copilot.generate_response.openai_api_error",
+                event_info="Copilot: OpenAI API error",
+                messages=messages,
+                error=str(e),
+            )
+            raise LLMGenerationError(f"Copilot: OpenAI API error: {e}")
+        except asyncio.TimeoutError:
+            structlogger.error(
+                "copilot.generate_response.llm_request_timeout",
+                event_info="Copilot: LLM request timed out.",
+                messages=messages,
+            )
+            raise LLMGenerationError("Copilot: LLM request timed out.")
+
+    async def _create_llm_request_messages(
+        self, context: CopilotContext
+    ) -> List[Dict[str, Any]]:
+        """Constructs the full list of messages to send to the LLM.
+
+        This includes:
+        - System instructions that utilizes logs, relevant documentation bits, and
+          the current tracker state of the Rasa assistant to generate a response.
+        - Chat history between the user and the copilot.
+
+        Args:
+            context: Context object containing chat history, current tracker
+                state, logs, and file references.
+
+        Returns:
+            A full list of messages to pass to the LLM (system + chronological message
+            history).
+        """
+        system_message = await self._create_system_message(context)
+        chat_history_messages = self._create_chat_history_messages(context)
+        return [system_message, *chat_history_messages]
+
+    async def _create_system_message(
+        self,
+        context: CopilotContext,
+    ) -> Dict[str, Any]:
+        """Create the system message with the instructions and context for the copilot.
+
+        Args:
+            context: The context of the copilot.
+
+        Returns:
+            The system message for the copilot.
+        """
+        # Retrieve relevant documents from Rasa documentation and format them
+        documentation_results = await self._search_rasa_documentation(context)
+        formatted_docs = self._format_documents(documentation_results)
+
+        # Format the current conversation between the user and the Rasa assistant
+        current_conversation_with_assistant = tracker_as_llm_context(context.tracker)
+
+        # Render the system message prompt template
+        rendered_prompt = self._system_message_prompt_template.render(
+            current_conversation=current_conversation_with_assistant,
+            assistant_logs=context.assistant_logs,
+            assistant_files=context.assistant_files,
+            documentation_results=formatted_docs,
+        )
+        return {"role": ROLE_SYSTEM, "content": rendered_prompt}
+
+    def _create_chat_history_messages(
+        self,
+        context: CopilotContext,
+    ) -> List[Dict[str, Any]]:
+        """Create the chat history messages for the copilot."""
+        return [message.to_openai_format() for message in context.copilot_chat_history]
+
+    async def _search_rasa_documentation(
+        self,
+        context: CopilotContext,
+    ) -> List[Document]:
+        """Search Rasa documentation for relevant information.
+
+        Args:
+            context: The context of the copilot.
+
+        Returns:
+            A list of Document objects. Empty list is returned if the search fails.
+        """
+        try:
+            query = self._create_documentation_search_query(context)
+            return await self._inkeep_document_retrieval.retrieve_documents(query)
+        except DocumentRetrievalError as e:
+            structlogger.error(
+                "copilot.search_rasa_documentation.error",
+                event_info=(
+                    f"Copilot: Searching Rasa documentation for query '{query}' "
+                    f"failed with the following error: {e}. Returning empty list."
+                ),
+                query=query,
+                error=str(e),
+            )
+            return []
+
+    @staticmethod
+    def _create_documentation_search_query(context: CopilotContext) -> str:
+        """Format chat messages between user and copilot for documentation search."""
+        result = ""
+        user_prefix = "User"
+        assistant_prefix = "Assistant"
+        for message in context.copilot_chat_history:
+            text = message.get_text_content().strip()
+            if not text:
+                continue
+            if message.role == ROLE_USER:
+                result += f"{user_prefix}: {text}\n"
+            else:
+                result += f"{assistant_prefix}: {text}\n"
+        return result
+
+    @staticmethod
+    def _format_documents(results: List[Document]) -> str:
+        """Format documentation search results."""
+        if not results:
+            return "<sources>No relevant documentation found.</sources>"
+
+        formatted_results = ""
+        for result in results:
+            formatted_result = f"<result url='{result.url}'>"
+            formatted_result += f"<content>{result.content}</content>"
+            formatted_results += formatted_result + "</result>"
+
+        return f"<sources>{formatted_results}</sources>"

rasa/builder/{llm_helper_prompt.jinja2 → copilot_system_prompt.jinja2}

@@ -22,16 +22,16 @@ You have access to:
 ```
 {% endif %}
 
-{% if bot_logs %}
+{% if assistant_logs %}
 **Bot Logs:**
 ```
-{{ bot_logs }}
+{{ assistant_logs }}
 ```
 {% endif %}
 
-{% if chat_bot_files %}
+{% if assistant_files %}
 **Bot Configuration Files:**
-{% for file_name, file_content in chat_bot_files.items() %}
+{% for file_name, file_content in assistant_files.items() %}
 **{{ file_name }}:**
 ```
 {{ file_content }}
@@ -182,8 +182,8 @@ Use for generic code examples and snippets:
 ```json
 {
     "type": "file",
-    "file": "domain.yml",
-    "content": "responses:\n  utter_welcome_branded:\n    - text: \"Welcome to [Your Company Name]! I'm here to help.\"\n    - text: \"Hi! I'm [Bot Name], your personal assistant.\""
+    "file_path": "domain.yml",
+    "file_content": "responses:\n  utter_welcome_branded:\n    - text: \"Welcome to [Your Company Name]! I'm here to help.\"\n    - text: \"Hi! I'm [Bot Name], your personal assistant.\""
 }
 ```
 
@@ -212,18 +212,18 @@ Use to reference Rasa documentation:
     },
     {
         "type": "file",
-        "file": "domain.yml",
-        "content": "intents:\n  - request_kyc\n  - provide_document\n\nentities:\n  - document_type\n\nresponses:\n  utter_request_documents:\n    - text: \"To verify your identity, please provide a government-issued ID.\""
+        "file_path": "domain.yml",
+        "file_content": "intents:\n  - request_kyc\n  - provide_document\n\nentities:\n  - document_type\n\nresponses:\n  utter_request_documents:\n    - text: \"To verify your identity, please provide a government-issued ID.\""
     },
     {
         "type": "file",
-        "file": "flows.yml",
-        "content": "flows:\n  kyc_verification:\n    description: Handle KYC document verification\n    start_conditions:\n      - intent: request_kyc\n    steps:\n      - action: utter_request_documents\n      - intent: provide_document\n      - action: action_process_kyc_document"
+        "file_path": "flows.yml",
+        "file_content": "flows:\n  kyc_verification:\n    description: Handle KYC document verification\n    start_conditions:\n      - intent: request_kyc\n    steps:\n      - action: utter_request_documents\n      - intent: provide_document\n      - action: action_process_kyc_document"
     },
     {
         "type": "file",
-        "file": "data/nlu.yml",
-        "content": "- intent: request_kyc\n  examples: |\n    - I need to verify my identity\n    - How do I complete KYC\n    - What documents do you need"
+        "file_path": "data/nlu.yml",
+        "file_content": "- intent: request_kyc\n  examples: |\n    - I need to verify my identity\n    - How do I complete KYC\n    - What documents do you need"
     },
     {
         "type": "text",

rasa/builder/inkeep_document_retrieval.py

@@ -52,15 +52,28 @@ class InKeepDocumentRetrieval:
             List of Document objects containing retrieved content
 
         Raises:
-            LLMGenerationError: If the API call fails or returns invalid response
+            DocumentRetrievalError: When document retrieval fails due to:
+                - Empty response from InKeep AI API
+                - OpenAI API errors (authentication, rate limiting, etc.)
+                - Request timeout
+                - Unexpected errors during API communication
         """
-        response = await self._call_inkeep_rag_api(
-            query=query,
-            temperature=temperature,
-            timeout=timeout,
-        )
-        documents = self._parse_documents_from_response(response)
-        return documents
+        try:
+            response = await self._call_inkeep_rag_api(
+                query=query,
+                temperature=temperature,
+                timeout=timeout,
+            )
+            documents = self._parse_documents_from_response(response)
+            return documents
+        except DocumentRetrievalError as e:
+            structlogger.error(
+                "inkeep_document_retrieval.retrieve_documents.error",
+                event_info="InKeep Document Retrieval: Error",
+                query=query,
+                error=str(e),
+            )
+            raise e
 
     async def _call_inkeep_rag_api(
         self, query: str, temperature: float, timeout: float
@@ -108,7 +121,7 @@ class InKeepDocumentRetrieval:
 
         except openai.OpenAIError as e:
             structlogger.error(
-                "inkeep_document_retrieval.api_error",
+                "inkeep_document_retrieval.call_inkeep_rag_api.api_error",
                 event_info="InKeep Document Retrieval: API error",
                 request_params=request_params,
                 error=e,
@@ -116,7 +129,7 @@ class InKeepDocumentRetrieval:
             raise DocumentRetrievalError(f"InKeep Document Retrieval: API error: {e}")
         except asyncio.TimeoutError as e:
             structlogger.error(
-                "inkeep_document_retrieval.timeout_error",
+                "inkeep_document_retrieval.call_inkeep_rag_api.timeout_error",
                 event_info="InKeep Document Retrieval: Timeout error",
                 request_params=request_params,
                 error=e,
@@ -124,7 +137,7 @@ class InKeepDocumentRetrieval:
             raise DocumentRetrievalError(f"InKeep AI request timed out: {e}")
         except Exception as e:
             structlogger.error(
-                "inkeep_document_retrieval.error",
+                "inkeep_document_retrieval.call_inkeep_rag_api.error",
                 event_info="InKeep Document Retrieval: Error",
                 request_params=request_params,
                 error=e,
@@ -161,7 +174,8 @@ class InKeepDocumentRetrieval:
             response: ChatCompletion response from InKeep AI's RAG model.
 
         Returns:
-            List of Document objects
+            List of Document objects. Empty list is returned if the response is empty
+            or if the response is invalid.
         """
         try:
             content = response.choices[0].message.content
@@ -192,7 +206,8 @@ class InKeepDocumentRetrieval:
 
         except json.JSONDecodeError as e:
             structlogger.warning(
-                "inkeep_document_retrieval.parse_response_failed",
+                "inkeep_document_retrieval.parse_documents_from_response"
+                ".parse_response_failed",
                 event_info=(
                     "InKeep Document Retrieval: Parse response failed. "
                     "Returning empty list.",
@@ -202,7 +217,7 @@ class InKeepDocumentRetrieval:
             return []
         except Exception as e:
             structlogger.error(
-                "inkeep_document_retrieval.parse_response_error",
+                "inkeep_document_retrieval.parse_documents_from_response.error",
                 event_info=(
                     "InKeep Document Retrieval: Parse response error. "
                     "Returning empty list.",

rasa/builder/llm_service.py

@@ -11,13 +11,10 @@ import importlib_resources
 import openai
 import structlog
 from jinja2 import Template
-from pydantic import ValidationError
 
 from rasa.builder import config
+from rasa.builder.copilot import Copilot
 from rasa.builder.exceptions import LLMGenerationError
-from rasa.builder.inkeep_document_retrieval import InKeepDocumentRetrieval
-from rasa.builder.llm_context import tracker_as_llm_context
-from rasa.builder.models import Document, LLMBuilderContext, LLMHelperResponse
 from rasa.constants import PACKAGE_NAME
 from rasa.shared.constants import DOMAIN_SCHEMA_FILE, RESPONSES_SCHEMA_FILE
 from rasa.shared.core.flows.yaml_flows_io import FLOWS_SCHEMA_FILE
@@ -34,7 +31,23 @@ class LLMService:
         self._client: Optional[openai.AsyncOpenAI] = None
         self._domain_schema: Optional[Dict[str, Any]] = None
         self._flows_schema: Optional[Dict[str, Any]] = None
-        self._helper_schema: Optional[Dict[str, Any]] = None
+        self._copilot = None
+
+    @property
+    def copilot(self):
+        """Get or lazy create copilot instance."""
+        if self._copilot is None:
+            self._copilot = Copilot()
+
+        try:
+            return self._copilot
+        except Exception as e:
+            structlogger.error(
+                "llm_service.copilot.error",
+                event_info="LLM Service: Error getting copilot instance.",
+                error=str(e),
+            )
+            raise
 
     @asynccontextmanager
     async def _get_client(self) -> AsyncGenerator[openai.AsyncOpenAI, None]:
@@ -56,9 +69,6 @@ class LLMService:
         if self._flows_schema is None:
             self._flows_schema = _prepare_flows_schema()
 
-        if self._helper_schema is None:
-            self._helper_schema = _load_helper_schema()
-
     async def generate_rasa_project(
         self, messages: List[Dict[str, Any]]
     ) -> Dict[str, Any]:
@@ -67,24 +77,25 @@ class LLMService:
 
         try:
             async with self._get_client() as client:
+                response_format = {
+                    "type": "json_schema",
+                    "json_schema": {
+                        "name": "rasa_project",
+                        "schema": {
+                            "type": "object",
+                            "properties": {
+                                "domain": self._domain_schema,
+                                "flows": self._flows_schema,
+                            },
+                            "required": ["domain", "flows"],
+                        },
+                    },
+                }
                 response = await client.chat.completions.create(
                     model=config.OPENAI_MODEL,
                     messages=messages,
                     temperature=config.OPENAI_TEMPERATURE,
-                    response_format={
-                        "type": "json_schema",
-                        "json_schema": {
-                            "name": "rasa_project",
-                            "schema": {
-                                "type": "object",
-                                "properties": {
-                                    "domain": self._domain_schema,
-                                    "flows": self._flows_schema,
-                                },
-                                "required": ["domain", "flows"],
-                            },
-                        },
-                    },
+                    response_format=response_format,
                 )
 
                 content = response.choices[0].message.content
@@ -101,119 +112,6 @@ class LLMService:
         except asyncio.TimeoutError:
             raise LLMGenerationError("LLM request timed out")
 
-    async def create_helper_messages(
-        self, llm_builder_context: LLMBuilderContext
-    ) -> List[Dict[str, Any]]:
-        """Create helper messages for LLM builder."""
-        # Format chat history for documentation search
-        chat_dump = self._format_chat_dump(llm_builder_context.chat_history)
-
-        # Search documentation
-        documentation_results = await self.search_documentation(chat_dump)
-        formatted_docs = self._format_documentation_results(documentation_results)
-
-        current_conversation = tracker_as_llm_context(llm_builder_context.tracker)
-
-        # Prepare LLM messages
-        system_messages = get_helper_messages(
-            current_conversation,
-            llm_builder_context.bot_logs,
-            llm_builder_context.chat_bot_files,
-            formatted_docs,
-        )
-
-        # Add user messages
-        messages = system_messages.copy()
-        for msg in llm_builder_context.chat_history:
-            messages.append(
-                {
-                    "role": "user" if msg.type == "user" else "assistant",
-                    "content": json.dumps(msg.content)
-                    if isinstance(msg.content, list)
-                    else msg.content,
-                }
-            )
-        return messages
-
-    async def generate_helper_response(
-        self, messages: List[Dict[str, Any]]
-    ) -> LLMHelperResponse:
-        """Generate helper response using OpenAI."""
-        self._prepare_schemas()
-
-        try:
-            async with self._get_client() as client:
-                response = await client.chat.completions.create(
-                    model=config.OPENAI_MODEL,
-                    messages=messages,
-                    response_format={
-                        "type": "json_schema",
-                        "json_schema": {
-                            "name": "llm_helper",
-                            "schema": self._helper_schema,
-                        },
-                    },
-                )
-
-                content = response.choices[0].message.content
-                if not content:
-                    raise LLMGenerationError("Empty response from LLM helper")
-
-                try:
-                    return LLMHelperResponse.model_validate_json(json.loads(content))
-                except json.JSONDecodeError as e:
-                    raise LLMGenerationError(f"Invalid JSON from LLM helper: {e}")
-                except ValidationError as e:
-                    raise LLMGenerationError(f"Invalid JSON from LLM helper: {e}")
-
-        except openai.OpenAIError as e:
-            raise LLMGenerationError(f"OpenAI API error in helper: {e}")
-        except asyncio.TimeoutError:
-            raise LLMGenerationError("LLM helper request timed out")
-
-    async def search_documentation(
-        self, query: str, max_results: Optional[int] = None
-    ) -> List[Document]:
-        """Search documentation using OpenAI vector store."""
-        inkeep_document_retrieval = InKeepDocumentRetrieval()
-        documents = await inkeep_document_retrieval.retrieve_documents(query)
-        return documents
-
-    @staticmethod
-    def _format_chat_dump(messages: List[Dict[str, Any]]) -> str:
-        """Format chat messages for documentation search."""
-        result = ""
-        for message in messages:
-            if message.type == "user":
-                content = (
-                    message.content
-                    if isinstance(message.content, str)
-                    else str(message.content)
-                )
-                result += f"User: {content}\n"
-            else:
-                if isinstance(message.content, list):
-                    for part in message.content:
-                        if part.get("type") == "text":
-                            result += f"Assistant: {part.get('text')}\n"
-                else:
-                    result += f"Assistant: {message.content}\n"
-        return result
-
-    @staticmethod
-    def _format_documentation_results(results: List[Document]) -> str:
-        """Format documentation search results."""
-        if not results:
-            return "<sources>No relevant documentation found.</sources>"
-
-        formatted_results = ""
-        for result in results:
-            formatted_result = f"<result url='{result.url}'>"
-            formatted_result += f"<content>{result.content}</content>"
-            formatted_results += formatted_result + "</result>"
-
-        return f"<sources>{formatted_results}</sources>"
-
 
 # Schema preparation functions (stateless)
 def _prepare_domain_schema() -> Dict[str, Any]:
@@ -254,15 +152,6 @@ def _prepare_flows_schema() -> Dict[str, Any]:
     return flows_schema
 
 
-def _load_helper_schema() -> Dict[str, Any]:
-    """Load helper schema."""
-    return read_json_file(
-        importlib_resources.files(PACKAGE_NAME).joinpath(
-            "builder/llm-helper-schema.json"
-        )
-    )
-
-
 # Template functions (stateless with caching)
 _skill_template: Optional[Template] = None
 _helper_template: Optional[Template] = None
@@ -288,30 +177,5 @@ def get_skill_generation_messages(
     return [{"role": "system", "content": system_prompt}]
 
 
-def get_helper_messages(
-    current_conversation: str,
-    bot_logs: str,
-    chat_bot_files: Dict[str, str],
-    documentation_results: str,
-) -> List[Dict[str, Any]]:
-    """Get messages for helper response."""
-    global _helper_template
-
-    if _helper_template is None:
-        template_content = importlib.resources.read_text(
-            "rasa.builder",
-            "llm_helper_prompt.jinja2",
-        )
-        _helper_template = Template(template_content)
-
-    system_prompt = _helper_template.render(
-        current_conversation=current_conversation,
-        bot_logs=bot_logs,
-        chat_bot_files=chat_bot_files,
-        documentation_results=documentation_results,
-    )
-    return [{"role": "system", "content": system_prompt}]
-
-
 # Global service instance
 llm_service = LLMService()

rasa/builder/models.py

@@ -1,12 +1,16 @@
 """Pydantic models for request/response validation."""
 
+import json
 from typing import Any, Dict, List, Literal, Optional, Union
 
-from pydantic import BaseModel, Field, validator
+import structlog
+from pydantic import BaseModel, Field, model_validator, validator
 
 from rasa.cli.scaffold import ProjectTemplateName
 from rasa.shared.core.trackers import DialogueStateTracker
 
+structlogger = structlog.get_logger()
+
 
 class PromptRequest(BaseModel):
     """Request model for prompt-to-bot endpoint."""
@@ -14,9 +18,6 @@ class PromptRequest(BaseModel):
     prompt: str = Field(
         ..., min_length=1, max_length=10000, description="The skill description prompt"
     )
-    client_id: Optional[str] = Field(
-        None, max_length=255, description="Optional client identifier"
-    )
 
     @validator("prompt")
     def validate_prompt(cls, v: str) -> str:
@@ -34,9 +35,6 @@ class TemplateRequest(BaseModel):
             f"The template name to use ({ProjectTemplateName.supported_values()})"
         ),
     )
-    client_id: Optional[str] = Field(
-        None, max_length=255, description="Optional client identifier"
-    )
 
     @validator("template_name")
     def validate_template_name(cls, v: Any) -> Any:
@@ -47,26 +45,143 @@ class TemplateRequest(BaseModel):
         return v
 
 
-class ChatMessage(BaseModel):
-    """Model for chat messages."""
+class BaseContent(BaseModel):
+    type: str
+
+
+class TextContent(BaseContent):
+    type: Literal["text"]
+    text: str
+
+
+class LinkContent(BaseContent):
+    type: Literal["link"]
+    text: str  # This holds the URL
+
+
+class CodeContent(BaseContent):
+    type: Literal["code"]
+    text: str
+
 
-    type: str = Field(..., pattern="^(user|assistant)$")
-    content: Union[str, List[Dict[str, Any]]] = Field(...)
+class FileContent(BaseContent):
+    type: Literal["file"]
+    file_path: str
+    file_content: str
 
 
-class LLMBuilderRequest(BaseModel):
-    """Request model for LLM builder endpoint."""
+class EventContent(BaseModel):
+    type: Literal["event"]
+    event: str = Field(..., description="The event's type_name")
 
-    messages: List[ChatMessage] = Field(..., min_items=1, max_items=50)
+    event_data: Dict[str, Any] = Field(
+        default_factory=dict,
+        description="Contains event-specific data fields."
+    )
+
+    @model_validator(mode="before")
+    @classmethod
+    def _collect_event_data(cls, data: Dict[str, Any]) -> Dict[str, Any]:
+        generic = {"type", "event"}
+        data["event_data"] = {
+            key: data.pop(key) for key in list(data.keys()) if key not in generic
+        }
+        return data
+
+    class Config:
+        extra = "forbid"
+
+
+class CopilotChatMessage(BaseModel):
+    """Model for a single chat messages between the user and the copilot."""
+
+    role: str = Field(..., pattern="^(user|copilot)$")
+    content: List[
+        Union[TextContent, LinkContent, CodeContent, FileContent, EventContent]
+    ] = Field(
+        ...,
+        description=(
+            "The content of the message. "
+            "The content is expected to be a list of content blocks. "
+            "The content blocks are expected to be one of the following types: "
+            "text, link, code, or file."
+        ),
+    )
+
+    @classmethod
+    def from_llm_response(cls, llm_response: Dict[str, Any]) -> "CopilotChatMessage":
+        """Create a CopilotChatMessage from an LLM response (role: copilot)."""
+        parsed_content = []
+        block_type_to_content_class = {
+            "text": TextContent,
+            "link": LinkContent,
+            "code": CodeContent,
+            "file": FileContent,
+            "event": EventContent,
+        }
+        for block in llm_response.get("content_blocks", []):
+            block_type = block.get("type")
+            if block_type in block_type_to_content_class.keys():
+                parsed_content.append(block_type_to_content_class[block_type](**block))
+            else:
+                structlogger.error(
+                    "copilot_chat_message.from_llm_response.unknown_content_block_type",
+                    event_info=f"Unknown content block type: `{block_type}`",
+                    block_type=block_type,
+                    block=block,
+                    llm_response=llm_response,
+                )
+                continue
+
+        return cls(role="copilot", content=parsed_content)
+
+    def get_text_content(self) -> str:
+        """Concatenate all 'text' content blocks into a single string."""
+        return "\n".join(
+            content_block.text
+            for content_block in self.content
+            if isinstance(content_block, TextContent)
+        )
+
+    def to_openai_format(self) -> Dict[str, Any]:
+        """Convert to OpenAI message format for API calls."""
+        role = "user" if self.role == "user" else "assistant"
+
+        if self.role == "user":
+            content = self.get_text_content()
+        else:
+            content = [block.model_dump() for block in self.content]
+            content = json.dumps(content)
+
+        return {"role": role, "content": content}
+
+
+class CopilotRequest(BaseModel):
+    """Request model for the copilot endpoint."""
+
+    copilot_chat_history: List[CopilotChatMessage] = Field(
+        ...,
+        description=(
+            "The chat history between the user and the copilot. "
+            "Used to generate a new response based on the previous conversation."
+        ),
+    )
+    session_id: str = Field(
+        ...,
+        description=(
+            "The session ID of chat session with the assistant. "
+            "Used to fetch the conversation from the tracker."
+        ),
+    )
 
 
-class LLMBuilderContext(BaseModel):
-    """Context model for LLM builder endpoint."""
+class CopilotContext(BaseModel):
+    """Model containing the context used by the copilot to generate a response."""
 
     tracker: Optional[DialogueStateTracker] = Field(None)
-    bot_logs: str = Field("")
-    chat_bot_files: Dict[str, str] = Field({})
-    chat_history: List[ChatMessage] = Field([])
+    assistant_logs: str = Field("")
+    assistant_files: Dict[str, str] = Field({})
+    copilot_chat_history: List[CopilotChatMessage] = Field([])
 
     class Config:
         """Config for LLMBuilderContext."""
@@ -123,8 +238,8 @@ class LinkBlock(ContentBlock):
     text: str = Field(..., pattern=r"^https?://")
 
 
-class LLMHelperResponse(BaseModel):
-    """Response model for LLM helper."""
+class CoPilotHelperResponse(BaseModel):
+    """Response model for CoPilot helper."""
 
     content_blocks: List[Union[TextBlock, CodeBlock, FileBlock, LinkBlock]] = Field(...)
 

rasa/builder/service.py

@@ -1,6 +1,7 @@
 """Main service for the prompt-to-bot functionality."""
 
 import os
+import sys
 from typing import Any, Optional
 
 import structlog
@@ -18,9 +19,9 @@ from rasa.builder.llm_service import llm_service
 from rasa.builder.logging_utils import get_recent_logs
 from rasa.builder.models import (
     ApiErrorResponse,
-    LLMBuilderContext,
-    LLMBuilderRequest,
-    LLMHelperResponse,
+    CopilotChatMessage,
+    CopilotContext,
+    CopilotRequest,
     PromptRequest,
     ServerSentEvent,
     TemplateRequest,
@@ -51,6 +52,10 @@ def setup_project_generator(project_folder: Optional[str] = None) -> ProjectGene
     # for relative paths (./docs) in a projects config to work
     os.chdir(project_folder)
 
+    # Ensure the project folder is in sys.path
+    if project_folder not in sys.path:
+        sys.path.insert(0, project_folder)
+
     structlogger.info(
         "bot_builder_service.service_initialized", project_folder=project_folder
     )
@@ -134,8 +139,7 @@ async def health(request: Request) -> HTTPResponse:
 @openapi.tag("bot-generation")
 @openapi.body(
     {"application/json": model_to_schema(PromptRequest)},
-    description="Prompt request with natural language description and client ID "
-    "for tracking",
+    description="Prompt request with natural language description.",
     required=True,
 )
 @openapi.response(
@@ -246,7 +250,6 @@ async def handle_prompt_to_bot(request: Request) -> None:
 
         structlogger.info(
             "bot_builder_service.prompt_to_bot.success",
-            client_id=prompt_data.client_id,
             files_generated=list(bot_files.keys()),
         )
 
@@ -300,7 +303,7 @@ async def handle_prompt_to_bot(request: Request) -> None:
 @openapi.tag("bot-generation")
 @openapi.body(
     {"application/json": model_to_schema(TemplateRequest)},
-    description="Template request with template name and client ID for " "tracking",
+    description="Template request with template name.",
     required=True,
 )
 @openapi.response(
@@ -415,7 +418,6 @@ async def handle_template_to_bot(request: Request) -> None:
 
         structlogger.info(
             "bot_builder_service.template_to_bot.success",
-            client_id=template_data.client_id,
             files_generated=list(bot_files.keys()),
         )
 
@@ -639,22 +641,27 @@ async def get_bot_data(request: Request) -> HTTPResponse:
         )
 
 
-@bp.route("/llm-builder", methods=["POST"])
-@openapi.summary("LLM assistant for bot building")
+@bp.route("/copilot", methods=["POST"])
+@openapi.summary("AI copilot for bot building")
 @openapi.description(
-    "Provides LLM-powered assistance for bot building tasks, including "
-    "debugging, suggestions, and explanations"
+    "Provides LLM-powered copilot assistance for conversational bot development, "
+    "including debugging, suggestions, and explanations."
 )
-@openapi.tag("llm-assistant")
+@openapi.tag("copilot")
 @openapi.body(
-    {"application/json": model_to_schema(LLMBuilderRequest)},
-    description="LLM builder request containing chat messages and context",
+    {"application/json": model_to_schema(CopilotRequest)},
+    description=(
+        "Copilot request containing: "
+        "1. conversation history between user and copilot, "
+        "2. session ID for tracking conversation context with the bot being built, and"
+        "3. additional context."
+    ),
     required=True,
 )
 @openapi.response(
     200,
-    {"application/json": model_to_schema(LLMHelperResponse)},
-    description="LLM response with assistance and suggestions",
+    {"application/json": model_to_schema(CopilotChatMessage)},
+    description="Copilot response with assistance and suggestions.",
 )
 @openapi.response(
     400,
@@ -664,46 +671,45 @@ async def get_bot_data(request: Request) -> HTTPResponse:
 @openapi.response(
     502,
     {"application/json": model_to_schema(ApiErrorResponse)},
-    description="LLM generation failed",
+    description="LLM generation failed.",
 )
 @openapi.response(
     500,
     {"application/json": model_to_schema(ApiErrorResponse)},
-    description="Internal server error",
+    description="Internal server error.",
 )
-async def llm_builder(request: Request) -> HTTPResponse:
-    """Handle LLM builder requests."""
+async def copilot(request: Request) -> HTTPResponse:
+    """Handle copilot requests."""
     project_generator = get_project_generator(request)
     input_channel = get_input_channel(request)
 
     try:
         # Validate request
-        builder_request = LLMBuilderRequest(**request.json)
+        copilot_request = CopilotRequest(**request.json)
 
         # Get current conversation context
         current_tracker = await current_tracker_from_input_channel(
             request.app, input_channel
         )
-        bot_logs = get_recent_logs()
-        chat_bot_files = project_generator.get_bot_files()
+        assistant_logs = get_recent_logs()
+        assistant_files = project_generator.get_bot_files()
 
-        # create LLM builder context
-        llm_builder_context = LLMBuilderContext(
+        # Create LLM builder context
+        context = CopilotContext(
             tracker=current_tracker,
-            bot_logs=bot_logs,
-            chat_bot_files=chat_bot_files,
-            chat_history=builder_request.messages,
+            assistant_logs=assistant_logs,
+            assistant_files=assistant_files,
+            copilot_chat_history=copilot_request.copilot_chat_history,
         )
 
         # Generate response
-        messages = await llm_service.create_helper_messages(llm_builder_context)
-        llm_response = await llm_service.generate_helper_response(messages)
+        copilot_response = await llm_service.copilot.generate_response(context)
 
-        return response.json(llm_response)
+        return response.json(copilot_response.model_dump())
 
     except LLMGenerationError as e:
         structlogger.error(
-            "bot_builder_service.llm_builder.generation_error", error=str(e)
+            "bot_builder_service.copilot_helper.generation_error", error=str(e)
         )
         return response.json(
             ApiErrorResponse(
@@ -714,7 +720,7 @@ async def llm_builder(request: Request) -> HTTPResponse:
 
     except Exception as e:
         structlogger.error(
-            "bot_builder_service.llm_builder.unexpected_error", error=str(e)
+            "bot_builder_service.copilot_helper.unexpected_error", error=str(e)
         )
         return response.json(
             ApiErrorResponse(

rasa/core/actions/direct_custom_actions_executor.py

@@ -1,5 +1,5 @@
-import os
 from functools import lru_cache
+from importlib.util import find_spec
 from typing import (
     Any,
     ClassVar,
@@ -16,6 +16,7 @@ from rasa.core.actions.custom_action_executor import (
 )
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.trackers import DialogueStateTracker, EventVerbosity
+from rasa.shared.exceptions import RasaException
 from rasa.utils.endpoints import EndpointConfig
 
 structlogger = structlog.get_logger(__name__)
@@ -62,20 +63,12 @@ class DirectCustomActionExecutor(CustomActionExecutor):
             return
 
         module_name = self.action_endpoint.actions_module
-        # TODO: remove this / change back
-        structlogger.info(
-            "action.direct_custom_action_executor.register_actions_from_a_module",
-            module_name=module_name,
-            cwd=os.getcwd(),
-            ls_dir=os.listdir(os.getcwd()),
-            ls_dir_module=os.listdir(os.getcwd() + "/" + module_name),
-        )
-        # if not find_spec(module_name):
-        #     raise RasaException(
-        #         f"You've provided the custom actions module '{module_name}' "
-        #         f"to run directly by the rasa server, however this module does "
-        #         f"not exist. Please check for typos in your `endpoints.yml` file."
-        #     )
+        if not find_spec(module_name):
+            raise RasaException(
+                f"You've provided the custom actions module '{module_name}' "
+                f"to run directly by the rasa server, however this module does "
+                f"not exist. Please check for typos in your `endpoints.yml` file."
+            )
 
         self.action_executor.register_package(module_name)
         DirectCustomActionExecutor._actions_module_registered = True

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.1a17"
+__version__ = "3.13.1a19"

{rasa_pro-3.13.1a17.dist-info → rasa_pro-3.13.1a19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.1a17
+Version: 3.13.1a19
 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.1a17.dist-info → rasa_pro-3.13.1a19.dist-info}/RECORD

@@ -4,20 +4,22 @@ rasa/api.py,sha256=RY3SqtlOcdq4YZGgr6DOm-nUBpiA8l8uguUZOctL_7o,6320
 rasa/builder/README.md,sha256=7WYioSzBHFY25h1QCFellv7bIOW9VLH7Gf7dwQEc1k0,3715
 rasa/builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/builder/config.py,sha256=NxTvyqWGzJnPANv2s78SBv98fiVhebF2ktzWgr6W0CA,2461
+rasa/builder/constants.py,sha256=M64YEO-8HMAY4Q9EBsYXKD7DaF28uzeGzFWI1ylAgGQ,101
+rasa/builder/copilot-llm-structured-output-response-schema.json,sha256=jpHJoW4TZ9f0kQgt5SuyLigHmMcAHY0oWSsh5Hf8fnE,1629
+rasa/builder/copilot.py,sha256=MhNrQO9YFSy_Q1BMQ8CE2Bwavmu75DO-kE2cIAAJsVA,9236
+rasa/builder/copilot_system_prompt.jinja2,sha256=2FhWizah072ZPMZDG5W55rosPeqPepZsjsfcHxxoN-s,9639
 rasa/builder/create_openai_vector_store.py,sha256=jAk1QzM4HiC0wjkn1031xBzLFGwVV4JUJMc50QZFIdw,6642
 rasa/builder/exceptions.py,sha256=lsMX_892AoDi4yY86mIX0x-hGvCDZN22kOTTGM5Tvro,1220
 rasa/builder/inkeep-rag-response-schema.json,sha256=ePVbGo6u6sm_CPS8EeECX3UayIvcfUe6yTy2gtexKlk,1498
-rasa/builder/inkeep_document_retrieval.py,sha256=FafqkRgwn-OktF2oBEUzGw28KhmKPU90SSL5Tb8jLZA,7467
-rasa/builder/llm-helper-schema.json,sha256=z5IJc_-2mZ9oQ-z-9WzTivOoqYsLXCAm8MIOTWy5rGs,1609
+rasa/builder/inkeep_document_retrieval.py,sha256=4NOZl1gfXqKcdXWdCei9BSRLuIwSj_550X-v-0OQ6x8,8239
 rasa/builder/llm_context.py,sha256=zy7htrXgS_QWJWeEj4TfseQgTI65whFJR_4GKm_iOvE,2826
-rasa/builder/llm_helper_prompt.jinja2,sha256=AhfEzXYIMTmWgd2TgVmPVeCfojHA29IiuO6JhTOXXKY,9585
-rasa/builder/llm_service.py,sha256=vAVekor9ZBRZw6-TGDGXoutd9UaNnQV2GltbLbM0-Qc,11459
+rasa/builder/llm_service.py,sha256=NEB8OmM2V6xhqMnOChQXKa_nmu6LwE_9QR31liqsWFY,6114
 rasa/builder/logging_utils.py,sha256=iPJoN2HhNlS14SKyZv0s0iIljrmP6A8s8C5btoDVOXM,1383
 rasa/builder/main.py,sha256=KzlVDESi5FO3ZAXxr2RISwn2aXACaY4jjZ5Fb-lcVM4,4242
-rasa/builder/models.py,sha256=EuP6FVD0VIkG8Jzf8ftYW2A1xirDRTlN4Ae-OmdLdAA,6208
+rasa/builder/models.py,sha256=GyiCPlUQ-luZ12FwzSvz64o0ecX6Y3ZbUk1ah6R5Ja8,9755
 rasa/builder/project_generator.py,sha256=7z2wyiwXFYQdw9RT2Yht5NrrtWwntgTBdCuaJGrEheM,10937
 rasa/builder/scrape_rasa_docs.py,sha256=yWezvPgfLkokm9t71ngyckNKCiY4bRvc9azEgSYN0Sg,2480
-rasa/builder/service.py,sha256=Z8yvRCnRYQbdHtyiNXLU8LhLlOl7FvccXbpWbOJ0RVU,24575
+rasa/builder/service.py,sha256=z7-ROQ6x4FGCm6L1jNJ_d1V7k1w41khBfQFGZg6cOj0,24701
 rasa/builder/skill_to_bot_prompt.jinja2,sha256=h2Fgoh9k3XinN0blEEqMuOWuvwXxJifP3GJs-GczgBU,5530
 rasa/builder/training_service.py,sha256=9OIRZ6CRXHc_m9VHkeHHK7woN5Q1n7BpmsxjYjuByoI,4046
 rasa/builder/validation_service.py,sha256=rKMgbG8Jyv8WMnTIXOMd7VuGWAYicrL9wDJ22BJXZHE,2765
@@ -310,7 +312,7 @@ rasa/core/actions/action_trigger_flow.py,sha256=IydYAGafTtoY6XSgCX124xJQhzudUg8J
 rasa/core/actions/action_trigger_search.py,sha256=QfYqnaGRCqRYJ4msYsLAbnVYW5ija_tqhCcKIN8aEfw,1064
 rasa/core/actions/constants.py,sha256=gfgdWmj-OJ5xTcTAS1OcXQ3dgcTiHO98NC-SGyKlTjs,161
 rasa/core/actions/custom_action_executor.py,sha256=qafASBdM3-hByDqbkNxgXfx5yMSsJh_nB3B7x9ye0TY,6176
-rasa/core/actions/direct_custom_actions_executor.py,sha256=JXlyRA40Hedkz6URyemUEIV0fFCehoOoAzvatu--2FU,4025
+rasa/core/actions/direct_custom_actions_executor.py,sha256=IzxRnPF92zs3WX-p9DoFq51Vf0QwfE6prB_AlyEEllc,3746
 rasa/core/actions/e2e_stub_custom_action_executor.py,sha256=D-kECC1QjVLv4owNxstW2xJPPsXTGfGepvquMeWB_ec,2282
 rasa/core/actions/forms.py,sha256=MPGxp3vg-EgFcU5UQYqWM2tycSFIuoF6vWvNSSWPhSA,26967
 rasa/core/actions/grpc_custom_action_executor.py,sha256=EDxdSIDA4H4Mu-QZk-pPGV2N41ZsbY8W9laV6l1WlDQ,9103
@@ -1068,9 +1070,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=AVviI7uhVQCuE-dl34eiA4si4yQj06yJK9V2U7CyeeM,120
-rasa_pro-3.13.1a17.dist-info/METADATA,sha256=3NmO_L2ac2WjOweNuV5fYTtIKciTj_ezAyC8nIwCmLI,10610
-rasa_pro-3.13.1a17.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.13.1a17.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rasa_pro-3.13.1a17.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.13.1a17.dist-info/RECORD,,
+rasa/version.py,sha256=5BSECPf7G03URRFUd2ZM2wihUq-XTlLshREyRXZyPGI,120
+rasa_pro-3.13.1a19.dist-info/METADATA,sha256=8YKwP1nDPfThPyWzWaqxZ_2YMjmC6vOACJb_Flm_nDI,10610
+rasa_pro-3.13.1a19.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.13.1a19.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rasa_pro-3.13.1a19.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.13.1a19.dist-info/RECORD,,