Compare commits

..

5 Commits

16 changed files with 182 additions and 80 deletions

View File

@@ -62,9 +62,7 @@ jobs:
uses: docker/build-push-action@v3 uses: docker/build-push-action@v3
with: with:
context: . context: .
platforms: ${{ contains(github.ref, 'alpha') && 'linux/amd64' || 'linux/amd64,linux/arm64' }} platforms: ${{ contains(github.ref, 'alpha') && 'linux/amd64' || 'linux/amd64' }}
push: true push: true
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
build-args: |
TARGETARCH=${{ startsWith(matrix.platform, 'linux/arm64') && 'arm64' || 'amd64' }}

View File

@@ -24,8 +24,7 @@ RUN apk add --no-cache \
ENV GO111MODULE=on \ ENV GO111MODULE=on \
CGO_ENABLED=1 \ CGO_ENABLED=1 \
GOOS=linux \ GOOS=linux
GOARCH=$TARGETARCH
WORKDIR /build WORKDIR /build

13
common/utils/array.go Normal file
View File

@@ -0,0 +1,13 @@
package utils
func DeDuplication(slice []string) []string {
m := make(map[string]bool)
for _, v := range slice {
m[v] = true
}
result := make([]string, 0, len(m))
for v := range m {
result = append(result, v)
}
return result
}

View File

@@ -2,10 +2,13 @@ package model
import ( import (
"context" "context"
"github.com/songquanpeng/one-api/common"
"gorm.io/gorm"
"sort" "sort"
"strings" "strings"
"gorm.io/gorm"
"github.com/songquanpeng/one-api/common"
"github.com/songquanpeng/one-api/common/utils"
) )
type Ability struct { type Ability struct {
@@ -49,6 +52,7 @@ func GetRandomSatisfiedChannel(group string, model string, ignoreFirstPriority b
func (channel *Channel) AddAbilities() error { func (channel *Channel) AddAbilities() error {
models_ := strings.Split(channel.Models, ",") models_ := strings.Split(channel.Models, ",")
models_ = utils.DeDuplication(models_)
groups_ := strings.Split(channel.Group, ",") groups_ := strings.Split(channel.Group, ",")
abilities := make([]Ability, 0, len(models_)) abilities := make([]Ability, 0, len(models_))
for _, model := range models_ { for _, model := range models_ {

View File

@@ -0,0 +1,30 @@
package baiduv2
// https://console.bce.baidu.com/support/?_=1692863460488&timestamp=1739074632076#/api?product=QIANFAN&project=%E5%8D%83%E5%B8%86ModelBuilder&parent=%E5%AF%B9%E8%AF%9DChat%20V2&api=v2%2Fchat%2Fcompletions&method=post
// https://cloud.baidu.com/doc/WENXINWORKSHOP/s/Fm2vrveyu#%E6%94%AF%E6%8C%81%E6%A8%A1%E5%9E%8B%E5%88%97%E8%A1%A8
var ModelList = []string{
"ernie-4.0-8k-latest",
"ernie-4.0-8k-preview",
"ernie-4.0-8k",
"ernie-4.0-turbo-8k-latest",
"ernie-4.0-turbo-8k-preview",
"ernie-4.0-turbo-8k",
"ernie-4.0-turbo-128k",
"ernie-3.5-8k-preview",
"ernie-3.5-8k",
"ernie-3.5-128k",
"ernie-speed-8k",
"ernie-speed-128k",
"ernie-speed-pro-128k",
"ernie-lite-8k",
"ernie-lite-pro-128k",
"ernie-tiny-8k",
"ernie-char-8k",
"ernie-char-fiction-8k",
"ernie-novel-8k",
"deepseek-v3",
"deepseek-r1",
"deepseek-r1-distill-qwen-32b",
"deepseek-r1-distill-qwen-14b",
}

View File

@@ -0,0 +1,17 @@
package baiduv2
import (
"fmt"
"github.com/songquanpeng/one-api/relay/meta"
"github.com/songquanpeng/one-api/relay/relaymode"
)
func GetRequestURL(meta *meta.Meta) (string, error) {
switch meta.Mode {
case relaymode.ChatCompletions:
return fmt.Sprintf("%s/v2/chat/completions", meta.BaseURL), nil
default:
}
return "", fmt.Errorf("unsupported relay mode %d for baidu v2", meta.Mode)
}

View File

@@ -8,7 +8,9 @@ import (
"strings" "strings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/relay/adaptor" "github.com/songquanpeng/one-api/relay/adaptor"
"github.com/songquanpeng/one-api/relay/adaptor/baiduv2"
"github.com/songquanpeng/one-api/relay/adaptor/doubao" "github.com/songquanpeng/one-api/relay/adaptor/doubao"
"github.com/songquanpeng/one-api/relay/adaptor/minimax" "github.com/songquanpeng/one-api/relay/adaptor/minimax"
"github.com/songquanpeng/one-api/relay/adaptor/novita" "github.com/songquanpeng/one-api/relay/adaptor/novita"
@@ -52,6 +54,8 @@ func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
return doubao.GetRequestURL(meta) return doubao.GetRequestURL(meta)
case channeltype.Novita: case channeltype.Novita:
return novita.GetRequestURL(meta) return novita.GetRequestURL(meta)
case channeltype.BaiduV2:
return baiduv2.GetRequestURL(meta)
default: default:
return GetFullRequestURL(meta.BaseURL, meta.RequestURLPath, meta.ChannelType), nil return GetFullRequestURL(meta.BaseURL, meta.RequestURLPath, meta.ChannelType), nil
} }

View File

@@ -3,6 +3,7 @@ package openai
import ( import (
"github.com/songquanpeng/one-api/relay/adaptor/ai360" "github.com/songquanpeng/one-api/relay/adaptor/ai360"
"github.com/songquanpeng/one-api/relay/adaptor/baichuan" "github.com/songquanpeng/one-api/relay/adaptor/baichuan"
"github.com/songquanpeng/one-api/relay/adaptor/baiduv2"
"github.com/songquanpeng/one-api/relay/adaptor/deepseek" "github.com/songquanpeng/one-api/relay/adaptor/deepseek"
"github.com/songquanpeng/one-api/relay/adaptor/doubao" "github.com/songquanpeng/one-api/relay/adaptor/doubao"
"github.com/songquanpeng/one-api/relay/adaptor/groq" "github.com/songquanpeng/one-api/relay/adaptor/groq"
@@ -34,6 +35,7 @@ var CompatibleChannels = []int{
channeltype.Novita, channeltype.Novita,
channeltype.SiliconFlow, channeltype.SiliconFlow,
channeltype.XAI, channeltype.XAI,
channeltype.BaiduV2,
} }
func GetCompatibleChannelMeta(channelType int) (string, []string) { func GetCompatibleChannelMeta(channelType int) (string, []string) {
@@ -68,6 +70,8 @@ func GetCompatibleChannelMeta(channelType int) (string, []string) {
return "siliconflow", siliconflow.ModelList return "siliconflow", siliconflow.ModelList
case channeltype.XAI: case channeltype.XAI:
return "xai", xai.ModelList return "xai", xai.ModelList
case channeltype.BaiduV2:
return "baiduv2", baiduv2.ModelList
default: default:
return "openai", ModelList return "openai", ModelList
} }

View File

@@ -48,5 +48,6 @@ const (
SiliconFlow SiliconFlow
XAI XAI
Replicate Replicate
BaiduV2
Dummy Dummy
) )

View File

@@ -48,6 +48,7 @@ var ChannelBaseURLs = []string{
"https://api.siliconflow.cn", // 44 "https://api.siliconflow.cn", // 44
"https://api.x.ai", // 45 "https://api.x.ai", // 45
"https://api.replicate.com/v1/models/", // 46 "https://api.replicate.com/v1/models/", // 46
"https://qianfan.baidubce.com", // 47
} }
func init() { func init() {

View File

@@ -7,7 +7,7 @@ export const CHANNEL_OPTIONS = [
{ key: 24, text: 'Google Gemini', value: 24, color: 'orange' }, { key: 24, text: 'Google Gemini', value: 24, color: 'orange' },
{ key: 28, text: 'Mistral AI', value: 28, color: 'orange' }, { key: 28, text: 'Mistral AI', value: 28, color: 'orange' },
{ key: 41, text: 'Novita', value: 41, color: 'purple' }, { key: 41, text: 'Novita', value: 41, color: 'purple' },
{key: 40, text: '火山引擎', value: 40, color: 'blue'}, {key: 40, text: '字节火山引擎', value: 40, color: 'blue'},
{ key: 15, text: '百度文心千帆', value: 15, color: 'blue' }, { key: 15, text: '百度文心千帆', value: 15, color: 'blue' },
{ key: 17, text: '阿里通义千问', value: 17, color: 'orange' }, { key: 17, text: '阿里通义千问', value: 17, color: 'orange' },
{ key: 18, text: '讯飞星火认知', value: 18, color: 'blue' }, { key: 18, text: '讯飞星火认知', value: 18, color: 'blue' },

View File

@@ -49,7 +49,7 @@ export const CHANNEL_OPTIONS = {
}, },
40: { 40: {
key: 40, key: 40,
text: '火山引擎', text: '字节火山引擎',
value: 40, value: 40,
color: 'primary' color: 'primary'
}, },

View File

@@ -1,48 +1,67 @@
export const CHANNEL_OPTIONS = [ export const CHANNEL_OPTIONS = [
{ key: 1, text: 'OpenAI', value: 1, color: 'green' }, {key: 1, text: 'OpenAI', value: 1, color: 'green'},
{ key: 14, text: 'Anthropic Claude', value: 14, color: 'black' }, {key: 14, text: 'Anthropic Claude', value: 14, color: 'black'},
{ key: 33, text: 'AWS', value: 33, color: 'black' }, {key: 33, text: 'AWS', value: 33, color: 'black'},
{ key: 3, text: 'Azure OpenAI', value: 3, color: 'olive' }, {key: 3, text: 'Azure OpenAI', value: 3, color: 'olive'},
{ key: 11, text: 'Google PaLM2', value: 11, color: 'orange' }, {key: 11, text: 'Google PaLM2', value: 11, color: 'orange'},
{ key: 24, text: 'Google Gemini', value: 24, color: 'orange' }, {key: 24, text: 'Google Gemini', value: 24, color: 'orange'},
{ key: 28, text: 'Mistral AI', value: 28, color: 'orange' }, {key: 28, text: 'Mistral AI', value: 28, color: 'orange'},
{ key: 41, text: 'Novita', value: 41, color: 'purple' }, {key: 41, text: 'Novita', value: 41, color: 'purple'},
{key: 40, text: '火山引擎', value: 40, color: 'blue'}, {
{ key: 15, text: '百度文心千帆', value: 15, color: 'blue' }, key: 40,
{ key: 17, text: '阿里通义千问', value: 17, color: 'orange' }, text: '字节火山引擎',
{ key: 18, text: '讯飞星火认知', value: 18, color: 'blue' }, value: 40,
{ key: 16, text: '智谱 ChatGLM', value: 16, color: 'violet' }, color: 'blue',
{ key: 19, text: '360 智脑', value: 19, color: 'blue' }, description: '原字节跳动豆包',
{ key: 25, text: 'Moonshot AI', value: 25, color: 'black' }, },
{ key: 23, text: '腾讯混元', value: 23, color: 'teal' }, {
{ key: 26, text: '百川大模型', value: 26, color: 'orange' }, key: 15,
{ key: 27, text: 'MiniMax', value: 27, color: 'red' }, text: '百度文心千帆',
{ key: 29, text: 'Groq', value: 29, color: 'orange' }, value: 15,
{ key: 30, text: 'Ollama', value: 30, color: 'black' }, color: 'blue',
{ key: 31, text: '零一万物', value: 31, color: 'green' }, tip: '请前往<a href="https://console.bce.baidu.com/qianfan/ais/console/applicationConsole/application/v1" target="_blank">此处</a>获取 AKAPI Key以及 SKSecret Key注意V2 版本接口请使用 <strong>百度文心千帆 V2 </strong>渠道类型',
{ key: 32, text: '阶跃星辰', value: 32, color: 'blue' }, },
{ key: 34, text: 'Coze', value: 34, color: 'blue' }, {
{ key: 35, text: 'Cohere', value: 35, color: 'blue' }, key: 47,
{ key: 36, text: 'DeepSeek', value: 36, color: 'black' }, text: '百度文心千帆 V2',
{ key: 37, text: 'Cloudflare', value: 37, color: 'orange' }, value: 47,
{ key: 38, text: 'DeepL', value: 38, color: 'black' }, color: 'blue',
{ key: 39, text: 'together.ai', value: 39, color: 'blue' }, tip: '请前往<a href="https://console.bce.baidu.com/iam/#/iam/apikey/list" target="_blank">此处</a>获取 API Key注意本渠道仅支持<a target="_blank" href="https://cloud.baidu.com/doc/WENXINWORKSHOP/s/em4tsqo3v">推理服务 V2</a>相关模型',
{ key: 42, text: 'VertexAI', value: 42, color: 'blue' }, },
{ key: 43, text: 'Proxy', value: 43, color: 'blue' }, {key: 17, text: '阿里通义千问', value: 17, color: 'orange'},
{ key: 44, text: 'SiliconFlow', value: 44, color: 'blue' }, {key: 18, text: '讯飞星火认知', value: 18, color: 'blue'},
{ key: 45, text: 'xAI', value: 45, color: 'blue' }, {key: 16, text: '智谱 ChatGLM', value: 16, color: 'violet'},
{ key: 46, text: 'Replicate', value: 46, color: 'blue' }, {key: 19, text: '360 智脑', value: 19, color: 'blue'},
{ key: 8, text: '自定义渠道', value: 8, color: 'pink' }, {key: 25, text: 'Moonshot AI', value: 25, color: 'black'},
{ key: 22, text: '知识库FastGPT', value: 22, color: 'blue' }, {key: 23, text: '腾讯混元', value: 23, color: 'teal'},
{ key: 21, text: '知识库AI Proxy', value: 21, color: 'purple' }, {key: 26, text: '百川大模型', value: 26, color: 'orange'},
{ key: 20, text: '代理OpenRouter', value: 20, color: 'black' }, {key: 27, text: 'MiniMax', value: 27, color: 'red'},
{ key: 2, text: '代理API2D', value: 2, color: 'blue' }, {key: 29, text: 'Groq', value: 29, color: 'orange'},
{ key: 5, text: '代理OpenAI-SB', value: 5, color: 'brown' }, {key: 30, text: 'Ollama', value: 30, color: 'black'},
{ key: 7, text: '代理OhMyGPT', value: 7, color: 'purple' }, {key: 31, text: '零一万物', value: 31, color: 'green'},
{ key: 10, text: '代理AI Proxy', value: 10, color: 'purple' }, {key: 32, text: '阶跃星辰', value: 32, color: 'blue'},
{ key: 4, text: '代理CloseAI', value: 4, color: 'teal' }, {key: 34, text: 'Coze', value: 34, color: 'blue'},
{ key: 6, text: '代理OpenAI Max', value: 6, color: 'violet' }, {key: 35, text: 'Cohere', value: 35, color: 'blue'},
{ key: 9, text: '代理AI.LS', value: 9, color: 'yellow' }, {key: 36, text: 'DeepSeek', value: 36, color: 'black'},
{ key: 12, text: '代理API2GPT', value: 12, color: 'blue' }, {key: 37, text: 'Cloudflare', value: 37, color: 'orange'},
{ key: 13, text: '代理AIGC2D', value: 13, color: 'purple' } {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: 44, text: 'SiliconFlow', value: 44, color: 'blue'},
{key: 45, text: 'xAI', value: 45, color: 'blue'},
{key: 46, text: 'Replicate', value: 46, 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'},
]; ];

View File

@@ -0,0 +1,13 @@
import {CHANNEL_OPTIONS} from '../constants';
let channelMap = undefined;
export function getChannelOption(channelId) {
if (channelMap === undefined) {
channelMap = {};
CHANNEL_OPTIONS.forEach((option) => {
channelMap[option.key] = option;
});
}
return channelMap[channelId];
}

View File

@@ -1,5 +1,6 @@
import { Label } from 'semantic-ui-react'; import {Label, Message} from 'semantic-ui-react';
import { useTranslation } from 'react-i18next'; import {getChannelOption} from './helper';
import React from 'react';
export function renderText(text, limit) { export function renderText(text, limit) {
if (text.length > limit) { if (text.length > limit) {
@@ -98,3 +99,15 @@ export function renderColorLabel(text) {
</Label> </Label>
); );
} }
export function renderChannelTip(channelId) {
let channel = getChannelOption(channelId);
if (channel === undefined || channel.tip === undefined) {
return <></>;
}
return (
<Message>
<div dangerouslySetInnerHTML={{__html: channel.tip}}></div>
</Message>
);
}

View File

@@ -1,25 +1,10 @@
import React, { useEffect, useState } from 'react'; import React, {useEffect, useState} from 'react';
import { useTranslation } from 'react-i18next'; import {useTranslation} from 'react-i18next';
import { import {Button, Card, Form, Input, Message,} from 'semantic-ui-react';
Button, import {useNavigate, useParams} from 'react-router-dom';
Form, import {API, copy, getChannelModels, showError, showInfo, showSuccess, verifyJSON,} from '../../helpers';
Header, import {CHANNEL_OPTIONS} from '../../constants';
Input, import {renderChannelTip} from '../../helpers/render';
Message,
Segment,
Card,
} from 'semantic-ui-react';
import { useNavigate, useParams } from 'react-router-dom';
import {
API,
copy,
getChannelModels,
showError,
showInfo,
showSuccess,
verifyJSON,
} from '../../helpers';
import { CHANNEL_OPTIONS } from '../../constants';
const MODEL_MAPPING_EXAMPLE = { const MODEL_MAPPING_EXAMPLE = {
'gpt-3.5-turbo-0301': 'gpt-3.5-turbo', 'gpt-3.5-turbo-0301': 'gpt-3.5-turbo',
@@ -310,6 +295,7 @@ const EditChannel = () => {
options={groupOptions} options={groupOptions}
/> />
</Form.Field> </Form.Field>
{renderChannelTip(inputs.type)}
{/* Azure OpenAI specific fields */} {/* Azure OpenAI specific fields */}
{inputs.type === 3 && ( {inputs.type === 3 && (