diff --git a/backend/route_registry.py b/backend/route_registry.py index 5a14209..7a27d4e 100644 --- a/backend/route_registry.py +++ b/backend/route_registry.py @@ -122,6 +122,10 @@ ROUTES: tuple[RouteSpec, ...] = ( RouteSpec("GET", "settings/snapshots", "backend.routes.settings_routes.list_settings_snapshots", "config"), RouteSpec("GET", "settings/snapshots/{snapshot_id}", "backend.routes.settings_routes.get_settings_snapshot", "config"), RouteSpec("POST", "settings/rollback", "backend.routes.settings_routes.rollback_settings", "config"), + RouteSpec("GET", "backups", "backend.routes.data_backup_routes.list_backups", "config"), + RouteSpec("POST", "backups", "backend.routes.data_backup_routes.create_backup", "config"), + RouteSpec("GET", "backups/{backup_id}", "backend.routes.data_backup_routes.inspect_backup", "config"), + RouteSpec("POST", "backups/{backup_id}/restore", "backend.routes.data_backup_routes.restore_backup", "config"), RouteSpec("GET", "storage/status", "backend.routes.storage_routes.get_storage_status", "read"), RouteSpec("POST", "storage/migrate", "backend.routes.storage_routes.migrate_storage", "config"), RouteSpec("GET", "media/sign", "backend.routes.media_routes.sign_media", "read"), diff --git a/backend/routes/data_backup_routes.py b/backend/routes/data_backup_routes.py new file mode 100644 index 0000000..2a6fef2 --- /dev/null +++ b/backend/routes/data_backup_routes.py @@ -0,0 +1,23 @@ +"""Full data backup route handlers.""" +from __future__ import annotations +from backend.routes.common import handle_request +from backend.routes.params import as_bool +from backend.services.data_backup_service import DataBackupService +from core.identity import RequestContext +from core.security import require_config_manager + +def list_backups(ctx:RequestContext,service:DataBackupService|None=None)->dict: + instance=service or DataBackupService() + return handle_request(ctx,lambda:(require_config_manager(ctx),instance.list_backups())[1]) + +def create_backup(ctx:RequestContext,payload:dict|None=None,service:DataBackupService|None=None)->dict: + instance=service or DataBackupService();params=payload or {} + return handle_request(ctx,lambda:(require_config_manager(ctx),instance.create_backup(include_media=as_bool(params.get("include_media"),default=True)))[1]) + +def inspect_backup(ctx:RequestContext,backup_id:str,service:DataBackupService|None=None)->dict: + instance=service or DataBackupService() + return handle_request(ctx,lambda:(require_config_manager(ctx),instance.inspect_backup(backup_id))[1]) + +def restore_backup(ctx:RequestContext,backup_id:str,payload:dict|None=None,service:DataBackupService|None=None)->dict: + instance=service or DataBackupService();params=payload or {} + return handle_request(ctx,lambda:(require_config_manager(ctx),instance.restore_backup(backup_id,confirm=as_bool(params.get("confirm"))))[1]) diff --git a/backend/services/data_backup_service.py b/backend/services/data_backup_service.py new file mode 100644 index 0000000..f4e978d --- /dev/null +++ b/backend/services/data_backup_service.py @@ -0,0 +1,202 @@ +"""Server-side ImageStudio data backup and guarded restore.""" + +from __future__ import annotations + +import hashlib +import json +import shutil +import sqlite3 +import tempfile +import zipfile +from datetime import datetime, timezone +from pathlib import Path +from typing import Any +from uuid import uuid4 + +from backend.dto.common import ApiError, ErrorCode +from core.config_service import ConfigService +from core.runtime_paths import resolve_data_path +from database.db_helper import load_config_payload, load_database_settings + +MAX_BACKUP_FILES = 50_000 +MAX_RESTORE_BYTES = 10 * 1024 * 1024 * 1024 + + +class DataBackupService: + def __init__(self, config_service: ConfigService | None = None): + self.config_service = config_service or ConfigService() + + def list_backups(self) -> list[dict[str, Any]]: + root = self._backup_root() + if not root.exists(): + return [] + return [self._summary(path) for path in sorted(root.glob("*.zip"), key=lambda item: item.stat().st_mtime, reverse=True)] + + def create_backup(self, *, include_media: bool = True) -> dict[str, Any]: + backup_id = f"backup_{datetime.now(timezone.utc).strftime('%Y%m%dT%H%M%SZ')}_{uuid4().hex[:8]}" + root = self._backup_root() + root.mkdir(parents=True, exist_ok=True) + destination = root / f"{backup_id}.zip" + config = load_config_payload(self.config_service.config_path) + entries: list[dict[str, Any]] = [] + with tempfile.TemporaryDirectory(prefix="imagestudio-backup-") as temp_dir: + temp = Path(temp_dir) + config_copy = temp / "config.yaml" + if self.config_service.config_path.exists(): + shutil.copy2(self.config_service.config_path, config_copy) + entries.append(_entry(config_copy, "config/config.yaml")) + database_settings = load_database_settings(self.config_service.config_path) + warnings: list[str] = [] + if database_settings.selected_backend == "sqlite": + source_db = resolve_data_path(database_settings.sqlite.path) + if source_db.exists(): + db_copy = temp / "imagestudio.db" + source = sqlite3.connect(source_db) + target = sqlite3.connect(db_copy) + try: + source.backup(target) + finally: + target.close(); source.close() + entries.append(_entry(db_copy, "database/imagestudio.db")) + else: + warnings.append("PostgreSQL data is not embedded; use pg_dump with the connection recorded in the redacted config.") + storage = config.get("storage") if isinstance(config.get("storage"), dict) else {} + media_roots = { + key: resolve_data_path(storage.get(f"{key}_path") or f"data/{key}") + for key in ("images", "thumbnails", "materials", "styles") + } + if include_media: + for key, media_root in media_roots.items(): + if not media_root.exists(): + continue + for path in media_root.rglob("*"): + if not path.is_file(): + continue + if len(entries) >= MAX_BACKUP_FILES: + raise ApiError(ErrorCode.VALIDATION_FAILED, "backup file count exceeds safety limit", {"limit": MAX_BACKUP_FILES}) + entries.append(_entry(path, f"media/{key}/{path.relative_to(media_root).as_posix()}")) + manifest = { + "format": "imagestudio-full-backup", + "version": 1, + "backup_id": backup_id, + "created_at": datetime.now(timezone.utc).isoformat(), + "database_backend": database_settings.selected_backend, + "include_media": include_media, + "entries": entries, + "warnings": warnings, + } + with zipfile.ZipFile(destination, "w", compression=zipfile.ZIP_DEFLATED, compresslevel=6) as archive: + for item in entries: + source_path = config_copy if item["path"] == "config/config.yaml" else db_copy if item["path"] == "database/imagestudio.db" else _source_for_media_entry(item["path"], media_roots) + archive.write(source_path, item["path"]) + archive.writestr("manifest.json", json.dumps(manifest, ensure_ascii=False, indent=2)) + return self._summary(destination, manifest=manifest) + + def inspect_backup(self, backup_id: str) -> dict[str, Any]: + path = self._backup_path(backup_id) + with zipfile.ZipFile(path) as archive: + manifest = _read_manifest(archive) + _validate_archive(archive, manifest) + return {**self._summary(path, manifest=manifest), "manifest": manifest, "valid": True} + + def restore_backup(self, backup_id: str, *, confirm: bool = False) -> dict[str, Any]: + if not confirm: + return {**self.inspect_backup(backup_id), "restored": False, "requires_confirmation": True} + path = self._backup_path(backup_id) + with zipfile.ZipFile(path) as archive: + manifest = _read_manifest(archive) + _validate_archive(archive, manifest) + safety_backup = self.create_backup(include_media=False) + with tempfile.TemporaryDirectory(prefix="imagestudio-restore-") as temp_dir: + temp = Path(temp_dir) + archive.extractall(temp) + config_source = temp / "config" / "config.yaml" + if config_source.exists(): + self.config_service.config_path.parent.mkdir(parents=True, exist_ok=True) + shutil.copy2(config_source, self.config_service.config_path) + database_settings = load_database_settings(self.config_service.config_path) + db_source = temp / "database" / "imagestudio.db" + if db_source.exists() and database_settings.selected_backend == "sqlite": + db_target = resolve_data_path(database_settings.sqlite.path) + db_target.parent.mkdir(parents=True, exist_ok=True) + shutil.copy2(db_source, db_target) + config = load_config_payload(self.config_service.config_path) + storage = config.get("storage") if isinstance(config.get("storage"), dict) else {} + for key in ("images", "thumbnails", "materials", "styles"): + source_root = temp / "media" / key + if not source_root.exists(): + continue + target_root = resolve_data_path(storage.get(f"{key}_path") or f"data/{key}") + target_root.mkdir(parents=True, exist_ok=True) + shutil.copytree(source_root, target_root, dirs_exist_ok=True) + return {"restored": True, "backup_id": backup_id, "safety_backup_id": safety_backup["backup_id"]} + + def _backup_root(self) -> Path: + config = self.config_service.load() + return resolve_data_path(config.storage.archives_path) / "backups" + + def _backup_path(self, backup_id: str) -> Path: + normalized = str(backup_id or "").strip() + if not normalized or any(char not in "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-" for char in normalized): + raise ApiError(ErrorCode.VALIDATION_FAILED, "invalid backup_id", {"backup_id": backup_id}) + path = self._backup_root() / f"{normalized}.zip" + if not path.exists(): + raise ApiError(ErrorCode.RESOURCE_NOT_FOUND, "backup not found", {"backup_id": normalized}) + return path + + def _summary(self, path: Path, *, manifest: dict[str, Any] | None = None) -> dict[str, Any]: + loaded = manifest + if loaded is None: + try: + with zipfile.ZipFile(path) as archive: + loaded = _read_manifest(archive) + except Exception: + loaded = {} + stat = path.stat() + return {"backup_id": loaded.get("backup_id") or path.stem, "created_at": loaded.get("created_at") or datetime.fromtimestamp(stat.st_mtime,timezone.utc).isoformat(), "size_bytes": stat.st_size, "file_count": len(loaded.get("entries") or []), "database_backend": loaded.get("database_backend"), "include_media": bool(loaded.get("include_media")), "warnings": loaded.get("warnings") or []} + + +def _entry(path: Path, archive_path: str) -> dict[str, Any]: + digest = hashlib.sha256() + with path.open("rb") as handle: + for chunk in iter(lambda: handle.read(1024 * 1024), b""): + digest.update(chunk) + return {"path": archive_path, "size": path.stat().st_size, "sha256": digest.hexdigest()} + + +def _source_for_media_entry(archive_path: str, roots: dict[str, Path]) -> Path: + _, key, relative = archive_path.split("/", 2) + return roots[key] / Path(relative) + + +def _read_manifest(archive: zipfile.ZipFile) -> dict[str, Any]: + try: + value = json.loads(archive.read("manifest.json")) + except (KeyError, json.JSONDecodeError) as exc: + raise ApiError(ErrorCode.VALIDATION_FAILED, "invalid backup manifest", {}) from exc + if not isinstance(value, dict) or value.get("format") != "imagestudio-full-backup": + raise ApiError(ErrorCode.VALIDATION_FAILED, "unsupported backup format", {}) + return value + + +def _validate_archive(archive: zipfile.ZipFile, manifest: dict[str, Any]) -> None: + entries = manifest.get("entries") if isinstance(manifest.get("entries"), list) else [] + if len(entries) > MAX_BACKUP_FILES: + raise ApiError(ErrorCode.VALIDATION_FAILED, "backup file count exceeds safety limit", {}) + names = set(archive.namelist()) + declared_names = {str(item.get("path") or "") for item in entries if isinstance(item, dict)} + if names - declared_names != {"manifest.json"}: + raise ApiError(ErrorCode.VALIDATION_FAILED, "backup contains undeclared entries", {}) + total = 0 + for item in entries: + name = str(item.get("path") or "") if isinstance(item, dict) else "" + parts = Path(name).parts + if not name or name not in names or Path(name).is_absolute() or ".." in parts: + raise ApiError(ErrorCode.VALIDATION_FAILED, "unsafe backup entry", {"path": name}) + info = archive.getinfo(name) + total += info.file_size + if total > MAX_RESTORE_BYTES: + raise ApiError(ErrorCode.VALIDATION_FAILED, "backup exceeds restore size limit", {}) + digest = hashlib.sha256(archive.read(name)).hexdigest() + if digest != item.get("sha256"): + raise ApiError(ErrorCode.VALIDATION_FAILED, "backup checksum mismatch", {"path": name}) diff --git a/backend/services/model_provider_bootstrap.py b/backend/services/model_provider_bootstrap.py index 5116e4b..6e87648 100644 --- a/backend/services/model_provider_bootstrap.py +++ b/backend/services/model_provider_bootstrap.py @@ -14,65 +14,106 @@ def sync_generation_provider_from_config( config: Mapping[str, Any], ) -> dict[str, Any]: generation = _mapping(config.get("generation")) - provider = _mapping(generation.get("provider")) default_route = _text(generation.get("default_model")) - route_name = _text(provider.get("route_name")) or default_route - model_id = _text(provider.get("model_id")) or default_route - base_url = _text(provider.get("base_url")) - if not any((default_route, route_name, model_id, base_url)): + configured_adapters = generation.get("adapters") + adapters = [ + _mapping(item) + for item in configured_adapters + if isinstance(item, Mapping) + ] if isinstance(configured_adapters, list) else [] + if not adapters: + legacy_provider = _mapping(generation.get("provider")) + if legacy_provider: + adapters = [legacy_provider] + if not adapters and not default_route: _disable_config_routes(service, "image_generation") return {"configured": False, "status": "not_configured"} - missing = [ - field - for field, value in ( - ("generation.default_model", route_name), - ("generation.provider.model_id", model_id), - ("generation.provider.base_url", base_url), - ) - if not value - ] - if missing: - _disable_config_routes(service, "image_generation") - return {"configured": False, "status": "incomplete", "missing_fields": missing} - - provider_id = _text(provider.get("provider_id")) or "imagestudio_default" - provider_payload: dict[str, Any] = { - "provider_id": provider_id, - "display_name": _text(provider.get("display_name")) or "ImageStudio default provider", - "provider_type": "openai_compatible", - "base_url": base_url, - "image_endpoint": _text(provider.get("image_endpoint")) or "/v1/images/generations", - "timeout_seconds": _positive_int(provider.get("timeout_seconds"), 180), - "enabled": _bool(provider.get("enabled", True)), - "metadata": {"source": "config_bootstrap"}, - } - api_key_env_var = _text(provider.get("api_key_env_var")) - api_key_secret_ref = _text(provider.get("api_key_secret_ref")) - if api_key_env_var: - provider_payload["api_key_env_var"] = api_key_env_var - if api_key_secret_ref: - provider_payload["api_key_secret_ref"] = api_key_secret_ref - service.upsert_provider(provider_payload) - route = _upsert_config_route( - service, - { - "route_name": route_name, + ready: list[dict[str, Any]] = [] + errors: list[dict[str, Any]] = [] + active_route_ids: set[str] = set() + for index, provider in enumerate(adapters): + provider_id = _text(provider.get("provider_id") or provider.get("id")) or f"imagestudio_adapter_{index + 1}" + route_name = _text(provider.get("route_name")) or (default_route if index == 0 else provider_id) + model_id = _text(provider.get("model_id")) or route_name + base_url = _text(provider.get("base_url")) + missing = [ + field + for field, value in ( + ("route_name", route_name), + ("model_id", model_id), + ("base_url", base_url), + ) + if not value + ] + if missing: + errors.append({"adapter_id": provider_id, "index": index, "missing_fields": missing}) + continue + provider_payload: dict[str, Any] = { "provider_id": provider_id, - "model_id": model_id, - "modality": "image_generation", - "priority": _int(provider.get("priority"), 10), + "display_name": _text(provider.get("display_name") or provider.get("name")) or provider_id, + "provider_type": _text(provider.get("provider_type")) or "openai_compatible", + "base_url": base_url, + "image_endpoint": _text(provider.get("image_endpoint")) or "/v1/images/generations", + "timeout_seconds": _positive_int(provider.get("timeout_seconds"), 180), "enabled": _bool(provider.get("enabled", True)), - "metadata": {"source": "config_bootstrap"}, + "metadata": {"source": "config_bootstrap", "adapter_index": index}, } - ) + api_key_env_var = _text(provider.get("api_key_env_var")) + api_key_secret_ref = _text(provider.get("api_key_secret_ref")) + if api_key_env_var: + provider_payload["api_key_env_var"] = api_key_env_var + if api_key_secret_ref: + provider_payload["api_key_secret_ref"] = api_key_secret_ref + service.upsert_provider(provider_payload) + route = _upsert_config_route( + service, + { + "route_name": route_name, + "provider_id": provider_id, + "model_id": model_id, + "modality": "image_generation", + "priority": _int(provider.get("priority"), 10 + index), + "enabled": _bool(provider.get("enabled", True)), + "metadata": { + "source": "config_bootstrap", + "adapter_index": index, + "is_default": index == 0 or route_name == default_route, + }, + }, + disable_others=False, + ) + active_route_ids.add(str(route["route_id"])) + ready.append( + { + "provider_id": provider_id, + "route_name": route["route_name"], + "model_id": route["model_id"], + "enabled": bool(route["enabled"]), + "api_key_source": "env" if api_key_env_var else "secret_ref" if api_key_secret_ref else "none", + } + ) + _disable_config_routes_except(service, "image_generation", active_route_ids) + if not ready: + _disable_config_routes(service, "image_generation") + missing_fields = [ + f"generation.provider.{field}" + for field in ((errors[0].get("missing_fields") if errors else ["base_url", "model_id"])) + ] + return { + "configured": False, + "status": "incomplete", + "missing_fields": missing_fields, + "adapter_errors": errors, + } + default = next((item for item in ready if item["route_name"] == default_route), ready[0]) return { "configured": True, - "status": "ready", - "provider_id": provider_id, - "route_name": route["route_name"], - "model_id": route["model_id"], - "api_key_source": "env" if api_key_env_var else "secret_ref" if api_key_secret_ref else "none", + "status": "ready" if not errors else "partial", + **default, + "adapter_count": len(ready), + "adapters": ready, + "adapter_errors": errors, } @@ -224,17 +265,59 @@ def sync_vision_provider_from_config( } -def _upsert_config_route(service: ModelProviderService, payload: dict[str, Any]) -> dict[str, Any]: +def _upsert_config_route( + service: ModelProviderService, + payload: dict[str, Any], + *, + disable_others: bool = True, +) -> dict[str, Any]: """Keep a single active config-owned route across provider/model changes.""" route_name = _text(payload.get("route_name")) modality = _text(payload.get("modality")) or "image_generation" stable_route_id = _config_route_id(route_name, modality) route = service.upsert_route({**payload, "route_id": stable_route_id}) - _disable_config_routes(service, modality, except_route_id=stable_route_id) + if disable_others: + _disable_config_routes(service, modality, except_route_id=stable_route_id) return route +def _disable_config_routes_except( + service: ModelProviderService, + modality: str, + active_route_ids: set[str], +) -> None: + all_routes = service.list_routes() + active_by_name = { + str(route.get("route_name")): str(route.get("route_id")) + for route in all_routes + if route.get("route_id") in active_route_ids + } + for existing in all_routes: + metadata = _mapping(existing.get("metadata")) + if ( + existing.get("route_id") in active_route_ids + or existing.get("modality") != modality + or metadata.get("source") != "config_bootstrap" + or not existing.get("enabled") + ): + continue + service.upsert_route( + { + **existing, + "enabled": False, + "metadata": { + **metadata, + **( + {"superseded_by": active_by_name[str(existing.get("route_name"))]} + if str(existing.get("route_name")) in active_by_name + else {"disabled_by": "config"} + ), + }, + } + ) + + def _disable_config_routes( service: ModelProviderService, modality: str, diff --git a/docs/frontend-integration-queue.md b/docs/frontend-integration-queue.md index e5d3db5..c89f37d 100644 --- a/docs/frontend-integration-queue.md +++ b/docs/frontend-integration-queue.md @@ -6,7 +6,7 @@ ## P0:核心功能闭环 -### 1. 多适配器真实路由 +### 1. 多适配器真实路由(已完成第一阶段) - 后端加载并管理全部生成适配器,而非只使用 `generation.provider`。 - 支持默认适配器切换、任务指定适配器和禁用状态。 @@ -14,21 +14,21 @@ - 将模型能力档案绑定到具体适配器与模型。 - 删除适配器前检查是否仍被任务、路由或配置引用。 -### 2. 配置快照管理 +### 2. 配置快照管理(已接入) - 展示快照列表、详情、操作人、时间和变更原因。 - 调用 `settings/diff` 展示当前配置与快照的差异。 - 接入 `settings/snapshots/{snapshot_id}` 和 `settings/rollback`。 - 回滚前展示影响范围并要求二次确认。 -### 3. 存储维护 +### 3. 存储维护(已接入) - 接入 `storage/status`,展示目录可写性、空间与存储状态。 - 接入 `storage/migrate`,展示迁移计划、进度和结果。 - 接入 `media/index`,支持媒体索引重建。 - 接入 `media/orphans`,支持孤儿文件扫描和安全处理。 -### 4. 图库完整管理 +### 4. 图库完整管理(已接入) - 接入选中、取消选中、归档和批量操作。 - 接入安全删除与永久删除,并提供二次确认。 @@ -36,27 +36,27 @@ ## P1:工作流与模型能力 -### 5. 工作流生命周期管理 +### 5. 工作流生命周期管理(已接入) - 接入启动、取消和归档工作流。 - 增加工作流状态操作栏。 - 展示节点依赖上下文。 - 接入工作流整体审查与历史版本恢复。 -### 6. 审查策略页面 +### 6. 审查策略页面(已接入) - 接入审查策略读取、校验和保存。 - 配置角色一致性、候选图规则、错误与警告阈值。 - 展示规则校验错误及影响范围。 -### 7. 模型能力档案 +### 7. 模型能力档案(已接入) - 展示已探测的适配器、模型和能力档案。 - 区分生图、文本和视觉模型。 - 支持重新探测、手动修正和能力状态管理。 - 接入渲染计划兼容性校验。 -### 8. 实时事件流 +### 8. 实时事件流(已接入增量轮询) - 接入 `events/stream`。 - 实时更新生成进度、队列状态和日志。 @@ -64,27 +64,27 @@ ## P2:系统管理能力 -### 9. 私伴插件集成管理 +### 9. 私伴插件集成管理(已接入) - 展示集成 Token 状态。 - 支持 Token 轮换、集成启停和最近调用记录。 - 提供每日穿搭联调测试入口。 -### 10. 成本保护 +### 10. 成本保护(已接入) - 接入 `costs/guard`。 - 配置单次、每日和每月预算。 - 支持超限警告或阻止策略。 - 按适配器和模型展示费用异常。 -### 11. 完整数据备份 +### 11. 完整数据备份(SQLite 与媒体已接入;PostgreSQL 提供 pg_dump 提示) - 当前页面仅支持脱敏配置导入导出。 - 后续增加 SQLite 数据库备份和恢复。 - 设计 PostgreSQL 导出、恢复和版本兼容方案。 - 支持图片、素材与清单文件打包,并生成校验值。 -### 12. 系统诊断页面 +### 12. 系统诊断页面(已接入) - 展示 API 合同、前后端版本、Web Manifest 和健康状态。 - 展示已挂载路由及当前用户权限矩阵。 @@ -92,17 +92,17 @@ ## P3:补充与体验优化 -### 13. 提示词扩写 +### 13. 提示词扩写(已接入) - 接入 `prompts/expand`。 - 支持扩写前后对比、一键采用和历史记录。 -### 14. 素材包导入 +### 14. 素材包导入(已有预检与执行流程) - 完善导入预检、内容清单和冲突处理。 - 展示导入进度、失败项和最终报告。 -### 15. 页面权限统一 +### 15. 页面权限统一(已完成主要入口) - 根据后端权限隐藏或禁用操作。 - 统一展示无权限原因和只读状态。 @@ -111,4 +111,3 @@ ## 推荐实施顺序 `多适配器真实路由 → 配置快照 → 存储维护 → 图库管理 → 工作流生命周期 → 审查策略 → 能力档案 → 实时事件流 → 系统管理能力` - diff --git a/frontend/shared/api/endpoints.ts b/frontend/shared/api/endpoints.ts index bc0f944..f651703 100644 --- a/frontend/shared/api/endpoints.ts +++ b/frontend/shared/api/endpoints.ts @@ -4,6 +4,7 @@ export const endpoints = { uiBootstrap: "ui/bootstrap", uiActions: "ui/actions", dashboardSummary: "dashboard/summary", + contract: "contract", profiles: "profiles", profile: (profileId: string) => `profiles/${profileId}`, profileArchive: (profileId: string) => `profiles/${profileId}/archive`, @@ -20,6 +21,7 @@ export const endpoints = { workflowSwitchBranch: (workflowId: string) => `workflows/${workflowId}/switch-branch`, workflowHistory: (workflowId: string) => `workflows/${workflowId}/history`, node: (nodeId: string) => `nodes/${nodeId}`, + nodeDependencyContext: (nodeId: string) => `nodes/${nodeId}/dependency-context`, nodeGenerate: (nodeId: string) => `nodes/${nodeId}/generate`, nodeRetry: (nodeId: string) => `nodes/${nodeId}/retry`, nodeComplete: (nodeId: string) => `nodes/${nodeId}/complete`, @@ -29,6 +31,7 @@ export const endpoints = { reviewPolicy: "review/policy", reviewPolicyValidate: "review/policy/validate", reviewPolicySave: "review/policy/save", + promptsExpand: "prompts/expand", nodeReview: (nodeId: string) => `nodes/${nodeId}/review`, nodeImages: (nodeId: string) => `nodes/${nodeId}/images`, workflowReview: (workflowId: string) => `workflows/${workflowId}/review`, @@ -37,6 +40,8 @@ export const endpoints = { imageSelect: (imageId: string) => `images/${imageId}/select`, imageUnselect: (imageId: string) => `images/${imageId}/unselect`, imageArchive: (imageId: string) => `images/${imageId}/archive`, + imageSafeDelete: (imageId: string) => `images/${imageId}/safe-delete`, + imageDelete: (imageId: string) => `images/${imageId}`, jobs: "jobs", job: (taskId: string) => `jobs/${taskId}`, jobCancel: (taskId: string) => `jobs/${taskId}/cancel`, @@ -44,6 +49,7 @@ export const endpoints = { jobDeadLetterRetry: "jobs/dead-letter/retry", jobDeadLetterMoveFailed: "jobs/dead-letter/move-failed", costUsage: "costs/usage", + costGuard: "costs/guard", settingsSchema: "settings/schema", settingsCurrent: "settings/current", settingsValidate: "settings/validate", @@ -55,9 +61,14 @@ export const endpoints = { settingsSnapshots: "settings/snapshots", settingsSnapshot: (snapshotId: string) => `settings/snapshots/${snapshotId}`, settingsRollback: "settings/rollback", + backups: "backups", + backup: (backupId: string) => `backups/${backupId}`, + backupRestore: (backupId: string) => `backups/${backupId}/restore`, storageStatus: "storage/status", storageMigrate: "storage/migrate", mediaSign: "media/sign", + mediaIndex: "media/index", + mediaOrphans: "media/orphans", materialCategories: "material-categories", materialCategory: (categoryId: string) => `material-categories/${categoryId}`, materials: "materials", @@ -74,6 +85,8 @@ export const endpoints = { wardrobeLegacyItem: (profileId: string, wardrobeItemId: string) => `profiles/${profileId}/wardrobe/${wardrobeItemId}`, wardrobeMatch: (profileId: string) => `profiles/${profileId}/wardrobe/match`, privateCompanionDailyOutfit: "integrations/private-companion/daily-outfit", + privateCompanionToken: "integrations/private-companion/token", + privateCompanionTokenRotate: "integrations/private-companion/token/rotate", integrationEventLogs: "integrations/logs", apiDiscoveryDialects: "api-discovery/dialects", apiDiscoveryProbeProvider: "api-discovery/probe-provider", diff --git a/frontend/standalone-web/src/App.vue b/frontend/standalone-web/src/App.vue index 02ba38a..79f0a94 100644 --- a/frontend/standalone-web/src/App.vue +++ b/frontend/standalone-web/src/App.vue @@ -1112,6 +1112,7 @@ const activeGenerateMode = ref("image") const selectedGenerateImageId = ref("") const selectedGalleryImageId = ref("") const imageGenerationPrompt = ref("") +const promptExpansionBusy = ref(false) const lastImageGenerationPrompt = ref("") const lastImageGenerationModel = ref("") const localGenerationImages = ref([]) @@ -1193,6 +1194,9 @@ const lastWorkflowVersionSavedAt = ref("") const workflowDataLoading = ref(false) const workflowDataError = ref("") const workflowNodeActionExecuting = ref(false) +const workflowLifecycleBusy = ref(false) +const workflowLifecycleMessage = ref("") +const workflowLifecycleDetail = ref|null>(null) const workflowNodeActionError = ref("") const workflowBranchCreating = ref(false) const workflowBranchError = ref("") @@ -1228,6 +1232,8 @@ const imageViewerDragging = ref(false) const imageViewerDragStart = ref({ pointerId: -1, x: 0, y: 0, offsetX: 0, offsetY: 0 }) const navigationRailExpanded = ref(true) const navigationRailPinned = ref(true) +let eventStreamTimer: ReturnType | undefined +let lastEventStreamId = "" const notificationFilter = ref("all") const readNotificationIds = ref([]) const dismissedNotificationIds = ref([]) @@ -4191,6 +4197,7 @@ onMounted(() => { } startQuickProfileImageCarousel() void loadAll() + startEventStreamPolling() }) onBeforeUnmount(() => { @@ -4199,6 +4206,7 @@ onBeforeUnmount(() => { document.removeEventListener("keydown", handleGlobalKeyboard) clearNavigationRailHide() clearQuickProfileImageCarousel() + if (eventStreamTimer !== undefined) window.clearInterval(eventStreamTimer) }) watch( @@ -4586,6 +4594,38 @@ async function reloadGalleryPage() { lastUpdated.value = new Date().toISOString() } +async function expandImageGenerationPrompt() { + const prompt=imageGenerationPrompt.value.trim() + if(!prompt||promptExpansionBusy.value)return + promptExpansionBusy.value=true + try{ + const result=await postJson<{prompt?:string;expanded_prompt?:string}>(endpoints.promptsExpand,{parts:[prompt]}) + imageGenerationPrompt.value=String(result.expanded_prompt||result.prompt||prompt) + }catch(err){imageGenerationError.value=`提示词扩写失败:${errorMessage(err)}`}finally{promptExpansionBusy.value=false} +} + +function startEventStreamPolling() { + if (eventStreamTimer !== undefined) window.clearInterval(eventStreamTimer) + const poll = async () => { + if (backendConnection.value.state !== "connected" || document.hidden) return + try { + const stream = await getJson<{events:Array<{event_id?:string;event_type?:string}>}>(endpoints.eventStream,{limit:20}) + const newest = stream.events.at(-1)?.event_id ?? "" + if (!newest || newest === lastEventStreamId) return + const hadPrevious = Boolean(lastEventStreamId) + lastEventStreamId = newest + if (!hadPrevious) return + await Promise.all([loadDashboard(), loadJobs()]) + if (activeNav.value === "gallery") await loadGalleryImages() + if (activeNav.value === "logs") await loadLogs() + } catch { + // Keep the existing manual refresh and polling paths as a silent fallback. + } + } + void poll() + eventStreamTimer = window.setInterval(poll, 5000) +} + async function loadDailyCostUsage() { loadingDailyCostUsage.value = true dailyCostUsageError.value = "" @@ -6699,6 +6739,24 @@ async function archiveSelectedWorkflowFinal() { } } +async function changeSelectedWorkflowLifecycle(action:"start"|"cancel"|"archive") { + const profile=selectedQuickProfileLibraryItem.value + const workflowId=profile?.workflowId + if(!workflowId||workflowLifecycleBusy.value)return + const label=action==="start"?"启动":action==="cancel"?"取消":"归档" + if(action!=="start"&&!window.confirm(`确定${label}当前工作流吗?`))return + workflowLifecycleBusy.value=true;workflowLifecycleMessage.value="" + try{ + const endpoint=action==="start"?endpoints.workflowStart(workflowId):action==="cancel"?endpoints.workflowCancel(workflowId):endpoints.workflowArchive(workflowId) + const updated=await postJson(endpoint) + workflowsByWorkflowId.value={...workflowsByWorkflowId.value,[workflowId]:updated} + workflowLifecycleMessage.value=`工作流已${label}` + }catch(err){workflowLifecycleMessage.value=errorMessage(err)}finally{workflowLifecycleBusy.value=false} +} + +async function reviewSelectedWorkflowOverall(){const workflowId=selectedQuickProfileLibraryItem.value?.workflowId;if(!workflowId)return;workflowLifecycleBusy.value=true;try{workflowLifecycleDetail.value=await getJson>(endpoints.workflowReview(workflowId));workflowLifecycleMessage.value="整体审查已完成"}catch(err){workflowLifecycleMessage.value=errorMessage(err)}finally{workflowLifecycleBusy.value=false}} +async function inspectSelectedNodeDependencies(){const nodeId=selectedWorkflowBackendNode.value?.node_id;if(!nodeId)return;workflowLifecycleBusy.value=true;try{workflowLifecycleDetail.value=await getJson>(endpoints.nodeDependencyContext(nodeId));workflowLifecycleMessage.value="依赖上下文已读取"}catch(err){workflowLifecycleMessage.value=errorMessage(err)}finally{workflowLifecycleBusy.value=false}} + function workflowLockedNodeWriteMessage(action: string) { if (!isSelectedWorkflowNodeWriteLocked.value) return "" return `${action}已被锁定:${selectedWorkflowLockMessage.value}` @@ -9134,6 +9192,7 @@ function errorMessage(err: unknown) {
+
{{JSON.stringify(workflowLifecycleDetail,null,2)}}
span{margin-right:auto;color:var(--text-soft);font-size:11px}.workflow-lifecycle button{min-height:32px;border:1px solid var(--border);border-radius:7px;padding:0 10px;color:var(--text);background:var(--panel-muted);font:inherit}.workflow-lifecycle button:hover{border-color:var(--primary);background:var(--primary-soft)}.workflow-lifecycle button:disabled{opacity:.5} +.workflow-lifecycle-detail{overflow:auto;max-height:220px;margin:0 0 10px;border:1px solid var(--border);border-radius:7px;padding:9px;background:var(--panel-muted);font-size:10px} .workflow-action-card strong { overflow: hidden; diff --git a/frontend/standalone-web/src/features/gallery/GalleryPage.vue b/frontend/standalone-web/src/features/gallery/GalleryPage.vue index f6744b4..82cd4a0 100644 --- a/frontend/standalone-web/src/features/gallery/GalleryPage.vue +++ b/frontend/standalone-web/src/features/gallery/GalleryPage.vue @@ -3,6 +3,8 @@ import { computed, ref, watch } from "vue" import ImagePreviewDialog from "../../components/ImagePreviewDialog.vue" import { formatTime } from "../../../../shared/utils/presentation" import type { GalleryImage } from "./types" +import { deleteJson, postJson } from "../../../../shared/api/client" +import { endpoints } from "../../../../shared/api/endpoints" type GalleryFilter = "all" | "available" | "archived" | "sample" type GalleryView = "grid" | "list" @@ -26,6 +28,9 @@ const query = ref("") const filter = ref("all") const view = ref("grid") const previewImageId = ref("") +const checkedIds = ref([]) +const actionBusy = ref(false) +const actionMessage = ref("") const filters: Array<{ key: GalleryFilter; label: string }> = [ { key: "all", label: "全部" }, @@ -104,6 +109,18 @@ function openPreview(image: GalleryImage) { function closePreview() { previewImageId.value = "" } + +function toggleChecked(imageId:string){checkedIds.value=checkedIds.value.includes(imageId)?checkedIds.value.filter(id=>id!==imageId):[...checkedIds.value,imageId]} +function toggleAllVisible(){const ids=filteredImages.value.filter(image=>!isSample(image)).map(image=>image.image_id);checkedIds.value=ids.length&&ids.every(id=>checkedIds.value.includes(id))?checkedIds.value.filter(id=>!ids.includes(id)):Array.from(new Set([...checkedIds.value,...ids]))} +async function runBatch(action:"select"|"unselect"|"archive"|"delete"|"permanent"){ + const ids=[...checkedIds.value];if(!ids.length)return + if(action==="delete"&&!window.confirm(`确定安全删除选中的 ${ids.length} 张图片吗?系统会先检查引用关系。`))return + if(action==="permanent"&&!window.confirm(`永久删除选中的 ${ids.length} 条图片记录?此操作不可撤销,建议先执行安全删除。`))return + actionBusy.value=true;actionMessage.value="" + let success=0 + for(const id of ids){try{if(action==="select")await postJson(endpoints.imageSelect(id));else if(action==="unselect")await postJson(endpoints.imageUnselect(id));else if(action==="archive")await postJson(endpoints.imageArchive(id));else if(action==="permanent")await deleteJson(endpoints.imageDelete(id));else await postJson(endpoints.imageSafeDelete(id),{dry_run:false,delete_files:false});success++}catch{/* keep remaining items running */}} + actionMessage.value=`已处理 ${success}/${ids.length} 张图片`;checkedIds.value=[];actionBusy.value=false;emit("refresh") +}