⚡️ Speed up function get_cache_service by 1,090% in PR #11129 (aka-merge-1.7.1)

.github/workflows/nightly_build.yml

@@ -221,6 +221,7 @@ jobs:
     with:
       build_docker_base: true
       build_docker_main: true
+      build_docker_ep: true
       build_lfx: true
       nightly_tag_main: ${{ needs.create-nightly-tag.outputs.main_tag }}
       nightly_tag_base: ${{ needs.create-nightly-tag.outputs.base_tag }}

.github/workflows/release.yml

@@ -385,7 +385,7 @@ jobs:
 
   build-lfx:
     name: Build LFX
-    needs: [ci]
+    needs: [build-base]
     if: ${{ inputs.release_lfx }}
     runs-on: ubuntu-latest
     outputs:
@@ -434,7 +434,7 @@ jobs:
 
   test-cross-platform:
     name: Test Cross-Platform Installation
-    needs: [build-base, build-main]
+    needs: [build-base, build-main, build-lfx]
     if: |
       always() &&
       !cancelled() &&
@@ -494,7 +494,7 @@ jobs:
   publish-lfx:
     name: Publish LFX to PyPI
     if: ${{ inputs.release_lfx }}
-    needs: [build-lfx]
+    needs: [build-lfx, test-cross-platform]
     runs-on: ubuntu-latest
     steps:
       - name: Download LFX artifact

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "langflow"
-version = "1.7.0"
+version = "1.7.1"
 description = "A Python package with a built-in web application"
 requires-python = ">=3.10,<3.14"
 license = "MIT"
@@ -17,7 +17,7 @@ maintainers = [
 ]
 # Define your main dependencies here
 dependencies = [
-    "langflow-base~=0.7.0",
+    "langflow-base~=0.7.1",
     "beautifulsoup4==4.12.3",
     "google-search-results>=2.4.1,<3.0.0",
     "google-api-python-client==2.154.0",

src/backend/base/langflow/api/utils/core.py

@@ -61,7 +61,7 @@ def remove_api_keys(flow: dict):
         node_data = node.get("data").get("node")
         template = node_data.get("template")
         for value in template.values():
-            if isinstance(value, dict) and has_api_terms(value["name"]) and value.get("password"):
+            if isinstance(value, dict) and "name" in value and has_api_terms(value["name"]) and value.get("password"):
                 value["value"] = None
 
     return flow

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

@@ -10,9 +10,11 @@
 from langflow.api.utils import DbSession, custom_params
 from langflow.schema.message import MessageResponse
 from langflow.services.auth.utils import get_current_active_user
+from langflow.services.database.models.flow.model import Flow
 from langflow.services.database.models.message.model import MessageRead, MessageTable, MessageUpdate
 from langflow.services.database.models.transactions.crud import transform_transaction_table
 from langflow.services.database.models.transactions.model import TransactionTable
+from langflow.services.database.models.user.model import User
 from langflow.services.database.models.vertex_builds.crud import (
     delete_vertex_builds_by_flow_id,
     get_vertex_builds_by_flow_id,
@@ -39,15 +41,20 @@ async def delete_vertex_builds(flow_id: Annotated[UUID, Query()], session: DbSes
         raise HTTPException(status_code=500, detail=str(e)) from e
 
 
-@router.get("/messages/sessions", dependencies=[Depends(get_current_active_user)])
+@router.get("/messages/sessions")
 async def get_message_sessions(
     session: DbSession,
+    current_user: Annotated[User, Depends(get_current_active_user)],
     flow_id: Annotated[UUID | None, Query()] = None,
 ) -> list[str]:
     try:
         stmt = select(MessageTable.session_id).distinct()
         stmt = stmt.where(col(MessageTable.session_id).isnot(None))
 
+        # Filter by user's flows
+        user_flows_stmt = select(Flow.id).where(Flow.user_id == current_user.id)
+        stmt = stmt.where(col(MessageTable.flow_id).in_(user_flows_stmt))
+
         if flow_id:
             stmt = stmt.where(MessageTable.flow_id == flow_id)
 
@@ -57,9 +64,10 @@ async def get_message_sessions(
         raise HTTPException(status_code=500, detail=str(e)) from e
 
 
-@router.get("/messages", dependencies=[Depends(get_current_active_user)])
+@router.get("/messages")
 async def get_messages(
     session: DbSession,
+    current_user: Annotated[User, Depends(get_current_active_user)],
     flow_id: Annotated[UUID | None, Query()] = None,
     session_id: Annotated[str | None, Query()] = None,
     sender: Annotated[str | None, Query()] = None,
@@ -68,6 +76,11 @@ async def get_messages(
 ) -> list[MessageResponse]:
     try:
         stmt = select(MessageTable)
+
+        # Filter by user's flows
+        user_flows_stmt = select(Flow.id).where(Flow.user_id == current_user.id)
+        stmt = stmt.where(col(MessageTable.flow_id).in_(user_flows_stmt))
+
         if flow_id:
             stmt = stmt.where(MessageTable.flow_id == flow_id)
         if session_id:
@@ -80,8 +93,8 @@ async def get_messages(
         if sender_name:
             stmt = stmt.where(MessageTable.sender_name == sender_name)
         if order_by:
-            col = getattr(MessageTable, order_by).asc()
-            stmt = stmt.order_by(col)
+            order_col = getattr(MessageTable, order_by).asc()
+            stmt = stmt.order_by(order_col)
         messages = await session.exec(stmt)
         return [MessageResponse.model_validate(d, from_attributes=True) for d in messages]
     except Exception as e:

src/backend/base/langflow/initial_setup/starter_projects/Research Translation Loop.json

@@ -1577,6 +1577,7 @@
               "Message"
             ],
             "beta": false,
+            "category": "models_and_agents",
             "conditional_paths": [],
             "custom_fields": {},
             "description": "Extracts text using a template.",

src/backend/base/langflow/memory.py

@@ -164,7 +164,9 @@ async def aupdate_messages(messages: Message | list[Message]) -> list[Message]:
                 # Convert flow_id to UUID if it's a string preventing error when saving to database
                 if msg.flow_id and isinstance(msg.flow_id, str):
                     msg.flow_id = UUID(msg.flow_id)
-                session.add(msg)
+                result = session.add(msg)
+                if asyncio.iscoroutine(result):
+                    await result
                 updated_messages.append(msg)
             else:
                 error_message = f"Message with id {message.id} not found"
@@ -190,7 +192,9 @@ async def aadd_messagetables(messages: list[MessageTable], session: AsyncSession
     try:
         try:
             for message in messages:
-                session.add(message)
+                result = session.add(message)
+                if asyncio.iscoroutine(result):
+                    await result
             await session.commit()
             # This is a hack.
             # We are doing this because build_public_tmp causes the CancelledError to be raised

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

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from contextlib import asynccontextmanager
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Union
 
 from langflow.services.schema import ServiceType
 
@@ -176,15 +176,18 @@
         yield session
 
 
-def get_cache_service() -> CacheService | AsyncBaseCacheService:
+def get_cache_service() -> Union[CacheService, AsyncBaseCacheService]:  # noqa: UP007
     """Retrieves the cache service from the service manager.
 
     Returns:
         The cache service instance.
     """
-    from langflow.services.cache.factory import CacheServiceFactory
+    if not hasattr(get_cache_service, "_factory"):
+        from langflow.services.cache.factory import CacheServiceFactory
 
-    return get_service(ServiceType.CACHE_SERVICE, CacheServiceFactory())
+        get_cache_service._factory = CacheServiceFactory()
+
+    return get_service(ServiceType.CACHE_SERVICE, get_cache_service._factory)
 
 
 def get_shared_component_cache_service() -> CacheService:

src/backend/base/langflow/services/storage/s3.py

@@ -1,4 +1,8 @@
-"""S3-based storage service implementation using async boto3."""
+"""S3-based storage service implementation using async boto3.
+
+This service handles file storage operations with AWS S3, including
+file upload, download, deletion, and listing operations.
+"""
 
 from __future__ import annotations
 

src/backend/base/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "langflow-base"
-version = "0.7.0"
+version = "0.7.1"
 description = "A Python package with a built-in web application"
 requires-python = ">=3.10,<3.14"
 license = "MIT"
@@ -17,7 +17,7 @@ maintainers = [
 ]
 
 dependencies = [
-    "lfx~=0.2.0",
+    "lfx~=0.2.1",
     "fastapi>=0.115.2,<1.0.0",
     "httpx[http2]>=0.27,<1.0.0",
     "aiofile>=3.9.0,<4.0.0",

src/backend/tests/unit/api/test_api_utils.py

@@ -1,6 +1,6 @@
 from unittest.mock import patch
 
-from langflow.api.utils import get_suggestion_message
+from langflow.api.utils import get_suggestion_message, remove_api_keys
 from langflow.services.database.models.flow.utils import get_outdated_components
 from langflow.utils.version import get_version_info
 
@@ -43,3 +43,129 @@ def test_get_outdated_components():
         result = get_outdated_components(flow)
         # Assert the result is as expected
         assert result == expected_outdated_components
+
+
+def test_remove_api_keys():
+    """Test that remove_api_keys properly removes API keys and handles various template structures.
+
+    This test validates the fix for the bug where remove_api_keys would crash when
+    encountering template values without 'name' keys (e.g., Note components with
+    only backgroundColor).
+    """
+    # Test case 1: Flow with API key that should be removed
+    flow_with_api_key = {
+        "data": {
+            "nodes": [
+                {
+                    "data": {
+                        "node": {
+                            "template": {
+                                "api_key": {
+                                    "name": "api_key",
+                                    "value": "secret-123",
+                                    "password": True,
+                                },
+                                "openai_api_key": {
+                                    "name": "openai_api_key",
+                                    "value": "sk-abc123",
+                                    "password": True,
+                                },
+                            }
+                        }
+                    }
+                }
+            ]
+        }
+    }
+
+    result = remove_api_keys(flow_with_api_key)
+    assert result["data"]["nodes"][0]["data"]["node"]["template"]["api_key"]["value"] is None
+    assert result["data"]["nodes"][0]["data"]["node"]["template"]["openai_api_key"]["value"] is None
+
+    # Test case 2: Flow with Note component (no 'name' key) - this is the bug fix
+    flow_with_note = {
+        "data": {
+            "nodes": [
+                {
+                    "data": {
+                        "node": {
+                            "template": {
+                                "backgroundColor": {"value": "#ffffff"},  # No 'name' key
+                                "text": {"value": "Test note"},  # No 'name' key
+                            }
+                        }
+                    }
+                }
+            ]
+        }
+    }
+
+    # This should not raise an error (the bug that was fixed)
+    result = remove_api_keys(flow_with_note)
+    # Values should be preserved since they're not API keys
+    assert result["data"]["nodes"][0]["data"]["node"]["template"]["backgroundColor"]["value"] == "#ffffff"
+    assert result["data"]["nodes"][0]["data"]["node"]["template"]["text"]["value"] == "Test note"
+
+    # Test case 3: Mixed flow with both API keys and template values without 'name'
+    mixed_flow = {
+        "data": {
+            "nodes": [
+                {
+                    "data": {
+                        "node": {
+                            "template": {
+                                "backgroundColor": {"value": "#ffffff"},  # No 'name' key
+                                "api_token": {
+                                    "name": "api_token",
+                                    "value": "token-xyz",
+                                    "password": True,
+                                },
+                                "regular_field": {
+                                    "name": "regular_field",
+                                    "value": "keep-this",
+                                },
+                            }
+                        }
+                    }
+                }
+            ]
+        }
+    }
+
+    result = remove_api_keys(mixed_flow)
+    # backgroundColor should be preserved (no 'name' key)
+    assert result["data"]["nodes"][0]["data"]["node"]["template"]["backgroundColor"]["value"] == "#ffffff"
+    # API token should be removed
+    assert result["data"]["nodes"][0]["data"]["node"]["template"]["api_token"]["value"] is None
+    # Regular field should be kept
+    assert result["data"]["nodes"][0]["data"]["node"]["template"]["regular_field"]["value"] == "keep-this"
+
+    # Test case 4: Flow with auth_token (password field but not password=True)
+    flow_with_non_password_api = {
+        "data": {
+            "nodes": [
+                {
+                    "data": {
+                        "node": {
+                            "template": {
+                                "api_key": {
+                                    "name": "api_key",
+                                    "value": "should-not-be-removed",
+                                    "password": False,  # Not a password field
+                                },
+                            }
+                        }
+                    }
+                }
+            ]
+        }
+    }
+
+    result = remove_api_keys(flow_with_non_password_api)
+    # Should NOT be removed because password is False
+    assert result["data"]["nodes"][0]["data"]["node"]["template"]["api_key"]["value"] == "should-not-be-removed"
+
+    # Test case 5: Empty flow
+    empty_flow = {"data": {"nodes": []}}
+    result = remove_api_keys(empty_flow)
+    assert result == empty_flow