Merge branch 'dev' of https://github.com/sdcb/chats into dev

src/FE/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run format

src/FE/package.json

@@ -8,7 +8,8 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "format": "prettier --write ."
+    "format": "prettier --write .",
+    "prepare": "husky"
   },
   "dependencies": {
     "@hookform/resolvers": "^3.3.4",
@@ -65,6 +66,7 @@
     "cross-env": "^7.0.3",
     "eslint": "8.49.0",
     "eslint-config-next": "13.4.19",
+    "husky": "^9.1.7",
     "postcss": "^8.4.41",
     "prettier": "^2.8.7",
     "prettier-plugin-tailwindcss": "^0.2.5",

src/FE/pages/home/_components/Chat/PromptList.tsx

@@ -1,4 +1,4 @@
-import { ForwardedRef, MutableRefObject, forwardRef } from 'react';
+import { MutableRefObject } from 'react';
 
 import { Prompt } from '@/types/prompt';
 

src/FE/pages/home/_components/HomeContent/HomeContent.tsx

@@ -12,6 +12,7 @@ import {
 } from '@/utils/chats';
 import { getSelectMessages } from '@/utils/message';
 import { getStorageModelId, setStorageModelId } from '@/utils/model';
+import { formatPrompt } from '@/utils/promptVariable';
 import { getSettings, saveSettings } from '@/utils/settings';
 import { Settings } from '@/utils/settings';
 import { getLoginUrl, getUserInfo, getUserSession } from '@/utils/user';
@@ -102,7 +103,7 @@ const HomeContent = () => {
           data.temperature ??
           userModelConfig?.temperature ??
           DEFAULT_TEMPERATURE,
-        prompt: data.content,
+        prompt: formatPrompt(data.content, { model }),
       });
     });
   };