refactor: 更新请求转换逻辑，优化工具调用解析

relay/channel/ollama/adaptor.go

@@ -32,7 +32,8 @@ func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayIn
 	openaiRequest.(*dto.GeneralOpenAIRequest).StreamOptions = &dto.StreamOptions{
 	openaiRequest.(*dto.GeneralOpenAIRequest).StreamOptions = &dto.StreamOptions{
 		IncludeUsage: true,
 		IncludeUsage: true,
 	}
 	}
-	return requestOpenAI2Ollama(c, openaiRequest.(*dto.GeneralOpenAIRequest))
+	// map to ollama chat request (Claude -> OpenAI -> Ollama chat)
+	return openAIChatToOllamaChat(c, openaiRequest.(*dto.GeneralOpenAIRequest))
 }
 }
 
 
 func (a *Adaptor) ConvertAudioRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.AudioRequest) (io.Reader, error) {
 func (a *Adaptor) ConvertAudioRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.AudioRequest) (io.Reader, error) {

relay/channel/ollama/dto.go

@@ -2,7 +2,6 @@ package ollama
 
 
 import (
 import (
 	"encoding/json"
 	"encoding/json"
-	"one-api/dto"
 )
 )
 
 
 // OllamaChatMessage represents a single chat message
 // OllamaChatMessage represents a single chat message

relay/channel/ollama/relay-ollama.go

@@ -101,19 +101,22 @@ func openAIChatToOllamaChat(c *gin.Context, r *dto.GeneralOpenAIRequest) (*Ollam
 		// history tool call result message
 		// history tool call result message
 		if m.Role == "tool" && m.Name != nil { cm.ToolName = *m.Name }
 		if m.Role == "tool" && m.Name != nil { cm.ToolName = *m.Name }
 		// tool calls from assistant previous message
 		// tool calls from assistant previous message
-		if len(m.ToolCalls)>0 {
-			calls := make([]OllamaToolCall,0,len(m.ToolCalls))
-			for _, tc := range m.ToolCalls {
+		if m.ToolCalls != nil && len(m.ToolCalls) > 0 {
+			parsed := m.ParseToolCalls()
+			if len(parsed) > 0 {
+				calls := make([]OllamaToolCall,0,len(parsed))
+				for _, tc := range parsed {
 					var args interface{}
 					var args interface{}
 					if tc.Function.Arguments != "" { _ = json.Unmarshal([]byte(tc.Function.Arguments), &args) }
 					if tc.Function.Arguments != "" { _ = json.Unmarshal([]byte(tc.Function.Arguments), &args) }
+					if args==nil { args = map[string]any{} }
 					oc := OllamaToolCall{}
 					oc := OllamaToolCall{}
 					oc.Function.Name = tc.Function.Name
 					oc.Function.Name = tc.Function.Name
-				if args==nil { args = map[string]any{} }
 					oc.Function.Arguments = args
 					oc.Function.Arguments = args
 					calls = append(calls, oc)
 					calls = append(calls, oc)
 				}
 				}
 				cm.ToolCalls = calls
 				cm.ToolCalls = calls
 			}
 			}
+		}
 		chatReq.Messages = append(chatReq.Messages, cm)
 		chatReq.Messages = append(chatReq.Messages, cm)
 	}
 	}
 	return chatReq, nil
 	return chatReq, nil
@@ -165,7 +168,6 @@ func requestOpenAI2Embeddings(r dto.EmbeddingRequest) *OllamaEmbeddingRequest {
 	opts := map[string]any{}
 	opts := map[string]any{}
 	if r.Temperature != nil { opts["temperature"] = r.Temperature }
 	if r.Temperature != nil { opts["temperature"] = r.Temperature }
 	if r.TopP != 0 { opts["top_p"] = r.TopP }
 	if r.TopP != 0 { opts["top_p"] = r.TopP }
-	if r.TopK != 0 { opts["top_k"] = r.TopK }
 	if r.FrequencyPenalty != 0 { opts["frequency_penalty"] = r.FrequencyPenalty }
 	if r.FrequencyPenalty != 0 { opts["frequency_penalty"] = r.FrequencyPenalty }
 	if r.PresencePenalty != 0 { opts["presence_penalty"] = r.PresencePenalty }
 	if r.PresencePenalty != 0 { opts["presence_penalty"] = r.PresencePenalty }
 	if r.Seed != 0 { opts["seed"] = int(r.Seed) }
 	if r.Seed != 0 { opts["seed"] = int(r.Seed) }

relay/channel/ollama/stream.go

@@ -87,7 +87,6 @@ func ollamaStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http
             // delta content
             // delta content
             var content string
             var content string
             if chunk.Message != nil { content = chunk.Message.Content } else { content = chunk.Response }
             if chunk.Message != nil { content = chunk.Message.Content } else { content = chunk.Response }
-            if content != "" { aggregatedText.WriteString(content) }
             delta := dto.ChatCompletionsStreamResponse{
             delta := dto.ChatCompletionsStreamResponse{
                 Id:      responseId,
                 Id:      responseId,
                 Object:  "chat.completion.chunk",
                 Object:  "chat.completion.chunk",