Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway

app/api/knowledge.py

@@ -19,4 +19,4 @@ async def knowledge_list(
         return ResponseList(code=400, msg="缺少参数")
     getknowledgelist = await get_knowledge_list(db, current_user.id, pageSize, current)
 
-    return Response(code=200, msg="", data={"rows": getknowledgelist})
+    return Response(code=200, msg="", data=getknowledgelist)

app/service/llm.py

@@ -10,13 +10,10 @@ async def get_llm_list(db, user_id):
         query = db.query(CommonLlmModel)
     else:
         group_list = [i.id for i in user.groups]
-        query = db.query(CommonLlmModel)
-        query = query.intersect(
-            db.query(CommonLlmModel).join(
-                group_llm_table,
-                CommonLlmModel.id == group_llm_table.c.llm_id
-            ).filter(
-                group_llm_table.c.group_id.in_(group_list)
-            )
+        query = db.query(CommonLlmModel).join(
+            group_llm_table,
+            CommonLlmModel.id == group_llm_table.c.llm_id
+        ).filter(
+            group_llm_table.c.group_id.in_(group_list)
         )
-    return {"rows": [kld.to_json() for kld in query.all()]}
+    return {"rows": [kld.to_json() for kld in query.all()]}