mirror of
https://github.com/langgenius/dify.git
synced 2026-03-27 01:00:13 +08:00
DifyCli and AppAssets used hardcoded absolute paths under /tmp/.dify/,
causing concurrent sandbox sessions on the same host (e.g. SSH provider)
to overwrite each other's config files and CLI binaries.
- Add Sandbox.id property (uuid4 hex) as a stable, path-safe identifier
independent of provider-specific environment IDs
- Convert DifyCli/AppAssets from static constants to per-sandbox instances
namespaced under /tmp/.dify/{sandbox.id}/
- Replace all vm.metadata.id references with sandbox.id
- Replace upload_file with heredoc-based pipeline step in session.py to
reduce round-trips
140 lines
5.3 KiB
Python
140 lines
5.3 KiB
Python
"""Service for creating and managing sandbox instances.
|
|
|
|
Three creation paths:
|
|
|
|
- ``create()`` — published runtime. Downloads the pre-built ZIP via
|
|
``AppAssetsInitializer`` and loads the ``SkillBundle`` via
|
|
``SkillInitializer``.
|
|
|
|
- ``create_draft()`` / ``create_for_single_step()`` — draft runtime.
|
|
``DraftAppAssetsInitializer`` runs the build pipeline on the fly,
|
|
compiles ``.md`` skills (saving the ``SkillBundle`` to Redis/S3 as a
|
|
side-effect), and pushes resolved content as inline base64 into the
|
|
sandbox. ``SkillInitializer`` then loads the bundle from Redis/S3.
|
|
No separate ``build_assets()`` call is needed.
|
|
"""
|
|
|
|
import logging
|
|
|
|
from core.sandbox.builder import SandboxBuilder
|
|
from core.sandbox.entities import AppAssets, SandboxType
|
|
from core.sandbox.entities.providers import SandboxProviderEntity
|
|
from core.sandbox.initializer.app_asset_attrs_initializer import AppAssetAttrsInitializer
|
|
from core.sandbox.initializer.app_assets_initializer import AppAssetsInitializer
|
|
from core.sandbox.initializer.dify_cli_initializer import DifyCliInitializer
|
|
from core.sandbox.initializer.draft_app_assets_initializer import DraftAppAssetsDownloader, DraftAppAssetsInitializer
|
|
from core.sandbox.initializer.skill_initializer import SkillInitializer
|
|
from core.sandbox.sandbox import Sandbox
|
|
from core.sandbox.storage.archive_storage import ArchiveSandboxStorage
|
|
from extensions.ext_storage import storage
|
|
from services.app_asset_service import AppAssetService
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class SandboxService:
|
|
@classmethod
|
|
def create(
|
|
cls,
|
|
tenant_id: str,
|
|
app_id: str,
|
|
user_id: str,
|
|
sandbox_id: str,
|
|
sandbox_provider: SandboxProviderEntity,
|
|
) -> Sandbox:
|
|
assets = AppAssetService.get_assets(tenant_id, app_id, user_id, is_draft=False)
|
|
if not assets:
|
|
raise ValueError(f"No assets found for tid={tenant_id}, app_id={app_id}")
|
|
|
|
archive_storage = ArchiveSandboxStorage(tenant_id, app_id, sandbox_id, storage.storage_runner)
|
|
sandbox = (
|
|
SandboxBuilder(tenant_id, SandboxType(sandbox_provider.provider_type))
|
|
.options(sandbox_provider.config)
|
|
.user(user_id)
|
|
.app(app_id)
|
|
.initializer(AppAssetAttrsInitializer())
|
|
.initializer(AppAssetsInitializer())
|
|
.initializer(SkillInitializer())
|
|
.initializer(DifyCliInitializer())
|
|
.storage(archive_storage, assets.id)
|
|
.build()
|
|
)
|
|
|
|
logger.info("Sandbox created: id=%s, assets=%s", sandbox.id, sandbox.assets_id)
|
|
return sandbox
|
|
|
|
@classmethod
|
|
def delete_draft_storage(cls, tenant_id: str, app_id: str, user_id: str) -> None:
|
|
archive_storage = ArchiveSandboxStorage(
|
|
tenant_id, app_id, SandboxBuilder.draft_id(user_id), storage.storage_runner
|
|
)
|
|
archive_storage.delete()
|
|
|
|
@classmethod
|
|
def create_draft(
|
|
cls,
|
|
tenant_id: str,
|
|
app_id: str,
|
|
user_id: str,
|
|
sandbox_provider: SandboxProviderEntity,
|
|
) -> Sandbox:
|
|
assets = AppAssetService.get_assets(tenant_id, app_id, user_id, is_draft=True)
|
|
if not assets:
|
|
raise ValueError(f"No assets found for tid={tenant_id}, app_id={app_id}")
|
|
|
|
sandbox_id = SandboxBuilder.draft_id(user_id)
|
|
archive_storage = ArchiveSandboxStorage(
|
|
tenant_id, app_id, sandbox_id, storage.storage_runner, exclude_patterns=[AppAssets.PATH]
|
|
)
|
|
|
|
sandbox = (
|
|
SandboxBuilder(tenant_id, SandboxType(sandbox_provider.provider_type))
|
|
.options(sandbox_provider.config)
|
|
.user(user_id)
|
|
.app(app_id)
|
|
.initializer(AppAssetAttrsInitializer())
|
|
.initializer(DraftAppAssetsInitializer())
|
|
.initializer(DraftAppAssetsDownloader())
|
|
.initializer(SkillInitializer())
|
|
.initializer(DifyCliInitializer())
|
|
.storage(archive_storage, assets.id)
|
|
.build()
|
|
)
|
|
|
|
logger.info("Draft sandbox created: id=%s, assets=%s", sandbox.id, sandbox.assets_id)
|
|
return sandbox
|
|
|
|
@classmethod
|
|
def create_for_single_step(
|
|
cls,
|
|
tenant_id: str,
|
|
app_id: str,
|
|
user_id: str,
|
|
sandbox_provider: SandboxProviderEntity,
|
|
) -> Sandbox:
|
|
assets = AppAssetService.get_assets(tenant_id, app_id, user_id, is_draft=True)
|
|
if not assets:
|
|
raise ValueError(f"No assets found for tid={tenant_id}, app_id={app_id}")
|
|
|
|
sandbox_id = SandboxBuilder.draft_id(user_id)
|
|
archive_storage = ArchiveSandboxStorage(
|
|
tenant_id, app_id, sandbox_id, storage.storage_runner, exclude_patterns=[AppAssets.PATH]
|
|
)
|
|
|
|
sandbox = (
|
|
SandboxBuilder(tenant_id, SandboxType(sandbox_provider.provider_type))
|
|
.options(sandbox_provider.config)
|
|
.user(user_id)
|
|
.app(app_id)
|
|
.initializer(AppAssetAttrsInitializer())
|
|
.initializer(DraftAppAssetsInitializer())
|
|
.initializer(DraftAppAssetsDownloader())
|
|
.initializer(SkillInitializer())
|
|
.initializer(DifyCliInitializer())
|
|
.storage(archive_storage, assets.id)
|
|
.build()
|
|
)
|
|
|
|
logger.info("Single-step sandbox created: id=%s, assets=%s", sandbox.id, sandbox.assets_id)
|
|
return sandbox
|