mirror of
https://github.com/router-for-me/CLIProxyAPI.git
synced 2026-02-03 13:00:52 +08:00
e313d39be8
- Added `CountTokens` for token counting requests in Gemini executor. - Integrated request translation via `sdktranslator` and response handling. - Improved error handling, logging, and API request configuration with headers.
345 lines
11 KiB
Go
345 lines
11 KiB
Go
package executor
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/config"
|
|
"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
|
|
cliproxyauth "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/auth"
|
|
cliproxyexecutor "github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/executor"
|
|
sdktranslator "github.com/router-for-me/CLIProxyAPI/v6/sdk/translator"
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/tidwall/sjson"
|
|
"golang.org/x/oauth2"
|
|
"golang.org/x/oauth2/google"
|
|
)
|
|
|
|
const (
|
|
glEndpoint = "https://generativelanguage.googleapis.com"
|
|
glAPIVersion = "v1beta"
|
|
)
|
|
|
|
// GeminiExecutor is a stateless executor for the official Gemini API using API keys.
|
|
// If no API key is found on the auth entry, it falls back to the legacy client via ClientAdapter.
|
|
type GeminiExecutor struct {
|
|
cfg *config.Config
|
|
}
|
|
|
|
func NewGeminiExecutor(cfg *config.Config) *GeminiExecutor { return &GeminiExecutor{cfg: cfg} }
|
|
|
|
func (e *GeminiExecutor) Identifier() string { return "gemini" }
|
|
|
|
func (e *GeminiExecutor) PrepareRequest(_ *http.Request, _ *cliproxyauth.Auth) error { return nil }
|
|
|
|
func (e *GeminiExecutor) Execute(ctx context.Context, auth *cliproxyauth.Auth, req cliproxyexecutor.Request, opts cliproxyexecutor.Options) (cliproxyexecutor.Response, error) {
|
|
apiKey, bearer := geminiCreds(auth)
|
|
if apiKey == "" && bearer == "" {
|
|
// Fallback to legacy client
|
|
return NewClientAdapter("gemini").Execute(ctx, auth, req, opts)
|
|
}
|
|
|
|
// Official Gemini API via API key or OAuth bearer
|
|
from := opts.SourceFormat
|
|
to := sdktranslator.FromString("gemini")
|
|
body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), false)
|
|
|
|
action := "generateContent"
|
|
if req.Metadata != nil {
|
|
if a, _ := req.Metadata["action"].(string); a == "countTokens" {
|
|
action = "countTokens"
|
|
}
|
|
}
|
|
url := fmt.Sprintf("%s/%s/models/%s:%s", glEndpoint, glAPIVersion, req.Model, action)
|
|
if opts.Alt != "" && action != "countTokens" {
|
|
url = url + fmt.Sprintf("?$alt=%s", opts.Alt)
|
|
}
|
|
|
|
recordAPIRequest(ctx, e.cfg, body)
|
|
httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(body))
|
|
if err != nil {
|
|
return cliproxyexecutor.Response{}, err
|
|
}
|
|
httpReq.Header.Set("Content-Type", "application/json")
|
|
if apiKey != "" {
|
|
httpReq.Header.Set("x-goog-api-key", apiKey)
|
|
} else if bearer != "" {
|
|
httpReq.Header.Set("Authorization", "Bearer "+bearer)
|
|
}
|
|
|
|
httpClient := &http.Client{}
|
|
if rt, ok := ctx.Value("cliproxy.roundtripper").(http.RoundTripper); ok && rt != nil {
|
|
httpClient.Transport = rt
|
|
}
|
|
resp, err := httpClient.Do(httpReq)
|
|
if err != nil {
|
|
return cliproxyexecutor.Response{}, err
|
|
}
|
|
defer func() { _ = resp.Body.Close() }()
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
b, _ := io.ReadAll(resp.Body)
|
|
appendAPIResponseChunk(ctx, e.cfg, b)
|
|
log.Debugf("request error, error status: %d, error body: %s", resp.StatusCode, string(b))
|
|
return cliproxyexecutor.Response{}, statusErr{code: resp.StatusCode, msg: string(b)}
|
|
}
|
|
data, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return cliproxyexecutor.Response{}, err
|
|
}
|
|
appendAPIResponseChunk(ctx, e.cfg, data)
|
|
var param any
|
|
out := sdktranslator.TranslateNonStream(ctx, to, from, req.Model, bytes.Clone(opts.OriginalRequest), body, data, ¶m)
|
|
return cliproxyexecutor.Response{Payload: []byte(out)}, nil
|
|
}
|
|
|
|
func (e *GeminiExecutor) ExecuteStream(ctx context.Context, auth *cliproxyauth.Auth, req cliproxyexecutor.Request, opts cliproxyexecutor.Options) (<-chan cliproxyexecutor.StreamChunk, error) {
|
|
apiKey, bearer := geminiCreds(auth)
|
|
if apiKey == "" && bearer == "" {
|
|
// Fallback to legacy streaming
|
|
return NewClientAdapter("gemini").ExecuteStream(ctx, auth, req, opts)
|
|
}
|
|
|
|
from := opts.SourceFormat
|
|
to := sdktranslator.FromString("gemini")
|
|
body := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), true)
|
|
|
|
url := fmt.Sprintf("%s/%s/models/%s:%s", glEndpoint, glAPIVersion, req.Model, "streamGenerateContent")
|
|
if opts.Alt == "" {
|
|
url = url + "?alt=sse"
|
|
} else {
|
|
url = url + fmt.Sprintf("?$alt=%s", opts.Alt)
|
|
}
|
|
recordAPIRequest(ctx, e.cfg, body)
|
|
httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(body))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
httpReq.Header.Set("Content-Type", "application/json")
|
|
if apiKey != "" {
|
|
httpReq.Header.Set("x-goog-api-key", apiKey)
|
|
} else {
|
|
httpReq.Header.Set("Authorization", "Bearer "+bearer)
|
|
}
|
|
|
|
httpClient := &http.Client{Timeout: 0}
|
|
if rt, ok := ctx.Value("cliproxy.roundtripper").(http.RoundTripper); ok && rt != nil {
|
|
httpClient.Transport = rt
|
|
}
|
|
resp, err := httpClient.Do(httpReq)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
defer func() { _ = resp.Body.Close() }()
|
|
b, _ := io.ReadAll(resp.Body)
|
|
appendAPIResponseChunk(ctx, e.cfg, b)
|
|
log.Debugf("request error, error status: %d, error body: %s", resp.StatusCode, string(b))
|
|
return nil, statusErr{code: resp.StatusCode, msg: string(b)}
|
|
}
|
|
out := make(chan cliproxyexecutor.StreamChunk)
|
|
go func() {
|
|
defer close(out)
|
|
defer func() { _ = resp.Body.Close() }()
|
|
scanner := bufio.NewScanner(resp.Body)
|
|
buf := make([]byte, 1024*1024)
|
|
scanner.Buffer(buf, 1024*1024)
|
|
var param any
|
|
for scanner.Scan() {
|
|
line := scanner.Bytes()
|
|
appendAPIResponseChunk(ctx, e.cfg, line)
|
|
lines := sdktranslator.TranslateStream(ctx, to, from, req.Model, bytes.Clone(opts.OriginalRequest), body, bytes.Clone(line), ¶m)
|
|
for i := range lines {
|
|
out <- cliproxyexecutor.StreamChunk{Payload: []byte(lines[i])}
|
|
}
|
|
}
|
|
lines := sdktranslator.TranslateStream(ctx, to, from, req.Model, bytes.Clone(opts.OriginalRequest), body, bytes.Clone([]byte("[DONE]")), ¶m)
|
|
for i := range lines {
|
|
out <- cliproxyexecutor.StreamChunk{Payload: []byte(lines[i])}
|
|
}
|
|
if err = scanner.Err(); err != nil {
|
|
out <- cliproxyexecutor.StreamChunk{Err: err}
|
|
}
|
|
}()
|
|
return out, nil
|
|
}
|
|
|
|
func (e *GeminiExecutor) CountTokens(ctx context.Context, auth *cliproxyauth.Auth, req cliproxyexecutor.Request, opts cliproxyexecutor.Options) (cliproxyexecutor.Response, error) {
|
|
apiKey, bearer := geminiCreds(auth)
|
|
|
|
from := opts.SourceFormat
|
|
to := sdktranslator.FromString("gemini")
|
|
translatedReq := sdktranslator.TranslateRequest(from, to, req.Model, bytes.Clone(req.Payload), false)
|
|
respCtx := context.WithValue(ctx, "alt", opts.Alt)
|
|
translatedReq, _ = sjson.DeleteBytes(translatedReq, "tools")
|
|
|
|
url := fmt.Sprintf("%s/%s/models/%s:%s", glEndpoint, glAPIVersion, req.Model, "countTokens")
|
|
recordAPIRequest(ctx, e.cfg, translatedReq)
|
|
requestBody := bytes.NewReader(translatedReq)
|
|
|
|
httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, url, requestBody)
|
|
if err != nil {
|
|
return cliproxyexecutor.Response{}, err
|
|
}
|
|
httpReq.Header.Set("Content-Type", "application/json")
|
|
if apiKey != "" {
|
|
httpReq.Header.Set("x-goog-api-key", apiKey)
|
|
} else {
|
|
httpReq.Header.Set("Authorization", "Bearer "+bearer)
|
|
}
|
|
|
|
httpClient := &http.Client{}
|
|
if rt, ok := ctx.Value("cliproxy.roundtripper").(http.RoundTripper); ok && rt != nil {
|
|
httpClient.Transport = rt
|
|
}
|
|
resp, err := httpClient.Do(httpReq)
|
|
if err != nil {
|
|
return cliproxyexecutor.Response{}, err
|
|
}
|
|
defer func() { _ = resp.Body.Close() }()
|
|
|
|
data, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return cliproxyexecutor.Response{}, err
|
|
}
|
|
appendAPIResponseChunk(ctx, e.cfg, data)
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
log.Debugf("request error, error status: %d, error body: %s", resp.StatusCode, string(data))
|
|
return cliproxyexecutor.Response{}, statusErr{code: resp.StatusCode, msg: string(data)}
|
|
}
|
|
|
|
var param any
|
|
translated := sdktranslator.TranslateNonStream(respCtx, to, from, req.Model, bytes.Clone(opts.OriginalRequest), translatedReq, data, ¶m)
|
|
return cliproxyexecutor.Response{Payload: []byte(translated)}, nil
|
|
}
|
|
|
|
func (e *GeminiExecutor) Refresh(ctx context.Context, auth *cliproxyauth.Auth) (*cliproxyauth.Auth, error) {
|
|
log.Debugf("gemini executor: refresh called")
|
|
// OAuth bearer token refresh for official Gemini API.
|
|
if auth == nil {
|
|
return nil, fmt.Errorf("gemini executor: auth is nil")
|
|
}
|
|
if auth.Metadata == nil {
|
|
return auth, nil
|
|
}
|
|
// Token data is typically nested under "token" map in Gemini files.
|
|
tokenMap, _ := auth.Metadata["token"].(map[string]any)
|
|
var refreshToken, accessToken, clientID, clientSecret, tokenURI, expiryStr string
|
|
if tokenMap != nil {
|
|
if v, ok := tokenMap["refresh_token"].(string); ok {
|
|
refreshToken = v
|
|
}
|
|
if v, ok := tokenMap["access_token"].(string); ok {
|
|
accessToken = v
|
|
}
|
|
if v, ok := tokenMap["client_id"].(string); ok {
|
|
clientID = v
|
|
}
|
|
if v, ok := tokenMap["client_secret"].(string); ok {
|
|
clientSecret = v
|
|
}
|
|
if v, ok := tokenMap["token_uri"].(string); ok {
|
|
tokenURI = v
|
|
}
|
|
if v, ok := tokenMap["expiry"].(string); ok {
|
|
expiryStr = v
|
|
}
|
|
} else {
|
|
// Fallback to top-level keys if present
|
|
if v, ok := auth.Metadata["refresh_token"].(string); ok {
|
|
refreshToken = v
|
|
}
|
|
if v, ok := auth.Metadata["access_token"].(string); ok {
|
|
accessToken = v
|
|
}
|
|
if v, ok := auth.Metadata["client_id"].(string); ok {
|
|
clientID = v
|
|
}
|
|
if v, ok := auth.Metadata["client_secret"].(string); ok {
|
|
clientSecret = v
|
|
}
|
|
if v, ok := auth.Metadata["token_uri"].(string); ok {
|
|
tokenURI = v
|
|
}
|
|
if v, ok := auth.Metadata["expiry"].(string); ok {
|
|
expiryStr = v
|
|
}
|
|
}
|
|
if refreshToken == "" {
|
|
// Nothing to do for API key or cookie based entries
|
|
return auth, nil
|
|
}
|
|
|
|
// Prepare oauth2 config; default to Google endpoints
|
|
endpoint := google.Endpoint
|
|
if tokenURI != "" {
|
|
endpoint.TokenURL = tokenURI
|
|
}
|
|
conf := &oauth2.Config{ClientID: clientID, ClientSecret: clientSecret, Endpoint: endpoint}
|
|
|
|
// Ensure proxy-aware HTTP client for token refresh
|
|
httpClient := util.SetProxy(e.cfg, &http.Client{})
|
|
ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient)
|
|
|
|
// Build base token
|
|
tok := &oauth2.Token{AccessToken: accessToken, RefreshToken: refreshToken}
|
|
if t, err := time.Parse(time.RFC3339, expiryStr); err == nil {
|
|
tok.Expiry = t
|
|
}
|
|
newTok, err := conf.TokenSource(ctx, tok).Token()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Persist back to metadata; prefer nested token map if present
|
|
if tokenMap == nil {
|
|
tokenMap = make(map[string]any)
|
|
}
|
|
tokenMap["access_token"] = newTok.AccessToken
|
|
tokenMap["refresh_token"] = newTok.RefreshToken
|
|
tokenMap["expiry"] = newTok.Expiry.Format(time.RFC3339)
|
|
if clientID != "" {
|
|
tokenMap["client_id"] = clientID
|
|
}
|
|
if clientSecret != "" {
|
|
tokenMap["client_secret"] = clientSecret
|
|
}
|
|
if tokenURI != "" {
|
|
tokenMap["token_uri"] = tokenURI
|
|
}
|
|
auth.Metadata["token"] = tokenMap
|
|
|
|
// Also mirror top-level access_token for compatibility if previously present
|
|
if _, ok := auth.Metadata["access_token"]; ok {
|
|
auth.Metadata["access_token"] = newTok.AccessToken
|
|
}
|
|
return auth, nil
|
|
}
|
|
|
|
func geminiCreds(a *cliproxyauth.Auth) (apiKey, bearer string) {
|
|
if a == nil {
|
|
return "", ""
|
|
}
|
|
if a.Attributes != nil {
|
|
if v := a.Attributes["api_key"]; v != "" {
|
|
apiKey = v
|
|
}
|
|
}
|
|
if a.Metadata != nil {
|
|
// GeminiTokenStorage.Token is a map that may contain access_token
|
|
if v, ok := a.Metadata["access_token"].(string); ok && v != "" {
|
|
bearer = v
|
|
}
|
|
if token, ok := a.Metadata["token"].(map[string]any); ok && token != nil {
|
|
if v, ok2 := token["access_token"].(string); ok2 && v != "" {
|
|
bearer = v
|
|
}
|
|
}
|
|
}
|
|
return
|
|
}
|