Merge branch 'dev' of https://github.com/logspace-ai/langflow into dev

src/backend/langflow/__main__.py

@@ -23,7 +23,7 @@ from rich.table import Table
 
 console = Console()
 
-app = typer.Typer()
+app = typer.Typer(no_args_is_help=True)
 
 
 def get_number_of_workers(workers=None):
@@ -141,7 +141,7 @@ def run(
     ),
 ):
     """
-    Run the Langflow server.
+    Run the Langflow.
     """
     # override env variables with .env file
     if env_file:
@@ -299,7 +299,14 @@ def superuser(
     password: str = typer.Option(
         ..., prompt=True, hide_input=True, help="Password for the superuser."
     ),
+    log_level: str = typer.Option(
+        "critical", help="Logging level.", envvar="LANGFLOW_LOG_LEVEL"
+    ),
 ):
+    """
+    Create a superuser.
+    """
+    configure(log_level=log_level)
     initialize_services()
     db_service = get_db_service()
     with session_getter(db_service) as session:
@@ -321,7 +328,10 @@ def superuser(
 
 
 @app.command()
-def migration(test: bool = typer.Option(False, help="Run migrations in test mode.")):
+def migration(test: bool = typer.Option(True, help="Run migrations in test mode.")):
+    """
+    Run or test migrations.
+    """
     initialize_services()
     db_service = get_db_service()
     if not test:

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

@@ -13,6 +13,7 @@ from langflow.api.v1.schemas import BuildStatus, BuiltResponse, InitResponse, St
 
 from langflow.graph.graph.base import Graph
 from langflow.services.auth.utils import get_current_active_user, get_current_user
+from langflow.services.cache.utils import update_build_status
 from loguru import logger
 from langflow.services.getters import get_chat_service, get_session, get_cache_service
 from sqlmodel import Session
@@ -157,7 +158,7 @@ async def stream_build(
             graph = Graph.from_payload(graph_data)
 
             number_of_nodes = len(graph.nodes)
-            cache_service[flow_id]["status"] = BuildStatus.IN_PROGRESS
+            update_build_status(cache_service, flow_id, BuildStatus.IN_PROGRESS)
 
             for i, vertex in enumerate(graph.generator_build(), 1):
                 try:
@@ -184,7 +185,7 @@ async def stream_build(
                     logger.exception(exc)
                     params = str(exc)
                     valid = False
-                    cache_service[flow_id]["status"] = BuildStatus.FAILURE
+                    update_build_status(cache_service, flow_id, BuildStatus.FAILURE)
 
                 response = {
                     "valid": valid,
@@ -211,11 +212,12 @@ async def stream_build(
             chat_service.set_cache(flow_id, langchain_object)
             # We need to reset the chat history
             chat_service.chat_history.empty_history(flow_id)
-            cache_service[flow_id]["status"] = BuildStatus.SUCCESS
+            update_build_status(cache_service, flow_id, BuildStatus.SUCCESS)
         except Exception as exc:
             logger.exception(exc)
             logger.error("Error while building the flow: %s", exc)
-            cache_service[flow_id]["status"] = BuildStatus.FAILURE
+
+            update_build_status(cache_service, flow_id, BuildStatus.FAILURE)
             yield str(StreamData(event="error", data={"error": str(exc)}))
         finally:
             yield str(StreamData(event="message", data=final_response))

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

@@ -20,6 +20,7 @@ from langflow.interface.custom.custom_component import CustomComponent
 
 from langflow.api.v1.schemas import (
     ProcessResponse,
+    TaskResponse,
     TaskStatusResponse,
     UploadFileResponse,
     CustomComponentCode,
@@ -145,9 +146,15 @@ async def process_flow(
                 session_id,
             )
             task_result = task.status
+
+        if task_id:
+            task_response = TaskResponse(id=task_id, href=f"api/v1/task/{task_id}")
+        else:
+            task_response = None
+
         return ProcessResponse(
             result=task_result,
-            id=task_id,
+            task=task_response,
             session_id=session_id,
             backend=str(type(task_service.backend)),
         )
@@ -173,7 +180,7 @@ async def process_flow(
         raise HTTPException(status_code=500, detail=str(e)) from e
 
 
-@router.get("/task/{task_id}/status", response_model=TaskStatusResponse)
+@router.get("/task/{task_id}", response_model=TaskStatusResponse)
 async def get_task_status(task_id: str):
     task_service = get_task_service()
     task = task_service.get_task(task_id)

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

@@ -47,11 +47,18 @@ class UpdateTemplateRequest(BaseModel):
     template: dict
 
 
+class TaskResponse(BaseModel):
+    """Task response schema."""
+
+    id: Optional[str] = Field(None)
+    href: Optional[str] = Field(None)
+
+
 class ProcessResponse(BaseModel):
     """Process response schema."""
 
     result: Any
-    id: Optional[str] = None
+    task: Optional[TaskResponse] = None
     session_id: Optional[str] = None
     backend: Optional[str] = None
 

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

@@ -185,9 +185,10 @@ class Vertex:
                 # Load the type in value.get('suffixes') using
                 # what is inside value.get('content')
                 # value.get('value') is the file name
-                file_path = value.get("file_path")
-
-                params[key] = file_path
+                if file_path := value.get("file_path"):
+                    params[key] = file_path
+                else:
+                    raise ValueError(f"File path not found for {self.vertex_type}")
             elif value.get("type") in DIRECT_TYPES and params.get(key) is None:
                 if value.get("type") == "code":
                     try:

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

@@ -102,7 +102,10 @@ class CustomComponent(Component, extra=Extra.allow):
                     status_code=400,
                     detail={
                         "error": "Type hint Error",
-                        "traceback": "Prompt type is not supported in the build method. Try using PromptTemplate instead.",
+                        "traceback": (
+                            "Prompt type is not supported in the build method."
+                            " Try using PromptTemplate instead."
+                        ),
                     },
                 )
         return args

src/backend/langflow/interface/importing/utils.py

@@ -144,6 +144,8 @@ def import_chain(chain: str) -> Type[Chain]:
 
     if chain in CUSTOM_CHAINS:
         return CUSTOM_CHAINS[chain]
+    if chain == "SQLDatabaseChain":
+        return import_class("langchain_experimental.sql.SQLDatabaseChain")
     return import_class(f"langchain.chains.{chain}")
 
 

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

@@ -74,13 +74,17 @@ class InMemoryCache(BaseCacheService, Service):
             ):
                 # Move the key to the end to make it recently used
                 self._cache.move_to_end(key)
-                unpickled = pickle.loads(item["value"])
-                return unpickled
+                # Check if the value is pickled
+                if isinstance(item["value"], bytes):
+                    value = pickle.loads(item["value"])
+                else:
+                    value = item["value"]
+                return value
             else:
                 self.delete(key)
         return None
 
-    def set(self, key, value):
+    def set(self, key, value, pickle=False):
         """
         Add an item to the cache.
 
@@ -98,8 +102,10 @@ class InMemoryCache(BaseCacheService, Service):
                 # Remove least recently used item
                 self._cache.popitem(last=False)
             # pickle locally to mimic Redis
-            pickled = pickle.dumps(value)
-            self._cache[key] = {"value": pickled, "time": time.time()}
+            if pickle:
+                value = pickle.dumps(value)
+
+            self._cache[key] = {"value": value, "time": time.time()}
 
     def upsert(self, key, value):
         """

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

@@ -9,6 +9,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict
 from appdirs import user_cache_dir
 from fastapi import UploadFile
+from langflow.api.v1.schemas import BuildStatus
 from langflow.services.database.models.base import orjson_dumps
 
 if TYPE_CHECKING:
@@ -202,3 +203,11 @@ def save_uploaded_file(file: UploadFile, folder_name):
             new_file.write(chunk)
 
     return file_path
+
+
+def update_build_status(cache_service, flow_id: str, status: BuildStatus):
+    cached_flow = cache_service[flow_id]
+    if cached_flow is None:
+        raise ValueError(f"Flow {flow_id} not found in cache")
+    cached_flow["status"] = status
+    cache_service[flow_id] = cached_flow

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

@@ -94,9 +94,7 @@ class DatabaseService(Service):
         return True
 
     def run_migrations(self):
-        logger.info(
-            f"Running DB migrations in {self.script_location} on {self.database_url}"
-        )
+        logger.info(f"Running DB migrations in {self.script_location}")
         alembic_cfg = Config()
         alembic_cfg.set_main_option("script_location", str(self.script_location))
         alembic_cfg.set_main_option("sqlalchemy.url", self.database_url)

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

@@ -1,4 +1,5 @@
 from typing import Any, Callable, Coroutine, Union
+from langflow.utils.logger import configure
 from loguru import logger
 from langflow.services.base import Service
 from langflow.services.task.backends.anyio import AnyIOBackend
@@ -7,18 +8,19 @@ from langflow.services.task.utils import get_celery_worker_status
 
 
 def check_celery_availability():
-    from langflow.worker import celery_app
-
     try:
+        from langflow.worker import celery_app
+
         status = get_celery_worker_status(celery_app)
         logger.debug(f"Celery status: {status}")
-    except Exception as e:
-        logger.error(f"An error occurred: {e}")
+    except Exception as exc:
+        logger.debug(f"Celery not available: {exc}")
         status = {"availability": None}
     return status
 
 
 try:
+    configure()
     status = check_celery_availability()
 
     USE_CELERY = status.get("availability") is not None

src/backend/langflow/template/frontend_node/documentloaders.py

@@ -171,7 +171,7 @@ class DocumentLoaderFrontNode(FrontendNode):
         self.template.add_field(
             TemplateField(
                 field_type="dict",
-                required=True,
+                required=False,
                 show=True,
                 name="metadata",
                 value={},

src/backend/langflow/utils/logger.py

@@ -2,12 +2,42 @@ from typing import Optional
 from loguru import logger
 from pathlib import Path
 from rich.logging import RichHandler
+import os
+import orjson
+import appdirs
 
 
-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>"
+VALID_LOG_LEVELS = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
+
+
+def serialize(record):
+    subset = {
+        "timestamp": record["time"].timestamp(),
+        "message": record["message"],
+        "level": record["level"].name,
+        "module": record["module"],
+    }
+    return orjson.dumps(subset)
+
+
+def patching(record):
+    record["extra"]["serialized"] = serialize(record)
+
+
+def configure(log_level: Optional[str] = None, log_file: Optional[Path] = None):
+    if os.getenv("LANGFLOW_LOG_LEVEL") in VALID_LOG_LEVELS and log_level is None:
+        log_level = os.getenv("LANGFLOW_LOG_LEVEL")
+    if log_level is None:
+        log_level = "INFO"
+    # Human-readable
+    log_format = (
+        "<green>{time:YYYY-MM-DD HH:mm:ss}</green> - <level>"
+        "{level: <8}</level> - {module} - <level>{message}</level>"
+    )
+
+    # log_format = log_format_dev if log_level.upper() == "DEBUG" else log_format_prod
     logger.remove()  # Remove default handlers
-
+    logger.patch(patching)
     # Configure loguru to use RichHandler
     logger.configure(
         handlers=[
@@ -19,17 +49,21 @@ def configure(log_level: str = "DEBUG", log_file: Optional[Path] = None):
         ]
     )
 
-    if log_file:
-        log_file = Path(log_file)
-        log_file.parent.mkdir(parents=True, exist_ok=True)
+    if not log_file:
+        cache_dir = Path(appdirs.user_cache_dir("langflow"))
+        log_file = cache_dir / "langflow.log"
 
-        logger.add(
-            sink=str(log_file),
-            level=log_level.upper(),
-            format=log_format,
-            rotation="10 MB",  # Log rotation based on file size
-        )
+    log_file = Path(log_file)
+    log_file.parent.mkdir(parents=True, exist_ok=True)
 
-    logger.info(f"Logger set up with log level: {log_level}")
+    logger.add(
+        sink=str(log_file),
+        level=log_level.upper(),
+        format=log_format,
+        rotation="10 MB",  # Log rotation based on file size
+        serialize=True,
+    )
+
+    logger.debug(f"Logger set up with log level: {log_level}")
     if log_file:
         logger.info(f"Log file: {log_file}")

src/frontend/src/CustomNodes/GenericNode/index.tsx

@@ -107,7 +107,6 @@ export default function GenericNode({
       setValidationStatus(null);
     }
   }, [sseData, data.id]);
-
   return (
     <>
       <NodeToolbar>

src/frontend/src/components/chatComponent/buildTrigger/index.tsx

@@ -37,7 +37,10 @@ export default function BuildTrigger({
       if (isBuilding) {
         return;
       }
-      const errors = validateNodes(reactFlowInstance!);
+      const errors = validateNodes(
+        reactFlowInstance!.getNodes(),
+        reactFlowInstance!.getEdges()
+      );
       if (errors.length > 0) {
         setErrorData({
           title: "Oops! Looks like you missed something",

src/frontend/src/modals/EditNodeModal/index.tsx

@@ -256,7 +256,7 @@ const EditNodeModal = forwardRef(
                                 </div>
                               ) : myData.current.node?.template[templateParam]
                                   .type === "dict" ? (
-                                <div className="mt-2 w-full max-h-48 overflow-auto custom-scroll">
+                                <div className="mt-2 max-h-48 w-full overflow-auto custom-scroll">
                                   <KeypairListComponent
                                     disabled={disabled}
                                     editNode={true}

src/frontend/src/modals/formModal/index.tsx

@@ -356,7 +356,10 @@ export default function FormModal({
   }, [open]);
 
   function sendMessage(): void {
-    let nodeValidationErrors = validateNodes(reactFlowInstance!);
+    let nodeValidationErrors = validateNodes(
+      reactFlowInstance!.getNodes(),
+      reactFlowInstance!.getEdges()
+    );
     if (nodeValidationErrors.length === 0) {
       setLockChat(true);
       let inputs = tabsState[id.current].formKeysData.input_keys;

src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx

@@ -62,7 +62,7 @@ export default function NodeToolbarComponent({
       setShowNode((prev) => !prev);
       updateNodeInternals(data.id);
     }
-    if(event.includes("disabled")){
+    if (event.includes("disabled")) {
       return;
     }
   };
@@ -156,8 +156,20 @@ export default function NodeToolbarComponent({
                 </SelectTrigger>
               </ShadTooltip>
               <SelectContent>
-                <SelectItem value={getRandomKeyByssmm() + (nodeLength==0?"disabled":"advanced")}>
-                  <div className={"flex "+(nodeLength==0?"text-muted-foreground":"text-primary")}>
+                <SelectItem
+                  value={
+                    getRandomKeyByssmm() +
+                    (nodeLength == 0 ? "disabled" : "advanced")
+                  }
+                >
+                  <div
+                    className={
+                      "flex " +
+                      (nodeLength == 0
+                        ? "text-muted-foreground"
+                        : "text-primary")
+                    }
+                  >
                     <IconComponent
                       name="Settings2"
                       className="relative top-0.5 mr-2 h-4 w-4"
@@ -182,7 +194,7 @@ export default function NodeToolbarComponent({
             <ShadTooltip content="Edit" side="top">
               <div>
                 <button
-                disabled={nodeLength === 0}
+                  disabled={nodeLength === 0}
                   onClick={() => setShowModalAdvanced(true)}
                   className={classNames(
                     "relative -ml-px inline-flex items-center rounded-r-md bg-background px-2 py-2 text-foreground shadow-md ring-1  ring-inset ring-ring transition-all duration-500 ease-in-out hover:bg-muted focus:z-10" +

src/frontend/src/pages/MainPage/index.tsx

@@ -41,13 +41,13 @@ export default function HomePage(): JSX.Element {
 
   const dragOver = (e) => {
     e.preventDefault();
-    if(e.dataTransfer.types.some((types) => types === "Files")){
+    if (e.dataTransfer.types.some((types) => types === "Files")) {
       setIsDragging(true);
     }
   };
 
   const dragEnter = (e) => {
-    if(e.dataTransfer.types.some((types) => types === "Files")){
+    if (e.dataTransfer.types.some((types) => types === "Files")) {
       setIsDragging(true);
     }
     e.preventDefault();

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

@@ -134,18 +134,18 @@ export type TooltipComponentType = {
   children: ReactElement;
   title: string | ReactElement;
   placement?:
-  | "bottom-end"
-  | "bottom-start"
-  | "bottom"
-  | "left-end"
-  | "left-start"
-  | "left"
-  | "right-end"
-  | "right-start"
-  | "right"
-  | "top-end"
-  | "top-start"
-  | "top";
+    | "bottom-end"
+    | "bottom-start"
+    | "bottom"
+    | "left-end"
+    | "left-start"
+    | "left"
+    | "right-end"
+    | "right-start"
+    | "right"
+    | "top-end"
+    | "top-start"
+    | "top";
 };
 
 export type ProgressBarType = {

src/frontend/src/utils/reactflowUtils.ts

@@ -189,10 +189,7 @@ export function buildTweaks(flow: FlowType) {
   }, {});
 }
 
-export function validateNode(
-  node: NodeType,
-  reactFlowInstance: ReactFlowInstance
-): Array<string> {
+export function validateNode(node: NodeType, edges: Edge[]): Array<string> {
   if (!node.data?.node?.template || !Object.keys(node.data.node.template)) {
     return [
       "We've noticed a potential issue with a node in the flow. Please review it and, if necessary, submit a bug report with your exported flow file. Thank you for your help!",
@@ -211,13 +208,11 @@ export function validateNode(
       (template[t].value === undefined ||
         template[t].value === null ||
         template[t].value === "") &&
-      !reactFlowInstance
-        .getEdges()
-        .some(
-          (edge) =>
-            edge.targetHandle?.split("|")[1] === t &&
-            edge.targetHandle.split("|")[2] === node.id
-        )
+      !edges.some(
+        (edge) =>
+          edge.targetHandle?.split("|")[1] === t &&
+          edge.targetHandle.split("|")[2] === node.id
+      )
     ) {
       errors.push(
         `${type} is missing ${
@@ -249,15 +244,13 @@ export function validateNode(
   }, [] as string[]);
 }
 
-export function validateNodes(reactFlowInstance: ReactFlowInstance) {
-  if (reactFlowInstance.getNodes().length === 0) {
+export function validateNodes(nodes: Node[], edges: Edge[]) {
+  if (nodes.length === 0) {
     return [
       "No nodes found in the flow. Please add at least one node to the flow.",
     ];
   }
-  return reactFlowInstance
-    .getNodes()
-    .flatMap((n: NodeType) => validateNode(n, reactFlowInstance));
+  return nodes.flatMap((n: NodeType) => validateNode(n, edges));
 }
 
 export function addVersionToDuplicates(flow: FlowType, flows: FlowType[]) {
@@ -311,15 +304,20 @@ export function getConnectedNodes(
   return nodes.filter((node) => node.id === targetId || node.id === sourceId);
 }
 
-export function convertObjToArray(singleObject) {
+export function convertObjToArray(singleObject: object | string) {
+  if (typeof singleObject === "string") {
+    singleObject = JSON.parse(singleObject);
+  }
   if (Array.isArray(singleObject)) return singleObject;
 
-  let arrConverted: any = [];
-  for (const key in singleObject) {
-    if (singleObject.hasOwnProperty(key)) {
-      const newObj = {};
-      newObj[key] = singleObject[key];
-      arrConverted.push(newObj);
+  let arrConverted: any[] = [];
+  if (typeof singleObject === "object") {
+    for (const key in singleObject) {
+      if (Object.prototype.hasOwnProperty.call(singleObject, key)) {
+        const newObj = {};
+        newObj[key] = singleObject[key];
+        arrConverted.push(newObj);
+      }
     }
   }
   return arrConverted;