Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add Proxy channel type and relay mode
Add the Proxy channel type and relay mode to support proxying requests to custom upstream services.
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| package proxy | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io" | ||
| "net/http" | ||
| "strings" | ||
|
|
||
| "github.com/gin-gonic/gin" | ||
| "github.com/pkg/errors" | ||
| "github.com/songquanpeng/one-api/relay/adaptor" | ||
| channelhelper "github.com/songquanpeng/one-api/relay/adaptor" | ||
| "github.com/songquanpeng/one-api/relay/meta" | ||
| "github.com/songquanpeng/one-api/relay/model" | ||
| relaymodel "github.com/songquanpeng/one-api/relay/model" | ||
| ) | ||
|
|
||
| var _ adaptor.Adaptor = new(Adaptor) | ||
|
|
||
| const channelName = "proxy" | ||
|
|
||
| type Adaptor struct{} | ||
|
|
||
| func (a *Adaptor) Init(meta *meta.Meta) { | ||
| } | ||
|
|
||
| func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.GeneralOpenAIRequest) (any, error) { | ||
| return nil, errors.New("notimplement") | ||
| } | ||
|
|
||
| func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Meta) (usage *model.Usage, err *model.ErrorWithStatusCode) { | ||
| for k, v := range resp.Header { | ||
| for _, vv := range v { | ||
| c.Writer.Header().Set(k, vv) | ||
| } | ||
| } | ||
|
|
||
| c.Writer.WriteHeader(resp.StatusCode) | ||
| if _, gerr := io.Copy(c.Writer, resp.Body); gerr != nil { | ||
| return nil, &relaymodel.ErrorWithStatusCode{ | ||
| StatusCode: http.StatusInternalServerError, | ||
| Error: relaymodel.Error{ | ||
| Message: gerr.Error(), | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| return nil, nil | ||
| } | ||
|
|
||
| func (a *Adaptor) GetModelList() (models []string) { | ||
| return nil | ||
| } | ||
|
|
||
| func (a *Adaptor) GetChannelName() string { | ||
| return channelName | ||
| } | ||
|
|
||
| // GetRequestURL remove static prefix, and return the real request url to the upstream service | ||
| func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) { | ||
| prefix := fmt.Sprintf("/v1/oneapi/proxy/%d", meta.ChannelId) | ||
| return meta.BaseURL + strings.TrimPrefix(meta.RequestURLPath, prefix), nil | ||
|
|
||
| } | ||
|
|
||
| func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, meta *meta.Meta) error { | ||
| for k, v := range c.Request.Header { | ||
| req.Header.Set(k, v[0]) | ||
| } | ||
|
|
||
| // remove unnecessary headers | ||
| req.Header.Del("Host") | ||
| req.Header.Del("Content-Length") | ||
| req.Header.Del("Accept-Encoding") | ||
| req.Header.Del("Connection") | ||
|
|
||
| // set authorization header | ||
| req.Header.Set("Authorization", meta.APIKey) | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) { | ||
| return nil, errors.Errorf("not implement") | ||
| } | ||
|
|
||
| func (a *Adaptor) DoRequest(c *gin.Context, meta *meta.Meta, requestBody io.Reader) (*http.Response, error) { | ||
| return channelhelper.DoRequestHelper(a, c, meta, requestBody) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,5 +44,6 @@ const ( | |
| Doubao | ||
| Novita | ||
| VertextAI | ||
| Proxy | ||
| Dummy | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Package controller is a package for handling the relay controller | ||
| package controller | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/http" | ||
|
|
||
| "github.com/gin-gonic/gin" | ||
| "github.com/songquanpeng/one-api/common/logger" | ||
| "github.com/songquanpeng/one-api/relay" | ||
| "github.com/songquanpeng/one-api/relay/adaptor/openai" | ||
| "github.com/songquanpeng/one-api/relay/meta" | ||
| relaymodel "github.com/songquanpeng/one-api/relay/model" | ||
| ) | ||
|
|
||
| // RelayProxyHelper is a helper function to proxy the request to the upstream service | ||
| func RelayProxyHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatusCode { | ||
| ctx := c.Request.Context() | ||
| meta := meta.GetByContext(c) | ||
|
|
||
| adaptor := relay.GetAdaptor(meta.APIType) | ||
| if adaptor == nil { | ||
| return openai.ErrorWrapper(fmt.Errorf("invalid api type: %d", meta.APIType), "invalid_api_type", http.StatusBadRequest) | ||
| } | ||
| adaptor.Init(meta) | ||
|
|
||
| resp, err := adaptor.DoRequest(c, meta, c.Request.Body) | ||
| if err != nil { | ||
| logger.Errorf(ctx, "DoRequest failed: %s", err.Error()) | ||
| return openai.ErrorWrapper(err, "do_request_failed", http.StatusInternalServerError) | ||
| } | ||
|
|
||
| // do response | ||
| _, respErr := adaptor.DoResponse(c, resp, meta) | ||
| if respErr != nil { | ||
| logger.Errorf(ctx, "respErr is not nil: %+v", respErr) | ||
| return respErr | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,45 @@ | ||
| export const CHANNEL_OPTIONS = [ | ||
| { key: 1, text: 'OpenAI', value: 1, color: 'green' }, | ||
| { key: 14, text: 'Anthropic Claude', value: 14, color: 'black' }, | ||
| { key: 33, text: 'AWS', value: 33, color: 'black' }, | ||
| { key: 3, text: 'Azure OpenAI', value: 3, color: 'olive' }, | ||
| { key: 11, text: 'Google PaLM2', value: 11, color: 'orange' }, | ||
| { key: 24, text: 'Google Gemini', value: 24, color: 'orange' }, | ||
| { key: 28, text: 'Mistral AI', value: 28, color: 'orange' }, | ||
| { key: 41, text: 'Novita', value: 41, color: 'purple' }, | ||
| { key: 40, text: '字节跳动豆包', value: 40, color: 'blue' }, | ||
| { key: 15, text: '百度文心千帆', value: 15, color: 'blue' }, | ||
| { key: 17, text: '阿里通义千问', value: 17, color: 'orange' }, | ||
| { key: 18, text: '讯飞星火认知', value: 18, color: 'blue' }, | ||
| { key: 16, text: '智谱 ChatGLM', value: 16, color: 'violet' }, | ||
| { key: 19, text: '360 智脑', value: 19, color: 'blue' }, | ||
| { key: 25, text: 'Moonshot AI', value: 25, color: 'black' }, | ||
| { key: 23, text: '腾讯混元', value: 23, color: 'teal' }, | ||
| { key: 26, text: '百川大模型', value: 26, color: 'orange' }, | ||
| { key: 27, text: 'MiniMax', value: 27, color: 'red' }, | ||
| { key: 29, text: 'Groq', value: 29, color: 'orange' }, | ||
| { key: 30, text: 'Ollama', value: 30, color: 'black' }, | ||
| { key: 31, text: '零一万物', value: 31, color: 'green' }, | ||
| { key: 32, text: '阶跃星辰', value: 32, color: 'blue' }, | ||
| { key: 34, text: 'Coze', value: 34, color: 'blue' }, | ||
| { key: 35, text: 'Cohere', value: 35, color: 'blue' }, | ||
| { key: 36, text: 'DeepSeek', value: 36, color: 'black' }, | ||
| { key: 37, text: 'Cloudflare', value: 37, color: 'orange' }, | ||
| { key: 38, text: 'DeepL', value: 38, color: 'black' }, | ||
| { key: 39, text: 'together.ai', value: 39, color: 'blue' }, | ||
| { key: 42, text: 'VertexAI', value: 42, color: 'blue' }, | ||
| { key: 43, text: 'Proxy', value: 43, color: 'blue' }, | ||
| { key: 8, text: '自定义渠道', value: 8, color: 'pink' }, | ||
| { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' }, | ||
| { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' }, | ||
| { key: 20, text: '代理：OpenRouter', value: 20, color: 'black' }, | ||
| { key: 2, text: '代理：API2D', value: 2, color: 'blue' }, | ||
| { key: 5, text: '代理：OpenAI-SB', value: 5, color: 'brown' }, | ||
| { key: 7, text: '代理：OhMyGPT', value: 7, color: 'purple' }, | ||
| { key: 10, text: '代理：AI Proxy', value: 10, color: 'purple' }, | ||
| { key: 4, text: '代理：CloseAI', value: 4, color: 'teal' }, | ||
| { key: 6, text: '代理：OpenAI Max', value: 6, color: 'violet' }, | ||
| { key: 9, text: '代理：AI.LS', value: 9, color: 'yellow' }, | ||
| { key: 12, text: '代理：API2GPT', value: 12, color: 'blue' }, | ||
| { key: 13, text: '代理：AIGC2D', value: 13, color: 'purple' } | ||
| ]; |
Oops, something went wrong.