rasa-pro 3.14.0a12__py3-none-any.whl → 3.14.0a14__py3-none-any.whl

rasa/builder/main.py

@@ -22,9 +22,6 @@ from rasa.builder.logging_utils import (
     log_request_start,
 )
 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, update_agent
 from rasa.core.channels.studio_chat import StudioChatInput
 from rasa.server import configure_cors
@@ -150,16 +147,6 @@ def create_app(project_folder: str) -> Sanic:
         except Exception as e:
             structlogger.warning("Failed to load agent on server startup", error=str(e))
 
-    if config.HELLO_RASA_PROJECT_ID and app.ctx.project_generator.is_empty():
-        app.register_listener(background_download_template_caches, "after_server_start")
-    else:
-        structlogger.debug(
-            "builder.main.background_cache_download.disabled",
-            event_info=(
-                "No hello rasa project id set; skipping background cache download"
-            ),
-        )
-
     return app
 
 

rasa/builder/project_generator.py

@@ -60,7 +60,7 @@ class ProjectGenerator:
         create_initial_project(self.project_folder.as_posix(), template)
         # If a local cache for this template exists, copy it into the project.
         # We no longer download here to avoid blocking project creation.
-        copy_cache_for_template_if_available(template, self.project_folder)
+        await copy_cache_for_template_if_available(template, self.project_folder)
         # needs to happen after caching, as we download/copy .rasa and that would
         # overwrite the project info file in .rasa
         ensure_first_used(self.project_folder)
@@ -339,6 +339,8 @@ class ProjectGenerator:
         for filename in os.listdir(self.project_folder):
             file_path = os.path.join(self.project_folder, filename)
             try:
+                if filename == "lost+found":
+                    continue
                 if os.path.isfile(file_path) or os.path.islink(file_path):
                     os.unlink(file_path)
                 elif os.path.isdir(file_path):

rasa/builder/template_cache.py

@@ -1,18 +1,11 @@
-import asyncio
 import os
-import shutil
-import tarfile
-import tempfile
 from pathlib import Path
-from typing import Generator
 
 import aiofiles
-import aiohttp
+import aiofiles.os
+import aioshutil
 import structlog
-from sanic import Sanic
 
-import rasa.version
-from rasa.builder.logging_utils import capture_exception_with_context
 from rasa.cli.scaffold import ProjectTemplateName
 
 structlogger = structlog.get_logger()
@@ -20,64 +13,15 @@ structlogger = structlog.get_logger()
 CACHE_BUCKET_URL = "https://trained-templates.s3.us-east-1.amazonaws.com"
 
 # Root directory for storing downloaded template caches on disk.
-_CACHE_ROOT_DIR = Path(
-    os.getenv(
-        "RASA_TEMPLATE_CACHE_DIR",
-        Path.home().joinpath(".rasa", "template-cache").as_posix(),
-    )
-)
+_CACHE_ROOT_DIR = Path(os.getenv("RASA_TEMPLATE_CACHE_DIR", "/templates"))
 
 
 def _template_cache_dir(template: ProjectTemplateName) -> Path:
     """Return the local cache directory for a given template and version."""
-    return _CACHE_ROOT_DIR / rasa.version.__version__ / template.value
+    return _CACHE_ROOT_DIR / template.value
 
 
-def _cache_root_dir() -> Path:
-    return Path(
-        os.getenv(
-            "RASA_TEMPLATE_CACHE_DIR",
-            Path.home().joinpath(".rasa", "template-cache").as_posix(),
-        )
-    )
-
-
-def _safe_tar_members(
-    tar: tarfile.TarFile, destination_directory: Path
-) -> Generator[tarfile.TarInfo, None, None]:
-    """Yield safe members for extraction to prevent path traversal and links.
-
-    Args:
-        tar: Open tar file handle
-        destination_directory: Directory to which files will be extracted
-
-    Yields:
-        Members that are safe to extract within destination_directory
-    """
-    base_path = destination_directory.resolve()
-
-    for member in tar.getmembers():
-        name = member.name
-        # Skip empty names and absolute paths
-        if not name or name.startswith("/") or name.startswith("\\"):
-            continue
-
-        # Disallow symlinks and hardlinks
-        if member.issym() or member.islnk():
-            continue
-
-        # Compute the final path and ensure it's within base_path
-        target_path = (base_path / name).resolve()
-        try:
-            target_path.relative_to(base_path)
-        except ValueError:
-            # Member would escape the destination directory
-            continue
-
-        yield member
-
-
-def _copytree(src: Path, dst: Path) -> None:
+async def _copytree(src: Path, dst: Path) -> None:
     """Copy directory tree from src to dst, merging into dst.
 
     Existing files are overwritten. Hidden files and directories are included, as
@@ -87,132 +31,14 @@ def _copytree(src: Path, dst: Path) -> None:
     for root, dirs, files in os.walk(src):
         rel_path = Path(root).relative_to(src)
         target_dir = dst / rel_path
-        target_dir.mkdir(parents=True, exist_ok=True)
+        await aiofiles.os.makedirs(target_dir, exist_ok=True)
         for filename in files:
             src_file = Path(root) / filename
             dst_file = target_dir / filename
-            shutil.copy2(src_file, dst_file)
-
-
-async def download_cache_for_template(
-    template: ProjectTemplateName, target_dir: str
-) -> None:
-    # get a temp path for the cache file download
-    temporary_cache_file = tempfile.NamedTemporaryFile(suffix=".tar.gz", delete=False)
-
-    try:
-        url = f"{CACHE_BUCKET_URL}/{rasa.version.__version__}-{template.value}.tar.gz"
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url) as response:
-                response.raise_for_status()
-                async with aiofiles.open(temporary_cache_file.name, "wb") as f:
-                    async for chunk in response.content.iter_chunked(1024 * 1024):
-                        await f.write(chunk)
-
-        # extract the cache to the project folder using safe member filtering
-        with tarfile.open(temporary_cache_file.name, "r:gz") as tar:
-            destination = Path(target_dir)
-            destination.mkdir(parents=True, exist_ok=True)
-            tar.extractall(
-                path=destination,
-                members=_safe_tar_members(tar, destination),
-            )
-
-        structlogger.info(
-            "project_generator.download_cache_for_template.success",
-            template=template,
-            event_info=(
-                "Downloaded cache for template, extracted to target directory."
-            ),
-            target_dir=target_dir,
-        )
-    except aiohttp.ClientResponseError as e:
-        if e.status == 403:
-            structlogger.debug(
-                "project_generator.download_cache_for_template.no_cache_found",
-                template=template,
-                event_info=("No cache found for template, continuing without it."),
-                target_dir=target_dir,
-            )
-        else:
-            capture_exception_with_context(
-                e,
-                "project_generator.download_cache_for_template.response_error",
-                extra={
-                    "template": template.value,
-                    "status": str(e.status),
-                    "target_dir": target_dir,
-                },
-            )
-    except Exception as exc:
-        capture_exception_with_context(
-            exc,
-            "project_generator.download_cache_for_template.unexpected_error",
-            extra={"template": template.value, "target_dir": target_dir},
-        )
-    finally:
-        # Clean up the temporary file
-        try:
-            Path(temporary_cache_file.name).unlink(missing_ok=True)
-        except Exception as exc:
-            structlogger.debug(
-                "project_generator.download_cache_for_template.cleanup_error",
-                error=str(exc),
-                template=template,
-                event_info=("Failed to cleanup cache for template, ignoring."),
-            )
-
-
-async def background_download_template_caches(
-    app: Sanic, loop: asyncio.AbstractEventLoop
-) -> None:
-    """Kick off background downloads of template caches if enabled."""
-    try:
-        structlogger.info(
-            "builder.main.background_cache_download.start",
-            event_info=(
-                "Starting background download of template caches for this " "version"
-            ),
-        )
-
-        # Ensure cache root exists
-        _cache_root_dir().mkdir(parents=True, exist_ok=True)
-
-        async def _download(template: ProjectTemplateName) -> None:
-            try:
-                target_dir = _template_cache_dir(template)
-                if target_dir.exists() and any(target_dir.iterdir()):
-                    structlogger.debug(
-                        "builder.main.background_cache_download.skipped",
-                        template=template,
-                        event_info=(
-                            "Skipping download of template cache because it "
-                            "already exists."
-                        ),
-                        target_dir=target_dir,
-                    )
-                    return
-
-                target_dir.mkdir(parents=True, exist_ok=True)
-                await download_cache_for_template(template, target_dir.as_posix())
-            except Exception as exc:
-                structlogger.debug(
-                    "builder.main.background_cache_download.error",
-                    template=template,
-                    error=str(exc),
-                )
-
-        # schedule downloads concurrently without blocking startup
-        for template in ProjectTemplateName:
-            loop.create_task(_download(template))
-    except Exception as exc:
-        structlogger.debug(
-            "builder.main.background_cache_download.unexpected_error",
-            error=str(exc),
-        )
+            await aioshutil.copy2(src_file, dst_file)
 
 
-def copy_cache_for_template_if_available(
+async def copy_cache_for_template_if_available(
     template: ProjectTemplateName, project_folder: Path
 ) -> None:
     """Copy a previously downloaded cache for `template` into `project_folder`.
@@ -222,7 +48,7 @@ def copy_cache_for_template_if_available(
     try:
         cache_dir = _template_cache_dir(template)
         if cache_dir.exists() and any(cache_dir.iterdir()):
-            _copytree(cache_dir, project_folder)
+            await _copytree(cache_dir, project_folder)
             structlogger.info(
                 "project_generator.copy_cache_for_template.success",
                 template=template,

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.0a12"
+__version__ = "3.14.0a14"

{rasa_pro-3.14.0a12.dist-info → rasa_pro-3.14.0a14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.14.0a12
+Version: 3.14.0a14
 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
@@ -28,6 +28,7 @@ Requires-Dist: absl-py (>=2.0,<2.1)
 Requires-Dist: aio-pika (>=8.2.3,<9.4.4)
 Requires-Dist: aiogram (>=3.15,<3.16)
 Requires-Dist: aiohttp (>=3.10,<3.11)
+Requires-Dist: aioshutil (>=1.5,<2.0)
 Requires-Dist: apscheduler (>=3.10,<3.11)
 Requires-Dist: attrs (>=23.1,<23.2)
 Requires-Dist: azure-identity (>=1.19.0,<1.20.0)

{rasa_pro-3.14.0a12.dist-info → rasa_pro-3.14.0a14.dist-info}/RECORD

@@ -37,15 +37,15 @@ rasa/builder/job_manager.py,sha256=eQ5HRff-U4Cj3joHKqpjDcfCMWj4nz4D_oQmoozpwPM,2
 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=7UhHynU4pTiWj6v7_c9bfRutfT8TIFIZmQs3BRy2aKY,7946
+rasa/builder/main.py,sha256=_LrQrka_zsgHoPWS2sglVgPKsmqYEouOvVJMsZB-QkM,7459
 rasa/builder/models.py,sha256=UWMN1Z20Btrc2fBK4y4eAyRmx3RVyQiqiUHYQTJfyIE,5937
-rasa/builder/project_generator.py,sha256=1CMFZxhOD0pmrTIC-1nMRdQRqDvUgW0zMFNBwVuT-Og,13834
+rasa/builder/project_generator.py,sha256=d7ZAMX1NIR-lzznBtEV_S0MODRGJ-kmzVyHI0HtYCcs,13914
 rasa/builder/project_info.py,sha256=ZBwFCigZLSo1RBMhlZDYBoVl2G-9OnhRrYxdMWHn6S4,2093
 rasa/builder/scrape_rasa_docs.py,sha256=iR_uThYA_kjDeIFY7AdpXcP-30P2vOHQ65gH4S1OjLw,2485
 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/template_cache.py,sha256=Lrn_AjiDTdwG1ydBNKeuCtydTlwOfYs7i2J1Vk9djpM,2424
 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
@@ -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=Cwf73DCZiOAF-zeBSpScxpoQsF7If2Rg7TeXms4Jihk,120
-rasa_pro-3.14.0a12.dist-info/METADATA,sha256=DTaiRiz_xMk8gTDkwth-WBv5eqYem13tvAhuqQuplXE,10153
-rasa_pro-3.14.0a12.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.14.0a12.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rasa_pro-3.14.0a12.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.14.0a12.dist-info/RECORD,,
+rasa/version.py,sha256=swo0Q6PztYkxOIZHWlEfLcETFHTje68-yoUGlZIBVd4,120
+rasa_pro-3.14.0a14.dist-info/METADATA,sha256=mHkfVyM2suR66EHcHkMGRt-hm86DortyU-LKqNSgJfU,10191
+rasa_pro-3.14.0a14.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.14.0a14.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rasa_pro-3.14.0a14.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.14.0a14.dist-info/RECORD,,