merge fix

src/backend/langflow/__main__.py

@@ -1,5 +1,8 @@
+import platform
+import socket
 import sys
 import time
+import webbrowser
 import httpx
 from langflow.services.database.utils import session_getter
 from langflow.services.manager import initialize_services, initialize_settings_service
@@ -9,18 +12,22 @@ from multiprocess import Process, cpu_count  # type: ignore
 import platform
 from pathlib import Path
 from typing import Optional
-import socket
-from rich.panel import Panel
+
+import httpx
+import typer
+from dotenv import load_dotenv
+from multiprocess import Process, cpu_count  # type: ignore
 from rich import box
 from rich import print as rprint
-from rich.table import Table
-import typer
-from langflow.main import setup_app
-from langflow.utils.logger import configure, logger
-import webbrowser
-from dotenv import load_dotenv
-
 from rich.console import Console
+from rich.panel import Panel
+from rich.table import Table
+
+from langflow.main import setup_app
+from langflow.services.database.utils import session_getter
+from langflow.services.getters import get_db_manager, get_settings_manager
+from langflow.services.utils import initialize_services, initialize_settings_manager
+from langflow.utils.logger import configure, logger
 
 console = Console()
 
@@ -79,52 +86,6 @@ def update_settings(
         settings_service.settings.update_settings(COMPONENTS_PATH=components_path)
 
 
-def serve_on_jcloud():
-    """
-    Deploy Langflow server on Jina AI Cloud
-    """
-    import asyncio
-    from importlib.metadata import version as mod_version
-
-    import click
-
-    try:
-        from lcserve.__main__ import serve_on_jcloud  # type: ignore
-    except ImportError:
-        click.secho(
-            "🚨 Please install langchain-serve to deploy Langflow server on Jina AI Cloud "
-            "using `pip install langchain-serve`",
-            fg="red",
-        )
-        return
-
-    app_name = "langflow.lcserve:app"
-    app_dir = str(Path(__file__).parent)
-    version = mod_version("langflow")
-    base_image = "jinaai+docker://deepankarm/langflow"
-
-    click.echo("🚀 Deploying Langflow server on Jina AI Cloud")
-    app_id = asyncio.run(
-        serve_on_jcloud(
-            fastapi_app_str=app_name,
-            app_dir=app_dir,
-            uses=f"{base_image}:{version}",
-            name="langflow",
-        )
-    )
-    click.secho(
-        "🎉 Langflow server successfully deployed on Jina AI Cloud 🎉", fg="green"
-    )
-    click.secho(
-        "🔗 Click on the link to open the server (please allow ~1-2 minutes for the server to startup): ",
-        nl=False,
-        fg="green",
-    )
-    click.secho(f"https://{app_id}.wolf.jina.ai/", fg="blue")
-    click.secho("📖 Read more about managing the server: ", nl=False, fg="green")
-    click.secho("https://github.com/jina-ai/langchain-serve", fg="blue")
-
-
 @app.command()
 def run(
     host: str = typer.Option(
@@ -158,7 +119,6 @@ def run(
         help="Type of cache to use. (InMemoryCache, SQLiteCache)",
         default=None,
     ),
-    jcloud: bool = typer.Option(False, help="Deploy on Jina AI Cloud"),
     dev: bool = typer.Option(False, help="Run in development mode (may contain bugs)"),
     # This variable does not work but is set by the .env file
     # and works with Pydantic
@@ -195,9 +155,6 @@ def run(
     if env_file:
         load_dotenv(env_file, override=True)
 
-    if jcloud:
-        return serve_on_jcloud()
-
     configure(log_level=log_level, log_file=log_file)
     update_settings(
         config,

src/backend/langflow/jcloud.yml

@@ -1,2 +0,0 @@
-instance: C4
-autoscale_min: 1

src/backend/langflow/lcserve.py

@@ -1,15 +0,0 @@
-# This file is used by lc-serve to load the mounted app and serve it.
-
-import os
-
-# Use the JCLOUD_WORKSPACE for db URL if it's provided by JCloud.
-if "JCLOUD_WORKSPACE" in os.environ:
-    os.environ[
-        "LANGFLOW_DATABASE_URL"
-    ] = f"sqlite:///{os.environ['JCLOUD_WORKSPACE']}/langflow.db"
-
-from langflow.main import setup_app
-from langflow.utils.logger import configure
-
-configure(log_level="DEBUG")
-app = setup_app()

src/frontend/src/utils/utils.ts

@@ -324,8 +324,14 @@ TWEAKS = ${tweak && tweak.length > 0
       : JSON.stringify(tweaks, null, 2)
     }
 
+<<<<<<< HEAD
 def run_flow(inputs: dict, flow_id: str, tweaks: Optional[dict] = None${!isAuth ? `, apiKey: str=""` : ""
     }) -> dict:
+=======
+def run_flow(inputs: dict, flow_id: str, tweaks: Optional[dict] = None${
+    !isAuth ? `, api_key: Optional[str] = None` : ""
+  }) -> dict:
+>>>>>>> 1773f3fda830988438e7f3e3aa40959f1df692f5
     """
     Run a flow with a given message and optional tweaks.
 
@@ -337,18 +343,25 @@ def run_flow(inputs: dict, flow_id: str, tweaks: Optional[dict] = None${!isAuth
     api_url = f"{BASE_API_URL}/{flow_id}"
 
     payload = {"inputs": inputs}
-
+    headers = None
     if tweaks:
         payload["tweaks"] = tweaks
-    ${!isAuth ? 'headers = {"api-key": apiKey}' : ""}
-    response = requests.post(api_url, json=payload,headers=headers)
+    if api_key:
+        headers = {"x-api-key": api_key}
+    response = requests.post(api_url, json=payload, headers=headers)
     return response.json()
 
 # Setup any tweaks you want to apply to the flow
 inputs = ${inputs}
 ${!isAuth ? `api_key = "<your api key>"` : ""}
+<<<<<<< HEAD
 print(run_flow(inputs, flow_id=FLOW_ID, tweaks=TWEAKS${!isAuth ? `, apiKey=api_key` : ""
     }))`;
+=======
+print(run_flow(inputs, flow_id=FLOW_ID, tweaks=TWEAKS${
+    !isAuth ? `, api_key=api_key` : ""
+  }))`;
+>>>>>>> 1773f3fda830988438e7f3e3aa40959f1df692f5
 }
 
 /**
@@ -367,11 +380,22 @@ export function getCurlCode(
   const inputs = buildInputs(tabsState!, flow.id);
 
   return `curl -X POST \\
+<<<<<<< HEAD
   ${window.location.protocol}//${window.location.host
     }/api/v1/process/${flowId} \\
   -H 'Content-Type: application/json'\\
   ${!isAuth ? `-H 'api-key: <your api key>'\\` : ""}
   -d '{"inputs": ${inputs}, "tweaks": ${tweak && tweak.length > 0
+=======
+  ${window.location.protocol}//${
+    window.location.host
+  }/api/v1/process/${flowId} \\
+  -H 'Content-Type: application/json'\\${
+    !isAuth ? `\n  -H 'x-api-key: <your api key>'\\` : ""
+  }
+  -d '{"inputs": ${inputs}, "tweaks": ${
+    tweak && tweak.length > 0
+>>>>>>> 1773f3fda830988438e7f3e3aa40959f1df692f5
       ? buildTweakObject(tweak)
       : JSON.stringify(tweaks, null, 2)
     }}'`;
@@ -433,8 +457,13 @@ chat_input_field: Input key that you want the chat to send the user message with
       ? `
   api_key="..."`
       : ""
+<<<<<<< HEAD
     }
   
+=======
+  }
+
+>>>>>>> 1773f3fda830988438e7f3e3aa40959f1df692f5
 ></langflow-chat>`;
 }