Merge remote-tracking branch 'origin/alpha' into alpha

controller/channel-billing.go

@@ -135,7 +135,11 @@ func GetResponseBody(method, url string, channel *model.Channel, headers http.He
 	for k := range headers {
 		req.Header.Add(k, headers.Get(k))
 	}
-	res, err := service.GetHttpClient().Do(req)
+	client, err := service.NewProxyHttpClient(channel.GetSetting().Proxy)
+	if err != nil {
+		return nil, err
+	}
+	res, err := client.Do(req)
 	if err != nil {
 		return nil, err
 	}

relay/channel/openai/constant.go

@@ -12,16 +12,25 @@ var ModelList = []string{
 	"gpt-4o", "gpt-4o-2024-05-13", "gpt-4o-2024-08-06", "gpt-4o-2024-11-20",
 	"gpt-4o-mini", "gpt-4o-mini-2024-07-18",
 	"gpt-4.5-preview", "gpt-4.5-preview-2025-02-27",
+	"gpt-4.1", "gpt-4.1-2025-04-14",
+	"gpt-4.1-mini", "gpt-4.1-mini-2025-04-14",
+	"gpt-4.1-nano", "gpt-4.1-nano-2025-04-14",
+	"o1", "o1-2024-12-17",
 	"o1-preview", "o1-preview-2024-09-12",
 	"o1-mini", "o1-mini-2024-09-12",
+	"o1-pro", "o1-pro-2025-03-19",
 	"o3-mini", "o3-mini-2025-01-31",
 	"o3-mini-high", "o3-mini-2025-01-31-high",
 	"o3-mini-low", "o3-mini-2025-01-31-low",
 	"o3-mini-medium", "o3-mini-2025-01-31-medium",
+	"o3", "o3-2025-04-16",
+	"o3-pro", "o3-pro-2025-06-10",
+	"o3-deep-research", "o3-deep-research-2025-06-26",
+	"o4-mini", "o4-mini-2025-04-16",
+	"o4-mini-deep-research", "o4-mini-deep-research-2025-06-26",
 	"gpt-5", "gpt-5-2025-08-07", "gpt-5-chat-latest",
 	"gpt-5-mini", "gpt-5-mini-2025-08-07",
 	"gpt-5-nano", "gpt-5-nano-2025-08-07",
-	"o1", "o1-2024-12-17",
 	"gpt-4o-audio-preview", "gpt-4o-audio-preview-2024-10-01",
 	"gpt-4o-realtime-preview", "gpt-4o-realtime-preview-2024-10-01", "gpt-4o-realtime-preview-2024-12-17",
 	"gpt-4o-mini-realtime-preview", "gpt-4o-mini-realtime-preview-2024-12-17",
@@ -30,7 +39,7 @@ var ModelList = []string{
 	"text-moderation-latest", "text-moderation-stable",
 	"text-davinci-edit-001",
 	"davinci-002", "babbage-002",
-	"dall-e-3",
+	"dall-e-3", "gpt-image-1",
 	"whisper-1",
 	"tts-1", "tts-1-1106", "tts-1-hd", "tts-1-hd-1106",
 }

setting/ratio_setting/model_ratio.go

@@ -52,13 +52,21 @@ var defaultModelRatio = map[string]float64{
 	"gpt-4o-realtime-preview-2024-12-17":      2.5,
 	"gpt-4o-mini-realtime-preview":            0.3,
 	"gpt-4o-mini-realtime-preview-2024-12-17": 0.3,
-	"gpt-image-1":                             2.5,
-	"o1":                                      7.5,
-	"o1-2024-12-17":                           7.5,
-	"o1-preview":                              7.5,
-	"o1-preview-2024-09-12":                   7.5,
-	"o1-mini":                                 0.55,
-	"o1-mini-2024-09-12":                      0.55,
+	"gpt-4.1":                                 1.0,  // $2 / 1M tokens
+	"gpt-4.1-2025-04-14":                      1.0,  // $2 / 1M tokens
+	"gpt-4.1-mini":                            0.2,  // $0.4 / 1M tokens
+	"gpt-4.1-mini-2025-04-14":                 0.2,  // $0.4 / 1M tokens
+	"gpt-4.1-nano":                            0.05, // $0.1 / 1M tokens
+	"gpt-4.1-nano-2025-04-14":                 0.05, // $0.1 / 1M tokens
+	"gpt-image-1":                             2.5,  // $5 / 1M tokens
+	"o1":                                      7.5,  // $15 / 1M tokens
+	"o1-2024-12-17":                           7.5,  // $15 / 1M tokens
+	"o1-preview":                              7.5,  // $15 / 1M tokens
+	"o1-preview-2024-09-12":                   7.5,  // $15 / 1M tokens
+	"o1-mini":                                 0.55, // $1.1 / 1M tokens
+	"o1-mini-2024-09-12":                      0.55, // $1.1 / 1M tokens
+	"o1-pro":                                  75.0, // $150 / 1M tokens
+	"o1-pro-2025-03-19":                       75.0, // $150 / 1M tokens
 	"o3-mini":                                 0.55,
 	"o3-mini-2025-01-31":                      0.55,
 	"o3-mini-high":                            0.55,
@@ -67,6 +75,16 @@ var defaultModelRatio = map[string]float64{
 	"o3-mini-2025-01-31-low":                  0.55,
 	"o3-mini-medium":                          0.55,
 	"o3-mini-2025-01-31-medium":               0.55,
+	"o3":                                      1.0,  // $2 / 1M tokens
+	"o3-2025-04-16":                           1.0,  // $2 / 1M tokens
+	"o3-pro":                                  10.0, // $20 / 1M tokens
+	"o3-pro-2025-06-10":                       10.0, // $20 / 1M tokens
+	"o3-deep-research":                        5.0,  // $10 / 1M tokens
+	"o3-deep-research-2025-06-26":             5.0,  // $10 / 1M tokens
+	"o4-mini":                                 0.55, // $1.1 / 1M tokens
+	"o4-mini-2025-04-16":                      0.55, // $1.1 / 1M tokens
+	"o4-mini-deep-research":                   1.0,  // $2 / 1M tokens
+	"o4-mini-deep-research-2025-06-26":        1.0,  // $2 / 1M tokens
 	"gpt-4o-mini":                             0.075,
 	"gpt-4o-mini-2024-07-18":                  0.075,
 	"gpt-4-turbo":                             5, // $0.01 / 1K tokens