Merge remote-tracking branch 'origin/multi_keys_channel' into alpha

# Conflicts:
#	web/src/components/table/LogsTable.js
#	web/src/i18n/locales/en.json
#	web/src/pages/Channel/EditChannel.js

web/src/pages/Channel/EditChannel.js

@@ -26,6 +26,7 @@ import {
   Form,
   Row,
   Col,
+  Upload,
 } from '@douyinfe/semi-ui';
 import { getChannelModels, copy, getChannelIcon } from '../../helpers';
 import {
@@ -35,6 +36,7 @@ import {
   IconSetting,
   IconCode,
   IconGlobe,
+  IconBolt,
 } from '@douyinfe/semi-icons';
 
 const { Text, Title } = Typography;
@@ -100,10 +102,12 @@ const EditChannel = (props) => {
     priority: 0,
     weight: 0,
     tag: '',
+    multi_key_mode: 'random',
   };
   const [batch, setBatch] = useState(false);
+  const [multiToSingle, setMultiToSingle] = useState(false);
+  const [multiKeyMode, setMultiKeyMode] = useState('random');
   const [autoBan, setAutoBan] = useState(true);
-  // const [autoBan, setAutoBan] = useState(true);
   const [inputs, setInputs] = useState(originInputs);
   const [originModelOptions, setOriginModelOptions] = useState([]);
   const [modelOptions, setModelOptions] = useState([]);
@@ -114,6 +118,10 @@ const EditChannel = (props) => {
   const [modalImageUrl, setModalImageUrl] = useState('');
   const [isModalOpenurl, setIsModalOpenurl] = useState(false);
   const formApiRef = useRef(null);
+  const [vertexKeys, setVertexKeys] = useState([]);
+  const [vertexFileList, setVertexFileList] = useState([]);
+  const vertexErroredNames = useRef(new Set()); // 避免重复报错
+  const [isMultiKeyChannel, setIsMultiKeyChannel] = useState(false);
   const getInitValues = () => ({ ...originInputs });
   const handleInputChange = (name, value) => {
     if (formApiRef.current) {
@@ -211,6 +219,19 @@ const EditChannel = (props) => {
           2,
         );
       }
+      const chInfo = data.channel_info || {};
+      const isMulti = chInfo.is_multi_key === true;
+      setIsMultiKeyChannel(isMulti);
+      if (isMulti) {
+        setBatch(true);
+        setMultiToSingle(true);
+        const modeVal = chInfo.multi_key_mode || 'random';
+        setMultiKeyMode(modeVal);
+        data.multi_key_mode = modeVal;
+      } else {
+        setBatch(false);
+        setMultiToSingle(false);
+      }
       setInputs(data);
       if (formApiRef.current) {
         formApiRef.current.setValues(data);
@@ -381,10 +402,76 @@ const EditChannel = (props) => {
     }
   }, [props.visible, channelId]);
 
+  const handleVertexUploadChange = ({ fileList }) => {
+    (async () => {
+      const validFiles = [];
+      const keys = [];
+      const errorNames = [];
+      for (const item of fileList) {
+        const fileObj = item.fileInstance;
+        if (!fileObj) continue;
+        try {
+          const txt = await fileObj.text();
+          keys.push(JSON.parse(txt));
+          validFiles.push(item); // 仅合法文件加入列表
+        } catch (err) {
+          if (!vertexErroredNames.current.has(item.name)) {
+            errorNames.push(item.name);
+            vertexErroredNames.current.add(item.name);
+          }
+        }
+      }
+
+      setVertexKeys(keys);
+      setVertexFileList(validFiles);
+      if (formApiRef.current) {
+        formApiRef.current.setValue('vertex_files', validFiles);
+      }
+      setInputs((prev) => ({ ...prev, vertex_files: validFiles }));
+
+      if (errorNames.length > 0) {
+        showError(t('以下文件解析失败，已忽略：{{list}}', { list: errorNames.join(', ') }));
+      }
+    })();
+  };
+
   const submit = async () => {
     const formValues = formApiRef.current ? formApiRef.current.getValues() : {};
     let localInputs = { ...formValues };
 
+    if (localInputs.type === 41) {
+      let keys = vertexKeys;
+      if (keys.length === 0) {
+        // 确保提交时也能解析，避免因异步延迟导致 keys 为空
+        try {
+          const parsed = await Promise.all(
+            vertexFileList.map(async (item) => {
+              const fileObj = item.fileInstance;
+              if (!fileObj) return null;
+              const txt = await fileObj.text();
+              return JSON.parse(txt);
+            })
+          );
+          keys = parsed.filter(Boolean);
+        } catch (err) {
+          showError(t('解析密钥文件失败: {{msg}}', { msg: err.message }));
+          return;
+        }
+      }
+
+      if (keys.length === 0) {
+        showInfo(t('请上传密钥文件！'));
+        return;
+      }
+
+      if (batch) {
+        localInputs.key = JSON.stringify(keys);
+      } else {
+        localInputs.key = JSON.stringify(keys[0]);
+      }
+    }
+    delete localInputs.vertex_files;
+
     if (!isEdit && (!localInputs.name || !localInputs.key)) {
       showInfo(t('请填写渠道名称和渠道密钥！'));
       return;
@@ -410,13 +497,23 @@ const EditChannel = (props) => {
     localInputs.auto_ban = localInputs.auto_ban ? 1 : 0;
     localInputs.models = localInputs.models.join(',');
     localInputs.group = (localInputs.groups || []).join(',');
+
+    let mode = 'single';
+    if (batch) {
+      mode = multiToSingle ? 'multi_to_single' : 'batch';
+    }
+
     if (isEdit) {
       res = await API.put(`/api/channel/`, {
         ...localInputs,
         id: parseInt(channelId),
       });
     } else {
-      res = await API.post(`/api/channel/`, localInputs);
+      res = await API.post(`/api/channel/`, {
+        mode: mode,
+        multi_key_mode: mode === 'multi_to_single' ? multiKeyMode : undefined,
+        channel: localInputs,
+      });
     }
     const { success, message } = res.data;
     if (success) {
@@ -469,9 +566,31 @@ const EditChannel = (props) => {
     }
   };
 
-  const batchAllowed = !isEdit && inputs.type !== 41;
+  const batchAllowed = !isEdit || isMultiKeyChannel;
   const batchExtra = batchAllowed ? (
-    <Checkbox checked={batch} onChange={() => setBatch(!batch)}>{t('批量创建')}</Checkbox>
+    <Space>
+      <Checkbox disabled={isEdit} checked={batch} onChange={() => {
+        setBatch(!batch);
+        if (batch) {
+          setMultiToSingle(false);
+          setMultiKeyMode('random');
+        }
+      }}>{t('批量创建')}</Checkbox>
+      {batch && (
+        <Checkbox disabled={isEdit} checked={multiToSingle} onChange={() => {
+          setMultiToSingle(prev => !prev);
+          setInputs(prev => {
+            const newInputs = { ...prev };
+            if (!multiToSingle) {
+              newInputs.multi_key_mode = multiKeyMode;
+            } else {
+              delete newInputs.multi_key_mode;
+            }
+            return newInputs;
+          });
+        }}>{t('密钥聚合模式')}</Checkbox>
+      )}
+    </Space>
   ) : null;
 
   const channelOptionList = useMemo(
@@ -571,52 +690,93 @@ const EditChannel = (props) => {
                   />
 
                   {batch ? (
-                    <Form.TextArea
-                      field='key'
-                      label={t('密钥')}
-                      placeholder={t('请输入密钥，一行一个')}
-                      rules={isEdit ? [] : [{ required: true, message: t('请输入密钥') }]}
-                      autosize={{ minRows: 6, maxRows: 6 }}
-                      autoComplete='new-password'
-                      onChange={(value) => handleInputChange('key', value)}
-                      extraText={batchExtra}
-                    />
+                    inputs.type === 41 ? (
+                      <Form.Upload
+                        field='vertex_files'
+                        label={t('密钥文件 (.json)')}
+                        accept='.json'
+                        multiple
+                        draggable
+                        dragIcon={<IconBolt />}
+                        dragMainText={t('点击上传文件或拖拽文件到这里')}
+                        dragSubText={t('仅支持 JSON 文件，支持多文件')}
+                        style={{ marginTop: 10 }}
+                        uploadTrigger='custom'
+                        beforeUpload={() => false}
+                        onChange={handleVertexUploadChange}
+                        fileList={vertexFileList}
+                        rules={isEdit ? [] : [{ required: true, message: t('请上传密钥文件') }]}
+                        extraText={batchExtra}
+                      />
+                    ) : (
+                      <Form.TextArea
+                        field='key'
+                        label={t('密钥')}
+                        placeholder={t('请输入密钥，一行一个')}
+                        rules={isEdit ? [] : [{ required: true, message: t('请输入密钥') }]}
+                        autosize
+                        autoComplete='new-password'
+                        onChange={(value) => handleInputChange('key', value)}
+                        extraText={batchExtra}
+                        showClear
+                      />
+                    )
                   ) : (
                     <>
                       {inputs.type === 41 ? (
-                        <Form.TextArea
-                          field='key'
-                          label={t('密钥')}
-                          placeholder={
-                            '{\n' +
-                            '  "type": "service_account",\n' +
-                            '  "project_id": "abc-bcd-123-456",\n' +
-                            '  "private_key_id": "123xxxxx456",\n' +
-                            '  "private_key": "-----BEGIN PRIVATE KEY-----xxxx\n' +
-                            '  "client_email": "xxx@developer.gserviceaccount.com",\n' +
-                            '  "client_id": "111222333",\n' +
-                            '  "auth_uri": "https://accounts.google.com/o/oauth2/auth",\n' +
-                            '  "token_uri": "https://oauth2.googleapis.com/token",\n' +
-                            '  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",\n' +
-                            '  "client_x509_cert_url": "https://xxxxx.gserviceaccount.com",\n' +
-                            '  "universe_domain": "googleapis.com"\n' +
-                            '}'
-                          }
-                          rules={isEdit ? [] : [{ required: true, message: t('请输入密钥') }]}
-                          autosize={{ minRows: 10 }}
-                          autoComplete='new-password'
-                          onChange={(value) => handleInputChange('key', value)}
+                        <Form.Upload
+                          field='vertex_files'
+                          label={t('密钥文件 (.json)')}
+                          accept='.json'
+                          draggable
+                          dragIcon={<IconBolt />}
+                          dragMainText={t('点击上传文件或拖拽文件到这里')}
+                          dragSubText={t('仅支持 JSON 文件')}
+                          style={{ marginTop: 10 }}
+                          uploadTrigger='custom'
+                          beforeUpload={() => false}
+                          onChange={handleVertexUploadChange}
+                          fileList={vertexFileList}
+                          rules={isEdit ? [] : [{ required: true, message: t('请上传密钥文件') }]}
                           extraText={batchExtra}
                         />
                       ) : (
                         <Form.Input
                           field='key'
-                          label={t('密钥')}
+                          label={isEdit ? t('密钥（编辑模式下，保存的密钥不会显示）') : t('密钥')}
                           placeholder={t(type2secretPrompt(inputs.type))}
                           rules={isEdit ? [] : [{ required: true, message: t('请输入密钥') }]}
                           autoComplete='new-password'
                           onChange={(value) => handleInputChange('key', value)}
                           extraText={batchExtra}
+                          showClear
+                        />
+                      )}
+                    </>
+                  )}
+
+                  {batch && multiToSingle && (
+                    <>
+                      <Form.Select
+                        field='multi_key_mode'
+                        label={t('密钥聚合模式')}
+                        placeholder={t('请选择多密钥使用策略')}
+                        optionList={[
+                          { label: t('随机'), value: 'random' },
+                          { label: t('轮询'), value: 'polling' },
+                        ]}
+                        style={{ width: '100%' }}
+                        value={inputs.multi_key_mode || 'random'}
+                        onChange={(value) => {
+                          setMultiKeyMode(value);
+                          handleInputChange('multi_key_mode', value);
+                        }}
+                      />
+                      {inputs.multi_key_mode === 'polling' && (
+                        <Banner
+                          type='warning'
+                          description={t('轮询模式必须搭配Redis和内存缓存功能使用，否则性能将大幅降低，并且无法实现轮询功能')}
+                          className='!rounded-lg mt-2'
                         />
                       )}
                     </>
@@ -639,8 +799,9 @@ const EditChannel = (props) => {
                       placeholder={t(
                         '请输入部署地区，例如：us-central1\n支持使用模型映射格式\n{\n    "default": "us-central1",\n    "claude-3-5-sonnet-20240620": "europe-west1"\n}'
                       )}
-                      autosize={{ minRows: 2 }}
+                      autosize
                       onChange={(value) => handleInputChange('other', value)}
+                      rules={[{ required: true, message: t('请填写部署地区') }]}
                       extraText={
                         <Text
                           className="!text-semi-color-primary cursor-pointer"
@@ -649,6 +810,7 @@ const EditChannel = (props) => {
                           {t('填入模板')}
                         </Text>
                       }
+                      showClear
                     />
                   )}