mirror of
https://github.com/langgenius/dify.git
synced 2026-05-13 08:57:28 +08:00
44491e427c
Resolve the full dependency chain to enable all previously disabled controllers: Enabled routes: - sandbox_files: sandbox file browser API - sandbox_providers: sandbox provider management API - app_asset: app asset management API - skills: skill extraction API - CLI API blueprint: DifyCli callback endpoints (/cli/api/*) Dependencies extracted (64 files, ~8000 lines): - models/sandbox.py, models/app_asset.py: DB models - core/zip_sandbox/: zip-based sandbox execution - core/session/: CLI API session management - core/memory/: base memory + node token buffer - core/helper/creators.py: helper utilities - core/llm_generator/: context models, output models, utils - core/workflow/nodes/command/: command node type - core/workflow/nodes/file_upload/: file upload node type - core/app/entities/: app_asset_entities, app_bundle_entities, llm_generation_entities - services/: asset_content, skill, workflow_collaboration, workflow_comment - controllers/console/app/error.py: AppAsset error classes - core/tools/utils/system_encryption.py Import fixes: - dify_graph.enums -> graphon.enums in skill_service.py - get_signed_file_url_for_plugin -> get_signed_file_url in cli_api.py All 5 controllers verified: import OK, Flask starts successfully. 46 existing tests still pass. Made-with: Cursor
118 lines
3.0 KiB
Python
118 lines
3.0 KiB
Python
from __future__ import annotations
|
|
|
|
from typing import TYPE_CHECKING
|
|
|
|
from core.virtual_environment.__base.helpers import execute, try_execute
|
|
|
|
from .strategy import ZipStrategy
|
|
|
|
if TYPE_CHECKING:
|
|
from core.virtual_environment.__base.virtual_environment import VirtualEnvironment
|
|
|
|
|
|
ZIP_SCRIPT = r"""
|
|
import os
|
|
import sys
|
|
import zipfile
|
|
|
|
src = sys.argv[1]
|
|
out_path = sys.argv[2]
|
|
|
|
def is_cwd(p: str) -> bool:
|
|
return p in (".", "")
|
|
|
|
src = src.rstrip("/")
|
|
|
|
if is_cwd(src):
|
|
base = "."
|
|
root = "."
|
|
prefix = ""
|
|
else:
|
|
base = os.path.dirname(src) or "."
|
|
prefix = os.path.basename(src)
|
|
root = os.path.join(base, prefix)
|
|
|
|
def add_empty_dir(zf: zipfile.ZipFile, arc_dir: str) -> None:
|
|
name = arc_dir.rstrip("/") + "/"
|
|
if name != "/":
|
|
zf.writestr(name, b"")
|
|
|
|
with zipfile.ZipFile(out_path, "w", compression=zipfile.ZIP_DEFLATED) as zf:
|
|
if os.path.isfile(root):
|
|
zf.write(root, arcname=os.path.basename(root))
|
|
else:
|
|
for dirpath, dirnames, filenames in os.walk(root):
|
|
rel_dir = os.path.relpath(dirpath, base)
|
|
rel_dir = "" if rel_dir == "." else rel_dir
|
|
if not dirnames and not filenames:
|
|
add_empty_dir(zf, rel_dir)
|
|
for fn in filenames:
|
|
fp = os.path.join(dirpath, fn)
|
|
arcname = os.path.join(rel_dir, fn) if rel_dir else fn
|
|
zf.write(fp, arcname=arcname)
|
|
"""
|
|
|
|
UNZIP_SCRIPT = r"""
|
|
import sys
|
|
import zipfile
|
|
|
|
archive_path = sys.argv[1]
|
|
dest_dir = sys.argv[2]
|
|
|
|
with zipfile.ZipFile(archive_path, "r") as zf:
|
|
zf.extractall(dest_dir)
|
|
"""
|
|
|
|
|
|
class PythonZipStrategy(ZipStrategy):
|
|
"""Strategy using Python's zipfile module."""
|
|
|
|
def __init__(self) -> None:
|
|
self._python_cmd: str | None = None
|
|
|
|
def is_available(self, vm: VirtualEnvironment) -> bool:
|
|
for cmd in ("python3", "python"):
|
|
result = try_execute(vm, ["which", cmd], timeout=10)
|
|
if result.stdout and result.stdout.strip():
|
|
self._python_cmd = cmd
|
|
return True
|
|
return False
|
|
|
|
def zip(
|
|
self,
|
|
vm: VirtualEnvironment,
|
|
*,
|
|
src: str,
|
|
out_path: str,
|
|
cwd: str | None,
|
|
timeout: float,
|
|
) -> None:
|
|
if self._python_cmd is None:
|
|
raise RuntimeError("Python not available")
|
|
|
|
execute(
|
|
vm,
|
|
[self._python_cmd, "-c", ZIP_SCRIPT, src, out_path],
|
|
timeout=timeout,
|
|
cwd=cwd,
|
|
error_message="Failed to create zip archive",
|
|
)
|
|
|
|
def unzip(
|
|
self,
|
|
vm: VirtualEnvironment,
|
|
*,
|
|
archive_path: str,
|
|
dest_dir: str,
|
|
timeout: float,
|
|
) -> None:
|
|
if self._python_cmd is None:
|
|
raise RuntimeError("Python not available")
|
|
|
|
execute(
|
|
vm,
|
|
[self._python_cmd, "-c", UNZIP_SCRIPT, archive_path, dest_dir],
|
|
timeout=timeout,
|
|
error_message="Failed to unzip archive",
|
|
)
|