fix(canvas): 媒体提示词 - 统一 Agent 更新与画布生成读取生成合同
This commit is contained in:
1 parent
d0b27d2871
commit
ed68608080
20 files changed
+174
-48
No files matched your search
@@ -1,5 +1,7 @@
|
||||
package capability
|
||||
|
||||
import "infinite-canvas/backend/internal/canvas/contract"
|
||||
|
||||
const (
|
||||
maxAgentNodeTitleRunes = 240
|
||||
maxAgentNodeContentRunes = 16000
|
||||
@@ -136,10 +138,10 @@ func generatedMediaDescriptor(nodeType, version, label string, width, height flo
|
||||
Purpose: semantics.Purpose, GoodFor: semantics.GoodFor, NotIdealFor: semantics.NotIdealFor,
|
||||
Tradeoffs: semantics.Tradeoffs, Actions: semantics.Actions,
|
||||
InputKind: nodeType, GenerationMode: generationMode, Connection: connection, CanUpdate: true,
|
||||
SummaryFields: []string{"prompt", "composerContent", "assetTags", "referenceNodeIds"},
|
||||
DetailFields: []string{"prompt", "composerContent", "assetTags", "referenceNodeIds"},
|
||||
PatchFields: editableNodeFields("metadata.composerContent", "下一版提示词", "下次生成使用的提示词草稿;不覆盖已提交提示词或媒体结果"),
|
||||
CreateMetadata: generatedMetadata,
|
||||
SummaryFields: []string{"prompt", "assetTags", "referenceNodeIds"},
|
||||
DetailFields: []string{"prompt", "assetTags", "referenceNodeIds"},
|
||||
PatchFields: editableNodeFields("metadata.generationSpec.prompt", "提示词", "生成合同中的当前提示词;这是 Agent 唯一读写的媒体提示词"),
|
||||
CreateMetadata: func(prompt string) map[string]any { return generatedMetadata(generationMode, prompt) },
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,6 +213,20 @@ func positionPatchFields() map[string]PatchField {
|
||||
}
|
||||
}
|
||||
|
||||
func generatedMetadata(prompt string) map[string]any {
|
||||
return map[string]any{"content": "", "prompt": prompt, "composerContent": prompt, "status": "idle"}
|
||||
func generatedMetadata(mode, prompt string) map[string]any {
|
||||
spec := contract.GenerationSpec{
|
||||
Version: contract.GenerationVersion,
|
||||
Mode: mode,
|
||||
Prompt: prompt,
|
||||
Options: contract.Options{},
|
||||
ReferenceBindings: []contract.ReferenceBinding{},
|
||||
TextInputMode: "append-sources",
|
||||
}
|
||||
metadata, err := spec.NodeMetadata()
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
metadata["content"] = ""
|
||||
metadata["status"] = "idle"
|
||||
return metadata
|
||||
}
|
||||
@@ -6,6 +6,8 @@ import (
|
||||
"sort"
|
||||
"strings"
|
||||
"unicode"
|
||||
|
||||
"infinite-canvas/backend/internal/canvas/contract"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -146,6 +148,23 @@ func (d Descriptor) ApplyPatch(node map[string]any, patch map[string]any) error
|
||||
}
|
||||
for key, value := range patch {
|
||||
field := d.PatchFields[key]
|
||||
if field.Path == "metadata.generationSpec.prompt" {
|
||||
metadata, ok := node["metadata"].(map[string]any)
|
||||
if !ok {
|
||||
metadata = map[string]any{}
|
||||
node["metadata"] = metadata
|
||||
}
|
||||
if _, ok := metadata["generationSpec"].(map[string]any); !ok {
|
||||
metadata["generationSpec"] = map[string]any{
|
||||
"version": float64(contract.GenerationVersion),
|
||||
"mode": d.GenerationMode,
|
||||
"prompt": "",
|
||||
"options": map[string]any{},
|
||||
"referenceBindings": []any{},
|
||||
"textInputMode": "append-sources",
|
||||
}
|
||||
}
|
||||
}
|
||||
parts := strings.Split(field.Path, ".")
|
||||
target := node
|
||||
for _, part := range parts[:len(parts)-1] {
|
||||
|
||||
@@ -241,8 +241,8 @@ func TestBuiltinMediaCapabilitiesUpdateDraftWithoutOverwritingGeneratedAssets(t
|
||||
if !ok || !descriptor.CanUpdate {
|
||||
t.Fatalf("media capability is not updateable: %#v", descriptor)
|
||||
}
|
||||
if descriptor.PatchFields["content"].Path != "metadata.composerContent" || descriptor.PatchFields["title"].Path != "title" {
|
||||
t.Fatalf("unsafe media update paths: %#v", descriptor.PatchFields)
|
||||
if descriptor.PatchFields["content"].Path != "metadata.generationSpec.prompt" || descriptor.PatchFields["title"].Path != "title" {
|
||||
t.Fatalf("media update must target the generation contract: %#v", descriptor.PatchFields)
|
||||
}
|
||||
|
||||
node := map[string]any{
|
||||
@@ -251,28 +251,70 @@ func TestBuiltinMediaCapabilitiesUpdateDraftWithoutOverwritingGeneratedAssets(t
|
||||
"content": "resource:generated-result",
|
||||
"prompt": "已提交提示词",
|
||||
"composerContent": "旧草稿",
|
||||
"status": "success",
|
||||
"generationSpec": map[string]any{
|
||||
"version": float64(1),
|
||||
"mode": nodeType,
|
||||
"prompt": "旧草稿",
|
||||
"options": map[string]any{},
|
||||
"referenceBindings": []any{},
|
||||
"textInputMode": "append-sources",
|
||||
},
|
||||
"status": "success",
|
||||
},
|
||||
}
|
||||
if err := descriptor.ApplyPatch(node, map[string]any{"title": "新标题", "content": "下一版提示词"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
metadata := node["metadata"].(map[string]any)
|
||||
if node["title"] != "新标题" || metadata["composerContent"] != "下一版提示词" {
|
||||
t.Fatalf("media draft was not updated: %#v", node)
|
||||
generationSpec := metadata["generationSpec"].(map[string]any)
|
||||
if node["title"] != "新标题" || generationSpec["prompt"] != "下一版提示词" || metadata["composerContent"] != "旧草稿" {
|
||||
t.Fatalf("media prompt contract was not updated: %#v", node)
|
||||
}
|
||||
if metadata["content"] != "resource:generated-result" || metadata["prompt"] != "已提交提示词" || metadata["status"] != "success" {
|
||||
if metadata["content"] != "resource:generated-result" || metadata["prompt"] != "已提交提示词" || metadata["status"] != "success" || generationSpec["prompt"] != "下一版提示词" {
|
||||
t.Fatalf("media result or submission snapshot was overwritten: %#v", metadata)
|
||||
}
|
||||
|
||||
created := descriptor.Metadata("初始草稿")
|
||||
if created["content"] != "" || created["prompt"] != "初始草稿" || created["composerContent"] != "初始草稿" || created["status"] != "idle" {
|
||||
createdSpec := created["generationSpec"].(map[string]any)
|
||||
if created["content"] != "" || created["prompt"] != "初始草稿" || created["composerContent"] != "初始草稿" || createdSpec["prompt"] != "初始草稿" || created["status"] != "idle" {
|
||||
t.Fatalf("media draft metadata is incomplete: %#v", created)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuiltinMediaCapabilitiesUpdateDraftInitializesEmptyGenerationContract(t *testing.T) {
|
||||
registry := BuiltinRegistry()
|
||||
for _, nodeType := range []string{"image", "video", "audio"} {
|
||||
t.Run(nodeType, func(t *testing.T) {
|
||||
descriptor, ok := registry.Resolve(nodeType)
|
||||
if !ok {
|
||||
t.Fatal("missing media descriptor")
|
||||
}
|
||||
node := map[string]any{
|
||||
"title": "旧媒体节点",
|
||||
"metadata": map[string]any{
|
||||
"content": "resource:already-generated",
|
||||
"prompt": "已提交快照",
|
||||
"composerContent": "旧兼容草稿",
|
||||
"status": "success",
|
||||
},
|
||||
}
|
||||
if err := descriptor.ApplyPatch(node, map[string]any{"content": "空合同后的新提示词"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
metadata := node["metadata"].(map[string]any)
|
||||
spec := metadata["generationSpec"].(map[string]any)
|
||||
if spec["mode"] != nodeType || spec["prompt"] != "空合同后的新提示词" {
|
||||
t.Fatalf("empty generation contract was not initialized: %#v", metadata)
|
||||
}
|
||||
if metadata["content"] != "resource:already-generated" || metadata["prompt"] != "已提交快照" || metadata["composerContent"] != "旧兼容草稿" || metadata["status"] != "success" {
|
||||
t.Fatalf("legacy media state was overwritten: %#v", metadata)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestRegistryResolveUnknownTypeFailsClosed(t *testing.T) {
|
||||
registry, err := NewRegistry([]Descriptor{testDescriptor()})
|
||||
if err != nil {
|
||||
|
||||
Reference in new issue
Block a user