feat(*): 生图与视频工作台 - 新增独立生成流程并整合平台配置

This commit is contained in:
ddcat666 committed 2026-10-13 09:04:34 +08:00
1 parent 4c1d2b4012
commit 1f3f2c6020
69 files changed
+7108 -87

No files matched your search

+2
View File
@@ -32,6 +32,8 @@ const (
FeatureSystemPlugins = platform.FeatureSystemPlugins
FeatureInspirationSources = platform.FeatureInspirationSources
FeatureTimelineTranscription = platform.FeatureTimelineTranscription
FeatureImageWorkbench = platform.FeatureImageWorkbench
FeatureVideoWorkbench = platform.FeatureVideoWorkbench
)
type platformHost struct {
+2
View File
@@ -112,6 +112,8 @@ type providerMedia struct {
DataURL string `json:"dataUrl"`
URL string `json:"url"`
StorageKey string `json:"storageKey"`
Role string `json:"role,omitempty"`
SlotKey string `json:"slotKey,omitempty"`
MimeType string `json:"mimeType"`
Bytes int64 `json:"bytes"`
Width int `json:"width"`
+3
View File
@@ -505,6 +505,9 @@ func videoImageRole(input canvasGenerationInput, image providerMedia) string {
}
func videoImageRoleOrDefault(input canvasGenerationInput, image providerMedia, fallback string) string {
if image.Role == "first_frame" || image.Role == "last_frame" {
return image.Role
}
if metadataString(input.Metadata, "videoEditOperation") == "reference_to_video" {
return "reference_image"
}
+11 -6
View File
@@ -22,6 +22,7 @@ import (
"yingce/backend/internal/skills"
"yingce/backend/internal/sms"
"yingce/backend/internal/tools"
"yingce/backend/internal/workbench"
)
type Service struct {
@@ -79,6 +80,7 @@ type Service struct {
auth *auth.Service
sms *sms.Service
canvas *canvas.Service
workbench *workbench.Service
piRunnerMu sync.Mutex
piRunnerWg sync.WaitGroup
piRunners map[string]context.CancelFunc
@@ -99,8 +101,9 @@ const taskWorkerConcurrency = 3
const taskLogPayloadLimit = 4000
type CreateTaskRequest struct {
creationPrepare *creationTaskPreparation
admission *taskAdmission
creationPrepare *creationTaskPreparation
admission *taskAdmission
workbenchKind string
// callerHoldsStorageMu 只给已经持有 Service.storageMu 的内部调用设置。
// 文件容量检查不能再锁一次,否则审批改参数会自锁。
callerHoldsStorageMu bool
@@ -117,9 +120,10 @@ type CreateTaskRequest struct {
}
type TaskListOptions struct {
Limit int
ProjectID string
ActiveOnly bool
Limit int
ProjectID string
ActiveOnly bool
WorkbenchKind string
}
func New(repo *repository.Repository, dataDir string) *Service {
@@ -148,6 +152,7 @@ func newService(repo *repository.Repository, dataDir string) *Service {
service.sms = service.newSMSDomain()
service.auth.SetSMSDelivery(service.sms)
service.canvas = canvas.New(service.repo, canvasHost{svc: service})
service.workbench = workbench.New(service.repo, workbenchAdminGate{svc: service}, workbenchAdminGate{svc: service})
service.platform = platform.New(service.repo, coordinator, platformHost{svc: service})
return service
}
@@ -234,7 +239,7 @@ func (s *Service) Tasks(userID string, limit int) ([]TaskSummary, error) {
}
func (s *Service) TasksWithOptions(userID string, options TaskListOptions) ([]TaskSummary, error) {
tasks, err := s.repo.Tasks(userID, options.Limit, options.ProjectID, options.ActiveOnly)
tasks, err := s.repo.TasksWithWorkbenchKind(userID, options.Limit, options.ProjectID, options.ActiveOnly, options.WorkbenchKind)
if err != nil {
return nil, err
}
+27 -1
View File
@@ -129,7 +129,11 @@ func (s *Service) CreateTask(userID string, req CreateTaskRequest) (*model.Task,
if capacityErr != nil {
return nil, capacityErr
}
task := model.Task{ID: newID(), UserID: userID, TraceID: req.TraceID, RequestID: req.RequestID, ProjectID: req.ProjectID, Type: taskType, Status: model.TaskStatusQueued, Stage: "等待队列调度", Progress: 5, Prompt: prompt, Operation: req.Operation, Provider: req.Provider, Model: req.Model}
workbenchKind := req.workbenchKind
if workbenchKind == "" {
workbenchKind = workbenchKindFromTaskInput(normalizedInput, taskType)
}
task := model.Task{ID: newID(), UserID: userID, TraceID: req.TraceID, RequestID: req.RequestID, ProjectID: req.ProjectID, Type: taskType, WorkbenchKind: workbenchKind, Status: model.TaskStatusQueued, Stage: "等待队列调度", Progress: 5, Prompt: prompt, Operation: req.Operation, Provider: req.Provider, Model: req.Model}
if req.admission != nil {
task.ID = req.admission.ID
task.AgentRunID = req.admission.AgentRunID
@@ -328,6 +332,28 @@ func normalizeTaskInput(input map[string]any) (map[string]any, error) {
return normalized, nil
}
func workbenchKindFromTaskInput(input map[string]any, taskType string) string {
metadata, ok := input["metadata"].(map[string]any)
if !ok || metadata["source"] != "workbench" {
return ""
}
kind := stringValue(metadata["workbenchKind"])
if stringValue(input["mode"]) != kind {
return ""
}
switch kind {
case model.WorkbenchKindImage:
if taskType == "canvas_image" {
return kind
}
case model.WorkbenchKindVideo:
if taskType == "canvas_video" || strings.HasPrefix(taskType, "video_") {
return kind
}
}
return ""
}
// createTextReplayTask 创建前端自管的文本持久化任务:状态为 text_replay,
// 不排队执行、不计 active 队列、不产生计费,仅作为正文增量(text-deltas)的存储容器。
func (s *Service) createTextReplayTask(userID string, req CreateTaskRequest, normalizedInput map[string]any) (*model.Task, error) {
@@ -12,6 +12,23 @@ import (
"gorm.io/gorm"
)
func TestWorkbenchKindFromTaskInputRequiresWorkbenchMetadataAndMatchingTaskType(t *testing.T) {
input := map[string]any{
"mode": "image",
"metadata": map[string]any{"source": "workbench", "workbenchKind": "image"},
}
if got := workbenchKindFromTaskInput(input, "canvas_image"); got != model.WorkbenchKindImage {
t.Fatalf("workbench kind = %q, want image", got)
}
if got := workbenchKindFromTaskInput(input, "canvas_video"); got != "" {
t.Fatalf("mismatched task type was classified as %q", got)
}
input["metadata"].(map[string]any)["source"] = "canvas"
if got := workbenchKindFromTaskInput(input, "canvas_image"); got != "" {
t.Fatalf("non-workbench task was classified as %q", got)
}
}
func TestTaskInputUsesWorkflowProvider(t *testing.T) {
tests := []struct {
name string
+197
View File
@@ -2,6 +2,7 @@ package app
import (
"encoding/json"
"strconv"
"strings"
"time"
@@ -317,6 +318,202 @@ func publicTaskInputJSON(raw string) string {
if len(public) == 0 {
return ""
}
if workbench := publicWorkbenchInput(input); workbench != nil {
public["workbench"] = workbench
}
data, _ := json.Marshal(public)
return string(data)
}
func publicWorkbenchInput(input map[string]any) map[string]any {
metadata, ok := input["metadata"].(map[string]any)
if !ok || metadata["source"] != "workbench" {
return nil
}
kind := strings.TrimSpace(stringValue(metadata["workbenchKind"]))
if kind != model.WorkbenchKindImage && kind != model.WorkbenchKindVideo {
return nil
}
snapshot, _ := metadata["workbench"].(map[string]any)
result := map[string]any{
"kind": kind,
"parameters": publicWorkbenchParameters(kind, snapshot, input),
}
if toolID := strings.TrimSpace(stringValue(metadata["workbenchToolId"])); toolID != "" {
result["toolId"] = toolID
}
if presetID := strings.TrimSpace(stringValue(metadata["workbenchPresetId"])); presetID != "" {
result["presetId"] = presetID
}
result["references"] = publicWorkbenchReferences(snapshot["references"], input)
return result
}
func publicWorkbenchParameters(kind string, snapshot, input map[string]any) map[string]any {
parameters, _ := snapshot["parameters"].(map[string]any)
config, _ := input["config"].(map[string]any)
result := map[string]any{}
if kind == model.WorkbenchKindImage {
copyWorkbenchTextParameter(result, "size", parameters["size"])
copyWorkbenchTextParameter(result, "quality", parameters["quality"])
if result["size"] == nil {
copyWorkbenchTextParameter(result, "size", config["size"])
}
if result["quality"] == nil {
copyWorkbenchTextParameter(result, "quality", config["quality"])
}
if value, ok := workbenchInteger(parameters["count"], 20); ok {
result["count"] = value
} else if value, ok := workbenchInteger(config["count"], 20); ok {
result["count"] = value
}
return result
}
if value, ok := workbenchInteger(parameters["seconds"], 3600); ok {
result["seconds"] = value
} else if value, ok := workbenchInteger(config["videoSeconds"], 3600); ok {
result["seconds"] = value
}
copyWorkbenchTextParameter(result, "ratio", firstWorkbenchValue(parameters["ratio"], config["size"]))
copyWorkbenchTextParameter(result, "resolution", firstWorkbenchValue(parameters["resolution"], config["vquality"]))
if value, ok := workbenchBoolean(firstWorkbenchValue(parameters["generateAudio"], config["videoGenerateAudio"])); ok {
result["generateAudio"] = value
}
if value, ok := workbenchBoolean(firstWorkbenchValue(parameters["watermark"], config["videoWatermark"])); ok {
result["watermark"] = value
}
return result
}
func firstWorkbenchValue(values ...any) any {
for _, value := range values {
if value != nil {
return value
}
}
return nil
}
func copyWorkbenchTextParameter(target map[string]any, key string, value any) {
text, ok := value.(string)
text = strings.TrimSpace(text)
if ok && text != "" && len(text) <= 64 && !strings.Contains(text, "://") && !strings.HasPrefix(strings.ToLower(text), "data:") {
target[key] = text
}
}
func workbenchInteger(value any, max int) (int, bool) {
var parsed int
switch number := value.(type) {
case float64:
parsed = int(number)
if float64(parsed) != number {
return 0, false
}
case int:
parsed = number
case int64:
parsed = int(number)
if int64(parsed) != number {
return 0, false
}
case json.Number:
var err error
parsed, err = strconv.Atoi(number.String())
if err != nil {
return 0, false
}
case string:
var err error
parsed, err = strconv.Atoi(strings.TrimSpace(number))
if err != nil {
return 0, false
}
default:
return 0, false
}
return parsed, parsed >= 1 && parsed <= max
}
func workbenchBoolean(value any) (bool, bool) {
switch flag := value.(type) {
case bool:
return flag, true
case string:
if strings.EqualFold(flag, "true") {
return true, true
}
if strings.EqualFold(flag, "false") {
return false, true
}
}
return false, false
}
func publicWorkbenchReferences(snapshotReferences any, input map[string]any) []map[string]any {
result := make([]map[string]any, 0, 20)
appendReference := func(value map[string]any, fallbackKind string) {
if len(result) >= 20 {
return
}
resourceID := strings.TrimSpace(stringValue(value["resourceId"]))
if resourceID == "" {
storageKey := strings.TrimSpace(stringValue(value["storageKey"]))
if strings.HasPrefix(storageKey, "resource:") {
resourceID = strings.TrimPrefix(storageKey, "resource:")
}
}
if resourceID == "" || strings.ContainsAny(resourceID, "/\\?#") {
return
}
kind := strings.TrimSpace(stringValue(value["kind"]))
if kind != "image" && kind != "video" && kind != "audio" {
kind = fallbackKind
}
if kind != "image" && kind != "video" && kind != "audio" {
return
}
item := map[string]any{"resourceId": resourceID, "kind": kind}
role := strings.TrimSpace(stringValue(value["role"]))
if role == "reference" || role == "first_frame" || role == "last_frame" {
item["role"] = role
}
if slotKey := safeWorkbenchSlotKey(stringValue(value["slotKey"])); slotKey != "" {
item["slotKey"] = slotKey
}
result = append(result, item)
}
if values, ok := snapshotReferences.([]any); ok {
for _, value := range values {
if item, ok := value.(map[string]any); ok {
appendReference(item, "")
}
}
}
if len(result) > 0 {
return result
}
for _, group := range []struct{ key, kind string }{{"referenceImages", "image"}, {"referenceVideos", "video"}, {"referenceAudios", "audio"}} {
values, _ := input[group.key].([]any)
for _, value := range values {
if item, ok := value.(map[string]any); ok {
appendReference(item, group.kind)
}
}
}
return result
}
func safeWorkbenchSlotKey(value string) string {
value = strings.TrimSpace(value)
if value == "" || len(value) > 64 {
return ""
}
for _, character := range value {
if (character >= 'a' && character <= 'z') || (character >= 'A' && character <= 'Z') || (character >= '0' && character <= '9') || character == '_' || character == '-' {
continue
}
return ""
}
return value
}
+28
View File
@@ -31,6 +31,34 @@ func TestTaskForOutputRedactsRoutingAndSecrets(t *testing.T) {
}
}
func TestTaskOutputIncludesOnlySafeWorkbenchRestoreData(t *testing.T) {
task := model.Task{InputJSON: `{"mode":"video","metadata":{"source":"workbench","workbenchKind":"video","workbenchToolId":"tool-1","workbenchPresetId":"preset-1","workbench":{"kind":"video","parameters":{"seconds":8,"ratio":"16:9","resolution":"1080p","generateAudio":true},"references":[{"resourceId":"resource-1","kind":"image","role":"first_frame","slotKey":"subject"}]}},"config":{"apiKey":"private-key","videoSeconds":"8","size":"16:9","vquality":"1080p"},"referenceImages":[{"resourceId":"resource-1","storageKey":"resource:resource-1","role":"first_frame","slotKey":"subject"}]}`}
publicJSON := publicTaskInputJSON(task.InputJSON)
var output map[string]any
if err := json.Unmarshal([]byte(publicJSON), &output); err != nil {
t.Fatal(err)
}
if _, exists := output["config"]; exists {
t.Fatal("provider config leaked from workbench restore data")
}
workbench, ok := output["workbench"].(map[string]any)
if !ok || workbench["kind"] != "video" {
t.Fatalf("workbench restore data missing: %#v", output)
}
parameters, ok := workbench["parameters"].(map[string]any)
if !ok || parameters["seconds"] != float64(8) || parameters["ratio"] != "16:9" || parameters["generateAudio"] != true {
t.Fatalf("workbench parameters not preserved safely: %#v", workbench)
}
references, ok := workbench["references"].([]any)
if !ok || len(references) != 1 {
t.Fatalf("workbench references missing: %#v", workbench)
}
reference := references[0].(map[string]any)
if reference["resourceId"] != "resource-1" || reference["kind"] != "image" || reference["role"] != "first_frame" || reference["slotKey"] != "subject" {
t.Fatalf("safe reference fields not preserved: %#v", reference)
}
}
func TestTaskMediaPreviewUsesSafeMediaURLs(t *testing.T) {
previewURL, previewKind := taskMediaPreview(`{"images":["data:image/png;base64,AAAA","/api/resources/resource-1/file"],"video":"https://cdn.example.com/output.mp4"}`, "video")
if previewURL != "/api/resources/resource-1/file" || previewKind != "image" {
+189
View File
@@ -0,0 +1,189 @@
package app
import (
"strings"
"yingce/backend/internal/assets"
"yingce/backend/internal/model"
"yingce/backend/internal/workbench"
)
const (
WorkbenchKindImage = workbench.KindImage
WorkbenchKindVideo = workbench.KindVideo
)
type (
WorkbenchToolInput = workbench.ToolInput
WorkbenchPresetInput = workbench.PresetInput
WorkbenchToolView = workbench.ToolView
WorkbenchPresetView = workbench.PresetView
WorkbenchTaskInput = workbench.TaskInput
)
type workbenchAdminGate struct{ svc *Service }
func (g workbenchAdminGate) RequireAdmin(user *model.User) error {
if g.svc == nil {
return Unauthorized("请先登录")
}
return g.svc.RequireAdmin(user)
}
func (g workbenchAdminGate) AppendAudit(actor *model.User, action, targetType, targetID, summary string, metadata any) error {
if g.svc == nil {
return Unauthorized("请先登录")
}
return g.svc.appendAdminAudit(actor, action, targetType, targetID, summary, metadata)
}
func (g workbenchAdminGate) WorkbenchResourceAccess(resourceID string) (string, error) {
if g.svc == nil {
return "", Unauthorized("请先登录")
}
resource, err := g.svc.repo.Resource(strings.TrimSpace(resourceID))
if err != nil {
return "", NotFound("工具展示资源不存在")
}
if resource.Kind != "image" && resource.Kind != "video" && resource.Kind != "audio" || resource.Status != model.ResourceStatusReady {
return "", BadAuthRequest("工具展示资源不可用")
}
access, err := g.svc.resolveResourceAccess(resource, ResourceAccessOptions{Purpose: assets.PurposeDisplay})
if err != nil {
return "", err
}
return access.URL, nil
}
func (s *Service) workbenchDomain() *workbench.Service {
if s == nil {
return workbench.New(nil, nil, nil)
}
if s.workbench != nil {
return s.workbench
}
return workbench.New(s.repo, workbenchAdminGate{svc: s}, workbenchAdminGate{svc: s})
}
func (s *Service) PublicWorkbenchTools(kind string) ([]WorkbenchToolView, error) {
if kind == workbench.KindImage {
if err := s.RequireFeature(FeatureImageWorkbench); err != nil {
return nil, err
}
} else if kind == workbench.KindVideo {
if err := s.RequireFeature(FeatureVideoWorkbench); err != nil {
return nil, err
}
} else {
return nil, BadAuthRequest("工作台类型无效")
}
return s.workbenchDomain().PublicTools(kind)
}
func (s *Service) AdminWorkbenchTools(actor *model.User, kind string) ([]WorkbenchToolView, error) {
return s.workbenchDomain().AdminTools(actor, kind)
}
func (s *Service) CreateWorkbenchTool(actor *model.User, req WorkbenchToolInput) (*WorkbenchToolView, error) {
return s.workbenchDomain().CreateTool(actor, req)
}
func (s *Service) UpdateWorkbenchTool(actor *model.User, id string, req WorkbenchToolInput) (*WorkbenchToolView, error) {
return s.workbenchDomain().UpdateTool(actor, id, req)
}
func (s *Service) SetWorkbenchToolEnabled(actor *model.User, id string, enabled bool) error {
return s.workbenchDomain().SetToolEnabled(actor, id, enabled)
}
func (s *Service) CreateWorkbenchPreset(actor *model.User, req WorkbenchPresetInput) (*WorkbenchPresetView, error) {
return s.workbenchDomain().CreatePreset(actor, req)
}
func (s *Service) UpdateWorkbenchPreset(actor *model.User, id string, req WorkbenchPresetInput) (*WorkbenchPresetView, error) {
return s.workbenchDomain().UpdatePreset(actor, id, req)
}
func (s *Service) SetWorkbenchPresetEnabled(actor *model.User, id string, enabled bool) error {
return s.workbenchDomain().SetPresetEnabled(actor, id, enabled)
}
func (s *Service) CreateWorkbenchTask(userID string, req WorkbenchTaskInput, traceID, requestID string) (*model.Task, error) {
if req.Kind == WorkbenchKindImage {
if err := s.RequireFeature(FeatureImageWorkbench); err != nil {
return nil, err
}
} else if req.Kind == WorkbenchKindVideo {
if err := s.RequireFeature(FeatureVideoWorkbench); err != nil {
return nil, err
}
} else {
return nil, BadAuthRequest("工作台类型无效")
}
resolved, err := s.workbenchDomain().ResolveTask(userID, req)
if err != nil {
return nil, err
}
providerConfig, err := s.resolveWorkbenchProviderConfig(req.Kind, resolved.Model, resolved.LogicalModelID, resolved.ChannelID, resolved.Parameters, resolved.Input)
if err != nil {
return nil, err
}
resolved.Input["config"] = providerConfig
modelName, ok := providerConfig["model"].(string)
if !ok || strings.TrimSpace(modelName) == "" {
return nil, BadAuthRequest("所选系统模型不可用")
}
resolved.Model = modelName
return s.CreateTask(userID, CreateTaskRequest{Type: resolved.TaskType, Operation: resolved.Operation, Prompt: resolved.Prompt, Model: resolved.Model, LogicalModelID: resolved.LogicalModelID, Input: resolved.Input, TraceID: traceID, RequestID: requestID, workbenchKind: req.Kind})
}
func (s *Service) WorkbenchTasks(userID, kind string, activeOnly bool, limit int) ([]TaskSummary, error) {
if kind == WorkbenchKindImage {
if err := s.RequireFeature(FeatureImageWorkbench); err != nil {
return nil, err
}
} else if kind == WorkbenchKindVideo {
if err := s.RequireFeature(FeatureVideoWorkbench); err != nil {
return nil, err
}
} else {
return nil, BadAuthRequest("工作台类型无效")
}
return s.TasksWithOptions(userID, TaskListOptions{Limit: limit, ActiveOnly: activeOnly, WorkbenchKind: kind})
}
func (s *Service) resolveWorkbenchProviderConfig(kind, modelName, logicalModelID, channelID string, parameters map[string]any, input map[string]any) (map[string]any, error) {
config := map[string]any{"mode": kind}
if kind == WorkbenchKindImage {
for _, key := range []string{"size", "quality", "count"} {
if value, exists := parameters[key]; exists {
config[key] = providerConfigOptionValue(value)
}
}
} else if kind == WorkbenchKindVideo {
for inputKey, configKey := range map[string]string{
"seconds": "videoSeconds", "ratio": "size", "resolution": "vquality",
"generateAudio": "videoGenerateAudio", "watermark": "videoWatermark",
} {
if value, exists := parameters[inputKey]; exists {
config[configKey] = providerConfigOptionValue(value)
}
}
} else {
return nil, BadAuthRequest("工作台类型无效")
}
if logicalModelID != "" {
config["model"] = modelName
return config, nil
}
channelID = strings.TrimSpace(channelID)
modelName = strings.TrimSpace(modelName)
if channelID == "" || modelName == "" {
return nil, BadAuthRequest("所选系统模型不可用")
}
config["channelId"] = channelID
config["model"] = modelName
input["config"] = config
resolved, err := s.resolveSystemChannelModelSelection(input, "canvas_"+kind, "")
if err != nil {
return nil, err
}
providerConfig, _ := resolved["config"].(map[string]any)
if len(providerConfig) == 0 {
return nil, BadAuthRequest("所选系统模型不可用")
}
return providerConfig, nil
}
@@ -0,0 +1,34 @@
package app
import "testing"
func TestResolveWorkbenchProviderConfigMapsWorkbenchParameters(t *testing.T) {
service := &Service{}
image, err := service.resolveWorkbenchProviderConfig(WorkbenchKindImage, "image-model", "logical-image", "", map[string]any{
"size": "1024x1024", "quality": "high", "count": 2,
}, map[string]any{})
if err != nil {
t.Fatal(err)
}
for key, want := range map[string]any{"model": "image-model", "size": "1024x1024", "quality": "high", "count": "2"} {
if image[key] != want {
t.Errorf("image config[%q] = %#v, want %#v", key, image[key], want)
}
}
video, err := service.resolveWorkbenchProviderConfig(WorkbenchKindVideo, "video-model", "logical-video", "", map[string]any{
"seconds": 8, "ratio": "9:16", "resolution": "1080P", "generateAudio": true, "watermark": false,
}, map[string]any{})
if err != nil {
t.Fatal(err)
}
for key, want := range map[string]any{
"model": "video-model", "videoSeconds": "8", "size": "9:16", "vquality": "1080P",
"videoGenerateAudio": "true", "videoWatermark": "false",
} {
if video[key] != want {
t.Errorf("video config[%q] = %#v, want %#v", key, video[key], want)
}
}
}