refactor: [Coda] stop merging snippet variable definitions

(LogID: 202510241537520100911040168388BC8)

Co-Authored-By: Coda <[email protected]>

Author: kasarolzzw

backend/modules/prompt/domain/service/manage.go

@@ -483,9 +483,8 @@ func (p *PromptServiceImpl) doExpandSnippets(ctx context.Context, promptDO *enti
 		}
 	}
 
-	// Build maps for quick lookup of snippet content and variable definitions
+	// Build map for quick lookup of snippet content
 	snippetContentMap := make(map[string]string)
-	snippetVariableMap := make(map[string][]*entity.VariableDef)
 	for _, snippet := range promptDetail.PromptTemplate.Snippets {
 		if snippet == nil || snippet.PromptBasic == nil {
 			continue
@@ -503,111 +502,68 @@ func (p *PromptServiceImpl) doExpandSnippets(ctx context.Context, promptDO *enti
 			snippetContent := ptr.From(snippetDetail.PromptTemplate.Messages[0].Content)
 			snippetContentMap[key] = snippetContent
 		}
-
-		// Collect variable definitions from snippet
-		if len(snippetDetail.PromptTemplate.VariableDefs) > 0 {
-			snippetVariableMap[key] = snippetDetail.PromptTemplate.VariableDefs
-		}
-	}
-
-	// Now expand all snippet references in messages using the pre-built content map and merge variable definitions
-	var allMergedVariableDefs []*entity.VariableDef
-	existingVarKeys := make(map[string]bool) // Track existing variable keys to avoid duplicates
-
-	// First, collect existing variable definitions from the main prompt
-	for _, varDef := range promptDetail.PromptTemplate.VariableDefs {
-		if varDef != nil {
-			allMergedVariableDefs = append(allMergedVariableDefs, varDef)
-			existingVarKeys[varDef.Key] = true
-		}
 	}
 
+	// Expand all snippet references in messages using the pre-built content map
 	for _, message := range promptDetail.PromptTemplate.Messages {
 		if message == nil {
 			continue
 		}
 
 		// Expand content if it exists
 		if message.Content != nil && *message.Content != "" {
-			expandedContent, mergedVars, err := p.expandWithSnippetMap(ctx, *message.Content, snippetContentMap, snippetVariableMap)
+			expandedContent, err := p.expandWithSnippetMap(ctx, *message.Content, snippetContentMap)
 			if err != nil {
 				return err
 			}
 			message.Content = &expandedContent
-			// Add merged variable definitions (avoid duplicates)
-			for _, varDef := range mergedVars {
-				if varDef != nil && !existingVarKeys[varDef.Key] {
-					allMergedVariableDefs = append(allMergedVariableDefs, varDef)
-					existingVarKeys[varDef.Key] = true
-				}
-			}
 		}
 
 		// Expand text in parts
 		for _, part := range message.Parts {
 			if part == nil || part.Text == nil || *part.Text == "" {
 				continue
 			}
-			expandedText, mergedVars, err := p.expandWithSnippetMap(ctx, *part.Text, snippetContentMap, snippetVariableMap)
+			expandedText, err := p.expandWithSnippetMap(ctx, *part.Text, snippetContentMap)
 			if err != nil {
 				return err
 			}
 			part.Text = &expandedText
-			// Add merged variable definitions (avoid duplicates)
-			for _, varDef := range mergedVars {
-				if varDef != nil && !existingVarKeys[varDef.Key] {
-					allMergedVariableDefs = append(allMergedVariableDefs, varDef)
-					existingVarKeys[varDef.Key] = true
-				}
-			}
 		}
 	}
 
-	// Update the prompt template with merged variable definitions
-	promptDetail.PromptTemplate.VariableDefs = allMergedVariableDefs
-
 	return nil
 }
 
-// expandWithSnippetMap expands snippet references using a pre-built content map and returns expanded content with merged variable definitions
-func (p *PromptServiceImpl) expandWithSnippetMap(ctx context.Context, content string, snippetContentMap map[string]string, snippetVariableMap map[string][]*entity.VariableDef) (string, []*entity.VariableDef, error) {
+// expandWithSnippetMap expands snippet references using a pre-built content map and returns expanded content
+func (p *PromptServiceImpl) expandWithSnippetMap(ctx context.Context, content string, snippetContentMap map[string]string) (string, error) {
 	// Parse snippet references from content
 	snippetRefs, err := p.snippetParser.ParseReferences(content)
 	if err != nil {
-		return "", nil, err
+		return "", err
 	}
 
 	// If no references found, return original content and empty variable definitions
 	if len(snippetRefs) == 0 {
-		return content, nil, nil
+		return content, nil
 	}
 
-	// Replace each reference with expanded content from the map and collect variable definitions
+	// Replace each reference with expanded content from the map
 	expandedContent := content
-	var mergedVariableDefs []*entity.VariableDef
-	processedSnippets := make(map[string]bool) // Track processed snippets to avoid duplicates
 
 	for _, ref := range snippetRefs {
 		// Build lookup key: "promptID_version"
 		key := fmt.Sprintf("%d_%s", ref.PromptID, ref.CommitVersion)
 		expandedSnippetContent, exists := snippetContentMap[key]
 		if !exists {
-			return "", nil, errorx.NewByCode(prompterr.ResourceNotFoundCode,
+			return "", errorx.NewByCode(prompterr.ResourceNotFoundCode,
 				errorx.WithExtraMsg(fmt.Sprintf("snippet content for prompt %d with version %s not found in cache", ref.PromptID, ref.CommitVersion)))
 		}
 
-		// Collect variable definitions from this snippet if not already processed
-		if !processedSnippets[key] {
-			if variableDefs, varExists := snippetVariableMap[key]; varExists && len(variableDefs) > 0 {
-				mergedVariableDefs = append(mergedVariableDefs, variableDefs...)
-			}
-			processedSnippets[key] = true
-		}
-
 		// Replace the reference with expanded content
 		refString := p.snippetParser.SerializeReference(ref)
 		expandedContent = strings.ReplaceAll(expandedContent, refString, expandedSnippetContent)
 	}
 
-	return expandedContent, mergedVariableDefs, nil
+	return expandedContent, nil
 }

backend/modules/prompt/domain/service/manage_test.go

@@ -925,15 +925,10 @@ func TestPromptServiceImpl_ExpandSnippets(t *testing.T) {
 				}
 				as.NotEmpty(detail.PromptTemplate.Snippets)
 				as.Equal("hello snippet body", ptr.From(detail.PromptTemplate.Messages[0].Content))
-				as.Len(detail.PromptTemplate.VariableDefs, 2)
-				keys := map[string]bool{}
-				for _, def := range detail.PromptTemplate.VariableDefs {
-					if def != nil {
-						keys[def.Key] = true
-					}
+				as.Len(detail.PromptTemplate.VariableDefs, 1)
+				if len(detail.PromptTemplate.VariableDefs) > 0 {
+					as.Equal("main_var", detail.PromptTemplate.VariableDefs[0].Key)
 				}
-				as.True(keys["main_var"])
-				as.True(keys["snippet_var"])
 			},
 		},
 	}
@@ -966,16 +961,14 @@ func TestPromptServiceImpl_expandWithSnippetMap(t *testing.T) {
 		snippetParser SnippetParser
 	}
 	type args struct {
-		content            string
-		snippetContentMap  map[string]string
-		snippetVariableMap map[string][]*entity.VariableDef
+		content           string
+		snippetContentMap map[string]string
 	}
 	tests := []struct {
 		name        string
 		fields      fields
 		args        args
 		wantContent string
-		wantVars    []*entity.VariableDef
 		wantErr     error
 	}{
 		{
@@ -988,9 +981,8 @@ func TestPromptServiceImpl_expandWithSnippetMap(t *testing.T) {
 				},
 			},
 			args: args{
-				content:            "test",
-				snippetContentMap:  map[string]string{},
-				snippetVariableMap: map[string][]*entity.VariableDef{},
+				content:           "test",
+				snippetContentMap: map[string]string{},
 			},
 			wantErr: errors.New("parse fail"),
 		},
@@ -1004,14 +996,13 @@ func TestPromptServiceImpl_expandWithSnippetMap(t *testing.T) {
 				},
 			},
 			args: args{
-				content:            "<cozeloop_snippet>id=2&version=v1</cozeloop_snippet>",
-				snippetContentMap:  map[string]string{},
-				snippetVariableMap: map[string][]*entity.VariableDef{},
+				content:           "<cozeloop_snippet>id=2&version=v1</cozeloop_snippet>",
+				snippetContentMap: map[string]string{},
 			},
 			wantErr: errorx.NewByCode(prompterr.ResourceNotFoundCode, errorx.WithExtraMsg("snippet content for prompt 2 with version v1 not found in cache")),
 		},
 		{
-			name: "success merges duplicated variables",
+			name: "success expands duplicated snippets",
 			fields: fields{
 				snippetParser: NewCozeLoopSnippetParser(),
 			},
@@ -1020,14 +1011,8 @@ func TestPromptServiceImpl_expandWithSnippetMap(t *testing.T) {
 				snippetContentMap: map[string]string{
 					"2_v1": "snippet",
 				},
-				snippetVariableMap: map[string][]*entity.VariableDef{
-					"2_v1": {
-						{Key: "snippet_var"},
-					},
-				},
 			},
 			wantContent: "hello snippet and again snippet",
-			wantVars:    []*entity.VariableDef{{Key: "snippet_var"}},
 		},
 	}
 
@@ -1042,25 +1027,12 @@ func TestPromptServiceImpl_expandWithSnippetMap(t *testing.T) {
 				svc.snippetParser = NewCozeLoopSnippetParser()
 			}
 
-			gotContent, gotVars, err := svc.expandWithSnippetMap(context.Background(), ttt.args.content, ttt.args.snippetContentMap, ttt.args.snippetVariableMap)
+			gotContent, err := svc.expandWithSnippetMap(context.Background(), ttt.args.content, ttt.args.snippetContentMap)
 			unittest.AssertErrorEqual(t, ttt.wantErr, err)
 			if ttt.wantErr != nil {
 				return
 			}
 			assert.Equal(t, ttt.wantContent, gotContent)
-			if ttt.wantVars != nil {
-				assert.Len(t, gotVars, len(ttt.wantVars))
-				for _, expected := range ttt.wantVars {
-					found := false
-					for _, actual := range gotVars {
-						if actual != nil && actual.Key == expected.Key {
-							found = true
-							break
-						}
-					}
-					assert.True(t, found, "expected variable %s not found", expected.Key)
-				}
-			}
 		})
 	}
 }