fix: fix trigger task

client/app/factory/edit/components/KnowledgeBtn.tsx

@@ -11,20 +11,20 @@ import RefreshIcon from '@/public/icons/RefreshIcon';
 import { useBotTask } from './TaskContext';
 
 type IProps = {
-  botId: string;
+  repoName: string;
   onClick: () => void;
   mode: 'configItem' | 'pageHeader';
 };
 
 const KnowledgeBtn = (props: IProps) => {
-  const { onClick, botId, mode } = props;
+  const { onClick, repoName, mode } = props;
   const { setTaskProfile } = useBotTask();
-  const [shouldGetTask, setShouldGetTask] = React.useState<boolean>(!!botId);
+  const [shouldGetTask, setShouldGetTask] = React.useState<boolean>(!!repoName);
   const [taskLoading, setTaskLoading] = React.useState<boolean>(true);
   const [allowShowChunkList, setAllowShowChunkList] =
     React.useState<boolean>(false);
 
-  const { data: taskList } = useGetBotRagTask(botId, shouldGetTask, true);
+  const { data: taskList } = useGetBotRagTask(repoName, shouldGetTask, true);
   const taskCnt = taskList?.length ?? 0;
 
   // compute task running status by taskList

client/app/factory/edit/page.tsx

@@ -318,7 +318,7 @@ export default function Edit() {
           )}
           {isEdit && activeTab === ConfigTypeEnum.MANUAL_CONFIG && (
             <KnowledgeBtn
-              botId={botProfile.id}
+              repoName={botProfile.repoName!}
               onClick={() => {
                 setVisibleType(VisibleTypeEnum.KNOWLEDGE_DETAIL);
               }}

client/app/hooks/useBot.ts

@@ -134,13 +134,13 @@ export const useBotRAGChunkList = (
 };
 
 export const useGetBotRagTask = (
-  botId: string,
+  repoName: string,
   enabled: boolean = true,
   refetchInterval: boolean = true,
 ) => {
   return useQuery({
-    queryKey: [`rag.task`, botId],
-    queryFn: async () => getRagTask(botId),
+    queryKey: [`rag.task`, repoName],
+    queryFn: async () => getRagTask(repoName),
     select: (data) => data,
     enabled,
     retry: true,

client/app/services/BotsController.ts

@@ -84,9 +84,9 @@ export async function getChunkList(
   return response.data;
 }
 
-export async function getRagTask(bot_id: string): Promise<RagTask[]> {
+export async function getRagTask(repo_name: string): Promise<RagTask[]> {
   const response = await axios.get(
-    `${apiDomain}/api/rag/task/latest?bot_id=${bot_id}`,
+    `${apiDomain}/api/rag/task/latest?repo_name=${repo_name}`,
   );
   return response.data.data;
 }

petercat_utils/rag_helper/task.py

@@ -54,7 +54,11 @@
     return response.data[0] if (len(response.data) > 0) else None
 
 
-def get_task(task_type: TaskType, task_id: str) -> GitTask:
+def get_task(
+    task_type: TaskType,
+    task_id: str,
+    bot_id: Optional[str],
+) -> GitTask:
     supabase = get_client()
     response = (
         supabase.table(GitTask.get_table_name(task_type))
@@ -71,7 +75,7 @@
                 sha=data["sha"],
                 repo_name=data["repo_name"],
                 node_type=data["node_type"],
-                bot_id=data["bot_id"],
+                bot_id=bot_id,
                 path=data["path"],
                 status=data["status"],
                 from_id=data["from_task_id"],
@@ -88,8 +92,8 @@
             )
 
 
-def trigger_task(task_type: TaskType, task_id: Optional[str]):
-    task = get_task(task_type, task_id) if task_id else get_oldest_task()
+def trigger_task(task_type: TaskType, bot_id: Optional[str], task_id: Optional[str]):
+    task = get_task(task_type, bot_id, task_id) if task_id else get_oldest_task()
     if task is None:
         return task
     return task.handle()

server/rag/router.py

@@ -82,9 +82,9 @@
 
 
 @router.post("/rag/trigger_task", dependencies=[Depends(verify_rate_limit)])
-def trigger_task(task_type: TaskType, task_id: Optional[str] = None):
+def trigger_task(task_type: TaskType, bot_id: str, task_id: Optional[str] = None):
     try:
-        task.trigger_task(task_type, task_id)
+        task.trigger_task(task_type, task_id, bot_id)
     except Exception as e:
         return json.dumps({"success": False, "message": str(e)})
 
@@ -98,14 +98,14 @@
 
 
 @router.get("/rag/task/latest", dependencies=[Depends(verify_rate_limit)])
-def get_rag_task(bot_id: str):
+def get_rag_task(repo_name: str):
     # TODO: Think about hot to get correct when reload knowledge task was triggered
     try:
         supabase = get_client()
         response = (
             supabase.table("rag_tasks")
             .select("id,status,node_type,path,from_task_id,created_at", count="exact")
-            .eq("bot_id", bot_id)
+            .eq("repo_name", repo_name)
             .order("created_at", desc=True)
             .execute()
         )

server/requirements.txt

@@ -27,5 +27,5 @@ requests
 pytest
 httpx
 urllib3>=2.2.2
-petercat_utils>=0.1.31
-toolz
+petercat_utils>=0.1.36
+toolz

subscriber/requirements.txt

@@ -1 +1 @@
-petercat_utils>=0.1.32
+petercat_utils>=0.1.36