Merge branch 'main' into customer-function

2025-11-19 22:53:41 +08:00 · 2024-02-22 13:47:31 +08:00
parent c5bec16703 32387d9c20
commit b0f40b239c
133 changed files with 3279 additions and 2793 deletions
--- a/web/berry/src/constants/ChannelConstants.js
+++ b/web/berry/src/constants/ChannelConstants.js
@@ -59,6 +59,12 @@ export const CHANNEL_OPTIONS = {
    value: 19,
    color: 'default'
  },
+  25: {
+    key: 25,
+    text: 'Moonshot AI',
+    value: 19,
+    color: 'default'
+  },
  23: {
    key: 23,
    text: '腾讯混元',
--- a/web/berry/src/hooks/useRegister.js
+++ b/web/berry/src/hooks/useRegister.js
@@ -6,6 +6,10 @@ const useRegister = () => {
  const navigate = useNavigate();
  const register = async (input, turnstile) => {
    try {
+      let affCode = localStorage.getItem('aff');
+      if (affCode) {
+        input = { ...input, aff_code: affCode };
+      }
      const res = await API.post(`/api/user/register?turnstile=${turnstile}`, input);
      const { success, message } = res.data;
      if (success) {
--- a/web/berry/src/views/Channel/index.js
+++ b/web/berry/src/views/Channel/index.js
@@ -202,9 +202,7 @@ export default function ChannelPage() {
      </Stack>
      <Stack mb={5}>
        <Alert severity="info">
-          当前版本测试是通过按照 OpenAI API 格式使用 gpt-3.5-turbo
-          模型进行非流式请求实现的，因此测试报错并不一定代表通道不可用，该功能后续会修复。 另外，OpenAI 渠道已经不再支持通过 key
-          获取余额，因此余额显示为 0。对于支持的渠道类型，请点击余额进行刷新。
+          OpenAI 渠道已经不再支持通过 key 获取余额，因此余额显示为 0。对于支持的渠道类型，请点击余额进行刷新。
        </Alert>
      </Stack>
      <Card>
@@ -229,9 +227,9 @@ export default function ChannelPage() {
                <Button onClick={testAllChannels} startIcon={<IconBrandSpeedtest width={'18px'} />}>
                  测试启用渠道
                </Button>
-                <Button onClick={updateAllChannelsBalance} startIcon={<IconCoinYuan width={'18px'} />}>
-                  更新启用余额
-                </Button>
+                {/*<Button onClick={updateAllChannelsBalance} startIcon={<IconCoinYuan width={'18px'} />}>*/}
+                {/*  更新启用余额*/}
+                {/*</Button>*/}
                <Button onClick={deleteAllDisabledChannels} startIcon={<IconHttpDelete width={'18px'} />}>
                  删除禁用渠道
                </Button>
--- a/web/berry/src/views/Channel/type/Config.js
+++ b/web/berry/src/views/Channel/type/Config.js
@@ -94,7 +94,13 @@ const typeConfig = {
      other: "版本号",
    },
    input: {
-      models: ["SparkDesk"],
+      models: [
+          "SparkDesk",
+        'SparkDesk-v1.1',
+        'SparkDesk-v2.1',
+        'SparkDesk-v3.1',
+        'SparkDesk-v3.5'
+      ],
    },
    prompt: {
      key: "按照如下格式输入：APPID|APISecret|APIKey",
--- a/web/berry/src/views/Setting/component/OperationSetting.js
+++ b/web/berry/src/views/Setting/component/OperationSetting.js
@@ -27,6 +27,7 @@ const OperationSetting = () => {
    QuotaRemindThreshold: 0,
    PreConsumedQuota: 0,
    ModelRatio: "",
+    CompletionRatio: "",
    GroupRatio: "",
    TopUpLink: "",
    ChatLink: "",
@@ -52,9 +53,12 @@ const OperationSetting = () => {
    if (success) {
      let newInputs = {};
      data.forEach((item) => {
-        if (item.key === "ModelRatio" || item.key === "GroupRatio") {
+        if (item.key === "ModelRatio" || item.key === "GroupRatio" || item.key === "CompletionRatio") {
          item.value = JSON.stringify(JSON.parse(item.value), null, 2);
        }
+        if (item.value === '{}') {
+          item.value = '';
+        }
        newInputs[item.key] = item.value;
      });
      setInputs(newInputs);
@@ -133,6 +137,13 @@ const OperationSetting = () => {
          }
          await updateOption("GroupRatio", inputs.GroupRatio);
        }
+        if (originInputs['CompletionRatio'] !== inputs.CompletionRatio) {
+          if (!verifyJSON(inputs.CompletionRatio)) {
+            showError('补全倍率不是合法的 JSON 字符串');
+            return;
+          }
+          await updateOption('CompletionRatio', inputs.CompletionRatio);
+        }
        break;
      case "quota":
        if (originInputs["QuotaForNewUser"] !== inputs.QuotaForNewUser) {
@@ -500,7 +511,20 @@ const OperationSetting = () => {
              placeholder="为一个 JSON 文本，键为模型名称，值为倍率"
            />
          </FormControl>
-
+          <FormControl fullWidth>
+            <TextField
+              multiline
+              maxRows={15}
+              id="channel-CompletionRatio-label"
+              label="补全倍率"
+              value={inputs.CompletionRatio}
+              name="CompletionRatio"
+              onChange={handleInputChange}
+              aria-describedby="helper-text-channel-CompletionRatio-label"
+              minRows={5}
+              placeholder="为一个 JSON 文本，键为模型名称，值为倍率，此处的倍率设置是模型补全倍率相较于提示倍率的比例，使用该设置可强制覆盖 One API 的内部比例"
+            />
+          </FormControl>
          <FormControl fullWidth>
            <TextField
              multiline
--- a/web/berry/src/views/Token/component/TableRow.js
+++ b/web/berry/src/views/Token/component/TableRow.js
@@ -192,7 +192,7 @@ export default function TokensTableRow({ item, manageToken, handleOpenModal, set
              id={`switch-${item.id}`}
              checked={statusSwitch === 1}
              onChange={handleStatus}
-              // disabled={statusSwitch !== 1 && statusSwitch !== 2}
+            // disabled={statusSwitch !== 1 && statusSwitch !== 2}
            />
          </Tooltip>
        </TableCell>
@@ -222,7 +222,7 @@ export default function TokensTableRow({ item, manageToken, handleOpenModal, set
              </Button>
            </ButtonGroup>
            <ButtonGroup size="small" aria-label="split button">
-              <Button color="primary">聊天</Button>
+              <Button color="primary" onClick={(e) => handleCopy(COPY_OPTIONS[0], 'link')}>聊天</Button>
              <Button size="small" onClick={(e) => handleOpenMenu(e, 'link')}>
                <IconCaretDownFilled size={'16px'} />
              </Button>
--- a/web/default/src/components/ChannelsTable.js
+++ b/web/default/src/components/ChannelsTable.js
@@ -322,10 +322,7 @@ const ChannelsTable = () => {
            setShowPrompt(false);
            setPromptShown("channel-test");
          }}>
-            当前版本测试是通过按照 OpenAI API 格式使用 gpt-3.5-turbo
-            模型进行非流式请求实现的，因此测试报错并不一定代表通道不可用，该功能后续会修复。
-
-            另外，OpenAI 渠道已经不再支持通过 key 获取余额，因此余额显示为 0。对于支持的渠道类型，请点击余额进行刷新。
+            OpenAI 渠道已经不再支持通过 key 获取余额，因此余额显示为 0。对于支持的渠道类型，请点击余额进行刷新。
          </Message>
        )
      }
@@ -525,8 +522,8 @@ const ChannelsTable = () => {
              <Button size='small' loading={loading} onClick={testAllChannels}>
                测试所有渠道
              </Button>
-              <Button size='small' onClick={updateAllChannelsBalance}
-                      loading={loading || updatingBalance}>更新已启用渠道余额</Button>
+              {/*<Button size='small' onClick={updateAllChannelsBalance}*/}
+              {/*        loading={loading || updatingBalance}>更新已启用渠道余额</Button>*/}
              <Popup
                trigger={
                  <Button size='small' loading={loading}>
--- a/web/default/src/components/OperationSetting.js
+++ b/web/default/src/components/OperationSetting.js
@@ -11,6 +11,7 @@ const OperationSetting = () => {
    QuotaRemindThreshold: 0,
    PreConsumedQuota: 0,
    ModelRatio: '',
+    CompletionRatio: '',
    GroupRatio: '',
    TopUpLink: '',
    ChatLink: '',
@@ -34,9 +35,12 @@ const OperationSetting = () => {
    if (success) {
      let newInputs = {};
      data.forEach((item) => {
-        if (item.key === 'ModelRatio' || item.key === 'GroupRatio') {
+        if (item.key === 'ModelRatio' || item.key === 'GroupRatio' || item.key === 'CompletionRatio') {
          item.value = JSON.stringify(JSON.parse(item.value), null, 2);
        }
+        if (item.value === '{}') {
+          item.value = '';
+        }
        newInputs[item.key] = item.value;
      });
      setInputs(newInputs);
@@ -101,6 +105,13 @@ const OperationSetting = () => {
          }
          await updateOption('GroupRatio', inputs.GroupRatio);
        }
+        if (originInputs['CompletionRatio'] !== inputs.CompletionRatio) {
+          if (!verifyJSON(inputs.CompletionRatio)) {
+            showError('补全倍率不是合法的 JSON 字符串');
+            return;
+          }
+          await updateOption('CompletionRatio', inputs.CompletionRatio);
+        }
        break;
      case 'quota':
        if (originInputs['QuotaForNewUser'] !== inputs.QuotaForNewUser) {
@@ -271,10 +282,10 @@ const OperationSetting = () => {
              onChange={handleInputChange}
            />
            <Form.Checkbox
-                checked={inputs.AutomaticEnableChannelEnabled === 'true'}
-                label='成功时自动启用通道'
-                name='AutomaticEnableChannelEnabled'
-                onChange={handleInputChange}
+              checked={inputs.AutomaticEnableChannelEnabled === 'true'}
+              label='成功时自动启用通道'
+              name='AutomaticEnableChannelEnabled'
+              onChange={handleInputChange}
            />
          </Form.Group>
          <Form.Button onClick={() => {
@@ -344,6 +355,17 @@ const OperationSetting = () => {
              placeholder='为一个 JSON 文本，键为模型名称，值为倍率'
            />
          </Form.Group>
+          <Form.Group widths='equal'>
+            <Form.TextArea
+              label='补全倍率'
+              name='CompletionRatio'
+              onChange={handleInputChange}
+              style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
+              autoComplete='new-password'
+              value={inputs.CompletionRatio}
+              placeholder='为一个 JSON 文本，键为模型名称，值为倍率，此处的倍率设置是模型补全倍率相较于提示倍率的比例，使用该设置可强制覆盖 One API 的内部比例'
+            />
+          </Form.Group>
          <Form.Group widths='equal'>
            <Form.TextArea
              label='分组倍率'
--- a/web/default/src/constants/channel.constants.js
+++ b/web/default/src/constants/channel.constants.js
@@ -9,6 +9,7 @@ export const CHANNEL_OPTIONS = [
  { 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: 8, text: '自定义渠道', value: 8, color: 'pink' },
  { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
--- a/web/default/src/pages/Channel/EditChannel.js
+++ b/web/default/src/pages/Channel/EditChannel.js
@@ -82,7 +82,13 @@ const EditChannel = () => {
          localModels = ['chatglm_turbo', 'chatglm_pro', 'chatglm_std', 'chatglm_lite'];
          break;
        case 18:
-          localModels = ['SparkDesk'];
+          localModels = [
+            'SparkDesk',
+            'SparkDesk-v1.1',
+            'SparkDesk-v2.1',
+            'SparkDesk-v3.1',
+            'SparkDesk-v3.5'
+          ];
          break;
        case 19:
          localModels = ['360GPT_S2_V9', 'embedding-bert-512-v1', 'embedding_s1_v1', 'semantic_similarity_s1_v1'];
@@ -93,6 +99,9 @@ const EditChannel = () => {
        case 24:
          localModels = ['gemini-pro', 'gemini-pro-vision'];
          break;
+        case 25:
+          localModels = ['moonshot-v1-8k', 'moonshot-v1-32k', 'moonshot-v1-128k'];
+          break;
      }
      setInputs((inputs) => ({ ...inputs, models: localModels }));
    }