Merge branch 'release-1.6.0' into merge/release-1.6.0-to-main-v2

Author: jordanrfrazier

pyproject.toml

@@ -122,7 +122,7 @@ dependencies = [
     "cleanlab-tlm>=1.1.2",
     'gassist>=0.0.1; sys_platform == "win32"',
     "twelvelabs>=0.4.7",
-    "docling_core>=2.36.1",
+    "docling>=2.36.1",
     "filelock>=3.18.0",
     "jigsawstack==0.2.7",
     "structlog>=25.4.0",
@@ -181,7 +181,6 @@ dev = [
     "pytest-timeout>=2.3.1",
     "pyyaml>=6.0.2",
     "pyleak>=0.1.14",
-    "docling>=2.36.1"
 ]
 
 [tool.uv.sources]

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

@@ -39,7 +39,6 @@
 from langflow.services.database.models.flow.model import Flow, FlowCreate
 from langflow.services.database.models.folder.constants import DEFAULT_FOLDER_NAME
 from langflow.services.database.models.folder.model import Folder, FolderCreate, FolderRead
-from langflow.services.database.models.user.crud import get_user_by_username
 from langflow.services.deps import get_settings_service, get_storage_service, get_variable_service, session_scope
 
 # In the folder ./starter_projects we have a few JSON files that represent
@@ -727,20 +726,21 @@ async def load_flows_from_directory() -> None:
     """On langflow startup, this loads all flows from the directory specified in the settings.
 
     All flows are uploaded into the default folder for the superuser.
-    Note that this feature currently only works if AUTO_LOGIN is enabled in the settings.
     """
     settings_service = get_settings_service()
     flows_path = settings_service.settings.load_flows_path
     if not flows_path:
         return
-    if not settings_service.auth_settings.AUTO_LOGIN:
-        await logger.awarning("AUTO_LOGIN is disabled, not loading flows from directory")
-        return
 
     async with session_scope() as session:
-        user = await get_user_by_username(session, settings_service.auth_settings.SUPERUSER)
+        # Find superuser by role instead of username to avoid issues with credential reset
+        from langflow.services.database.models.user.model import User
+
+        stmt = select(User).where(User.is_superuser == True)  # noqa: E712
+        result = await session.exec(stmt)
+        user = result.first()
         if user is None:
-            msg = "Superuser not found in the database"
+            msg = "No superuser found in the database"
             raise NoResultFound(msg)
 
         # Ensure that the default folder exists for this user
@@ -793,13 +793,16 @@ async def load_bundles_from_urls() -> tuple[list[TemporaryDirectory], list[str]]
     bundle_urls = settings_service.settings.bundle_urls
     if not bundle_urls:
         return [], []
-    if not settings_service.auth_settings.AUTO_LOGIN:
-        await logger.awarning("AUTO_LOGIN is disabled, not loading flows from URLs")
 
     async with session_scope() as session:
-        user = await get_user_by_username(session, settings_service.auth_settings.SUPERUSER)
+        # Find superuser by role instead of username to avoid issues with credential reset
+        from langflow.services.database.models.user.model import User
+
+        stmt = select(User).where(User.is_superuser == True)  # noqa: E712
+        result = await session.exec(stmt)
+        user = result.first()
         if user is None:
-            msg = "Superuser not found in the database"
+            msg = "No superuser found in the database"
             raise NoResultFound(msg)
         user_id = user.id
 
@@ -816,11 +819,7 @@ async def load_bundles_from_urls() -> tuple[list[TemporaryDirectory], list[str]]
                 for filename in zfile.namelist():
                     path = Path(filename)
                     for dir_name in dir_names:
-                        if (
-                            settings_service.auth_settings.AUTO_LOGIN
-                            and path.is_relative_to(f"{dir_name}flows/")
-                            and path.suffix == ".json"
-                        ):
+                        if path.is_relative_to(f"{dir_name}flows/") and path.suffix == ".json":
                             file_content = zfile.read(filename)
                             await upsert_flow_from_file(file_content, path.stem, session, user_id)
                         elif path.is_relative_to(f"{dir_name}components/"):

src/backend/tests/unit/components/tools/test_python_repl_tool.py

@@ -45,7 +45,8 @@ def test_component_initialization(self, component_class, default_kwargs):
 
         # Test python_code configuration
         python_code = template["python_code"]
-        assert python_code["type"] == "code"
+        # assert python_code["type"] == "code"  # TODO: Restore when CodeInput is included in component
+        assert python_code["type"] == "str"  # TODO: Remove when CodeInput is included in component
         assert python_code["value"] == "print('Hello, World!')"
         assert python_code["required"] is True
 

src/lfx/src/lfx/components/processing/python_repl_core.py

@@ -3,7 +3,7 @@
 from langchain_experimental.utilities import PythonREPL
 
 from lfx.custom.custom_component.component import Component
-from lfx.io import CodeInput, Output, StrInput
+from lfx.io import MultilineInput, Output, StrInput
 from lfx.schema.data import Data
 
 
@@ -21,7 +21,7 @@ class PythonREPLComponent(Component):
             value="math,pandas",
             required=True,
         ),
-        CodeInput(
+        MultilineInput(
             name="python_code",
             display_name="Python Code",
             info="The Python code to execute. Only modules specified in Global Imports can be used.",