diff --git a/apps/scheduler/scheduler/scheduler.py b/apps/scheduler/scheduler/scheduler.py index 49953877c87290f0e85f5b901ec56bc2ca15a5b9..35cd1edb14aeeb042067a7179b626ade637ca67f 100644 --- a/apps/scheduler/scheduler/scheduler.py +++ b/apps/scheduler/scheduler/scheduler.py @@ -106,6 +106,7 @@ class Scheduler: kb_ids = await KnowledgeBaseManager.get_kb_ids_by_conversation_id( self.task.ids.user_sub, self.task.ids.conversation_id ) + return kb_ids except Exception: logger.exception("[Scheduler] 获取知识库ID失败") await self.queue.close() @@ -135,6 +136,8 @@ class Scheduler: if rag_method: llm = await self.get_llm_use_in_chat_with_rag() kb_ids = await self.get_kb_ids_use_in_chat_with_rag() + logger.error('here') + logger.error(kb_ids) self.task = await push_init_message(self.task, self.queue, 3, is_flow=False) rag_data = RAGQueryReq( kbIds=kb_ids, diff --git a/apps/schemas/response_data.py b/apps/schemas/response_data.py index 5db37ef881a4ee6ae747f4a9c60169a807852ead..1c8ae72a51aae2134edd997af211ad15f4f5be38 100644 --- a/apps/schemas/response_data.py +++ b/apps/schemas/response_data.py @@ -337,6 +337,7 @@ class RecentAppListItem(BaseModel): app_id: str = Field(..., alias="appId", description="应用ID") name: str = Field(..., description="应用名称") + published: bool = Field(default=True, description="是否已发布") class RecentAppList(BaseModel): diff --git a/apps/services/appcenter.py b/apps/services/appcenter.py index 3e20f12721a34dbda2b58fc72d3b380c4da3a4aa..de37501fdaa7253b7cc50c7497ebb6a4c5077a93 100644 --- a/apps/services/appcenter.py +++ b/apps/services/appcenter.py @@ -285,10 +285,17 @@ class AppCenterManager: apps = [] # 如果 app_ids 为空,直接返回空列表 else: # 查询 MongoDB,获取符合条件的应用 - apps = await app_collection.find({"_id": {"$in": app_ids}}, {"name": 1}).to_list(length=len(app_ids)) - app_map = {str(a["_id"]): a.get("name", "") for a in apps} + apps = await app_collection.find({"_id": {"$in": app_ids}}, {"name": 1, "published": 1}).to_list(length=len(app_ids)) + app_map = {str(a["_id"]): {"name": a.get("name", ""), "published": a.get("published", False)} for a in apps} return RecentAppList( - applications=[RecentAppListItem(appId=app_id, name=app_map.get(app_id, "")) for app_id in app_ids], + applications=[ + RecentAppListItem( + appId=app_id, + name=app_map.get(app_id, {}).get("name", ""), + published=app_map.get(app_id, {}).get("published", False) + ) + for app_id in app_ids + ], ) @staticmethod