chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-20 05:10:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(logging): pass request entry into auth selection log

Browse Source 
Avoid re-creating the request-scoped log entry in the helper and use a switch for account type dispatch.
This commit is contained in:
Michael Velbaum
2025-12-28 15:51:11 +02:00
parent 48f6d7abdf
commit 48f19aab51
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
sdk/cliproxy/auth/conductor.go
View File

@@ -386,7 +386,10 @@ func (m *Manager) executeWithProvider(ctx context.Context, provider string, req
return cliproxyexecutor.Response{}, errPick return cliproxyexecutor.Response{}, errPick
} }
debugLogAuthSelection(ctx, auth, provider, req.Model) if log.IsLevelEnabled(log.DebugLevel) {
entry := logEntryWithRequestID(ctx)
debugLogAuthSelection(entry, auth, provider, req.Model)
}
tried[auth.ID] = struct{}{} tried[auth.ID] = struct{}{}
execCtx := ctx execCtx := ctx
@@ -432,7 +435,10 @@ func (m *Manager) executeCountWithProvider(ctx context.Context, provider string,
return cliproxyexecutor.Response{}, errPick return cliproxyexecutor.Response{}, errPick
} }
debugLogAuthSelection(ctx, auth, provider, req.Model) if log.IsLevelEnabled(log.DebugLevel) {
entry := logEntryWithRequestID(ctx)
debugLogAuthSelection(entry, auth, provider, req.Model)
}
tried[auth.ID] = struct{}{} tried[auth.ID] = struct{}{}
execCtx := ctx execCtx := ctx
@@ -478,7 +484,10 @@ func (m *Manager) executeStreamWithProvider(ctx context.Context, provider string
return nil, errPick return nil, errPick
} }
debugLogAuthSelection(ctx, auth, provider, req.Model) if log.IsLevelEnabled(log.DebugLevel) {
entry := logEntryWithRequestID(ctx)
debugLogAuthSelection(entry, auth, provider, req.Model)
}
tried[auth.ID] = struct{}{} tried[auth.ID] = struct{}{}
execCtx := ctx execCtx := ctx
@@ -1566,33 +1575,27 @@ func logEntryWithRequestID(ctx context.Context) *log.Entry {
return log.NewEntry(log.StandardLogger()) return log.NewEntry(log.StandardLogger())
} }
func debugLogAuthSelection(ctx context.Context, auth *Auth, provider string, model string) { func debugLogAuthSelection(entry *log.Entry, auth *Auth, provider string, model string) {
if !log.IsLevelEnabled(log.DebugLevel) { if entry == nil || auth == nil {
return return
} }
if auth == nil {
return
}
entry := logEntryWithRequestID(ctx)
accountType, accountInfo := auth.AccountInfo() accountType, accountInfo := auth.AccountInfo()
proxyInfo := auth.ProxyInfo() proxyInfo := auth.ProxyInfo()
if accountType == "api_key" { switch accountType {
case "api_key":
if proxyInfo != "" { if proxyInfo != "" {
entry.Debugf("Use API key %s for model %s %s", util.HideAPIKey(accountInfo), model, proxyInfo) entry.Debugf("Use API key %s for model %s %s", util.HideAPIKey(accountInfo), model, proxyInfo)
} else { return
}
entry.Debugf("Use API key %s for model %s", util.HideAPIKey(accountInfo), model) entry.Debugf("Use API key %s for model %s", util.HideAPIKey(accountInfo), model)
} case "oauth":
return
}
if accountType != "oauth" {
return
}
ident := formatOauthIdentity(auth, provider, accountInfo) ident := formatOauthIdentity(auth, provider, accountInfo)
if proxyInfo != "" { if proxyInfo != "" {
entry.Debugf("Use OAuth %s for model %s %s", ident, model, proxyInfo) entry.Debugf("Use OAuth %s for model %s %s", ident, model, proxyInfo)
return return
} }
entry.Debugf("Use OAuth %s for model %s", ident, model) entry.Debugf("Use OAuth %s for model %s", ident, model)
}
} }
func formatOauthIdentity(auth *Auth, provider string, accountInfo string) string { func formatOauthIdentity(auth *Auth, provider string, accountInfo string) string {