refactor: 将 PrepareRequest 和 CompleteLLM 的选项参数类型从 ztype.Map 更改为函数类型，以提高灵活性和可维护性

Author: sohaha

agent/deepseek.go

@@ -126,7 +126,7 @@ func (p *DeepseekProvider) streamable(ctx context.Context, body []byte) (*zjson.
 	return zjson.ParseBytes(json), nil
 }
 
-func (p *DeepseekProvider) PrepareRequest(messages *message.Messages, options ...ztype.Map) ([]byte, error) {
+func (p *DeepseekProvider) PrepareRequest(messages *message.Messages, options ...func(ztype.Map) ztype.Map) ([]byte, error) {
 	requestBody := ztype.Map{
 		"model":       p.options.Model,
 		"stream":      p.options.Stream,
@@ -141,9 +141,7 @@ func (p *DeepseekProvider) PrepareRequest(messages *message.Messages, options ..
 	})
 
 	for _, v := range options {
-		for k, v := range v {
-			requestBody[k] = v
-		}
+		v(requestBody)
 	}
 
 	return json.Marshal(requestBody)

agent/deepseek_test.go

@@ -31,7 +31,10 @@ func TestNewDeepseekProvider(t *testing.T) {
 
 	data, err := deepseek.PrepareRequest(
 		messages,
-		ztype.Map{"temperature": 0.7},
+		func(m ztype.Map) ztype.Map {
+			m.Set("temperature", 0.7)
+			return m
+		},
 	)
 	tt.Log(string(data))
 	tt.NoError(err, true)

agent/ollama.go

@@ -83,7 +83,7 @@ func (p *OllamaProvider) Generate(ctx context.Context, body []byte) (json *zjson
 	return
 }
 
-func (p *OllamaProvider) PrepareRequest(messages *message.Messages, options ...ztype.Map) ([]byte, error) {
+func (p *OllamaProvider) PrepareRequest(messages *message.Messages, options ...func(ztype.Map) ztype.Map) ([]byte, error) {
 	requestBody := ztype.Map{
 		"model":       p.options.Model,
 		"stream":      p.options.Stream,
@@ -98,9 +98,7 @@ func (p *OllamaProvider) PrepareRequest(messages *message.Messages, options ...z
 	})
 
 	for _, v := range options {
-		for k, v := range v {
-			requestBody[k] = v
-		}
+		requestBody = v(requestBody)
 	}
 
 	return json.Marshal(requestBody)

agent/ollama_test.go

@@ -35,7 +35,10 @@ func TestNewOllamaProvider(t *testing.T) {
 
 	data, err := llm.PrepareRequest(
 		messages,
-		ztype.Map{"temperature": 0.3},
+		func(m ztype.Map) ztype.Map {
+			m.Set("temperature", 0.3)
+			return m
+		},
 	)
 	tt.Log(string(data))
 	tt.NoError(err, true)

agent/openai.go

@@ -162,7 +162,7 @@ func (p *OpenAIProvider) streamable(ctx context.Context, url string, header zhtt
 	return zjson.ParseBytes(json), nil
 }
 
-func (p *OpenAIProvider) PrepareRequest(messages *message.Messages, options ...ztype.Map) ([]byte, error) {
+func (p *OpenAIProvider) PrepareRequest(messages *message.Messages, options ...func(ztype.Map) ztype.Map) ([]byte, error) {
 	requestBody := ztype.Map{
 		"model":       p.options.Model,
 		"stream":      p.options.Stream,
@@ -177,9 +177,7 @@ func (p *OpenAIProvider) PrepareRequest(messages *message.Messages, options ...z
 	})
 
 	for _, v := range options {
-		for k, v := range v {
-			requestBody[k] = v
-		}
+		requestBody = v(requestBody)
 	}
 
 	return json.Marshal(requestBody)

agent/openai_test.go

@@ -31,7 +31,10 @@ func TestNewOpenAIProvider(t *testing.T) {
 
 	data, err := openai.PrepareRequest(
 		messages,
-		ztype.Map{"temperature": 0.7},
+		func(m ztype.Map) ztype.Map {
+			m.Set("temperature", 0.7)
+			return m
+		},
 	)
 	tt.Log(string(data))
 	tt.NoError(err, true)

agent/provide.go

@@ -10,7 +10,7 @@ import (
 
 type LLMAgent interface {
 	Generate(ctx context.Context, data []byte) (*zjson.Res, error)
-	PrepareRequest(messages *message.Messages, options ...ztype.Map) (body []byte, err error)
+	PrepareRequest(messages *message.Messages, options ...func(ztype.Map) ztype.Map) (body []byte, err error)
 	ParseResponse(*zjson.Res) (*Response, error)
 }
 

zllm.go

@@ -14,7 +14,7 @@ import (
 	"github.com/zlsgo/zllm/utils"
 )
 
-func CompleteLLM[T *message.Prompt | *message.Messages](ctx context.Context, llm agent.LLMAgent, p T, options ...ztype.Map) (string, error) {
+func CompleteLLM[T *message.Prompt | *message.Messages](ctx context.Context, llm agent.LLMAgent, p T, options ...func(ztype.Map) ztype.Map) (string, error) {
 	var (
 		messages *message.Messages
 		err      error
@@ -47,7 +47,7 @@ func CompleteLLM[T *message.Prompt | *message.Messages](ctx context.Context, llm
 	return parse, err
 }
 
-func CompleteLLMJSON[T *message.Prompt | *message.Messages](ctx context.Context, llm agent.LLMAgent, p T, options ...ztype.Map) (ztype.Map, error) {
+func CompleteLLMJSON[T *message.Prompt | *message.Messages](ctx context.Context, llm agent.LLMAgent, p T, options ...func(ztype.Map) ztype.Map) (ztype.Map, error) {
 	resp, err := CompleteLLM(ctx, llm, p, options...)
 	if err != nil {
 		return nil, err

zllm_test.go

@@ -204,7 +204,10 @@ func TestExecutePromptMore(t *testing.T) {
 			},
 		)
 
-		resp, err := CompleteLLM(context.Background(), llm, p, ztype.Map{"stream": false})
+		resp, err := CompleteLLM(context.Background(), llm, p, func(m ztype.Map) ztype.Map {
+			m["stream"] = false
+			return m
+		})
 		tt.Log(resp)
 		tt.NoError(err, true)
 	})
@@ -346,8 +349,8 @@ func TestLLM(t *testing.T) {
 	utils.SetDebug(true)
 	p := message.NewPrompt("北京的天气怎么样？", func(po *message.PromptOptions) {
 	})
-	resp, err := CompleteLLMJSON(context.Background(), llm, p, ztype.Map{
-		"tools": ztype.Maps{
+	resp, err := CompleteLLMJSON(context.Background(), llm, p, func(m ztype.Map) ztype.Map {
+		m["tools"] = ztype.Maps{
 			{
 				"type": "function",
 				"function": ztype.Map{
@@ -370,7 +373,8 @@ func TestLLM(t *testing.T) {
 					},
 				},
 			},
-		},
+		}
+		return m
 	})
 	tt.NoError(err, true)
 	tt.Log(resp)