feat(admin): 渠道管理 - 支持渠道级出站代理
This commit is contained in:
commit
524d2910ca
16 files changed
+144
-12
No files matched your search
@@ -93,6 +93,7 @@ type ChannelRequest struct {
|
||||
Models []string `json:"models"`
|
||||
Headers []OutboundHeader `json:"headers"`
|
||||
Enabled *bool `json:"enabled"`
|
||||
ProxyURL string `json:"proxyUrl"`
|
||||
}
|
||||
|
||||
type PublicModelChannel struct {
|
||||
@@ -106,6 +107,7 @@ type PublicModelChannel struct {
|
||||
APIKey string `json:"apiKey"`
|
||||
APIFormat string `json:"apiFormat"`
|
||||
ConcurrencyLimit int `json:"concurrencyLimit"`
|
||||
ProxyURL string `json:"proxyUrl"`
|
||||
Models []string `json:"models"`
|
||||
ModelCosts []PublicChannelModelPrice `json:"modelCosts"`
|
||||
Headers []OutboundHeader `json:"headers,omitempty"`
|
||||
@@ -187,6 +189,7 @@ func (s *Service) channelFromRequest(req ChannelRequest, channel model.ModelChan
|
||||
}
|
||||
channel.ModelsJSON = string(modelsJSON)
|
||||
channel.HeadersJSON = headersJSON
|
||||
channel.ProxyURL = strings.TrimSpace(req.ProxyURL)
|
||||
if req.Enabled != nil {
|
||||
channel.Enabled = *req.Enabled
|
||||
}
|
||||
@@ -206,6 +209,9 @@ func mergeChannelRequest(req ChannelRequest, channel model.ModelChannel) Channel
|
||||
if req.Headers == nil {
|
||||
req.Headers, _ = ParseOutboundHeadersJSON(channel.HeadersJSON)
|
||||
}
|
||||
if strings.TrimSpace(req.ProxyURL) == "" {
|
||||
req.ProxyURL = channel.ProxyURL
|
||||
}
|
||||
return req
|
||||
}
|
||||
|
||||
@@ -232,6 +238,7 @@ func publicChannel(channel model.ModelChannel, admin bool, channelModels []model
|
||||
}
|
||||
apiKey := ""
|
||||
baseURL := channel.BaseURL
|
||||
proxyURL := ""
|
||||
var headers []OutboundHeader
|
||||
if channel.Scope == model.ChannelScopeSystem {
|
||||
if !admin {
|
||||
@@ -244,6 +251,9 @@ func publicChannel(channel model.ModelChannel, admin bool, channelModels []model
|
||||
} else if admin {
|
||||
apiKey = channel.APIKey
|
||||
}
|
||||
if admin {
|
||||
proxyURL = channel.ProxyURL
|
||||
}
|
||||
return PublicModelChannel{
|
||||
ID: channel.ID,
|
||||
UserID: channel.UserID,
|
||||
@@ -255,6 +265,7 @@ func publicChannel(channel model.ModelChannel, admin bool, channelModels []model
|
||||
APIKey: apiKey,
|
||||
APIFormat: channel.APIFormat,
|
||||
ConcurrencyLimit: channel.ConcurrencyLimit,
|
||||
ProxyURL: proxyURL,
|
||||
Models: models,
|
||||
ModelCosts: modelCosts,
|
||||
Headers: headers,
|
||||
|
||||
@@ -189,16 +189,22 @@ func TestChannelFromRequestStoresAndClearsHeaders(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestPublicChannelOnlyReturnsSystemHeadersToAdmin(t *testing.T) {
|
||||
channel := model.ModelChannel{ID: "system-1", Scope: model.ChannelScopeSystem, BaseURL: "https://example.com/v1", HeadersJSON: `[{"name":"X-Gateway-Tenant","value":"tenant-a"}]`}
|
||||
func TestPublicChannelOnlyReturnsSystemHeadersAndProxyToAdmin(t *testing.T) {
|
||||
channel := model.ModelChannel{ID: "system-1", Scope: model.ChannelScopeSystem, BaseURL: "https://example.com/v1", HeadersJSON: `[{"name":"X-Gateway-Tenant","value":"tenant-a"}]`, ProxyURL: "socks5://user:secret@127.0.0.1:1080"}
|
||||
adminView := publicChannel(channel, true, nil)
|
||||
if len(adminView.Headers) != 1 || adminView.Headers[0].Name != "X-Gateway-Tenant" {
|
||||
t.Fatalf("admin headers = %#v", adminView.Headers)
|
||||
}
|
||||
if adminView.ProxyURL != channel.ProxyURL {
|
||||
t.Fatalf("admin proxy URL = %q", adminView.ProxyURL)
|
||||
}
|
||||
userView := publicChannel(channel, false, nil)
|
||||
if len(userView.Headers) != 0 {
|
||||
t.Fatalf("user headers = %#v", userView.Headers)
|
||||
}
|
||||
if userView.ProxyURL != "" {
|
||||
t.Fatalf("user proxy URL = %q", userView.ProxyURL)
|
||||
}
|
||||
}
|
||||
|
||||
func TestChannelFromRequestRejectsInvalidConcurrencyLimit(t *testing.T) {
|
||||
|
||||
@@ -112,7 +112,7 @@ func (s *Service) TestAdminChannelModel(ctx context.Context, actor *model.User,
|
||||
defer cancel()
|
||||
testCtx = context.WithValue(testCtx, providerAnalyticsKey{}, providerAnalyticsContext{
|
||||
Service: s, Billing: s.taskBilling(), UserID: actor.ID, ChannelID: channel.ID, Capability: capability,
|
||||
Operation: "admin_model_test", Model: modelKey, VideoSeconds: videoSecondsValue,
|
||||
Operation: "admin_model_test", Model: modelKey, VideoSeconds: videoSecondsValue, ProxyURL: channel.ProxyURL,
|
||||
})
|
||||
testCtx = withProtocolRegistry(testCtx, s.protocolRegistry())
|
||||
startedAt := time.Now()
|
||||
|
||||
@@ -12,6 +12,8 @@ func (s *Service) ValidateChannelOutboundURL(rawURL string) (*url.URL, error) {
|
||||
return ValidateOutboundURL(rawURL)
|
||||
}
|
||||
|
||||
func (s *Service) OutboundHTTPClientForChannel(timeout time.Duration, _ *url.URL) *http.Client {
|
||||
return OutboundHTTPClient(timeout)
|
||||
// OutboundHTTPClientForChannel 返回渠道专用的出站 HTTP 客户端。
|
||||
// proxyURL 非空时使用渠道级代理(socks5/http/https),否则回退到全局客户端。
|
||||
func (s *Service) OutboundHTTPClientForChannel(timeout time.Duration, _ *url.URL, proxyURL string) *http.Client {
|
||||
return OutboundHTTPClientWithProxy(timeout, proxyURL)
|
||||
}
|
||||
@@ -30,6 +30,10 @@ func OutboundHTTPClient(timeout time.Duration) *http.Client {
|
||||
return outbound.OutboundHTTPClient(timeout)
|
||||
}
|
||||
|
||||
func OutboundHTTPClientWithProxy(timeout time.Duration, proxyURL string) *http.Client {
|
||||
return outbound.OutboundHTTPClientWithProxy(timeout, proxyURL)
|
||||
}
|
||||
|
||||
func ApplyDefaultOutboundHeaders(req *http.Request) {
|
||||
outbound.ApplyDefaultOutboundHeaders(req)
|
||||
}
|
||||
|
||||
@@ -78,6 +78,7 @@ type providerAnalyticsContext struct {
|
||||
Capability string
|
||||
Operation string
|
||||
ChannelID string
|
||||
ProxyURL string
|
||||
Model string
|
||||
VideoSeconds int
|
||||
RequestKind string
|
||||
@@ -107,6 +108,11 @@ func withProviderAnalytics(ctx context.Context, service *Service, task model.Tas
|
||||
if normalized := normalizeCapability(input.Mode); normalized != "" {
|
||||
metadata.Capability = normalized
|
||||
}
|
||||
if metadata.ChannelID != "" && service != nil {
|
||||
if ch, err := service.repo.SystemChannel(metadata.ChannelID); err == nil {
|
||||
metadata.ProxyURL = ch.ProxyURL
|
||||
}
|
||||
}
|
||||
}
|
||||
return context.WithValue(ctx, providerAnalyticsKey{}, metadata)
|
||||
}
|
||||
|
||||
@@ -257,10 +257,12 @@ func doBinaryWithConsumer(req *http.Request, onChunk func(string, []byte)) ([]by
|
||||
cacheManagementRequest := requestKind == "cache-create" || requestKind == "cache-delete"
|
||||
responseLimit := maxProviderResponseBytes
|
||||
channelID := ""
|
||||
channelProxyURL := ""
|
||||
if metadata, ok := req.Context().Value(providerAnalyticsKey{}).(providerAnalyticsContext); ok && metadata.Service != nil {
|
||||
runtimeService = metadata.Service
|
||||
coordinator = metadata.Service.coordinator
|
||||
channelID = metadata.ChannelID
|
||||
channelProxyURL = metadata.ProxyURL
|
||||
policy, err := metadata.Service.RuntimePolicy()
|
||||
if err != nil {
|
||||
err = fmt.Errorf("读取生成资源限制失败:%w", err)
|
||||
@@ -302,7 +304,7 @@ func doBinaryWithConsumer(req *http.Request, onChunk func(string, []byte)) ([]by
|
||||
return nil, "", err
|
||||
}
|
||||
ApplyDefaultOutboundHeaders(req)
|
||||
client := OutboundHTTPClient(requestTimeout)
|
||||
client := OutboundHTTPClientWithProxy(requestTimeout, channelProxyURL)
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
err = providerConnectionError(err)
|
||||
|
||||
@@ -130,7 +130,18 @@ func (s *Service) downloadTaskMedia(ctx context.Context, config providerConfig,
|
||||
ApplyOutboundHeaders(req, config.Headers)
|
||||
}
|
||||
ApplyDefaultOutboundHeaders(req)
|
||||
response, err := OutboundHTTPClient(3 * time.Minute).Do(req)
|
||||
// 结果文件可能托管在渠道同域(sameProviderOrigin 时还带渠道鉴权),
|
||||
// 渠道配置了出站代理时下载必须走同一代理,否则配代理渠道的结果无法取回。
|
||||
proxyURL := ""
|
||||
if metadata, ok := ctx.Value(providerAnalyticsKey{}).(providerAnalyticsContext); ok {
|
||||
proxyURL = metadata.ProxyURL
|
||||
}
|
||||
if strings.TrimSpace(proxyURL) == "" && strings.TrimSpace(config.ChannelID) != "" {
|
||||
if ch, err := s.repo.SystemChannel(config.ChannelID); err == nil {
|
||||
proxyURL = ch.ProxyURL
|
||||
}
|
||||
}
|
||||
response, err := OutboundHTTPClientWithProxy(3*time.Minute, proxyURL).Do(req)
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user