From 0ad20a631808fcc255a8739d0ea27bfe044f4ea0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 十一月 2024 17:07:31 +0800
Subject: [PATCH] 请求basic_agent换成requests库，保存消息是不再保存中间结果
---
app/api/auth.py | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/app/api/auth.py b/app/api/auth.py
index 588d7c8..72b0bbf 100644
--- a/app/api/auth.py
+++ b/app/api/auth.py
@@ -1,10 +1,12 @@
+import json
+
from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session
-from app.api import Response, pwd_context
+from app.api import Response, pwd_context, get_current_user
from app.config.config import settings
from app.models.base_model import get_db
-from app.models.token_model import upsert_token
+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
@@ -20,24 +22,25 @@
if db_user:
return Response(code=200, msg="Username already registered")
- bisheng_service = BishengService(settings.bisheng_base_url)
- ragflow_service = RagflowService(settings.ragflow_base_url)
+ bisheng_service = BishengService(settings.sgb_base_url)
+ ragflow_service = RagflowService(settings.fwr_base_url)
# 娉ㄥ唽鍒版瘯鏄�
try:
- await bisheng_service.register(user.username, user.password)
+ bisheng_info = await bisheng_service.register(user.username, user.password)
except Exception as e:
return Response(code=500, msg=f"Failed to register with Bisheng: {str(e)}")
# 娉ㄥ唽鍒皉agflow
try:
- await ragflow_service.register(user.username, user.password)
+ ragflow_info = await ragflow_service.register(user.username, user.password)
except Exception as e:
return Response(code=500, msg=f"Failed to register with Ragflow: {str(e)}")
# 瀛樺偍鐢ㄦ埛淇℃伅
hashed_password = pwd_context.hash(user.password)
- db_user = UserModel(username=user.username, hashed_password=hashed_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)
@@ -50,8 +53,8 @@
if not user:
return Response(code=400, msg="Incorrect username or password")
- bisheng_service = BishengService(settings.bisheng_base_url)
- ragflow_service = RagflowService(settings.ragflow_base_url)
+ bisheng_service = BishengService(settings.sgb_base_url)
+ ragflow_service = RagflowService(settings.fwr_base_url)
# 鐧诲綍鍒版瘯鏄�
try:
@@ -75,4 +78,16 @@
"token_type": "bearer",
"username": user.username,
"nickname": "",
+ "user": user.to_login_json()
+ })
+
+
+@router.get("/token", response_model=Response)
+async def token_api(db: Session = Depends(get_db), current_user: UserModel = Depends(get_current_user)):
+ # 鏌ヨ鐜版湁璁板綍
+ token = get_token(db, current_user.id)
+ if token is None:
+ return Response(code=400, msg="token not found")
+ return Response(code=200, msg="success", data={
+ "ragflow_token": token.ragflow_token,
})
--
Gitblit v1.8.0