From 065da8ef8c8bcbc0a7fc3ae22e39397ffe036b6a Mon Sep 17 00:00:00 2001
From: JustSong <songquanpeng@foxmail.com>
Date: Thu, 4 Apr 2024 00:46:30 +0800
Subject: [PATCH] fix: fix ali function call (#1242)

---
 relay/channel/ali/main.go  |  2 +-
 relay/channel/ali/model.go | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/relay/channel/ali/main.go b/relay/channel/ali/main.go
index 6fdfa4d4..dd1707ee 100644
--- a/relay/channel/ali/main.go
+++ b/relay/channel/ali/main.go
@@ -50,8 +50,8 @@ func ConvertRequest(request model.GeneralOpenAIRequest) *ChatRequest {
 			TopP:              request.TopP,
 			TopK:              request.TopK,
 			ResultFormat:      "message",
+			Tools:             request.Tools,
 		},
-		Tools: request.Tools,
 	}
 }
 
diff --git a/relay/channel/ali/model.go b/relay/channel/ali/model.go
index e19d427a..3b8a8372 100644
--- a/relay/channel/ali/model.go
+++ b/relay/channel/ali/model.go
@@ -16,21 +16,21 @@ type Input struct {
 }
 
 type Parameters struct {
-	TopP              float64 `json:"top_p,omitempty"`
-	TopK              int     `json:"top_k,omitempty"`
-	Seed              uint64  `json:"seed,omitempty"`
-	EnableSearch      bool    `json:"enable_search,omitempty"`
-	IncrementalOutput bool    `json:"incremental_output,omitempty"`
-	MaxTokens         int     `json:"max_tokens,omitempty"`
-	Temperature       float64 `json:"temperature,omitempty"`
-	ResultFormat      string  `json:"result_format,omitempty"`
+	TopP              float64      `json:"top_p,omitempty"`
+	TopK              int          `json:"top_k,omitempty"`
+	Seed              uint64       `json:"seed,omitempty"`
+	EnableSearch      bool         `json:"enable_search,omitempty"`
+	IncrementalOutput bool         `json:"incremental_output,omitempty"`
+	MaxTokens         int          `json:"max_tokens,omitempty"`
+	Temperature       float64      `json:"temperature,omitempty"`
+	ResultFormat      string       `json:"result_format,omitempty"`
+	Tools             []model.Tool `json:"tools,omitempty"`
 }
 
 type ChatRequest struct {
-	Model      string       `json:"model"`
-	Input      Input        `json:"input"`
-	Parameters Parameters   `json:"parameters,omitempty"`
-	Tools      []model.Tool `json:"tools,omitempty"`
+	Model      string     `json:"model"`
+	Input      Input      `json:"input"`
+	Parameters Parameters `json:"parameters,omitempty"`
 }
 
 type EmbeddingRequest struct {