feat: 增加重置模型倍率功能 (close #62)

web/src/helpers/utils.js

@@ -212,6 +212,16 @@ export const verifyJSON = (str) => {
   return true;
 };
 
+export function verifyJSONPromise(value) {
+  try {
+    JSON.parse(value);
+    return Promise.resolve();
+  } catch (e) {
+    return Promise.reject('不是合法的 JSON 字符串');
+  }
+}
+
+
 export function shouldShowPrompt(id) {
   let prompt = localStorage.getItem(`prompt-${id}`);
   return !prompt;

web/src/pages/Setting/Operation/SettingsMagnification.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useRef } from 'react';
-import { Button, Col, Form, Row, Spin } from '@douyinfe/semi-ui';
+import { Button, Col, Form, Popconfirm, Row, Space, Spin } from '@douyinfe/semi-ui';
 import {
   compareObjects,
   API,
@@ -7,6 +7,7 @@ import {
   showSuccess,
   showWarning,
   verifyJSON,
+  verifyJSONPromise
 } from '../../../helpers';
 
 export default function SettingsMagnification(props) {
@@ -15,50 +16,70 @@ export default function SettingsMagnification(props) {
     ModelPrice: '',
     ModelRatio: '',
     CompletionRatio: '',
-    GroupRatio: '',
+    GroupRatio: ''
   });
   const refForm = useRef();
   const [inputsRow, setInputsRow] = useState(inputs);
 
   async function onSubmit() {
     try {
-      await refForm.current.validate();
-      const updateArray = compareObjects(inputs, inputsRow);
-      if (!updateArray.length) return showWarning('你似乎并没有修改什么');
-      const requestQueue = updateArray.map((item) => {
-        let value = '';
-        if (typeof inputs[item.key] === 'boolean') {
-          value = String(inputs[item.key]);
-        } else {
-          value = inputs[item.key];
-        }
-        return API.put('/api/option/', {
-          key: item.key,
-          value,
-        });
-      });
-      setLoading(true);
-      Promise.all(requestQueue)
-        .then((res) => {
-          if (requestQueue.length === 1) {
-            if (res.includes(undefined)) return;
-          } else if (requestQueue.length > 1) {
-            if (res.includes(undefined))
-              return showError('部分保存失败，请重试');
+      console.log('Starting validation...');
+      await refForm.current.validate().then(() => {
+        console.log('Validation passed');
+        const updateArray = compareObjects(inputs, inputsRow);
+        if (!updateArray.length) return showWarning('你似乎并没有修改什么');
+        const requestQueue = updateArray.map((item) => {
+          let value = '';
+          if (typeof inputs[item.key] === 'boolean') {
+            value = String(inputs[item.key]);
+          } else {
+            value = inputs[item.key];
           }
-          showSuccess('保存成功');
-          props.refresh();
-        })
-        .catch(() => {
-          showError('保存失败，请重试');
-        })
-        .finally(() => {
-          setLoading(false);
+          return API.put('/api/option/', {
+            key: item.key,
+            value
+          });
         });
+        setLoading(true);
+        Promise.all(requestQueue)
+          .then((res) => {
+            if (requestQueue.length === 1) {
+              if (res.includes(undefined)) return;
+            } else if (requestQueue.length > 1) {
+              if (res.includes(undefined))
+                return showError('部分保存失败，请重试');
+            }
+            showSuccess('保存成功');
+            props.refresh();
+          })
+          .catch(() => {
+            showError('保存失败，请重试');
+          })
+          .finally(() => {
+            setLoading(false);
+          });
+      }).catch((error) => {
+        console.error('Validation failed:', error);
+        showError('请检查输入');
+      });
     } catch (error) {
       showError('请检查输入');
       console.error(error);
-    } finally {
+    }
+  }
+
+  async function resetModelRatio() {
+    try {
+      let res = await API.post(`/api/option/rest_model_ratio`);
+      // return {success, message}
+      if (res.data.success) {
+        showSuccess(res.data.message);
+        props.refresh();
+      } else {
+        showError(res.data.message);
+      }
+    } catch (error) {
+      showError(error);
     }
   }
 
@@ -73,122 +94,145 @@ export default function SettingsMagnification(props) {
     setInputsRow(structuredClone(currentInputs));
     refForm.current.setValues(currentInputs);
   }, [props.options]);
-  return (
-    <>
-      <Spin spinning={loading}>
-        <Form
-          values={inputs}
-          getFormApi={(formAPI) => (refForm.current = formAPI)}
-          style={{ marginBottom: 15 }}
-        >
-          <Form.Section text={'倍率设置'}>
-            <Row gutter={16}>
-              <Col span={16}>
-                <Form.TextArea
-                  label={'模型固定价格'}
-                  extraText={'一次调用消耗多少刀，优先级大于模型倍率'}
-                  placeholder={
-                    '为一个 JSON 文本，键为模型名称，值为一次调用消耗多少刀，比如 "gpt-4-gizmo-*": 0.1，一次消耗0.1刀'
-                  }
-                  field={'ModelPrice'}
-                  autosize={{ minRows: 6, maxRows: 12 }}
-                  trigger='blur'
-                  rules={[
-                    {
-                      validator: (rule, value) => verifyJSON(value),
-                      message: '不是合法的 JSON 字符串',
-                    },
-                  ]}
-                  onChange={(value) =>
-                    setInputs({
-                      ...inputs,
-                      ModelPrice: value,
-                    })
-                  }
-                />
-              </Col>
-            </Row>
-            <Row gutter={16}>
-              <Col span={16}>
-                <Form.TextArea
-                  label={'模型倍率'}
-                  extraText={''}
-                  placeholder={'为一个 JSON 文本，键为模型名称，值为倍率'}
-                  field={'ModelRatio'}
-                  autosize={{ minRows: 6, maxRows: 12 }}
-                  trigger='blur'
-                  rules={[
-                    {
-                      validator: (rule, value) => verifyJSON(value),
-                      message: '不是合法的 JSON 字符串',
-                    },
-                  ]}
-                  onChange={(value) =>
-                    setInputs({
-                      ...inputs,
-                      ModelRatio: value,
-                    })
-                  }
-                />
-              </Col>
-            </Row>
-            <Row gutter={16}>
-              <Col span={16}>
-                <Form.TextArea
-                  label={'模型补全倍率（仅对自定义模型有效）'}
-                  extraText={'仅对自定义模型有效'}
-                  placeholder={'为一个 JSON 文本，键为模型名称，值为倍率'}
-                  field={'CompletionRatio'}
-                  autosize={{ minRows: 6, maxRows: 12 }}
-                  trigger='blur'
-                  rules={[
-                    {
-                      validator: (rule, value) => verifyJSON(value),
-                      message: '不是合法的 JSON 字符串',
-                    },
-                  ]}
-                  onChange={(value) =>
-                    setInputs({
-                      ...inputs,
-                      CompletionRatio: value,
-                    })
-                  }
-                />
-              </Col>
-            </Row>
-            <Row gutter={16}>
-              <Col span={16}>
-                <Form.TextArea
-                  label={'分组倍率'}
-                  extraText={''}
-                  placeholder={'为一个 JSON 文本，键为分组名称，值为倍率'}
-                  field={'GroupRatio'}
-                  autosize={{ minRows: 6, maxRows: 12 }}
-                  trigger='blur'
-                  rules={[
-                    {
-                      validator: (rule, value) => verifyJSON(value),
-                      message: '不是合法的 JSON 字符串',
-                    },
-                  ]}
-                  onChange={(value) =>
-                    setInputs({
-                      ...inputs,
-                      GroupRatio: value,
-                    })
-                  }
-                />
-              </Col>
-            </Row>
 
-            <Row>
-              <Button size='large' onClick={onSubmit}>
-                保存倍率设置
-              </Button>
-            </Row>
-          </Form.Section>
-        </Form>
-      </Spin>
-    </>
+  return (
+    <Spin spinning={loading}>
+      <Form
+        values={inputs}
+        getFormApi={(formAPI) => (refForm.current = formAPI)}
+        style={{ marginBottom: 15 }}
+      >
+        <Form.Section text={'倍率设置'}>
+          <Row gutter={16}>
+            <Col span={16}>
+              <Form.TextArea
+                label={'模型固定价格'}
+                extraText={'一次调用消耗多少刀，优先级大于模型倍率'}
+                placeholder={
+                  '为一个 JSON 文本，键为模型名称，值为一次调用消耗多少刀，比如 "gpt-4-gizmo-*": 0.1，一次消耗0.1刀'
+                }
+                field={'ModelPrice'}
+                autosize={{ minRows: 6, maxRows: 12 }}
+                trigger='blur'
+                stopValidateWithError
+                rules={[
+                  {
+                    validator: (rule, value) => {
+                      return verifyJSON(value);
+                    },
+                    message: '不是合法的 JSON 字符串'
+                  }
+                ]}
+                onChange={(value) =>
+                  setInputs({
+                    ...inputs,
+                    ModelPrice: value
+                  })
+                }
+              />
+            </Col>
+          </Row>
+          <Row gutter={16}>
+            <Col span={16}>
+              <Form.TextArea
+                label={'模型倍率'}
+                extraText={''}
+                placeholder={'为一个 JSON 文本，键为模型名称，值为倍率'}
+                field={'ModelRatio'}
+                autosize={{ minRows: 6, maxRows: 12 }}
+                trigger='blur'
+                stopValidateWithError
+                rules={[
+                  {
+                    validator: (rule, value) => {
+                      return verifyJSON(value);
+                    },
+                    message: '不是合法的 JSON 字符串'
+                  }
+                ]}
+                onChange={(value) =>
+                  setInputs({
+                    ...inputs,
+                    ModelRatio: value
+                  })
+                }
+              />
+            </Col>
+          </Row>
+          <Row gutter={16}>
+            <Col span={16}>
+              <Form.TextArea
+                label={'模型补全倍率（仅对自定义模型有效）'}
+                extraText={'仅对自定义模型有效'}
+                placeholder={'为一个 JSON 文本，键为模型名称，值为倍率'}
+                field={'CompletionRatio'}
+                autosize={{ minRows: 6, maxRows: 12 }}
+                trigger='blur'
+                stopValidateWithError
+                rules={[
+                  {
+                    validator: (rule, value) => {
+                      return verifyJSON(value);
+                    },
+                    message: '不是合法的 JSON 字符串'
+                  }
+                ]}
+                onChange={(value) =>
+                  setInputs({
+                    ...inputs,
+                    CompletionRatio: value
+                  })
+                }
+              />
+            </Col>
+          </Row>
+          <Row gutter={16}>
+            <Col span={16}>
+              <Form.TextArea
+                label={'分组倍率'}
+                extraText={''}
+                placeholder={'为一个 JSON 文本，键为分组名称，值为倍率'}
+                field={'GroupRatio'}
+                autosize={{ minRows: 6, maxRows: 12 }}
+                trigger='blur'
+                stopValidateWithError
+                rules={[
+                  {
+                    validator: (rule, value) => {
+                      return verifyJSON(value);
+                    },
+                    message: '不是合法的 JSON 字符串'
+                  }
+                ]}
+                onChange={(value) =>
+                  setInputs({
+                    ...inputs,
+                    GroupRatio: value
+                  })
+                }
+              />
+            </Col>
+          </Row>
+        </Form.Section>
+      </Form>
+      <Space>
+        <Button onClick={onSubmit}>
+          保存倍率设置
+        </Button>
+        <Popconfirm
+          title='确定重置模型倍率吗？'
+          content='此修改将不可逆'
+          okType={'danger'}
+          position={'top'}
+          onConfirm={() => {
+            resetModelRatio();
+          }}
+        >
+          <Button type={'danger'}>
+            重置模型倍率
+          </Button>
+        </Popconfirm>
+      </Space>
+    </Spin>
   );
 }