增加删除

zhaoqingang

2024-11-19 9c275b214f9619a64cd2998596ce696610185eb4

 app/api/auth.py

@@ -1,12 +1,12 @@
from fastapi import APIRouter, Depends, Request
from fastapi.security import OAuth2PasswordBearer
from passlib.context import CryptContext
import json

from fastapi import APIRouter, Depends
from sqlalchemy.orm import Session

from app.api import Response, pwd_context, oauth2_scheme, get_current_user
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
@@ -16,32 +16,31 @@
router = APIRouter()




@router.post("/register", response_model=Response)
async def register(user: UserCreate, db=Depends(get_db)):
    db_user = db.query(UserModel).filter(UserModel.username == user.username).first()
    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)}")

    # 注册到ragflow
    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)
@@ -54,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:
@@ -79,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,
    })