From a8e620d89ca5345b5e1cec77e7d1a41bb476816a Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 5 Dec 2023 18:16:11 -0300 Subject: [PATCH] Refactor user CRUD functions --- .../langflow/services/database/models/user/crud.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/backend/langflow/services/database/models/user/crud.py b/src/backend/langflow/services/database/models/user/crud.py index 75ce56038..e8f58735c 100644 --- a/src/backend/langflow/services/database/models/user/crud.py +++ b/src/backend/langflow/services/database/models/user/crud.py @@ -1,22 +1,21 @@ from datetime import datetime, timezone -from typing import Union +from typing import Optional, Union from uuid import UUID + from fastapi import Depends, HTTPException, status from langflow.services.database.models.user.model import User, UserUpdate from langflow.services.deps import get_session from sqlalchemy.exc import IntegrityError -from sqlmodel import Session -from typing import Optional - from sqlalchemy.orm.attributes import flag_modified +from sqlmodel import Session, select def get_user_by_username(db: Session, username: str) -> Union[User, None]: - return db.query(User).filter(User.username == username).first() + return db.exec(select(User).where(User.username == username)).first() def get_user_by_id(db: Session, id: UUID) -> Union[User, None]: - return db.query(User).filter(User.id == id).first() + return db.exec(select(User).where(User.id == id)).first() def update_user(user_db: Optional[User], user: UserUpdate, db: Session = Depends(get_session)) -> User: @@ -27,7 +26,7 @@ def update_user(user_db: Optional[User], user: UserUpdate, db: Session = Depends # if user_db_by_username and user_db_by_username.id != user_id: # raise HTTPException(status_code=409, detail="Username already exists") - user_data = user.dict(exclude_unset=True) + user_data = user.model_dump(exclude_unset=True) changed = False for attr, value in user_data.items(): if hasattr(user_db, attr) and value is not None: