fix(canvas): 媒体提示词 - 统一 Agent 更新与画布生成读取生成合同
This commit is contained in:
1 parent
853c7d2ce7
commit
6d757b7001
20 files changed
+174
-48
No files matched your search
@@ -68,10 +68,11 @@ func cloudAgentCreativeAnchorForCanvas(repo *repository.Repository, userID strin
|
||||
continue
|
||||
}
|
||||
meta, _ := node["metadata"].(map[string]any)
|
||||
prompt, _ := cloudAgentMediaPrompt(meta)
|
||||
item := cloudAgentReferenceAnchor{
|
||||
NodeID: stringValue(node["id"]), Type: descriptor.Type,
|
||||
Title: truncateRunes(stringValue(node["title"]), 300),
|
||||
Prompt: truncateRunes(firstNonEmpty(stringValue(meta["prompt"]), stringValue(meta["composerContent"])), 1000),
|
||||
Prompt: truncateRunes(prompt, 1000),
|
||||
VisualIdentity: "unknown", RequiresVisualInspection: true,
|
||||
}
|
||||
if tags, ok := meta["assetTags"].([]any); ok {
|
||||
|
||||
@@ -29,7 +29,7 @@ func TestCloudAgentCanvasApprovalPreviewDescribesUpdateTargetAndFields(t *testin
|
||||
if item.NodeTitle != "满月庆祝视频草稿" || item.NodeType != "video" || item.NodeTypeLabel != "视频" {
|
||||
t.Fatalf("preview lost target identity: %+v", item)
|
||||
}
|
||||
if item.ResultTitle != newTitle || strings.Join(item.Fields, "、") != "节点名称、下一版提示词" {
|
||||
if item.ResultTitle != newTitle || strings.Join(item.Fields, "、") != "节点名称、提示词" {
|
||||
t.Fatalf("preview lost changed fields: %+v", item)
|
||||
}
|
||||
raw, _ := json.Marshal(item)
|
||||
@@ -37,7 +37,8 @@ func TestCloudAgentCanvasApprovalPreviewDescribesUpdateTargetAndFields(t *testin
|
||||
t.Fatalf("preview exposed private content or internal id: %s", raw)
|
||||
}
|
||||
metadata := doc["nodes"].([]map[string]any)[0]["metadata"].(map[string]any)
|
||||
if metadata["content"] != "已提交结果" || metadata["prompt"] != "private prompt" || metadata["composerContent"] != newPrompt {
|
||||
generationSpec := metadata["generationSpec"].(map[string]any)
|
||||
if metadata["content"] != "已提交结果" || metadata["prompt"] != "private prompt" || generationSpec["prompt"] != newPrompt {
|
||||
t.Fatalf("preview mutated media result incorrectly: %+v", metadata)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -216,8 +216,13 @@ func TestCloudAgentCanvasOperationTraceSharesToolCallID(t *testing.T) {
|
||||
break
|
||||
}
|
||||
}
|
||||
if cat == nil || stringValue(cat["title"]) != "叮当猫飞行参考" || stringValue(cat["metadata"].(map[string]any)["composerContent"]) != "下一版参考图提示词" {
|
||||
t.Fatalf("canvas_apply_ops did not persist the requested draft: %+v", cat)
|
||||
if cat == nil || stringValue(cat["title"]) != "叮当猫飞行参考" {
|
||||
t.Fatalf("canvas_apply_ops did not persist the requested prompt contract: %+v", cat)
|
||||
}
|
||||
metadata := cat["metadata"].(map[string]any)
|
||||
generationSpec := metadata["generationSpec"].(map[string]any)
|
||||
if stringValue(generationSpec["prompt"]) != "下一版参考图提示词" {
|
||||
t.Fatalf("canvas_apply_ops did not persist the requested prompt contract: %+v", cat)
|
||||
}
|
||||
|
||||
actions := creationMaps(trace["actions"])
|
||||
@@ -238,7 +243,7 @@ func TestCloudAgentCanvasOperationTraceSharesToolCallID(t *testing.T) {
|
||||
fieldValues = append(fieldValues, stringValue(field))
|
||||
}
|
||||
}
|
||||
if len(fieldValues) != 2 || fieldValues[0] != "节点名称" || fieldValues[1] != "下一版提示词" {
|
||||
if len(fieldValues) != 2 || fieldValues[0] != "节点名称" || fieldValues[1] != "提示词" {
|
||||
t.Fatalf("canvas operation trace lost updated fields: %+v", updated)
|
||||
}
|
||||
created := byActionAndNode["created:trace-video"]
|
||||
|
||||
@@ -440,9 +440,15 @@ func cloudAgentProjectNodeFields(node, meta map[string]any, descriptor capabilit
|
||||
}
|
||||
continue
|
||||
}
|
||||
value, ok := node[key]
|
||||
if !ok {
|
||||
value, ok = meta[key]
|
||||
var value any
|
||||
var ok bool
|
||||
if key == "prompt" && descriptor.GenerationMode != "" {
|
||||
value, ok = cloudAgentMediaPrompt(meta)
|
||||
} else {
|
||||
value, ok = node[key]
|
||||
if !ok {
|
||||
value, ok = meta[key]
|
||||
}
|
||||
}
|
||||
if !ok || (key == "content" && descriptor.GenerationMode != "") {
|
||||
continue
|
||||
@@ -457,6 +463,21 @@ func cloudAgentProjectNodeFields(node, meta map[string]any, descriptor capabilit
|
||||
return projected, nil
|
||||
}
|
||||
|
||||
func cloudAgentMediaPrompt(meta map[string]any) (string, bool) {
|
||||
if generationSpec, ok := meta["generationSpec"].(map[string]any); ok {
|
||||
if prompt, ok := generationSpec["prompt"].(string); ok {
|
||||
return prompt, true
|
||||
}
|
||||
}
|
||||
if prompt, ok := meta["composerContent"].(string); ok {
|
||||
return prompt, true
|
||||
}
|
||||
if prompt, ok := meta["prompt"].(string); ok {
|
||||
return prompt, true
|
||||
}
|
||||
return "", false
|
||||
}
|
||||
|
||||
func cloudAgentProjectionValue(node, meta map[string]any, path string) (any, bool) {
|
||||
parts := strings.Split(path, ".")
|
||||
for _, root := range []map[string]any{node, meta} {
|
||||
|
||||
@@ -963,7 +963,8 @@ func TestCloudAgentCanvasUpdatesExistingVideoDraftThroughCapabilityContract(t *t
|
||||
}
|
||||
updated := updatedNodes["video-1789310237935-mmh3-baby-fullmoon"]
|
||||
metadata := updated["metadata"].(map[string]any)
|
||||
if updated["title"] != "满月庆祝视频草稿(舒缓呼吸感)" || metadata["composerContent"] != "下一版舒缓视频提示词" {
|
||||
generationSpec := metadata["generationSpec"].(map[string]any)
|
||||
if updated["title"] != "满月庆祝视频草稿(舒缓呼吸感)" || generationSpec["prompt"] != "下一版舒缓视频提示词" {
|
||||
t.Fatalf("video draft was not updated: %#v", updated)
|
||||
}
|
||||
if metadata["prompt"] != "原始已提交提示词" || metadata["status"] != "error" || metadata["referenceIssue"] != "参考资产尚未准备完成" {
|
||||
|
||||
Reference in new issue
Block a user