feat: when error add retry

KeJunMao · Mar 22, 2023 · 9c25674 · 9c25674
1 parent 4b22cf4
commit 9c25674
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 24 deletions.
diff --git a/components/tool/ToolDetail.vue b/components/tool/ToolDetail.vue
@@ -13,10 +13,15 @@ const {
   reset,
   toggleHistory,
   error,
+  resend,
 } = useAi(props.tool);
 
 function submit(data: any) {
-  send(data);
+  if (error.value) {
+    resend();
+  } else {
+    send(data);
+  }
 }
 function stop() {
   cancel();
@@ -60,6 +65,7 @@ defineExpose({
         @stop="stop"
         @reset="handleReset"
         :tool="tool"
+        :error="error"
       />
     </div>
   </div>

diff --git a/components/tool/ToolForms.vue b/components/tool/ToolForms.vue
@@ -8,6 +8,7 @@ export default defineComponent({
     tool: Object as PropType<ToolItem>,
     readonly: Boolean,
     loading: Boolean,
+    error: {} as any,
   },
   setup(props) {
     const { formData } = useToolFormData(props.tool!);
@@ -87,7 +88,8 @@ export default defineComponent({
         <el-button flex-1 @click="submit" type="primary" w-full>
           <div flex items-center>
             <el-icon class="text-xl! i-carbon:send-alt-filled mr-1"></el-icon>
-            <span>{{ $t("tool.forms.submit") }}</span>
+            <span v-if="!error">{{ $t("tool.forms.submit") }}</span>
+            <span v-else="">{{ $t("tool.forms.retry") }}</span>
             <div ml-4 hidden md:block>
               <kbd>Shift</kbd>
               <span>+</span>

diff --git a/composables/useAi.ts b/composables/useAi.ts
@@ -16,27 +16,8 @@ export const useAi = (_tool: MaybeRef<ToolItem>) => {
   let signal = controller.signal;
   const error = ref<any>(null);
 
-  const send = async (data: MaybeRef<Record<string, any>>) => {
+  const _send = async (messages: OpenAIMessages) => {
     error.value = null;
-    const tool = unref(_tool);
-    data = unref(data);
-    let messages = parseRoles(data, tool?.roles!);
-    if (messages.some((v) => !v.content)) {
-      ElMessage.error("Content cannot be empty");
-      return;
-    }
-    if (!tool.chat) {
-      reset();
-    }
-
-    if (!contexts.value.length) {
-      contexts.value.push(...messages);
-      create(contexts.value);
-    } else if (tool.chat) {
-      contexts.value.push(messages[messages.length - 1]);
-    }
-    messages = contexts.value;
-
     result.value = "";
     loading.value = true;
     try {
@@ -68,6 +49,33 @@ export const useAi = (_tool: MaybeRef<ToolItem>) => {
     });
     loading.value = false;
   };
+
+  const send = async (data: MaybeRef<Record<string, any>>) => {
+    const tool = unref(_tool);
+    data = unref(data);
+    let messages = parseRoles(data, tool?.roles!);
+    if (messages.some((v) => !v.content)) {
+      ElMessage.error("Content cannot be empty");
+      return;
+    }
+    if (!tool.chat) {
+      reset();
+    }
+
+    if (!contexts.value.length) {
+      contexts.value.push(...messages);
+      create(contexts.value);
+    } else if (tool.chat) {
+      contexts.value.push(messages[messages.length - 1]);
+    }
+    messages = contexts.value;
+    await _send(messages);
+  };
+
+  const resend = async () => {
+    _send(contexts.value);
+  };
+
   const cancel = () => {
     controller.abort();
     controller = new AbortController();
@@ -96,6 +104,7 @@ export const useAi = (_tool: MaybeRef<ToolItem>) => {
   };
   return {
     send,
+    resend,
     resultHtml,
     result,
     loading,

diff --git a/locales/en.json b/locales/en.json
@@ -64,5 +64,6 @@
   "app.gpt-setting-forms.default-provider": "Default Provider",
   "create.the-role.chat.label": "With Context (Chat Mode)",
   "tool.forms.stop": "Stop",
-  "tool.forms.new": "New Chat"
+  "tool.forms.new": "New Chat",
+  "tool.forms.retry": "Retry"
 }
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
@@ -61,5 +61,6 @@
   "tool.forms.stop": "停止",
   "app.gpt-setting-forms.default-provider": "默认GPT提供商",
   "create.the-role.chat.label": "关联上下文 (Chat Mode)",
-  "tool.forms.new": "新会话"
+  "tool.forms.new": "新会话",
+  "tool.forms.retry": "重试"
 }