mirror of
https://github.com/langgenius/dify.git
synced 2026-03-15 20:07:23 +08:00
76c02db094
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
134 lines
4.0 KiB
Python
134 lines
4.0 KiB
Python
from __future__ import annotations
|
|
|
|
import logging
|
|
import threading
|
|
from typing import TYPE_CHECKING
|
|
from uuid import uuid4
|
|
|
|
from libs.attr_map import AttrMap
|
|
|
|
if TYPE_CHECKING:
|
|
from core.sandbox.storage.sandbox_storage import SandboxStorage
|
|
from core.virtual_environment.__base.virtual_environment import VirtualEnvironment
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class Sandbox:
|
|
"""Represents a single sandbox environment.
|
|
|
|
Each ``Sandbox`` owns a stable, path-safe ``id`` (a 32-char hex
|
|
UUID4) that is independent of the underlying provider's environment
|
|
ID. Use ``sandbox.id`` for any path or resource namespacing
|
|
(e.g. ``DifyCli(sandbox.id)``).
|
|
|
|
The raw provider identifier is still accessible via
|
|
``sandbox.vm.metadata.id`` when needed (logging, API calls back to
|
|
the provider, etc.).
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
*,
|
|
vm: VirtualEnvironment,
|
|
storage: SandboxStorage,
|
|
tenant_id: str,
|
|
user_id: str,
|
|
app_id: str,
|
|
assets_id: str,
|
|
) -> None:
|
|
self._id = uuid4().hex
|
|
self._vm = vm
|
|
self._storage = storage
|
|
self._tenant_id = tenant_id
|
|
self._user_id = user_id
|
|
self._app_id = app_id
|
|
self._assets_id = assets_id
|
|
self._attributes = AttrMap()
|
|
self._ready_event = threading.Event()
|
|
self._cancel_event = threading.Event()
|
|
self._init_error: Exception | None = None
|
|
|
|
@property
|
|
def id(self) -> str:
|
|
"""Stable, path-safe identifier for this sandbox (UUID4 hex)."""
|
|
return self._id
|
|
|
|
@property
|
|
def attrs(self) -> AttrMap:
|
|
return self._attributes
|
|
|
|
@property
|
|
def vm(self) -> VirtualEnvironment:
|
|
return self._vm
|
|
|
|
@property
|
|
def storage(self) -> SandboxStorage:
|
|
return self._storage
|
|
|
|
@property
|
|
def tenant_id(self) -> str:
|
|
return self._tenant_id
|
|
|
|
@property
|
|
def user_id(self) -> str:
|
|
return self._user_id
|
|
|
|
@property
|
|
def app_id(self) -> str:
|
|
return self._app_id
|
|
|
|
@property
|
|
def assets_id(self) -> str:
|
|
return self._assets_id
|
|
|
|
def mark_ready(self) -> None:
|
|
# Signal that sandbox initialization has completed successfully.
|
|
self._ready_event.set()
|
|
|
|
def mark_failed(self, error: Exception) -> None:
|
|
# Capture initialization error and unblock waiters.
|
|
self._init_error = error
|
|
self._ready_event.set()
|
|
|
|
def cancel_init(self) -> None:
|
|
# Mark initialization as cancelled to stop background setup.
|
|
self._cancel_event.set()
|
|
self._ready_event.set()
|
|
|
|
def is_cancelled(self) -> bool:
|
|
return self._cancel_event.is_set()
|
|
|
|
def wait_ready(self, timeout: float | None = None) -> None:
|
|
# Block until initialization completes, fails, or is cancelled.
|
|
if not self._ready_event.wait(timeout=timeout):
|
|
raise TimeoutError("Sandbox initialization timed out")
|
|
if self._cancel_event.is_set():
|
|
raise RuntimeError("Sandbox initialization was cancelled")
|
|
if self._init_error is not None:
|
|
if isinstance(self._init_error, ValueError):
|
|
raise RuntimeError(f"Sandbox initialization failed: {self._init_error}") from self._init_error
|
|
else:
|
|
raise RuntimeError("Sandbox initialization failed") from self._init_error
|
|
|
|
def mount(self) -> bool:
|
|
return self._storage.mount(self._vm)
|
|
|
|
def unmount(self) -> bool:
|
|
return self._storage.unmount(self._vm)
|
|
|
|
def release(self) -> None:
|
|
self.cancel_init()
|
|
sandbox_id = self.id
|
|
try:
|
|
self._storage.unmount(self._vm)
|
|
logger.info("Sandbox storage unmounted: sandbox_id=%s", sandbox_id)
|
|
except Exception:
|
|
logger.exception("Failed to unmount sandbox storage: sandbox_id=%s", sandbox_id)
|
|
|
|
try:
|
|
self._vm.release_environment()
|
|
logger.info("Sandbox released: sandbox_id=%s", sandbox_id)
|
|
except Exception:
|
|
logger.exception("Failed to release sandbox: sandbox_id=%s", sandbox_id)
|