niuniu/lijiaoqiao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(gateway): 优化OpenAI适配器实现

Browse Source 
1. 使用bufio.Scanner代替io.ReadLine进行流式读取，提高效率
2. MapError返回ProviderError结构化错误码，便于错误处理和追踪
3. 更新go.mod添加必要依赖
This commit is contained in:
Your Name
2026-04-03 09:59:32 +08:00
parent a9d304fdfa
commit 9931075e94
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gateway/go.mod
View File

@@ -3,10 +3,19 @@ module lijiaoqiao/gateway
go 1.21 go 1.21
require ( require (
github.com/golang-jwt/jwt/v5 v5.2.0 github.com/jackc/pgx/v5 v5.5.0
github.com/stretchr/testify v1.8.1
) )
require ( require (
github.com/jackc/pgx/v5 v5.5.0 github.com/davecgh/go-spew v1.1.1 // indirect
golang.org/x/net v0.19.0 github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/text v0.9.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
) )

25
gateway/internal/adapter/openai_adapter.go
View File

@@ -1,6 +1,7 @@
package adapter package adapter
import ( import (
"bufio"
"bytes" "bytes"
"context" "context"
"encoding/json" "encoding/json"
@@ -8,8 +9,6 @@ import (
"io" "io"
"net/http" "net/http"
"time" "time"
"lijiaoqiao/gateway/pkg/error"
) )
// OpenAIAdapter OpenAI适配器 // OpenAIAdapter OpenAI适配器
@@ -188,13 +187,9 @@ func (a *OpenAIAdapter) ChatCompletionStream(ctx context.Context, model string,
defer close(ch) defer close(ch)
defer resp.Body.Close() defer resp.Body.Close()
reader := io.Reader(resp.Body) scanner := bufio.NewScanner(resp.Body)
for { for scanner.Scan() {
line, err := io.ReadLine(reader) line := scanner.Bytes()
if err != nil {
return
}
if len(line) < 6 { if len(line) < 6 {
continue continue
} }
@@ -262,24 +257,24 @@ func (a *OpenAIAdapter) GetUsage(response *CompletionResponse) Usage {
} }
// MapError 错误码映射 // MapError 错误码映射
func (a *OpenAIAdapter) MapError(err error) error { func (a *OpenAIAdapter) MapError(err error) ProviderError {
// 简化实现，实际应根据OpenAI错误响应映射 // 简化实现，实际应根据OpenAI错误响应映射
errStr := err.Error() errStr := err.Error()
if contains(errStr, "invalid_api_key") { if contains(errStr, "invalid_api_key") {
return error.NewGatewayError(error.PROVIDER_INVALID_KEY, "Invalid API key").WithInternal(err) return ProviderError{Code: "PROVIDER_001", Message: "Invalid API key", HTTPStatus: 401, Retryable: false}
} }
if contains(errStr, "rate_limit") { if contains(errStr, "rate_limit") {
return error.NewGatewayError(error.PROVIDER_RATE_LIMIT, "Rate limit exceeded").WithInternal(err) return ProviderError{Code: "PROVIDER_002", Message: "Rate limit exceeded", HTTPStatus: 429, Retryable: true}
} }
if contains(errStr, "quota") { if contains(errStr, "quota") {
return error.NewGatewayError(error.PROVIDER_QUOTA_EXCEEDED, "Quota exceeded").WithInternal(err) return ProviderError{Code: "PROVIDER_003", Message: "Quota exceeded", HTTPStatus: 402, Retryable: false}
} }
if contains(errStr, "model_not_found") { if contains(errStr, "model_not_found") {
return error.NewGatewayError(error.PROVIDER_MODEL_NOT_FOUND, "Model not found").WithInternal(err) return ProviderError{Code: "PROVIDER_004", Message: "Model not found", HTTPStatus: 404, Retryable: false}
} }
return error.NewGatewayError(error.PROVIDER_ERROR, "Provider error").WithInternal(err) return ProviderError{Code: "PROVIDER_005", Message: "Provider error", HTTPStatus: 502, Retryable: true}
} }
func contains(s, substr string) bool { func contains(s, substr string) bool {