fix: 重新获取询问

huangzonggui · Mar 29, 2023 · dc144a6 · dc144a6
1 parent feea637
commit dc144a6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
  },
  "package": {
  "productName": "ChatGPT-Tauri-App",
- "version": "0.1.4"
+ "version": "0.1.0"
  },
  "tauri": {
  "allowlist": {

diff --git a/src/components/common/Setting/User.vue b/src/components/common/Setting/User.vue
@@ -1,7 +1,7 @@
 <script setup lang='ts'>
 import { computed, ref } from 'vue'
 import type { FormInst, FormItemRule, FormRules } from 'naive-ui'
-import { NButton, NForm, NFormItem, NInput, NRadio, NRadioGroup, NSelect, useMessage } from 'naive-ui'
+import { NButton, NForm, NFormItem, NInput, NRadio, NRadioGroup, NSelect, NTooltip, useMessage } from 'naive-ui'
 import { useUserStore } from '@/store'
 import { t } from '@/locales'
 import { genOptionByList } from '@/utils/functions'
@@ -124,24 +124,30 @@ function saveUserInfo() {
  <NInput v-model:value="model.name" :placeholder="$t('setting.namePlaceholder')" />
  </NFormItem>
  <NFormItem path="type" label="访问方式">
- <NRadioGroup v-model:value="model.accessType">
- <NRadio value="0">
- API key
- </NRadio>
- <NRadio value="1">
- Access Token
- </NRadio>
- </NRadioGroup>
+ <NTooltip trigger="hover">
+ <template #trigger>
+ <NRadioGroup v-model:value="model.accessType">
+ <NRadio value="0">
+ API key
+ </NRadio>
+ <NRadio value="1">
+ Access Token
+ </NRadio>
+ </NRadioGroup>
+ </template>
+ API Key Host 要修改为官方API https://api.openai.com/v1/chat/completions;
+ Access Token 要修改为代理 https://bypass.duti.tech/api/conversation;
+ </NTooltip>
+ </NFormItem>
+ <NFormItem path="host" label="Host">
+ <NSelect v-model:value="model.host" placeholder="Select" :options="genOptionByList(model.hostList)" />
  </NFormItem>
  <NFormItem path="apiKey" label="Openai API Key">
  <NSelect v-model:value="model.apiKey" placeholder="Select" :options="genOptionByList(model.apiKeyList)" />
  </NFormItem>
  <NFormItem path="accessToken" label="Access Token">
  <NSelect v-model:value="model.accessToken" placeholder="Select" :options="genOptionByList(model.accessTokenList)" />
  </NFormItem>
- <NFormItem path="host" label="Host">
- <NSelect v-model:value="model.host" placeholder="Select" :options="genOptionByList(model.hostList)" />
- </NFormItem>
  <NFormItem path="modelName" label="Model Name">
  <NSelect v-model:value="model.modelName" placeholder="Select" :options="models" />
  </NFormItem>

diff --git a/src/views/chat/index.vue b/src/views/chat/index.vue
@@ -168,14 +168,14 @@ async function onRegenerate(index: number) {
  if (loading.value)
  return
 
- const { requestOptions } = dataSources.value[index]
+ const { requestOptions } = dataSources.value[index - 1]
  const message = requestOptions?.prompt ?? ''
  let options: Chat.ConversationRequest = {}
 
  if (requestOptions.options)
  options = { ...requestOptions.options }
 
- const messages = await buildRequestMessages(+uuid, index)
+ const messages = await buildRequestMessages(+uuid, index - 1)
  if (!messages || messages.length === 0)
  return