Merge remote-tracking branch 'origin/dev' into fix/minor_bugs

Makefile

@@ -48,8 +48,8 @@ coverage:
 
 # allow passing arguments to pytest
 tests:
-	poetry run pytest tests --instafail $(args)
-# Use like:
+	poetry run pytest tests --instafail -ra -n auto -m "not api_key_required" $(args)
+
 
 format:
 	poetry run ruff check . --fix

docs/docs/index.mdx

@@ -14,8 +14,8 @@ Its intuitive interface allows for easy manipulation of AI building blocks, enab
 <ZoomableImage
   alt="Docusaurus themed image"
   sources={{
-    light: "img/new_langflow_demo.gif",
-    dark: "img/new_langflow_demo.gif",
+    light: "img/langflow_basic_howto.gif",
+    dark: "img/langflow_basic_howto.gif",
   }}
   style={{ width: "100%" }}
 />

pyproject.toml

@@ -140,7 +140,7 @@ testpaths = ["tests", "integration"]
 console_output_style = "progress"
 filterwarnings = ["ignore::DeprecationWarning"]
 log_cli = true
-markers = ["async_test"]
+markers = ["async_test", "api_key_required"]
 
 
 [tool.ruff]

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

@@ -8,7 +8,7 @@ from sqlmodel import Session, select
 from langflow.graph.schema import RunOutputs
 from langflow.schema.schema import INPUT_FIELD_NAME, Record
 from langflow.services.database.models.flow import Flow
-from langflow.services.deps import get_session, session_scope
+from langflow.services.deps import get_session, get_settings_service, session_scope
 
 if TYPE_CHECKING:
     from langflow.graph.graph.base import Graph
@@ -88,7 +88,9 @@ async def run_flow(
         inputs_components.append(input_dict.get("components", []))
         types.append(input_dict.get("type", "chat"))
 
-    return await graph.arun(inputs_list, inputs_components=inputs_components, types=types)
+    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)
 
 
 def generate_function_for_flow(

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

@@ -8,6 +8,7 @@ from langflow.graph.schema import RunOutputs
 from langflow.graph.vertex.base import Vertex
 from langflow.schema.graph import InputValue, Tweaks
 from langflow.schema.schema import INPUT_FIELD_NAME
+from langflow.services.deps import get_settings_service
 from langflow.services.session.service import SessionService
 
 if TYPE_CHECKING:
@@ -49,6 +50,8 @@ async def run_graph_internal(
         inputs_list.append({INPUT_FIELD_NAME: input_value_request.input_value})
         types.append(input_value_request.type)
 
+    fallback_to_env_vars = get_settings_service().settings.fallback_to_env_var
+
     run_outputs = await graph.arun(
         inputs_list,
         components,
@@ -56,6 +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
     )
     if session_id_str and session_service:
         await session_service.update_session(session_id_str, (graph, artifacts))

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

@@ -78,6 +78,7 @@ class Settings(BaseSettings):
     langchain_cache: str = "InMemoryCache"
     load_flows_path: Optional[str] = None
 
+
     # Redis
     redis_host: str = "localhost"
     redis_port: int = 6379

tests/test_endpoints.py

@@ -4,6 +4,7 @@ from uuid import UUID, uuid4
 import pytest
 from fastapi import status
 from fastapi.testclient import TestClient
+
 from langflow.custom.directory_reader.directory_reader import DirectoryReader
 from langflow.services.deps import get_settings_service
 
@@ -632,6 +633,7 @@ def test_successful_run_with_input_type_any(client, starter_project, created_api
     assert all([output.get("results").get("result") == "value1" for output in any_input_outputs]), any_input_outputs
 
 
+@pytest.mark.api_key_required
 def test_run_with_inputs_and_outputs(client, starter_project, created_api_key):
     headers = {"x-api-key": created_api_key.api_key}
     flow_id = starter_project["id"]
@@ -659,6 +661,7 @@ def test_invalid_flow_id(client, created_api_key):
     # Check if the error detail is as expected
 
 
+@pytest.mark.api_key_required
 def test_run_flow_with_caching_success(client: TestClient, starter_project, created_api_key):
     flow_id = starter_project["id"]
     headers = {"x-api-key": created_api_key.api_key}
@@ -676,6 +679,7 @@ def test_run_flow_with_caching_success(client: TestClient, starter_project, crea
     assert "session_id" in data
 
 
+@pytest.mark.api_key_required
 def test_run_flow_with_caching_invalid_flow_id(client: TestClient, created_api_key):
     invalid_flow_id = uuid4()
     headers = {"x-api-key": created_api_key.api_key}
@@ -687,6 +691,7 @@ def test_run_flow_with_caching_invalid_flow_id(client: TestClient, created_api_k
     assert f"Flow identifier {invalid_flow_id} not found" in data["detail"]
 
 
+@pytest.mark.api_key_required
 def test_run_flow_with_caching_invalid_input_format(client: TestClient, starter_project, created_api_key):
     flow_id = starter_project["id"]
     headers = {"x-api-key": created_api_key.api_key}
@@ -695,6 +700,7 @@ def test_run_flow_with_caching_invalid_input_format(client: TestClient, starter_
     assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY
 
 
+@pytest.mark.api_key_required
 def test_run_flow_with_session_id(client, starter_project, created_api_key):
     headers = {"x-api-key": created_api_key.api_key}
     flow_id = starter_project["id"]
@@ -726,6 +732,7 @@ def test_run_flow_with_invalid_session_id(client, starter_project, created_api_k
     assert f"Session {payload['session_id']} not found" in data["detail"]
 
 
+@pytest.mark.api_key_required
 def test_run_flow_with_invalid_tweaks(client, starter_project, created_api_key):
     headers = {"x-api-key": created_api_key.api_key}
     flow_id = starter_project["id"]