feat: 完成短剧项目空间与结构化资产创作闭环 (#38)
* feat(canvas): 短剧项目空间 - 建立项目章节与画布关联 MVP * feat(canvas): 短剧项目空间 - 完善项目资产、镜头与流程闭环 Refs #30 * fix(deploy): 本地部署 - 修复前端构建并忽略本地 PostgreSQL 配置 * feat(*): 短剧项目空间 - 完成项目、章节、资产、角色与画布创作闭环 Refs #30 --------- Co-authored-by: ddCat <ddcat666@88.com>
This commit is contained in:
1 parent
431b9e3294
commit
d2fbc413b3
208 files changed
+22655
-4234
No files matched your search
@@ -79,6 +79,8 @@ type TaskSummary struct {
|
||||
Provider string `json:"provider,omitempty"`
|
||||
Model string `json:"model,omitempty"`
|
||||
ErrorCode string `json:"errorCode,omitempty"`
|
||||
PreviewURL string `json:"previewUrl,omitempty"`
|
||||
PreviewKind string `json:"previewKind,omitempty"`
|
||||
Attempts int `json:"attempts"`
|
||||
StartedAt *time.Time `json:"startedAt"`
|
||||
CompletedAt *time.Time `json:"completedAt"`
|
||||
@@ -290,6 +292,10 @@ func (s *Service) CreateTask(userID string, req CreateTaskRequest) (*model.Task,
|
||||
taskType = "video_image_to_video"
|
||||
}
|
||||
task := model.Task{ID: newID(), UserID: userID, SessionID: req.SessionID, ProjectID: req.ProjectID, Type: taskType, Status: model.TaskStatusQueued, Stage: "等待队列调度", Progress: 5, Prompt: prompt, Operation: req.Operation, Provider: req.Provider, Model: req.Model}
|
||||
domainProjectID, projectTaskLimit, err := s.projectTaskLimit(userID, req.ProjectID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
billingOrder, err := s.taskBillingOrder(userID, &task, normalizedInput)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -302,10 +308,13 @@ func (s *Service) CreateTask(userID string, req CreateTaskRequest) (*model.Task,
|
||||
if billingOrder != nil {
|
||||
task.BillingOrderID = billingOrder.ID
|
||||
}
|
||||
err = s.createTaskWithinStorageQuota(&task, billingOrder, policy)
|
||||
err = s.createTaskWithinStorageQuota(&task, billingOrder, policy, domainProjectID, projectTaskLimit)
|
||||
if errors.Is(err, repository.ErrActiveTaskLimit) {
|
||||
return nil, BadAuthRequest(fmt.Sprintf("同时排队或运行的任务最多 %d 个,请等待已有任务完成", policy.Task.ActiveTaskLimit))
|
||||
}
|
||||
if errors.Is(err, repository.ErrProjectTaskLimit) {
|
||||
return nil, BadAuthRequest(fmt.Sprintf("当前项目同时排队或运行的任务最多 %d 个", projectTaskLimit))
|
||||
}
|
||||
if errors.Is(err, repository.ErrInsufficientCredits) {
|
||||
return nil, BadAuthRequest("积分不足,请先使用兑换码充值")
|
||||
}
|
||||
@@ -410,13 +419,20 @@ func (s *Service) RetryTask(userID string, id string) (*model.Task, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
task, err = s.repo.RetryTaskWithBilling(userID, task.ID, billingOrder, policy.Task.ActiveTaskLimit)
|
||||
domainProjectID, projectTaskLimit, err := s.projectTaskLimit(userID, task.ProjectID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
task, err = s.repo.RetryTaskWithBilling(userID, task.ID, billingOrder, policy.Task.ActiveTaskLimit, domainProjectID, projectTaskLimit)
|
||||
if errors.Is(err, repository.ErrInsufficientCredits) {
|
||||
return nil, BadAuthRequest("积分不足,请先使用兑换码充值")
|
||||
}
|
||||
if errors.Is(err, repository.ErrActiveTaskLimit) {
|
||||
return nil, BadAuthRequest(fmt.Sprintf("同时排队或运行的任务最多 %d 个,请等待已有任务完成", policy.Task.ActiveTaskLimit))
|
||||
}
|
||||
if errors.Is(err, repository.ErrProjectTaskLimit) {
|
||||
return nil, BadAuthRequest(fmt.Sprintf("当前项目同时排队或运行的任务最多 %d 个", projectTaskLimit))
|
||||
}
|
||||
if errors.Is(err, repository.ErrTaskNotRetryable) {
|
||||
return nil, BadAuthRequest("任务已被其他请求重新入队,请勿重复重试")
|
||||
}
|
||||
@@ -539,6 +555,7 @@ func taskSummaryForOutput(task model.Task) TaskSummary {
|
||||
if isContentModerationFailure(task.Error) {
|
||||
errorCode = contentModerationErrorCode
|
||||
}
|
||||
previewURL, previewKind := taskMediaPreview(task.ResultJSON, task.Type)
|
||||
return TaskSummary{
|
||||
ID: task.ID,
|
||||
SessionID: task.SessionID,
|
||||
@@ -552,6 +569,8 @@ func taskSummaryForOutput(task model.Task) TaskSummary {
|
||||
Provider: task.Provider,
|
||||
Model: task.Model,
|
||||
ErrorCode: errorCode,
|
||||
PreviewURL: previewURL,
|
||||
PreviewKind: previewKind,
|
||||
Attempts: task.Attempts,
|
||||
StartedAt: task.StartedAt,
|
||||
CompletedAt: task.CompletedAt,
|
||||
@@ -560,6 +579,63 @@ func taskSummaryForOutput(task model.Task) TaskSummary {
|
||||
}
|
||||
}
|
||||
|
||||
// 列表只暴露首个可访问媒体地址,避免把完整生成结果和内嵌数据带回前端。
|
||||
func taskMediaPreview(raw string, taskType string) (string, string) {
|
||||
if strings.TrimSpace(raw) == "" {
|
||||
return "", ""
|
||||
}
|
||||
var payload any
|
||||
if json.Unmarshal([]byte(raw), &payload) != nil {
|
||||
return "", ""
|
||||
}
|
||||
defaultKind := "image"
|
||||
if strings.Contains(strings.ToLower(taskType), "video") {
|
||||
defaultKind = "video"
|
||||
}
|
||||
return findTaskMediaPreview(payload, defaultKind)
|
||||
}
|
||||
|
||||
func findTaskMediaPreview(value any, hint string) (string, string) {
|
||||
switch item := value.(type) {
|
||||
case string:
|
||||
text := strings.TrimSpace(item)
|
||||
if !strings.HasPrefix(text, "/api/resources/") && !strings.HasPrefix(text, "http://") && !strings.HasPrefix(text, "https://") {
|
||||
return "", ""
|
||||
}
|
||||
kind := hint
|
||||
lower := strings.ToLower(text)
|
||||
if strings.Contains(lower, ".mp4") || strings.Contains(lower, ".webm") || strings.Contains(lower, ".mov") {
|
||||
kind = "video"
|
||||
} else if kind != "video" {
|
||||
kind = "image"
|
||||
}
|
||||
return text, kind
|
||||
case []any:
|
||||
for _, child := range item {
|
||||
if previewURL, previewKind := findTaskMediaPreview(child, hint); previewURL != "" {
|
||||
return previewURL, previewKind
|
||||
}
|
||||
}
|
||||
case map[string]any:
|
||||
for _, key := range []string{"images", "image", "video", "dataUrl", "url", "resultUrl", "outputUrl"} {
|
||||
child, exists := item[key]
|
||||
if !exists {
|
||||
continue
|
||||
}
|
||||
childHint := hint
|
||||
if key == "video" {
|
||||
childHint = "video"
|
||||
} else if key == "images" || key == "image" {
|
||||
childHint = "image"
|
||||
}
|
||||
if previewURL, previewKind := findTaskMediaPreview(child, childHint); previewURL != "" {
|
||||
return previewURL, previewKind
|
||||
}
|
||||
}
|
||||
}
|
||||
return "", ""
|
||||
}
|
||||
|
||||
func truncateRunes(value string, limit int) string {
|
||||
text := []rune(value)
|
||||
if len(text) <= limit {
|
||||
@@ -582,7 +658,8 @@ func publicTaskInputJSON(raw string) string {
|
||||
return ""
|
||||
}
|
||||
public := map[string]any{}
|
||||
for _, key := range []string{"mode", "metadata"} {
|
||||
// 任务完成后仍需依靠这些非敏感 ID 恢复项目产物归属;密钥等配置继续被过滤。
|
||||
for _, key := range []string{"mode", "metadata", "workflowStepId", "domainProjectId", "assetVersionId", "resourceId", "mediaType", "role"} {
|
||||
if value, ok := input[key]; ok {
|
||||
public[key] = value
|
||||
}
|
||||
@@ -781,6 +858,12 @@ func (s *Service) processClaimedTask(task *model.Task) error {
|
||||
_ = s.log(task.UserID, task.ID, "error", "任务结果保存失败", task.Error)
|
||||
return err
|
||||
}
|
||||
if completedTask, fetchErr := s.repo.Task(task.ID); fetchErr == nil {
|
||||
if registerErr := s.RegisterTaskOutputFromTask(*completedTask); registerErr != nil {
|
||||
// 任务成功与产物登记分开记账;登记失败保持步骤异常,允许项目页幂等补登记。
|
||||
_ = s.log(task.UserID, task.ID, "error", "任务成功但项目产物登记失败", registerErr.Error())
|
||||
}
|
||||
}
|
||||
if err := s.SettleBilling(task.BillingOrderID, ""); err != nil {
|
||||
_ = s.MarkBillingUncertain(task.BillingOrderID, "生成成功但积分结算失败:"+err.Error())
|
||||
_ = s.log(task.UserID, task.ID, "error", "积分结算失败,已进入待核对", err.Error())
|
||||
|
||||
Reference in new issue
Block a user