From 77d51a55f7241e1eae25d89b4c76865c51565319 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 06 十二月 2024 16:04:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/knowledge.py | 2 +-
app/service/llm.py | 15 ++++++---------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/app/api/knowledge.py b/app/api/knowledge.py
index c0e97ab..d7edcc6 100644
--- a/app/api/knowledge.py
+++ b/app/api/knowledge.py
@@ -19,4 +19,4 @@
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)
diff --git a/app/service/llm.py b/app/service/llm.py
index d26a448..9c841de 100644
--- a/app/service/llm.py
+++ b/app/service/llm.py
@@ -10,13 +10,10 @@
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()]}
\ No newline at end of file
+ return {"rows": [kld.to_json() for kld in query.all()]}
--
Gitblit v1.8.0