feat: no need init client, use ctx

service/aiproxy/common/config/config.go

@@ -86,21 +86,10 @@ func SetRetryTimes(times int64) {
 
 var DisableAutoMigrateDB = os.Getenv("DISABLE_AUTO_MIGRATE_DB") == "true"
 
-var RelayTimeout = env.Int("RELAY_TIMEOUT", 0) // unit is second
-
 var RateLimitKeyExpirationDuration = 20 * time.Minute
 
 var OnlyOneLogFile = env.Bool("ONLY_ONE_LOG_FILE", false)
 
-var (
-	// 代理地址
-	RelayProxy = env.String("RELAY_PROXY", "")
-	// 用户内容请求代理地址
-	UserContentRequestProxy = env.String("USER_CONTENT_REQUEST_PROXY", "")
-	// 用户内容请求超时时间，单位为秒
-	UserContentRequestTimeout = env.Int("USER_CONTENT_REQUEST_TIMEOUT", 30)
-)
-
 var AdminKey = env.String("ADMIN_KEY", "")
 
 var (

service/aiproxy/common/image/image.go

@@ -21,8 +21,6 @@ import (
 
 	// import webp decoder
 	_ "golang.org/x/image/webp"
-
-	"github.com/labring/sealos/service/aiproxy/common/client"
 )
 
 // Regex to match data URL pattern
@@ -37,7 +35,7 @@ func GetImageSizeFromURL(url string) (width int, height int, err error) {
 	if err != nil {
 		return 0, 0, err
 	}
-	resp, err := client.UserContentRequestHTTPClient.Do(req)
+	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return
 	}
@@ -70,7 +68,7 @@ func GetImageFromURL(ctx context.Context, url string) (string, string, error) {
 	if err != nil {
 		return "", "", err
 	}
-	resp, err := client.UserContentRequestHTTPClient.Do(req)
+	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return "", "", err
 	}

service/aiproxy/common/image/image_test.go

@@ -12,8 +12,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/labring/sealos/service/aiproxy/common/client"
-
 	img "github.com/labring/sealos/service/aiproxy/common/image"
 
 	"github.com/stretchr/testify/assert"
@@ -44,11 +42,6 @@ var cases = []struct {
 	{"https://upload.wikimedia.org/wikipedia/commons/6/62/102Cervus.jpg", "jpeg", 270, 230},
 }
 
-func TestMain(m *testing.M) {
-	client.Init()
-	m.Run()
-}
-
 func TestDecode(t *testing.T) {
 	// Bytes read: varies sometimes
 	// jpeg: 1063892

service/aiproxy/controller/relay.go

@@ -95,19 +95,11 @@ func Relay(c *gin.Context) {
 }
 
 func shouldRetry(_ *gin.Context, statusCode int) bool {
-	if statusCode == http.StatusTooManyRequests {
+	if statusCode == http.StatusTooManyRequests ||
+		statusCode == http.StatusGatewayTimeout {
 		return true
 	}
-	if statusCode/100 == 5 {
-		return true
-	}
-	if statusCode == http.StatusBadRequest {
-		return false
-	}
-	if statusCode/100 == 2 {
-		return false
-	}
-	return true
+	return false
 }
 
 func RelayNotImplemented(c *gin.Context) {

service/aiproxy/main.go

@@ -17,7 +17,6 @@ import (
 	_ "github.com/joho/godotenv/autoload"
 	"github.com/labring/sealos/service/aiproxy/common"
 	"github.com/labring/sealos/service/aiproxy/common/balance"
-	"github.com/labring/sealos/service/aiproxy/common/client"
 	"github.com/labring/sealos/service/aiproxy/common/config"
 	"github.com/labring/sealos/service/aiproxy/middleware"
 	"github.com/labring/sealos/service/aiproxy/model"
@@ -43,7 +42,6 @@ func initializeServices() error {
 		return err
 	}
 
-	client.Init()
 	return nil
 }
 

service/aiproxy/relay/adaptor/baidu/token.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	json "github.com/json-iterator/go"
-	"github.com/labring/sealos/service/aiproxy/common/client"
+	"github.com/labring/sealos/service/aiproxy/relay/utils"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -66,7 +66,7 @@ func getBaiduAccessTokenHelper(ctx context.Context, apiKey string) (*AccessToken
 	}
 	req.Header.Add("Content-Type", "application/json")
 	req.Header.Add("Accept", "application/json")
-	res, err := client.ImpatientHTTPClient.Do(req)
+	res, err := utils.DoRequest(req)
 	if err != nil {
 		return nil, err
 	}

service/aiproxy/relay/adaptor/openai/balance.go

@@ -6,7 +6,6 @@ import (
 	"time"
 
 	json "github.com/json-iterator/go"
-	"github.com/labring/sealos/service/aiproxy/common/client"
 	"github.com/labring/sealos/service/aiproxy/model"
 	"github.com/labring/sealos/service/aiproxy/relay/adaptor"
 )
@@ -29,7 +28,7 @@ func GetBalance(channel *model.Channel) (float64, error) {
 		return 0, err
 	}
 	req1.Header.Set("Authorization", "Bearer "+channel.Key)
-	res1, err := client.HTTPClient.Do(req1)
+	res1, err := http.DefaultClient.Do(req1)
 	if err != nil {
 		return 0, err
 	}
@@ -51,7 +50,7 @@ func GetBalance(channel *model.Channel) (float64, error) {
 		return 0, err
 	}
 	req2.Header.Set("Authorization", "Bearer "+channel.Key)
-	res2, err := client.HTTPClient.Do(req2)
+	res2, err := http.DefaultClient.Do(req2)
 	if err != nil {
 		return 0, err
 	}

service/aiproxy/relay/adaptor/siliconflow/balance.go

@@ -7,7 +7,6 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/labring/sealos/service/aiproxy/common/client"
 	"github.com/labring/sealos/service/aiproxy/model"
 	"github.com/labring/sealos/service/aiproxy/relay/adaptor"
 )
@@ -25,7 +24,7 @@ func (a *Adaptor) GetBalance(channel *model.Channel) (float64, error) {
 		return 0, err
 	}
 	req.Header.Set("Authorization", "Bearer "+channel.Key)
-	res, err := client.HTTPClient.Do(req)
+	res, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return 0, err
 	}

service/aiproxy/relay/controller/helper.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"errors"
 	"io"
 	"net/http"
 	"sync"
@@ -260,6 +261,9 @@ func DoHelper(a adaptor.Adaptor, c *gin.Context, meta *meta.Meta) (*relaymodel.U
 
 	resp, err := a.DoRequest(meta, c, req)
 	if err != nil {
+		if errors.Is(err, context.DeadlineExceeded) {
+			return nil, &detail, openai.ErrorWrapperWithMessage("do request failed: "+err.Error(), "do_request_failed", http.StatusGatewayTimeout)
+		}
 		return nil, &detail, openai.ErrorWrapperWithMessage("do request failed: "+err.Error(), "do_request_failed", http.StatusBadRequest)
 	}
 

service/aiproxy/relay/utils/utils.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	"github.com/labring/sealos/service/aiproxy/common"
-	"github.com/labring/sealos/service/aiproxy/common/client"
 	relaymodel "github.com/labring/sealos/service/aiproxy/relay/model"
 )
 
@@ -55,7 +54,7 @@ func UnmarshalMap(req *http.Request) (map[string]any, error) {
 }
 
 func DoRequest(req *http.Request) (*http.Response, error) {
-	resp, err := client.HTTPClient.Do(req)
+	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return nil, err
 	}