chore: merge #780

terwer · Oct 11, 2023 · ad93890 · ad93890
1 parent 8d73688
commit ad93890
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 17 deletions.
diff --git a/esbuild.config.cjs b/esbuild.config.cjs
@@ -35,8 +35,8 @@ const isWindows = os.platform() === "win32"
 
 let baseDir
 if (isWatch || isServe) {
-  // baseDir = "/Users/terwer/Documents/mydocs/SiYuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
-  baseDir = "/Users/zhangyue/Documents/terwer/SiyuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
+  baseDir = "/Users/terwer/Documents/mydocs/SiYuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
+  // baseDir = "/Users/zhangyue/Documents/terwer/SiyuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
   // baseDir = "/Users/terwer/Documents/mydocs/SiYuanWorkspace/public/data/plugins/siyuan-plugin-publisher"
   if (isWindows) {
     baseDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\test\\data\\plugins\\siyuan-plugin-publisher"

diff --git a/src/components/publish/form/CommonCategories.vue b/src/components/publish/form/CommonCategories.vue
@@ -116,7 +116,9 @@ const cateMethods = {
       const { chat } = 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:
+          formData.md?.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH) ??
+          HtmlUtil.parseHtml(formData.html, AiConstants.MAX_INPUT_TOKEN_LENGTH, true),
       })
       if (StrUtil.isEmptyString(chatText)) {
         ElMessage.error("请求错误，请在偏好设置配置请求地址和ChatGPT key！")

diff --git a/src/components/publish/form/PublishCategories.vue b/src/components/publish/form/PublishCategories.vue
@@ -32,9 +32,9 @@ import { useVueI18n } from "~/src/composables/useVueI18n.ts"
 import { watch } from "vue"
 import { CategoryAIResult, prompt, TagAIResult } from "~/src/utils/ai/prompt.ts"
 import { useChatGPT } from "~/src/composables/useChatGPT.ts"
-import {HtmlUtil, JsonUtil, StrUtil} from "zhi-common"
+import { HtmlUtil, JsonUtil, StrUtil } from "zhi-common"
 import { ElMessage } from "element-plus"
-import {AiConstants} from "~/src/utils/ai/AiConstants.ts";
+import { AiConstants } from "~/src/utils/ai/AiConstants.ts"
 
 const logger = createAppLogger("publish-categories")
 const { t } = useVueI18n()
@@ -85,10 +85,10 @@ watch(
 )
 
 watch(
-    () => props.html,
-    (newValue) => {
-      formData.html = newValue
-    }
+  () => props.html,
+  (newValue) => {
+    formData.html = newValue
+  }
 )
 
 // emits
@@ -109,9 +109,11 @@ const fetchCate = async () => {
 
     const inputWord = prompt.categoryPrompt.content
     const { chat } = useChatGPT()
-    const chatText = await chat(inputWord,{
+    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:
+        formData.md?.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH) ??
+        HtmlUtil.parseHtml(formData.html, AiConstants.MAX_INPUT_TOKEN_LENGTH, true),
     })
     if (StrUtil.isEmptyString(chatText)) {
       ElMessage.error("请求错误，请在偏好设置配置请求地址和ChatGPT key！")

diff --git a/src/components/publish/form/PublishDescription.vue b/src/components/publish/form/PublishDescription.vue
@@ -101,7 +101,9 @@ const handleMakeDesc = async () => {
     const { chat } = 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:
+        formData.md?.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH) ??
+        HtmlUtil.parseHtml(formData.html, AiConstants.MAX_INPUT_TOKEN_LENGTH, true),
     })
     if (StrUtil.isEmptyString(chatText)) {
       ElMessage.error("请求错误，请在偏好设置配置请求地址和ChatGPT key！")

diff --git a/src/components/publish/form/PublishTags.vue b/src/components/publish/form/PublishTags.vue
@@ -119,7 +119,9 @@ const tagMethods = {
       const { chat } = useChatGPT()
       const chatText = await chat(inputWord, {
         name: "tags",
-        systemMessage: formData.md?.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH) ?? (formData.html, AiConstants.MAX_INPUT_TOKEN_LENGTH, true),
+        systemMessage:
+          formData.md?.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH) ??
+          HtmlUtil.parseHtml(formData.html, AiConstants.MAX_INPUT_TOKEN_LENGTH, true),
       })
       if (StrUtil.isEmptyString(chatText)) {
         ElMessage.error("请求错误，请在偏好设置配置请求地址和ChatGPT key！")

diff --git a/src/components/publish/form/PublishTitle.vue b/src/components/publish/form/PublishTitle.vue
@@ -102,9 +102,12 @@ const handleMakeTitle = async () => {
     formData.isLoading = true
     const inputWord = prompt.titlePrompt.content
     const { chat } = useChatGPT()
+    debugger
     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:
+        formData.md?.substring(0, AiConstants.MAX_INPUT_TOKEN_LENGTH) ??
+        HtmlUtil.parseHtml(formData.html, AiConstants.MAX_INPUT_TOKEN_LENGTH, true),
     })
     if (StrUtil.isEmptyString(chatText)) {
       ElMessage.error("请求错误，请在偏好设置配置请求地址和ChatGPT key！")

diff --git a/src/locales/zh_CN.ts b/src/locales/zh_CN.ts
@@ -592,7 +592,7 @@ export default {
   "main.auto.fetch.title": "自动提取标题",
   "main.auto.fetch.cate": "自动提取分类",
   "category.ai.hand": "由于各平台分类体系不一致，分类需要手动进行校准，不会自动保存",
-  "category.ai.enabled": "检测到您已经配置AI，可请前往详细模式进行操作",
+  "category.ai.enabled": "检测到您已经配置AI，可请前往详细模式进行操作。小贴士：由于网络或者其他问题，如果第一次失败生成，多试几次或许就能出结果哟~😄",
   "sys.config.ai": "AI设置",
   "config.ai.use.siyuan": "思源笔记内部，直接使用思源笔记配置，无需配置",
   "setting.blog.yamlLinkEnabled": "YAML永久链接",

diff --git a/vite.config.ts b/vite.config.ts
@@ -62,8 +62,8 @@ const isServe = process.env.IS_SERVE
 const isWatch = args.watch || args.w || false
 const isDev = isServe || isWatch || debugMode
 const isWindows = process.platform === "win32"
-// let devDistDir = "/Users/terwer/Documents/mydocs/SiYuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
-let devDistDir = "/Users/zhangyue/Documents/terwer/SiyuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
+let devDistDir = "/Users/terwer/Documents/mydocs/SiYuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
+// let devDistDir = "/Users/zhangyue/Documents/terwer/SiyuanWorkspace/test/data/plugins/siyuan-plugin-publisher"
 // let devDistDir = "/Users/terwer/Documents/mydocs/SiYuanWorkspace/public/data/plugins/siyuan-plugin-publisher"
 if (isWindows) {
   devDistDir = "C:\\Users\\terwer\\Documents\\mydocs\\SiyuanWorkspace\\test\\data\\plugins\\siyuan-plugin-publisher"