Merge remote-tracking branch 'origin/dev' into celery

src/backend/langflow/alembic/versions/260dbcc8b680_adds_tables.py

@@ -30,10 +30,10 @@ def upgrade() -> None:
     # and other related indices
     if "flowstyle" in existing_tables:
         op.drop_table("flowstyle")
-    if "ix_flowstyle_flow_id" in [
-        index["name"] for index in inspector.get_indexes("flowstyle")
-    ]:
-        op.drop_index("ix_flowstyle_flow_id", table_name="flowstyle")
+        if "ix_flowstyle_flow_id" in [
+            index["name"] for index in inspector.get_indexes("flowstyle")
+        ]:
+            op.drop_index("ix_flowstyle_flow_id", table_name="flowstyle")
 
     existing_indices_flow = []
     existing_fks_flow = []

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

@@ -22,7 +22,7 @@ class ValidatePromptRequest(BaseModel):
     name: str
     template: str
     # optional for tweak call
-    frontend_node: Optional[FrontendNodeRequest]
+    frontend_node: Optional[FrontendNodeRequest] = None
 
 
 # Build ValidationResponse class for {"imports": {"errors": []}, "function": {"errors": []}}
@@ -42,7 +42,7 @@ class CodeValidationResponse(BaseModel):
 class PromptValidationResponse(BaseModel):
     input_variables: list
     # object return for tweak call
-    frontend_node: FrontendNodeRequest | object
+    frontend_node: Optional[FrontendNodeRequest] = None
 
 
 INVALID_CHARACTERS = {

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

@@ -10,7 +10,7 @@ from fastapi import WebSocket
 
 
 from langchain.schema import AgentAction, LLMResult, AgentFinish
-from langflow.utils.logger import logger
+from loguru import logger
 
 
 # https://github.com/hwchase17/chat-langchain/blob/master/callback.py

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

@@ -11,16 +11,15 @@ from fastapi.responses import StreamingResponse
 from langflow.api.utils import build_input_keys_response
 from langflow.api.v1.schemas import BuildStatus, BuiltResponse, InitResponse, StreamData
 
-from langflow.services import service_manager, ServiceType
 from langflow.graph.graph.base import Graph
 from langflow.services.auth.utils import get_current_active_user, get_current_user
-from langflow.services.utils import get_session
-from langflow.utils.logger import logger
+from langflow.services.utils import get_cache_manager, get_session
+from loguru import logger
+from langflow.services.utils import get_chat_manager
 from sqlmodel import Session
-from typing import TYPE_CHECKING
+from langflow.services.chat.manager import ChatManager
+from langflow.services.cache.manager import BaseCacheManager
 
-if TYPE_CHECKING:
-    from langflow.services.chat.manager import ChatManager
 
 router = APIRouter(tags=["Chat"])
 
@@ -31,6 +30,7 @@ async def chat(
     websocket: WebSocket,
     token: str = Query(...),
     db: Session = Depends(get_session),
+    chat_manager: "ChatManager" = Depends(get_chat_manager),
 ):
     """Websocket endpoint for chat."""
     try:
@@ -45,7 +45,6 @@ async def chat(
                 code=status.WS_1008_POLICY_VIOLATION, reason="Unauthorized"
             )
 
-        chat_manager: "ChatManager" = service_manager.get(ServiceType.CHAT_MANAGER)
         if client_id in chat_manager.in_memory_cache:
             await chat_manager.handle_websocket(client_id, websocket)
         else:
@@ -69,10 +68,13 @@ async def chat(
 
 @router.post("/build/init/{flow_id}", response_model=InitResponse, status_code=201)
 async def init_build(
-    graph_data: dict, flow_id: str, current_user=Depends(get_current_active_user)
+    graph_data: dict,
+    flow_id: str,
+    current_user=Depends(get_current_active_user),
+    chat_manager: "ChatManager" = Depends(get_chat_manager),
+    cache_manager: "BaseCacheManager" = Depends(get_cache_manager),
 ):
     """Initialize the build by storing graph data and returning a unique session ID."""
-    cache_manager = service_manager.get(ServiceType.CACHE_MANAGER)
     try:
         if flow_id is None:
             raise ValueError("No ID provided")
@@ -85,7 +87,6 @@ async def init_build(
             return InitResponse(flowId=flow_id)
 
         # Delete from cache if already exists
-        chat_manager = service_manager.get(ServiceType.CHAT_MANAGER)
         if flow_id in chat_manager.cache_manager:
             chat_manager.cache_manager.delete(flow_id)
             logger.debug(f"Deleted flow {flow_id} from cache")
@@ -102,9 +103,10 @@ async def init_build(
 
 
 @router.get("/build/{flow_id}/status", response_model=BuiltResponse)
-async def build_status(flow_id: str):
+async def build_status(
+    flow_id: str, cache_manager: "BaseCacheManager" = Depends(get_cache_manager)
+):
     """Check the flow_id is in the cache_manager."""
-    cache_manager = service_manager.get(ServiceType.CACHE_MANAGER)
     try:
         built = (
             flow_id in cache_manager
@@ -121,9 +123,12 @@ async def build_status(flow_id: str):
 
 
 @router.get("/build/stream/{flow_id}", response_class=StreamingResponse)
-async def stream_build(flow_id: str):
+async def stream_build(
+    flow_id: str,
+    chat_manager: "ChatManager" = Depends(get_chat_manager),
+    cache_manager: "BaseCacheManager" = Depends(get_cache_manager),
+):
     """Stream the build process based on stored flow data."""
-    cache_manager = service_manager.get(ServiceType.CACHE_MANAGER)
 
     async def event_stream(flow_id):
         final_response = {"end_of_stream": True}
@@ -204,7 +209,6 @@ async def stream_build(flow_id: str):
                     "handle_keys": [],
                 }
             yield str(StreamData(event="message", data=input_keys_response))
-            chat_manager = service_manager.get(ServiceType.CHAT_MANAGER)
             chat_manager.set_cache(flow_id, langchain_object)
             # We need to reset the chat history
             chat_manager.chat_history.empty_history(flow_id)

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

@@ -8,7 +8,7 @@ from langflow.services.database.models.flow import Flow
 from langflow.processing.process import process_graph_cached, process_tweaks
 from langflow.services.database.models.user.user import User
 from langflow.services.utils import get_settings_manager, get_task_manager
-from langflow.utils.logger import logger
+from loguru import logger
 from fastapi import APIRouter, Depends, HTTPException, UploadFile, Body, status
 import sqlalchemy as sa
 from langflow.interface.custom.custom_component import CustomComponent
@@ -39,14 +39,15 @@ from langflow.services.task.manager import TaskManager
 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

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

@@ -8,7 +8,7 @@ from langflow.api.v1.base import (
     validate_prompt,
 )
 from langflow.template.field.base import TemplateField
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.validate import validate_code
 
 # build router
@@ -35,7 +35,7 @@ def post_validate_prompt(prompt_request: ValidatePromptRequest):
         if prompt_request.frontend_node is None:
             return PromptValidationResponse(
                 input_variables=input_variables,
-                frontend_node={},
+                frontend_node=None,
             )
         old_custom_fields = get_old_custom_fields(prompt_request)
 

src/backend/langflow/graph/edge/base.py

@@ -1,4 +1,4 @@
-from langflow.utils.logger import logger
+from loguru import logger
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:

src/backend/langflow/graph/graph/base.py

@@ -10,7 +10,7 @@ from langflow.graph.vertex.types import (
 )
 from langflow.interface.tools.constants import FILE_TOOLS
 from langflow.utils import payload
-from langflow.utils.logger import logger
+from loguru import logger
 from langchain.chains.base import Chain
 
 

src/backend/langflow/graph/vertex/base.py

@@ -3,7 +3,7 @@ from langflow.graph.utils import UnbuiltObject
 from langflow.interface.initialize import loading
 from langflow.interface.listing import lazy_load_dict
 from langflow.utils.constants import DIRECT_TYPES
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import sync_to_async
 
 

src/backend/langflow/interface/agents/base.py

@@ -8,7 +8,7 @@ from langflow.interface.base import LangChainTypeCreator
 from langflow.services.utils import get_settings_manager
 
 from langflow.template.frontend_node.agents import AgentFrontendNode
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class, build_template_from_method
 
 

src/backend/langflow/interface/base.py

@@ -8,7 +8,7 @@ from pydantic import BaseModel
 from langflow.template.field.base import TemplateField
 from langflow.template.frontend_node.base import FrontendNode
 from langflow.template.template.base import Template
-from langflow.utils.logger import logger
+from loguru import logger
 
 
 # Assuming necessary imports for Field, Template, and FrontendNode classes

src/backend/langflow/interface/chains/base.py

@@ -6,7 +6,7 @@ from langflow.interface.importing.utils import import_class
 from langflow.services.utils import get_settings_manager
 
 from langflow.template.frontend_node.chains import ChainFrontendNode
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class, build_template_from_method
 from langchain import chains
 from langchain_experimental.sql import SQLDatabaseChain  # type: ignore

src/backend/langflow/interface/custom/base.py

@@ -8,7 +8,7 @@ from langflow.interface.custom.custom_component import CustomComponent
 from langflow.template.frontend_node.custom_components import (
     CustomComponentFrontendNode,
 )
-from langflow.utils.logger import logger
+from loguru import logger
 
 # Assuming necessary imports for Field, Template, and FrontendNode classes
 

src/backend/langflow/interface/custom/directory_reader.py

@@ -1,7 +1,7 @@
 import os
 import ast
 import zlib
-from langflow.utils.logger import logger
+from loguru import logger
 
 
 class CustomComponentPathValueError(ValueError):

src/backend/langflow/interface/document_loaders/base.py

@@ -5,7 +5,7 @@ from langflow.services.utils import get_settings_manager
 from langflow.template.frontend_node.documentloaders import DocumentLoaderFrontNode
 from langflow.interface.custom_lists import documentloaders_type_to_cls_dict
 
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class
 
 

src/backend/langflow/interface/embeddings/base.py

@@ -6,7 +6,7 @@ from langflow.services.utils import get_settings_manager
 
 from langflow.template.frontend_node.base import FrontendNode
 from langflow.template.frontend_node.embeddings import EmbeddingFrontendNode
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class
 
 

src/backend/langflow/interface/initialize/loading.py

@@ -34,7 +34,7 @@ from langflow.utils import validate
 from langchain.chains.base import Chain
 from langchain.vectorstores.base import VectorStore
 from langchain.document_loaders.base import BaseLoader
-from langflow.utils.logger import logger
+from loguru import logger
 
 if TYPE_CHECKING:
     from langflow import CustomComponent

src/backend/langflow/interface/llms/base.py

@@ -5,7 +5,7 @@ from langflow.interface.custom_lists import llm_type_to_cls_dict
 from langflow.services.utils import get_settings_manager
 
 from langflow.template.frontend_node.llms import LLMFrontendNode
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class
 
 

src/backend/langflow/interface/memories/base.py

@@ -6,7 +6,7 @@ from langflow.services.utils import get_settings_manager
 
 from langflow.template.frontend_node.base import FrontendNode
 from langflow.template.frontend_node.memories import MemoryFrontendNode
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class, build_template_from_method
 from langflow.custom.customs import get_custom_nodes
 

src/backend/langflow/interface/output_parsers/base.py

@@ -7,7 +7,7 @@ from langflow.interface.importing.utils import import_class
 from langflow.services.utils import get_settings_manager
 
 from langflow.template.frontend_node.output_parsers import OutputParserFrontendNode
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class, build_template_from_method
 
 

src/backend/langflow/interface/prompts/base.py

@@ -8,7 +8,7 @@ from langflow.interface.importing.utils import import_class
 from langflow.services.utils import get_settings_manager
 
 from langflow.template.frontend_node.prompts import PromptFrontendNode
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class
 
 

src/backend/langflow/interface/retrievers/base.py

@@ -7,7 +7,7 @@ from langflow.interface.importing.utils import import_class
 from langflow.services.utils import get_settings_manager
 
 from langflow.template.frontend_node.retrievers import RetrieverFrontendNode
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_method, build_template_from_class
 
 

src/backend/langflow/interface/run.py

@@ -1,8 +1,8 @@
 from typing import Any, Dict, Tuple
 from langflow.services.cache.utils import Memoize
 from langflow.graph import Graph
-from langflow.utils.logger import logger
 from langflow.services.utils import get_cache_manager
+from loguru import logger
 
 
 @Memoize(get_cache_manager=get_cache_manager)

src/backend/langflow/interface/text_splitters/base.py

@@ -5,7 +5,7 @@ from langflow.services.utils import get_settings_manager
 from langflow.template.frontend_node.textsplitters import TextSplittersFrontendNode
 from langflow.interface.custom_lists import textsplitter_type_to_cls_dict
 
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class
 
 

src/backend/langflow/interface/toolkits/base.py

@@ -6,7 +6,7 @@ from langflow.interface.base import LangChainTypeCreator
 from langflow.interface.importing.utils import import_class, import_module
 from langflow.services.utils import get_settings_manager
 
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class
 
 

src/backend/langflow/interface/tools/util.py

@@ -3,7 +3,7 @@ import inspect
 from typing import Dict, Union
 
 from langchain.agents.tools import Tool
-from langflow.utils.logger import logger
+from loguru import logger
 
 
 def get_func_tool_params(func, **kwargs) -> Union[Dict, None]:

src/backend/langflow/interface/types.py

@@ -29,7 +29,7 @@ from langflow.template.frontend_node.custom_components import (
 from langflow.interface.retrievers.base import retriever_creator
 
 from langflow.interface.custom.directory_reader import DirectoryReader
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import get_base_classes
 
 import re

src/backend/langflow/interface/utilities/base.py

@@ -8,7 +8,7 @@ from langflow.interface.importing.utils import import_class
 from langflow.services.utils import get_settings_manager
 
 from langflow.template.frontend_node.utilities import UtilitiesFrontendNode
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class
 
 

src/backend/langflow/interface/utils.py

@@ -8,7 +8,7 @@ import re
 import yaml
 from langchain.base_language import BaseLanguageModel
 from PIL.Image import Image
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.services.chat.config import ChatConfig
 from langflow.services.utils import get_settings_manager
 

src/backend/langflow/interface/vector_store/base.py

@@ -7,7 +7,7 @@ from langflow.interface.importing.utils import import_class
 from langflow.services.utils import get_settings_manager
 
 from langflow.template.frontend_node.vectorstores import VectorStoreFrontendNode
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_method
 
 

src/backend/langflow/interface/wrappers/base.py

@@ -3,7 +3,7 @@ from typing import Dict, List, Optional
 from langchain import requests, sql_database
 
 from langflow.interface.base import LangChainTypeCreator
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.utils.util import build_template_from_class, build_template_from_method
 
 

src/backend/langflow/processing/base.py

@@ -4,7 +4,7 @@ from langflow.api.v1.callback import (
     StreamingLLMCallbackHandler,
 )
 from langflow.processing.process import fix_memory_inputs, format_actions
-from langflow.utils.logger import logger
+from loguru import logger
 from langchain.agents.agent import AgentExecutor
 
 

src/backend/langflow/processing/process.py

@@ -8,7 +8,7 @@ from langflow.interface.run import (
     update_memory_keys,
 )
 from langflow.services.utils import get_session_manager
-from langflow.utils.logger import logger
+from loguru import logger
 from langflow.graph import Graph
 from langchain.chains.base import Chain
 from langchain.vectorstores.base import VectorStore

src/backend/langflow/services/chat/manager.py

@@ -4,8 +4,7 @@ from langflow.api.v1.schemas import ChatMessage, ChatResponse, FileResponse
 from langflow.services.base import Service
 from langflow.services.chat.cache import Subject
 from langflow.services.chat.utils import process_graph
-from langflow.interface.utils import pil_to_base64
-from langflow.utils.logger import logger
+from loguru import logger
 
 from .cache import cache_manager
 import asyncio

src/backend/langflow/services/chat/utils.py

@@ -2,7 +2,7 @@ from fastapi import WebSocket
 from langflow.api.v1.schemas import ChatMessage
 from langflow.processing.base import get_result_and_steps
 from langflow.interface.utils import try_setting_streaming_options
-from langflow.utils.logger import logger
+from loguru import logger
 
 
 async def process_graph(

src/backend/langflow/services/database/manager.py

@@ -7,7 +7,7 @@ from langflow.services.utils import get_settings_manager
 from sqlalchemy import inspect
 import sqlalchemy as sa
 from sqlmodel import SQLModel, Session, create_engine
-from langflow.utils.logger import logger
+from loguru import logger
 from alembic.config import Config
 from alembic import command
 from langflow.services.database import models  # noqa
@@ -89,7 +89,7 @@ class DatabaseManager(Service):
 
         for table in legacy_tables:
             if table in inspector.get_table_names():
-                logger.warn(f"Legacy table exists: {table}")
+                logger.warning(f"Legacy table exists: {table}")
 
         return True
 

src/backend/langflow/services/database/utils.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
-from langflow.utils.logger import logger
+from loguru import logger
 from contextlib import contextmanager
 from alembic.util.exc import CommandError
 from sqlmodel import Session

src/backend/langflow/services/manager.py

@@ -1,6 +1,6 @@
 from langflow.services.schema import ServiceType
-from typing import TYPE_CHECKING, Dict, List, Optional
-from langflow.utils.logger import logger
+from typing import TYPE_CHECKING, List, Optional
+from loguru import logger
 
 if TYPE_CHECKING:
     from langflow.services.factory import ServiceFactory

src/backend/langflow/services/settings/auth.py

@@ -5,7 +5,7 @@ from langflow.services.settings.utils import read_secret_from_file, write_secret
 
 from pydantic import BaseSettings, Field, validator
 from passlib.context import CryptContext
-from langflow.utils.logger import logger
+from loguru import logger
 
 
 class AuthSettings(BaseSettings):

src/backend/langflow/services/settings/base.py

@@ -8,7 +8,7 @@ from pathlib import Path
 
 import yaml
 from pydantic import BaseSettings, root_validator, validator
-from langflow.utils.logger import logger
+from loguru import logger
 
 # BASE_COMPONENTS_PATH = str(Path(__file__).parent / "components")
 BASE_COMPONENTS_PATH = str(Path(__file__).parent.parent.parent / "components")

src/backend/langflow/services/settings/manager.py

@@ -1,7 +1,7 @@
 from langflow.services.base import Service
 from langflow.services.settings.auth import AuthSettings
 from langflow.services.settings.base import Settings
-from langflow.utils.logger import logger
+from loguru import logger
 import os
 import yaml
 

src/backend/langflow/services/settings/utils.py

@@ -2,7 +2,7 @@ import os
 from pathlib import Path
 import platform
 
-from langflow.utils.logger import logger
+from loguru import logger
 
 
 def set_secure_permissions(file_path):

src/backend/langflow/services/utils.py

@@ -1,5 +1,5 @@
 from langflow.services import ServiceType, service_manager
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Generator
 
 
 if TYPE_CHECKING:
@@ -8,6 +8,7 @@ if TYPE_CHECKING:
     from langflow.services.cache.manager import BaseCacheManager
     from langflow.services.session.manager import SessionManager
     from langflow.services.task.manager import TaskManager
+    from langflow.services.chat.manager import ChatManager
     from sqlmodel import Session
 
 
@@ -19,7 +20,7 @@ def get_db_manager() -> "DatabaseManager":
     return service_manager.get(ServiceType.DATABASE_MANAGER)
 
 
-def get_session() -> "Session":
+def get_session() -> Generator["Session", None, None]:
     db_manager = service_manager.get(ServiceType.DATABASE_MANAGER)
     yield from db_manager.get_session()
 
@@ -34,3 +35,7 @@ def get_session_manager() -> "SessionManager":
 
 def get_task_manager() -> "TaskManager":
     return service_manager.get(ServiceType.TASK_MANAGER)
+
+
+def get_chat_manager() -> "ChatManager":
+    return service_manager.get(ServiceType.CHAT_MANAGER)

src/backend/langflow/utils/logger.py

@@ -1,30 +1,35 @@
-import logging
+from typing import Optional
+from loguru import logger
 from pathlib import Path
-
 from rich.logging import RichHandler
 
-logger = logging.getLogger("langflow")
 
+def configure(log_level: str = "DEBUG", log_file: Optional[Path] = None):
+    log_format = "<green>{time:HH:mm:ss}</green> - <level>{level: <8}</level> - <level>{message}</level>"
+    logger.remove()  # Remove default handlers
 
-def configure(log_level: str = "DEBUG", log_file: Path = None):  # type: ignore
-    log_format = "%(asctime)s - %(levelname)s - %(message)s"
-    log_level_value = getattr(logging, log_level.upper(), logging.INFO)
-
-    logging.basicConfig(
-        level=log_level_value,
-        format=log_format,
-        datefmt="[%X]",
-        handlers=[RichHandler(rich_tracebacks=True)],
+    # Configure loguru to use RichHandler
+    logger.configure(
+        handlers=[
+            {
+                "sink": RichHandler(rich_tracebacks=True, markup=True),
+                "format": log_format,
+                "level": log_level.upper(),
+            }
+        ]
     )
 
     if log_file:
         log_file = Path(log_file)
         log_file.parent.mkdir(parents=True, exist_ok=True)
 
-        file_handler = logging.FileHandler(log_file)
-        file_handler.setFormatter(logging.Formatter(log_format))
-        logger.addHandler(file_handler)
+        logger.add(
+            sink=str(log_file),
+            level=log_level.upper(),
+            format=log_format,
+            rotation="10 MB",  # Log rotation based on file size
+        )
 
-    logger.info(f"Logger set up with log level: {log_level_value}({log_level})")
+    logger.info(f"Logger set up with log level: {log_level}")
     if log_file:
         logger.info(f"Log file: {log_file}")

src/frontend/src/components/DropdownButtonComponent/index.tsx

@@ -39,9 +39,7 @@ export default function DropdownButton({
               }}
             >
               {!showOptions ? (
-                <IconComponent
-                  name="ChevronDown"
-                />
+                <IconComponent name="ChevronDown" />
               ) : (
                 <IconComponent name="ChevronUp" />
               )}

src/frontend/src/components/inputComponent/index.tsx

@@ -54,7 +54,7 @@ export default function InputComponent({
         </Form.Control>
       ) : (
         <Input
-          type={password && !pwdVisible ? "password" : "text"}
+          type="text"
           value={value}
           disabled={disabled}
           required={required}

src/frontend/src/contexts/tabsContext.tsx

@@ -315,9 +315,11 @@ export function TabsProvider({ children }: { children: ReactNode }) {
       input.type = "file";
       input.accept = ".json";
       // add a change event listener to the file input
-      id = await new Promise(resolve => {
+      id = await new Promise((resolve) => {
         input.onchange = async (e: Event) => {
-          if ((e.target as HTMLInputElement).files![0].type === "application/json") {
+          if (
+            (e.target as HTMLInputElement).files![0].type === "application/json"
+          ) {
             const currentfile = (e.target as HTMLInputElement).files![0];
             let text = await currentfile.text();
             let flow: FlowType = JSON.parse(text);

src/frontend/src/controllers/API/index.ts

@@ -164,7 +164,7 @@ export async function readFlowsFromDatabase() {
   try {
     const response = await api.get(`${BASE_URL_API}flows/`);
     if (response?.status !== 200) {
-      throw new Error(`HTTP error! status: ${response.status}`);
+      throw new Error(`HTTP error! status: ${response?.status}`);
     }
     return response.data;
   } catch (error) {
@@ -177,7 +177,7 @@ export async function downloadFlowsFromDatabase() {
   try {
     const response = await api.get(`${BASE_URL_API}flows/download/`);
     if (response?.status !== 200) {
-      throw new Error(`HTTP error! status: ${response.status}`);
+      throw new Error(`HTTP error! status: ${response?.status}`);
     }
     return response.data;
   } catch (error) {
@@ -190,8 +190,8 @@ export async function uploadFlowsToDatabase(flows: FormData) {
   try {
     const response = await api.post(`${BASE_URL_API}flows/upload/`, flows);
 
-    if (response.status !== 201) {
-      throw new Error(`HTTP error! status: ${response.status}`);
+    if (response?.status !== 201) {
+      throw new Error(`HTTP error! status: ${response?.status}`);
     }
     return response.data;
   } catch (error) {
@@ -468,7 +468,7 @@ export async function updateUser(user_id: string, user: Users) {
 
 export async function getApiKey() {
   try {
-    const res = await api.get(`${BASE_URL_API}api_key`);
+    const res = await api.get(`${BASE_URL_API}api_key/`);
     if (res.status === 200) {
       return res.data;
     }
@@ -480,7 +480,7 @@ export async function getApiKey() {
 
 export async function createApiKey(name: string) {
   try {
-    const res = await api.post(`${BASE_URL_API}api_key`, { name });
+    const res = await api.post(`${BASE_URL_API}api_key/`, { name });
     if (res.status === 200) {
       return res.data;
     }

src/frontend/src/pages/loginPage/index.tsx

@@ -32,8 +32,8 @@ export default function LoginPage(): JSX.Element {
 
   function signIn() {
     const user: LoginType = {
-      username: username,
-      password: password,
+      username: username.trim(),
+      password: password.trim(),
     };
     onLogin(user)
       .then((user) => {

src/frontend/src/pages/signUpPage/index.tsx

@@ -33,8 +33,8 @@ export default function SignUp(): JSX.Element {
   function handleSignup(): void {
     const { username, password } = inputState;
     const newUser: UserInputType = {
-      username,
-      password,
+      username: username.trim(),
+      password: password.trim(),
     };
     addUser(newUser)
       .then((user) => {

src/frontend/src/types/components/index.ts

@@ -548,5 +548,5 @@ export type fetchErrorComponentType = {
 export type dropdownButtonPropsType = {
   firstButtonName: string;
   onFirstBtnClick: () => void;
-  options: Array<{ name: string; onBtnClick: () => void; }>;
+  options: Array<{ name: string; onBtnClick: () => void }>;
 };