mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-09-13 07:40:56 +00:00
* test(relayconvert): add golden snapshot matrix and relaykit boundary guard Phase 0 of the relaykit extraction plan: pin byte-level output of every registered (from,to) request/response/stream conversion route, and forbid kit-bound packages from growing host-only imports. * wip(relayconvert): drop gin.Context from converter signatures; add convmeta draft Phase 1 in progress: relayconvert now takes context.Context; host media resolver adapts gin.Context back at the service boundary. * refactor(relayconvert): decouple converters from RelayInfo, gin, and settings Phase 1 of the relaykit extraction plan: - converters now depend on convmeta.Meta (implemented by RelayInfo) instead of *relaycommon.RelayInfo; ClaudeConvertInfo and the format guesser move to convmeta with aliases left behind - host settings reach converters via a convmeta.Options snapshot built in RelayInfo.ConvOptions; no more model_setting/reasoning global reads inside the conversion layer - effort-suffix helpers move to service/relayconvert/reasoning (old package forwards); chat-to-responses upgrade policy moves to service (host routing logic, not conversion) - golden conversion matrix unchanged * test(relayconvert): tighten boundary — kit packages now free of gin/setting imports * refactor(dto): drop gin and logger dependencies Phase 2 (part 1): dto.Request.IsStream now takes *http.Request instead of *gin.Context (Gemini's impl reads query/path off the std request); dto's three logger calls become common.SysError. Boundary test allowlist is now empty — kit-bound packages import no gin/setting/logger/model. * refactor(kit): extract dependency-free kitutil; dto/types/relayconvert stop importing common Phase 2 of the relaykit extraction plan: - new service/relayconvert/kitutil holds the pure helpers the kit needs (JSON wrappers, pointer/string/uuid/timestamp utils, MaskSensitiveInfo, pluggable LogInfo/LogError hooks, Debug flag) - dto, types, and all relayconvert packages now use kitutil; their only remaining internal deps are dto/types/constant - common keeps every original symbol (MaskSensitiveInfo delegates to kitutil) so host code is untouched; main.go routes kit logging into common.SysLog/SysError and mirrors DebugEnabled - golden conversion matrix unchanged * refactor(kit): move EndpointType/FinishReason to types; OpenRouter dialect via Options Kit packages (dto/types/relayconvert/reasonmap) no longer import constant: - EndpointType and finish-reason values live in types; constant re-exports - the OpenRouter special-case in claude->openai request conversion reads Options.OpenRouterDialect, set by the host from the channel type; InitChannelMeta invalidates the cached snapshot on channel switch * refactor: extract relaykit submodule (dto/types/relayconvert/reasonmap) Phase 3 of the relaykit extraction plan: - new go module github.com/QuantumNous/new-api/relaykit containing dto (minus task family), types, relayconvert (with convmeta/kitutil/reasoning), and reasonmap; host consumes it via require + replace, go.work for dev - task-family dto (task/suno/midjourney/video) stays in the host dto package; dual-consumer host files alias it as taskdto - relaykit builds and tests standalone (GOWORK=off): no host imports, no gin, no DB, no settings - golden conversion matrix unchanged * build(docker): copy relaykit/go.mod before go mod download The local-replace submodule's go.mod must exist inside the build context for the main module graph to resolve. * fix: address relaykit extraction regressions * fix: address relaykit review regressions * docs: document Meta nil receiver contract * fix(relaykit): fail OpenAI→Claude conversion without max_tokens; reject negative default_max_tokens The Claude Messages API requires max_tokens (omitting it is a 400 "Field required"), but with a nil Options.Claude.DefaultMaxTokens hook the converters silently emitted a request the upstream is guaranteed to reject. Both OpenAI Chat and Responses → Claude conversions now return sharedclaude.ErrMissingMaxTokens when no path (client value, default hook, thinking-adapter floor) supplied one. Unreachable in the host, which always configures the hook. Host side, claude.default_max_tokens now rejects negative values at the option API before persisting — they would wrap into huge unsigned values during conversion. Zero stays allowed: the current API treats max_tokens: 0 as cache pre-warming. * fix: make Gemini safety settings read path race-free
299 lines
8.9 KiB
Go
299 lines
8.9 KiB
Go
package coze
|
|
|
|
import (
|
|
"bufio"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
relaycommon "github.com/QuantumNous/new-api/relay/common"
|
|
"github.com/QuantumNous/new-api/relay/helper"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/relaykit/types"
|
|
"github.com/QuantumNous/new-api/service"
|
|
"github.com/samber/lo"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
func convertCozeChatRequest(c *gin.Context, request dto.GeneralOpenAIRequest) *CozeChatRequest {
|
|
var messages []CozeEnterMessage
|
|
// 将 request的messages的role为user的content转换为CozeMessage
|
|
for _, message := range request.Messages {
|
|
if message.Role == "user" {
|
|
messages = append(messages, CozeEnterMessage{
|
|
Role: "user",
|
|
Content: message.Content,
|
|
// TODO: support more content type
|
|
ContentType: "text",
|
|
})
|
|
}
|
|
}
|
|
user := request.User
|
|
if len(user) == 0 {
|
|
user = json.RawMessage(helper.GetResponseID(c))
|
|
}
|
|
cozeRequest := &CozeChatRequest{
|
|
BotId: c.GetString("bot_id"),
|
|
UserId: user,
|
|
AdditionalMessages: messages,
|
|
Stream: lo.FromPtrOr(request.Stream, false),
|
|
}
|
|
return cozeRequest
|
|
}
|
|
|
|
func cozeChatHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response) (*dto.Usage, *types.NewAPIError) {
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
|
|
}
|
|
service.CloseResponseBodyGracefully(resp)
|
|
// convert coze response to openai response
|
|
var response dto.TextResponse
|
|
var cozeResponse CozeChatDetailResponse
|
|
response.Model = info.UpstreamModelName
|
|
err = json.Unmarshal(responseBody, &cozeResponse)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
|
|
}
|
|
if cozeResponse.Code != 0 {
|
|
return nil, types.NewError(errors.New(cozeResponse.Msg), types.ErrorCodeBadResponseBody)
|
|
}
|
|
// 从上下文获取 usage
|
|
var usage dto.Usage
|
|
usage.PromptTokens = c.GetInt("coze_input_count")
|
|
usage.CompletionTokens = c.GetInt("coze_output_count")
|
|
usage.TotalTokens = c.GetInt("coze_token_count")
|
|
response.Usage = usage
|
|
response.Id = helper.GetResponseID(c)
|
|
|
|
var responseContent json.RawMessage
|
|
for _, data := range cozeResponse.Data {
|
|
if data.Type == "answer" {
|
|
responseContent = data.Content
|
|
response.Created = data.CreatedAt
|
|
}
|
|
}
|
|
// 添加 response.Choices
|
|
response.Choices = []dto.OpenAITextResponseChoice{
|
|
{
|
|
Index: 0,
|
|
Message: dto.Message{Role: "assistant", Content: responseContent},
|
|
FinishReason: "stop",
|
|
},
|
|
}
|
|
jsonResponse, err := json.Marshal(response)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
|
|
}
|
|
c.Writer.Header().Set("Content-Type", "application/json")
|
|
c.Writer.WriteHeader(resp.StatusCode)
|
|
_, _ = c.Writer.Write(jsonResponse)
|
|
|
|
return &usage, nil
|
|
}
|
|
|
|
func cozeChatStreamHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *http.Response) (*dto.Usage, *types.NewAPIError) {
|
|
scanner := helper.NewStreamScanner(resp.Body)
|
|
scanner.Split(bufio.ScanLines)
|
|
helper.SetEventStreamHeaders(c)
|
|
id := helper.GetResponseID(c)
|
|
var responseText string
|
|
|
|
var currentEvent string
|
|
var currentData string
|
|
var usage = &dto.Usage{}
|
|
|
|
for scanner.Scan() {
|
|
line := scanner.Text()
|
|
|
|
if line == "" {
|
|
if currentEvent != "" && currentData != "" {
|
|
// handle last event
|
|
handleCozeEvent(c, currentEvent, currentData, &responseText, usage, id, info)
|
|
currentEvent = ""
|
|
currentData = ""
|
|
}
|
|
continue
|
|
}
|
|
|
|
if strings.HasPrefix(line, "event:") {
|
|
currentEvent = strings.TrimSpace(line[6:])
|
|
continue
|
|
}
|
|
|
|
if strings.HasPrefix(line, "data:") {
|
|
currentData = strings.TrimSpace(line[5:])
|
|
continue
|
|
}
|
|
}
|
|
|
|
// Last event
|
|
if currentEvent != "" && currentData != "" {
|
|
handleCozeEvent(c, currentEvent, currentData, &responseText, usage, id, info)
|
|
}
|
|
|
|
if err := scanner.Err(); err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
|
|
}
|
|
helper.Done(c)
|
|
|
|
if usage.TotalTokens == 0 {
|
|
usage = service.ResponseText2Usage(c, responseText, info.UpstreamModelName, c.GetInt("coze_input_count"))
|
|
}
|
|
|
|
return usage, nil
|
|
}
|
|
|
|
func handleCozeEvent(c *gin.Context, event string, data string, responseText *string, usage *dto.Usage, id string, info *relaycommon.RelayInfo) {
|
|
switch event {
|
|
case "conversation.chat.completed":
|
|
// 将 data 解析为 CozeChatResponseData
|
|
var chatData CozeChatResponseData
|
|
err := json.Unmarshal([]byte(data), &chatData)
|
|
if err != nil {
|
|
common.SysLog("error_unmarshalling_stream_response: " + err.Error())
|
|
return
|
|
}
|
|
|
|
usage.PromptTokens = chatData.Usage.InputCount
|
|
usage.CompletionTokens = chatData.Usage.OutputCount
|
|
usage.TotalTokens = chatData.Usage.TokenCount
|
|
|
|
finishReason := "stop"
|
|
stopResponse := helper.GenerateStopResponse(id, common.GetTimestamp(), info.UpstreamModelName, finishReason)
|
|
helper.ObjectData(c, stopResponse)
|
|
|
|
case "conversation.message.delta":
|
|
// 将 data 解析为 CozeChatV3MessageDetail
|
|
var messageData CozeChatV3MessageDetail
|
|
err := json.Unmarshal([]byte(data), &messageData)
|
|
if err != nil {
|
|
common.SysLog("error_unmarshalling_stream_response: " + err.Error())
|
|
return
|
|
}
|
|
|
|
var content string
|
|
err = json.Unmarshal(messageData.Content, &content)
|
|
if err != nil {
|
|
common.SysLog("error_unmarshalling_stream_response: " + err.Error())
|
|
return
|
|
}
|
|
|
|
*responseText += content
|
|
|
|
openaiResponse := dto.ChatCompletionsStreamResponse{
|
|
Id: id,
|
|
Object: "chat.completion.chunk",
|
|
Created: common.GetTimestamp(),
|
|
Model: info.UpstreamModelName,
|
|
}
|
|
|
|
choice := dto.ChatCompletionsStreamResponseChoice{
|
|
Index: 0,
|
|
}
|
|
choice.Delta.SetContentString(content)
|
|
openaiResponse.Choices = append(openaiResponse.Choices, choice)
|
|
|
|
helper.ObjectData(c, openaiResponse)
|
|
|
|
case "error":
|
|
var errorData CozeError
|
|
err := json.Unmarshal([]byte(data), &errorData)
|
|
if err != nil {
|
|
common.SysLog("error_unmarshalling_stream_response: " + err.Error())
|
|
return
|
|
}
|
|
|
|
common.SysLog(fmt.Sprintf("stream event error: %v %v", errorData.Code, errorData.Message))
|
|
}
|
|
}
|
|
|
|
func checkIfChatComplete(a *Adaptor, c *gin.Context, info *relaycommon.RelayInfo) (error, bool) {
|
|
requestURL := fmt.Sprintf("%s/v3/chat/retrieve", info.ChannelBaseUrl)
|
|
|
|
requestURL = requestURL + "?conversation_id=" + c.GetString("coze_conversation_id") + "&chat_id=" + c.GetString("coze_chat_id")
|
|
// 将 conversationId和chatId作为参数发送get请求
|
|
req, err := http.NewRequest("GET", requestURL, nil)
|
|
if err != nil {
|
|
return err, false
|
|
}
|
|
err = a.SetupRequestHeader(c, &req.Header, info)
|
|
if err != nil {
|
|
return err, false
|
|
}
|
|
|
|
resp, err := doRequest(req, info) // 调用 doRequest
|
|
if err != nil {
|
|
return err, false
|
|
}
|
|
if resp == nil { // 确保在 doRequest 失败时 resp 不为 nil 导致 panic
|
|
return fmt.Errorf("resp is nil"), false
|
|
}
|
|
defer resp.Body.Close() // 确保响应体被关闭
|
|
|
|
// 解析 resp 到 CozeChatResponse
|
|
var cozeResponse CozeChatResponse
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return fmt.Errorf("read response body failed: %w", err), false
|
|
}
|
|
err = json.Unmarshal(responseBody, &cozeResponse)
|
|
if err != nil {
|
|
return fmt.Errorf("unmarshal response body failed: %w", err), false
|
|
}
|
|
if cozeResponse.Data.Status == "completed" {
|
|
// 在上下文设置 usage
|
|
c.Set("coze_token_count", cozeResponse.Data.Usage.TokenCount)
|
|
c.Set("coze_output_count", cozeResponse.Data.Usage.OutputCount)
|
|
c.Set("coze_input_count", cozeResponse.Data.Usage.InputCount)
|
|
return nil, true
|
|
} else if cozeResponse.Data.Status == "failed" || cozeResponse.Data.Status == "canceled" || cozeResponse.Data.Status == "requires_action" {
|
|
return fmt.Errorf("chat status: %s", cozeResponse.Data.Status), false
|
|
} else {
|
|
return nil, false
|
|
}
|
|
}
|
|
|
|
func getChatDetail(a *Adaptor, c *gin.Context, info *relaycommon.RelayInfo) (*http.Response, error) {
|
|
requestURL := fmt.Sprintf("%s/v3/chat/message/list", info.ChannelBaseUrl)
|
|
|
|
requestURL = requestURL + "?conversation_id=" + c.GetString("coze_conversation_id") + "&chat_id=" + c.GetString("coze_chat_id")
|
|
req, err := http.NewRequest("GET", requestURL, nil)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("new request failed: %w", err)
|
|
}
|
|
err = a.SetupRequestHeader(c, &req.Header, info)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("setup request header failed: %w", err)
|
|
}
|
|
resp, err := doRequest(req, info)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("do request failed: %w", err)
|
|
}
|
|
return resp, nil
|
|
}
|
|
|
|
func doRequest(req *http.Request, info *relaycommon.RelayInfo) (*http.Response, error) {
|
|
var client *http.Client
|
|
var err error // 声明 err 变量
|
|
if info.ChannelSetting.Proxy != "" {
|
|
client, err = service.GetHttpClientWithProxy(info.ChannelSetting.Proxy)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("new proxy http client failed: %w", err)
|
|
}
|
|
} else {
|
|
client = service.GetHttpClient()
|
|
}
|
|
resp, err := client.Do(req)
|
|
if err != nil { // 增加对 client.Do(req) 返回错误的检查
|
|
return nil, fmt.Errorf("client.Do failed: %w", err)
|
|
}
|
|
// _ = resp.Body.Close()
|
|
return resp, nil
|
|
}
|