Merge pull request #113 from ant-xuexiao/feat_bot_builder_edit

feat: enabel to edit bot configuration information through dialogue

Author: RaoHai

lui/src/Chat/index.tsx

@@ -37,135 +37,135 @@ const Chat: FC<ChatProps> = memo(({ helloMessage, host, drawerWidth }) => {
     ? `calc(${drawerWidth}px - 90px)`
     : '100%';
   return (
-    <div className="petercat-lui">
-       <div
-      className="h-full w-full"
-      style={{ backgroundColor: globalToken.chatBoxBackgroundColor }}
-    >
-      <ProChat
-        showTitle
-        chats={chats}
-        onChatsChange={(chats) => {
-          setChats(chats);
-        }}
-        chatRef={proChatRef}
-        helloMessage={helloMessage || BOT_INFO.work_info.prologue}
-        userMeta={{ title: 'User' }}
-        chatItemRenderConfig={{
-          avatarRender: (props: ChatItemProps) => {
-            if (props.originData?.role === Role.user) {
-              return <></>;
-            }
-            if (
-              props.originData?.role === Role.tool ||
-              props.originData?.role === Role.knowledge
-            ) {
-              return <div className="w-[40px] h-[40px]" />;
-            }
-          },
-          contentRender: (props: ChatItemProps, defaultDom: ReactNode) => {
-            const originData = props.originData || {};
-            if (originData?.role === Role.user) {
-              return defaultDom;
-            }
-            const message = originData.content;
-            const defaultMessageContent = (
-              <div style={{ minWidth: messageMinWidth }}>{defaultDom}</div>
-            );
-
-            if (!message || !message.includes('<TOOL>')) {
-              return defaultMessageContent;
-            }
-
-            const [toolStr, answerStr] = message.split('<ANSWER>');
-            const tools = toolStr.split('\n').filter(Boolean);
-            const lastTool = tools[tools.length - 1];
+    <div className="petercat-lui" style={{ height: '100%' }}>
+      <div
+        className="h-full w-full"
+        style={{ backgroundColor: globalToken.chatBoxBackgroundColor }}
+      >
+        <ProChat
+          showTitle
+          chats={chats}
+          onChatsChange={(chats) => {
+            setChats(chats);
+          }}
+          chatRef={proChatRef}
+          helloMessage={helloMessage || BOT_INFO.work_info.prologue}
+          userMeta={{ title: 'User' }}
+          chatItemRenderConfig={{
+            avatarRender: (props: ChatItemProps) => {
+              if (props.originData?.role === Role.user) {
+                return <></>;
+              }
+              if (
+                props.originData?.role === Role.tool ||
+                props.originData?.role === Role.knowledge
+              ) {
+                return <div className="w-[40px] h-[40px]" />;
+              }
+            },
+            contentRender: (props: ChatItemProps, defaultDom: ReactNode) => {
+              const originData = props.originData || {};
+              if (originData?.role === Role.user) {
+                return defaultDom;
+              }
+              const message = originData.content;
+              const defaultMessageContent = (
+                <div style={{ minWidth: messageMinWidth }}>{defaultDom}</div>
+              );
 
-            const regex = /<TOOL>(.*)/;
-            const match = lastTool.match(regex);
+              if (!message || !message.includes('<TOOL>')) {
+                return defaultMessageContent;
+              }
 
-            if (!match) {
-              console.error('No valid JSON found in input');
-              return defaultMessageContent;
-            }
+              const [toolStr, answerStr] = message.split('<ANSWER>');
+              const tools = toolStr.split('\n').filter(Boolean);
+              const lastTool = tools[tools.length - 1];
 
-            try {
-              const config = JSON.parse(match[1]);
-              const { type, extra } = config;
+              const regex = /<TOOL>(.*)/;
+              const match = lastTool.match(regex);
 
-              if (![Role.knowledge, Role.tool].includes(type)) {
+              if (!match) {
+                console.error('No valid JSON found in input');
                 return defaultMessageContent;
               }
 
-              const { status, source } = extra;
+              try {
+                const config = JSON.parse(match[1]);
+                const { type, extra } = config;
 
-              return (
-                <div
-                  className="p-2 bg-white rounded-md "
-                  style={{ minWidth: messageMinWidth }}
-                >
-                  <div className="mb-1">
-                    <ThoughtChain
-                      content={extra}
-                      status={status}
-                      source={source}
-                    />
+                if (![Role.knowledge, Role.tool].includes(type)) {
+                  return defaultMessageContent;
+                }
+
+                const { status, source } = extra;
+
+                return (
+                  <div
+                    className="p-2 bg-white rounded-md "
+                    style={{ minWidth: messageMinWidth }}
+                  >
+                    <div className="mb-1">
+                      <ThoughtChain
+                        content={extra}
+                        status={status}
+                        source={source}
+                      />
+                    </div>
+                    <Markdown style={{ overflowX: 'hidden', overflowY: 'auto' }}>
+                      {answerStr}
+                    </Markdown>
                   </div>
-                  <Markdown style={{ overflowX: 'hidden', overflowY: 'auto' }}>
-                    {answerStr}
-                  </Markdown>
-                </div>
+                );
+              } catch (error) {
+                console.error(`JSON parse error: ${error}`);
+                return defaultMessageContent;
+              }
+            },
+          }}
+          assistantMeta={{
+            avatar: BOT_INFO.avatar,
+            title: BOT_INFO.resourceName,
+          }}
+          autocompleteRequest={async (value) => {
+            if (value === '/') {
+              return BOT_INFO.work_info.suggested_questions.map(
+                (prompt: string) => ({
+                  value: prompt,
+                  label: prompt,
+                }),
               );
-            } catch (error) {
-              console.error(`JSON parse error: ${error}`);
-              return defaultMessageContent;
             }
-          },
-        }}
-        assistantMeta={{
-          avatar: BOT_INFO.avatar,
-          title: BOT_INFO.resourceName,
-        }}
-        autocompleteRequest={async (value) => {
-          if (value === '/') {
-            return BOT_INFO.work_info.suggested_questions.map(
-              (prompt: string) => ({
-                value: prompt,
-                label: prompt,
-              }),
-            );
-          }
-          return [];
-        }}
-        request={async (messages) => {
-          const newMessages = messages
-            .filter(
-              (item) => item.role !== Role.tool && item.role !== Role.knowledge,
-            )
-            .map((message) => ({
-              role: message.role,
-              content: message.content as string,
-            }));
+            return [];
+          }}
+          request={async (messages) => {
+            const newMessages = messages
+              .filter(
+                (item) => item.role !== Role.tool && item.role !== Role.knowledge,
+              )
+              .map((message) => ({
+                role: message.role,
+                content: message.content as string,
+              }));
 
-          const response = await streamChat(newMessages, host);
-          return handleStream(response);
-        }}
-        inputAreaProps={{ className: 'userInputBox h-24 !important' }}
-        actions={{
-          render: () => [
-            <StopBtn
-              key="StopBtn"
-              visible={!!proChatRef?.current?.getChatLoadingId()}
-              action={() => proChatRef?.current?.stopGenerateMessage()}
-            />,
-            <Actions key="Actions"></Actions>,
-          ],
-          flexConfig: {
-            gap: 24,
-            direction: 'vertical',
-            justify: 'space-between',
-          },
-        }}
+            const response = await streamChat(newMessages, host);
+            return handleStream(response);
+          }}
+          inputAreaProps={{ className: 'userInputBox h-24 !important' }}
+          actions={{
+            render: () => [
+              <StopBtn
+                key="StopBtn"
+                visible={!!proChatRef?.current?.getChatLoadingId()}
+                action={() => proChatRef?.current?.stopGenerateMessage()}
+              />,
+              <Actions key="Actions"></Actions>,
+            ],
+            flexConfig: {
+              gap: 24,
+              direction: 'vertical',
+              justify: 'space-between',
+            },
+          }}
       />
     </div>
     </div>

server/agent/base.py

@@ -51,7 +51,7 @@ def init_tavily_tools(self):
         return [tavily_tool]
 
     def _create_agent_with_tools(self) -> AgentExecutor:
-        llm = ChatOpenAI(model="gpt-4-1106-preview", temperature=self.temperature, streaming=True, max_tokens=self.max_tokens, openai_api_key=OPEN_API_KEY)
+        llm = ChatOpenAI(model="gpt-4-turbo", temperature=self.temperature, streaming=True, max_tokens=self.max_tokens, openai_api_key=OPEN_API_KEY)
 
         tools =  self.init_tavily_tools() if self.enable_tavily else []
         for tool in self.tools.values():

server/agent/bot_builder.py

@@ -16,7 +16,8 @@
 - 使用 bot_builder 工具根据用户提供的 Github 仓库名创建机器人。
 
 ### 技能3：修改机器人的配置
-- 根据用户的描述进行机器人的配置信息修改。
+- 根据用户的描述使用 bot_builder 工具进行机器人的配置信息修改。每次使用该工具，请默认创建机器人获得的 id 作为编辑的该机器人 id
+- 如果用户想要修改头像，请回答暂不支持改头像能力，敬请期待
 
 ## 限制
 - 只能基于用户提供的Github仓库信息创建答疑机器人。
@@ -27,6 +28,7 @@
 
 TOOL_MAPPING = {
     "bot_builder": bot_builder.create_bot,
+    "edit_bot": bot_builder.edit_bot,
 }
 
 def agent_chat(input_data: ChatData) -> AsyncIterator[str]:

server/rag/retrieval.py

@@ -1,5 +1,4 @@
 import json
-from typing import Optional
 from langchain_openai import OpenAIEmbeddings
 from langchain_community.vectorstores import SupabaseVectorStore
 from db.supabase.client import get_client

server/routers/rag.py

@@ -1,7 +1,6 @@
-from typing import Optional
 from fastapi import APIRouter, Depends
 from rag import retrieval
-from data_class import GitDocConfig, GitIssueConfig, S3Config
+from data_class import GitDocConfig, GitIssueConfig
 from verify.rate_limit import verify_rate_limit
 
 router = APIRouter(
@@ -11,17 +10,17 @@
 )
 
 
-@router.post("/rag/add_knowledge_by_doc")
+@router.post("/rag/add_knowledge_by_doc", dependencies=[Depends(verify_rate_limit)])
 def add_knowledge_by_doc(config: GitDocConfig):
     data=retrieval.add_knowledge_by_doc(config)
     return data
 
-@router.post("/rag/add_knowledge_by_issues")
+@router.post("/rag/add_knowledge_by_issues", dependencies=[Depends(verify_rate_limit)])
 def add_knowledge_by_issues(config: GitIssueConfig):
     data=retrieval.add_knowledge_by_issues(config)
     return data
 
-@router.post("/rag/search_knowledge")
+@router.post("/rag/search_knowledge", dependencies=[Depends(verify_rate_limit)])
 def search_knowledge(query: str):
     data=retrieval.search_knowledge(query)
     return data

server/tools/bot_builder.py

@@ -1,3 +1,4 @@
+from typing import Optional
 from langchain.tools import tool
 from github import Github
 from db.supabase.client import get_client
@@ -32,15 +33,65 @@ def create_bot(
           "uid": "u123456", # TODO get from auth
           "enable_img_generation": False,
           "label": "Assistant",
-          "starters": starters,
+          "starters": starters if isinstance(starters, list) and starters else ["介绍一下项目", "快速上手", "贡献指南"],
           "enable_img_generation": False,
           "public": False,
         }
-        print('bot_data', bot_data)
+       
         supabase = get_client()
         response = supabase.table("bots").insert(bot_data).execute()
+        print('bot_data_response', response)
         return response
     except Exception as e:
         print(f"An error occurred: {e}")
         return e
 
+@tool
+def edit_bot(
+        id: str,
+        name: Optional[str] = None,
+        description : Optional[str] = None,
+        prompt: Optional[str] = None,
+        starters: Optional[list[str]] = None,
+    ):
+    """
+    edit a bot based on the given params
+    
+    :param id: The id of the bot, e.g., "1234567890"
+    :param name: The name of the bot, e.g., "Ant Design"
+    :param description: The description of the bot, e.g., "A design system for enterprise-level products."
+    :param prompt: The prompt of the bot, e.g., "You are an AI assistant designed to help users with their needs. You can answer questions about Ant Design, provide design resources, and offer advice on how to use Ant Design in your projects. Your responses should be clear, concise, and helpful."
+    :param starters: The Opening Dialog, e.g., ["介绍一下项目", "快速上手", "贡献指南"]
+    """
+    try:
+        # Step1: Get the bot object
+        supabase = get_client()
+        bot = supabase.table("bots").select("*").eq("id", id).execute().data[0]
+        if not bot:
+            raise ValueError(f"Bot with ID {id} not found.")
+
+        # Step2: Update the bot data
+        uid = "u123456" # TODO get from auth
+        bot_data = {
+            "name":  name if name else bot["name"],
+            "description": description if description else bot["description"],
+            "avatar": bot["avatar"],
+            "prompt": prompt if prompt else bot["prompt"],
+            "uid": uid, 
+            "enable_img_generation": False,
+            "label": "Assistant",
+            "starters": starters if isinstance(starters, list) and starters else bot["starters"],
+            "enable_img_generation": False,
+            "public": False,
+        }
+        
+        
+        # Step3: Save the changes to the database
+        response = supabase.table("bots").update(bot_data).eq("id", id).eq("uid", uid).execute()
+        return response
+    except Exception as e:
+        print(f"An error occurred: {e}")
+        return e
+   
+   
+