mirror of
https://github.com/langgenius/dify.git
synced 2026-03-16 04:17:43 +08:00
a0c388f283
- Add helpers.py with connection management utilities:
- with_connection: context manager for connection lifecycle
- submit_command: execute command and return CommandFuture
- execute: run command with auto connection, raise on failure
- try_execute: run command with auto connection, return result
- Add CommandExecutionError to exec.py for typed error handling
with access to exit_code, stderr, and full result
- Remove run_command method from VirtualEnvironment base class
(now available as submit_command helper)
- Update all call sites to use new helper functions:
- sandbox/session.py
- sandbox/storage/archive_storage.py
- sandbox/bash/bash_tool.py
- workflow/nodes/command/node.py
- Add comprehensive unit tests for helpers with connection reuse
59 lines
2.2 KiB
Python
59 lines
2.2 KiB
Python
from datetime import datetime
|
|
from uuid import uuid4
|
|
|
|
import sqlalchemy as sa
|
|
from sqlalchemy import DateTime, String, func
|
|
from sqlalchemy.orm import Mapped, mapped_column
|
|
|
|
from core.app.entities.app_asset_entities import AppAssetFileTree
|
|
|
|
from .base import Base
|
|
from .types import LongText, StringUUID
|
|
|
|
|
|
class AppAssetDraft(Base):
|
|
__tablename__ = "app_asset_drafts"
|
|
__table_args__ = (
|
|
sa.PrimaryKeyConstraint("id", name="app_asset_draft_pkey"),
|
|
sa.Index("app_asset_draft_version_idx", "tenant_id", "app_id", "version"),
|
|
)
|
|
|
|
VERSION_DRAFT = "draft"
|
|
|
|
id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
|
|
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
version: Mapped[str] = mapped_column(String(255), nullable=False)
|
|
_asset_tree: Mapped[str] = mapped_column("asset_tree", LongText, nullable=False, default='{"nodes":[]}')
|
|
created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
|
|
updated_by: Mapped[str | None] = mapped_column(StringUUID)
|
|
updated_at: Mapped[datetime] = mapped_column(
|
|
DateTime,
|
|
nullable=False,
|
|
default=func.current_timestamp(),
|
|
server_default=func.current_timestamp(),
|
|
onupdate=func.current_timestamp(),
|
|
)
|
|
|
|
@property
|
|
def asset_tree(self) -> AppAssetFileTree:
|
|
if not self._asset_tree:
|
|
return AppAssetFileTree()
|
|
return AppAssetFileTree.model_validate_json(self._asset_tree)
|
|
|
|
@asset_tree.setter
|
|
def asset_tree(self, value: AppAssetFileTree) -> None:
|
|
self._asset_tree = value.model_dump_json()
|
|
|
|
@staticmethod
|
|
def get_storage_key(tenant_id: str, app_id: str, node_id: str) -> str:
|
|
return f"app_assets/{tenant_id}/{app_id}/draft/{node_id}"
|
|
|
|
@staticmethod
|
|
def get_published_storage_key(tenant_id: str, app_id: str, draft_id: str) -> str:
|
|
return f"app_assets/{tenant_id}/{app_id}/published/{draft_id}.zip"
|
|
|
|
def __repr__(self) -> str:
|
|
return f"<AppAssetDraft(id={self.id}, app_id={self.app_id}, version={self.version})>"
|