mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-10-16 07:33:06 +08:00
问题:Kimi/GLM/MiniMax 等国产 LLM 协议层只有 thinking on/off 开关,没有 reasoning_effort 档位概念。客户端启用 thinking 后 usage_log.reasoning_effort 长期为 NULL,无法在用量分析里区分 'thinking 开启' 与 'thinking 关闭'。 方案:仅在 'thinking 启用 + 上游属于 passback-required 国产模型 + 客户端 未明确指定 effort' 三者同时成立时,给 usage_log.reasoning_effort 写默认值 'high'(与 DeepSeek thinking-enabled 默认 effort 一致)。 设计原则: 1. **白名单**:仅 ResolveThinkingProtocol == PassbackRequired 集合内, 且排除原生支持 effort 的 DeepSeek(避免覆盖客户端意图)。 2. **fail-open**:客户端显式传 effort 时永远不覆盖。 3. **未来兼容**:如 Kimi 后续加入真 effort 档位,客户端开始发 effort, guard (3) 自动让出,本逻辑变 no-op。 实现: - gateway_request.go: 加 DefaultEffortForThinkingEnabled (按模型白名单) + OpenAIBodyHasThinkingEnabled (检测 OpenAI 协议 body 里的 thinking.type) + ApplyThinkingEnabledFallback (包装现有 extractor 的 nil-then-default 逻辑) - gateway_handler.go: Anthropic 路径两处(主 + retry)对称补充 - OpenAI 路径全覆盖:openai_gateway_service.go (passthrough + non-passthrough) + openai_gateway_chat_completions_raw.go + openai_gateway_responses_chat_fallback.go + openai_ws_http_bridge.go + openai_ws_forwarder.go - 跨协议路径:gateway_forward_as_chat_completions.go (CC client → Anthropic upstream) + gateway_forward_as_responses.go (Responses client → Anthropic upstream) + gemini_chat_completions_compat_service.go (一致性保持) 未覆盖:openai_ws_v2_passthrough_adapter.go 两处。原因:该 adapter 持有的是 session-level 客户端原始 model,没有 *Account 句柄无法走 GetMappedModel。 WS v2 当前对国产模型场景不重要(pi 调用 Kimi/GLM/MiniMax 走 sync HTTP), 留待后续如果出现 WS v2 + 国产模型用例时单独处理。 测试: - TestDefaultEffortForThinkingEnabled (14 用例):覆盖 Kimi/GLM/MiniMax 大小写、 Qwen thinking 变体、DeepSeek 排除、Claude/GPT/Gemini 不命中。 - TestOpenAIBodyHasThinkingEnabled (8 用例):covers enabled/adaptive/disabled、 大小写、空 body、缺字段、invalid JSON fail-safe。 - TestApplyThinkingEnabledFallback (9 用例):现有 effort 不覆盖、nil + 启用 + passback → high、nil + disabled → nil、nil + 启用 + 排除模型 → nil。
417 lines
13 KiB
Go
417 lines
13 KiB
Go
package service
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/Wei-Shaw/sub2api/internal/pkg/apicompat"
|
|
"github.com/Wei-Shaw/sub2api/internal/pkg/logger"
|
|
"github.com/Wei-Shaw/sub2api/internal/util/responseheaders"
|
|
"github.com/gin-gonic/gin"
|
|
"go.uber.org/zap"
|
|
)
|
|
|
|
// forwardResponsesViaRawChatCompletions serves /v1/responses clients through an
|
|
// upstream that only supports /v1/chat/completions.
|
|
func (s *OpenAIGatewayService) forwardResponsesViaRawChatCompletions(
|
|
ctx context.Context,
|
|
c *gin.Context,
|
|
account *Account,
|
|
body []byte,
|
|
) (*OpenAIForwardResult, error) {
|
|
startTime := time.Now()
|
|
|
|
var responsesReq apicompat.ResponsesRequest
|
|
if err := json.Unmarshal(body, &responsesReq); err != nil {
|
|
c.JSON(http.StatusBadRequest, gin.H{
|
|
"error": gin.H{
|
|
"type": "invalid_request_error",
|
|
"message": "Failed to parse request body",
|
|
},
|
|
})
|
|
return nil, fmt.Errorf("parse responses request: %w", err)
|
|
}
|
|
originalModel := strings.TrimSpace(responsesReq.Model)
|
|
if originalModel == "" {
|
|
c.JSON(http.StatusBadRequest, gin.H{
|
|
"error": gin.H{
|
|
"type": "invalid_request_error",
|
|
"message": "model is required",
|
|
},
|
|
})
|
|
return nil, fmt.Errorf("missing model in request")
|
|
}
|
|
|
|
clientStream := responsesReq.Stream
|
|
reasoningEffort := extractOpenAIReasoningEffortFromBody(body, originalModel)
|
|
serviceTier := extractOpenAIServiceTierFromBody(body)
|
|
|
|
chatReq, err := apicompat.ResponsesToChatCompletionsRequest(&responsesReq)
|
|
if err != nil {
|
|
c.JSON(http.StatusBadRequest, gin.H{
|
|
"error": gin.H{
|
|
"type": "invalid_request_error",
|
|
"message": err.Error(),
|
|
},
|
|
})
|
|
return nil, fmt.Errorf("convert responses to chat completions: %w", err)
|
|
}
|
|
|
|
billingModel := resolveOpenAIForwardModel(account, originalModel, "")
|
|
upstreamModel := normalizeOpenAIModelForUpstream(account, billingModel)
|
|
// 国产模型默认 effort 补充:需要 mappedModel 判定,推迟到 billingModel 算出之后。
|
|
reasoningEffort = ApplyThinkingEnabledFallback(reasoningEffort, body, billingModel)
|
|
chatReq.Model = upstreamModel
|
|
if clientStream {
|
|
chatReq.StreamOptions = &apicompat.ChatStreamOptions{IncludeUsage: true}
|
|
}
|
|
|
|
chatBody, err := json.Marshal(chatReq)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("marshal chat completions fallback request: %w", err)
|
|
}
|
|
chatBody, err = s.applyOpenAIFastPolicyToBody(ctx, account, upstreamModel, chatBody)
|
|
if err != nil {
|
|
var blocked *OpenAIFastBlockedError
|
|
if errors.As(err, &blocked) {
|
|
writeOpenAIFastPolicyBlockedResponse(c, blocked)
|
|
}
|
|
return nil, err
|
|
}
|
|
if serviceTier == nil {
|
|
serviceTier = extractOpenAIServiceTierFromBody(chatBody)
|
|
}
|
|
|
|
logger.L().Debug("openai responses: forwarding via raw chat completions",
|
|
zap.Int64("account_id", account.ID),
|
|
zap.String("original_model", originalModel),
|
|
zap.String("billing_model", billingModel),
|
|
zap.String("upstream_model", upstreamModel),
|
|
zap.Bool("stream", clientStream),
|
|
)
|
|
|
|
apiKey := account.GetOpenAIApiKey()
|
|
if apiKey == "" {
|
|
return nil, fmt.Errorf("account %d missing api_key", account.ID)
|
|
}
|
|
baseURL := account.GetOpenAIBaseURL()
|
|
if baseURL == "" {
|
|
baseURL = "https://api.openai.com"
|
|
}
|
|
validatedURL, err := s.validateUpstreamBaseURL(baseURL)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("invalid base_url: %w", err)
|
|
}
|
|
targetURL := buildOpenAIChatCompletionsURL(validatedURL)
|
|
|
|
upstreamCtx, releaseUpstreamCtx := detachUpstreamContext(ctx)
|
|
upstreamReq, err := http.NewRequestWithContext(upstreamCtx, http.MethodPost, targetURL, bytes.NewReader(chatBody))
|
|
releaseUpstreamCtx()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("build upstream request: %w", err)
|
|
}
|
|
upstreamReq = upstreamReq.WithContext(WithHTTPUpstreamProfile(upstreamReq.Context(), HTTPUpstreamProfileOpenAI))
|
|
upstreamReq.Header.Set("Content-Type", "application/json")
|
|
upstreamReq.Header.Set("Authorization", "Bearer "+apiKey)
|
|
if clientStream {
|
|
upstreamReq.Header.Set("Accept", "text/event-stream")
|
|
} else {
|
|
upstreamReq.Header.Set("Accept", "application/json")
|
|
}
|
|
for key, values := range c.Request.Header {
|
|
lowerKey := strings.ToLower(key)
|
|
if openaiCCRawAllowedHeaders[lowerKey] {
|
|
for _, v := range values {
|
|
upstreamReq.Header.Add(key, v)
|
|
}
|
|
}
|
|
}
|
|
if customUA := account.GetOpenAIUserAgent(); customUA != "" {
|
|
upstreamReq.Header.Set("user-agent", customUA)
|
|
}
|
|
|
|
proxyURL := ""
|
|
if account.Proxy != nil {
|
|
proxyURL = account.Proxy.URL()
|
|
}
|
|
resp, err := s.httpUpstream.Do(upstreamReq, proxyURL, account.ID, account.Concurrency)
|
|
if err != nil {
|
|
// Transport-level failure (proxy/DNS/TCP/TLS — no HTTP response). Convert to
|
|
// a failover so the handler switches to a healthy account, and temporarily
|
|
// unschedule the account on durable faults (e.g. rejected proxy credentials).
|
|
return nil, s.handleOpenAIUpstreamTransportError(ctx, c, account, err, false)
|
|
}
|
|
defer func() { _ = resp.Body.Close() }()
|
|
|
|
if resp.StatusCode >= 400 {
|
|
respBody := s.readUpstreamErrorBody(resp)
|
|
_ = resp.Body.Close()
|
|
resp.Body = io.NopCloser(bytes.NewReader(respBody))
|
|
|
|
upstreamMsg := strings.TrimSpace(extractUpstreamErrorMessage(respBody))
|
|
upstreamMsg = sanitizeUpstreamErrorMessage(upstreamMsg)
|
|
if s.shouldFailoverOpenAIUpstreamResponse(resp.StatusCode, upstreamMsg, respBody) {
|
|
upstreamDetail := ""
|
|
if s.cfg != nil && s.cfg.Gateway.LogUpstreamErrorBody {
|
|
maxBytes := s.cfg.Gateway.LogUpstreamErrorBodyMaxBytes
|
|
if maxBytes <= 0 {
|
|
maxBytes = 2048
|
|
}
|
|
upstreamDetail = truncateString(string(respBody), maxBytes)
|
|
}
|
|
appendOpsUpstreamError(c, OpsUpstreamErrorEvent{
|
|
Platform: account.Platform,
|
|
AccountID: account.ID,
|
|
AccountName: account.Name,
|
|
UpstreamStatusCode: resp.StatusCode,
|
|
UpstreamRequestID: resp.Header.Get("x-request-id"),
|
|
Kind: "failover",
|
|
Message: upstreamMsg,
|
|
Detail: upstreamDetail,
|
|
})
|
|
s.handleOpenAIAccountUpstreamError(ctx, account, resp.StatusCode, resp.Header, respBody, upstreamModel)
|
|
return nil, &UpstreamFailoverError{
|
|
StatusCode: resp.StatusCode,
|
|
ResponseBody: respBody,
|
|
RetryableOnSameAccount: account.IsPoolMode() && (account.IsPoolModeRetryableStatus(resp.StatusCode) || isOpenAITransientProcessingError(resp.StatusCode, upstreamMsg, respBody)),
|
|
}
|
|
}
|
|
return s.handleErrorResponse(ctx, resp, c, account, chatBody, billingModel)
|
|
}
|
|
|
|
if clientStream {
|
|
return s.streamChatCompletionsAsResponses(c, resp, originalModel, billingModel, upstreamModel, reasoningEffort, serviceTier, startTime)
|
|
}
|
|
return s.bufferChatCompletionsAsResponses(c, resp, originalModel, billingModel, upstreamModel, reasoningEffort, serviceTier, startTime)
|
|
}
|
|
|
|
func (s *OpenAIGatewayService) bufferChatCompletionsAsResponses(
|
|
c *gin.Context,
|
|
resp *http.Response,
|
|
originalModel string,
|
|
billingModel string,
|
|
upstreamModel string,
|
|
reasoningEffort *string,
|
|
serviceTier *string,
|
|
startTime time.Time,
|
|
) (*OpenAIForwardResult, error) {
|
|
requestID := resp.Header.Get("x-request-id")
|
|
respBody, err := ReadUpstreamResponseBody(resp.Body, s.cfg, c, openAITooLargeError)
|
|
if err != nil {
|
|
if !errors.Is(err, ErrUpstreamResponseBodyTooLarge) {
|
|
c.JSON(http.StatusBadGateway, gin.H{
|
|
"error": gin.H{
|
|
"type": "api_error",
|
|
"message": "Failed to read upstream response",
|
|
},
|
|
})
|
|
}
|
|
return nil, fmt.Errorf("read upstream body: %w", err)
|
|
}
|
|
|
|
var ccResp apicompat.ChatCompletionsResponse
|
|
if err := json.Unmarshal(respBody, &ccResp); err != nil {
|
|
c.JSON(http.StatusBadGateway, gin.H{
|
|
"error": gin.H{
|
|
"type": "api_error",
|
|
"message": "Failed to parse upstream response",
|
|
},
|
|
})
|
|
return nil, fmt.Errorf("parse chat completions response: %w", err)
|
|
}
|
|
responsesResp := apicompat.ChatCompletionsResponseToResponses(&ccResp, originalModel)
|
|
|
|
usage := OpenAIUsage{}
|
|
if parsed, ok := extractOpenAIUsageFromJSONBytes(respBody); ok {
|
|
usage = parsed
|
|
}
|
|
|
|
if s.responseHeaderFilter != nil {
|
|
responseheaders.WriteFilteredHeaders(c.Writer.Header(), resp.Header, s.responseHeaderFilter)
|
|
}
|
|
c.JSON(http.StatusOK, responsesResp)
|
|
|
|
return &OpenAIForwardResult{
|
|
RequestID: requestID,
|
|
Usage: usage,
|
|
Model: originalModel,
|
|
BillingModel: billingModel,
|
|
UpstreamModel: upstreamModel,
|
|
ReasoningEffort: reasoningEffort,
|
|
ServiceTier: serviceTier,
|
|
Stream: false,
|
|
Duration: time.Since(startTime),
|
|
}, nil
|
|
}
|
|
|
|
func (s *OpenAIGatewayService) streamChatCompletionsAsResponses(
|
|
c *gin.Context,
|
|
resp *http.Response,
|
|
originalModel string,
|
|
billingModel string,
|
|
upstreamModel string,
|
|
reasoningEffort *string,
|
|
serviceTier *string,
|
|
startTime time.Time,
|
|
) (*OpenAIForwardResult, error) {
|
|
requestID := resp.Header.Get("x-request-id")
|
|
headersWritten := false
|
|
writeStreamHeaders := func() {
|
|
if headersWritten {
|
|
return
|
|
}
|
|
headersWritten = true
|
|
if s.responseHeaderFilter != nil {
|
|
responseheaders.WriteFilteredHeaders(c.Writer.Header(), resp.Header, s.responseHeaderFilter)
|
|
}
|
|
c.Writer.Header().Set("Content-Type", "text/event-stream")
|
|
c.Writer.Header().Set("Cache-Control", "no-cache")
|
|
c.Writer.Header().Set("Connection", "keep-alive")
|
|
c.Writer.Header().Set("X-Accel-Buffering", "no")
|
|
c.Writer.WriteHeader(http.StatusOK)
|
|
}
|
|
|
|
state := apicompat.NewChatCompletionsToResponsesStreamState(originalModel)
|
|
var usage OpenAIUsage
|
|
var firstTokenMs *int
|
|
clientDisconnected := false
|
|
sawDone := false
|
|
|
|
writeEvents := func(events []apicompat.ResponsesStreamEvent) {
|
|
if clientDisconnected || len(events) == 0 {
|
|
return
|
|
}
|
|
writeStreamHeaders()
|
|
for _, event := range events {
|
|
sse, err := apicompat.ResponsesEventToSSE(event)
|
|
if err != nil {
|
|
logger.L().Warn("openai responses chat fallback: failed to marshal stream event",
|
|
zap.Error(err),
|
|
zap.String("request_id", requestID),
|
|
)
|
|
continue
|
|
}
|
|
if _, err := fmt.Fprint(c.Writer, sse); err != nil {
|
|
clientDisconnected = true
|
|
logger.L().Debug("openai responses chat fallback: client disconnected, continuing to drain upstream for billing",
|
|
zap.Error(err),
|
|
zap.String("request_id", requestID),
|
|
)
|
|
return
|
|
}
|
|
}
|
|
c.Writer.Flush()
|
|
}
|
|
|
|
scanner := bufio.NewScanner(resp.Body)
|
|
maxLineSize := defaultMaxLineSize
|
|
if s.cfg != nil && s.cfg.Gateway.MaxLineSize > 0 {
|
|
maxLineSize = s.cfg.Gateway.MaxLineSize
|
|
}
|
|
scanner.Buffer(make([]byte, 0, 64*1024), maxLineSize)
|
|
|
|
for scanner.Scan() {
|
|
line := scanner.Text()
|
|
payload, ok := extractOpenAISSEDataLine(line)
|
|
if !ok {
|
|
continue
|
|
}
|
|
payload = strings.TrimSpace(payload)
|
|
if payload == "" {
|
|
continue
|
|
}
|
|
if payload == "[DONE]" {
|
|
sawDone = true
|
|
break
|
|
}
|
|
|
|
if u := extractCCStreamUsage(payload); u != nil {
|
|
usage = *u
|
|
}
|
|
|
|
var chunk apicompat.ChatCompletionsChunk
|
|
if err := json.Unmarshal([]byte(payload), &chunk); err != nil {
|
|
logger.L().Warn("openai responses chat fallback: failed to parse chat stream chunk",
|
|
zap.Error(err),
|
|
zap.String("request_id", requestID),
|
|
)
|
|
continue
|
|
}
|
|
if firstTokenMs == nil && !isOpenAIChatUsageOnlyStreamChunk(payload) && chatChunkStartsResponsesOutput(&chunk) {
|
|
ms := int(time.Since(startTime).Milliseconds())
|
|
firstTokenMs = &ms
|
|
}
|
|
writeEvents(apicompat.ChatCompletionsChunkToResponsesEvents(&chunk, state))
|
|
}
|
|
|
|
if err := scanner.Err(); err != nil {
|
|
if !errors.Is(err, context.Canceled) && !errors.Is(err, context.DeadlineExceeded) {
|
|
logger.L().Warn("openai responses chat fallback: stream read error",
|
|
zap.Error(err),
|
|
zap.String("request_id", requestID),
|
|
)
|
|
}
|
|
return &OpenAIForwardResult{
|
|
RequestID: requestID,
|
|
Usage: usage,
|
|
Model: originalModel,
|
|
BillingModel: billingModel,
|
|
UpstreamModel: upstreamModel,
|
|
ReasoningEffort: reasoningEffort,
|
|
ServiceTier: serviceTier,
|
|
Stream: true,
|
|
Duration: time.Since(startTime),
|
|
FirstTokenMs: firstTokenMs,
|
|
}, fmt.Errorf("stream usage incomplete: %w", err)
|
|
}
|
|
|
|
writeEvents(apicompat.FinalizeChatCompletionsResponsesStream(state))
|
|
if !clientDisconnected {
|
|
writeStreamHeaders()
|
|
if _, err := fmt.Fprint(c.Writer, "data: [DONE]\n\n"); err != nil {
|
|
clientDisconnected = true
|
|
}
|
|
if !clientDisconnected {
|
|
c.Writer.Flush()
|
|
}
|
|
}
|
|
if !sawDone {
|
|
logger.L().Debug("openai responses chat fallback: upstream stream ended without done sentinel",
|
|
zap.String("request_id", requestID),
|
|
)
|
|
}
|
|
|
|
return &OpenAIForwardResult{
|
|
RequestID: requestID,
|
|
Usage: usage,
|
|
Model: originalModel,
|
|
BillingModel: billingModel,
|
|
UpstreamModel: upstreamModel,
|
|
ReasoningEffort: reasoningEffort,
|
|
ServiceTier: serviceTier,
|
|
Stream: true,
|
|
Duration: time.Since(startTime),
|
|
FirstTokenMs: firstTokenMs,
|
|
}, nil
|
|
}
|
|
|
|
func chatChunkStartsResponsesOutput(chunk *apicompat.ChatCompletionsChunk) bool {
|
|
if chunk == nil {
|
|
return false
|
|
}
|
|
for _, choice := range chunk.Choices {
|
|
if choice.Delta.Content != nil || choice.Delta.ReasoningContent != nil || len(choice.Delta.ToolCalls) > 0 {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|