From d8410fab37e7cea1f88ad68e5d29912f7bd25db8 Mon Sep 17 00:00:00 2001 From: Cold <16419454+cold502@user.noreply.gitee.com> Date: Thu, 27 Nov 2025 18:03:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ragflow/client.go | 27 +++++++++++++-------------- ragflow/openai.go | 29 ++++++++++++++--------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/ragflow/client.go b/ragflow/client.go index 44d028c..c340f73 100644 --- a/ragflow/client.go +++ b/ragflow/client.go @@ -24,7 +24,7 @@ func NewClient(baseURL, apiKey string) *Client { client := gclient.New() client.SetHeader("Authorization", fmt.Sprintf("Bearer %s", apiKey)) client.SetHeader("Content-Type", "application/json") - + return &Client{ BaseURL: strings.TrimSuffix(baseURL, "/"), APIKey: apiKey, @@ -34,8 +34,8 @@ func NewClient(baseURL, apiKey string) *Client { // CommonResponse 通用响应结构 type CommonResponse struct { - Code int `json:"code"` - Message string `json:"message"` + Code int `json:"code"` + Message string `json:"message"` Data interface{} `json:"data,omitempty"` } @@ -47,7 +47,7 @@ func (r *CommonResponse) IsSuccess() bool { // request 发送 HTTP 请求 func (c *Client) request(ctx context.Context, method, path string, body interface{}, result interface{}) error { fullURL := c.BaseURL + path - + var reqBody io.Reader if body != nil { jsonData, err := json.Marshal(body) @@ -56,10 +56,10 @@ func (c *Client) request(ctx context.Context, method, path string, body interfac } reqBody = strings.NewReader(string(jsonData)) } - + var resp *gclient.Response var err error - + switch method { case "GET": resp, err = c.HTTPClient.Get(ctx, fullURL) @@ -72,25 +72,25 @@ func (c *Client) request(ctx context.Context, method, path string, body interfac default: return fmt.Errorf("unsupported method: %s", method) } - + if err != nil { return fmt.Errorf("http request failed: %w", err) } defer resp.Close() - + if resp.StatusCode != http.StatusOK { return fmt.Errorf("http request failed with status: %d", resp.StatusCode) } - - respBody, err := resp.ReadAll() + + respBody := resp.ReadAll() if err != nil { return fmt.Errorf("read response body failed: %w", err) } - + if err := json.Unmarshal(respBody, result); err != nil { return fmt.Errorf("unmarshal response failed: %w", err) } - + return nil } @@ -99,11 +99,10 @@ func buildQueryString(params map[string]interface{}) string { if len(params) == 0 { return "" } - + var parts []string for k, v := range params { parts = append(parts, fmt.Sprintf("%s=%v", url.QueryEscape(k), url.QueryEscape(fmt.Sprintf("%v", v)))) } return strings.Join(parts, "&") } - diff --git a/ragflow/openai.go b/ragflow/openai.go index b56008b..acaa2ff 100644 --- a/ragflow/openai.go +++ b/ragflow/openai.go @@ -11,15 +11,15 @@ import ( // ChatCompletionMessage OpenAI 格式的消息 type ChatCompletionMessage struct { - Role string `json:"role"` // "user", "assistant", "system" + Role string `json:"role"` // "user", "assistant", "system" Content string `json:"content"` } // ChatCompletionRequest OpenAI 格式的聊天补全请求 type ChatCompletionRequest struct { - Model string `json:"model"` // 模型名称（服务器会自动解析，可设置为任意值） - Messages []ChatCompletionMessage `json:"messages"` // 消息列表，必须至少包含一条 user 消息 - Stream bool `json:"stream,omitempty"` // 是否流式返回，默认 false + Model string `json:"model"` // 模型名称（服务器会自动解析，可设置为任意值） + Messages []ChatCompletionMessage `json:"messages"` // 消息列表，必须至少包含一条 user 消息 + Stream bool `json:"stream,omitempty"` // 是否流式返回，默认 false } // ChatCompletionResponse OpenAI 格式的聊天补全响应（非流式） @@ -29,9 +29,9 @@ type ChatCompletionResponse struct { Created int64 `json:"created"` Model string `json:"model"` Choices []struct { - Index int `json:"index"` + Index int `json:"index"` Message ChatCompletionMessage `json:"message"` - FinishReason string `json:"finish_reason"` + FinishReason string `json:"finish_reason"` } `json:"choices"` Usage struct { PromptTokens int `json:"prompt_tokens"` @@ -47,8 +47,8 @@ type ChatCompletionChunk struct { Created int64 `json:"created"` Model string `json:"model"` Choices []struct { - Index int `json:"index"` - Delta struct { + Index int `json:"index"` + Delta struct { Content string `json:"content"` Role string `json:"role"` } `json:"delta"` @@ -65,12 +65,12 @@ type ChatCompletionChunk struct { // POST /api/v1/chats_openai/{chat_id}/chat/completions func (c *Client) CreateChatCompletion(ctx context.Context, chatID string, req *ChatCompletionRequest) (*ChatCompletionResponse, error) { path := fmt.Sprintf("/api/v1/chats_openai/%s/chat/completions", chatID) - + var resp ChatCompletionResponse if err := c.request(ctx, "POST", path, req, &resp); err != nil { return nil, fmt.Errorf("create chat completion failed: %w", err) } - + return &resp, nil } @@ -78,12 +78,12 @@ func (c *Client) CreateChatCompletion(ctx context.Context, chatID string, req *C // POST /api/v1/agents_openai/{agent_id}/chat/completions func (c *Client) CreateAgentCompletion(ctx context.Context, agentID string, req *ChatCompletionRequest) (*ChatCompletionResponse, error) { path := fmt.Sprintf("/api/v1/agents_openai/%s/chat/completions", agentID) - + var resp ChatCompletionResponse if err := c.request(ctx, "POST", path, req, &resp); err != nil { return nil, fmt.Errorf("create agent completion failed: %w", err) } - + return &resp, nil } @@ -91,8 +91,8 @@ func (c *Client) CreateAgentCompletion(ctx context.Context, agentID string, req // 注意：流式响应需要特殊处理，这里返回一个可用于读取流的接口 func (c *Client) CreateChatCompletionStream(ctx context.Context, chatID string, req *ChatCompletionRequest) (*StreamReader, error) { req.Stream = true - apiPath := fmt.Sprintf("/api/v1/chats_openai/%s/chat/completions", chatID) - + _ = fmt.Sprintf("/api/v1/chats_openai/%s/chat/completions", chatID) + // TODO: 实现流式读取逻辑 return nil, fmt.Errorf("stream mode not implemented yet") } @@ -119,4 +119,3 @@ func (sr *StreamReader) Close() error { } return nil } -