From f3403cfc10d568bad157bc38c4b8248534898197 Mon Sep 17 00:00:00 2001
From: yhjun1026 <460342015@qq.com>
Date: Thu, 8 Aug 2024 17:47:02 +0800
Subject: [PATCH] feat(app): new ui app module support

---
 dbgpt/app/knowledge/api.py         |  1 +
 dbgpt/app/knowledge/document_db.py | 18 ++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dbgpt/app/knowledge/api.py b/dbgpt/app/knowledge/api.py
index ee4fd6f0a..0d2c2ace7 100644
--- a/dbgpt/app/knowledge/api.py
+++ b/dbgpt/app/knowledge/api.py
@@ -81,6 +81,7 @@ def space_list(request: KnowledgeSpaceRequest):
     try:
         return Result.succ(knowledge_space_service.get_knowledge_space(request))
     except Exception as e:
+        logger.exception(f"Space list error!{str(e)}")
         return Result.failed(code="E000X", msg=f"space list error {e}")
 
 
diff --git a/dbgpt/app/knowledge/document_db.py b/dbgpt/app/knowledge/document_db.py
index 166be07c2..04f0ece1f 100644
--- a/dbgpt/app/knowledge/document_db.py
+++ b/dbgpt/app/knowledge/document_db.py
@@ -240,17 +240,17 @@ class KnowledgeDocumentDao(BaseDao):
         # 构建一个查询，聚合每个知识空间的文档数量
         counts_query = (
             session.query(
-                KnowledgeDocumentEntity.space_id,
+                KnowledgeDocumentEntity.id,
                 func.count(KnowledgeDocumentEntity.id).label("document_count"),
             )
-            .filter(KnowledgeDocumentEntity.space_id.in_(space_ids))
-            .group_by(KnowledgeDocumentEntity.space_id)
+            .filter(KnowledgeDocumentEntity.id.in_(space_ids))
+            .group_by(KnowledgeDocumentEntity.id)
         )
 
         # 执行查询并获取结果
         results = counts_query.all()
         # 将结果转换为字典
-        docs_count = {result.space_id: result.document_count for result in results}
+        docs_count = {result.id: result.document_count for result in results}
         session.close()
         return docs_count
 
@@ -263,7 +263,7 @@ class KnowledgeDocumentDao(BaseDao):
             )
         if query.space_id is not None:
             knowledge_documents = knowledge_documents.filter(
-                KnowledgeDocumentEntity.space_id == query.space_id
+                KnowledgeDocumentEntity.id == query.space_id
             )
         if query.doc_name is not None:
             knowledge_documents = knowledge_documents.filter(
@@ -290,10 +290,8 @@ class KnowledgeDocumentDao(BaseDao):
         knowledge_documents = session.query(KnowledgeDocumentEntity)
         if space is not None:
             knowledge_documents.filter(KnowledgeDocumentEntity.space == space).filter(
-                KnowledgeDocumentEntity.space_id == None
-            ).update(
-                {KnowledgeDocumentEntity.space_id: space_id}, synchronize_session=False
-            )
+                KnowledgeDocumentEntity.id == None
+            ).update({KnowledgeDocumentEntity.id: space_id}, synchronize_session=False)
             session.commit()
         session.close()
 
@@ -319,7 +317,7 @@ class KnowledgeDocumentDao(BaseDao):
             )
         if query.space_id is not None:
             knowledge_documents = knowledge_documents.filter(
-                KnowledgeDocumentEntity.space_id == query.space_id
+                KnowledgeDocumentEntity.id == query.space_id
             )
         if query.space is not None:
             knowledge_documents = knowledge_documents.filter(