From 5388423e0e23aa8c3b7088a1ebff70ef55e996bf Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 5 Dec 2023 18:39:20 -0300 Subject: [PATCH] Fix formatting issues in code --- src/backend/langflow/__main__.py | 3 +-- src/backend/langflow/api/v1/credential.py | 19 ++++++--------- src/backend/langflow/api/v1/endpoints.py | 23 +++++++++---------- src/backend/langflow/api/v1/flows.py | 3 +-- src/backend/langflow/api/v1/users.py | 15 ++++++------ src/backend/langflow/processing/process.py | 3 +-- .../langflow/services/credentials/service.py | 8 +++++-- .../langflow/services/database/service.py | 5 +--- src/backend/langflow/services/utils.py | 9 +++----- tests/conftest.py | 1 + tests/test_setup_superuser.py | 3 +-- 11 files changed, 41 insertions(+), 51 deletions(-) diff --git a/src/backend/langflow/__main__.py b/src/backend/langflow/__main__.py index 661b78063..5b10ba40f 100644 --- a/src/backend/langflow/__main__.py +++ b/src/backend/langflow/__main__.py @@ -12,8 +12,7 @@ from dotenv import load_dotenv from langflow.main import setup_app from langflow.services.database.utils import session_getter from langflow.services.deps import get_db_service, get_settings_service -from langflow.services.utils import (initialize_services, - initialize_settings_service) +from langflow.services.utils import initialize_services, initialize_settings_service from langflow.utils.logger import configure, logger from multiprocess import Process, cpu_count # type: ignore from rich import box diff --git a/src/backend/langflow/api/v1/credential.py b/src/backend/langflow/api/v1/credential.py index 3c71e7e3a..1026319c4 100644 --- a/src/backend/langflow/api/v1/credential.py +++ b/src/backend/langflow/api/v1/credential.py @@ -4,10 +4,7 @@ from uuid import UUID from fastapi import APIRouter, Depends, HTTPException from langflow.services.auth import utils as auth_utils from langflow.services.auth.utils import get_current_active_user -from langflow.services.database.models.credential import (Credential, - CredentialCreate, - CredentialRead, - CredentialUpdate) +from langflow.services.database.models.credential import Credential, CredentialCreate, CredentialRead, CredentialUpdate from langflow.services.database.models.user.model import User from langflow.services.deps import get_session, get_settings_service from sqlmodel import Session, select @@ -26,10 +23,9 @@ def create_credential( """Create a new credential.""" try: # check if credential name already exists - credential_exists = ( - session.exec(select(Credential).where(Credential.name == credential.name, Credential.user_id == current_user.id)) - .first() - ) + credential_exists = session.exec( + select(Credential).where(Credential.name == credential.name, Credential.user_id == current_user.id) + ).first() if credential_exists: raise HTTPException(status_code=400, detail="Credential name already exists") @@ -73,10 +69,9 @@ def update_credential( ): """Update a credential.""" try: - db_credential = ( - session.exec(select(Credential).where(Credential.id == credential_id, Credential.user_id == current_user.id)) - .first() - ) + db_credential = session.exec( + select(Credential).where(Credential.id == credential_id, Credential.user_id == current_user.id) + ).first() if not db_credential: raise HTTPException(status_code=404, detail="Credential not found") diff --git a/src/backend/langflow/api/v1/endpoints.py b/src/backend/langflow/api/v1/endpoints.py index 077b2b674..d4bb083ef 100644 --- a/src/backend/langflow/api/v1/endpoints.py +++ b/src/backend/langflow/api/v1/endpoints.py @@ -4,21 +4,22 @@ from typing import Annotated, Optional, Union import sqlalchemy as sa from fastapi import APIRouter, Body, Depends, HTTPException, UploadFile, status from langflow.api.utils import update_frontend_node_with_template_values -from langflow.api.v1.schemas import (CustomComponentCode, ProcessResponse, - TaskResponse, TaskStatusResponse, - UploadFileResponse) +from langflow.api.v1.schemas import ( + CustomComponentCode, + ProcessResponse, + TaskResponse, + TaskStatusResponse, + UploadFileResponse, +) from langflow.interface.custom.custom_component import CustomComponent from langflow.interface.custom.directory_reader import DirectoryReader -from langflow.interface.types import (build_custom_component_template, - create_and_validate_component) +from langflow.interface.types import build_custom_component_template, create_and_validate_component from langflow.processing.process import process_graph_cached, process_tweaks -from langflow.services.auth.utils import (api_key_security, - get_current_active_user) +from langflow.services.auth.utils import api_key_security, get_current_active_user from langflow.services.cache.utils import save_uploaded_file from langflow.services.database.models.flow import Flow from langflow.services.database.models.user.model import User -from langflow.services.deps import (get_session, get_session_service, - get_settings_service, get_task_service) +from langflow.services.deps import get_session, get_session_service, get_settings_service, get_task_service from loguru import logger from sqlmodel import select @@ -84,9 +85,7 @@ async def process( # Get the flow that matches the flow_id and belongs to the user # flow = session.query(Flow).filter(Flow.id == flow_id).filter(Flow.user_id == api_key_user.id).first() - flow = session.exec( - select(Flow).where(Flow.id == flow_id).where(Flow.user_id == api_key_user.id) - ).first() + flow = session.exec(select(Flow).where(Flow.id == flow_id).where(Flow.user_id == api_key_user.id)).first() if flow is None: raise ValueError(f"Flow {flow_id} not found") diff --git a/src/backend/langflow/api/v1/flows.py b/src/backend/langflow/api/v1/flows.py index 5e91cc2cc..28c11dfb4 100644 --- a/src/backend/langflow/api/v1/flows.py +++ b/src/backend/langflow/api/v1/flows.py @@ -8,8 +8,7 @@ from fastapi.encoders import jsonable_encoder from langflow.api.utils import remove_api_keys, validate_is_component from langflow.api.v1.schemas import FlowListCreate, FlowListRead from langflow.services.auth.utils import get_current_active_user -from langflow.services.database.models.flow import (Flow, FlowCreate, FlowRead, - FlowUpdate) +from langflow.services.database.models.flow import Flow, FlowCreate, FlowRead, FlowUpdate from langflow.services.database.models.user.model import User from langflow.services.deps import get_session, get_settings_service from sqlmodel import Session, select diff --git a/src/backend/langflow/api/v1/users.py b/src/backend/langflow/api/v1/users.py index 535fe613c..9d4c3f32e 100644 --- a/src/backend/langflow/api/v1/users.py +++ b/src/backend/langflow/api/v1/users.py @@ -2,13 +2,14 @@ from uuid import UUID from fastapi import APIRouter, Depends, HTTPException from langflow.api.v1.schemas import UsersResponse -from langflow.services.auth.utils import (get_current_active_superuser, - get_current_active_user, - get_password_hash, verify_password) -from langflow.services.database.models.user import (User, UserCreate, UserRead, - UserUpdate) -from langflow.services.database.models.user.crud import (get_user_by_id, - update_user) +from langflow.services.auth.utils import ( + get_current_active_superuser, + get_current_active_user, + get_password_hash, + verify_password, +) +from langflow.services.database.models.user import User, UserCreate, UserRead, UserUpdate +from langflow.services.database.models.user.crud import get_user_by_id, update_user from langflow.services.deps import get_session, get_settings_service from sqlalchemy import func from sqlalchemy.exc import IntegrityError diff --git a/src/backend/langflow/processing/process.py b/src/backend/langflow/processing/process.py index 171c0d599..de0890802 100644 --- a/src/backend/langflow/processing/process.py +++ b/src/backend/langflow/processing/process.py @@ -8,8 +8,7 @@ from langchain.chains.base import Chain from langchain.schema import AgentAction, Document from langchain.vectorstores.base import VectorStore from langflow.graph import Graph -from langflow.interface.run import (build_sorted_vertices, get_memory_key, - update_memory_keys) +from langflow.interface.run import build_sorted_vertices, get_memory_key, update_memory_keys from langflow.services.deps import get_session_service from loguru import logger from pydantic import BaseModel diff --git a/src/backend/langflow/services/credentials/service.py b/src/backend/langflow/services/credentials/service.py index 3b7810419..08e04fdaa 100644 --- a/src/backend/langflow/services/credentials/service.py +++ b/src/backend/langflow/services/credentials/service.py @@ -21,13 +21,17 @@ class CredentialService(Service): def get_credential(self, user_id: Union[UUID, str], name: str, session: Session = Depends(get_session)) -> str: # we get the credential from the database # credential = session.query(Credential).filter(Credential.user_id == user_id, Credential.name == name).first() - credential = session.exec(select(Credential).where(Credential.user_id == user_id, Credential.name == name)).first() + credential = session.exec( + select(Credential).where(Credential.user_id == user_id, Credential.name == name) + ).first() # we decrypt the value if not credential or not credential.value: raise ValueError(f"{name} credential not found.") decrypted = auth_utils.decrypt_api_key(credential.value, settings_service=self.settings_service) return decrypted - def list_credentials(self, user_id: Union[UUID, str], session: Session = Depends(get_session)) -> list[Optional[str]]: + def list_credentials( + self, user_id: Union[UUID, str], session: Session = Depends(get_session) + ) -> list[Optional[str]]: credentials = session.exec(select(Credential).where(Credential.user_id == user_id)).all() return [credential.name for credential in credentials] diff --git a/src/backend/langflow/services/database/service.py b/src/backend/langflow/services/database/service.py index c375cfe70..3610f0dea 100644 --- a/src/backend/langflow/services/database/service.py +++ b/src/backend/langflow/services/database/service.py @@ -64,10 +64,7 @@ class DatabaseService(Service): settings_service = get_settings_service() if settings_service.auth_settings.AUTO_LOGIN: with Session(self.engine) as session: - flows = ( - session.exec(select(models.Flow) - .where(models.Flow.user_id == None)).all() - ) + flows = session.exec(select(models.Flow).where(models.Flow.user_id is None)).all() if flows: logger.debug("Migrating flows to default superuser") username = settings_service.auth_settings.SUPERUSER diff --git a/src/backend/langflow/services/utils.py b/src/backend/langflow/services/utils.py index 8f44b114d..1e8738ac0 100644 --- a/src/backend/langflow/services/utils.py +++ b/src/backend/langflow/services/utils.py @@ -2,8 +2,7 @@ from langflow.services.auth.utils import create_super_user, verify_password from langflow.services.database.utils import initialize_database from langflow.services.manager import service_manager from langflow.services.schema import ServiceType -from langflow.services.settings.constants import (DEFAULT_SUPERUSER, - DEFAULT_SUPERUSER_PASSWORD) +from langflow.services.settings.constants import DEFAULT_SUPERUSER, DEFAULT_SUPERUSER_PASSWORD from loguru import logger from sqlmodel import Session, select @@ -16,8 +15,7 @@ def get_factories_and_deps(): from langflow.services.chat import factory as chat_factory from langflow.services.credentials import factory as credentials_factory from langflow.services.database import factory as database_factory - from langflow.services.session import \ - factory as session_service_factory # type: ignore + from langflow.services.session import factory as session_service_factory # type: ignore from langflow.services.settings import factory as settings_factory from langflow.services.store import factory as store_factory from langflow.services.task import factory as task_factory @@ -173,8 +171,7 @@ def initialize_session_service(): Initialize the session manager. """ from langflow.services.cache import factory as cache_factory - from langflow.services.session import \ - factory as session_service_factory # type: ignore + from langflow.services.session import factory as session_service_factory # type: ignore initialize_settings_service() diff --git a/tests/conftest.py b/tests/conftest.py index 770a01918..ce279162f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,5 @@ import json + # we need to import tmpdir import tempfile from contextlib import contextmanager, suppress diff --git a/tests/test_setup_superuser.py b/tests/test_setup_superuser.py index e8951258f..03d3882fb 100644 --- a/tests/test_setup_superuser.py +++ b/tests/test_setup_superuser.py @@ -1,7 +1,6 @@ from unittest.mock import MagicMock, patch -from langflow.services.settings.constants import (DEFAULT_SUPERUSER, - DEFAULT_SUPERUSER_PASSWORD) +from langflow.services.settings.constants import DEFAULT_SUPERUSER, DEFAULT_SUPERUSER_PASSWORD from langflow.services.utils import teardown_superuser # @patch("langflow.services.deps.get_session")