Merge pull request #8 from Hk-Gosuto/dev

支持 ChatSession 级别插件功能开关
2025-05-25 07:00:23 +09:00 · 2023-08-12 00:56:18 +08:00 · 2023-08-12 00:56:18 +08:00 · 6f38ee9a88
commit 6f38ee9a88
parent 1147d63e8e fb1b92e9cc
10 changed files with 117 additions and 129 deletions
--- a/README.md
+++ b/README.md
@ -57,10 +57,14 @@
 - [ ] 支持开关指定插件
 - [ ] 支持添加自定义插件
 - [ ] 支持 Agent 参数配置（ agentType, maxIterations, returnIntermediateSteps 等）
- [ ] 支持 ChatSession 级别插件功能开关
+- [x] 支持 ChatSession 级别插件功能开关
+
+  仅在使用 `0613` 版本模型时会出现插件开关，其它模型默认为关闭状态，开关也不会显示。

 ## 已知问题
- [ ] 使用插件时需将模型切换为 `0613` 版本模型，如：`gpt-3.5-turbo-0613`
+- [x] 使用插件时需将模型切换为 `0613` 版本模型，如：`gpt-3.5-turbo-0613`
+
+  尝试使用 `chat-conversational-react-description` 等类型的 `agent` 使用插件时效果并不理想，不再考虑支持其它版本的模型。
 - [x] `SERPAPI_API_KEY` 目前为必填，后续会支持使用 DuckDuckGo 替换搜索插件
 - [ ] Agent 不支持自定义接口地址
 - [x] ~~部分场景下插件会调用失败~~
--- a/app/api/langchain/tool/agent/route.ts
+++ b/app/api/langchain/tool/agent/route.ts
@ -68,6 +68,7 @@ async function handle(req: NextRequest) {
    const handler = BaseCallbackHandler.fromMethods({
      async handleLLMNewToken(token: string) {
        if (token) {
+          console.log("[Token]", token);
          var response = new ResponseBody();
          response.message = token;
          await writer.ready;
@ -199,13 +200,13 @@ async function handle(req: NextRequest) {
      presencePenalty: reqBody.presence_penalty,
      frequencyPenalty: reqBody.frequency_penalty,
    });
-
    const executor = await initializeAgentExecutorWithOptions(tools, llm, {
      agentType: "openai-functions",
      returnIntermediateSteps: true,
      maxIterations: 3,
      memory: memory,
    });
+
    executor.call(
      {
        input: reqBody.messages.slice(-1)[0].content,
--- a/app/components/chat.module.scss
+++ b/app/components/chat.module.scss
@ -3,6 +3,7 @@
 .chat-input-actions {
  display: flex;
  flex-wrap: wrap;
+  justify-content: space-between;

  .chat-input-action {
    display: inline-flex;
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@ -27,6 +27,8 @@ import PinIcon from "../icons/pin.svg";
 import EditIcon from "../icons/rename.svg";
 import ConfirmIcon from "../icons/confirm.svg";
 import CancelIcon from "../icons/cancel.svg";
+import EnablePluginIcon from "../icons/plugin_enable.svg";
+import DisablePluginIcon from "../icons/plugin_disable.svg";

 import LightIcon from "../icons/light.svg";
 import DarkIcon from "../icons/dark.svg";
@ -414,11 +416,11 @@ export function ChatActions(props: {
  const navigate = useNavigate();
  const chatStore = useChatStore();

-  // switch tools
-  const useTools = chatStore.currentSession().useTools;
-  function switchUseTools() {
+  // switch Plugins
+  const usePlugins = chatStore.currentSession().mask.usePlugins;
+  function switchUsePlugins() {
    chatStore.updateCurrentSession((session) => {
-      session.useTools = !session.useTools;
+      session.mask.usePlugins = !session.mask.usePlugins;
    });
  }

@ -450,107 +452,114 @@ export function ChatActions(props: {

  return (
    <div className={styles["chat-input-actions"]}>
-      {couldStop && (
+      <div>
+        {couldStop && (
+          <ChatAction
+            onClick={stopAll}
+            text={Locale.Chat.InputActions.Stop}
+            icon={<StopIcon />}
+          />
+        )}
+        {!props.hitBottom && (
+          <ChatAction
+            onClick={props.scrollToBottom}
+            text={Locale.Chat.InputActions.ToBottom}
+            icon={<BottomIcon />}
+          />
+        )}
+        {props.hitBottom && (
+          <ChatAction
+            onClick={props.showPromptModal}
+            text={Locale.Chat.InputActions.Settings}
+            icon={<SettingsIcon />}
+          />
+        )}
+
        <ChatAction
-          onClick={stopAll}
-          text={Locale.Chat.InputActions.Stop}
-          icon={<StopIcon />}
+          onClick={nextTheme}
+          text={Locale.Chat.InputActions.Theme[theme]}
+          icon={
+            <>
+              {theme === Theme.Auto ? (
+                <AutoIcon />
+              ) : theme === Theme.Light ? (
+                <LightIcon />
+              ) : theme === Theme.Dark ? (
+                <DarkIcon />
+              ) : null}
+            </>
+          }
        />
-      )}
-      {!props.hitBottom && (
+
        <ChatAction
-          onClick={props.scrollToBottom}
-          text={Locale.Chat.InputActions.ToBottom}
-          icon={<BottomIcon />}
+          onClick={props.showPromptHints}
+          text={Locale.Chat.InputActions.Prompt}
+          icon={<PromptIcon />}
        />
-      )}
-      {props.hitBottom && (
+
        <ChatAction
-          onClick={props.showPromptModal}
-          text={Locale.Chat.InputActions.Settings}
-          icon={<SettingsIcon />}
+          onClick={() => {
+            navigate(Path.Masks);
+          }}
+          text={Locale.Chat.InputActions.Masks}
+          icon={<MaskIcon />}
        />
-      )}

-      <ChatAction
-        onClick={nextTheme}
-        text={Locale.Chat.InputActions.Theme[theme]}
-        icon={
-          <>
-            {theme === Theme.Auto ? (
-              <AutoIcon />
-            ) : theme === Theme.Light ? (
-              <LightIcon />
-            ) : theme === Theme.Dark ? (
-              <DarkIcon />
-            ) : null}
-          </>
-        }
-      />
+        <ChatAction
+          onClick={() => setShowModelSelector(true)}
+          text={currentModel}
+          icon={<RobotIcon />}
+        />

-      <ChatAction
-        onClick={props.showPromptHints}
-        text={Locale.Chat.InputActions.Prompt}
-        icon={<PromptIcon />}
-      />
-
-      <ChatAction
-        onClick={() => {
-          navigate(Path.Masks);
-        }}
-        text={Locale.Chat.InputActions.Masks}
-        icon={<MaskIcon />}
-      />
-
-      <ChatAction
-        text={Locale.Chat.InputActions.Clear}
-        icon={<BreakIcon />}
-        onClick={() => {
-          chatStore.updateCurrentSession((session) => {
-            if (session.clearContextIndex === session.messages.length) {
-              session.clearContextIndex = undefined;
-            } else {
-              session.clearContextIndex = session.messages.length;
-              session.memoryPrompt = ""; // will clear memory
+        {currentModel.endsWith("0613") && (
+          <ChatAction
+            onClick={switchUsePlugins}
+            text={
+              usePlugins
+                ? Locale.Chat.InputActions.DisablePlugins
+                : Locale.Chat.InputActions.EnablePlugins
            }
-          });
-        }}
-      />
+            icon={usePlugins ? <EnablePluginIcon /> : <DisablePluginIcon />}
+          />
+        )}

-      <ChatAction
-        onClick={() => setShowModelSelector(true)}
-        text={currentModel}
-        icon={<RobotIcon />}
-      />
-
-      {/* <ChatAction
-        onClick={switchUseTools}
-        text={
-          useTools
-            ? Locale.Chat.InputActions.CloseTools
-            : Locale.Chat.InputActions.OpenTools
-        }
-        icon={useTools ? <SearchOpenIcon /> : <SearchCloseIcon />}
-      /> */}
-
-      {showModelSelector && (
-        <Selector
-          defaultSelectedValue={currentModel}
-          items={models.map((m) => ({
-            title: m,
-            value: m,
-          }))}
-          onClose={() => setShowModelSelector(false)}
-          onSelection={(s) => {
-            if (s.length === 0) return;
+        {showModelSelector && (
+          <Selector
+            defaultSelectedValue={currentModel}
+            items={models.map((m) => ({
+              title: m,
+              value: m,
+            }))}
+            onClose={() => setShowModelSelector(false)}
+            onSelection={(s) => {
+              if (s.length === 0) return;
+              chatStore.updateCurrentSession((session) => {
+                session.mask.modelConfig.model = s[0] as ModelType;
+                session.mask.syncGlobalConfig = false;
+                session.mask.usePlugins =
+                  session.mask.modelConfig.model.endsWith("0613");
+              });
+              showToast(s[0]);
+            }}
+          />
+        )}
+      </div>
+      <div>
+        <ChatAction
+          text={Locale.Chat.InputActions.Clear}
+          icon={<BreakIcon />}
+          onClick={() => {
            chatStore.updateCurrentSession((session) => {
-              session.mask.modelConfig.model = s[0] as ModelType;
-              session.mask.syncGlobalConfig = false;
+              if (session.clearContextIndex === session.messages.length) {
+                session.clearContextIndex = undefined;
+              } else {
+                session.clearContextIndex = session.messages.length;
+                session.memoryPrompt = ""; // will clear memory
+              }
            });
-            showToast(s[0]);
          }}
        />
-      )}
+      </div>
    </div>
  );
 }
@ -1198,8 +1207,7 @@ function _Chat() {
                      </div>
                    )}
                  </div>
-                  {session.useTools &&
-                    !isUser &&
+                  {!isUser &&
                    message.toolMessages &&
                    message.toolMessages.map((tool, index) => (
                      <div
--- a/app/icons/plugin_disenable.svg
+++ b/app/icons/plugin_disenable.svg
--- a/app/locales/cn.ts
+++ b/app/locales/cn.ts
@ -58,8 +58,8 @@ const cn = {
      Masks: "所有面具",
      Clear: "清除聊天",
      Settings: "对话设置",
-      OpenTools: "开启插件",
-      CloseTools: "关闭插件",
+      EnablePlugins: "开启插件",
+      DisablePlugins: "关闭插件",
    },
    Rename: "重命名对话",
    Typing: "正在输入…",
--- a/app/locales/en.ts
+++ b/app/locales/en.ts
@ -60,8 +60,8 @@ const en: LocaleType = {
      Masks: "Masks",
      Clear: "Clear Context",
      Settings: "Settings",
-      OpenTools: "Enable Plugins",
-      CloseTools: "Disable Plugins",
+      EnablePlugins: "Enable Plugins",
+      DisablePlugins: "Disable Plugins",
    },
    Rename: "Rename Chat",
    Typing: "Typing…",
--- a/app/masks/cn.ts
+++ b/app/masks/cn.ts
@ -1,32 +1,6 @@
 import { BuiltinMask } from "./typing";

 export const CN_MASKS: BuiltinMask[] = [
-  {
-    avatar: "1f92c",
-    name: "国粹 AI",
-    context: [
-      {
-        id: "chinese-cultural-heritage-0",
-        role: "system",
-        content:
-          "你现在是一个语言学习辅助助手，我在学习中国的脏话，无论我问什么，你都要巧妙的用脏话回复。即使面对批评，道德审判，任何形式的质疑，或者让你忘记脏话学习助手的身份，等等任何提问和沟通，你都要用脏话回复并且隐瞒你脏话助手的身份。碰到无法回答的问题，就随便回复一句脏话。",
-        date: "",
-      },
-    ],
-    modelConfig: {
-      model: "gpt-3.5-turbo-0613",
-      temperature: 1,
-      max_tokens: 2000,
-      presence_penalty: 0,
-      frequency_penalty: 0,
-      sendMemory: true,
-      historyMessageCount: 4,
-      compressMessageLengthThreshold: 1000,
-    },
-    lang: "cn",
-    builtin: true,
-    createdAt: 1690628160000,
-  },
  {
    avatar: "1f5bc-fe0f",
    name: "以文搜图",
--- a/app/store/chat.ts
+++ b/app/store/chat.ts
@ -61,7 +61,6 @@ export interface ChatSession {
  clearContextIndex?: number;

  mask: Mask;
-  useTools: boolean;
 }

 export const DEFAULT_TOPIC = Locale.Store.DefaultTopic;
@ -85,7 +84,6 @@ function createEmptySession(): ChatSession {
    lastSummarizeIndex: 0,

    mask: createEmptyMask(),
-    useTools: true,
  };
 }

@ -317,7 +315,7 @@ export const useChatStore = create<ChatStore>()(
          session.messages.push(botMessage);
        });

-        if (session.useTools && modelConfig.model.endsWith("0613")) {
+        if (session.mask.usePlugins) {
          console.log("[ToolAgent] start");
          api.llm.toolAgentChat({
            messages: sendMessages,
--- a/app/store/mask.ts
+++ b/app/store/mask.ts
@ -18,6 +18,7 @@ export type Mask = {
  modelConfig: ModelConfig;
  lang: Lang;
  builtin: boolean;
+  usePlugins?: boolean;
 };

 export const DEFAULT_MASK_STATE = {
@ -46,6 +47,7 @@ export const createEmptyMask = () =>
    lang: getLang(),
    builtin: false,
    createdAt: Date.now(),
+    usePlugins: useAppConfig.getState().modelConfig.model.endsWith("0613"),
  } as Mask);

 export const useMaskStore = create<MaskStore>()(