Merge remote-tracking branch 'upstream/main' into refactor-main

2025-11-17 05:33:42 +08:00 · 2023-07-30 00:06:16 +08:00
parent 101c3d83cd ec88c0c240
commit 8db2c0173b
20 changed files with 894 additions and 110 deletions
--- a/web/src/components/ChannelsTable.js
+++ b/web/src/components/ChannelsTable.js
@@ -363,9 +363,12 @@ const ChannelsTable = () => {
                  </Table.Cell>
                  <Table.Cell>
                    <Popup
-                      content={channel.balance_updated_time ? renderTimestamp(channel.balance_updated_time) : '未更新'}
-                      key={channel.id}
-                      trigger={renderBalance(channel.type, channel.balance)}
+                      trigger={<span onClick={() => {
+                        updateChannelBalance(channel.id, channel.name, idx);
+                      }} style={{ cursor: 'pointer' }}>
+                      {renderBalance(channel.type, channel.balance)}
+                    </span>}
+                      content="点击更新"
                      basic
                    />
                  </Table.Cell>
@@ -380,16 +383,16 @@ const ChannelsTable = () => {
                      >
                        测试
                      </Button>
-                      <Button
-                        size={'small'}
-                        positive
-                        loading={updatingBalance}
-                        onClick={() => {
-                          updateChannelBalance(channel.id, channel.name, idx);
-                        }}
-                      >
-                        更新余额
-                      </Button>
+                      {/*<Button*/}
+                      {/*  size={'small'}*/}
+                      {/*  positive*/}
+                      {/*  loading={updatingBalance}*/}
+                      {/*  onClick={() => {*/}
+                      {/*    updateChannelBalance(channel.id, channel.name, idx);*/}
+                      {/*  }}*/}
+                      {/*>*/}
+                      {/*  更新余额*/}
+                      {/*</Button>*/}
                      <Popup
                        trigger={
                          <Button size='small' negative>
--- a/web/src/components/UsersTable.js
+++ b/web/src/components/UsersTable.js
@@ -227,7 +227,7 @@ const UsersTable = () => {
                      content={user.email ? user.email : '未绑定邮箱地址'}
                      key={user.username}
                      header={user.display_name ? user.display_name : user.username}
-                      trigger={<span>{renderText(user.username, 10)}</span>}
+                      trigger={<span>{renderText(user.username, 15)}</span>}
                      hoverable
                    />
                  </Table.Cell>
--- a/web/src/constants/channel.constants.js
+++ b/web/src/constants/channel.constants.js
@@ -4,6 +4,8 @@ export const CHANNEL_OPTIONS = [
  { key: 3, text: 'Azure OpenAI', value: 3, color: 'olive' },
  { key: 11, text: 'Google PaLM2', value: 11, 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: 8, text: '自定义渠道', value: 8, color: 'pink' },
  { key: 2, text: '代理：API2D', value: 2, color: 'blue' },
--- a/web/src/constants/toast.constants.js
+++ b/web/src/constants/toast.constants.js
@@ -1,5 +1,5 @@
 export const toastConstants = {
-  SUCCESS_TIMEOUT: 500,
+  SUCCESS_TIMEOUT: 1500,
  INFO_TIMEOUT: 3000,
  ERROR_TIMEOUT: 5000,
  WARNING_TIMEOUT: 10000,
--- a/web/src/pages/Channel/EditChannel.js
+++ b/web/src/pages/Channel/EditChannel.js
@@ -37,6 +37,30 @@ const EditChannel = () => {
  const [customModel, setCustomModel] = useState('');
  const handleInputChange = (e, { name, value }) => {
    setInputs((inputs) => ({ ...inputs, [name]: value }));
+    if (name === 'type' && inputs.models.length === 0) {
+      let localModels = [];
+      switch (value) {
+        case 14:
+          localModels = ['claude-instant-1', 'claude-2'];
+          break;
+        case 11:
+          localModels = ['PaLM-2'];
+          break;
+        case 15:
+          localModels = ['ERNIE-Bot', 'ERNIE-Bot-turbo', 'Embedding-V1'];
+          break;
+        case 17:
+          localModels = ['qwen-v1', 'qwen-plus-v1'];
+          break;
+        case 16:
+          localModels = ['chatglm_pro', 'chatglm_std', 'chatglm_lite'];
+          break;
+        case 18:
+          localModels = ['SparkDesk'];
+          break;
+      }
+      setInputs((inputs) => ({ ...inputs, models: localModels }));
+    }
  };

  const loadChannel = async () => {
@@ -142,7 +166,10 @@ const EditChannel = () => {
      localInputs.base_url = localInputs.base_url.slice(0, localInputs.base_url.length - 1);
    }
    if (localInputs.type === 3 && localInputs.other === '') {
-      localInputs.other = '2023-03-15-preview';
+      localInputs.other = '2023-06-01-preview';
+    }
+    if (localInputs.model_mapping === '') {
+      localInputs.model_mapping = '{}';
    }
    let res;
    localInputs.models = localInputs.models.join(',');
@@ -202,7 +229,7 @@ const EditChannel = () => {
                  <Form.Input
                    label='默认 API 版本'
                    name='other'
-                    placeholder={'请输入默认 API 版本，例如：2023-03-15-preview，该配置可以被实际的请求查询参数所覆盖'}
+                    placeholder={'请输入默认 API 版本，例如：2023-06-01-preview，该配置可以被实际的请求查询参数所覆盖'}
                    onChange={handleInputChange}
                    value={inputs.other}
                    autoComplete='new-password'
@@ -281,7 +308,7 @@ const EditChannel = () => {
            <Input
              action={
                <Button type={'button'} onClick={() => {
-                  if (customModel.trim() === "") return;
+                  if (customModel.trim() === '') return;
                  if (inputs.models.includes(customModel)) return;
                  let localModels = [...inputs.models];
                  localModels.push(customModel);
@@ -289,7 +316,7 @@ const EditChannel = () => {
                  localModelOptions.push({
                    key: customModel,
                    text: customModel,
-                    value: customModel,
+                    value: customModel
                  });
                  setModelOptions(modelOptions => {
                    return [...modelOptions, ...localModelOptions];
@@ -307,7 +334,7 @@ const EditChannel = () => {
          </div>
          <Form.Field>
            <Form.TextArea
-              label='模型映射'
+              label='模型重定向'
              placeholder={`此项可选，用于修改请求体中的模型名称，为一个 JSON 字符串，键为请求中模型名称，值为要替换的模型名称，例如：\n${JSON.stringify(MODEL_MAPPING_EXAMPLE, null, 2)}`}
              name='model_mapping'
              onChange={handleInputChange}
@@ -353,7 +380,7 @@ const EditChannel = () => {
                label='密钥'
                name='key'
                required
-                placeholder={inputs.type === 15 ? "请输入 access token，当前版本暂不支持自动刷新，请每 30 天更新一次" : '请输入渠道对应的鉴权密钥'}
+                placeholder={inputs.type === 15 ? '请输入 access token，当前版本暂不支持自动刷新，请每 30 天更新一次' : (inputs.type === 18 ? '按照如下格式输入：APPID|APISecret|APIKey' : '请输入渠道对应的鉴权密钥')}
                onChange={handleInputChange}
                value={inputs.key}
                autoComplete='new-password'
@@ -384,7 +411,7 @@ const EditChannel = () => {
              </Form.Field>
            )
          }
-          <Button type={isEdit ? "button" : "submit"} positive onClick={submit}>提交</Button>
+          <Button type={isEdit ? 'button' : 'submit'} positive onClick={submit}>提交</Button>
        </Form>
      </Segment>
    </>
--- a/web/src/pages/Token/EditToken.js
+++ b/web/src/pages/Token/EditToken.js
@@ -83,7 +83,7 @@ const EditToken = () => {
      if (isEdit) {
        showSuccess('令牌更新成功！');
      } else {
-        showSuccess('令牌创建成功！');
+        showSuccess('令牌创建成功，请在列表页面点击复制获取令牌！');
        setInputs(originInputs);
      }
    } else {