From b2ccb55abfcfd924968cac928bd2879041f95d3a Mon Sep 17 00:00:00 2001
From: terwer <youweics@163.com>
Date: Wed, 11 Oct 2023 11:25:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=9B=E4=B8=80=E6=AD=A5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20AI=20=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../publish/form/CommonCategories.vue         | 14 ++++-------
 .../publish/form/PublishCategories.vue        | 16 +++++--------
 .../publish/form/PublishDescription.vue       |  9 +++-----
 src/components/publish/form/PublishTags.vue   |  9 +++-----
 src/components/publish/form/PublishTitle.vue  | 23 ++++++++-----------
 src/composables/useChatGPT.ts                 | 16 ++++++++++++-
 6 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/src/components/publish/form/CommonCategories.vue b/src/components/publish/form/CommonCategories.vue
index 3555417f..eaae37e2 100644
--- a/src/components/publish/form/CommonCategories.vue
+++ b/src/components/publish/form/CommonCategories.vue
@@ -26,13 +26,11 @@
 <script setup lang="ts">
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { useVueI18n } from "~/src/composables/useVueI18n.ts"
-import { nextTick, reactive, ref } from "vue"
-import { watch } from "vue"
+import { nextTick, reactive, ref, watch } from "vue"
 import { CategoryAIResult, prompt } from "~/src/utils/ai/prompt.ts"
 import { useChatGPT } from "~/src/composables/useChatGPT.ts"
-import { HtmlUtil, JsonUtil, StrUtil } from "zhi-common"
+import { JsonUtil, StrUtil } from "zhi-common"
 import { ElMessage } from "element-plus"
-import { AiConstants } from "~/src/utils/ai/AiConstants.ts"
 
 const logger = createAppLogger("common-categories")
 const { t } = useVueI18n()
@@ -113,12 +111,10 @@ const cateMethods = {
       formData.isLoading = true
 
       const inputWord = prompt.categoryPrompt.content
-      const { chat } = useChatGPT()
+      const { chat, getChatInput } = useChatGPT()
       const chatText = await chat(inputWord, {
         name: "categories",
-        systemMessage:
-          formData.md?.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH) ??
-          HtmlUtil.parseHtml(formData.html, AiConstants.MAX_INPUT_TOKEN_LENGTH, true),
+        systemMessage: getChatInput(formData?.md, formData.html),
       })
       if (StrUtil.isEmptyString(chatText)) {
         ElMessage.error("请求错误，请在偏好设置配置请求地址和ChatGPT key！")
@@ -215,4 +211,4 @@ const cateMethods = {
 
 .recomm-cate
   margin 0 10px
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/publish/form/PublishCategories.vue b/src/components/publish/form/PublishCategories.vue
index a1f6d411..628b80c3 100644
--- a/src/components/publish/form/PublishCategories.vue
+++ b/src/components/publish/form/PublishCategories.vue
@@ -25,16 +25,14 @@
 
 <script setup lang="ts">
 import { CategoryTypeEnum } from "zhi-blog-api"
-import { reactive, toRaw } from "vue"
+import { reactive, toRaw, watch } from "vue"
 import { ICategoryConfig, IMultiCategoriesConfig } from "~/src/types/ICategoryConfig.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { useVueI18n } from "~/src/composables/useVueI18n.ts"
-import { watch } from "vue"
-import { CategoryAIResult, prompt, TagAIResult } from "~/src/utils/ai/prompt.ts"
+import { CategoryAIResult, prompt } from "~/src/utils/ai/prompt.ts"
 import { useChatGPT } from "~/src/composables/useChatGPT.ts"
-import { HtmlUtil, JsonUtil, StrUtil } from "zhi-common"
+import { JsonUtil, StrUtil } from "zhi-common"
 import { ElMessage } from "element-plus"
-import { AiConstants } from "~/src/utils/ai/AiConstants.ts"
 
 const logger = createAppLogger("publish-categories")
 const { t } = useVueI18n()
@@ -108,12 +106,10 @@ const fetchCate = async () => {
     formData.isLoading = true
 
     const inputWord = prompt.categoryPrompt.content
-    const { chat } = useChatGPT()
+    const { chat, getChatInput } = useChatGPT()
     const chatText = await chat(inputWord, {
       name: "categories",
-      systemMessage:
-        formData.md?.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH) ??
-        HtmlUtil.parseHtml(formData.html, AiConstants.MAX_INPUT_TOKEN_LENGTH, true),
+      systemMessage: getChatInput(formData?.md, formData.html),
     })
     if (StrUtil.isEmptyString(chatText)) {
       ElMessage.error("请求错误，请在偏好设置配置请求地址和ChatGPT key！")
@@ -184,4 +180,4 @@ const fetchCate = async () => {
 
 .recomm-cate
   margin 0 10px
-</style>
+</style>
\ No newline at end of file
diff --git a/src/components/publish/form/PublishDescription.vue b/src/components/publish/form/PublishDescription.vue
index ce2deee3..7664a0b0 100644
--- a/src/components/publish/form/PublishDescription.vue
+++ b/src/components/publish/form/PublishDescription.vue
@@ -28,10 +28,9 @@ import { useVueI18n } from "~/src/composables/useVueI18n.ts"
 import { reactive, watch } from "vue"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { ElMessage } from "element-plus"
-import { HtmlUtil, JsonUtil, SmartUtil, StrUtil } from "zhi-common"
+import { JsonUtil, StrUtil } from "zhi-common"
 import { prompt, ShortDescAIResult } from "~/src/utils/ai/prompt.ts"
 import { useChatGPT } from "~/src/composables/useChatGPT.ts"
-import { AiConstants } from "~/src/utils/ai/AiConstants.ts"
 
 const logger = createAppLogger("publish-description")
 const { t } = useVueI18n()
@@ -98,12 +97,10 @@ const handleMakeDesc = async () => {
   try {
     // if (formData.useAi) {
     const inputWord = prompt.shortDescPrompt.content
-    const { chat } = useChatGPT()
+    const { chat, getChatInput } = useChatGPT()
     const chatText = await chat(inputWord, {
       name: "desc",
-      systemMessage:
-        formData.md?.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH) ??
-        HtmlUtil.parseHtml(formData.html, AiConstants.MAX_INPUT_TOKEN_LENGTH, true),
+      systemMessage: getChatInput(formData?.md, formData.html),
     })
     if (StrUtil.isEmptyString(chatText)) {
       ElMessage.error("请求错误，请在偏好设置配置请求地址和ChatGPT key！")
diff --git a/src/components/publish/form/PublishTags.vue b/src/components/publish/form/PublishTags.vue
index d529eb54..e8fd8863 100644
--- a/src/components/publish/form/PublishTags.vue
+++ b/src/components/publish/form/PublishTags.vue
@@ -28,10 +28,9 @@ import { useVueI18n } from "~/src/composables/useVueI18n.ts"
 import { nextTick, reactive, ref, watch } from "vue"
 import { ElMessage } from "element-plus"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
-import { HtmlUtil, JsonUtil, StrUtil } from "zhi-common"
+import { JsonUtil, StrUtil } from "zhi-common"
 import { prompt, TagAIResult } from "~/src/utils/ai/prompt.ts"
 import { useChatGPT } from "~/src/composables/useChatGPT.ts"
-import { AiConstants } from "~/src/utils/ai/AiConstants.ts"
 
 const logger = createAppLogger("publish-tags")
 const { t } = useVueI18n()
@@ -116,12 +115,10 @@ const tagMethods = {
       formData.isTagLoading = true
 
       const inputWord = prompt.tagPrompt.content
-      const { chat } = useChatGPT()
+      const { chat, getChatInput } = useChatGPT()
       const chatText = await chat(inputWord, {
         name: "tags",
-        systemMessage:
-          formData.md?.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH) ??
-          HtmlUtil.parseHtml(formData.html, AiConstants.MAX_INPUT_TOKEN_LENGTH, true),
+        systemMessage: getChatInput(formData?.md, formData.html),
       })
       if (StrUtil.isEmptyString(chatText)) {
         ElMessage.error("请求错误，请在偏好设置配置请求地址和ChatGPT key！")
diff --git a/src/components/publish/form/PublishTitle.vue b/src/components/publish/form/PublishTitle.vue
index 1c211d8d..d372c2f8 100644
--- a/src/components/publish/form/PublishTitle.vue
+++ b/src/components/publish/form/PublishTitle.vue
@@ -26,12 +26,11 @@
 <script setup lang="ts">
 import { reactive, watch } from "vue"
 import { useVueI18n } from "~/src/composables/useVueI18n.ts"
-import { HtmlUtil, JsonUtil, StrUtil } from "zhi-common"
+import { JsonUtil, StrUtil } from "zhi-common"
 import { ElMessage } from "element-plus"
 import { useChatGPT } from "~/src/composables/useChatGPT.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
 import { prompt, TitleAIResult } from "~/src/utils/ai/prompt.ts"
-import { AiConstants } from "~/src/utils/ai/AiConstants.ts"
 
 const logger = createAppLogger("publish-title")
 const { t } = useVueI18n()
@@ -77,12 +76,12 @@ watch(
   }
 )
 
-// watch(
-//   () => props.md,
-//   (newValue) => {
-//     formData.md = newValue
-//   }
-// )
+watch(
+  () => props.md,
+  (newValue) => {
+    formData.md = newValue
+  }
+)
 
 watch(
   () => props.html,
@@ -101,13 +100,11 @@ const handleMakeTitle = async () => {
   try {
     formData.isLoading = true
     const inputWord = prompt.titlePrompt.content
-    const { chat } = useChatGPT()
-    debugger
+    const { chat, getChatInput } = useChatGPT()
+
     const chatText = await chat(inputWord, {
       name: "title",
-      systemMessage:
-        formData.md?.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH) ??
-        HtmlUtil.parseHtml(formData.html, AiConstants.MAX_INPUT_TOKEN_LENGTH, true),
+      systemMessage: getChatInput(formData?.md, formData.html),
     })
     if (StrUtil.isEmptyString(chatText)) {
       ElMessage.error("请求错误，请在偏好设置配置请求地址和ChatGPT key！")
diff --git a/src/composables/useChatGPT.ts b/src/composables/useChatGPT.ts
index 308cc73c..4aedd08f 100644
--- a/src/composables/useChatGPT.ts
+++ b/src/composables/useChatGPT.ts
@@ -24,11 +24,12 @@
  */
 
 import { usePublishPreferenceSetting } from "~/src/stores/usePublishPreferenceSetting.ts"
-import { StrUtil } from "zhi-common"
+import { HtmlUtil, StrUtil } from "zhi-common"
 import { ChatGPTAPI, ChatGPTUnofficialProxyAPI, SendMessageOptions } from "chatgpt"
 import { Utils } from "~/src/utils/utils.ts"
 import { isDev } from "~/src/utils/constants.ts"
 import { createAppLogger } from "~/src/utils/appLogger.ts"
+import { AiConstants } from "~/src/utils/ai/AiConstants.ts"
 
 /**
  * 创建一个用于与 ChatGPT 服务进行交互的钩子
@@ -96,7 +97,20 @@ const useChatGPT = () => {
     }
   }
 
+  /**
+   * 获取聊天输入
+   *
+   * @param input1 可能为空的输入1，优先级高
+   * @param input2 不为空的输入2，优先级低
+   */
+  const getChatInput = (input1: string, input2: string) => {
+    const md = input1.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH)
+    const html = HtmlUtil.parseHtml(input2, AiConstants.MAX_INPUT_TOKEN_LENGTH, true)
+    return Utils.emptyOrDefault(md, html)
+  }
+
   return {
+    getChatInput,
     chat,
   }
 }