Fix formatting issues in code

This commit is contained in:
Gabriel Luiz Freitas Almeida 2023-12-05 18:39:20 -03:00
commit 5388423e0e
11 changed files with 41 additions and 51 deletions

View file

@ -12,8 +12,7 @@ from dotenv import load_dotenv
from langflow.main import setup_app from langflow.main import setup_app
from langflow.services.database.utils import session_getter from langflow.services.database.utils import session_getter
from langflow.services.deps import get_db_service, get_settings_service from langflow.services.deps import get_db_service, get_settings_service
from langflow.services.utils import (initialize_services, from langflow.services.utils import initialize_services, initialize_settings_service
initialize_settings_service)
from langflow.utils.logger import configure, logger from langflow.utils.logger import configure, logger
from multiprocess import Process, cpu_count # type: ignore from multiprocess import Process, cpu_count # type: ignore
from rich import box from rich import box

View file

@ -4,10 +4,7 @@ from uuid import UUID
from fastapi import APIRouter, Depends, HTTPException from fastapi import APIRouter, Depends, HTTPException
from langflow.services.auth import utils as auth_utils from langflow.services.auth import utils as auth_utils
from langflow.services.auth.utils import get_current_active_user from langflow.services.auth.utils import get_current_active_user
from langflow.services.database.models.credential import (Credential, from langflow.services.database.models.credential import Credential, CredentialCreate, CredentialRead, CredentialUpdate
CredentialCreate,
CredentialRead,
CredentialUpdate)
from langflow.services.database.models.user.model import User from langflow.services.database.models.user.model import User
from langflow.services.deps import get_session, get_settings_service from langflow.services.deps import get_session, get_settings_service
from sqlmodel import Session, select from sqlmodel import Session, select
@ -26,10 +23,9 @@ def create_credential(
"""Create a new credential.""" """Create a new credential."""
try: try:
# check if credential name already exists # check if credential name already exists
credential_exists = ( credential_exists = session.exec(
session.exec(select(Credential).where(Credential.name == credential.name, Credential.user_id == current_user.id)) select(Credential).where(Credential.name == credential.name, Credential.user_id == current_user.id)
.first() ).first()
)
if credential_exists: if credential_exists:
raise HTTPException(status_code=400, detail="Credential name already exists") raise HTTPException(status_code=400, detail="Credential name already exists")
@ -73,10 +69,9 @@ def update_credential(
): ):
"""Update a credential.""" """Update a credential."""
try: try:
db_credential = ( db_credential = session.exec(
session.exec(select(Credential).where(Credential.id == credential_id, Credential.user_id == current_user.id)) select(Credential).where(Credential.id == credential_id, Credential.user_id == current_user.id)
.first() ).first()
)
if not db_credential: if not db_credential:
raise HTTPException(status_code=404, detail="Credential not found") raise HTTPException(status_code=404, detail="Credential not found")

View file

@ -4,21 +4,22 @@ from typing import Annotated, Optional, Union
import sqlalchemy as sa import sqlalchemy as sa
from fastapi import APIRouter, Body, Depends, HTTPException, UploadFile, status from fastapi import APIRouter, Body, Depends, HTTPException, UploadFile, status
from langflow.api.utils import update_frontend_node_with_template_values from langflow.api.utils import update_frontend_node_with_template_values
from langflow.api.v1.schemas import (CustomComponentCode, ProcessResponse, from langflow.api.v1.schemas import (
TaskResponse, TaskStatusResponse, CustomComponentCode,
UploadFileResponse) ProcessResponse,
TaskResponse,
TaskStatusResponse,
UploadFileResponse,
)
from langflow.interface.custom.custom_component import CustomComponent from langflow.interface.custom.custom_component import CustomComponent
from langflow.interface.custom.directory_reader import DirectoryReader from langflow.interface.custom.directory_reader import DirectoryReader
from langflow.interface.types import (build_custom_component_template, from langflow.interface.types import build_custom_component_template, create_and_validate_component
create_and_validate_component)
from langflow.processing.process import process_graph_cached, process_tweaks from langflow.processing.process import process_graph_cached, process_tweaks
from langflow.services.auth.utils import (api_key_security, from langflow.services.auth.utils import api_key_security, get_current_active_user
get_current_active_user)
from langflow.services.cache.utils import save_uploaded_file from langflow.services.cache.utils import save_uploaded_file
from langflow.services.database.models.flow import Flow from langflow.services.database.models.flow import Flow
from langflow.services.database.models.user.model import User from langflow.services.database.models.user.model import User
from langflow.services.deps import (get_session, get_session_service, from langflow.services.deps import get_session, get_session_service, get_settings_service, get_task_service
get_settings_service, get_task_service)
from loguru import logger from loguru import logger
from sqlmodel import select from sqlmodel import select
@ -84,9 +85,7 @@ async def process(
# Get the flow that matches the flow_id and belongs to the user # 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.query(Flow).filter(Flow.id == flow_id).filter(Flow.user_id == api_key_user.id).first()
flow = session.exec( flow = session.exec(select(Flow).where(Flow.id == flow_id).where(Flow.user_id == api_key_user.id)).first()
select(Flow).where(Flow.id == flow_id).where(Flow.user_id == api_key_user.id)
).first()
if flow is None: if flow is None:
raise ValueError(f"Flow {flow_id} not found") raise ValueError(f"Flow {flow_id} not found")

View file

@ -8,8 +8,7 @@ from fastapi.encoders import jsonable_encoder
from langflow.api.utils import remove_api_keys, validate_is_component from langflow.api.utils import remove_api_keys, validate_is_component
from langflow.api.v1.schemas import FlowListCreate, FlowListRead from langflow.api.v1.schemas import FlowListCreate, FlowListRead
from langflow.services.auth.utils import get_current_active_user from langflow.services.auth.utils import get_current_active_user
from langflow.services.database.models.flow import (Flow, FlowCreate, FlowRead, from langflow.services.database.models.flow import Flow, FlowCreate, FlowRead, FlowUpdate
FlowUpdate)
from langflow.services.database.models.user.model import User from langflow.services.database.models.user.model import User
from langflow.services.deps import get_session, get_settings_service from langflow.services.deps import get_session, get_settings_service
from sqlmodel import Session, select from sqlmodel import Session, select

View file

@ -2,13 +2,14 @@ from uuid import UUID
from fastapi import APIRouter, Depends, HTTPException from fastapi import APIRouter, Depends, HTTPException
from langflow.api.v1.schemas import UsersResponse from langflow.api.v1.schemas import UsersResponse
from langflow.services.auth.utils import (get_current_active_superuser, from langflow.services.auth.utils import (
get_current_active_user, get_current_active_superuser,
get_password_hash, verify_password) get_current_active_user,
from langflow.services.database.models.user import (User, UserCreate, UserRead, get_password_hash,
UserUpdate) verify_password,
from langflow.services.database.models.user.crud import (get_user_by_id, )
update_user) 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 langflow.services.deps import get_session, get_settings_service
from sqlalchemy import func from sqlalchemy import func
from sqlalchemy.exc import IntegrityError from sqlalchemy.exc import IntegrityError

View file

@ -8,8 +8,7 @@ from langchain.chains.base import Chain
from langchain.schema import AgentAction, Document from langchain.schema import AgentAction, Document
from langchain.vectorstores.base import VectorStore from langchain.vectorstores.base import VectorStore
from langflow.graph import Graph from langflow.graph import Graph
from langflow.interface.run import (build_sorted_vertices, get_memory_key, from langflow.interface.run import build_sorted_vertices, get_memory_key, update_memory_keys
update_memory_keys)
from langflow.services.deps import get_session_service from langflow.services.deps import get_session_service
from loguru import logger from loguru import logger
from pydantic import BaseModel from pydantic import BaseModel

View file

@ -21,13 +21,17 @@ class CredentialService(Service):
def get_credential(self, user_id: Union[UUID, str], name: str, session: Session = Depends(get_session)) -> str: def get_credential(self, user_id: Union[UUID, str], name: str, session: Session = Depends(get_session)) -> str:
# we get the credential from the database # we get the credential from the database
# credential = session.query(Credential).filter(Credential.user_id == user_id, Credential.name == name).first() # 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 # we decrypt the value
if not credential or not credential.value: if not credential or not credential.value:
raise ValueError(f"{name} credential not found.") raise ValueError(f"{name} credential not found.")
decrypted = auth_utils.decrypt_api_key(credential.value, settings_service=self.settings_service) decrypted = auth_utils.decrypt_api_key(credential.value, settings_service=self.settings_service)
return decrypted 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() credentials = session.exec(select(Credential).where(Credential.user_id == user_id)).all()
return [credential.name for credential in credentials] return [credential.name for credential in credentials]

View file

@ -64,10 +64,7 @@ class DatabaseService(Service):
settings_service = get_settings_service() settings_service = get_settings_service()
if settings_service.auth_settings.AUTO_LOGIN: if settings_service.auth_settings.AUTO_LOGIN:
with Session(self.engine) as session: with Session(self.engine) as session:
flows = ( flows = session.exec(select(models.Flow).where(models.Flow.user_id is None)).all()
session.exec(select(models.Flow)
.where(models.Flow.user_id == None)).all()
)
if flows: if flows:
logger.debug("Migrating flows to default superuser") logger.debug("Migrating flows to default superuser")
username = settings_service.auth_settings.SUPERUSER username = settings_service.auth_settings.SUPERUSER

View file

@ -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.database.utils import initialize_database
from langflow.services.manager import service_manager from langflow.services.manager import service_manager
from langflow.services.schema import ServiceType from langflow.services.schema import ServiceType
from langflow.services.settings.constants import (DEFAULT_SUPERUSER, from langflow.services.settings.constants import DEFAULT_SUPERUSER, DEFAULT_SUPERUSER_PASSWORD
DEFAULT_SUPERUSER_PASSWORD)
from loguru import logger from loguru import logger
from sqlmodel import Session, select 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.chat import factory as chat_factory
from langflow.services.credentials import factory as credentials_factory from langflow.services.credentials import factory as credentials_factory
from langflow.services.database import factory as database_factory from langflow.services.database import factory as database_factory
from langflow.services.session import \ from langflow.services.session import factory as session_service_factory # type: ignore
factory as session_service_factory # type: ignore
from langflow.services.settings import factory as settings_factory from langflow.services.settings import factory as settings_factory
from langflow.services.store import factory as store_factory from langflow.services.store import factory as store_factory
from langflow.services.task import factory as task_factory from langflow.services.task import factory as task_factory
@ -173,8 +171,7 @@ def initialize_session_service():
Initialize the session manager. Initialize the session manager.
""" """
from langflow.services.cache import factory as cache_factory from langflow.services.cache import factory as cache_factory
from langflow.services.session import \ from langflow.services.session import factory as session_service_factory # type: ignore
factory as session_service_factory # type: ignore
initialize_settings_service() initialize_settings_service()

View file

@ -1,4 +1,5 @@
import json import json
# we need to import tmpdir # we need to import tmpdir
import tempfile import tempfile
from contextlib import contextmanager, suppress from contextlib import contextmanager, suppress

View file

@ -1,7 +1,6 @@
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock, patch
from langflow.services.settings.constants import (DEFAULT_SUPERUSER, from langflow.services.settings.constants import DEFAULT_SUPERUSER, DEFAULT_SUPERUSER_PASSWORD
DEFAULT_SUPERUSER_PASSWORD)
from langflow.services.utils import teardown_superuser from langflow.services.utils import teardown_superuser
# @patch("langflow.services.deps.get_session") # @patch("langflow.services.deps.get_session")