rasa-pro 3.14.0a4__py3-none-any.whl → 3.14.0a5__py3-none-any.whl

rasa/builder/jobs.py

@@ -16,10 +16,13 @@ from rasa.builder.models import (
     JobStatusEvent,
 )
 from rasa.builder.project_generator import ProjectGenerator
-from rasa.builder.training_service import train_and_load_agent, try_load_existing_agent
+from rasa.builder.training_service import (
+    train_and_load_agent,
+    try_load_existing_agent,
+    update_agent,
+)
 from rasa.builder.validation_service import validate_project
 from rasa.cli.scaffold import ProjectTemplateName
-from rasa.core.channels.studio_chat import StudioChatInput
 
 structlogger = structlog.get_logger()
 
@@ -45,7 +48,6 @@ async def run_prompt_to_bot_job(
         prompt: The natural language prompt for bot generation.
     """
     project_generator: ProjectGenerator = app.ctx.project_generator
-    input_channel: StudioChatInput = app.ctx.input_channel
 
     await push_job_status_event(job, JobStatus.received)
 
@@ -60,10 +62,8 @@ async def run_prompt_to_bot_job(
 
         # 2. Training
         await push_job_status_event(job, JobStatus.training)
-        app.ctx.agent = await train_and_load_agent(
-            project_generator.get_training_input()
-        )
-        input_channel.agent = app.ctx.agent
+        agent = await train_and_load_agent(project_generator.get_training_input())
+        update_agent(agent, app)
         await push_job_status_event(job, JobStatus.train_success)
 
         structlogger.info(
@@ -129,7 +129,6 @@ async def run_template_to_bot_job(
         template_name: The name of the template to use for bot generation.
     """
     project_generator: ProjectGenerator = app.ctx.project_generator
-    input_channel = app.ctx.input_channel
 
     await push_job_status_event(job, JobStatus.received)
 
@@ -142,16 +141,14 @@ async def run_template_to_bot_job(
 
         # 2) Training
         await push_job_status_event(job, JobStatus.training)
-        app.ctx.agent = await try_load_existing_agent(project_generator.project_folder)
-        if app.ctx.agent is None:
-            app.ctx.agent = await train_and_load_agent(
-                project_generator.get_training_input()
-            )
+        agent = await try_load_existing_agent(project_generator.project_folder)
+        if agent is None:
+            agent = await train_and_load_agent(project_generator.get_training_input())
         else:
             structlogger.info(
                 "bot_builder_service.template_to_bot.agent_loaded_from_cache",
             )
-        input_channel.agent = app.ctx.agent
+        update_agent(agent, app)
         await push_job_status_event(job, JobStatus.train_success)
 
         # 3) Done
@@ -216,7 +213,6 @@ async def run_update_files_job(
     bot_files: dict,
 ) -> None:
     project_generator = app.ctx.project_generator
-    input_channel = app.ctx.input_channel
     await push_job_status_event(job, JobStatus.received)
 
     try:
@@ -232,8 +228,8 @@ async def run_update_files_job(
 
         # 2. Training
         await push_job_status_event(job, JobStatus.training)
-        app.ctx.agent = await train_and_load_agent(training_input)
-        input_channel.agent = app.ctx.agent
+        agent = await train_and_load_agent(training_input)
+        update_agent(agent, app)
         await push_job_status_event(job, JobStatus.train_success)
 
         await push_job_status_event(job, JobStatus.done)

rasa/builder/main.py

@@ -25,7 +25,7 @@ from rasa.builder.service import bp, setup_project_generator
 from rasa.builder.template_cache import (
     background_download_template_caches,
 )
-from rasa.builder.training_service import try_load_existing_agent
+from rasa.builder.training_service import try_load_existing_agent, update_agent
 from rasa.core.channels.studio_chat import StudioChatInput
 from rasa.server import configure_cors
 from rasa.utils.common import configure_logging_and_warnings
@@ -101,7 +101,6 @@ def create_app(project_folder: str) -> Sanic:
         use_authentication=app.config.USE_AUTHENTICATION,
         rasa_version=rasa.__version__,
     )
-    app.ctx.agent = None
 
     # Set up project generator and store in app context
     app.ctx.project_generator = setup_project_generator(project_folder)
@@ -109,6 +108,8 @@ def create_app(project_folder: str) -> Sanic:
     # Set up input channel and store in app context
     app.ctx.input_channel = setup_input_channel()
 
+    update_agent(None, app)
+
     # Register the blueprint
     app.blueprint(bp)
 
@@ -140,7 +141,7 @@ def create_app(project_folder: str) -> Sanic:
         try:
             existing_agent = await try_load_existing_agent(project_folder)
             if existing_agent:
-                app.ctx.agent = existing_agent
+                update_agent(existing_agent, app)
                 structlogger.info("Agent loaded on server startup")
             else:
                 structlogger.info(

rasa/builder/training_service.py

@@ -5,10 +5,12 @@ from pathlib import Path
 from typing import Optional
 
 import structlog
+from sanic import Sanic
 
 from rasa.builder.exceptions import AgentLoadError, TrainingError
 from rasa.builder.models import TrainingInput
 from rasa.core.agent import Agent, load_agent
+from rasa.core.channels.studio_chat import StudioChatInput
 from rasa.core.utils import AvailableEndpoints, read_endpoints_from_path
 from rasa.model import get_latest_model
 from rasa.model_training import TrainingResult, train
@@ -17,6 +19,15 @@ from rasa.shared.importers.importer import TrainingDataImporter
 structlogger = structlog.get_logger()
 
 
+def update_agent(agent: Optional[Agent], app: Sanic) -> None:
+    """Update the agent in the request context."""
+    app.ctx.agent = agent
+    if hasattr(app.ctx, "input_channel") and isinstance(
+        app.ctx.input_channel, StudioChatInput
+    ):
+        app.ctx.input_channel.agent = agent
+
+
 async def train_and_load_agent(input: TrainingInput) -> Agent:
     """Train a model and load an agent.
 

rasa/core/channels/studio_chat.py

@@ -480,7 +480,8 @@ class StudioChatInput(SocketIOInput, VoiceInputChannel):
         async def after_server_start(
             app: "Sanic", _: asyncio.AbstractEventLoop
         ) -> None:
-            self.agent = app.ctx.agent
+            if hasattr(app.ctx, "agent"):
+                self.agent = app.ctx.agent
 
         @self.sio_server.on("disconnect", namespace=self.namespace)
         async def disconnect(sid: Text) -> None:

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.14.0a4"
+__version__ = "3.14.0a5"

{rasa_pro-3.14.0a4.dist-info → rasa_pro-3.14.0a5.dist-info}/METADATA

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

@@ -34,10 +34,10 @@ rasa/builder/guardrails/models.py,sha256=WlNoZWjDGo4Tigx7LLTkmR-zmMhVKpro0PjNdwM
 rasa/builder/guardrails/store.py,sha256=-mJdsCnHgSI08uPnPwZRObIyRV9u98zcpQ5QkeHdVK0,7660
 rasa/builder/guardrails/utils.py,sha256=2eudDOqPCTFiKWEGRfsCHUXNhjsht-tMsLJlh8hv0AE,11275
 rasa/builder/job_manager.py,sha256=eQ5HRff-U4Cj3joHKqpjDcfCMWj4nz4D_oQmoozpwPM,2507
-rasa/builder/jobs.py,sha256=fyx6gpiotgTu7YmflbkJDACaIW3Fg0-F-U7SmMTSY_4,9642
+rasa/builder/jobs.py,sha256=KgqWNW5e8Nh5kYBm3Fm0wZWspbPRe5Qr1cRfrVKnYlM,9346
 rasa/builder/llm_service.py,sha256=y3CPQS0qHGFhe6Z4lbs2HkEVztYYVZtnWiTNjghlBdE,8859
 rasa/builder/logging_utils.py,sha256=E1YZs5BdHT9TrnoA2758sFMD1Xw7e5mnAtqWSAZs1gk,9296
-rasa/builder/main.py,sha256=mvbttnSrSUc8RmrS_1P8D9Z5fMJJGFlr42_Cn_zVo6w,7925
+rasa/builder/main.py,sha256=7UhHynU4pTiWj6v7_c9bfRutfT8TIFIZmQs3BRy2aKY,7946
 rasa/builder/models.py,sha256=UWMN1Z20Btrc2fBK4y4eAyRmx3RVyQiqiUHYQTJfyIE,5937
 rasa/builder/project_generator.py,sha256=1CMFZxhOD0pmrTIC-1nMRdQRqDvUgW0zMFNBwVuT-Og,13834
 rasa/builder/project_info.py,sha256=ZBwFCigZLSo1RBMhlZDYBoVl2G-9OnhRrYxdMWHn6S4,2093
@@ -46,7 +46,7 @@ rasa/builder/service.py,sha256=DBIZeF9IDS-C0SWDfDwo8ieU6Ok9q5N417S3Mz82eLc,46649
 rasa/builder/shared/tracker_context.py,sha256=2P-DsWjWEkZ32dqrx6s4zVxdo0_mokZNrU3LYisu6MY,7691
 rasa/builder/skill_to_bot_prompt.jinja2,sha256=h2Fgoh9k3XinN0blEEqMuOWuvwXxJifP3GJs-GczgBU,5530
 rasa/builder/template_cache.py,sha256=GFI7o0peOFbbV4RQECsx7s60rhCc5FDOPM5a0DAfpuQ,8592
-rasa/builder/training_service.py,sha256=w2Z_nZqXQkBoPLNPxgLFPb3jBoq9GJMLXyfQ6k6F5MU,5596
+rasa/builder/training_service.py,sha256=kmcxgCxZzklxr4RKqan3aA_BU3pRE7WS_q-AO5sFyxM,5975
 rasa/builder/validation_service.py,sha256=FAHSf2tQZ8yDlckWWjqMqhjb0rANbXR2DJTybh4fHnM,3099
 rasa/cli/__init__.py,sha256=eO5vp9rFCANtbTVU-pxN3iMBKw4p9WRcgzytt9MzinY,115
 rasa/cli/arguments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -529,7 +529,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=N3aldDMzXotO85lX5pkmVtVq7g6gh9YpUpQpbAH3ogs,17560
-rasa/core/channels/studio_chat.py,sha256=WieWixHQm3p_laVGqobxI_1vN3M_jhNyi2ZkacutwxI,23502
+rasa/core/channels/studio_chat.py,sha256=qkA16kwXEJh5Emo7Xh7TmQfRD6xKS0TN9gVTqObGCGE,23548
 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
@@ -1123,9 +1123,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=_5IjhhzG-_LM5_Bpa09siEQATgFRYEsPp9FbOwXzVmM,83275
-rasa/version.py,sha256=CVp2O7CCDqX98uHAnt9kwsG8ZSG18A11bBm0SQxxJ00,119
-rasa_pro-3.14.0a4.dist-info/METADATA,sha256=weoGWM1LM-e_6diRVhuzENAKVdWMM6hnGgoWVHCYjOY,10152
-rasa_pro-3.14.0a4.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.14.0a4.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rasa_pro-3.14.0a4.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.14.0a4.dist-info/RECORD,,
+rasa/version.py,sha256=rUwLFIVnTPMfbY-jvJdgnI3ZzFod3g_Nwg8lIZlpWiI,119
+rasa_pro-3.14.0a5.dist-info/METADATA,sha256=PIV_8xQrTC_Kw6MkVRJynStykgYZK8aCcj28R1xv1sQ,10152
+rasa_pro-3.14.0a5.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.14.0a5.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rasa_pro-3.14.0a5.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.14.0a5.dist-info/RECORD,,