merge fix

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

@@ -71,9 +71,7 @@ async def login_to_get_access_token(
 
 @router.get("/auto_login")
 async def auto_login(
-    response: Response,
-    db: Session = Depends(get_session),
-    settings_service=Depends(get_settings_service)
+    response: Response, db: Session = Depends(get_session), settings_service=Depends(get_settings_service)
 ):
     auth_settings = settings_service.auth_settings
     if settings_service.auth_settings.AUTO_LOGIN:

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

@@ -1,5 +1,4 @@
 from typing import List, Optional
-from uuid import UUID
 from fastapi import APIRouter, Depends, HTTPException, Query
 
 from langflow.services.deps import get_monitor_service

src/backend/base/langflow/base/curl/parse.py

@@ -15,10 +15,25 @@ import shlex
 from collections import OrderedDict, namedtuple
 from http.cookies import SimpleCookie
 
-from uncurl.api import parser  # type: ignore
-
-parser.add_argument("-x", "--proxy", default={})
-parser.add_argument("-U", "--proxy-user", default="")
+ParsedArgs = namedtuple(
+    "ParsedContext",
+    [
+        "command",
+        "url",
+        "data",
+        "data_binary",
+        "method",
+        "headers",
+        "compressed",
+        "insecure",
+        "user",
+        "include",
+        "silent",
+        "proxy",
+        "proxy_user",
+        "cookies",
+    ],
+)
 
 ParsedContext = namedtuple("ParsedContext", ["method", "url", "data", "headers", "cookies", "verify", "auth", "proxy"])
 
@@ -27,24 +42,89 @@ def normalize_newlines(multiline_text):
     return multiline_text.replace(" \\\n", " ")
 
 
+def parse_curl_command(curl_command):
+    tokens = shlex.split(normalize_newlines(curl_command))
+    tokens = [token for token in tokens if token and token != " "]
+    if "curl" not in tokens[0]:
+        raise ValueError("Invalid curl command")
+    args_template = {
+        "command": None,
+        "url": None,
+        "data": None,
+        "data_binary": None,
+        "method": "get",
+        "headers": [],
+        "compressed": False,
+        "insecure": False,
+        "user": (),
+        "include": False,
+        "silent": False,
+        "proxy": None,
+        "proxy_user": None,
+        "cookies": {},
+    }
+    args = args_template.copy()
+
+    i = 0
+    while i < len(tokens):
+        token = tokens[i]
+        if token == "-X":
+            i += 1
+            args["method"] = tokens[i].lower()
+        elif token in ("-d", "--data"):
+            i += 1
+            args["data"] = tokens[i]
+            args["method"] = "post"
+        elif token in ("-b", "--data-binary", "--data-raw"):
+            i += 1
+            args["data_binary"] = tokens[i]
+            args["method"] = "post"
+        elif token in ("-H", "--header"):
+            i += 1
+            args["headers"].append(tokens[i])
+        elif token == "--compressed":
+            args["compressed"] = True
+        elif token in ("-k", "--insecure"):
+            args["insecure"] = True
+        elif token in ("-u", "--user"):
+            i += 1
+            args["user"] = tuple(tokens[i].split(":"))
+        elif token in ("-I", "--include"):
+            args["include"] = True
+        elif token in ("-s", "--silent"):
+            args["silent"] = True
+        elif token in ("-x", "--proxy"):
+            i += 1
+            args["proxy"] = tokens[i]
+        elif token in ("-U", "--proxy-user"):
+            i += 1
+            args["proxy_user"] = tokens[i]
+        elif not token.startswith("-"):
+            if args["command"] is None:
+                args["command"] = token
+            else:
+                args["url"] = token
+        i += 1
+
+    return ParsedArgs(**args)
+
+
 def parse_context(curl_command):
     method = "get"
 
-    tokens = shlex.split(normalize_newlines(curl_command))
-    tokens = [token for token in tokens if token and token != " "]
-    parsed_args = parser.parse_args(tokens)
+    parsed_args: ParsedArgs = parse_curl_command(curl_command)
 
     post_data = parsed_args.data or parsed_args.data_binary
     if post_data:
         method = "post"
 
-    if parsed_args.X:
-        method = parsed_args.X.lower()
+    if parsed_args.method:
+        method = parsed_args.method.lower()
 
     cookie_dict = OrderedDict()
     quoted_headers = OrderedDict()
 
-    for curl_header in parsed_args.header:
+    for curl_header in parsed_args.headers:
         if curl_header.startswith(":"):
             occurrence = [m.start() for m in re.finditer(":", curl_header)]
             header_key, header_value = curl_header[: occurrence[1]], curl_header[occurrence[1] + 1 :]

src/backend/base/langflow/base/data/utils.py

@@ -99,7 +99,7 @@ def read_text_file(file_path: str) -> str:
     with open(file_path, "rb") as f:
         raw_data = f.read()
         result = chardet.detect(raw_data)
-        encoding = result['encoding']
+        encoding = result["encoding"]
 
     with open(file_path, "r", encoding=encoding) as f:
         return f.read()

src/backend/base/langflow/helpers/flow.py

@@ -90,7 +90,9 @@ async def run_flow(
 
     fallback_to_env_vars = get_settings_service().settings.fallback_to_env_var
 
-    return await graph.arun(inputs_list, inputs_components=inputs_components, types=types, fallback_to_env_vars=fallback_to_env_vars)
+    return await graph.arun(
+        inputs_list, inputs_components=inputs_components, types=types, fallback_to_env_vars=fallback_to_env_vars
+    )
 
 
 def generate_function_for_flow(

src/backend/base/langflow/initial_setup/setup.py

@@ -20,7 +20,7 @@ from langflow.services.database.models.user.crud import get_user_by_username
 from langflow.services.deps import get_settings_service, session_scope
 
 from langflow.services.database.models.folder.utils import create_default_folder_if_it_doesnt_exist
-from langflow.services.deps import get_settings_service, session_scope, get_variable_service
+from langflow.services.deps import get_variable_service
 
 
 STARTER_FOLDER_NAME = "Starter Projects"
@@ -221,6 +221,7 @@ def _is_valid_uuid(val):
         return False
     return str(uuid_obj) == val
 
+
 def load_flows_from_directory():
     settings_service = get_settings_service()
     flows_path = settings_service.settings.load_flows_path
@@ -262,6 +263,7 @@ def load_flows_from_directory():
                     session.add(flow)
                 session.commit()
 
+
 def find_existing_flow(session, flow_id, flow_endpoint_name):
     if flow_endpoint_name:
         stmt = select(Flow).where(Flow.endpoint_name == flow_endpoint_name)
@@ -271,6 +273,8 @@ def find_existing_flow(session, flow_id, flow_endpoint_name):
     if existing := session.exec(stmt).first():
         return existing
     return None
+
+
 def create_or_update_starter_projects():
     components_paths = get_settings_service().settings.components_path
     try:

src/backend/base/langflow/processing/process.py

@@ -59,7 +59,7 @@ async def run_graph_internal(
         outputs or [],
         stream=stream,
         session_id=session_id_str or "",
-        fallback_to_env_vars=fallback_to_env_vars
+        fallback_to_env_vars=fallback_to_env_vars,
     )
     if session_id_str and session_service:
         await session_service.update_session(session_id_str, (graph, artifacts))

src/backend/base/langflow/services/auth/utils.py

@@ -215,10 +215,7 @@ def create_user_longterm_token(db: Session = Depends(get_session)) -> tuple[UUID
     username = settings_service.auth_settings.SUPERUSER
     super_user = get_user_by_username(db, username)
     if not super_user:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail="Super user hasn't been created"
-        )
+        raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST, detail="Super user hasn't been created")
     access_token_expires_longterm = timedelta(days=365)
     access_token = create_token(
         data={"sub": str(super_user.id)},

src/backend/base/langflow/services/database/models/api_key/model.py

@@ -55,6 +55,7 @@ class ApiKeyRead(ApiKeyBase):
     id: UUID
     api_key: str = Field(schema_extra={"validate_default": True})
     user_id: UUID = Field()
+    created_at: datetime = Field()
 
     @field_validator("api_key")
     @classmethod

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

@@ -1,5 +1,4 @@
 import os
-from typing import Optional
 
 import yaml
 from loguru import logger
@@ -8,6 +7,7 @@ from langflow.services.base import Service
 from langflow.services.settings.auth import AuthSettings
 from langflow.services.settings.base import Settings
 
+
 class SettingsService(Service):
     name = "settings_service"