feat: key接口完善及错误处理
This commit is contained in:
@@ -1,9 +1,13 @@
|
||||
package channel
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
app_errors "gpt-load/internal/errors"
|
||||
"gpt-load/internal/models"
|
||||
"io"
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
@@ -19,7 +23,7 @@ type OpenAIChannel struct {
|
||||
}
|
||||
|
||||
func newOpenAIChannel(f *Factory, group *models.Group) (ChannelProxy, error) {
|
||||
base, err := f.newBaseChannel("openai", group.Upstreams, group.Config)
|
||||
base, err := f.newBaseChannel("openai", group.Upstreams, group.Config, group.TestModel)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -36,21 +40,34 @@ func (ch *OpenAIChannel) Handle(c *gin.Context, apiKey *models.APIKey, group *mo
|
||||
return ch.ProcessRequest(c, apiKey, modifier, ch)
|
||||
}
|
||||
|
||||
// ValidateKey checks if the given API key is valid by making a request to the models endpoint.
|
||||
// ValidateKey checks if the given API key is valid by making a chat completion request.
|
||||
func (ch *OpenAIChannel) ValidateKey(ctx context.Context, key string) (bool, error) {
|
||||
upstreamURL := ch.getUpstreamURL()
|
||||
if upstreamURL == nil {
|
||||
return false, fmt.Errorf("no upstream URL configured for channel %s", ch.Name)
|
||||
}
|
||||
|
||||
// Construct the request URL for listing models, a common endpoint for key validation.
|
||||
reqURL := upstreamURL.String() + "/v1/models"
|
||||
reqURL := upstreamURL.String() + "/v1/chat/completions"
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, "GET", reqURL, nil)
|
||||
// Use a minimal, low-cost payload for validation
|
||||
payload := gin.H{
|
||||
"model": ch.TestModel,
|
||||
"messages": []gin.H{
|
||||
{"role": "user", "content": "Only output 'ok'"},
|
||||
},
|
||||
"max_tokens": 1,
|
||||
}
|
||||
body, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return false, fmt.Errorf("failed to marshal validation payload: %w", err)
|
||||
}
|
||||
|
||||
req, err := http.NewRequestWithContext(ctx, "POST", reqURL, bytes.NewBuffer(body))
|
||||
if err != nil {
|
||||
return false, fmt.Errorf("failed to create validation request: %w", err)
|
||||
}
|
||||
req.Header.Set("Authorization", "Bearer "+key)
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
|
||||
resp, err := ch.HTTPClient.Do(req)
|
||||
if err != nil {
|
||||
@@ -58,9 +75,21 @@ func (ch *OpenAIChannel) ValidateKey(ctx context.Context, key string) (bool, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
// A 200 OK status code indicates the key is valid.
|
||||
// Other status codes (e.g., 401 Unauthorized) indicate an invalid key.
|
||||
return resp.StatusCode == http.StatusOK, nil
|
||||
// A 200 OK status code indicates the key is valid and can make requests.
|
||||
if resp.StatusCode == http.StatusOK {
|
||||
return true, nil
|
||||
}
|
||||
|
||||
// For non-200 responses, parse the body to provide a more specific error reason.
|
||||
errorBody, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return false, fmt.Errorf("key is invalid (status %d), but failed to read error body: %w", resp.StatusCode, err)
|
||||
}
|
||||
|
||||
// Use the new parser to extract a clean error message.
|
||||
parsedError := app_errors.ParseUpstreamError(errorBody)
|
||||
|
||||
return false, fmt.Errorf("[status %d] %s", resp.StatusCode, parsedError)
|
||||
}
|
||||
|
||||
// IsStreamingRequest checks if the request is for a streaming response.
|
||||
|
Reference in New Issue
Block a user