Formatting

This commit is contained in:
Gabriel Luiz Freitas Almeida 2023-12-07 17:29:29 -03:00
commit 0d22a3864f
12 changed files with 34 additions and 45 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
@ -97,19 +96,22 @@ def update_settings(
settings_service.settings.update_settings(STORE=False) settings_service.settings.update_settings(STORE=False)
def version_callback(value: bool): def version_callback(value: bool):
""" """
Show the version and exit. Show the version and exit.
""" """
from langflow import __version__ from langflow import __version__
if value: if value:
typer.echo(f"Langflow Version: {__version__}") typer.echo(f"Langflow Version: {__version__}")
raise typer.Exit() raise typer.Exit()
@app.callback() @app.callback()
def main_entry_point( def main_entry_point(
version: bool = typer.Option(None, "--version", callback=version_callback, is_eager=True, help="Show the version and exit.") version: bool = typer.Option(
None, "--version", callback=version_callback, is_eager=True, help="Show the version and exit."
),
): ):
""" """
Main entry point for the Langflow CLI. Main entry point for the Langflow CLI.
@ -117,7 +119,6 @@ def main_entry_point(
pass pass
@app.command() @app.command()
def run( def run(
host: str = typer.Option("127.0.0.1", help="Host to bind the server to.", envvar="LANGFLOW_HOST"), host: str = typer.Option("127.0.0.1", help="Host to bind the server to.", envvar="LANGFLOW_HOST"),

View file

@ -1,17 +1,13 @@
from fastapi import (APIRouter, Depends, HTTPException, Query, WebSocket, from fastapi import APIRouter, Depends, HTTPException, Query, WebSocket, WebSocketException, status
WebSocketException, status)
from fastapi.responses import StreamingResponse from fastapi.responses import StreamingResponse
from langflow.api.utils import build_input_keys_response from langflow.api.utils import build_input_keys_response
from langflow.api.v1.schemas import (BuildStatus, BuiltResponse, InitResponse, from langflow.api.v1.schemas import BuildStatus, BuiltResponse, InitResponse, StreamData
StreamData)
from langflow.graph.graph.base import Graph from langflow.graph.graph.base import Graph
from langflow.services.auth.utils import (get_current_active_user, from langflow.services.auth.utils import get_current_active_user, get_current_user_by_jwt
get_current_user_by_jwt)
from langflow.services.cache.service import BaseCacheService from langflow.services.cache.service import BaseCacheService
from langflow.services.cache.utils import update_build_status from langflow.services.cache.utils import update_build_status
from langflow.services.chat.service import ChatService from langflow.services.chat.service import ChatService
from langflow.services.deps import (get_cache_service, get_chat_service, from langflow.services.deps import get_cache_service, get_chat_service, get_session
get_session)
from loguru import logger from loguru import logger
from sqlmodel import Session from sqlmodel import Session

View file

@ -22,6 +22,7 @@ async def lifespan(app: FastAPI):
yield yield
teardown_services() teardown_services()
def create_app(): def create_app():
"""Create the FastAPI app and include the router.""" """Create the FastAPI app and include the router."""
@ -52,10 +53,8 @@ def create_app():
def health(): def health():
return {"status": "ok"} return {"status": "ok"}
app.include_router(router) app.include_router(router)
return app return app

View file

@ -2,8 +2,7 @@ from typing import TYPE_CHECKING, List, Union
from langchain.agents.agent import AgentExecutor from langchain.agents.agent import AgentExecutor
from langchain.callbacks.base import BaseCallbackHandler from langchain.callbacks.base import BaseCallbackHandler
from langflow.api.v1.callback import (AsyncStreamingLLMCallbackHandler, from langflow.api.v1.callback import AsyncStreamingLLMCallbackHandler, StreamingLLMCallbackHandler
StreamingLLMCallbackHandler)
from langflow.processing.process import fix_memory_inputs, format_actions from langflow.processing.process import fix_memory_inputs, format_actions
from langflow.services.deps import get_plugins_service from langflow.services.deps import get_plugins_service
from loguru import logger from loguru import logger

View file

@ -16,26 +16,26 @@ if TYPE_CHECKING:
def get_credential_service() -> "CredentialService": def get_credential_service() -> "CredentialService":
return service_manager.get(ServiceType.CREDENTIAL_SERVICE) # type: ignore return service_manager.get(ServiceType.CREDENTIAL_SERVICE) # type: ignore
def get_plugins_service() -> "PluginService": def get_plugins_service() -> "PluginService":
return service_manager.get(ServiceType.PLUGIN_SERVICE) # type: ignore return service_manager.get(ServiceType.PLUGIN_SERVICE) # type: ignore
def get_settings_service() -> "SettingsService": def get_settings_service() -> "SettingsService":
try: try:
return service_manager.get(ServiceType.SETTINGS_SERVICE) # type: ignore return service_manager.get(ServiceType.SETTINGS_SERVICE) # type: ignore
except ValueError: except ValueError:
# initialize settings service # initialize settings service
from langflow.services.manager import initialize_settings_service from langflow.services.manager import initialize_settings_service
initialize_settings_service() initialize_settings_service()
return service_manager.get(ServiceType.SETTINGS_SERVICE) # type: ignore return service_manager.get(ServiceType.SETTINGS_SERVICE) # type: ignore
def get_db_service() -> "DatabaseService": def get_db_service() -> "DatabaseService":
return service_manager.get(ServiceType.DATABASE_SERVICE) # type: ignore return service_manager.get(ServiceType.DATABASE_SERVICE) # type: ignore
def get_session() -> Generator["Session", None, None]: def get_session() -> Generator["Session", None, None]:
@ -44,20 +44,20 @@ def get_session() -> Generator["Session", None, None]:
def get_cache_service() -> "BaseCacheService": def get_cache_service() -> "BaseCacheService":
return service_manager.get(ServiceType.CACHE_SERVICE) # type: ignore return service_manager.get(ServiceType.CACHE_SERVICE) # type: ignore
def get_session_service() -> "SessionService": def get_session_service() -> "SessionService":
return service_manager.get(ServiceType.SESSION_SERVICE) # type: ignore return service_manager.get(ServiceType.SESSION_SERVICE) # type: ignore
def get_task_service() -> "TaskService": def get_task_service() -> "TaskService":
return service_manager.get(ServiceType.TASK_SERVICE) # type: ignore return service_manager.get(ServiceType.TASK_SERVICE) # type: ignore
def get_chat_service() -> "ChatService": def get_chat_service() -> "ChatService":
return service_manager.get(ServiceType.CHAT_SERVICE) # type: ignore return service_manager.get(ServiceType.CHAT_SERVICE) # type: ignore
def get_store_service() -> "StoreService": def get_store_service() -> "StoreService":
return service_manager.get(ServiceType.STORE_SERVICE) # type: ignore return service_manager.get(ServiceType.STORE_SERVICE) # type: ignore

View file

@ -1,13 +1,12 @@
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
if TYPE_CHECKING: if TYPE_CHECKING:
from langflow.services.base import Service from langflow.services.base import Service
class ServiceFactory: class ServiceFactory:
def __init__(self, service_class): def __init__(self, service_class):
self.service_class = service_class self.service_class = service_class
def create(self, *args, **kwargs) -> "Service": def create(self, *args, **kwargs) -> "Service":
raise NotImplementedError raise NotImplementedError

View file

@ -134,8 +134,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

@ -12,7 +12,6 @@ class BasePlugin:
pass pass
class CallbackPlugin(BasePlugin): class CallbackPlugin(BasePlugin):
def get_callback(self, _id=None): def get_callback(self, _id=None):
pass pass

View file

@ -68,7 +68,6 @@ class LangfusePlugin(CallbackPlugin):
logger.debug("Initializing langfuse callback") logger.debug("Initializing langfuse callback")
try: try:
langfuse_instance = self.get() langfuse_instance = self.get()
if langfuse_instance is not None and hasattr(langfuse_instance, "trace"): if langfuse_instance is not None and hasattr(langfuse_instance, "trace"):

View file

@ -31,7 +31,11 @@ class PluginService(Service):
mod = importlib.import_module(module_path) mod = importlib.import_module(module_path)
for attr_name in dir(mod): for attr_name in dir(mod):
attr = getattr(mod, attr_name) attr = getattr(mod, attr_name)
if inspect.isclass(attr) and issubclass(attr, BasePlugin) and attr not in [CallbackPlugin, BasePlugin]: if (
inspect.isclass(attr)
and issubclass(attr, BasePlugin)
and attr not in [CallbackPlugin, BasePlugin]
):
self.register_plugin(plugin_name, attr()) self.register_plugin(plugin_name, attr())
except Exception as exc: except Exception as exc:
logger.error(f"Error loading plugin {plugin_name}: {exc}") logger.error(f"Error loading plugin {plugin_name}: {exc}")
@ -60,5 +64,3 @@ class PluginService(Service):
if callback: if callback:
callbacks.append(callback) callbacks.append(callback)
return callbacks return callbacks

View file

@ -1,10 +1,8 @@
from langflow.services.auth.utils import create_super_user, verify_password 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
@ -18,8 +16,7 @@ def get_factories_and_deps():
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.plugins import factory as plugins_factory from langflow.services.plugins import factory as plugins_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
@ -176,8 +173,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

@ -164,7 +164,7 @@ export default function GenericNode({
)} )}
<div> <div>
<div <div
data-testid={'div-generic-node'} data-testid={"div-generic-node"}
className={ className={
"generic-node-div-title " + "generic-node-div-title " +
(!showNode (!showNode