Merge pull request #586 from Hi-Windom/huge_merge

Huge merge

.github/workflows/cd.yml

@@ -16,10 +16,10 @@ jobs:
       version: ${{ steps.version.outputs.value }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: "3.10"
       - run: pip install PyGithub
@@ -132,13 +132,13 @@ jobs:
 
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ github.workspace }}/go/src/github.com/Hi-Windom/Sillot
 
       - name: Checkout subtree PSP
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: K-Sillot/sillot-plugin-system
           path: ${{ github.workspace }}/go/src/github.com/Hi-Windom/Sillot/app/PSP
@@ -291,7 +291,7 @@ jobs:
           path: ${{ github.workspace }}/go/src/github.com/Hi-Windom/SillotAndroid
 
       - name: Checkout android repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: contains( matrix.config.goos, 'windows')
         with:
           repository: Hi-Windom/Sillot-android
@@ -333,4 +333,4 @@ jobs:
           upload_url: ${{ needs.create_release.outputs.upload_url }}
           asset_name: Sillot-${{ needs.create_release.outputs.release_version }}-debug.apk
           asset_path: ${{steps.sign_app.outputs.signedReleaseFile}}
-          asset_content_type: application/octet-stream
+          asset_content_type: application/octet-stream

.gitignore

@@ -44,4 +44,7 @@ yarn.lock
 /app/out
 /app/dist-electron
 # copy to out for sillot-bridge gitmodule
-/app/package/app
+/app/package/app
+
+# subtree
+/astro

.vscode/extensions.json

@@ -0,0 +1,28 @@
+{
+  "recommendations": [
+    "editorconfig.editorconfig",
+    "mqycn.huile8",
+    "codeinchinese.chineseinputassistant",
+    "russell.any-rule",
+    "mrcrowl.easy-less",
+    "igorsbitnev.error-gutters",
+    "usernamehw.errorlens",
+    "mkxml.vscode-filesize",
+    "mhutchie.git-graph",
+    "donjayamanne.githistory",
+    "michelemelluso.gitignore",
+    "eamodio.gitlens",
+    "ldez.ignore-files",
+    "wix.vscode-import-cost",
+    "josee9988.minifyall",
+    "christian-kohler.npm-intellisense",
+    "leizongmin.node-module-intellisense",
+    "christian-kohler.path-intellisense",
+    "rome.rome",
+    "tyriar.vscode-terminal-here",
+    "symbolk.somanyconflicts",
+    "shardulm94.trailing-spaces",
+    "xboxyan.tree-generator"
+  ],
+  "unwantedRecommendations": []
+}

app/.npmrc

@@ -1,3 +1,4 @@
 shell-emulator=true
-registry=http://mirrors.cloud.tencent.com/npm/
-# 在 Github Action 中通过 `pnpm config set registry https://registry.npmjs.org/ --location project` 改写从而避免镜像问题
+# registry=http://mirrors.cloud.tencent.com/npm/
+# 已使用 nrm 管理 npm 源  `nrm test` && `nrm use taobao` （换源后需要删除 node_modules 和 lockfile 重新安装）
+# 在 Github Action 中通过 `pnpm config set registry https://registry.npmjs.org/ --location project` 改写从而避免镜像问题

app/appearance/langs/en_US.json

@@ -295,6 +295,10 @@
   "apiModelTip": "The <code class='fn__code'>model</code> parameter passed in when requesting the API is used to control the generated text style (the Deployment ID needs to be filled in when using the Azure OpenAI service)",
   "apiMaxTokens": "Maximum number of Tokens",
   "apiMaxTokensTip": "The <code class='fn__code'>max_tokens</code> parameter passed in when requesting the API is used to control the length of the generated text",
+  "apiTemperature": "Temperature",
+  "apiTemperatureTip": "The <code class='fn__code'>temperature</code> parameter passed in when requesting the API is used to control the randomness of the generated text",
+  "apiMaxContexts": "Maximum number of contexts",
+  "apiMaxContextsTip": "The maximum number of contexts passed in when requesting the API",
   "apiBaseURL": "API Base URL",
   "apiBaseURLTip": "The base address of the request, such as <code class='fn__code'>https://api.openai.com/v1</code>",
   "apiUserAgentTip": "The user agent that initiated the request, that is, the HTTP header <code class='fn__code'>User-Agent</code>",

app/appearance/langs/es_ES.json

@@ -295,6 +295,10 @@
   "apiModelTip": "El parámetro <code class='fn__code'>model</code> pasado al solicitar la API se usa para controlar el estilo del texto generado (el ID de implementación debe completarse cuando se usa el servicio Azure OpenAI)",
   "apiMaxTokens": "Número máximo de tokens",
   "apiMaxTokensTip": "El parámetro <code class='fn__code'>max_tokens</code> que se pasa al solicitar la API se usa para controlar la longitud del texto generado",
+  "apiTemperature": "Temperatura",
+  "apiTemperatureTip": "El parámetro <code class='fn__code'>temperature</code> pasado al solicitar la API se utiliza para controlar la aleatoriedad del texto generado",
+  "apiMaxContexts": "Número máximo de contextos",
+  "apiMaxContextsTip": "El número máximo de contextos pasados ​​al solicitar la API",
   "apiBaseURL": "URL base de la API",
   "apiBaseURLTip": "La dirección base de la solicitud, como <code class='fn__code'>https://api.openai.com/v1</code>",
   "apiUserAgentTip": "El agente de usuario que inició la solicitud, es decir, el encabezado HTTP <code class='fn__code'>User-Agent</code>",

app/appearance/langs/fr_FR.json

@@ -295,6 +295,10 @@
   "apiModelTip": "Le paramètre <code class='fn__code'>model</code> transmis lors de la demande de l'API est utilisé pour contrôler le style de texte généré (l'ID de déploiement doit être renseigné lors de l'utilisation du service Azure OpenAI)",
   "apiMaxTokens": "Nombre maximum de jetons",
   "apiMaxTokensTip": "Le paramètre <code class='fn__code'>max_tokens</code> transmis lors de la demande de l'API est utilisé pour contrôler la longueur du texte généré",
+  "apiTemperature": "Température",
+  "apiTemperatureTip": "Le paramètre <code class='fn__code'>temperature</code> transmis lors de la requête à l'API est utilisé pour contrôler le caractère aléatoire du texte généré",
+  "apiMaxContexts": "Nombre maximum de contextes",
+  "apiMaxContextsTip": "Le nombre maximum de contextes transmis lors de la requête de l'API",
   "apiBaseURL": "URL de base de l'API",
   "apiBaseURLTip": "L'adresse de base de la requête, telle que <code class='fn__code'>https://api.openai.com/v1</code>",
   "apiUserAgentTip": "L'agent utilisateur qui a initié la requête, c'est-à-dire l'en-tête HTTP <code class='fn__code'>User-Agent</code>",

app/appearance/langs/zh_CHT.json

@@ -295,6 +295,10 @@
   "apiModelTip": "請求 API 時傳入的 <code class='fn__code'>model</code> 參數，用於控制產生的文字風格（使用 Azure OpenAI 服務時需填入 Deployment ID）",
   "apiMaxTokens": "最大 Token 數",
   "apiMaxTokensTip": "請求 API 時傳入的 <code class='fn__code'>max_tokens</code> 參數，用於控制生成的文字長度",
+  "apiTemperature": "溫度",
+  "apiTemperatureTip": "請求 API 時傳入的 <code class='fn__code'>temperature</code> 參數，用來控制產生的文字隨機性",
+  "apiMaxContexts": "最大上下文數",
+  "apiMaxContextsTip": "請求 API 時傳入的最大上下文數",
   "apiBaseURL": "API 基礎地址",
   "apiBaseURLTip": "發起請求的基礎地址，如 <code class='fn__code'>https://api.openai.com/v1</code>",
   "apiUserAgentTip": "發起請求的使用者代理，即 HTTP 標頭 <code class='fn__code'>User-Agent</code>",

app/appearance/langs/zh_CN.json

@@ -296,6 +296,10 @@
   "apiModelTip": "请求 API 时传入的 <code class='fn__code'>model</code> 参数，用于控制生成的文本风格（使用 Azure OpenAI 服务时需填入 Deployment ID）",
   "apiMaxTokens": "最大 Token 数",
   "apiMaxTokensTip": "请求 API 时传入的 <code class='fn__code'>max_tokens</code> 参数，用于控制生成的文本长度",
+  "apiTemperature": "温度",
+  "apiTemperatureTip": "请求 API 时传入的 <code class='fn__code'>temperature</code> 参数，用于控制生成的文本随机性",
+  "apiMaxContexts": "最大上下文数",
+  "apiMaxContextsTip": "请求 API 时传入的最大上下文数",
   "apiBaseURL": "API 基础地址",
   "apiBaseURLTip": "发起请求的基础地址，如 <code class='fn__code'>https://api.openai.com/v1</code>",
   "apiVersion": "API 版本",

app/appx/AppxManifest.xml

@@ -9,7 +9,7 @@
     <Identity Name="89C2A984.SiYuan"
               ProcessorArchitecture="x64"
               Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
-              Version="3.0.3.0"/>
+              Version="3.0.4.0"/>
     <Properties>
         <DisplayName>SiYuan</DisplayName>
         <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

app/package.json

@@ -1,19 +1,24 @@
 {
   "name": "sillot",
-  "version": "0.27.10",
+  "version": "0.27.13",
   "syv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",
   "homepage": "https://github.com/Hi-Windom/Sillot",
   "repository": "https://github.com/Hi-Windom/Sillot",
   "main": "./electron/main.js",
-  "packageManager": "pnpm@8.14.1",
+  "engines": {
+    "node": ">=20.11.1",
+    "pnpm": ">=8.15.5"
+  },
+  "packageManager": "pnpm@9.0.0-alpha.8",
   "scripts": {
     "cli": "node ./package.cli.mjs",
+    "v": "pnpm version && echo '\npnpm:' && pnpm -v && echo '\n'",
     "git:tag": "git push origin --tags",
     "git:proxy": "git config --global http.proxy http://127.0.0.1:7890 && git config --global https.proxy http://127.0.0.1:7890",
     "check": "NPM_CHECK_INSTALLER=pnpm npm-check -u",
     "check:electron": "pnpm install electron@alpha",
-    "gentpl": "pnpm run '/gentpl:.*/'",
+    "gentpl": "echo '危险操作警告：生成替换前请确认版本合并冲突已解决' && pause && pnpm run '/gentpl:.*/'",
     "gentpl:app": "node ./scripts/genAppIndex.tpl.js && node ./scripts/genAppWindow.tpl.js",
     "gentpl:docker": "node ./scripts/genDockerIndex.tpl.js",
     "gentpl:desktop": "node ./scripts/genDesktopIndex.tpl.js",
@@ -93,19 +98,19 @@
     "@simonwep/pickr": "^1.9.0",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.0",
-    "@types/node": "^20.11.28",
-    "@types/react": "^18.2.66",
+    "@types/node": "^20.11.29",
+    "@types/react": "^18.2.67",
     "@types/react-dom": "^18.2.22",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
+    "@typescript-eslint/eslint-plugin": "^7.3.1",
+    "@typescript-eslint/parser": "^7.3.1",
     "@wixc3/react-board": "^2.4.1",
     "babel-loader": "^9.1.3",
     "brace": "^0.11.1",
     "clean-webpack-plugin": "^4.0.0",
     "concurrently": "^8.2.2",
     "css-loader": "^6.10.0",
     "csstype": "^3.1.3",
-    "date-fns": "^3.5.0",
+    "date-fns": "^3.6.0",
     "ejs": "^3.1.9",
     "electron": "30.0.0-alpha.7",
     "electron-builder": "^24.13.3",
@@ -130,7 +135,7 @@
     "npm-check": "^6.0.1",
     "ora": "^8.0.1",
     "path-browserify": "^1.0.1",
-    "postcss": "^8.4.35",
+    "postcss": "^8.4.36",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-hot-toast": "^2.4.1",