Merge pull request #3 from songquanpeng/main

update
2025-11-17 13:43:42 +08:00 · 2024-04-30 12:42:17 +08:00
parent 0fb6b21f41 2720e1a358
commit ec98f1c1c7
100 changed files with 2568 additions and 532 deletions
--- a/web/berry/src/constants/ChannelConstants.js
+++ b/web/berry/src/constants/ChannelConstants.js
@@ -11,6 +11,12 @@ export const CHANNEL_OPTIONS = {
    value: 14,
    color: 'primary'
  },
+  // 33: {
+  //   key: 33,
+  //   text: 'AWS Claude',
+  //   value: 33,
+  //   color: 'primary'
+  // },
  3: {
    key: 3,
    text: 'Azure OpenAI',
@@ -113,6 +119,36 @@ export const CHANNEL_OPTIONS = {
    value: 32,
    color: 'primary'
  },
+  // 34: {
+  //   key: 34,
+  //   text: 'Coze',
+  //   value: 34,
+  //   color: 'primary'
+  // },
+  35: {
+    key: 35,
+    text: 'Cohere',
+    value: 35,
+    color: 'primary'
+  },
+  36: {
+    key: 36,
+    text: 'DeepSeek',
+    value: 36,
+    color: 'primary'
+  },
+  38: {
+    key: 38,
+    text: 'DeepL',
+    value: 38,
+    color: 'primary'
+  },
+  39: {
+    key: 39,
+    text: 'together.ai',
+    value: 39,
+    color: 'primary'
+  },
  8: {
    key: 8,
    text: '自定义渠道',
--- a/web/default/package.json
+++ b/web/default/package.json
@@ -18,7 +18,7 @@
  },
  "scripts": {
    "start": "react-scripts start",
-    "build": "react-scripts build && mv -f build ../build/default",
+    "build": "react-scripts build && rm -rf ../build/default && mv -f build ../build/default",
    "test": "react-scripts test",
    "eject": "react-scripts eject"
  },
--- a/web/default/src/components/ChannelsTable.js
+++ b/web/default/src/components/ChannelsTable.js
@@ -33,7 +33,7 @@ function renderType(type) {
    }
    type2label[0] = { value: 0, text: '未知类型', color: 'grey' };
  }
-  return <Label basic color={type2label[type]?.color}>{type2label[type]?.text}</Label>;
+  return <Label basic color={type2label[type]?.color}>{type2label[type] ? type2label[type].text : type}</Label>;
 }

 function renderBalance(type, balance) {
--- a/web/default/src/components/TokensTable.js
+++ b/web/default/src/components/TokensTable.js
@@ -13,6 +13,7 @@ const COPY_OPTIONS = [
 ];

 const OPEN_LINK_OPTIONS = [
+  { key: 'next', text: 'ChatGPT Next Web', value: 'next' },
  { key: 'ama', text: 'BotGem', value: 'ama' },
  { key: 'opencat', text: 'OpenCat', value: 'opencat' },
 ];
--- a/web/default/src/constants/channel.constants.js
+++ b/web/default/src/constants/channel.constants.js
@@ -1,34 +1,41 @@
 export const CHANNEL_OPTIONS = [
-  { key: 1, text: 'OpenAI', value: 1, color: 'green' },
-  { key: 14, text: 'Anthropic Claude', value: 14, 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: 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: 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' }
-];
+    {key: 1, text: 'OpenAI', value: 1, color: 'green'},
+    {key: 14, text: 'Anthropic Claude', value: 14, color: 'black'},
+    {key: 33, text: 'AWS Claude', 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: 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: 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'}
+];
--- a/web/default/src/pages/Channel/EditChannel.js
+++ b/web/default/src/pages/Channel/EditChannel.js
@@ -54,6 +54,12 @@ const EditChannel = () => {
  const [basicModels, setBasicModels] = useState([]);
  const [fullModels, setFullModels] = useState([]);
  const [customModel, setCustomModel] = useState('');
+  const [config, setConfig] = useState({
+    region: '',
+    sk: '',
+    ak: '',
+    user_id: ''
+  });
  const handleInputChange = (e, { name, value }) => {
    setInputs((inputs) => ({ ...inputs, [name]: value }));
    if (name === 'type') {
@@ -65,6 +71,10 @@ const EditChannel = () => {
    }
  };

+  const handleConfigChange = (e, { name, value }) => {
+    setConfig((inputs) => ({ ...inputs, [name]: value }));
+  };
+
  const loadChannel = async () => {
    let res = await API.get(`/api/channel/${channelId}`);
    const { success, message, data } = res.data;
@@ -83,6 +93,9 @@ const EditChannel = () => {
        data.model_mapping = JSON.stringify(JSON.parse(data.model_mapping), null, 2);
      }
      setInputs(data);
+      if (data.config !== '') {
+        setConfig(JSON.parse(data.config));
+      }
      setBasicModels(getChannelModels(data.type));
    } else {
      showError(message);
@@ -144,6 +157,11 @@ const EditChannel = () => {
  }, []);

  const submit = async () => {
+    if (inputs.key === '') {
+      if (config.ak !== '' && config.sk !== '' && config.region !== '') {
+        inputs.key = `${config.ak}|${config.sk}|${config.region}`;
+      }
+    }
    if (!isEdit && (inputs.name === '' || inputs.key === '')) {
      showInfo('请填写渠道名称和渠道密钥！');
      return;
@@ -156,7 +174,7 @@ const EditChannel = () => {
      showInfo('模型映射必须是合法的 JSON 格式！');
      return;
    }
-    let localInputs = inputs;
+    let localInputs = {...inputs};
    if (localInputs.base_url && localInputs.base_url.endsWith('/')) {
      localInputs.base_url = localInputs.base_url.slice(0, localInputs.base_url.length - 1);
    }
@@ -169,6 +187,7 @@ const EditChannel = () => {
    let res;
    localInputs.models = localInputs.models.join(',');
    localInputs.group = localInputs.groups.join(',');
+    localInputs.config = JSON.stringify(config);
    if (isEdit) {
      res = await API.put(`/api/channel/`, { ...localInputs, id: parseInt(channelId) });
    } else {
@@ -336,6 +355,13 @@ const EditChannel = () => {
              </Form.Field>
            )
          }
+          {
+            inputs.type === 34 && (
+              <Message>
+                对于 Coze 而言，模型名称即 Bot ID，你可以添加一个前缀 `bot-`，例如：`bot-123456`。
+              </Message>
+            )
+          }
          <Form.Field>
            <Form.Dropdown
              label='模型'
@@ -345,7 +371,9 @@ const EditChannel = () => {
              fluid
              multiple
              search
-              onLabelClick={(e, { value }) => {copy(value).then()}}
+              onLabelClick={(e, { value }) => {
+                copy(value).then();
+              }}
              selection
              onChange={handleInputChange}
              value={inputs.models}
@@ -392,7 +420,52 @@ const EditChannel = () => {
            />
          </Form.Field>
          {
-            batch ? <Form.Field>
+            inputs.type === 33 && (
+              <Form.Field>
+                <Form.Input
+                  label='Region'
+                  name='region'
+                  required
+                  placeholder={'region，e.g. us-west-2'}
+                  onChange={handleConfigChange}
+                  value={config.region}
+                  autoComplete=''
+                />
+                <Form.Input
+                  label='AK'
+                  name='ak'
+                  required
+                  placeholder={'AWS IAM Access Key'}
+                  onChange={handleConfigChange}
+                  value={config.ak}
+                  autoComplete=''
+                />
+                <Form.Input
+                  label='SK'
+                  name='sk'
+                  required
+                  placeholder={'AWS IAM Secret Key'}
+                  onChange={handleConfigChange}
+                  value={config.sk}
+                  autoComplete=''
+                />
+              </Form.Field>
+            )
+          }
+          {
+            inputs.type === 34 && (
+              <Form.Input
+                label='User ID'
+                name='user_id'
+                required
+                placeholder={'生成该密钥的用户 ID'}
+                onChange={handleConfigChange}
+                value={config.user_id}
+                autoComplete=''
+              />)
+          }
+          {
+            inputs.type !== 33 && (batch ? <Form.Field>
              <Form.TextArea
                label='密钥'
                name='key'
@@ -413,10 +486,25 @@ const EditChannel = () => {
                value={inputs.key}
                autoComplete='new-password'
              />
-            </Form.Field>
+            </Form.Field>)
          }
          {
-            !isEdit && (
+            inputs.type === 37 && (
+              <Form.Field>
+                <Form.Input
+                  label='Account ID'
+                  name='user_id'
+                  required
+                  placeholder={'请输入 Account ID，例如：d8d7c61dbc334c32d3ced580e4bf42b4'}
+                  onChange={handleConfigChange}
+                  value={config.user_id}
+                  autoComplete=''
+                />
+              </Form.Field>
+            )
+          }
+          {
+            inputs.type !== 33 && !isEdit && (
              <Form.Checkbox
                checked={batch}
                label='批量创建'
@@ -426,7 +514,7 @@ const EditChannel = () => {
            )
          }
          {
-            inputs.type !== 3 && inputs.type !== 8 && inputs.type !== 22 && (
+            inputs.type !== 3 && inputs.type !== 33 && inputs.type !== 8 && inputs.type !== 22 && (
              <Form.Field>
                <Form.Input
                  label='代理'