🐛 fix(endpoints.py): change get_all function signature to include settings_manager as a dependency to improve code readability

🐛 fix(flows.py): change update_flow function signature to include settings_manager as a dependency to improve code readability
🐛 fix(login.py): change auto_login function signature to include settings_manager as a dependency to improve code readability
🐛 fix(users.py): change add_user function signature to include session as a dependency to improve code readability
🐛 fix(users.py): change read_all_users function signature to include session as a dependency to improve code readability
🐛 fix(users.py): change patch_user function signature to include session as a dependency to improve code readability
🐛 fix(users.py): change delete_user function signature to include session as a dependency to improve code readability
🐛 fix(users.py): change add_super_user_for_testing_purposes_delete_me_before_merge_into_dev function signature to include session as a dependency to improve code readability

src/backend/langflow/api/v1/endpoints.py

@@ -34,14 +34,15 @@ from sqlmodel import Session
 router = APIRouter(tags=["Base"])
 
 
-@router.get("/all")
-def get_all(current_user: User = Depends(get_current_active_user)):
+@router.get("/all", dependencies=[Depends(get_current_active_user)])
+def get_all(
+    settings_manager=Depends(get_settings_manager),
+):
     logger.debug("Building langchain types dict")
     native_components = build_langchain_types_dict()
     # custom_components is a list of dicts
     # need to merge all the keys into one dict
     custom_components_from_file: dict[str, Any] = {}
-    settings_manager = get_settings_manager()
     if settings_manager.settings.COMPONENTS_PATH:
         logger.info(
             f"Building custom components from {settings_manager.settings.COMPONENTS_PATH}"

src/backend/langflow/api/v1/flows.py

@@ -83,6 +83,7 @@ def update_flow(
     flow_id: UUID,
     flow: FlowUpdate,
     current_user: User = Depends(get_current_active_user),
+    settings_manager=Depends(get_settings_manager),
 ):
     """Update a flow."""
 
@@ -90,7 +91,6 @@ def update_flow(
     if not db_flow:
         raise HTTPException(status_code=404, detail="Flow not found")
     flow_data = flow.dict(exclude_unset=True)
-    settings_manager = get_settings_manager()
     if settings_manager.settings.REMOVE_API_KEYS:
         flow_data = remove_api_keys(flow_data)
     for key, value in flow_data.items():

src/backend/langflow/api/v1/login.py

@@ -34,9 +34,9 @@ async def login_to_get_access_token(
 
 
 @router.get("/auto_login")
-async def auto_login(db: Session = Depends(get_session)):
-    settings_manager = get_settings_manager()
-
+async def auto_login(
+    db: Session = Depends(get_session), settings_manager=Depends(get_settings_manager)
+):
     if settings_manager.auth_settings.AUTO_LOGIN:
         return create_user_longterm_token(db)
 

src/backend/langflow/api/v1/users.py

@@ -29,7 +29,7 @@ router = APIRouter(tags=["Users"])
 @router.post("/user", response_model=UserRead, status_code=201)
 def add_user(
     user: UserCreate,
-    db: Session = Depends(get_session),
+    session: Session = Depends(get_session),
 ) -> User:
     """
     Add a new user to the database.
@@ -38,11 +38,11 @@ def add_user(
     try:
         new_user.password = get_password_hash(user.password)
 
-        db.add(new_user)
-        db.commit()
-        db.refresh(new_user)
+        session.add(new_user)
+        session.commit()
+        session.refresh(new_user)
     except IntegrityError as e:
-        db.rollback()
+        session.rollback()
         raise HTTPException(
             status_code=400, detail="This username is unavailable."
         ) from e
@@ -65,16 +65,16 @@ def read_all_users(
     skip: int = 0,
     limit: int = 10,
     current_user: Session = Depends(get_current_active_superuser),
-    db: Session = Depends(get_session),
+    session: Session = Depends(get_session),
 ) -> UsersResponse:
     """
     Retrieve a list of users from the database with pagination.
     """
     query = select(User).offset(skip).limit(limit)
-    users = db.execute(query).fetchall()
+    users = session.execute(query).fetchall()
 
     count_query = select(func.count()).select_from(User)  # type: ignore
-    total_count = db.execute(count_query).scalar()
+    total_count = session.execute(count_query).scalar()
 
     return UsersResponse(
         total_count=total_count,  # type: ignore
@@ -87,19 +87,19 @@ def patch_user(
     user_id: UUID,
     user: UserUpdate,
     _: Session = Depends(get_current_active_user),
-    db: Session = Depends(get_session),
+    session: Session = Depends(get_session),
 ) -> User:
     """
     Update an existing user's data.
     """
-    return update_user(user_id, user, db)
+    return update_user(user_id, user, session)
 
 
 @router.delete("/user/{user_id}")
 def delete_user(
     user_id: UUID,
     current_user: User = Depends(get_current_active_superuser),
-    db: Session = Depends(get_session),
+    session: Session = Depends(get_session),
 ) -> dict:
     """
     Delete a user from the database.
@@ -113,12 +113,12 @@ def delete_user(
             status_code=403, detail="You don't have the permission to delete this user"
         )
 
-    user_db = db.query(User).filter(User.id == user_id).first()
+    user_db = session.query(User).filter(User.id == user_id).first()
     if not user_db:
         raise HTTPException(status_code=404, detail="User not found")
 
-    db.delete(user_db)
-    db.commit()
+    session.delete(user_db)
+    session.commit()
 
     return {"detail": "User deleted"}
 
@@ -126,7 +126,7 @@ def delete_user(
 # TODO: REMOVE - Just for testing purposes
 @router.post("/super_user", response_model=User)
 def add_super_user_for_testing_purposes_delete_me_before_merge_into_dev(
-    db: Session = Depends(get_session),
+    session: Session = Depends(get_session),
 ) -> User:
     """
     Add a superuser for testing purposes.
@@ -141,11 +141,11 @@ def add_super_user_for_testing_purposes_delete_me_before_merge_into_dev(
     )
 
     try:
-        db.add(new_user)
-        db.commit()
-        db.refresh(new_user)
+        session.add(new_user)
+        session.commit()
+        session.refresh(new_user)
     except IntegrityError as e:
-        db.rollback()
+        session.rollback()
         raise HTTPException(status_code=400, detail="User exists") from e
 
     return new_user