From 041b39822581c623721b09b892c37573573ab816 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 04 十二月 2024 09:33:46 +0800
Subject: [PATCH] 文档报告生成
---
app/api/auth.py | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index 0011ee9..6e74966 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -2,16 +2,20 @@
from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
-
+from sqlalchemy.ext.asyncio import AsyncSession
from app.api import Response, pwd_context, get_current_user
from app.config.config import settings
+from app.models.app_token_model import AppToken
from app.models.base_model import get_db
+from app.models.postgresql_base_model import get_pdb
from app.models.token_model import upsert_token, get_token
from app.models.user import UserCreate, LoginData
from app.models.user_model import UserModel
from app.service.auth import authenticate_user, create_access_token
from app.service.bisheng import BishengService
from app.service.ragflow import RagflowService
+from sqlalchemy.future import select
+
router = APIRouter()
@@ -40,6 +44,7 @@
# 瀛樺偍鐢ㄦ埛淇℃伅
hashed_password = pwd_context.hash(user.password)
db_user = UserModel(username=user.username, hashed_password=hashed_password, email=ragflow_info.get("email", f"{user.username}@example.com"),ragflow_id=ragflow_info.get("id"),bisheng_id=bisheng_info.get("user_id"))
+ db_user.password = db_user.encrypted_password(user.password)
db.add(db_user)
db.commit()
db.refresh(db_user)
@@ -77,7 +82,7 @@
"token_type": "bearer",
"username": user.username,
"nickname": "",
- "user": user.to_json()
+ "user": user.to_login_json()
})
@@ -90,3 +95,51 @@
return Response(code=200, msg="success", data={
"ragflow_token": token.ragflow_token,
})
+
+
+@router.post("/login_test", response_model=Response)
+async def login_test(login_data: LoginData, db: Session = Depends(get_db), pdb: AsyncSession = Depends(get_pdb)):
+ user = authenticate_user(db, login_data.username, login_data.password)
+ if not user:
+ return Response(code=400, msg="Incorrect username or password")
+
+ bisheng_service = BishengService(settings.sgb_base_url)
+ ragflow_service = RagflowService(settings.fwr_base_url)
+
+ # 鐧诲綍鍒版瘯鏄�
+ try:
+ bisheng_token = await bisheng_service.login(login_data.username, login_data.password)
+ except Exception as e:
+ return Response(code=500, msg=f"Failed to login with Bisheng: {str(e)}")
+
+ # 鐧诲綍鍒皉agflow
+ try:
+ ragflow_token = await ragflow_service.login(login_data.username, login_data.password)
+ except Exception as e:
+ return Response(code=500, msg=f"Failed to login with Ragflow: {str(e)}")
+
+ # 鍒涘缓鏈湴token
+ access_token = create_access_token(data={"sub": user.username, "user_id": user.id})
+
+ upsert_token(db, user.id, access_token, bisheng_token, ragflow_token)
+ result = await pdb.execute(select(AppToken).where(AppToken.id == user.id))
+ db_app_token = result.scalars().first()
+ if not db_app_token:
+ app_token_str = json.dumps({"rag_token": ragflow_token, "bs_token":bisheng_token})
+ # print(app_token_str)
+ app_token = AppToken(id=user.id, token=access_token.decode(), app_token=app_token_str)
+ pdb.add(app_token)
+ await pdb.commit()
+ await pdb.refresh(app_token)
+ else:
+ db_app_token.token = access_token.decode()
+ db_app_token.app_token = json.dumps({"rag_token": ragflow_token, "bs_token":bisheng_token})
+ await pdb.commit()
+ await pdb.refresh(db_app_token)
+ return Response(code=200, msg="Login successful", data={
+ "access_token": access_token,
+ "token_type": "bearer",
+ "username": user.username,
+ "nickname": "",
+ # "user": user.to_login_json()
+ })
--
Gitblit v1.8.0