From 057f034d4cd728c1bd0284e7c6b4a47739d5220d Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 12 十二月 2024 19:57:41 +0800
Subject: [PATCH] yonghu
---
app/service/service_token.py | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/app/service/service_token.py b/app/service/service_token.py
index 215353b..dd6b1e3 100644
--- a/app/service/service_token.py
+++ b/app/service/service_token.py
@@ -1,10 +1,12 @@
from Log import logger
from app.config.config import settings
-from app.config.const import BISHENG, RAGFLOW
-from app.models import UserModel
+from app.config.const import BISHENG, RAGFLOW, DIFY
+from app.models import UserModel, UserAppModel
+from app.models.base_model import SessionLocal
from app.models.token_model import TokenModel
from app.service.auth import UserAppDao
from app.service.bisheng import BishengService
+from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
@@ -28,11 +30,19 @@
return token.access_token
return token.ragflow_token
-async def get_ragflow_new_token(db, user_id: int, app_type):
- user = db.query(UserModel).filter(UserModel.id == user_id).first()
+async def get_dify_token(db, user_id: int):
+
+ token = await UserAppDao(db).get_data_by_id(user_id, DIFY)
+ if not token:
+ return None
+ return token.access_token
+
+async def get_new_token(db, user_id: int, app_type):
+ # user = db.query(UserModel).filter(UserModel.id == user_id).first()
+ user = db.query(UserAppModel).filter(UserAppModel.user_id == user_id, UserAppModel.app_type==app_type).first()
if not user:
return None
- if app_type == 1:
+ if app_type == RAGFLOW:
ragflow_service = RagflowService(settings.fwr_base_url)
# 鐧诲綍鍒皉agflow
try:
@@ -42,7 +52,7 @@
logger.error(e)
# return Response(code=500, msg=f"Failed to login with Ragflow: {str(e)}")
return None
- elif app_type == 2:
+ elif app_type == BISHENG:
bisheng_service = BishengService(settings.sgb_base_url)
# 鐧诲綍鍒版瘯鏄�
try:
@@ -53,6 +63,48 @@
# return Response(code=500, msg=f"Failed to login with Ragflow: {str(e)}")
return None
+ elif app_type == DIFY:
+ dify_service = DifyService(settings.dify_base_url)
+ # 鐧诲綍鍒版瘯鏄�
+ try:
+ dify_token = await dify_service.login(user.username, user.decrypted_password())
+ return dify_token
+ except Exception as e:
+ logger.error(e)
+ # return Response(code=500, msg=f"Failed to login with Ragflow: {str(e)}")
+ return None
+
else:
logger.error("閿欒鐨勫簲鐢ㄧ被鍨媨}".format(app_type))
+
+async def get_token(db, user_id: int):
+ res = {i.app_type.replace("app", "token"): i.access_token for i in await UserAppDao(db).get_user_datas(user_id)}
+ if not res:
+ token = db.query(TokenModel).filter_by(user_id=user_id).first()
+ res = {"ragflow_token": token.ragflow_token, "bisheng_token": token.bisheng_token}
+ return res
+
+
+async def update_user_group(db, user_id):
+ admin_user = db.query(UserModel).filter(UserModel.permission == "admin").first()
+ token = await get_new_token(db, admin_user.id, RAGFLOW)
+ # print(token)
+ if not token:
+ logger.error("娉ㄥ唽鐢ㄦ埛鑾峰彇token澶辫触锛�")
+ return False
+ user_list = db.query(UserAppModel).filter(UserAppModel.app_type==RAGFLOW).all()
+ user = db.query(UserAppModel).filter(UserAppModel.user_id==user_id, UserAppModel.app_type == RAGFLOW).first()
+ if not user:
+ logger.error("娉ㄥ唽鐢ㄦ埛鑾峰彇淇℃伅澶辫触锛�")
+ return False
+ ragflow_service = RagflowService(settings.fwr_base_url)
+ for u in user_list:
+ if u.id and user.id != u.id:
+ # print(user.id, u.id)
+ await ragflow_service.add_user_tenant(token,u.app_id,
+ user.email,
+ user.app_id)
+ await ragflow_service.add_user_tenant(token, user.app_id,
+ u.email,
+ u.app_id)
\ No newline at end of file
--
Gitblit v1.8.0