From 2222b77ab633b227df9080810e31c2a19b94f0d6 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 05 十二月 2024 14:22:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/models/llm_model.py | 2
app/api/knowledge.py | 19 +++------
app/api/llm.py | 17 ++++++++
main.py | 2 +
app/service/knowledge.py | 32 ++++++++--------
app/service/llm.py | 22 +++++++++++
6 files changed, 64 insertions(+), 30 deletions(-)
diff --git a/app/api/knowledge.py b/app/api/knowledge.py
index 625d591..c0e97ab 100644
--- a/app/api/knowledge.py
+++ b/app/api/knowledge.py
@@ -11,19 +11,12 @@
@knowledge_router.get("/list", response_model=Response)
async def knowledge_list(
+ current: int,
+ pageSize: int,
current_user: UserModel = Depends(get_current_user),
- page: Optional[int] = Query(None, description="Page number", gt=0),
- num: Optional[int] = Query(18, description="Number of items per page", gt=0),
db=Depends(get_db)):
- getknowledgelist = await get_knowledge_list(db, current_user.id)
- if page is None:
- return Response(code=200, msg="", data={"rows": getknowledgelist["rows"][0:num]})
+ if current and not pageSize:
+ return ResponseList(code=400, msg="缂哄皯鍙傛暟")
+ getknowledgelist = await get_knowledge_list(db, current_user.id, pageSize, current)
- start = (page - 1) * num
- end = start + num
-
- if start >= len(getknowledgelist):
- raise HTTPException(status_code=404, detail="Page not found")
- print(getknowledgelist)
-
- return Response(code=200, msg="", data={"rows": getknowledgelist["rows"][start:end]})
\ No newline at end of file
+ return Response(code=200, msg="", data={"rows": getknowledgelist})
diff --git a/app/api/llm.py b/app/api/llm.py
new file mode 100644
index 0000000..24598a9
--- /dev/null
+++ b/app/api/llm.py
@@ -0,0 +1,17 @@
+from fastapi import APIRouter, Depends
+from app.api import Response, get_current_user
+from app.models.base_model import get_db
+from app.models.user_model import UserModel
+from app.service.llm import get_llm_list
+
+
+llm_router = APIRouter()
+
+
+@llm_router.get("/list", response_model=Response)
+async def llm_list(
+ db=Depends(get_db),
+ current_user: UserModel = Depends(get_current_user),
+):
+ getllmlist = await get_llm_list(db, current_user.id)
+ return Response(code=200, msg="", data=getllmlist)
diff --git a/app/models/llm_model.py b/app/models/llm_model.py
index d80b419..ece2152 100644
--- a/app/models/llm_model.py
+++ b/app/models/llm_model.py
@@ -23,7 +23,7 @@
def to_json(self):
json = {
- 'id': self.ID,
+ 'id': self.id,
'llm_factory': self.llm_factory,
'model_type': self.model_type,
'llm_name': self.llm_name,
diff --git a/app/service/knowledge.py b/app/service/knowledge.py
index c0121fa..043db0f 100644
--- a/app/service/knowledge.py
+++ b/app/service/knowledge.py
@@ -1,26 +1,26 @@
-from app.models import KnowledgeModel, GroupModel
+from app.models import KnowledgeModel, group_knowledge_table
from app.models.user_model import UserModel
from Log import logger
-async def get_knowledge_list(db, user_id):
+async def get_knowledge_list(db, user_id, page_size, page_index):
user = db.query(UserModel).filter(UserModel.id == user_id).first()
if user is None:
return {"rows": []}
if user.permission == "admin":
- kld_list = db.query(KnowledgeModel).all()
+ query = db.query(KnowledgeModel)
else:
- user = db.query(UserModel).filter(UserModel.id == user_id).first()
-
group_list = [i.id for i in user.groups]
-
- kld_list = db.query(KnowledgeModel).filter(KnowledgeModel.tenant_id == user_id).all()
- kld_set = set([i.id for i in kld_list])
- for group in db.query(GroupModel).filter(GroupModel.id.in_(group_list)).all():
- for k in group.knowledges:
- if k.id not in kld_set:
- kld_list.append(k)
- kld_set.add(k.id)
-
- return {"rows": [kld.to_json() for kld in kld_list]}
-
+ query = db.query(KnowledgeModel)
+ query = query.filter(KnowledgeModel.tenant_id == user_id)
+ query = query.union(
+ db.query(KnowledgeModel).join(
+ group_knowledge_table,
+ KnowledgeModel.id == group_knowledge_table.c.knowledge_id
+ ).filter(
+ group_knowledge_table.c.group_id.in_(group_list)
+ )
+ )
+ if page_size:
+ query = query.limit(page_size).offset((page_index - 1) * page_size)
+ return {"rows": [kld.to_json() for kld in query.all()]}
diff --git a/app/service/llm.py b/app/service/llm.py
new file mode 100644
index 0000000..d26a448
--- /dev/null
+++ b/app/service/llm.py
@@ -0,0 +1,22 @@
+from app.models import CommonLlmModel, group_llm_table
+from app.models.user_model import UserModel
+
+
+async def get_llm_list(db, user_id):
+ user = db.query(UserModel).filter(UserModel.id == user_id).first()
+ if user is None:
+ return {"rows": []}
+ if user.permission == "admin":
+ 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)
+ )
+ )
+ return {"rows": [kld.to_json() for kld in query.all()]}
\ No newline at end of file
diff --git a/main.py b/main.py
index ea704da..0c77e3c 100644
--- a/main.py
+++ b/main.py
@@ -12,6 +12,7 @@
from app.api.excel import router as excel_router
from app.api.files import router as files_router
from app.api.knowledge import knowledge_router
+from app.api.llm import llm_router
from app.api.organization import dept_router
from app.api.public_api import public_api
from app.api.report import router as report_router
@@ -70,6 +71,7 @@
app.include_router(dept_router, prefix='/api/dept', tags=["dept"])
app.include_router(menu_router, prefix='/api/menu', tags=["menu"])
app.include_router(knowledge_router, prefix='/api/knowledge', tags=["knowledge"])
+app.include_router(llm_router, prefix='/api/llm', tags=["llm"])
app.include_router(dialog_router, prefix='/api/dialog', tags=["dialog"])
app.include_router(canvas_router, prefix='/api/canvas', tags=["canvas"])
# app.include_router(sync_router, prefix='/api/sync', tags=["sync"])
--
Gitblit v1.8.0