From ade883e3f3e5c0a4c8365b89e7e6d3a3a6af493e Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Tue, 29 Oct 2024 00:42:01 -0400
Subject: [PATCH 01/21] simple ai agent

new component:
simple ai agent

py tests for tool calling agent as well as for simple ai agent
---
 .../components/agents/simple_agent.py         | 156 ++++++++++++++++++
 .../components/agents/test_simple_agent.py    |  31 ++++
 .../agents/test_tool_calling_agent.py         |  32 ++++
 3 files changed, 219 insertions(+)
 create mode 100644 src/backend/base/langflow/components/agents/simple_agent.py
 create mode 100644 src/backend/tests/unit/components/agents/test_simple_agent.py
 create mode 100644 src/backend/tests/unit/components/agents/test_tool_calling_agent.py

diff --git a/src/backend/base/langflow/components/agents/simple_agent.py b/src/backend/base/langflow/components/agents/simple_agent.py
new file mode 100644
index 00000000000..56078bd1374
--- /dev/null
+++ b/src/backend/base/langflow/components/agents/simple_agent.py
@@ -0,0 +1,156 @@
+from langflow.base.models.model import LCModelComponent
+from langflow.components.agents.tool_calling import ToolCallingAgentComponent
+from langflow.components.models.azure_openai import AzureChatOpenAIComponent
+from langflow.components.models.openai import OpenAIModelComponent
+from langflow.io import (
+    DataInput,
+    DropdownInput,
+    HandleInput,
+    MessageTextInput,
+    Output,
+)
+from langflow.schema.message import Message
+
+
+class SimpleAgentComponent(ToolCallingAgentComponent):
+    display_name: str = "Simple Agent"
+    description: str = "Agent that uses tools"
+    icon = "workflow"
+    beta = True
+    name = "SimpleAgent"
+    AZURE_OPENAI_API_VERSIONS = [
+        "2024-06-01",
+        "2024-07-01-preview",
+        "2024-08-01-preview",
+        "2024-09-01-preview",
+        "2024-10-01-preview",
+        "2023-05-15",
+        "2023-12-01-preview",
+        "2024-02-15-preview",
+        "2024-03-01-preview",
+    ]
+    openai_inputs = [
+        component_input
+        for component_input in OpenAIModelComponent().inputs
+        if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]
+    ]
+    azure_inputs = [
+        component_input
+        for component_input in AzureChatOpenAIComponent().inputs
+        if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]
+    ]
+    inputs = [
+        HandleInput(
+            name="tools", display_name="Tools", input_types=["Tool", "BaseTool", "StructuredTool"], is_list=True
+        ),
+        MessageTextInput(name="input_value", display_name="Input"),
+        DataInput(name="chat_history", display_name="Chat History", is_list=True, advanced=True),
+        DropdownInput(
+            name="agent_llm",
+            display_name="Language Model Type",
+            options=["Custom", "Azure OpenAI", "OpenAI"],
+            value="OpenAI",
+            real_time_refresh=True,
+        ),
+        *openai_inputs,
+    ]
+    outputs = [Output(name="response", display_name="Response", method="get_response")]
+
+    async def get_response(self) -> Message:
+        # Chat input initialization
+
+        # Default OpenAI Model Component
+        llm_model = self.get_llm()
+        if llm_model is None:
+            msg = "No language model selected"
+            raise ValueError(msg)
+
+        agent = ToolCallingAgentComponent().set(
+            llm=llm_model, tools=[self.tools], chat_history=self.chat_history, input_value=self.input_value
+        )
+
+        return await agent.message_response()
+
+    def get_llm(self):
+        if self.agent_llm == "OpenAI":
+            return (
+                OpenAIModelComponent()
+                .set(
+                    **{
+                        component_input.name: getattr(self, component_input.name)
+                        for component_input in self.openai_inputs
+                    }
+                )
+                .build_model()
+            )
+        if self.agent_llm == "Azure OpenAI":
+            return (
+                AzureChatOpenAIComponent()
+                .set(
+                    **{
+                        component_input.name: getattr(self, f"azure_param_{component_input.name}")
+                        for component_input in self.azure_inputs
+                    }
+                )
+                .build_model()
+            )
+        if self.agent_llm == "Custom":
+            return self.llm_custom
+        return None
+
+    def insert_in_dict(self, build_config, field_name, new_parameters):
+        # Insert the new key-value pair after the found key
+        for new_field_name, new_parameter in new_parameters.items():
+            # Get all the items as a list of tuples (key, value)
+            items = list(build_config.items())
+
+            # Find the index of the key to insert after
+            idx = len(items)
+            for i, (key, _value) in enumerate(items):
+                if key == field_name:
+                    idx = i + 1
+                    break
+
+            items.insert(idx, (new_field_name, new_parameter))
+
+            # Clear the original dictionary and update with the modified items
+            build_config.clear()
+            build_config.update(items)
+
+        return build_config
+
+    def update_build_config(self, build_config: dict, field_value: str, field_name: str | None = None):
+        if field_name == "agent_llm":
+            openai_fields = {component.name: component for component in self.openai_inputs}
+            azure_fields = {f"azure_param_{component.name}": component for component in self.azure_inputs}
+            if field_value == "OpenAI":
+                for field in [key for key in build_config if key.startswith("azure_param_")]:
+                    if field in build_config:
+                        del build_config[field]
+                for field in openai_fields:
+                    if field in build_config:
+                        del build_config[field]
+                if "llm_custom" in build_config:
+                    del build_config["llm_custom"]
+
+                self.insert_in_dict(build_config, "agent_llm", openai_fields)
+            elif field_value == "Azure OpenAI":
+                for field in openai_fields:
+                    if field in build_config:
+                        del build_config[field]
+                if "llm_custom" in build_config:
+                    del build_config["llm_custom"]
+                self.insert_in_dict(build_config, "agent_llm", azure_fields)
+            elif field_value == "Custom":
+                for field in openai_fields:
+                    if field in build_config:
+                        del build_config[field]
+                for field in azure_fields:
+                    if field in build_config:
+                        del build_config[field]
+                llm_custom_fields = HandleInput(
+                    name="llm_custom", display_name="Language Model", input_types=["LanguageModel"], required=False
+                ).to_dict()
+                self.insert_in_dict(build_config, "agent_llm", {"llm_custom": llm_custom_fields})
+            build_config["agent_llm"]["value"] = field_value
+        return build_config
diff --git a/src/backend/tests/unit/components/agents/test_simple_agent.py b/src/backend/tests/unit/components/agents/test_simple_agent.py
new file mode 100644
index 00000000000..8e456970547
--- /dev/null
+++ b/src/backend/tests/unit/components/agents/test_simple_agent.py
@@ -0,0 +1,31 @@
+import os
+
+import pytest
+from langflow.components.agents.simple_agent import SimpleAgentComponent
+from langflow.components.tools.calculator import CalculatorToolComponent
+
+
+@pytest.mark.api_key_required
+@pytest.mark.asyncio
+async def test_simple_agent_with_calculator():
+    # Mock inputs
+    tools = [CalculatorToolComponent().build_tool()]  # Use the Calculator component as a tool
+    input_value = "What is 2 + 2?"
+
+    api_key = os.environ["OPENAI_API_KEY"]
+    temperature = 0.1
+
+    # Initialize the SimpleAgentComponent with mocked inputs
+    agent = SimpleAgentComponent(
+        tools=tools,
+        input_value=input_value,
+        api_key=api_key,
+        model_name="gpt-4o",
+        llm_type="OpenAI",
+        temperature=temperature
+    )
+
+    response = await agent.get_response()
+    assert "4" in response.data.get("text")
+
+
diff --git a/src/backend/tests/unit/components/agents/test_tool_calling_agent.py b/src/backend/tests/unit/components/agents/test_tool_calling_agent.py
new file mode 100644
index 00000000000..934085909f4
--- /dev/null
+++ b/src/backend/tests/unit/components/agents/test_tool_calling_agent.py
@@ -0,0 +1,32 @@
+import os
+
+from langflow.components.agents.tool_calling import ToolCallingAgentComponent
+from langflow.components.inputs.chat import ChatInput
+from langflow.components.models.openai import OpenAIModelComponent
+from langflow.components.outputs import ChatOutput
+from langflow.components.tools.calculator import CalculatorToolComponent
+from langflow.graph.graph.base import Graph
+from langflow.graph.state.model import create_state_model
+from loguru import logger
+
+
+async def test_tool_calling_agent_component():
+    tools = [CalculatorToolComponent().build_tool()]  # Use the Calculator component as a tool
+    input_value = "What is 2 + 2?"
+    chat_history = []
+    api_key = os.environ["OPENAI_API_KEY"]
+    temperature = 0.1
+
+    # Default OpenAI Model Component
+    llm_component = OpenAIModelComponent().set(
+        api_key=api_key,
+        temperature=temperature,
+    )
+    llm = llm_component.build_model()
+
+    agent = ToolCallingAgentComponent()
+    agent.set(llm=llm, tools=[tools], chat_history=chat_history, input_value=input_value)
+
+    # Chat output
+    response = await agent.message_response()
+    assert "4" in response.data.get("text")

From 019f3b32da7bf83f0321b128822b64b68a504504 Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Tue, 29 Oct 2024 13:17:16 -0400
Subject: [PATCH 02/21] Update simple_agent.py

update _config Changes and code oprimised
---
 .../components/agents/simple_agent.py         | 122 +++++++-----------
 1 file changed, 45 insertions(+), 77 deletions(-)

diff --git a/src/backend/base/langflow/components/agents/simple_agent.py b/src/backend/base/langflow/components/agents/simple_agent.py
index 56078bd1374..be5612c0016 100644
--- a/src/backend/base/langflow/components/agents/simple_agent.py
+++ b/src/backend/base/langflow/components/agents/simple_agent.py
@@ -9,6 +9,7 @@
     MessageTextInput,
     Output,
 )
+from langflow.schema.dotdict import dotdict
 from langflow.schema.message import Message
 
 
@@ -29,6 +30,7 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
         "2024-02-15-preview",
         "2024-03-01-preview",
     ]
+
     openai_inputs = [
         component_input
         for component_input in OpenAIModelComponent().inputs
@@ -48,18 +50,17 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
         DropdownInput(
             name="agent_llm",
             display_name="Language Model Type",
-            options=["Custom", "Azure OpenAI", "OpenAI"],
+            options=["Azure OpenAI", "OpenAI"],
             value="OpenAI",
             real_time_refresh=True,
+            input_types=["LanguageModel"],
+            refresh_button=True
         ),
         *openai_inputs,
     ]
     outputs = [Output(name="response", display_name="Response", method="get_response")]
 
     async def get_response(self) -> Message:
-        # Chat input initialization
-
-        # Default OpenAI Model Component
         llm_model = self.get_llm()
         if llm_model is None:
             msg = "No language model selected"
@@ -72,85 +73,52 @@ async def get_response(self) -> Message:
         return await agent.message_response()
 
     def get_llm(self):
-        if self.agent_llm == "OpenAI":
-            return (
-                OpenAIModelComponent()
-                .set(
-                    **{
-                        component_input.name: getattr(self, component_input.name)
-                        for component_input in self.openai_inputs
-                    }
-                )
-                .build_model()
-            )
-        if self.agent_llm == "Azure OpenAI":
-            return (
-                AzureChatOpenAIComponent()
-                .set(
-                    **{
-                        component_input.name: getattr(self, f"azure_param_{component_input.name}")
-                        for component_input in self.azure_inputs
-                    }
-                )
-                .build_model()
-            )
-        if self.agent_llm == "Custom":
-            return self.llm_custom
-        return None
-
-    def insert_in_dict(self, build_config, field_name, new_parameters):
-        # Insert the new key-value pair after the found key
-        for new_field_name, new_parameter in new_parameters.items():
-            # Get all the items as a list of tuples (key, value)
-            items = list(build_config.items())
+        try:
+            if self.agent_llm == "OpenAI":
+                return self._build_llm_model(OpenAIModelComponent(), self.openai_inputs)
+            if self.agent_llm == "Azure OpenAI":
+                return self._build_llm_model(AzureChatOpenAIComponent(), self.azure_inputs, prefix="azure_param_")
+        except Exception as e:
+            msg = f"Error building {self.agent_llm} language model"
+            raise ValueError(msg) from e
+        return self.agent_llm
 
-            # Find the index of the key to insert after
-            idx = len(items)
-            for i, (key, _value) in enumerate(items):
-                if key == field_name:
-                    idx = i + 1
-                    break
+    def _build_llm_model(self, component, inputs, prefix=""):
+        return component.set(
+            **{component_input.name: getattr(self, f"{prefix}{component_input.name}") for component_input in inputs}
+        ).build_model()
 
-            items.insert(idx, (new_field_name, new_parameter))
+    def delete_fields(self, build_config, fields):
+        for field in fields:
+            build_config.pop(field, None)
 
-            # Clear the original dictionary and update with the modified items
-            build_config.clear()
-            build_config.update(items)
-
-        return build_config
-
-    def update_build_config(self, build_config: dict, field_value: str, field_name: str | None = None):
+    def update_build_config(self, build_config: dotdict, field_value: str, field_name: str | None = None):
         if field_name == "agent_llm":
-            openai_fields = {component.name: component for component in self.openai_inputs}
-            azure_fields = {f"azure_param_{component.name}": component for component in self.azure_inputs}
+            openai_fields = {component_input.name: component_input for component_input in self.openai_inputs}
+            azure_fields = {
+                f"azure_param_{component_input.name}": component_input for component_input in self.azure_inputs
+            }
+
             if field_value == "OpenAI":
-                for field in [key for key in build_config if key.startswith("azure_param_")]:
-                    if field in build_config:
-                        del build_config[field]
-                for field in openai_fields:
-                    if field in build_config:
-                        del build_config[field]
-                if "llm_custom" in build_config:
-                    del build_config["llm_custom"]
+                self.delete_fields(build_config, {**azure_fields})
+                if not any(field in build_config for field in openai_fields):
+                    build_config.update(openai_fields)
 
-                self.insert_in_dict(build_config, "agent_llm", openai_fields)
             elif field_value == "Azure OpenAI":
-                for field in openai_fields:
-                    if field in build_config:
-                        del build_config[field]
-                if "llm_custom" in build_config:
-                    del build_config["llm_custom"]
-                self.insert_in_dict(build_config, "agent_llm", azure_fields)
+                self.delete_fields(build_config, {**openai_fields})
+                build_config.update(azure_fields)
             elif field_value == "Custom":
-                for field in openai_fields:
-                    if field in build_config:
-                        del build_config[field]
-                for field in azure_fields:
-                    if field in build_config:
-                        del build_config[field]
-                llm_custom_fields = HandleInput(
-                    name="llm_custom", display_name="Language Model", input_types=["LanguageModel"], required=False
-                ).to_dict()
-                self.insert_in_dict(build_config, "agent_llm", {"llm_custom": llm_custom_fields})
-            build_config["agent_llm"]["value"] = field_value
+                self.delete_fields(build_config, {**openai_fields})
+                self.delete_fields(build_config, {**azure_fields})
+
+        default_keys = ["code", "_type", "agent_llm", "tools", "input_value"]
+        missing_keys = [key for key in default_keys if key not in build_config]
+        if missing_keys:
+            msg = f"Missing required keys in build_config: {missing_keys}"
+            raise ValueError(msg)
+        #debug code
+        for key, value in build_config.items():
+            if isinstance(value, dict) and value.get("input_types") is None and key not in ["code", "_type"]:
+                msg = f"Component {key} has no input types specified"
+                raise ValueError(msg)
         return build_config

From 19f50471e19006476f8e30bb66fe55a0dffe8931 Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Tue, 29 Oct 2024 13:45:34 -0400
Subject: [PATCH 03/21] Update simple_agent.py

Error or inputType as None Solved
---
 .../components/agents/simple_agent.py         | 54 +++++++++++--------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/backend/base/langflow/components/agents/simple_agent.py b/src/backend/base/langflow/components/agents/simple_agent.py
index be5612c0016..7a69753dcd9 100644
--- a/src/backend/base/langflow/components/agents/simple_agent.py
+++ b/src/backend/base/langflow/components/agents/simple_agent.py
@@ -19,17 +19,6 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
     icon = "workflow"
     beta = True
     name = "SimpleAgent"
-    AZURE_OPENAI_API_VERSIONS = [
-        "2024-06-01",
-        "2024-07-01-preview",
-        "2024-08-01-preview",
-        "2024-09-01-preview",
-        "2024-10-01-preview",
-        "2023-05-15",
-        "2023-12-01-preview",
-        "2024-02-15-preview",
-        "2024-03-01-preview",
-    ]
 
     openai_inputs = [
         component_input
@@ -50,11 +39,11 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
         DropdownInput(
             name="agent_llm",
             display_name="Language Model Type",
-            options=["Azure OpenAI", "OpenAI"],
+            options=["Azure OpenAI", "OpenAI", "Custom"],
             value="OpenAI",
             real_time_refresh=True,
-            input_types=["LanguageModel"],
-            refresh_button=True
+            refresh_button=True,
+            input_types=[],
         ),
         *openai_inputs,
     ]
@@ -103,22 +92,41 @@ def update_build_config(self, build_config: dotdict, field_value: str, field_nam
                 self.delete_fields(build_config, {**azure_fields})
                 if not any(field in build_config for field in openai_fields):
                     build_config.update(openai_fields)
+                build_config["agent_llm"]["input_types"] = []
+                build_config = self.update_input_types(build_config)
 
             elif field_value == "Azure OpenAI":
                 self.delete_fields(build_config, {**openai_fields})
                 build_config.update(azure_fields)
+                build_config["agent_llm"]["input_types"] = []
+                build_config = self.update_input_types(build_config)
             elif field_value == "Custom":
                 self.delete_fields(build_config, {**openai_fields})
                 self.delete_fields(build_config, {**azure_fields})
+                new_component = DropdownInput(
+                    name="agent_llm",
+                    display_name="Language Model",
+                    options=["Azure OpenAI", "OpenAI", "Custom"],
+                    value="Custom",
+                    real_time_refresh=True,
+                    input_types=["LanguageModel"],
+                )
+                build_config.update({"agent_llm": new_component.to_dict()})
+                build_config = self.update_input_types(build_config)
+            default_keys = ["code", "_type", "agent_llm", "tools", "input_value"]
+            missing_keys = [key for key in default_keys if key not in build_config]
+            if missing_keys:
+                msg = f"Missing required keys in build_config: {missing_keys}"
+                raise ValueError(msg)
+        return build_config
 
-        default_keys = ["code", "_type", "agent_llm", "tools", "input_value"]
-        missing_keys = [key for key in default_keys if key not in build_config]
-        if missing_keys:
-            msg = f"Missing required keys in build_config: {missing_keys}"
-            raise ValueError(msg)
-        #debug code
+    def update_input_types(self, build_config):
         for key, value in build_config.items():
-            if isinstance(value, dict) and value.get("input_types") is None and key not in ["code", "_type"]:
-                msg = f"Component {key} has no input types specified"
-                raise ValueError(msg)
+            # Check if the value is a dictionary
+            if isinstance(value, dict):
+                if value.get("input_types") is None:
+                    build_config[key]["input_types"] = []
+            # Check if the value has an attribute 'input_types' and it is None
+            elif hasattr(value, "input_types") and value.input_types is None:
+                value.input_types = []
         return build_config

From f685b7710961a4997699710a7bff0fb4c4eaf494 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Tue, 29 Oct 2024 17:56:46 +0000
Subject: [PATCH 04/21] [autofix.ci] apply automated fixes

---
 .../tests/unit/components/agents/test_simple_agent.py        | 4 +---
 .../tests/unit/components/agents/test_tool_calling_agent.py  | 5 -----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/backend/tests/unit/components/agents/test_simple_agent.py b/src/backend/tests/unit/components/agents/test_simple_agent.py
index 8e456970547..fca5dfbde55 100644
--- a/src/backend/tests/unit/components/agents/test_simple_agent.py
+++ b/src/backend/tests/unit/components/agents/test_simple_agent.py
@@ -22,10 +22,8 @@ async def test_simple_agent_with_calculator():
         api_key=api_key,
         model_name="gpt-4o",
         llm_type="OpenAI",
-        temperature=temperature
+        temperature=temperature,
     )
 
     response = await agent.get_response()
     assert "4" in response.data.get("text")
-
-
diff --git a/src/backend/tests/unit/components/agents/test_tool_calling_agent.py b/src/backend/tests/unit/components/agents/test_tool_calling_agent.py
index 934085909f4..b8e6f11893b 100644
--- a/src/backend/tests/unit/components/agents/test_tool_calling_agent.py
+++ b/src/backend/tests/unit/components/agents/test_tool_calling_agent.py
@@ -1,13 +1,8 @@
 import os
 
 from langflow.components.agents.tool_calling import ToolCallingAgentComponent
-from langflow.components.inputs.chat import ChatInput
 from langflow.components.models.openai import OpenAIModelComponent
-from langflow.components.outputs import ChatOutput
 from langflow.components.tools.calculator import CalculatorToolComponent
-from langflow.graph.graph.base import Graph
-from langflow.graph.state.model import create_state_model
-from loguru import logger
 
 
 async def test_tool_calling_agent_component():

From 32229b6365716800fc60d4694fd5c639fb72f2e9 Mon Sep 17 00:00:00 2001
From: italojohnny <italojohnnydosanjos@gmail.com>
Date: Wed, 30 Oct 2024 09:53:08 -0300
Subject: [PATCH 05/21] fix: INP001 ruff error

---
 src/backend/tests/unit/components/agents/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/backend/tests/unit/components/agents/__init__.py

diff --git a/src/backend/tests/unit/components/agents/__init__.py b/src/backend/tests/unit/components/agents/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d

From 6e75f1123bf7f31cf70eac94f23423f8d1f8fa81 Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Wed, 30 Oct 2024 10:31:43 -0400
Subject: [PATCH 06/21] Update test_tool_calling_agent.py

added pytest mark as api required
---
 .../tests/unit/components/agents/test_tool_calling_agent.py    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/backend/tests/unit/components/agents/test_tool_calling_agent.py b/src/backend/tests/unit/components/agents/test_tool_calling_agent.py
index b8e6f11893b..312d29cf3bb 100644
--- a/src/backend/tests/unit/components/agents/test_tool_calling_agent.py
+++ b/src/backend/tests/unit/components/agents/test_tool_calling_agent.py
@@ -1,10 +1,13 @@
 import os
 
+import pytest
 from langflow.components.agents.tool_calling import ToolCallingAgentComponent
 from langflow.components.models.openai import OpenAIModelComponent
 from langflow.components.tools.calculator import CalculatorToolComponent
 
 
+@pytest.mark.api_key_required
+@pytest.mark.asyncio
 async def test_tool_calling_agent_component():
     tools = [CalculatorToolComponent().build_tool()]  # Use the Calculator component as a tool
     input_value = "What is 2 + 2?"

From b475c2b6dddbe4408972c6418f530e6e9b75fb3b Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Wed, 30 Oct 2024 10:42:19 -0400
Subject: [PATCH 07/21] Update simple_agent.py

added system prompt
---
 .../components/agents/simple_agent.py         | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/backend/base/langflow/components/agents/simple_agent.py b/src/backend/base/langflow/components/agents/simple_agent.py
index 7a69753dcd9..c449d879c52 100644
--- a/src/backend/base/langflow/components/agents/simple_agent.py
+++ b/src/backend/base/langflow/components/agents/simple_agent.py
@@ -1,3 +1,4 @@
+from langflow.base.agents.agent import LCToolsAgentComponent
 from langflow.base.models.model import LCModelComponent
 from langflow.components.agents.tool_calling import ToolCallingAgentComponent
 from langflow.components.models.azure_openai import AzureChatOpenAIComponent
@@ -31,11 +32,19 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
         if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]
     ]
     inputs = [
-        HandleInput(
-            name="tools", display_name="Tools", input_types=["Tool", "BaseTool", "StructuredTool"], is_list=True
+        *LCToolsAgentComponent._base_inputs,
+        MessageTextInput(
+            name="system_prompt",
+            display_name="System Prompt",
+            info="Initial instructions and context provided to guide the agent's behavior.",
+            value="You are a helpful assistant that can use tools to answer questions and perform tasks.",
         ),
-        MessageTextInput(name="input_value", display_name="Input"),
-        DataInput(name="chat_history", display_name="Chat History", is_list=True, advanced=True),
+        MessageTextInput(
+            name="input_value",
+            display_name="Input",
+            info="The input provided by the user for the agent to process.",
+        ),
+        DataInput(name="chat_history", display_name="Chat Memory", is_list=True, advanced=True),    
         DropdownInput(
             name="agent_llm",
             display_name="Language Model Type",
@@ -56,7 +65,8 @@ async def get_response(self) -> Message:
             raise ValueError(msg)
 
         agent = ToolCallingAgentComponent().set(
-            llm=llm_model, tools=[self.tools], chat_history=self.chat_history, input_value=self.input_value
+            llm=llm_model, tools=[self.tools], chat_history=self.chat_history, input_value=self.input_value,
+            system_prompt=self.system_prompt,
         )
 
         return await agent.message_response()

From 3c43404930d469e20936c88f83b46121b448c6fb Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 14:43:00 +0000
Subject: [PATCH 08/21] [autofix.ci] apply automated fixes

---
 .../base/langflow/components/agents/simple_agent.py       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/backend/base/langflow/components/agents/simple_agent.py b/src/backend/base/langflow/components/agents/simple_agent.py
index c449d879c52..df3f1b58a10 100644
--- a/src/backend/base/langflow/components/agents/simple_agent.py
+++ b/src/backend/base/langflow/components/agents/simple_agent.py
@@ -6,7 +6,6 @@
 from langflow.io import (
     DataInput,
     DropdownInput,
-    HandleInput,
     MessageTextInput,
     Output,
 )
@@ -44,7 +43,7 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
             display_name="Input",
             info="The input provided by the user for the agent to process.",
         ),
-        DataInput(name="chat_history", display_name="Chat Memory", is_list=True, advanced=True),    
+        DataInput(name="chat_history", display_name="Chat Memory", is_list=True, advanced=True),
         DropdownInput(
             name="agent_llm",
             display_name="Language Model Type",
@@ -65,7 +64,10 @@ async def get_response(self) -> Message:
             raise ValueError(msg)
 
         agent = ToolCallingAgentComponent().set(
-            llm=llm_model, tools=[self.tools], chat_history=self.chat_history, input_value=self.input_value,
+            llm=llm_model,
+            tools=[self.tools],
+            chat_history=self.chat_history,
+            input_value=self.input_value,
             system_prompt=self.system_prompt,
         )
 

From 91d3c1cc17010152d6a9d2a1279a148db081fe7c Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Wed, 30 Oct 2024 18:13:36 -0400
Subject: [PATCH 09/21] updates in the input field orders

---
 .../base/langflow/base/agents/agent.py        |  2 +-
 .../components/agents/simple_agent.py         | 35 +++++++++----------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/backend/base/langflow/base/agents/agent.py b/src/backend/base/langflow/base/agents/agent.py
index ca2e52d275f..959696e0cec 100644
--- a/src/backend/base/langflow/base/agents/agent.py
+++ b/src/backend/base/langflow/base/agents/agent.py
@@ -136,10 +136,10 @@ def create_agent_runnable(self) -> Runnable:
 
 class LCToolsAgentComponent(LCAgentComponent):
     _base_inputs = [
-        *LCAgentComponent._base_inputs,
         HandleInput(
             name="tools", display_name="Tools", input_types=["Tool", "BaseTool", "StructuredTool"], is_list=True
         ),
+        *LCAgentComponent._base_inputs,
     ]
 
     def build_agent(self) -> AgentExecutor:
diff --git a/src/backend/base/langflow/components/agents/simple_agent.py b/src/backend/base/langflow/components/agents/simple_agent.py
index df3f1b58a10..bf2d803f0a4 100644
--- a/src/backend/base/langflow/components/agents/simple_agent.py
+++ b/src/backend/base/langflow/components/agents/simple_agent.py
@@ -14,11 +14,11 @@
 
 
 class SimpleAgentComponent(ToolCallingAgentComponent):
-    display_name: str = "Simple Agent"
-    description: str = "Agent that uses tools"
-    icon = "workflow"
+    display_name: str = "Agent"
+    description: str = "Define the agent's instructions, then enter a task to complete using tools."
+    icon = "bot"
     beta = True
-    name = "SimpleAgent"
+    name = "Agent"
 
     openai_inputs = [
         component_input
@@ -31,22 +31,9 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
         if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]
     ]
     inputs = [
-        *LCToolsAgentComponent._base_inputs,
-        MessageTextInput(
-            name="system_prompt",
-            display_name="System Prompt",
-            info="Initial instructions and context provided to guide the agent's behavior.",
-            value="You are a helpful assistant that can use tools to answer questions and perform tasks.",
-        ),
-        MessageTextInput(
-            name="input_value",
-            display_name="Input",
-            info="The input provided by the user for the agent to process.",
-        ),
-        DataInput(name="chat_history", display_name="Chat Memory", is_list=True, advanced=True),
         DropdownInput(
             name="agent_llm",
-            display_name="Language Model Type",
+            display_name="Model Provider",
             options=["Azure OpenAI", "OpenAI", "Custom"],
             value="OpenAI",
             real_time_refresh=True,
@@ -54,6 +41,18 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
             input_types=[],
         ),
         *openai_inputs,
+        MessageTextInput(
+            name="system_prompt",
+            display_name="Agent Instructions",
+            info="Initial instructions and context provided to guide the agent's behavior.",
+            value="You are a helpful assistant that can use tools to answer questions and perform tasks.",
+            advanced=False,
+        ),
+        *LCToolsAgentComponent._base_inputs,
+
+        DataInput(name="chat_history", display_name="Chat Memory", is_list=True, advanced=True),
+
+
     ]
     outputs = [Output(name="response", display_name="Response", method="get_response")]
 

From ce911b46e6c55b1561832849894a986a9d62b538 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Wed, 30 Oct 2024 22:14:17 +0000
Subject: [PATCH 10/21] [autofix.ci] apply automated fixes

---
 src/backend/base/langflow/components/agents/simple_agent.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/backend/base/langflow/components/agents/simple_agent.py b/src/backend/base/langflow/components/agents/simple_agent.py
index bf2d803f0a4..cc611883c2a 100644
--- a/src/backend/base/langflow/components/agents/simple_agent.py
+++ b/src/backend/base/langflow/components/agents/simple_agent.py
@@ -49,10 +49,7 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
             advanced=False,
         ),
         *LCToolsAgentComponent._base_inputs,
-
         DataInput(name="chat_history", display_name="Chat Memory", is_list=True, advanced=True),
-
-
     ]
     outputs = [Output(name="response", display_name="Response", method="get_response")]
 

From 410ef12725b208a3daf1c93ff0844e095b11f628 Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Thu, 31 Oct 2024 18:21:25 -0400
Subject: [PATCH 11/21] Update simple_agent.py

chat memory added
---
 .../components/agents/simple_agent.py         | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/backend/base/langflow/components/agents/simple_agent.py b/src/backend/base/langflow/components/agents/simple_agent.py
index cc611883c2a..0d08edf6c76 100644
--- a/src/backend/base/langflow/components/agents/simple_agent.py
+++ b/src/backend/base/langflow/components/agents/simple_agent.py
@@ -1,14 +1,16 @@
 from langflow.base.agents.agent import LCToolsAgentComponent
 from langflow.base.models.model import LCModelComponent
 from langflow.components.agents.tool_calling import ToolCallingAgentComponent
+from langflow.components.helpers.memory import MemoryComponent
 from langflow.components.models.azure_openai import AzureChatOpenAIComponent
 from langflow.components.models.openai import OpenAIModelComponent
 from langflow.io import (
     DataInput,
     DropdownInput,
-    MessageTextInput,
+    MultilineInput,
     Output,
 )
+from langflow.schema.data import Data
 from langflow.schema.dotdict import dotdict
 from langflow.schema.message import Message
 
@@ -22,6 +24,8 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
 
     openai_inputs = [
         component_input
+        if component_input.name != "temperature"
+        else setattr(component_input, "advanced", True) or component_input
         for component_input in OpenAIModelComponent().inputs
         if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]
     ]
@@ -30,6 +34,11 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
         for component_input in AzureChatOpenAIComponent().inputs
         if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]
     ]
+    memory_inputs = [
+        setattr(component_input, "advanced", True) or component_input
+        for component_input in MemoryComponent().inputs
+    ]
+
     inputs = [
         DropdownInput(
             name="agent_llm",
@@ -41,7 +50,7 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
             input_types=[],
         ),
         *openai_inputs,
-        MessageTextInput(
+        MultilineInput(
             name="system_prompt",
             display_name="Agent Instructions",
             info="Initial instructions and context provided to guide the agent's behavior.",
@@ -49,7 +58,7 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
             advanced=False,
         ),
         *LCToolsAgentComponent._base_inputs,
-        DataInput(name="chat_history", display_name="Chat Memory", is_list=True, advanced=True),
+        *memory_inputs
     ]
     outputs = [Output(name="response", display_name="Response", method="get_response")]
 
@@ -58,6 +67,7 @@ async def get_response(self) -> Message:
         if llm_model is None:
             msg = "No language model selected"
             raise ValueError(msg)
+        self.chat_history = self.get_memory_data()
 
         agent = ToolCallingAgentComponent().set(
             llm=llm_model,
@@ -69,6 +79,16 @@ async def get_response(self) -> Message:
 
         return await agent.message_response()
 
+
+
+    def get_memory_data(self):
+        memory_kwargs = {
+            component_input.name: getattr(self, f"{component_input.name}")
+            for component_input in self.memory_inputs
+        }
+
+        return MemoryComponent().set(**memory_kwargs).retrieve_messages()
+
     def get_llm(self):
         try:
             if self.agent_llm == "OpenAI":

From caea6b1164921014dbf63e325ef187ec8e98ca7e Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Thu, 31 Oct 2024 22:21:54 +0000
Subject: [PATCH 12/21] [autofix.ci] apply automated fixes

---
 .../base/langflow/components/agents/simple_agent.py  | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/backend/base/langflow/components/agents/simple_agent.py b/src/backend/base/langflow/components/agents/simple_agent.py
index 0d08edf6c76..ac3e878bdf1 100644
--- a/src/backend/base/langflow/components/agents/simple_agent.py
+++ b/src/backend/base/langflow/components/agents/simple_agent.py
@@ -5,12 +5,10 @@
 from langflow.components.models.azure_openai import AzureChatOpenAIComponent
 from langflow.components.models.openai import OpenAIModelComponent
 from langflow.io import (
-    DataInput,
     DropdownInput,
     MultilineInput,
     Output,
 )
-from langflow.schema.data import Data
 from langflow.schema.dotdict import dotdict
 from langflow.schema.message import Message
 
@@ -35,8 +33,7 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
         if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]
     ]
     memory_inputs = [
-        setattr(component_input, "advanced", True) or component_input
-        for component_input in MemoryComponent().inputs
+        setattr(component_input, "advanced", True) or component_input for component_input in MemoryComponent().inputs
     ]
 
     inputs = [
@@ -58,7 +55,7 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
             advanced=False,
         ),
         *LCToolsAgentComponent._base_inputs,
-        *memory_inputs
+        *memory_inputs,
     ]
     outputs = [Output(name="response", display_name="Response", method="get_response")]
 
@@ -79,12 +76,9 @@ async def get_response(self) -> Message:
 
         return await agent.message_response()
 
-
-
     def get_memory_data(self):
         memory_kwargs = {
-            component_input.name: getattr(self, f"{component_input.name}")
-            for component_input in self.memory_inputs
+            component_input.name: getattr(self, f"{component_input.name}") for component_input in self.memory_inputs
         }
 
         return MemoryComponent().set(**memory_kwargs).retrieve_messages()

From 5f9a6d618facb1a61da831f1ccb32a04bf2998cc Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Thu, 31 Oct 2024 18:41:16 -0400
Subject: [PATCH 13/21] lint Errors Solved

---
 .../components/agents/simple_agent.py         | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/backend/base/langflow/components/agents/simple_agent.py b/src/backend/base/langflow/components/agents/simple_agent.py
index ac3e878bdf1..d4f6258ac9f 100644
--- a/src/backend/base/langflow/components/agents/simple_agent.py
+++ b/src/backend/base/langflow/components/agents/simple_agent.py
@@ -13,6 +13,11 @@
 from langflow.schema.message import Message
 
 
+def set_advanced_true(component_input):
+    component_input.advanced = True
+    return component_input
+
+
 class SimpleAgentComponent(ToolCallingAgentComponent):
     display_name: str = "Agent"
     description: str = "Define the agent's instructions, then enter a task to complete using tools."
@@ -20,22 +25,19 @@ class SimpleAgentComponent(ToolCallingAgentComponent):
     beta = True
     name = "Agent"
 
-    openai_inputs = [
-        component_input
-        if component_input.name != "temperature"
-        else setattr(component_input, "advanced", True) or component_input
-        for component_input in OpenAIModelComponent().inputs
-        if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]
-    ]
     azure_inputs = [
-        component_input
+        set_advanced_true(component_input) if component_input.name == "temperature" else component_input
         for component_input in AzureChatOpenAIComponent().inputs
         if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]
     ]
-    memory_inputs = [
-        setattr(component_input, "advanced", True) or component_input for component_input in MemoryComponent().inputs
+    openai_inputs = [
+        set_advanced_true(component_input) if component_input.name == "temperature" else component_input
+        for component_input in OpenAIModelComponent().inputs
+        if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]
     ]
 
+    memory_inputs = [set_advanced_true(component_input) for component_input in MemoryComponent().inputs]
+
     inputs = [
         DropdownInput(
             name="agent_llm",

From 4c81f5b08d799ec6eee8fd4fa891a4dace579976 Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Thu, 31 Oct 2024 18:41:34 -0400
Subject: [PATCH 14/21] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit e965fd3b7f518753cb9c56a1029df8113316af11
Author: Sebastián Estévez <estevezsebastian@gmail.com>
Date:   Thu Oct 31 17:16:08 2024 -0400

    fix: broken docker test (#4337)

    * Fix broken docker test

    Fixes #4336

    Update the Docker test workflow to use the `get_version` function from `langflow.utils.version`.

    * Modify the `Test image` step in `.github/workflows/docker_test.yml` to use the `get_version` function instead of directly importing `__version__`.
    * Modify the `Test backend image` step in `.github/workflows/docker_test.yml` to use the `get_version` function instead of directly importing `__version__`.

    ---

    For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/langflow-ai/langflow/issues/4336?shareId=XXXX-XXXX-XXXX-XXXX).

    * version.version not util.version

commit 3279b8a1e83cb83cc805f173328e23751e2a8206
Author: Lucas Oliveira <62335616+lucaseduoli@users.noreply.github.com>
Date:   Thu Oct 31 16:39:58 2024 -0300

    fix: add collapsible function to templates and fix design bugs (#4305)

    * Updated colors

    * Fixed design for small screens

    * Change border radius

    * Changed size of text on templates description

    * Fix shine effect on small screens

    * Fixed icons on starter templates

    * Updated mono font to JetBrains

    * Updated icon hit area for X

    * Added gradient wrapper and x-gradient

    * Changed colors and font weights for nav component

    * Added zoom on hover of gradient

    * Fixed input size

    * Fixed all templates to show everything

    * Hide scrollbar

    * Change text size of card

    * Removed title of the categories

    * Removed unused currentTab from templatecategory

    * Updated position of search icon

    * Updated style of inputs

    * Updated search clear button

    * Fixed bug on small screens

    * Added no results query

    * Fixed background on get started cards

    * Added focus ring on nav component

    * Added tab index to search and sidebar buttons

    * Added keyboard navigation to templates

    * Updated templatesModal to use ShadCN Sidebar

    * Implemented collapsible sidebar

    * Fix collapsible to work on mobile but be overlaying content

    * Added noise to styleUtils

    * Updated padding and sizes for mobile

    * Updated text size

    * Updated font family to inter

    * Made get started components fetch title and description from the flow

    * Updated description on get started component

    * Updated naming of sidebar

    * Updated description of start from scratch

    * Updated color of selected sidebar item

    * Changed text color for sidebar not active items

    * changed description sizes

    * changed to line clamp

    * Reduced gap between icon and category text

    * Fixed no results state

    * Fixed X icon only appearing on hover

    * Fix auto focus issue

    * fixed hover color of primary button

    * Fixed gradients to use stops if it exists and stop using random gradient

    * removed random gradient

    * Fixed design of cards in templates

    * Updated nav to go through tests

    * Fixed focus on input

    * [autofix.ci] apply automated fixes

    * New color

    * fix testes

    * Fixed starter projects test

    * ✨ (starter-projects.spec.ts): add Page import to test function parameters for better code readability and maintainability
    📝 (starter-projects.spec.ts): refactor test to include a function for waiting for template visibility, improving code readability and reducing duplication

    ---------

    Co-authored-by: Cristhian Zanforlin Lousa <cristhian.lousa@gmail.com>
    Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

commit a03da10750794b11cc43aa866a108e7e80d0ec4f
Author: Sebastián Estévez <estevezsebastian@gmail.com>
Date:   Thu Oct 31 14:57:07 2024 -0400

    fix: langfuse upgrade and crew result usage (#4342)

    * lanfuse upgrade and crew result usage

    * ✅ (Dynamic Agent.spec.ts): Enable tests for checking the presence of required environment variables before running the test suite.

    ✨ (Hierarchical Agent.spec.ts): Add integration test for Hierarchical Tasks Agent to ensure proper functionality and behavior
    ✨ (Sequential Task Agent.spec.ts): Add integration test for Sequential Tasks Agent to ensure proper functionality and behavior

    ---------

    Co-authored-by: cristhianzl <cristhian.lousa@gmail.com>
---
 .github/workflows/docker_test.yml             |   4 +-
 docs/css/custom.css                           |  22 +-
 pyproject.toml                                |   2 +-
 .../base/langflow/base/agents/crewai/crew.py  |   2 +-
 src/frontend/index.html                       |   8 +-
 src/frontend/package-lock.json                |  23 -
 src/frontend/package.json                     |   1 -
 .../components/NodeStatus/index.tsx           |   2 +-
 .../src/components/GradientWrapper/index.tsx  |  19 +
 .../components/popover/index.tsx              |   2 +-
 src/frontend/src/components/ui/button.tsx     |   8 +-
 src/frontend/src/components/ui/dialog.tsx     |  11 +-
 src/frontend/src/components/ui/separator.tsx  |   2 +-
 src/frontend/src/components/ui/sheet.tsx      | 140 ++++
 src/frontend/src/components/ui/sidebar.tsx    | 751 ++++++++++++++++++
 src/frontend/src/contexts/index.tsx           |  23 +-
 src/frontend/src/hooks/use-mobile.ts          |  22 +
 .../baseModal/helpers/switch-case-size.ts     |   5 +-
 src/frontend/src/modals/baseModal/index.tsx   |   3 +-
 .../components/GetStartedComponent/index.tsx  |  30 +-
 .../TemplateCardComponent/index.tsx           |  52 +-
 .../TemplateCategoryComponent/index.tsx       |  16 +-
 .../TemplateContentComponent/index.tsx        |  50 +-
 .../TemplateGetStartedCardComponent/index.tsx |  50 +-
 .../components/navComponent/index.tsx         | 101 ++-
 .../src/modals/templatesModal/index.tsx       |  99 ++-
 src/frontend/src/style/applies.css            |  15 +-
 src/frontend/src/style/classes.css            |  24 +-
 src/frontend/src/style/index.css              |   3 +
 src/frontend/src/types/templates/types.ts     |   9 +-
 src/frontend/src/utils/styleUtils.ts          |  27 +
 src/frontend/tailwind.config.mjs              |  28 +-
 .../core/integrations/Dynamic Agent.spec.ts   | 195 +++--
 .../integrations/Hierarchical Agent.spec.ts   | 122 +++
 .../Sequential Task Agent.spec.ts             | 103 +++
 .../features/starter-projects.spec.ts         |  49 +-
 uv.lock                                       |   8 +-
 37 files changed, 1639 insertions(+), 392 deletions(-)
 create mode 100644 src/frontend/src/components/GradientWrapper/index.tsx
 create mode 100644 src/frontend/src/components/ui/sheet.tsx
 create mode 100644 src/frontend/src/components/ui/sidebar.tsx
 create mode 100644 src/frontend/src/hooks/use-mobile.ts
 create mode 100644 src/frontend/tests/core/integrations/Hierarchical Agent.spec.ts
 create mode 100644 src/frontend/tests/core/integrations/Sequential Task Agent.spec.ts

diff --git a/.github/workflows/docker_test.yml b/.github/workflows/docker_test.yml
index 07b826c588e..9564ccd271b 100644
--- a/.github/workflows/docker_test.yml
+++ b/.github/workflows/docker_test.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Test image
         run: |
           expected_version=$(cat pyproject.toml | grep version | head -n 1 | cut -d '"' -f 2)
-          version=$(docker run --rm --entrypoint bash langflowai/langflow:latest-dev -c 'python -c "from langflow.version import __version__ as langflow_version; print(langflow_version)"')
+          version=$(docker run --rm --entrypoint bash langflowai/langflow:latest-dev -c 'python -c "from langflow.version.version import get_version; print(get_version())"')
           if [ "$expected_version" != "$version" ]; then
               echo "Expected version: $expected_version"
               echo "Actual version: $version"
@@ -51,7 +51,7 @@ jobs:
       - name: Test backend image
         run: |
           expected_version=$(cat pyproject.toml | grep version | head -n 1 | cut -d '"' -f 2)
-          version=$(docker run --rm --entrypoint bash langflowai/langflow-backend:latest-dev -c 'python -c "from langflow.version import __version__ as langflow_version; print(langflow_version)"')
+          version=$(docker run --rm --entrypoint bash langflowai/langflow-backend:latest-dev -c 'python -c "from langflow.version.version import get_version; print(get_version())"')
           if [ "$expected_version" != "$version" ]; then
               echo "Expected version: $expected_version"
               echo "Actual version: $version"
diff --git a/docs/css/custom.css b/docs/css/custom.css
index 68d901e0761..85dba23c945 100644
--- a/docs/css/custom.css
+++ b/docs/css/custom.css
@@ -8,7 +8,7 @@
   --ifm-navbar-link-hover-color: initial;
   --ifm-navbar-padding-vertical: 0;
   --ifm-navbar-item-padding-vertical: 0;
-  --ifm-font-family-base: -apple-system, BlinkMacSystemFont, Inter, Helvetica,
+  --ifm-font-family-base: Inter, -apple-system, BlinkMacSystemFont, Helvetica,
     Arial, sans-serif, "Apple Color Emoji", "Segoe UI emoji";
   --ifm-font-family-monospace: "SFMono-Regular", "Roboto Mono", Consolas,
     "Liberation Mono", Menlo, Courier, monospace;
@@ -118,17 +118,15 @@ body {
   width: 24px;
   height: 24px;
   display: flex;
-  background: url("/logos/gitLight.svg")
-    no-repeat;
+  background: url("/logos/gitLight.svg") no-repeat;
 }
 
-[data-theme='dark'] .header-github-link:before {
+[data-theme="dark"] .header-github-link:before {
   content: "";
   width: 24px;
   height: 24px;
   display: flex;
-  background: url("/logos/gitDark.svg")
-    no-repeat;
+  background: url("/logos/gitDark.svg") no-repeat;
 }
 
 /* Twitter */
@@ -145,7 +143,7 @@ body {
   background-size: contain;
 }
 
-[data-theme='dark'] .header-twitter-link::before {
+[data-theme="dark"] .header-twitter-link::before {
   content: "";
   width: 24px;
   height: 24px;
@@ -164,7 +162,7 @@ body {
   opacity: 0.6;
 }
 
-[data-theme='dark'] .header-discord-link::before {
+[data-theme="dark"] .header-discord-link::before {
   content: "";
   width: 24px;
   height: 24px;
@@ -241,6 +239,8 @@ body {
   min-height: 70px;
 }
 
-.theme-doc-sidebar-item-category.theme-doc-sidebar-item-category-level-2.menu__list-item:not(:first-child) {
-  margin-top: 0.25rem!important;
-}
\ No newline at end of file
+.theme-doc-sidebar-item-category.theme-doc-sidebar-item-category-level-2.menu__list-item:not(
+    :first-child
+  ) {
+  margin-top: 0.25rem !important;
+}
diff --git a/pyproject.toml b/pyproject.toml
index fbf33a382c0..30212ddd4b7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ dependencies = [
     "redis>=5.0.1",
     "metaphor-python>=0.1.11",
     'pywin32>=306; sys_platform == "win32"',
-    "langfuse>=2.33.0",
+    "langfuse~=2.53.1",
     "metal-sdk>=2.5.0",
     "markupsafe>=2.1.3",
     "boto3~=1.34.162",
diff --git a/src/backend/base/langflow/base/agents/crewai/crew.py b/src/backend/base/langflow/base/agents/crewai/crew.py
index c2cc019862c..8a78199558a 100644
--- a/src/backend/base/langflow/base/agents/crewai/crew.py
+++ b/src/backend/base/langflow/base/agents/crewai/crew.py
@@ -78,6 +78,6 @@ def step_callback(agent_output: AgentFinish | list[tuple[AgentAction, str]]) ->
     async def build_output(self) -> Message:
         crew = self.build_crew()
         result = await crew.kickoff_async()
-        message = Message(text=result, sender=MESSAGE_SENDER_AI)
+        message = Message(text=result.raw, sender=MESSAGE_SENDER_AI)
         self.status = message
         return message
diff --git a/src/frontend/index.html b/src/frontend/index.html
index cbbde528331..1091280085e 100644
--- a/src/frontend/index.html
+++ b/src/frontend/index.html
@@ -5,12 +5,10 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" href="/favicon.ico" />
+    <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link
-      href="https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap"
-      rel="stylesheet"
-    />
-    <link
-      href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:wght@400;700&display=swap"
+      href="https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap"
       rel="stylesheet"
     />
     <script
diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json
index af26f8ea431..7aaf8a3ca0a 100644
--- a/src/frontend/package-lock.json
+++ b/src/frontend/package-lock.json
@@ -61,7 +61,6 @@
         "p-debounce": "^4.0.0",
         "pako": "^2.1.0",
         "playwright": "^1.44.1",
-        "random-gradient": "^0.0.2",
         "react": "^18.3.1",
         "react-ace": "^11.0.1",
         "react-cookie": "^7.1.4",
@@ -14330,16 +14329,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/random-gradient": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/random-gradient/-/random-gradient-0.0.2.tgz",
-      "integrity": "sha512-1RfI+1PL7ZFNRjNX0pp5UI+RNpfwkRro0q3A20xEOOn5yIIN4Du+RbwzN9ryozq1s85ubREEtLqUXtirRc//Ww==",
-      "license": "MIT",
-      "dependencies": {
-        "string-hash": "^1.1.3",
-        "tinycolor2": "^1.4.1"
-      }
-    },
     "node_modules/rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -15912,12 +15901,6 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string-hash": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
-      "integrity": "sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==",
-      "license": "CC0-1.0"
-    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -16338,12 +16321,6 @@
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==",
       "license": "MIT"
     },
-    "node_modules/tinycolor2": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",
-      "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==",
-      "license": "MIT"
-    },
     "node_modules/tmp": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
diff --git a/src/frontend/package.json b/src/frontend/package.json
index e59959c2c81..7c072f75d92 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -56,7 +56,6 @@
     "p-debounce": "^4.0.0",
     "pako": "^2.1.0",
     "playwright": "^1.44.1",
-    "random-gradient": "^0.0.2",
     "react": "^18.3.1",
     "react-ace": "^11.0.1",
     "react-cookie": "^7.1.4",
diff --git a/src/frontend/src/CustomNodes/GenericNode/components/NodeStatus/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/NodeStatus/index.tsx
index 5a1f8d8ccba..5578dad5a5b 100644
--- a/src/frontend/src/CustomNodes/GenericNode/components/NodeStatus/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/components/NodeStatus/index.tsx
@@ -239,7 +239,7 @@ export default function NodeStatus({
         >
           <div className="cursor-help">
             {conditionSuccess && validationStatus?.data?.duration ? (
-              <div className="mr-1 flex gap-1 rounded-sm bg-emerald-50 px-1 font-jetbrains text-[11px] font-bold text-emerald-500">
+              <div className="font-jetbrains mr-1 flex gap-1 rounded-sm bg-emerald-50 px-1 text-[11px] font-bold text-emerald-500">
                 <Check className="h-4 w-4 items-center self-center" />
                 <span>
                   {normalizeTimeString(validationStatus?.data?.duration)}
diff --git a/src/frontend/src/components/GradientWrapper/index.tsx b/src/frontend/src/components/GradientWrapper/index.tsx
new file mode 100644
index 00000000000..bca3b002278
--- /dev/null
+++ b/src/frontend/src/components/GradientWrapper/index.tsx
@@ -0,0 +1,19 @@
+import { ReactNode } from "react";
+
+export function GradientWrapper({ children }: { children: ReactNode }) {
+  return (
+    <>
+      <svg width="0" height="0" className="absolute">
+        <defs>
+          <linearGradient id="x-gradient" x1="0%" y1="0%" x2="100%" y2="100%">
+            <stop offset="-35.61%" stopColor="#e6b1e1" />
+            <stop offset="13.03%" stopColor="#e94b71" />
+            <stop offset="61.67%" stopColor="#b79bde" />
+            <stop offset="126.52%" stopColor="#e955cb" />
+          </linearGradient>
+        </defs>
+      </svg>
+      {children}
+    </>
+  );
+}
diff --git a/src/frontend/src/components/inputComponent/components/popover/index.tsx b/src/frontend/src/components/inputComponent/components/popover/index.tsx
index 1378e900255..dba252c9a39 100644
--- a/src/frontend/src/components/inputComponent/components/popover/index.tsx
+++ b/src/frontend/src/components/inputComponent/components/popover/index.tsx
@@ -101,7 +101,7 @@ const CustomInputPopover = ({
               className={cn(
                 "flex items-center gap-1 truncate bg-muted",
                 nodeStyle &&
-                  "rounded-[3px] bg-emerald-100 px-1 font-jetbrains text-emerald-700 hover:bg-emerald-200",
+                  "font-jetbrains rounded-[3px] bg-emerald-100 px-1 text-emerald-700 hover:bg-emerald-200",
               )}
             >
               <div className="max-w-36 truncate">{selectedOption}</div>
diff --git a/src/frontend/src/components/ui/button.tsx b/src/frontend/src/components/ui/button.tsx
index 6d5a561b9ed..140c7b0e3de 100644
--- a/src/frontend/src/components/ui/button.tsx
+++ b/src/frontend/src/components/ui/button.tsx
@@ -5,11 +5,11 @@ import { cn } from "../../utils/utils";
 import ForwardedIconComponent from "../genericIconComponent";
 
 const buttonVariants = cva(
-  "noflow nowheel nopan nodelete nodrag  inline-flex items-center gap-2 justify-center rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-100 disabled:disabled-state disabled:pointer-events-none  ring-offset-background",
+  "noflow nowheel nopan nodelete nodrag inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:opacity-100 disabled:disabled-state [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
   {
     variants: {
       variant: {
-        default: "bg-primary text-primary-foreground hover:bg-primary/90",
+        default: "bg-primary text-primary-foreground  hover:bg-primary-hover",
         destructive:
           "bg-destructive text-destructive-foreground hover:bg-destructive/90",
         outline:
@@ -19,9 +19,9 @@ const buttonVariants = cva(
         secondary:
           "border border-muted bg-muted text-secondary-foreground hover:bg-secondary-foreground/5",
         ghost: "hover:bg-accent hover:text-accent-foreground",
-        menu: "hover:bg-muted hover:text-accent-foreground focus:!ring-0 focus-visible:!ring-0",
+        menu: "hover:bg-muted hover:text-accent-foreground focus-visible:!ring-offset-0",
         "menu-active":
-          "font-semibold hover:bg-muted hover:text-accent-foreground focus:!ring-0 focus-visible:!ring-0",
+          "font-semibold hover:bg-muted hover:text-accent-foreground focus-visible:!ring-offset-0",
         link: "underline-offset-4 hover:underline text-primary",
       },
       size: {
diff --git a/src/frontend/src/components/ui/dialog.tsx b/src/frontend/src/components/ui/dialog.tsx
index fa1a0322d3c..938bfbcaa19 100644
--- a/src/frontend/src/components/ui/dialog.tsx
+++ b/src/frontend/src/components/ui/dialog.tsx
@@ -12,7 +12,7 @@ const DialogPortal = ({
   ...props
 }: DialogPrimitive.DialogPortalProps) => (
   <DialogPrimitive.Portal {...props}>
-    <div className="nopan nodelete nodrag noflow fixed inset-0 z-50 flex items-start justify-center sm:items-center">
+    <div className="nopan nodelete nodrag noflow fixed inset-0 z-50 flex items-center justify-center">
       {children}
     </div>
   </DialogPrimitive.Portal>
@@ -43,13 +43,13 @@ const DialogContent = React.forwardRef<
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        "fixed z-50 flex w-full max-w-lg flex-col gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] sm:rounded-lg md:w-full",
+        "fixed z-50 flex w-full max-w-lg flex-col gap-4 rounded-xl border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%]",
         className,
       )}
       {...props}
     >
       {children}
-      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+      <DialogPrimitive.Close className="absolute right-2.5 top-2.5 rounded-sm p-1.5 opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
         <Cross2Icon className="h-4 w-4" />
         <span className="sr-only">Close</span>
       </DialogPrimitive.Close>
@@ -63,10 +63,7 @@ const DialogHeader = ({
   ...props
 }: React.HTMLAttributes<HTMLDivElement>) => (
   <div
-    className={cn(
-      "flex flex-col space-y-1 text-center sm:text-left",
-      className,
-    )}
+    className={cn("flex flex-col space-y-1 text-left", className)}
     {...props}
   />
 );
diff --git a/src/frontend/src/components/ui/separator.tsx b/src/frontend/src/components/ui/separator.tsx
index 36cbf40bba2..344c06ae842 100644
--- a/src/frontend/src/components/ui/separator.tsx
+++ b/src/frontend/src/components/ui/separator.tsx
@@ -17,7 +17,7 @@ const Separator = React.forwardRef<
       decorative={decorative}
       orientation={orientation}
       className={cn(
-        "shrink-0 bg-zinc-300 dark:bg-zinc-700",
+        "shrink-0 bg-border",
         orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
         className,
       )}
diff --git a/src/frontend/src/components/ui/sheet.tsx b/src/frontend/src/components/ui/sheet.tsx
new file mode 100644
index 00000000000..e48bc1d99f3
--- /dev/null
+++ b/src/frontend/src/components/ui/sheet.tsx
@@ -0,0 +1,140 @@
+"use client";
+
+import * as SheetPrimitive from "@radix-ui/react-dialog";
+import { cva, type VariantProps } from "class-variance-authority";
+import { X } from "lucide-react";
+import * as React from "react";
+
+import { cn } from "../../utils/utils";
+
+const Sheet = SheetPrimitive.Root;
+
+const SheetTrigger = SheetPrimitive.Trigger;
+
+const SheetClose = SheetPrimitive.Close;
+
+const SheetPortal = SheetPrimitive.Portal;
+
+const SheetOverlay = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof SheetPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <SheetPrimitive.Overlay
+    className={cn(
+      "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+      className,
+    )}
+    {...props}
+    ref={ref}
+  />
+));
+SheetOverlay.displayName = SheetPrimitive.Overlay.displayName;
+
+const sheetVariants = cva(
+  "fixed z-50 gap-4 bg-background p-6 shadow-lg transition ease-in-out data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:duration-300 data-[state=open]:duration-500",
+  {
+    variants: {
+      side: {
+        top: "inset-x-0 top-0 border-b data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top",
+        bottom:
+          "inset-x-0 bottom-0 border-t data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom",
+        left: "inset-y-0 left-0 h-full w-3/4 border-r data-[state=closed]:slide-out-to-left data-[state=open]:slide-in-from-left sm:max-w-sm",
+        right:
+          "inset-y-0 right-0 h-full w-3/4  border-l data-[state=closed]:slide-out-to-right data-[state=open]:slide-in-from-right sm:max-w-sm",
+      },
+    },
+    defaultVariants: {
+      side: "right",
+    },
+  },
+);
+
+interface SheetContentProps
+  extends React.ComponentPropsWithoutRef<typeof SheetPrimitive.Content>,
+    VariantProps<typeof sheetVariants> {}
+
+const SheetContent = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Content>,
+  SheetContentProps
+>(({ side = "right", className, children, ...props }, ref) => (
+  <SheetPortal>
+    <SheetOverlay />
+    <SheetPrimitive.Content
+      ref={ref}
+      className={cn(sheetVariants({ side }), className)}
+      {...props}
+    >
+      {children}
+      <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-secondary">
+        <X className="h-4 w-4" />
+        <span className="sr-only">Close</span>
+      </SheetPrimitive.Close>
+    </SheetPrimitive.Content>
+  </SheetPortal>
+));
+SheetContent.displayName = SheetPrimitive.Content.displayName;
+
+const SheetHeader = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col space-y-2 text-center sm:text-left",
+      className,
+    )}
+    {...props}
+  />
+);
+SheetHeader.displayName = "SheetHeader";
+
+const SheetFooter = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
+      className,
+    )}
+    {...props}
+  />
+);
+SheetFooter.displayName = "SheetFooter";
+
+const SheetTitle = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Title>,
+  React.ComponentPropsWithoutRef<typeof SheetPrimitive.Title>
+>(({ className, ...props }, ref) => (
+  <SheetPrimitive.Title
+    ref={ref}
+    className={cn("text-lg font-semibold text-foreground", className)}
+    {...props}
+  />
+));
+SheetTitle.displayName = SheetPrimitive.Title.displayName;
+
+const SheetDescription = React.forwardRef<
+  React.ElementRef<typeof SheetPrimitive.Description>,
+  React.ComponentPropsWithoutRef<typeof SheetPrimitive.Description>
+>(({ className, ...props }, ref) => (
+  <SheetPrimitive.Description
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+));
+SheetDescription.displayName = SheetPrimitive.Description.displayName;
+
+export {
+  Sheet,
+  SheetClose,
+  SheetContent,
+  SheetDescription,
+  SheetFooter,
+  SheetHeader,
+  SheetOverlay,
+  SheetPortal,
+  SheetTitle,
+  SheetTrigger,
+};
diff --git a/src/frontend/src/components/ui/sidebar.tsx b/src/frontend/src/components/ui/sidebar.tsx
new file mode 100644
index 00000000000..4941106ea0e
--- /dev/null
+++ b/src/frontend/src/components/ui/sidebar.tsx
@@ -0,0 +1,751 @@
+"use client";
+
+import { Slot } from "@radix-ui/react-slot";
+import { VariantProps, cva } from "class-variance-authority";
+import { PanelLeft } from "lucide-react";
+import * as React from "react";
+
+import { cn } from "../../utils/utils";
+import { Button } from "./button";
+import { Input } from "./input";
+import { Separator } from "./separator";
+import { Skeleton } from "./skeleton";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "./tooltip";
+
+const SIDEBAR_COOKIE_NAME = "sidebar:state";
+const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
+const SIDEBAR_WIDTH = "19rem";
+const SIDEBAR_WIDTH_ICON = "4rem";
+const SIDEBAR_KEYBOARD_SHORTCUT = "b";
+
+type SidebarContext = {
+  state: "expanded" | "collapsed";
+  open: boolean;
+  setOpen: (open: boolean) => void;
+  toggleSidebar: () => void;
+};
+
+const SidebarContext = React.createContext<SidebarContext | null>(null);
+
+function useSidebar() {
+  const context = React.useContext(SidebarContext);
+  if (!context) {
+    throw new Error("useSidebar must be used within a SidebarProvider.");
+  }
+
+  return context;
+}
+
+const SidebarProvider = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div"> & {
+    defaultOpen?: boolean;
+    open?: boolean;
+    onOpenChange?: (open: boolean) => void;
+    width?: string;
+  }
+>(
+  (
+    {
+      defaultOpen = true,
+      open: openProp,
+      onOpenChange: setOpenProp,
+      className,
+      style,
+      children,
+      width = SIDEBAR_WIDTH,
+      ...props
+    },
+    ref,
+  ) => {
+    // This is the internal state of the sidebar.
+    // We use openProp and setOpenProp for control from outside the component.
+    const [_open, _setOpen] = React.useState(defaultOpen);
+    const open = openProp ?? _open;
+    const setOpen = React.useCallback(
+      (value: boolean | ((value: boolean) => boolean)) => {
+        if (setOpenProp) {
+          return setOpenProp?.(
+            typeof value === "function" ? value(open) : value,
+          );
+        }
+
+        _setOpen(value);
+
+        // This sets the cookie to keep the sidebar state.
+        document.cookie = `${SIDEBAR_COOKIE_NAME}=${open}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`;
+      },
+      [setOpenProp, open],
+    );
+
+    // Helper to toggle the sidebar.
+    const toggleSidebar = React.useCallback(() => {
+      return setOpen((open) => !open);
+    }, [setOpen]);
+
+    // Adds a keyboard shortcut to toggle the sidebar.
+    React.useEffect(() => {
+      const handleKeyDown = (event: KeyboardEvent) => {
+        if (
+          event.key === SIDEBAR_KEYBOARD_SHORTCUT &&
+          (event.metaKey || event.ctrlKey)
+        ) {
+          event.preventDefault();
+          toggleSidebar();
+        }
+      };
+
+      window.addEventListener("keydown", handleKeyDown);
+      return () => window.removeEventListener("keydown", handleKeyDown);
+    }, [toggleSidebar]);
+
+    // We add a state so that we can do data-state="expanded" or "collapsed".
+    // This makes it easier to style the sidebar with Tailwind classes.
+    const state = open ? "expanded" : "collapsed";
+
+    const contextValue = React.useMemo<SidebarContext>(
+      () => ({
+        state,
+        open,
+        setOpen,
+        toggleSidebar,
+      }),
+      [state, open, setOpen, toggleSidebar],
+    );
+
+    return (
+      <SidebarContext.Provider value={contextValue}>
+        <TooltipProvider delayDuration={0}>
+          <div
+            style={
+              {
+                "--sidebar-width": width,
+                "--sidebar-width-icon": SIDEBAR_WIDTH_ICON,
+                ...style,
+              } as React.CSSProperties
+            }
+            className={cn(
+              "group/sidebar-wrapper flex h-full w-full text-foreground has-[[data-variant=inset]]:bg-background",
+              className,
+            )}
+            ref={ref}
+            {...props}
+          >
+            {children}
+          </div>
+        </TooltipProvider>
+      </SidebarContext.Provider>
+    );
+  },
+);
+SidebarProvider.displayName = "SidebarProvider";
+
+const Sidebar = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div"> & {
+    side?: "left" | "right";
+    variant?: "sidebar" | "floating" | "inset";
+    collapsible?: "offcanvas" | "icon" | "none";
+  }
+>(
+  (
+    {
+      side = "left",
+      variant = "sidebar",
+      collapsible = "offcanvas",
+      className,
+      children,
+      ...props
+    },
+    ref,
+  ) => {
+    const { state } = useSidebar();
+
+    if (collapsible === "none") {
+      return (
+        <div
+          className={cn(
+            "group flex h-full w-[--sidebar-width] flex-col bg-background text-foreground",
+            className,
+          )}
+          data-side={side}
+          ref={ref}
+          {...props}
+        >
+          <div
+            data-sidebar="sidebar"
+            className="flex h-full w-full flex-col group-data-[side=left]:border-r group-data-[side=right]:border-l"
+          >
+            {children}
+          </div>
+        </div>
+      );
+    }
+
+    return (
+      <div
+        ref={ref}
+        className="group peer relative block h-full flex-col"
+        data-state={state}
+        data-collapsible={state === "collapsed" ? collapsible : ""}
+        data-variant={variant}
+        data-side={side}
+      >
+        {/* This is what handles the sidebar gap on desktop */}
+        <div
+          className={cn(
+            "relative h-full w-[--sidebar-width] bg-transparent transition-[width] duration-200 ease-linear",
+            "group-data-[collapsible=offcanvas]:w-0",
+            "group-data-[side=right]:rotate-180",
+            variant === "floating" || variant === "inset"
+              ? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4))]"
+              : "group-data-[collapsible=icon]:w-[--sidebar-width-icon]",
+            // Keep icon width on mobile when collapsed
+            "max-sm:w-[--sidebar-width-icon]",
+          )}
+        />
+        <div
+          className={cn(
+            "absolute inset-y-0 z-50 flex h-full transition-[left,right,width] duration-200 ease-linear",
+            // Adjust width based on state and device
+            "w-[--sidebar-width]",
+            "max-sm:group-data-[state=collapsed]:w-[--sidebar-width-icon]",
+            side === "left"
+              ? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
+              : "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
+            // Adjust the padding for floating and inset variants.
+            variant === "floating" || variant === "inset"
+              ? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)_+_theme(spacing.4)_+2px)]"
+              : "group-data-[collapsible=icon]:w-[--sidebar-width-icon] group-data-[side=left]:border-r group-data-[side=right]:border-l",
+            // Position absolute relative to parent container on mobile
+            "max-sm:absolute max-sm:h-[100%] max-sm:group-data-[state=expanded]:bg-background/80",
+            className,
+          )}
+          {...props}
+        >
+          <div
+            data-sidebar="sidebar"
+            className={cn(
+              "flex h-full w-full flex-col bg-background",
+              "group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:border-border group-data-[variant=floating]:shadow",
+              // Add shadow on mobile
+              "max-sm:shadow-lg",
+            )}
+          >
+            {children}
+          </div>
+        </div>
+      </div>
+    );
+  },
+);
+Sidebar.displayName = "Sidebar";
+
+const SidebarTrigger = React.forwardRef<
+  React.ElementRef<typeof Button>,
+  React.ComponentProps<typeof Button>
+>(({ className, onClick, ...props }, ref) => {
+  const { toggleSidebar } = useSidebar();
+
+  return (
+    <Button
+      ref={ref}
+      data-sidebar="trigger"
+      variant="ghost"
+      size="icon"
+      className={cn("h-8 w-8", className)}
+      onClick={(event) => {
+        onClick?.(event);
+        toggleSidebar();
+      }}
+      {...props}
+    >
+      <PanelLeft />
+      <span className="sr-only">Toggle Sidebar</span>
+    </Button>
+  );
+});
+SidebarTrigger.displayName = "SidebarTrigger";
+
+const SidebarRail = React.forwardRef<
+  HTMLButtonElement,
+  React.ComponentProps<"button">
+>(({ className, ...props }, ref) => {
+  const { toggleSidebar } = useSidebar();
+
+  return (
+    <button
+      ref={ref}
+      data-sidebar="rail"
+      aria-label="Toggle Sidebar"
+      tabIndex={-1}
+      onClick={toggleSidebar}
+      title="Toggle Sidebar"
+      className={cn(
+        "absolute inset-y-0 z-20 hidden w-4 -translate-x-1/2 transition-all ease-linear after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] hover:after:bg-border group-data-[side=left]:-right-4 group-data-[side=right]:left-0 sm:flex",
+        "[[data-side=left]_&]:cursor-w-resize [[data-side=right]_&]:cursor-e-resize",
+        "[[data-side=left][data-state=collapsed]_&]:cursor-e-resize [[data-side=right][data-state=collapsed]_&]:cursor-w-resize",
+        "group-data-[collapsible=offcanvas]:hover:bg group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full",
+        "[[data-side=left][data-collapsible=offcanvas]_&]:-right-2",
+        "[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarRail.displayName = "SidebarRail";
+
+const SidebarInset = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"main">
+>(({ className, ...props }, ref) => {
+  return (
+    <main
+      ref={ref}
+      className={cn(
+        "relative flex min-h-svh flex-1 flex-col bg-background",
+        "peer-data-[variant=inset]:m-2 peer-data-[state=collapsed]:peer-data-[variant=inset]:ml-2 peer-data-[variant=inset]:ml-0 peer-data-[variant=inset]:rounded-xl peer-data-[variant=inset]:shadow",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarInset.displayName = "SidebarInset";
+
+const SidebarInput = React.forwardRef<
+  React.ElementRef<typeof Input>,
+  React.ComponentProps<typeof Input>
+>(({ className, ...props }, ref) => {
+  return (
+    <Input
+      ref={ref}
+      data-sidebar="input"
+      className={cn(
+        "h-8 w-full bg-background shadow-none focus-visible:ring-1 focus-visible:ring-ring",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarInput.displayName = "SidebarInput";
+
+const SidebarHeader = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => {
+  return (
+    <div
+      ref={ref}
+      data-sidebar="header"
+      className={cn("flex flex-col gap-2 p-2", className)}
+      {...props}
+    />
+  );
+});
+SidebarHeader.displayName = "SidebarHeader";
+
+const SidebarFooter = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => {
+  return (
+    <div
+      ref={ref}
+      data-sidebar="footer"
+      className={cn("flex flex-col gap-2 p-2", className)}
+      {...props}
+    />
+  );
+});
+SidebarFooter.displayName = "SidebarFooter";
+
+const SidebarSeparator = React.forwardRef<
+  React.ElementRef<typeof Separator>,
+  React.ComponentProps<typeof Separator>
+>(({ className, ...props }, ref) => {
+  return (
+    <Separator
+      ref={ref}
+      data-sidebar="separator"
+      className={cn("mx-2 w-auto bg-border", className)}
+      {...props}
+    />
+  );
+});
+SidebarSeparator.displayName = "SidebarSeparator";
+
+const SidebarContent = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => {
+  return (
+    <div
+      ref={ref}
+      data-sidebar="content"
+      className={cn(
+        "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarContent.displayName = "SidebarContent";
+
+const SidebarGroup = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => {
+  return (
+    <div
+      ref={ref}
+      data-sidebar="group"
+      className={cn("relative flex w-full min-w-0 flex-col p-2", className)}
+      {...props}
+    />
+  );
+});
+SidebarGroup.displayName = "SidebarGroup";
+
+const SidebarGroupLabel = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div"> & { asChild?: boolean }
+>(({ className, asChild = false, ...props }, ref) => {
+  const Comp = asChild ? Slot : "div";
+
+  return (
+    <Comp
+      ref={ref}
+      data-sidebar="group-label"
+      className={cn(
+        "flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-semibold text-foreground/70 outline-none ring-ring transition-[margin,opa] duration-200 ease-linear focus-visible:ring-1 [&>svg]:size-4 [&>svg]:shrink-0",
+        "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarGroupLabel.displayName = "SidebarGroupLabel";
+
+const SidebarGroupAction = React.forwardRef<
+  HTMLButtonElement,
+  React.ComponentProps<"button"> & { asChild?: boolean }
+>(({ className, asChild = false, ...props }, ref) => {
+  const Comp = asChild ? Slot : "button";
+
+  return (
+    <Comp
+      ref={ref}
+      data-sidebar="group-action"
+      className={cn(
+        "absolute right-3 top-3.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-foreground outline-none ring-ring transition-transform hover:bg-accent hover:text-accent-foreground focus-visible:ring-1 [&>svg]:size-4 [&>svg]:shrink-0",
+        // Increases the hit area of the button on mobile.
+        "after:-inset-2 after:hidden",
+        "group-data-[collapsible=icon]:hidden",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarGroupAction.displayName = "SidebarGroupAction";
+
+const SidebarGroupContent = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    data-sidebar="group-content"
+    className={cn("w-full text-sm", className)}
+    {...props}
+  />
+));
+SidebarGroupContent.displayName = "SidebarGroupContent";
+
+const SidebarMenu = React.forwardRef<
+  HTMLUListElement,
+  React.ComponentProps<"ul">
+>(({ className, ...props }, ref) => (
+  <ul
+    ref={ref}
+    data-sidebar="menu"
+    className={cn("flex w-full min-w-0 flex-col gap-1", className)}
+    {...props}
+  />
+));
+SidebarMenu.displayName = "SidebarMenu";
+
+const SidebarMenuItem = React.forwardRef<
+  HTMLLIElement,
+  React.ComponentProps<"li">
+>(({ className, ...props }, ref) => (
+  <li
+    ref={ref}
+    data-sidebar="menu-item"
+    className={cn("group/menu-item relative", className)}
+    {...props}
+  />
+));
+SidebarMenuItem.displayName = "SidebarMenuItem";
+
+const sidebarMenuButtonVariants = cva(
+  "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-none ring-ring transition-[width,height,padding] hover:bg-accent hover:text-accent-foreground focus-visible:ring-1 active:bg-accent active:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-accent data-[active=true]:font-medium data-[active=true]:text-accent-foreground data-[state=open]:hover:bg-accent data-[state=open]:hover:text-accent-foreground group-data-[collapsible=icon]:!size-8 group-data-[collapsible=icon]:!p-2 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0",
+  {
+    variants: {
+      variant: {
+        default:
+          "text-secondary-foreground hover:bg-accent hover:text-accent-foreground ",
+        outline:
+          "bg-background shadow-[0_0_0_1px_hsl(var(--border))] hover:bg-accent hover:text-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--accent))]",
+      },
+      size: {
+        default: "h-8 text-sm",
+        sm: "h-7 text-xs",
+        lg: "h-12 text-sm group-data-[collapsible=icon]:!p-0",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  },
+);
+
+const SidebarMenuButton = React.forwardRef<
+  HTMLButtonElement,
+  React.ComponentProps<"button"> & {
+    asChild?: boolean;
+    isActive?: boolean;
+    tooltip?: string | React.ComponentProps<typeof TooltipContent>;
+  } & VariantProps<typeof sidebarMenuButtonVariants>
+>(
+  (
+    {
+      asChild = false,
+      isActive = false,
+      variant = "default",
+      size = "default",
+      tooltip,
+      className,
+      ...props
+    },
+    ref,
+  ) => {
+    const Comp = asChild ? Slot : "button";
+    const { state } = useSidebar();
+
+    const button = (
+      <Comp
+        ref={ref}
+        data-sidebar="menu-button"
+        data-size={size}
+        data-active={isActive}
+        className={cn(sidebarMenuButtonVariants({ variant, size }), className)}
+        {...props}
+      />
+    );
+
+    if (!tooltip) {
+      return button;
+    }
+
+    if (typeof tooltip === "string") {
+      tooltip = {
+        children: tooltip,
+      };
+    }
+
+    return (
+      <Tooltip>
+        <TooltipTrigger asChild>{button}</TooltipTrigger>
+        <TooltipContent
+          side="right"
+          align="center"
+          hidden={state !== "collapsed"}
+          {...tooltip}
+        />
+      </Tooltip>
+    );
+  },
+);
+SidebarMenuButton.displayName = "SidebarMenuButton";
+
+const SidebarMenuAction = React.forwardRef<
+  HTMLButtonElement,
+  React.ComponentProps<"button"> & {
+    asChild?: boolean;
+    showOnHover?: boolean;
+  }
+>(({ className, asChild = false, showOnHover = false, ...props }, ref) => {
+  const Comp = asChild ? Slot : "button";
+
+  return (
+    <Comp
+      ref={ref}
+      data-sidebar="menu-action"
+      className={cn(
+        "absolute right-1 top-1.5 flex aspect-square w-5 items-center justify-center rounded-md p-0 text-foreground outline-none ring-ring transition-transform hover:bg-accent hover:text-accent-foreground focus-visible:ring-1 peer-hover/menu-button:text-accent-foreground [&>svg]:size-4 [&>svg]:shrink-0",
+        // Increases the hit area of the button on mobile.
+        "after:-inset-2 after:hidden",
+        "peer-data-[size=sm]/menu-button:top-1",
+        "peer-data-[size=default]/menu-button:top-1.5",
+        "peer-data-[size=lg]/menu-button:top-2.5",
+        "group-data-[collapsible=icon]:hidden",
+        showOnHover &&
+          "group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 peer-data-[active=true]/menu-button:text-accent-foreground md:opacity-0",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarMenuAction.displayName = "SidebarMenuAction";
+
+const SidebarMenuBadge = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div">
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    data-sidebar="menu-badge"
+    className={cn(
+      "pointer-events-none absolute right-1 flex h-5 min-w-5 select-none items-center justify-center rounded-md px-1 text-xs font-medium tabular-nums text-foreground",
+      "peer-hover/menu-button:text-accent-foreground peer-data-[active=true]/menu-button:text-accent-foreground",
+      "peer-data-[size=sm]/menu-button:top-1",
+      "peer-data-[size=default]/menu-button:top-1.5",
+      "peer-data-[size=lg]/menu-button:top-2.5",
+      "group-data-[collapsible=icon]:hidden",
+      className,
+    )}
+    {...props}
+  />
+));
+SidebarMenuBadge.displayName = "SidebarMenuBadge";
+
+const SidebarMenuSkeleton = React.forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<"div"> & {
+    showIcon?: boolean;
+  }
+>(({ className, showIcon = false, ...props }, ref) => {
+  // Random width between 50 to 90%.
+  const width = React.useMemo(() => {
+    return `${Math.floor(Math.random() * 40) + 50}%`;
+  }, []);
+
+  return (
+    <div
+      ref={ref}
+      data-sidebar="menu-skeleton"
+      className={cn("flex h-8 items-center gap-2 rounded-md px-2", className)}
+      {...props}
+    >
+      {showIcon && (
+        <Skeleton
+          className="size-4 rounded-md"
+          data-sidebar="menu-skeleton-icon"
+        />
+      )}
+      <Skeleton
+        className="h-4 max-w-[--skeleton-width] flex-1"
+        data-sidebar="menu-skeleton-text"
+        style={
+          {
+            "--skeleton-width": width,
+          } as React.CSSProperties
+        }
+      />
+    </div>
+  );
+});
+SidebarMenuSkeleton.displayName = "SidebarMenuSkeleton";
+
+const SidebarMenuSub = React.forwardRef<
+  HTMLUListElement,
+  React.ComponentProps<"ul">
+>(({ className, ...props }, ref) => (
+  <ul
+    ref={ref}
+    data-sidebar="menu-sub"
+    className={cn(
+      "mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l border-border px-2.5 py-0.5",
+      "group-data-[collapsible=icon]:hidden",
+      className,
+    )}
+    {...props}
+  />
+));
+SidebarMenuSub.displayName = "SidebarMenuSub";
+
+const SidebarMenuSubItem = React.forwardRef<
+  HTMLLIElement,
+  React.ComponentProps<"li">
+>(({ ...props }, ref) => <li ref={ref} {...props} />);
+SidebarMenuSubItem.displayName = "SidebarMenuSubItem";
+
+const SidebarMenuSubButton = React.forwardRef<
+  HTMLAnchorElement,
+  React.ComponentProps<"a"> & {
+    asChild?: boolean;
+    size?: "sm" | "md";
+    isActive?: boolean;
+  }
+>(({ asChild = false, size = "md", isActive, className, ...props }, ref) => {
+  const Comp = asChild ? Slot : "a";
+
+  return (
+    <Comp
+      ref={ref}
+      data-sidebar="menu-sub-button"
+      data-size={size}
+      data-active={isActive}
+      className={cn(
+        "flex h-7 min-w-0 -translate-x-px items-center gap-2 overflow-hidden rounded-md px-2 text-foreground outline-none ring-ring hover:bg-accent hover:text-accent-foreground focus-visible:ring-1 active:bg-accent active:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 [&>svg]:text-accent-foreground",
+        "data-[active=true]:bg-accent data-[active=true]:text-accent-foreground",
+        size === "sm" && "text-xs",
+        size === "md" && "text-sm",
+        "group-data-[collapsible=icon]:hidden",
+        className,
+      )}
+      {...props}
+    />
+  );
+});
+SidebarMenuSubButton.displayName = "SidebarMenuSubButton";
+
+export {
+  Sidebar,
+  SidebarContent,
+  SidebarFooter,
+  SidebarGroup,
+  SidebarGroupAction,
+  SidebarGroupContent,
+  SidebarGroupLabel,
+  SidebarHeader,
+  SidebarInput,
+  SidebarInset,
+  SidebarMenu,
+  SidebarMenuAction,
+  SidebarMenuBadge,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarMenuSkeleton,
+  SidebarMenuSub,
+  SidebarMenuSubButton,
+  SidebarMenuSubItem,
+  SidebarProvider,
+  SidebarRail,
+  SidebarSeparator,
+  SidebarTrigger,
+  useSidebar,
+};
diff --git a/src/frontend/src/contexts/index.tsx b/src/frontend/src/contexts/index.tsx
index c0c7a5b0be0..39c669fc791 100644
--- a/src/frontend/src/contexts/index.tsx
+++ b/src/frontend/src/contexts/index.tsx
@@ -1,3 +1,4 @@
+import { GradientWrapper } from "@/components/GradientWrapper";
 import { CustomWrapper } from "@/customization/custom-wrapper";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ReactNode } from "react";
@@ -12,16 +13,18 @@ export default function ContextWrapper({ children }: { children: ReactNode }) {
   return (
     <>
       <CustomWrapper>
-        <QueryClientProvider client={queryClient}>
-          <AuthProvider>
-            <TooltipProvider skipDelayDuration={0}>
-              <ReactFlowProvider>
-                <ApiInterceptor />
-                {children}
-              </ReactFlowProvider>
-            </TooltipProvider>
-          </AuthProvider>
-        </QueryClientProvider>
+        <GradientWrapper>
+          <QueryClientProvider client={queryClient}>
+            <AuthProvider>
+              <TooltipProvider skipDelayDuration={0}>
+                <ReactFlowProvider>
+                  <ApiInterceptor />
+                  {children}
+                </ReactFlowProvider>
+              </TooltipProvider>
+            </AuthProvider>
+          </QueryClientProvider>
+        </GradientWrapper>
       </CustomWrapper>
     </>
   );
diff --git a/src/frontend/src/hooks/use-mobile.ts b/src/frontend/src/hooks/use-mobile.ts
new file mode 100644
index 00000000000..6066b9e2e5f
--- /dev/null
+++ b/src/frontend/src/hooks/use-mobile.ts
@@ -0,0 +1,22 @@
+import { useEffect, useState } from "react";
+
+export function useMobile(breakpoint: number = 768) {
+  const [isMobile, setIsMobile] = useState(false);
+
+  useEffect(() => {
+    const checkMobile = () => {
+      setIsMobile(window.innerWidth < breakpoint);
+    };
+
+    // Check initially
+    checkMobile();
+
+    // Add event listener
+    window.addEventListener("resize", checkMobile);
+
+    // Cleanup
+    return () => window.removeEventListener("resize", checkMobile);
+  }, [breakpoint]);
+
+  return isMobile;
+}
diff --git a/src/frontend/src/modals/baseModal/helpers/switch-case-size.ts b/src/frontend/src/modals/baseModal/helpers/switch-case-size.ts
index 4a6dcf7b9ba..ca0ecf2780d 100644
--- a/src/frontend/src/modals/baseModal/helpers/switch-case-size.ts
+++ b/src/frontend/src/modals/baseModal/helpers/switch-case-size.ts
@@ -39,8 +39,9 @@ export const switchCaseModalSize = (size: string) => {
       height = "h-[80vh]";
       break;
     case "templates":
-      minWidth = "min-w-[85vw] max-w-[1200px]";
-      height = "h-[70vh] max-h-[700px]";
+      minWidth = "w-[97vw] max-w-[1200px]";
+      height =
+        "min-h-[700px] lg:min-h-0 h-[90vh] md:h-[80vh] lg:h-[50vw] lg:max-h-[640px]";
       break;
     case "three-cards":
       minWidth = "min-w-[1066px]";
diff --git a/src/frontend/src/modals/baseModal/index.tsx b/src/frontend/src/modals/baseModal/index.tsx
index 265f519604a..2619e8106d3 100644
--- a/src/frontend/src/modals/baseModal/index.tsx
+++ b/src/frontend/src/modals/baseModal/index.tsx
@@ -80,7 +80,7 @@ const Header: React.FC<{
       <DialogTitle className="line-clamp-1 flex items-center pb-0.5">
         {children}
       </DialogTitle>
-      <DialogDescription className="line-clamp-2">
+      <DialogDescription className="line-clamp-3">
         {description}
       </DialogDescription>
     </DialogHeader>
@@ -235,6 +235,7 @@ function BaseModal({
         <Dialog open={open} onOpenChange={setOpen}>
           {triggerChild}
           <DialogContent
+            onOpenAutoFocus={(event) => event.preventDefault()}
             onEscapeKeyDown={onEscapeKeyDown}
             className={contentClasses}
           >
diff --git a/src/frontend/src/modals/templatesModal/components/GetStartedComponent/index.tsx b/src/frontend/src/modals/templatesModal/components/GetStartedComponent/index.tsx
index 4c331582604..88bd29f27ab 100644
--- a/src/frontend/src/modals/templatesModal/components/GetStartedComponent/index.tsx
+++ b/src/frontend/src/modals/templatesModal/components/GetStartedComponent/index.tsx
@@ -4,9 +4,6 @@ import { CardData } from "@/types/templates/types";
 import memoryChatbotSpiral from "../../../../assets/artwork-spiral-1-def.svg";
 import vectorRagSpiral from "../../../../assets/artwork-spiral-2-def.svg";
 import multiAgentSpiral from "../../../../assets/artwork-spiral-3-def.svg";
-import memoryChatbotBg from "../../../../assets/memory-chatbot-bg.png";
-import multiAgentBg from "../../../../assets/multi-agent-bg.png";
-import vectorRagBg from "../../../../assets/vector-rag-bg.png";
 import TemplateGetStartedCardComponent from "../TemplateGetStartedCardComponent";
 
 export default function GetStartedComponent() {
@@ -15,43 +12,34 @@ export default function GetStartedComponent() {
   // Define the card data
   const cardData: CardData[] = [
     {
-      bgImage: memoryChatbotBg,
+      bg: "linear-gradient(145deg, #7CC0FF 0%, #96B9FF 50%, #CAA5FF 100%)",
       spiralImage: memoryChatbotSpiral,
       icon: "MessagesSquare",
       category: "Chatbot",
-      title: "Memory Chatbot",
-      description:
-        "Get hands-on with Langflow by building a simple RAGbot that uses memory.",
       flow: examples.find((example) => example.name === "Memory Chatbot"),
     },
     {
-      bgImage: vectorRagBg,
+      bg: "linear-gradient(145deg,  #388295 0%, #52B0C4 50%, #7CAB64 100%)",
       spiralImage: vectorRagSpiral,
-      icon: "MessagesSquare",
+      icon: "Database",
       category: "Vector RAG",
-      title: "Vector RAG",
-      description:
-        "Ingest data into a native vector store and efficiently retrieve it.",
       flow: examples.find((example) => example.name === "Vector Store RAG"),
     },
     {
-      bgImage: multiAgentBg,
+      bg: "linear-gradient(145deg, #DB52C2 0%, #DC4F88 50%, #FFA395 100%)",
       spiralImage: multiAgentSpiral,
-      icon: "MessagesSquare",
+      icon: "Bot",
       category: "Agents",
-      title: "Multi-Agent",
       flow: examples.find((example) => example.name === "Dynamic Agent"),
-      description:
-        "Deploy a team of agents with a Manager-Worker structure to tackle complex tasks.",
     },
   ];
 
   return (
-    <div className="flex flex-1 flex-col gap-8">
-      <BaseModal.Header description="Start building with templates that highlight Langflow's capabilities across Chatbot, RAG, and Agent use cases.">
-        Get Started
+    <div className="flex flex-1 flex-col gap-4 md:gap-8">
+      <BaseModal.Header description="Start with templates showcasing Langflow's Chatbot, RAG, and Agent use cases.">
+        Get started
       </BaseModal.Header>
-      <div className="grid flex-1 grid-cols-3 gap-4">
+      <div className="grid flex-1 grid-cols-1 gap-4 lg:grid-cols-3">
         {cardData.map((card, index) => (
           <TemplateGetStartedCardComponent key={index} {...card} />
         ))}
diff --git a/src/frontend/src/modals/templatesModal/components/TemplateCardComponent/index.tsx b/src/frontend/src/modals/templatesModal/components/TemplateCardComponent/index.tsx
index 9dfe019dccb..b3008d09d4c 100644
--- a/src/frontend/src/modals/templatesModal/components/TemplateCardComponent/index.tsx
+++ b/src/frontend/src/modals/templatesModal/components/TemplateCardComponent/index.tsx
@@ -1,5 +1,5 @@
 import { convertTestName } from "@/components/storeCardComponent/utils/convert-test-name";
-import gradient from "random-gradient";
+import { BG_NOISE, flowGradients } from "@/utils/styleUtils";
 import IconComponent, {
   ForwardedIconComponent,
 } from "../../../../components/genericIconComponent";
@@ -9,47 +9,63 @@ export default function TemplateCardComponent({
   example,
   onClick,
 }: TemplateCardComponentProps) {
-  const gradientDirections = ["horizontal", "vertical", "diagonal"];
   const directionIndex =
-    (example.gradient ? example.gradient.length : example.name.length) %
-    gradientDirections.length;
-  const bgGradient = {
-    background: gradient(
-      example.gradient || example.name,
-      gradientDirections[directionIndex],
-    ),
+    (example.gradient && example.gradient.split(",").length == 1
+      ? example.gradient.length
+      : example.name.length) % flowGradients.length;
+
+  const handleKeyDown = (e) => {
+    if (e.key === "Enter" || e.key === " ") {
+      e.preventDefault();
+      onClick();
+    }
   };
 
+  const bgGradient =
+    BG_NOISE +
+    "," +
+    (example.gradient && example.gradient.split(",").length > 1
+      ? "linear-gradient(90deg, " + example.gradient + ")"
+      : flowGradients[directionIndex]);
+
   return (
     <div
-      className="group flex cursor-pointer flex-col gap-4 overflow-hidden"
+      className="group flex cursor-pointer gap-3 overflow-hidden rounded-md p-3 hover:bg-muted focus-visible:bg-muted"
+      tabIndex={0}
+      onKeyDown={handleKeyDown}
       onClick={onClick}
     >
       <div
-        className="relative h-40 rounded-xl p-4 brightness-[90%] contrast-125 saturate-[80%]"
+        className="relative h-20 w-20 shrink-0 overflow-hidden rounded-md p-4 outline-none ring-ring"
         style={{
-          backgroundImage:
-            "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAMAAAAp4XiDAAAAUVBMVEWFhYWDg4N3d3dtbW17e3t1dXWBgYGHh4d5eXlzc3OLi4ubm5uVlZWPj4+NjY19fX2JiYl/f39ra2uRkZGZmZlpaWmXl5dvb29xcXGTk5NnZ2c8TV1mAAAAG3RSTlNAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEAvEOwtAAAFVklEQVR4XpWWB67c2BUFb3g557T/hRo9/WUMZHlgr4Bg8Z4qQgQJlHI4A8SzFVrapvmTF9O7dmYRFZ60YiBhJRCgh1FYhiLAmdvX0CzTOpNE77ME0Zty/nWWzchDtiqrmQDeuv3powQ5ta2eN0FY0InkqDD73lT9c9lEzwUNqgFHs9VQce3TVClFCQrSTfOiYkVJQBmpbq2L6iZavPnAPcoU0dSw0SUTqz/GtrGuXfbyyBniKykOWQWGqwwMA7QiYAxi+IlPdqo+hYHnUt5ZPfnsHJyNiDtnpJyayNBkF6cWoYGAMY92U2hXHF/C1M8uP/ZtYdiuj26UdAdQQSXQErwSOMzt/XWRWAz5GuSBIkwG1H3FabJ2OsUOUhGC6tK4EMtJO0ttC6IBD3kM0ve0tJwMdSfjZo+EEISaeTr9P3wYrGjXqyC1krcKdhMpxEnt5JetoulscpyzhXN5FRpuPHvbeQaKxFAEB6EN+cYN6xD7RYGpXpNndMmZgM5Dcs3YSNFDHUo2LGfZuukSWyUYirJAdYbF3MfqEKmjM+I2EfhA94iG3L7uKrR+GdWD73ydlIB+6hgref1QTlmgmbM3/LeX5GI1Ux1RWpgxpLuZ2+I+IjzZ8wqE4nilvQdkUdfhzI5QDWy+kw5Wgg2pGpeEVeCCA7b85BO3F9DzxB3cdqvBzWcmzbyMiqhzuYqtHRVG2y4x+KOlnyqla8AoWWpuBoYRxzXrfKuILl6SfiWCbjxoZJUaCBj1CjH7GIaDbc9kqBY3W/Rgjda1iqQcOJu2WW+76pZC9QG7M00dffe9hNnseupFL53r8F7YHSwJWUKP2q+k7RdsxyOB11n0xtOvnW4irMMFNV4H0uqwS5ExsmP9AxbDTc9JwgneAT5vTiUSm1E7BSflSt3bfa1tv8Di3R8n3Af7MNWzs49hmauE2wP+ttrq+AsWpFG2awvsuOqbipWHgtuvuaAE+A1Z/7gC9hesnr+7wqCwG8c5yAg3AL1fm8T9AZtp/bbJGwl1pNrE7RuOX7PeMRUERVaPpEs+yqeoSmuOlokqw49pgomjLeh7icHNlG19yjs6XXOMedYm5xH2YxpV2tc0Ro2jJfxC50ApuxGob7lMsxfTbeUv07TyYxpeLucEH1gNd4IKH2LAg5TdVhlCafZvpskfncCfx8pOhJzd76bJWeYFnFciwcYfubRc12Ip/ppIhA1/mSZ/RxjFDrJC5xifFjJpY2Xl5zXdguFqYyTR1zSp1Y9p+tktDYYSNflcxI0iyO4TPBdlRcpeqjK/piF5bklq77VSEaA+z8qmJTFzIWiitbnzR794USKBUaT0NTEsVjZqLaFVqJoPN9ODG70IPbfBHKK+/q/AWR0tJzYHRULOa4MP+W/HfGadZUbfw177G7j/OGbIs8TahLyynl4X4RinF793Oz+BU0saXtUHrVBFT/DnA3ctNPoGbs4hRIjTok8i+algT1lTHi4SxFvONKNrgQFAq2/gFnWMXgwffgYMJpiKYkmW3tTg3ZQ9Jq+f8XN+A5eeUKHWvJWJ2sgJ1Sop+wwhqFVijqWaJhwtD8MNlSBeWNNWTa5Z5kPZw5+LbVT99wqTdx29lMUH4OIG/D86ruKEauBjvH5xy6um/Sfj7ei6UUVk4AIl3MyD4MSSTOFgSwsH/QJWaQ5as7ZcmgBZkzjjU1UrQ74ci1gWBCSGHtuV1H2mhSnO3Wp/3fEV5a+4wz//6qy8JxjZsmxxy5+4w9CDNJY09T072iKG0EnOS0arEYgXqYnXcYHwjTtUNAcMelOd4xpkoqiTYICWFq0JSiPfPDQdnt+4/wuqcXY47QILbgAAAABJRU5ErkJggg==)," +
-            bgGradient.background,
+          backgroundImage: bgGradient,
+          transform: "scale(1)",
+          transition: "transform 0.3s ease-in-out",
         }}
       >
+        <div
+          className="absolute inset-0 transition-transform duration-300 group-hover:scale-125 group-focus-visible:scale-125"
+          style={{
+            backgroundImage: bgGradient,
+          }}
+        />
         <IconComponent
           name={example.icon || "FileText"}
-          className="absolute left-1/2 top-1/2 h-10 w-10 -translate-x-1/2 -translate-y-1/2 !stroke-1 text-white opacity-80 mix-blend-overlay duration-300 group-hover:scale-105 group-hover:opacity-100"
+          className="absolute left-1/2 top-1/2 h-10 w-10 -translate-x-1/2 -translate-y-1/2 text-white duration-300 group-hover:scale-105 group-focus-visible:scale-105"
         />
       </div>
       <div className="flex flex-1 flex-col justify-between">
         <div>
-          <div className="flex w-full items-center justify-between">
+          <div className="flex w-full items-center">
             <h3
-              className="line-clamp-3 text-lg font-semibold"
+              className="line-clamp-3 font-semibold"
               data-testid={`template_${convertTestName(example.name)}`}
             >
               {example.name}
             </h3>
             <ForwardedIconComponent
               name="ArrowRight"
-              className="mr-3 h-5 w-5 shrink-0 translate-x-0 opacity-0 transition-all duration-300 group-hover:translate-x-3 group-hover:opacity-100"
+              className="mr-3 h-5 w-5 shrink-0 translate-x-0 opacity-0 transition-all duration-300 group-hover:translate-x-3 group-hover:opacity-100 group-focus-visible:translate-x-3 group-focus-visible:opacity-100"
             />
           </div>
           <p className="mt-2 line-clamp-2 text-sm text-muted-foreground">
diff --git a/src/frontend/src/modals/templatesModal/components/TemplateCategoryComponent/index.tsx b/src/frontend/src/modals/templatesModal/components/TemplateCategoryComponent/index.tsx
index 6c8a74513bf..f8b2008c63a 100644
--- a/src/frontend/src/modals/templatesModal/components/TemplateCategoryComponent/index.tsx
+++ b/src/frontend/src/modals/templatesModal/components/TemplateCategoryComponent/index.tsx
@@ -1,27 +1,13 @@
-import { convertTestName } from "@/components/storeCardComponent/utils/convert-test-name";
-import { ForwardedIconComponent } from "../../../../components/genericIconComponent";
 import { TemplateCategoryProps } from "../../../../types/templates/types";
 import TemplateExampleCard from "../TemplateCardComponent";
 
 export function TemplateCategoryComponent({
-  currentTab,
   examples,
   onCardClick,
 }: TemplateCategoryProps) {
   return (
     <>
-      <div className="flex items-center gap-3 font-medium">
-        <ForwardedIconComponent
-          name={currentTab?.icon ?? "Search"}
-          className="h-4 w-4 text-muted-foreground"
-        />
-        <span
-          data-testid={`category_title_${convertTestName(currentTab?.title ?? "All Templates")}`}
-        >
-          {currentTab?.title ?? "All Templates"}
-        </span>
-      </div>
-      <div className="grid grid-cols-1 gap-8 sm:grid-cols-2 lg:grid-cols-3">
+      <div className="grid grid-cols-1 gap-6 lg:grid-cols-2">
         {examples.map((example, index) => (
           <TemplateExampleCard
             key={index}
diff --git a/src/frontend/src/modals/templatesModal/components/TemplateContentComponent/index.tsx b/src/frontend/src/modals/templatesModal/components/TemplateContentComponent/index.tsx
index 1950600afce..f4f2b019c9a 100644
--- a/src/frontend/src/modals/templatesModal/components/TemplateContentComponent/index.tsx
+++ b/src/frontend/src/modals/templatesModal/components/TemplateContentComponent/index.tsx
@@ -62,51 +62,55 @@ export default function TemplateContentComponent({
     track("New Flow Created", { template: `${example.name} Template` });
   };
 
+  const handleClearSearch = () => {
+    setSearchQuery("");
+    if (searchInputRef.current) {
+      searchInputRef.current.focus();
+    }
+  };
+
   const currentTabItem = categories.find((item) => item.id === currentTab);
 
+  const searchInputRef = useRef<HTMLInputElement>(null);
+
   return (
     <div className="flex flex-1 flex-col gap-6 overflow-hidden">
-      <div className="relative flex-1 p-px md:grow-0">
+      <div className="relative flex-1 grow-0 p-px">
         <ForwardedIconComponent
           name="Search"
-          className="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground"
+          className="absolute left-2.5 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground"
         />
         <Input
           type="search"
           placeholder="Search..."
           value={searchQuery}
           onChange={(e) => setSearchQuery(e.target.value)}
-          className="w-full rounded-lg bg-background pl-8 lg:w-3/4"
+          ref={searchInputRef}
+          className="w-3/4 rounded-lg bg-background pl-8 lg:w-2/3"
         />
       </div>
       <div
         ref={scrollContainerRef}
-        className="flex flex-1 flex-col gap-6 overflow-auto"
+        className="flex flex-1 flex-col gap-6 overflow-auto scrollbar-hide"
       >
-        {currentTab === "all-templates" ? (
-          categories.map(
-            (value) =>
-              filteredExamples.filter((example) =>
-                example.tags?.includes(value.id),
-              ).length > 0 && (
-                <TemplateCategoryComponent
-                  key={value.id}
-                  currentTab={value}
-                  examples={filteredExamples.filter((example) =>
-                    example.tags?.includes(value.id),
-                  )}
-                  onCardClick={handleCardClick}
-                />
-              ),
-          )
-        ) : currentTabItem ? (
+        {currentTabItem && filteredExamples.length > 0 ? (
           <TemplateCategoryComponent
-            currentTab={currentTabItem}
             examples={filteredExamples}
             onCardClick={handleCardClick}
           />
         ) : (
-          <></>
+          <div className="flex flex-col items-center justify-center px-4 py-12 text-center">
+            <p className="text-sm text-secondary-foreground">
+              No templates found.{" "}
+              <a
+                className="cursor-pointer underline underline-offset-4"
+                onClick={handleClearSearch}
+              >
+                Clear your search
+              </a>{" "}
+              and try a different query.
+            </p>
+          </div>
         )}
       </div>
     </div>
diff --git a/src/frontend/src/modals/templatesModal/components/TemplateGetStartedCardComponent/index.tsx b/src/frontend/src/modals/templatesModal/components/TemplateGetStartedCardComponent/index.tsx
index 1566b929d04..b650007661b 100644
--- a/src/frontend/src/modals/templatesModal/components/TemplateGetStartedCardComponent/index.tsx
+++ b/src/frontend/src/modals/templatesModal/components/TemplateGetStartedCardComponent/index.tsx
@@ -4,16 +4,16 @@ import { track } from "@/customization/utils/analytics";
 import useAddFlow from "@/hooks/flows/use-add-flow";
 import { useFolderStore } from "@/stores/foldersStore";
 import { updateIds } from "@/utils/reactflowUtils";
+import { BG_NOISE } from "@/utils/styleUtils";
+import { cn } from "@/utils/utils";
 import { useParams } from "react-router-dom";
 import { CardData } from "../../../../types/templates/types";
 
 export default function TemplateGetStartedCardComponent({
-  bgImage,
+  bg,
   spiralImage,
   icon,
   category,
-  title,
-  description,
   flow,
 }: CardData) {
   const addFlow = useAddFlow();
@@ -31,28 +31,40 @@ export default function TemplateGetStartedCardComponent({
       });
       track("New Flow Created", { template: `${flow.name} Template` });
     } else {
-      console.error(`Flow template "${title}" not found`);
+      console.error(`Flow template not found`);
     }
   };
 
-  return (
+  const handleKeyDown = (e) => {
+    if (e.key === "Enter" || e.key === " ") {
+      e.preventDefault();
+      handleClick();
+    }
+  };
+
+  return flow ? (
     <div
-      className="group relative flex h-full cursor-pointer flex-col overflow-hidden rounded-3xl border"
+      className="group relative flex h-full w-full cursor-pointer flex-col overflow-hidden rounded-3xl border focus-visible:border-ring"
+      tabIndex={1}
+      onKeyDown={handleKeyDown}
       onClick={handleClick}
     >
-      <img
-        src={bgImage}
-        alt={`${title} Background`}
-        className="absolute inset-2 h-[calc(100%-16px)] w-[calc(100%-16px)] rounded-2xl object-cover"
+      <div
+        className={cn(
+          "absolute inset-2 h-[calc(100%-16px)] w-[calc(100%-16px)] rounded-2xl object-cover brightness-90 saturate-[140%]",
+        )}
+        style={{
+          backgroundImage: BG_NOISE + "," + bg,
+        }}
       />
       <div className="absolute inset-2 h-[calc(100%-16px)] w-[calc(100%-16px)] overflow-hidden rounded-2xl">
         <img
           src={spiralImage}
-          alt={`${title} Spiral`}
-          className="h-full w-full object-cover opacity-25 transition-all duration-300 group-hover:scale-[102%] group-hover:opacity-60"
+          alt={`${flow.name} Spiral`}
+          className="h-full w-full object-cover opacity-25 transition-all duration-300 group-hover:scale-[102%] group-hover:opacity-60 group-focus-visible:scale-[102%] group-focus-visible:opacity-60"
         />
       </div>
-      <div className="card-shine-effect absolute inset-2 flex h-[calc(100%-16px)] w-[calc(100%-16px)] flex-col items-start gap-4 rounded-2xl p-4 py-6 text-white">
+      <div className="card-shine-effect absolute inset-2 flex h-[calc(100%-16px)] min-w-[calc(100%-16px)] flex-col items-start gap-1 rounded-2xl p-4 text-white md:gap-3 lg:gap-4 lg:py-6">
         <div className="flex items-center gap-2 text-white mix-blend-overlay">
           <ForwardedIconComponent name={icon} className="h-4 w-4" />
           <span className="font-mono text-xs font-semibold uppercase tracking-wider">
@@ -60,15 +72,21 @@ export default function TemplateGetStartedCardComponent({
           </span>
         </div>
         <div className="flex w-full items-center justify-between">
-          <h3 className="line-clamp-3 text-xl font-bold">{title}</h3>
+          <h3 className="line-clamp-3 text-lg font-bold lg:text-xl">
+            {flow.name}
+          </h3>
           <ForwardedIconComponent
             name="ArrowRight"
-            className="mr-3 h-5 w-5 shrink-0 translate-x-0 opacity-0 transition-all duration-300 group-hover:translate-x-3 group-hover:opacity-100"
+            className="mr-3 h-5 w-5 shrink-0 translate-x-0 opacity-0 transition-all duration-300 group-hover:translate-x-3 group-hover:opacity-100 group-focus-visible:translate-x-3 group-focus-visible:opacity-100"
           />
         </div>
 
-        <p className="text-xs font-medium opacity-90">{description}</p>
+        <p className="line-clamp-3 w-full overflow-hidden text-sm font-medium opacity-90">
+          {flow.description}
+        </p>
       </div>
     </div>
+  ) : (
+    <></>
   );
 }
diff --git a/src/frontend/src/modals/templatesModal/components/navComponent/index.tsx b/src/frontend/src/modals/templatesModal/components/navComponent/index.tsx
index 3ce3a6c02de..1a52599a65c 100644
--- a/src/frontend/src/modals/templatesModal/components/navComponent/index.tsx
+++ b/src/frontend/src/modals/templatesModal/components/navComponent/index.tsx
@@ -1,37 +1,86 @@
 import ForwardedIconComponent from "@/components/genericIconComponent";
 import { convertTestName } from "@/components/storeCardComponent/utils/convert-test-name";
-import { Button } from "@/components/ui/button";
+import {
+  Sidebar,
+  SidebarContent,
+  SidebarGroup,
+  SidebarGroupContent,
+  SidebarGroupLabel,
+  SidebarMenu,
+  SidebarMenuButton,
+  SidebarMenuItem,
+  SidebarTrigger,
+} from "@/components/ui/sidebar";
+import { useMobile } from "@/hooks/use-mobile";
 import { cn } from "@/utils/utils";
 import { NavProps } from "../../../../types/templates/types";
 
-export function Nav({ links, currentTab, onClick }: NavProps) {
+export function Nav({ categories, currentTab, setCurrentTab }: NavProps) {
+  const isMobile = useMobile();
+
   return (
-    <div className="group flex flex-col gap-4">
-      <nav className="grid">
-        {links.map((link, index) => (
-          <Button
-            variant={link.id === currentTab ? "menu-active" : "menu"}
-            size="sm"
-            key={index}
-            onClick={() => onClick?.(link.id)}
-            className="group"
+    <Sidebar collapsible={isMobile ? "icon" : "none"}>
+      <SidebarContent className="gap-0 p-2">
+        <div
+          className={cn("relative flex items-center gap-2 px-2 py-3 md:px-4")}
+          data-testid="modal-title"
+        >
+          <SidebarTrigger
+            className={cn(
+              "flex h-8 shrink-0 items-center rounded-md text-lg font-semibold leading-none tracking-tight text-primary outline-none ring-ring transition-[margin,opa] duration-200 ease-linear focus-visible:ring-1 md:hidden [&>svg]:size-4 [&>svg]:shrink-0",
+            )}
+          />
+          <div
+            className={cn(
+              "flex h-8 shrink-0 items-center rounded-md text-lg font-semibold leading-none tracking-tight text-primary outline-none ring-ring transition-[margin,opa] duration-200 ease-linear focus-visible:ring-1 [&>svg]:size-4 [&>svg]:shrink-0",
+              "group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",
+            )}
           >
-            <ForwardedIconComponent
-              name={link.icon}
-              className={cn(
-                "mr-2 h-4 w-4 stroke-2 text-muted-foreground",
-                link.id === currentTab && "text-pink-400",
-              )}
-            />
-            <span
-              data-testid={`side_nav_options_${convertTestName(link.title)}`}
-              className="flex-1 text-left text-primary"
+            Categories
+          </div>
+        </div>
+
+        {categories.map((category, index) => (
+          <SidebarGroup key={index}>
+            <SidebarGroupLabel
+              className={`${
+                index === 0
+                  ? "hidden"
+                  : "mb-1 text-sm font-semibold text-muted-foreground"
+              }`}
             >
-              {link.title}
-            </span>
-          </Button>
+              {category.title}
+            </SidebarGroupLabel>
+            <SidebarGroupContent>
+              <SidebarMenu>
+                {category.items.map((link) => (
+                  <SidebarMenuItem key={link.id}>
+                    <SidebarMenuButton
+                      onClick={() => setCurrentTab(link.id)}
+                      isActive={currentTab === link.id}
+                      data-testid={`side_nav_options_${link.title.toLowerCase().replace(/\s+/g, "-")}`}
+                    >
+                      <ForwardedIconComponent
+                        name={link.icon}
+                        className={`h-4 w-4 stroke-2 ${
+                          currentTab === link.id
+                            ? "x-gradient"
+                            : "text-muted-foreground"
+                        }`}
+                      />
+                      <span
+                        data-testid={`category_title_${convertTestName(link.title)}`}
+                      >
+                        {link.title}
+                      </span>
+                    </SidebarMenuButton>
+                  </SidebarMenuItem>
+                ))}
+              </SidebarMenu>
+            </SidebarGroupContent>
+          </SidebarGroup>
         ))}
-      </nav>
-    </div>
+      </SidebarContent>
+    </Sidebar>
   );
 }
diff --git a/src/frontend/src/modals/templatesModal/index.tsx b/src/frontend/src/modals/templatesModal/index.tsx
index 8da16a588e0..90f33285c03 100644
--- a/src/frontend/src/modals/templatesModal/index.tsx
+++ b/src/frontend/src/modals/templatesModal/index.tsx
@@ -1,5 +1,6 @@
+import ForwardedIconComponent from "@/components/genericIconComponent";
 import { Button } from "@/components/ui/button";
-import { Separator } from "@/components/ui/separator";
+import { SidebarProvider } from "@/components/ui/sidebar";
 import { useCustomNavigate } from "@/customization/hooks/use-custom-navigate";
 import { track } from "@/customization/utils/analytics";
 import useAddFlow from "@/hooks/flows/use-add-flow";
@@ -9,8 +10,8 @@ import { useParams } from "react-router-dom";
 import { newFlowModalPropsType } from "../../types/components";
 import BaseModal from "../baseModal";
 import GetStartedComponent from "./components/GetStartedComponent";
-import { Nav } from "./components/navComponent";
 import TemplateContentComponent from "./components/TemplateContentComponent";
+import { Nav } from "./components/navComponent";
 
 export default function TemplatesModal({
   open,
@@ -26,8 +27,8 @@ export default function TemplatesModal({
     {
       title: "Templates",
       items: [
-        { title: "Get Started", icon: "SquarePlay", id: "get-started" },
-        { title: "All Templates", icon: "LayoutPanelTop", id: "all-templates" },
+        { title: "Get started", icon: "SquarePlay", id: "get-started" },
+        { title: "All templates", icon: "LayoutPanelTop", id: "all-templates" },
       ],
     },
     {
@@ -44,58 +45,52 @@ export default function TemplatesModal({
     <BaseModal size="templates" open={open} setOpen={setOpen} className="p-0">
       <BaseModal.Content overflowHidden className="flex flex-col p-0">
         <div className="flex h-full">
-          <div className="flex w-60 flex-col gap-4 p-6 pl-4">
-            {categories.map((category, index) => (
-              <div key={index} className="flex flex-col gap-2">
-                <h2
-                  className={`pl-2 font-semibold ${index === 0 ? "mb-3 text-lg leading-none tracking-tight text-primary" : "text-sm text-muted-foreground"}`}
-                  data-testid={index === 0 ? "modal-title" : undefined}
-                >
-                  {category.title}
-                </h2>
-                <Nav
-                  links={category.items}
+          <SidebarProvider width="15rem" defaultOpen={false}>
+            <Nav
+              categories={categories}
+              currentTab={currentTab}
+              setCurrentTab={setCurrentTab}
+            />
+            <main className="flex flex-1 flex-col gap-4 overflow-hidden p-6 md:gap-8">
+              {currentTab === "get-started" ? (
+                <GetStartedComponent />
+              ) : (
+                <TemplateContentComponent
                   currentTab={currentTab}
-                  onClick={(id) => setCurrentTab(id)}
+                  categories={categories.flatMap((category) => category.items)}
                 />
-              </div>
-            ))}
-          </div>
-          <Separator className="h-auto" orientation="vertical" />
-          <div className="flex flex-1 flex-col gap-8 overflow-hidden p-6">
-            {currentTab === "get-started" ? (
-              <GetStartedComponent />
-            ) : (
-              <TemplateContentComponent
-                currentTab={currentTab}
-                categories={categories.flatMap((category) => category.items)}
-              />
-            )}
-            <BaseModal.Footer>
-              <div className="flex w-full items-center justify-between pb-4">
-                <div className="flex flex-col items-start justify-center">
-                  <div className="font-semibold">Start from scratch</div>
-                  <div className="text-sm text-muted-foreground">
-                    Begin a fresh project to build from scratch.
+              )}
+              <BaseModal.Footer>
+                <div className="flex w-full flex-col justify-between gap-4 pb-4 sm:flex-row sm:items-center">
+                  <div className="flex flex-col items-start justify-center">
+                    <div className="font-semibold">Start from scratch</div>
+                    <div className="text-sm text-muted-foreground">
+                      Begin with a fresh flow to build from scratch.
+                    </div>
                   </div>
+                  <Button
+                    onClick={() => {
+                      addFlow().then((id) => {
+                        navigate(
+                          `/flow/${id}${folderId ? `/folder/${folderId}` : ""}`,
+                        );
+                      });
+                      track("New Flow Created", { template: "Blank Flow" });
+                    }}
+                    size="sm"
+                    data-testid="blank-flow"
+                    className="shrink-0"
+                  >
+                    <ForwardedIconComponent
+                      name="Plus"
+                      className="h-4 w-4 shrink-0"
+                    />
+                    Blank Flow
+                  </Button>
                 </div>
-                <Button
-                  onClick={() => {
-                    addFlow().then((id) => {
-                      navigate(
-                        `/flow/${id}${folderId ? `/folder/${folderId}` : ""}`,
-                      );
-                    });
-                    track("New Flow Created", { template: "Blank Flow" });
-                  }}
-                  size="sm"
-                  data-testid="blank-flow"
-                >
-                  Create Blank Project
-                </Button>
-              </div>
-            </BaseModal.Footer>
-          </div>
+              </BaseModal.Footer>
+            </main>
+          </SidebarProvider>
         </div>
       </BaseModal.Content>
     </BaseModal>
diff --git a/src/frontend/src/style/applies.css b/src/frontend/src/style/applies.css
index 2473a95e2aa..99c97cc2914 100644
--- a/src/frontend/src/style/applies.css
+++ b/src/frontend/src/style/applies.css
@@ -174,7 +174,7 @@
     @apply flex gap-2;
   }
   .primary-input {
-    @apply placeholder:text-muted-foreground form-input block w-full truncate rounded-md border-[1px] border-border bg-background px-3 text-left text-sm  hover:border-muted-foreground focus:border-foreground focus:placeholder-transparent focus:ring-[0.75px] focus:ring-foreground focus-visible:border-foreground disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:text-muted disabled:opacity-100 placeholder:disabled:text-muted-foreground;
+    @apply form-input block w-full truncate rounded-md border-[1px] border-border bg-background px-3 text-left text-sm placeholder:text-muted-foreground hover:border-muted-foreground focus:border-foreground focus:placeholder-transparent focus:ring-0 focus:ring-foreground disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-muted disabled:text-muted disabled:opacity-100 placeholder:disabled:text-muted-foreground;
   }
 
   .skeleton-card {
@@ -191,7 +191,7 @@
 
   /* The same as primary-input but no-truncate */
   .textarea-primary {
-    @apply placeholder:text-placeholder-foreground form-input block w-full rounded-md border-[1px] border-border bg-background px-3 text-left shadow-sm hover:border-muted focus:border-muted focus:placeholder-transparent focus:ring-foreground focus:ring-[0.75px] disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-secondary disabled:text-muted disabled:opacity-100 placeholder:disabled:text-muted-foreground sm:text-sm;
+    @apply placeholder:text-placeholder-foreground form-input block w-full rounded-md border-[1px] border-border bg-background px-3 text-left shadow-sm hover:border-muted focus:border-muted focus:placeholder-transparent focus:ring-[0.75px] focus:ring-foreground disabled:pointer-events-none disabled:cursor-not-allowed disabled:bg-secondary disabled:text-muted disabled:opacity-100 placeholder:disabled:text-muted-foreground sm:text-sm;
   }
 
   .input-edit-node {
@@ -220,7 +220,7 @@
     @apply w-6 fill-build-trigger stroke-build-trigger stroke-1;
   }
   .message-button-position {
-    @apply fixed top-20 right-4;
+    @apply fixed right-4 top-20;
   }
   .message-button-icon {
     @apply fill-medium-indigo stroke-medium-indigo stroke-1;
@@ -1190,6 +1190,10 @@
     @apply w-fit;
   }
 
+  .x-gradient {
+    @apply stroke-[url(#x-gradient)] bg-blend-hard-light;
+  }
+
   .button-run-bg {
     @apply flex h-7 w-7 cursor-pointer items-center justify-center rounded-sm bg-transparent p-0 hover:bg-muted hover:p-1;
   }
@@ -1215,7 +1219,7 @@
   }
 
   .disabled-state {
-    @apply pointer-events-none bg-secondary text-hard-zinc;
+    @apply text-hard-zinc pointer-events-none bg-secondary;
   }
 
   .background-fade-input {
@@ -1260,8 +1264,7 @@
   }
 
   .node-toolbar-buttons {
-    @apply flex items-center gap-1 rounded-lg text-foreground w-max min-w-10
-
+    @apply flex w-max min-w-10 items-center gap-1 rounded-lg text-foreground;
   }
 
   .share-button {
diff --git a/src/frontend/src/style/classes.css b/src/frontend/src/style/classes.css
index 542f03648a6..a527393d47f 100644
--- a/src/frontend/src/style/classes.css
+++ b/src/frontend/src/style/classes.css
@@ -1,7 +1,17 @@
 body {
   margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
-    "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+  font-family:
+    "Inter",
+    -apple-system,
+    BlinkMacSystemFont,
+    "Segoe UI",
+    "Roboto",
+    "Oxygen",
+    "Ubuntu",
+    "Cantarell",
+    "Fira Sans",
+    "Droid Sans",
+    "Helvetica Neue",
     sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -245,3 +255,13 @@ pre {
   /* bg ignored now */
   background-color: var(--canvas);
 }
+
+[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+  background-color: hsl(var(--primary));
+  -webkit-mask-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='%23777'><path d='M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z'/></svg>");
+  background-size: 16px 16px;
+  height: 16px;
+  opacity: 1 !important;
+  width: 16px;
+}
diff --git a/src/frontend/src/style/index.css b/src/frontend/src/style/index.css
index 174520f02fd..2c4ddc44891 100644
--- a/src/frontend/src/style/index.css
+++ b/src/frontend/src/style/index.css
@@ -6,6 +6,9 @@
 
 @layer base {
   :root {
+    --font-sans: "Inter", sans-serif;
+    --font-mono: "JetBrains Mono", monospace;
+
     --foreground: 0 0% 0%; /* hsl(0, 0%, 0%) */
     --background: 0 0% 100%; /* hsl(0, 0%, 100%) */
     --muted: 240 5% 96%; /* hsl(240, 5%, 96%) */
diff --git a/src/frontend/src/types/templates/types.ts b/src/frontend/src/types/templates/types.ts
index a619fcef84e..5ff7731c0af 100644
--- a/src/frontend/src/types/templates/types.ts
+++ b/src/frontend/src/types/templates/types.ts
@@ -12,17 +12,14 @@ export interface Category {
 }
 
 export interface CardData {
-  bgImage: string;
+  bg: string;
   spiralImage: string;
   icon: string;
   category: string;
-  title: string;
-  description: string;
   flow: FlowType | undefined;
 }
 
 export interface TemplateCategoryProps {
-  currentTab: NavItem;
   examples: any[];
   onCardClick: (example: any) => void;
 }
@@ -44,7 +41,7 @@ export interface TemplateCardComponentProps {
 }
 
 export interface NavProps {
-  links: NavItem[];
+  categories: Category[];
   currentTab: string;
-  onClick?: (id: string) => void;
+  setCurrentTab: (id: string) => void;
 }
diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts
index 3a789d7dcf8..f82509b841b 100644
--- a/src/frontend/src/utils/styleUtils.ts
+++ b/src/frontend/src/utils/styleUtils.ts
@@ -258,6 +258,9 @@ import { MistralIcon } from "../icons/mistral";
 import { SupabaseIcon } from "../icons/supabase";
 import { iconsType } from "../types/components";
 
+export const BG_NOISE =
+  "url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAMAAAAp4XiDAAAAUVBMVEWFhYWDg4N3d3dtbW17e3t1dXWBgYGHh4d5eXlzc3OLi4ubm5uVlZWPj4+NjY19fX2JiYl/f39ra2uRkZGZmZlpaWmXl5dvb29xcXGTk5NnZ2c8TV1mAAAAG3RSTlNAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEAvEOwtAAAFVklEQVR4XpWWB67c2BUFb3g557T/hRo9/WUMZHlgr4Bg8Z4qQgQJlHI4A8SzFVrapvmTF9O7dmYRFZ60YiBhJRCgh1FYhiLAmdvX0CzTOpNE77ME0Zty/nWWzchDtiqrmQDeuv3powQ5ta2eN0FY0InkqDD73lT9c9lEzwUNqgFHs9VQce3TVClFCQrSTfOiYkVJQBmpbq2L6iZavPnAPcoU0dSw0SUTqz/GtrGuXfbyyBniKykOWQWGqwwMA7QiYAxi+IlPdqo+hYHnUt5ZPfnsHJyNiDtnpJyayNBkF6cWoYGAMY92U2hXHF/C1M8uP/ZtYdiuj26UdAdQQSXQErwSOMzt/XWRWAz5GuSBIkwG1H3FabJ2OsUOUhGC6tK4EMtJO0ttC6IBD3kM0ve0tJwMdSfjZo+EEISaeTr9P3wYrGjXqyC1krcKdhMpxEnt5JetoulscpyzhXN5FRpuPHvbeQaKxFAEB6EN+cYN6xD7RYGpXpNndMmZgM5Dcs3YSNFDHUo2LGfZuukSWyUYirJAdYbF3MfqEKmjM+I2EfhA94iG3L7uKrR+GdWD73ydlIB+6hgref1QTlmgmbM3/LeX5GI1Ux1RWpgxpLuZ2+I+IjzZ8wqE4nilvQdkUdfhzI5QDWy+kw5Wgg2pGpeEVeCCA7b85BO3F9DzxB3cdqvBzWcmzbyMiqhzuYqtHRVG2y4x+KOlnyqla8AoWWpuBoYRxzXrfKuILl6SfiWCbjxoZJUaCBj1CjH7GIaDbc9kqBY3W/Rgjda1iqQcOJu2WW+76pZC9QG7M00dffe9hNnseupFL53r8F7YHSwJWUKP2q+k7RdsxyOB11n0xtOvnW4irMMFNV4H0uqwS5ExsmP9AxbDTc9JwgneAT5vTiUSm1E7BSflSt3bfa1tv8Di3R8n3Af7MNWzs49hmauE2wP+ttrq+AsWpFG2awvsuOqbipWHgtuvuaAE+A1Z/7gC9hesnr+7wqCwG8c5yAg3AL1fm8T9AZtp/bbJGwl1pNrE7RuOX7PeMRUERVaPpEs+yqeoSmuOlokqw49pgomjLeh7icHNlG19yjs6XXOMedYm5xH2YxpV2tc0Ro2jJfxC50ApuxGob7lMsxfTbeUv07TyYxpeLucEH1gNd4IKH2LAg5TdVhlCafZvpskfncCfx8pOhJzd76bJWeYFnFciwcYfubRc12Ip/ppIhA1/mSZ/RxjFDrJC5xifFjJpY2Xl5zXdguFqYyTR1zSp1Y9p+tktDYYSNflcxI0iyO4TPBdlRcpeqjK/piF5bklq77VSEaA+z8qmJTFzIWiitbnzR794USKBUaT0NTEsVjZqLaFVqJoPN9ODG70IPbfBHKK+/q/AWR0tJzYHRULOa4MP+W/HfGadZUbfw177G7j/OGbIs8TahLyynl4X4RinF793Oz+BU0saXtUHrVBFT/DnA3ctNPoGbs4hRIjTok8i+algT1lTHi4SxFvONKNrgQFAq2/gFnWMXgwffgYMJpiKYkmW3tTg3ZQ9Jq+f8XN+A5eeUKHWvJWJ2sgJ1Sop+wwhqFVijqWaJhwtD8MNlSBeWNNWTa5Z5kPZw5+LbVT99wqTdx29lMUH4OIG/D86ruKEauBjvH5xy6um/Sfj7ei6UUVk4AIl3MyD4MSSTOFgSwsH/QJWaQ5as7ZcmgBZkzjjU1UrQ74ci1gWBCSGHtuV1H2mhSnO3Wp/3fEV5a+4wz//6qy8JxjZsmxxy5+4w9CDNJY09T072iKG0EnOS0arEYgXqYnXcYHwjTtUNAcMelOd4xpkoqiTYICWFq0JSiPfPDQdnt+4/wuqcXY47QILbgAAAABJRU5ErkJggg==)";
+
 export const gradients = [
   "bg-gradient-to-br from-gray-800 via-rose-700 to-violet-900",
   "bg-gradient-to-br from-green-200 via-green-300 to-blue-500",
@@ -292,6 +295,30 @@ export const gradients = [
   "bg-gradient-to-br from-lime-600 via-yellow-300 to-red-600",
 ];
 
+/* 
+Specifications
+#FF3276 -> #F480FF
+#1A0250 -> #2F10FE
+#98F4FE -> #9BFEAA
+#F480FF -> #7528FC
+#F480FF -> #9BFEAA
+#2F10FE -> #9BFEAA
+#BB277F -> #050154
+#7528FC -> #9BFEAA
+#2F10FE -> #98F4FE
+*/
+export const flowGradients = [
+  "linear-gradient(90deg, #FF3276 0%, #F480FF 100%)",
+  "linear-gradient(90deg, #1A0250 0%, #2F10FE 100%)",
+  "linear-gradient(90deg, #98F4FE 0%, #9BFEAA 100%)",
+  "linear-gradient(90deg, #F480FF 0%, #7528FC 100%)",
+  "linear-gradient(90deg, #F480FF 0%, #9BFEAA 100%)",
+  "linear-gradient(90deg, #2F10FE 0%, #9BFEAA 100%)",
+  "linear-gradient(90deg, #BB277F 0%, #050154 100%)",
+  "linear-gradient(90deg, #7528FC 0%, #9BFEAA 100%)",
+  "linear-gradient(90deg, #2F10FE 0%, #98F4FE 100%)",
+];
+
 export const nodeColors: { [char: string]: string } = {
   inputs: "#10B981",
   outputs: "#AA2411",
diff --git a/src/frontend/tailwind.config.mjs b/src/frontend/tailwind.config.mjs
index ccccdd41d9f..e97625e474e 100644
--- a/src/frontend/tailwind.config.mjs
+++ b/src/frontend/tailwind.config.mjs
@@ -186,8 +186,8 @@ const config = {
           DEFAULT: "hsl(var(--inner-yellow))",
           foreground: "hsl(var(--inner-foreground-yellow))",
           muted: "hsl(var(--inner-yellow-muted-foreground))",
-          },
-          "inner-blue": {
+        },
+        "inner-blue": {
           DEFAULT: "hsl(var(--inner-blue))",
           foreground: "hsl(var(--inner-foreground-blue))",
           muted: "hsl(var(--inner-blue-muted-foreground))",
@@ -244,28 +244,12 @@ const config = {
         sm: "calc(var(--radius) - 4px)",
       },
       borderWidth: {
-        '1.75': '1.75px',
-        '1.5': '1.5px',
+        1.75: "1.75px",
+        1.5: "1.5px",
       },
       fontFamily: {
-        sans: [
-          "Inter",
-          "ui-sans-serif",
-          "system-ui",
-          "-apple-system",
-          "BlinkMacSystemFont",
-          "Segoe UI",
-          "Roboto",
-          "Helvetica Neue",
-          "Arial",
-          "Noto Sans",
-          "sans-serif",
-          "Apple Color Emoji",
-          "Segoe UI Emoji",
-          "Segoe UI Symbol",
-          "Noto Color Emoji",
-        ],
-        jetbrains: ["JetBrains Mono", "monospace"],
+        sans: ["var(--font-sans)", ...fontFamily.sans],
+        mono: ["var(--font-mono)", ...fontFamily.mono],
       },
       boxShadow: {
         "frozen-ring": "0 0 10px 2px rgba(128, 190, 230, 0.5)",
diff --git a/src/frontend/tests/core/integrations/Dynamic Agent.spec.ts b/src/frontend/tests/core/integrations/Dynamic Agent.spec.ts
index 762bec8efcc..9e469296de4 100644
--- a/src/frontend/tests/core/integrations/Dynamic Agent.spec.ts	
+++ b/src/frontend/tests/core/integrations/Dynamic Agent.spec.ts	
@@ -3,105 +3,98 @@ import * as dotenv from "dotenv";
 import path from "path";
 
 test("Dynamic Agent", async ({ page }) => {
-  // test.skip(
-  //   !process?.env?.OPENAI_API_KEY,
-  //   "OPENAI_API_KEY required to run this test",
-  // );
-  // test.skip(
-  //   !process?.env?.SEARCH_API_KEY,
-  //   "SEARCH_API_KEY required to run this test",
-  // );
-  // if (!process.env.CI) {
-  //   dotenv.config({ path: path.resolve(__dirname, "../../.env") });
-  // }
-  // await page.goto("/");
-  // await page.waitForSelector('[data-testid="mainpage_title"]', {
-  //   timeout: 30000,
-  // });
-  // await page.waitForSelector('[id="new-project-btn"]', {
-  //   timeout: 30000,
-  // });
-  // let modalCount = 0;
-  // try {
-  //   const modalTitleElement = await page?.getByTestId("modal-title");
-  //   if (modalTitleElement) {
-  //     modalCount = await modalTitleElement.count();
-  //   }
-  // } catch (error) {
-  //   modalCount = 0;
-  // }
-  // while (modalCount === 0) {
-  //   await page.getByText("New Project", { exact: true }).click();
-  //   await page.waitForTimeout(3000);
-  //   modalCount = await page.getByTestId("modal-title")?.count();
-  // }
-  // await page.getByTestId("side_nav_options_all-templates").click();
-  // await page.getByRole("heading", { name: "Dynamic Agent" }).last().click();
-  // await page.waitForSelector('[data-testid="fit_view"]', {
-  //   timeout: 100000,
-  // });
-  // await page.getByTestId("fit_view").click();
-  // await page.getByTestId("zoom_out").click();
-  // await page.getByTestId("zoom_out").click();
-  // await page.getByTestId("zoom_out").click();
-  // let outdatedComponents = await page.getByTestId("icon-AlertTriangle").count();
-  // while (outdatedComponents > 0) {
-  //   await page.getByTestId("icon-AlertTriangle").first().click();
-  //   await page.waitForTimeout(1000);
-  //   outdatedComponents = await page.getByTestId("icon-AlertTriangle").count();
-  // }
-  // let filledApiKey = await page.getByTestId("remove-icon-badge").count();
-  // while (filledApiKey > 0) {
-  //   await page.getByTestId("remove-icon-badge").first().click();
-  //   await page.waitForTimeout(1000);
-  //   filledApiKey = await page.getByTestId("remove-icon-badge").count();
-  // }
-  // await page
-  //   .getByTestId("popover-anchor-input-api_key")
-  //   .last()
-  //   .fill(process.env.SEARCH_API_KEY ?? "");
-  // await page.waitForTimeout(1000);
-  // let openAiLlms = await page.getByText("OpenAI", { exact: true }).count();
-  // await page.waitForSelector('[data-testid="fit_view"]', {
-  //   timeout: 100000,
-  // });
-  // for (let i = 0; i < openAiLlms; i++) {
-  //   await page
-  //     .getByTestId("popover-anchor-input-api_key")
-  //     .nth(i)
-  //     .fill(process.env.OPENAI_API_KEY ?? "");
-  //   await page.getByTestId("zoom_in").click();
-  //   await page.getByTestId("dropdown_str_model_name").nth(i).click();
-  //   await page.getByTestId("gpt-4o-1-option").last().click();
-  //   await page.waitForTimeout(1000);
-  // }
-  // await page
-  //   .getByTestId("textarea_str_input_value")
-  //   .first()
-  //   .fill("how much is an apple stock today");
-  // await page.getByTestId("button_run_chat output").click();
-  // const result = await Promise.race([
-  //   page.waitForSelector("text=OpenAIException", { timeout: 30000 }),
-  //   page.waitForSelector("text=Error building", { timeout: 30000 }),
-  // ]);
-  // if (result) {
-  //   test.skip();
-  // }
-  // await page.waitForSelector("text=built successfully", { timeout: 60000 * 3 });
-  // await page.getByText("built successfully").last().click({
-  //   timeout: 15000,
-  // });
-  // await page.getByText("Playground", { exact: true }).last().click();
-  // await page.waitForTimeout(1000);
-  // expect(page.getByText("apple").last()).toBeVisible();
-  // const textContents = await page
-  //   .getByTestId("div-chat-message")
-  //   .allTextContents();
-  // const concatAllText = textContents.join(" ");
-  // expect(concatAllText.toLocaleLowerCase()).toContain("apple");
-  // expect(concatAllText.toLocaleLowerCase()).not.toContain("error");
-  // expect(concatAllText.toLocaleLowerCase()).not.toContain("apologize");
-  // expect(concatAllText.toLocaleLowerCase()).not.toContain("unable");
-  // const allTextLength = concatAllText.length;
-  // expect(allTextLength).toBeGreaterThan(100);
+  test.skip(
+    !process?.env?.OPENAI_API_KEY,
+    "OPENAI_API_KEY required to run this test",
+  );
+  test.skip(
+    !process?.env?.SEARCH_API_KEY,
+    "SEARCH_API_KEY required to run this test",
+  );
+  if (!process.env.CI) {
+    dotenv.config({ path: path.resolve(__dirname, "../../.env") });
+  }
+  await page.goto("/");
+  await page.waitForSelector('[data-testid="mainpage_title"]', {
+    timeout: 30000,
+  });
+  await page.waitForSelector('[id="new-project-btn"]', {
+    timeout: 30000,
+  });
+  let modalCount = 0;
+  try {
+    const modalTitleElement = await page?.getByTestId("modal-title");
+    if (modalTitleElement) {
+      modalCount = await modalTitleElement.count();
+    }
+  } catch (error) {
+    modalCount = 0;
+  }
+  while (modalCount === 0) {
+    await page.getByText("New Project", { exact: true }).click();
+    await page.waitForTimeout(3000);
+    modalCount = await page.getByTestId("modal-title")?.count();
+  }
+  await page.getByTestId("side_nav_options_all-templates").click();
+  await page.getByRole("heading", { name: "Dynamic Agent" }).last().click();
+  await page.waitForSelector('[data-testid="fit_view"]', {
+    timeout: 100000,
+  });
+  await page.getByTestId("fit_view").click();
+  await page.getByTestId("zoom_out").click();
+  await page.getByTestId("zoom_out").click();
+  await page.getByTestId("zoom_out").click();
+  let outdatedComponents = await page.getByTestId("icon-AlertTriangle").count();
+  while (outdatedComponents > 0) {
+    await page.getByTestId("icon-AlertTriangle").first().click();
+    await page.waitForTimeout(1000);
+    outdatedComponents = await page.getByTestId("icon-AlertTriangle").count();
+  }
+  let filledApiKey = await page.getByTestId("remove-icon-badge").count();
+  while (filledApiKey > 0) {
+    await page.getByTestId("remove-icon-badge").first().click();
+    await page.waitForTimeout(1000);
+    filledApiKey = await page.getByTestId("remove-icon-badge").count();
+  }
+  await page
+    .getByTestId("popover-anchor-input-api_key")
+    .last()
+    .fill(process.env.SEARCH_API_KEY ?? "");
+  await page.waitForTimeout(1000);
+  let openAiLlms = await page.getByText("OpenAI", { exact: true }).count();
+  await page.waitForSelector('[data-testid="fit_view"]', {
+    timeout: 100000,
+  });
+  for (let i = 0; i < openAiLlms; i++) {
+    await page
+      .getByTestId("popover-anchor-input-api_key")
+      .nth(i)
+      .fill(process.env.OPENAI_API_KEY ?? "");
+    await page.getByTestId("zoom_in").click();
+    await page.getByTestId("dropdown_str_model_name").nth(i).click();
+    await page.getByTestId("gpt-4o-1-option").last().click();
+    await page.waitForTimeout(1000);
+  }
+  await page
+    .getByTestId("textarea_str_input_value")
+    .first()
+    .fill("how much is an apple stock today");
+  await page.getByTestId("button_run_chat output").click();
+
+  await page.waitForSelector("text=built successfully", { timeout: 60000 * 3 });
+  await page.getByText("built successfully").last().click({
+    timeout: 15000,
+  });
+  await page.getByText("Playground", { exact: true }).last().click();
+  await page.waitForTimeout(1000);
+  expect(page.getByText("apple").last()).toBeVisible();
+  const textContents = await page
+    .getByTestId("div-chat-message")
+    .allTextContents();
+  const concatAllText = textContents.join(" ");
+  expect(concatAllText.toLocaleLowerCase()).toContain("apple");
+  expect(concatAllText.toLocaleLowerCase()).not.toContain("error");
+  expect(concatAllText.toLocaleLowerCase()).not.toContain("apologize");
+  const allTextLength = concatAllText.length;
+  expect(allTextLength).toBeGreaterThan(100);
 });
diff --git a/src/frontend/tests/core/integrations/Hierarchical Agent.spec.ts b/src/frontend/tests/core/integrations/Hierarchical Agent.spec.ts
new file mode 100644
index 00000000000..c2ea70abafc
--- /dev/null
+++ b/src/frontend/tests/core/integrations/Hierarchical Agent.spec.ts	
@@ -0,0 +1,122 @@
+import { expect, test } from "@playwright/test";
+import * as dotenv from "dotenv";
+import path from "path";
+import uaParser from "ua-parser-js";
+
+test("Hierarchical Tasks Agent", async ({ page }) => {
+  test.skip(
+    !process?.env?.OPENAI_API_KEY,
+    "OPENAI_API_KEY required to run this test",
+  );
+
+  test.skip(
+    !process?.env?.SEARCH_API_KEY,
+    "SEARCH_API_KEY required to run this test",
+  );
+
+  if (!process.env.CI) {
+    dotenv.config({ path: path.resolve(__dirname, "../../.env") });
+  }
+
+  await page.goto("/");
+  await page.waitForSelector('[data-testid="mainpage_title"]', {
+    timeout: 30000,
+  });
+
+  await page.waitForSelector('[id="new-project-btn"]', {
+    timeout: 30000,
+  });
+
+  let modalCount = 0;
+  try {
+    const modalTitleElement = await page?.getByTestId("modal-title");
+    if (modalTitleElement) {
+      modalCount = await modalTitleElement.count();
+    }
+  } catch (error) {
+    modalCount = 0;
+  }
+
+  while (modalCount === 0) {
+    await page.getByText("New Project", { exact: true }).click();
+    await page.waitForTimeout(3000);
+    modalCount = await page.getByTestId("modal-title")?.count();
+  }
+
+  const getUA = await page.evaluate(() => navigator.userAgent);
+  const userAgentInfo = uaParser(getUA);
+  let control = "Control";
+
+  if (userAgentInfo.os.name.includes("Mac")) {
+    control = "Meta";
+  }
+
+  await page.getByTestId("side_nav_options_all-templates").click();
+  await page
+    .getByRole("heading", { name: "Hierarchical Tasks Agent" })
+    .first()
+    .click();
+
+  await page.waitForSelector('[data-testid="fit_view"]', {
+    timeout: 100000,
+  });
+
+  await page.getByTestId("fit_view").click();
+  await page.getByTestId("zoom_out").click();
+  await page.getByTestId("zoom_out").click();
+  await page.getByTestId("zoom_out").click();
+
+  let outdatedComponents = await page.getByTestId("icon-AlertTriangle").count();
+
+  while (outdatedComponents > 0) {
+    await page.getByTestId("icon-AlertTriangle").first().click();
+    await page.waitForTimeout(1000);
+    outdatedComponents = await page.getByTestId("icon-AlertTriangle").count();
+  }
+
+  let filledApiKey = await page.getByTestId("remove-icon-badge").count();
+  while (filledApiKey > 0) {
+    await page.getByTestId("remove-icon-badge").first().click();
+    await page.waitForTimeout(1000);
+    filledApiKey = await page.getByTestId("remove-icon-badge").count();
+  }
+
+  await page
+    .getByTestId("popover-anchor-input-api_key")
+    .nth(1)
+    .fill(process.env.OPENAI_API_KEY ?? "");
+
+  await page
+    .getByTestId("popover-anchor-input-api_key")
+    .nth(0)
+    .fill(process.env.OPENAI_API_KEY ?? "");
+
+  await page.getByTestId("dropdown_str_model_name").nth(1).click();
+  await page.getByTestId("gpt-4o-1-option").last().click();
+
+  await page.getByTestId("dropdown_str_model_name").nth(0).click();
+  await page.getByTestId("gpt-4o-1-option").first().click();
+
+  await page
+    .getByTestId("popover-anchor-input-api_key")
+    .last()
+    .fill(process.env.SEARCH_API_KEY ?? "");
+
+  await page.waitForTimeout(1000);
+
+  await page.getByTestId("button_run_chat output").click();
+
+  await page.waitForTimeout(1000);
+
+  await page.waitForSelector("text=built successfully", { timeout: 30000 });
+
+  await page.getByText("built successfully").last().click({
+    timeout: 15000,
+  });
+
+  await page.getByText("Playground", { exact: true }).last().click();
+
+  expect(await page.locator(".markdown").count()).toBeGreaterThan(0);
+
+  expect(await page.getByText("Langflow").count()).toBeGreaterThan(2);
+});
diff --git a/src/frontend/tests/core/integrations/Sequential Task Agent.spec.ts b/src/frontend/tests/core/integrations/Sequential Task Agent.spec.ts
new file mode 100644
index 00000000000..f481364ec81
--- /dev/null
+++ b/src/frontend/tests/core/integrations/Sequential Task Agent.spec.ts	
@@ -0,0 +1,103 @@
+import { expect, test } from "@playwright/test";
+import * as dotenv from "dotenv";
+import path from "path";
+import uaParser from "ua-parser-js";
+
+test("Sequential Task Agent", async ({ page }) => {
+  test.skip(
+    !process?.env?.OPENAI_API_KEY,
+    "OPENAI_API_KEY required to run this test",
+  );
+
+  if (!process.env.CI) {
+    dotenv.config({ path: path.resolve(__dirname, "../../.env") });
+  }
+
+  await page.goto("/");
+  await page.waitForSelector('[data-testid="mainpage_title"]', {
+    timeout: 30000,
+  });
+
+  await page.waitForSelector('[id="new-project-btn"]', {
+    timeout: 30000,
+  });
+
+  let modalCount = 0;
+  try {
+    const modalTitleElement = await page?.getByTestId("modal-title");
+    if (modalTitleElement) {
+      modalCount = await modalTitleElement.count();
+    }
+  } catch (error) {
+    modalCount = 0;
+  }
+
+  while (modalCount === 0) {
+    await page.getByText("New Project", { exact: true }).click();
+    await page.waitForTimeout(3000);
+    modalCount = await page.getByTestId("modal-title")?.count();
+  }
+
+  const getUA = await page.evaluate(() => navigator.userAgent);
+  const userAgentInfo = uaParser(getUA);
+  let control = "Control";
+
+  if (userAgentInfo.os.name.includes("Mac")) {
+    control = "Meta";
+  }
+
+  await page.getByTestId("side_nav_options_all-templates").click();
+  await page
+    .getByRole("heading", { name: "Sequential Tasks Agent" })
+    .first()
+    .click();
+
+  await page.waitForSelector('[data-testid="fit_view"]', {
+    timeout: 100000,
+  });
+
+  await page.getByTestId("fit_view").click();
+  await page.getByTestId("zoom_out").click();
+  await page.getByTestId("zoom_out").click();
+  await page.getByTestId("zoom_out").click();
+
+  let outdatedComponents = await page.getByTestId("icon-AlertTriangle").count();
+
+  while (outdatedComponents > 0) {
+    await page.getByTestId("icon-AlertTriangle").first().click();
+    await page.waitForTimeout(1000);
+    outdatedComponents = await page.getByTestId("icon-AlertTriangle").count();
+  }
+
+  let filledApiKey = await page.getByTestId("remove-icon-badge").count();
+  while (filledApiKey > 0) {
+    await page.getByTestId("remove-icon-badge").first().click();
+    await page.waitForTimeout(1000);
+    filledApiKey = await page.getByTestId("remove-icon-badge").count();
+  }
+
+  await page
+    .getByTestId("popover-anchor-input-api_key")
+    .fill(process.env.OPENAI_API_KEY ?? "");
+
+  await page.getByTestId("dropdown_str_model_name").click();
+  await page.getByTestId("gpt-4o-1-option").click();
+
+  await page.waitForTimeout(1000);
+
+  await page.getByTestId("button_run_chat output").click();
+
+  await page.waitForTimeout(1000);
+
+  await page.waitForSelector("text=built successfully", { timeout: 30000 });
+
+  await page.getByText("built successfully").last().click({
+    timeout: 15000,
+  });
+
+  await page.getByText("Playground", { exact: true }).last().click();
+
+  expect(await page.locator(".markdown").count()).toBeGreaterThan(0);
+
+  expect(await page.getByText("Agile").count()).toBeGreaterThan(0);
+});
diff --git a/src/frontend/tests/extended/features/starter-projects.spec.ts b/src/frontend/tests/extended/features/starter-projects.spec.ts
index 0956f2af3db..b1deaa0c01d 100644
--- a/src/frontend/tests/extended/features/starter-projects.spec.ts
+++ b/src/frontend/tests/extended/features/starter-projects.spec.ts
@@ -1,4 +1,4 @@
-import { expect, test } from "@playwright/test";
+import { expect, Page, test } from "@playwright/test";
 
 test("user must be able to interact with starter projects", async ({
   page,
@@ -22,9 +22,7 @@ test("user must be able to interact with starter projects", async ({
   }
 
   expect(page.getByText("Start from scratch")).toBeVisible();
-  expect(
-    page.getByRole("button", { name: "Create Blank Project" }),
-  ).toBeVisible();
+  expect(page.getByRole("button", { name: "Blank Flow" })).toBeVisible();
 
   await page.getByTestId("side_nav_options_all-templates").click();
   await page.waitForTimeout(500);
@@ -70,15 +68,48 @@ test("user must be able to interact with starter projects", async ({
 
   expect(page.getByTestId(`category_title_agents`)).toBeVisible();
 
+  await page.waitForTimeout(500);
+
   expect(
     page.getByTestId(`template_basic-prompting-(hello,-world)`),
   ).not.toBeVisible();
   expect(page.getByTestId(`template_document-qa`)).not.toBeVisible();
   expect(page.getByTestId(`template_vector-store-rag`)).not.toBeVisible();
 
-  expect(page.getByTestId(`template_travel-planning-agents`)).toBeVisible();
-  expect(page.getByTestId(`template_sequential-tasks-agent`)).toBeVisible();
-  expect(page.getByTestId(`template_dynamic-agent`)).toBeVisible();
-  expect(page.getByTestId(`template_hierarchical-tasks-agent`)).toBeVisible();
-  expect(page.getByTestId(`template_simple-agent`)).toBeVisible();
+  await page.waitForTimeout(500);
+
+  await waitForTemplateVisibility(page, templateIds);
 });
+
+async function waitForTemplateVisibility(page: Page, templateIds: string[]) {
+  const timeout = 10000; // Increased timeout for better reliability
+
+  for (const templateId of templateIds) {
+    // Wait for the element to be attached to DOM first
+    await page.waitForSelector(`[data-testid="${templateId}"]`, {
+      state: "attached",
+      timeout,
+    });
+
+    // Wait for the element to be visible
+    await expect(
+      page.getByTestId(templateId).last(),
+      `Template ${templateId} should be visible`,
+    ).toBeVisible({
+      timeout,
+    });
+
+    // Optional: Ensure element is in viewport
+    const element = page.getByTestId(templateId).last();
+    await element.scrollIntoViewIfNeeded();
+  }
+}
+
+// Your test code
+const templateIds = [
+  "template_travel-planning-agents",
+  "template_sequential-tasks-agent",
+  "template_dynamic-agent",
+  "template_hierarchical-tasks-agent",
+  "template_simple-agent",
+];
diff --git a/uv.lock b/uv.lock
index 74254675966..00c0f842242 100644
--- a/uv.lock
+++ b/uv.lock
@@ -3759,7 +3759,7 @@ requires-dist = [
     { name = "langchain-pinecone", specifier = "~=0.2.0" },
     { name = "langchain-unstructured", specifier = ">=0.1.2" },
     { name = "langflow-base", editable = "src/backend/base" },
-    { name = "langfuse", specifier = ">=2.33.0" },
+    { name = "langfuse", specifier = "~=2.53.1" },
     { name = "langsmith", specifier = "~=0.1.136" },
     { name = "langwatch", specifier = "==0.1.16" },
     { name = "lark", specifier = ">=1.2.2" },
@@ -4066,7 +4066,7 @@ dev = [
 
 [[package]]
 name = "langfuse"
-version = "2.52.0"
+version = "2.53.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anyio" },
@@ -4077,9 +4077,9 @@ dependencies = [
     { name = "pydantic" },
     { name = "wrapt" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/9c/46/6b06df6bfc2a19465e27fa75a02ba2489b0e07367ba11fb23dddeee74a3b/langfuse-2.52.0.tar.gz", hash = "sha256:3ceb8803cb5991dd1127167a2b1288c7c6edc43429547ded1d6dc9e064e6e5cd", size = 122264 }
+sdist = { url = "https://files.pythonhosted.org/packages/89/43/ff488a56303106e45d170e0a5b2bee8babc9184296436ae08bef940da6df/langfuse-2.53.3.tar.gz", hash = "sha256:702ee42669f8283c0b4400fdf039f13b896e18c8b94ad20c079148c2894cbc64", size = 123601 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/04/47/4e87fa27a30b9da00df26b960cc194d19fb842312cc3723f40c3e144cf9e/langfuse-2.52.0-py3-none-any.whl", hash = "sha256:f2497966bd31adedbb2d643fde3b15cf0387cfbcdac8ebc2db2b6df9413b888a", size = 220663 },
+    { url = "https://files.pythonhosted.org/packages/a4/33/cb208078f2721f92af8f90ce387ac739ebf6942c37c2f1f61bf7106e44b7/langfuse-2.53.3-py3-none-any.whl", hash = "sha256:9fce8c70e77d03aa64fca474e254135ba379189bbafa2fdb23b255bda16c5b04", size = 221750 },
 ]
 
 [[package]]

From 4b91266fd1be8a0795481c1649a772f18263ff69 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 15:22:18 +0000
Subject: [PATCH 15/21] [autofix.ci] apply automated fixes

---
 src/backend/base/langflow/worker.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/base/langflow/worker.py b/src/backend/base/langflow/worker.py
index 9d285741794..e57c99103a7 100644
--- a/src/backend/base/langflow/worker.py
+++ b/src/backend/base/langflow/worker.py
@@ -29,10 +29,10 @@ def build_vertex(self, vertex: Vertex) -> Vertex:
 
 @celery_app.task(acks_late=True)
 def process_graph_cached_task(
-    data_graph: dict[str, Any],  # noqa: ARG001
-    inputs: dict | list[dict] | None = None,  # noqa: ARG001
-    clear_cache=False,  # noqa: ARG001, FBT002
-    session_id=None,  # noqa: ARG001
+    data_graph: dict[str, Any],
+    inputs: dict | list[dict] | None = None,
+    clear_cache=False,  # noqa: FBT002
+    session_id=None,
 ) -> dict[str, Any]:
     msg = "This task is not implemented yet"
     raise NotImplementedError(msg)

From 406868163a4e0aa7dceeed80a97055e62ac0dec4 Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Fri, 1 Nov 2024 14:57:36 -0400
Subject: [PATCH 16/21] Update worker.py

adding  # noqa: to solve CI Error
---
 src/backend/base/langflow/worker.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/base/langflow/worker.py b/src/backend/base/langflow/worker.py
index e57c99103a7..9d285741794 100644
--- a/src/backend/base/langflow/worker.py
+++ b/src/backend/base/langflow/worker.py
@@ -29,10 +29,10 @@ def build_vertex(self, vertex: Vertex) -> Vertex:
 
 @celery_app.task(acks_late=True)
 def process_graph_cached_task(
-    data_graph: dict[str, Any],
-    inputs: dict | list[dict] | None = None,
-    clear_cache=False,  # noqa: FBT002
-    session_id=None,
+    data_graph: dict[str, Any],  # noqa: ARG001
+    inputs: dict | list[dict] | None = None,  # noqa: ARG001
+    clear_cache=False,  # noqa: ARG001, FBT002
+    session_id=None,  # noqa: ARG001
 ) -> dict[str, Any]:
     msg = "This task is not implemented yet"
     raise NotImplementedError(msg)

From fa4b473ec3bc9c26c62d9fa6b306c650d06af952 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 18:58:08 +0000
Subject: [PATCH 17/21] [autofix.ci] apply automated fixes

---
 src/backend/base/langflow/worker.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/backend/base/langflow/worker.py b/src/backend/base/langflow/worker.py
index 9d285741794..e57c99103a7 100644
--- a/src/backend/base/langflow/worker.py
+++ b/src/backend/base/langflow/worker.py
@@ -29,10 +29,10 @@ def build_vertex(self, vertex: Vertex) -> Vertex:
 
 @celery_app.task(acks_late=True)
 def process_graph_cached_task(
-    data_graph: dict[str, Any],  # noqa: ARG001
-    inputs: dict | list[dict] | None = None,  # noqa: ARG001
-    clear_cache=False,  # noqa: ARG001, FBT002
-    session_id=None,  # noqa: ARG001
+    data_graph: dict[str, Any],
+    inputs: dict | list[dict] | None = None,
+    clear_cache=False,  # noqa: FBT002
+    session_id=None,
 ) -> dict[str, Any]:
     msg = "This task is not implemented yet"
     raise NotImplementedError(msg)

From 574c813e785a820f521c9c612ec9acd5b4faacfb Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Fri, 1 Nov 2024 15:04:25 -0400
Subject: [PATCH 18/21] Update worker.py

removed unused params that were causing the issue
---
 src/backend/base/langflow/worker.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/backend/base/langflow/worker.py b/src/backend/base/langflow/worker.py
index e57c99103a7..e79f7146ba9 100644
--- a/src/backend/base/langflow/worker.py
+++ b/src/backend/base/langflow/worker.py
@@ -28,11 +28,6 @@ def build_vertex(self, vertex: Vertex) -> Vertex:
 
 
 @celery_app.task(acks_late=True)
-def process_graph_cached_task(
-    data_graph: dict[str, Any],
-    inputs: dict | list[dict] | None = None,
-    clear_cache=False,  # noqa: FBT002
-    session_id=None,
-) -> dict[str, Any]:
+def process_graph_cached_task() -> dict[str, Any]:
     msg = "This task is not implemented yet"
     raise NotImplementedError(msg)

From 8518cbc77bf16e85642e7ed474f3115f946aa537 Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Sat, 2 Nov 2024 03:18:02 -0400
Subject: [PATCH 19/21] update in file names

changed simple agent to agent
---
 .../components/agents/{simple_agent.py => agent.py}       | 2 +-
 .../{test_simple_agent.py => test_agent_component.py}     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename src/backend/base/langflow/components/agents/{simple_agent.py => agent.py} (99%)
 rename src/backend/tests/unit/components/agents/{test_simple_agent.py => test_agent_component.py} (74%)

diff --git a/src/backend/base/langflow/components/agents/simple_agent.py b/src/backend/base/langflow/components/agents/agent.py
similarity index 99%
rename from src/backend/base/langflow/components/agents/simple_agent.py
rename to src/backend/base/langflow/components/agents/agent.py
index d4f6258ac9f..bd4aaf2ba58 100644
--- a/src/backend/base/langflow/components/agents/simple_agent.py
+++ b/src/backend/base/langflow/components/agents/agent.py
@@ -18,7 +18,7 @@ def set_advanced_true(component_input):
     return component_input
 
 
-class SimpleAgentComponent(ToolCallingAgentComponent):
+class AgentComponent(ToolCallingAgentComponent):
     display_name: str = "Agent"
     description: str = "Define the agent's instructions, then enter a task to complete using tools."
     icon = "bot"
diff --git a/src/backend/tests/unit/components/agents/test_simple_agent.py b/src/backend/tests/unit/components/agents/test_agent_component.py
similarity index 74%
rename from src/backend/tests/unit/components/agents/test_simple_agent.py
rename to src/backend/tests/unit/components/agents/test_agent_component.py
index fca5dfbde55..2d999cdbd6a 100644
--- a/src/backend/tests/unit/components/agents/test_simple_agent.py
+++ b/src/backend/tests/unit/components/agents/test_agent_component.py
@@ -1,13 +1,13 @@
 import os
 
 import pytest
-from langflow.components.agents.simple_agent import SimpleAgentComponent
+from langflow.components.agents.agent import AgentComponent
 from langflow.components.tools.calculator import CalculatorToolComponent
 
 
 @pytest.mark.api_key_required
 @pytest.mark.asyncio
-async def test_simple_agent_with_calculator():
+async def test_agent_component_with_calculator():
     # Mock inputs
     tools = [CalculatorToolComponent().build_tool()]  # Use the Calculator component as a tool
     input_value = "What is 2 + 2?"
@@ -15,8 +15,8 @@ async def test_simple_agent_with_calculator():
     api_key = os.environ["OPENAI_API_KEY"]
     temperature = 0.1
 
-    # Initialize the SimpleAgentComponent with mocked inputs
-    agent = SimpleAgentComponent(
+    # Initialize the AgentComponent with mocked inputs
+    agent = AgentComponent(
         tools=tools,
         input_value=input_value,
         api_key=api_key,

From 231d8fdf94d38c69a96fa98e2182da0c58bdf43d Mon Sep 17 00:00:00 2001
From: Edwin Jose <edwin.jose@datastax.com>
Date: Sat, 2 Nov 2024 03:44:57 -0400
Subject: [PATCH 20/21] Update Agent Flow.json

update Agent Flow.json
---
 .../starter_projects/Agent Flow.json          | 1221 ++++++++---------
 1 file changed, 568 insertions(+), 653 deletions(-)

diff --git a/src/backend/base/langflow/initial_setup/starter_projects/Agent Flow.json b/src/backend/base/langflow/initial_setup/starter_projects/Agent Flow.json
index 82153f047d6..a30d3bdd2e5 100644
--- a/src/backend/base/langflow/initial_setup/starter_projects/Agent Flow.json	
+++ b/src/backend/base/langflow/initial_setup/starter_projects/Agent Flow.json	
@@ -2,63 +2,41 @@
   "data": {
     "edges": [
       {
+        "animated": false,
         "className": "",
         "data": {
           "sourceHandle": {
-            "dataType": "ToolCallingAgent",
-            "id": "ToolCallingAgent-mf0BN",
-            "name": "response",
-            "output_types": [
-              "Message"
-            ]
-          },
-          "targetHandle": {
-            "fieldName": "input_value",
-            "id": "ChatOutput-Ag9YG",
-            "inputTypes": [
-              "Message"
-            ],
-            "type": "str"
-          }
-        },
-        "id": "reactflow__edge-ToolCallingAgent-mf0BN{œdataTypeœ:œToolCallingAgentœ,œidœ:œToolCallingAgent-mf0BNœ,œnameœ:œresponseœ,œoutput_typesœ:[œMessageœ]}-ChatOutput-Ag9YG{œfieldNameœ:œinput_valueœ,œidœ:œChatOutput-Ag9YGœ,œinputTypesœ:[œMessageœ],œtypeœ:œstrœ}",
-        "source": "ToolCallingAgent-mf0BN",
-        "sourceHandle": "{œdataTypeœ: œToolCallingAgentœ, œidœ: œToolCallingAgent-mf0BNœ, œnameœ: œresponseœ, œoutput_typesœ: [œMessageœ]}",
-        "target": "ChatOutput-Ag9YG",
-        "targetHandle": "{œfieldNameœ: œinput_valueœ, œidœ: œChatOutput-Ag9YGœ, œinputTypesœ: [œMessageœ], œtypeœ: œstrœ}"
-      },
-      {
-        "className": "",
-        "data": {
-          "sourceHandle": {
-            "dataType": "OpenAIModel",
-            "id": "OpenAIModel-1ioeW",
-            "name": "model_output",
+            "dataType": "PythonREPLTool",
+            "id": "PythonREPLTool-QaSW0",
+            "name": "api_build_tool",
             "output_types": [
-              "LanguageModel"
+              "Tool"
             ]
           },
           "targetHandle": {
-            "fieldName": "llm",
-            "id": "ToolCallingAgent-mf0BN",
+            "fieldName": "tools",
+            "id": "Agent-7mKwO",
             "inputTypes": [
-              "LanguageModel"
+              "Tool",
+              "BaseTool",
+              "StructuredTool"
             ],
             "type": "other"
           }
         },
-        "id": "reactflow__edge-OpenAIModel-1ioeW{œdataTypeœ:œOpenAIModelœ,œidœ:œOpenAIModel-1ioeWœ,œnameœ:œmodel_outputœ,œoutput_typesœ:[œLanguageModelœ]}-ToolCallingAgent-mf0BN{œfieldNameœ:œllmœ,œidœ:œToolCallingAgent-mf0BNœ,œinputTypesœ:[œLanguageModelœ],œtypeœ:œotherœ}",
-        "source": "OpenAIModel-1ioeW",
-        "sourceHandle": "{œdataTypeœ: œOpenAIModelœ, œidœ: œOpenAIModel-1ioeWœ, œnameœ: œmodel_outputœ, œoutput_typesœ: [œLanguageModelœ]}",
-        "target": "ToolCallingAgent-mf0BN",
-        "targetHandle": "{œfieldNameœ: œllmœ, œidœ: œToolCallingAgent-mf0BNœ, œinputTypesœ: [œLanguageModelœ], œtypeœ: œotherœ}"
+        "id": "reactflow__edge-PythonREPLTool-QaSW0{œdataTypeœ:œPythonREPLToolœ,œidœ:œPythonREPLTool-QaSW0œ,œnameœ:œapi_build_toolœ,œoutput_typesœ:[œToolœ]}-Agent-7mKwO{œfieldNameœ:œtoolsœ,œidœ:œAgent-7mKwOœ,œinputTypesœ:[œToolœ,œBaseToolœ,œStructuredToolœ],œtypeœ:œotherœ}",
+        "source": "PythonREPLTool-QaSW0",
+        "sourceHandle": "{œdataTypeœ: œPythonREPLToolœ, œidœ: œPythonREPLTool-QaSW0œ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
+        "target": "Agent-7mKwO",
+        "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-7mKwOœ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}"
       },
       {
+        "animated": false,
         "className": "",
         "data": {
           "sourceHandle": {
             "dataType": "CalculatorTool",
-            "id": "CalculatorTool-Nb4P5",
+            "id": "CalculatorTool-2c9q3",
             "name": "api_build_tool",
             "output_types": [
               "Tool"
@@ -66,26 +44,28 @@
           },
           "targetHandle": {
             "fieldName": "tools",
-            "id": "ToolCallingAgent-mf0BN",
+            "id": "Agent-7mKwO",
             "inputTypes": [
               "Tool",
-              "BaseTool"
+              "BaseTool",
+              "StructuredTool"
             ],
             "type": "other"
           }
         },
-        "id": "reactflow__edge-CalculatorTool-Nb4P5{œdataTypeœ:œCalculatorToolœ,œidœ:œCalculatorTool-Nb4P5œ,œnameœ:œapi_build_toolœ,œoutput_typesœ:[œToolœ]}-ToolCallingAgent-mf0BN{œfieldNameœ:œtoolsœ,œidœ:œToolCallingAgent-mf0BNœ,œinputTypesœ:[œToolœ,œBaseToolœ],œtypeœ:œotherœ}",
-        "source": "CalculatorTool-Nb4P5",
-        "sourceHandle": "{œdataTypeœ: œCalculatorToolœ, œidœ: œCalculatorTool-Nb4P5œ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
-        "target": "ToolCallingAgent-mf0BN",
-        "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œToolCallingAgent-mf0BNœ, œinputTypesœ: [œToolœ, œBaseToolœ], œtypeœ: œotherœ}"
+        "id": "reactflow__edge-CalculatorTool-2c9q3{œdataTypeœ:œCalculatorToolœ,œidœ:œCalculatorTool-2c9q3œ,œnameœ:œapi_build_toolœ,œoutput_typesœ:[œToolœ]}-Agent-7mKwO{œfieldNameœ:œtoolsœ,œidœ:œAgent-7mKwOœ,œinputTypesœ:[œToolœ,œBaseToolœ,œStructuredToolœ],œtypeœ:œotherœ}",
+        "source": "CalculatorTool-2c9q3",
+        "sourceHandle": "{œdataTypeœ: œCalculatorToolœ, œidœ: œCalculatorTool-2c9q3œ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
+        "target": "Agent-7mKwO",
+        "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œAgent-7mKwOœ, œinputTypesœ: [œToolœ, œBaseToolœ, œStructuredToolœ], œtypeœ: œotherœ}"
       },
       {
+        "animated": false,
         "className": "",
         "data": {
           "sourceHandle": {
             "dataType": "ChatInput",
-            "id": "ChatInput-X3ARP",
+            "id": "ChatInput-GA9eO",
             "name": "message",
             "output_types": [
               "Message"
@@ -93,50 +73,51 @@
           },
           "targetHandle": {
             "fieldName": "input_value",
-            "id": "ToolCallingAgent-mf0BN",
+            "id": "Agent-7mKwO",
             "inputTypes": [
               "Message"
             ],
             "type": "str"
           }
         },
-        "id": "reactflow__edge-ChatInput-X3ARP{œdataTypeœ:œChatInputœ,œidœ:œChatInput-X3ARPœ,œnameœ:œmessageœ,œoutput_typesœ:[œMessageœ]}-ToolCallingAgent-mf0BN{œfieldNameœ:œinput_valueœ,œidœ:œToolCallingAgent-mf0BNœ,œinputTypesœ:[œMessageœ],œtypeœ:œstrœ}",
-        "source": "ChatInput-X3ARP",
-        "sourceHandle": "{œdataTypeœ: œChatInputœ, œidœ: œChatInput-X3ARPœ, œnameœ: œmessageœ, œoutput_typesœ: [œMessageœ]}",
-        "target": "ToolCallingAgent-mf0BN",
-        "targetHandle": "{œfieldNameœ: œinput_valueœ, œidœ: œToolCallingAgent-mf0BNœ, œinputTypesœ: [œMessageœ], œtypeœ: œstrœ}"
+        "id": "reactflow__edge-ChatInput-GA9eO{œdataTypeœ:œChatInputœ,œidœ:œChatInput-GA9eOœ,œnameœ:œmessageœ,œoutput_typesœ:[œMessageœ]}-Agent-7mKwO{œfieldNameœ:œinput_valueœ,œidœ:œAgent-7mKwOœ,œinputTypesœ:[œMessageœ],œtypeœ:œstrœ}",
+        "source": "ChatInput-GA9eO",
+        "sourceHandle": "{œdataTypeœ: œChatInputœ, œidœ: œChatInput-GA9eOœ, œnameœ: œmessageœ, œoutput_typesœ: [œMessageœ]}",
+        "target": "Agent-7mKwO",
+        "targetHandle": "{œfieldNameœ: œinput_valueœ, œidœ: œAgent-7mKwOœ, œinputTypesœ: [œMessageœ], œtypeœ: œstrœ}"
       },
       {
+        "animated": false,
+        "className": "",
         "data": {
           "sourceHandle": {
-            "dataType": "PythonREPLTool",
-            "id": "PythonREPLTool-i922a",
-            "name": "api_build_tool",
+            "dataType": "Agent",
+            "id": "Agent-7mKwO",
+            "name": "response",
             "output_types": [
-              "Tool"
+              "Message"
             ]
           },
           "targetHandle": {
-            "fieldName": "tools",
-            "id": "ToolCallingAgent-mf0BN",
+            "fieldName": "input_value",
+            "id": "ChatOutput-iwrl6",
             "inputTypes": [
-              "Tool",
-              "BaseTool"
+              "Message"
             ],
-            "type": "other"
+            "type": "str"
           }
         },
-        "id": "reactflow__edge-PythonREPLTool-i922a{œdataTypeœ:œPythonREPLToolœ,œidœ:œPythonREPLTool-i922aœ,œnameœ:œapi_build_toolœ,œoutput_typesœ:[œToolœ]}-ToolCallingAgent-mf0BN{œfieldNameœ:œtoolsœ,œidœ:œToolCallingAgent-mf0BNœ,œinputTypesœ:[œToolœ,œBaseToolœ],œtypeœ:œotherœ}",
-        "source": "PythonREPLTool-i922a",
-        "sourceHandle": "{œdataTypeœ: œPythonREPLToolœ, œidœ: œPythonREPLTool-i922aœ, œnameœ: œapi_build_toolœ, œoutput_typesœ: [œToolœ]}",
-        "target": "ToolCallingAgent-mf0BN",
-        "targetHandle": "{œfieldNameœ: œtoolsœ, œidœ: œToolCallingAgent-mf0BNœ, œinputTypesœ: [œToolœ, œBaseToolœ], œtypeœ: œotherœ}"
+        "id": "reactflow__edge-Agent-7mKwO{œdataTypeœ:œAgentœ,œidœ:œAgent-7mKwOœ,œnameœ:œresponseœ,œoutput_typesœ:[œMessageœ]}-ChatOutput-iwrl6{œfieldNameœ:œinput_valueœ,œidœ:œChatOutput-iwrl6œ,œinputTypesœ:[œMessageœ],œtypeœ:œstrœ}",
+        "source": "Agent-7mKwO",
+        "sourceHandle": "{œdataTypeœ: œAgentœ, œidœ: œAgent-7mKwOœ, œnameœ: œresponseœ, œoutput_typesœ: [œMessageœ]}",
+        "target": "ChatOutput-iwrl6",
+        "targetHandle": "{œfieldNameœ: œinput_valueœ, œidœ: œChatOutput-iwrl6œ, œinputTypesœ: [œMessageœ], œtypeœ: œstrœ}"
       }
     ],
     "nodes": [
       {
         "data": {
-          "id": "ChatInput-X3ARP",
+          "id": "ChatInput-GA9eO",
           "node": {
             "base_classes": [
               "Message"
@@ -159,7 +140,7 @@
             "frozen": false,
             "icon": "MessagesSquare",
             "legacy": false,
-            "lf_version": "1.0.16",
+            "lf_version": "1.0.19",
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -343,23 +324,23 @@
           "type": "ChatInput"
         },
         "dragging": false,
-        "height": 302,
-        "id": "ChatInput-X3ARP",
+        "height": 234,
+        "id": "ChatInput-GA9eO",
         "position": {
-          "x": 1760.192972923414,
-          "y": -191.51901724049213
+          "x": 62.413733671682394,
+          "y": 1065.4595268030878
         },
         "positionAbsolute": {
-          "x": 1760.192972923414,
-          "y": -191.51901724049213
+          "x": 62.413733671682394,
+          "y": 1065.4595268030878
         },
         "selected": false,
         "type": "genericNode",
-        "width": 384
+        "width": 320
       },
       {
         "data": {
-          "id": "ChatOutput-Ag9YG",
+          "id": "ChatOutput-iwrl6",
           "node": {
             "base_classes": [
               "Message"
@@ -382,7 +363,7 @@
             "frozen": false,
             "icon": "MessagesSquare",
             "legacy": false,
-            "lf_version": "1.0.16",
+            "lf_version": "1.0.19",
             "metadata": {},
             "output_types": [],
             "outputs": [
@@ -544,93 +525,73 @@
           "type": "ChatOutput"
         },
         "dragging": false,
-        "height": 302,
-        "id": "ChatOutput-Ag9YG",
+        "height": 234,
+        "id": "ChatOutput-iwrl6",
         "position": {
-          "x": 3968.8870036313238,
-          "y": 627.770746142633
+          "x": 1503.4431369392628,
+          "y": 552.5679265365819
         },
         "positionAbsolute": {
-          "x": 3968.8870036313238,
-          "y": 627.770746142633
+          "x": 1503.4431369392628,
+          "y": 552.5679265365819
         },
-        "selected": false,
+        "selected": true,
         "type": "genericNode",
-        "width": 384
+        "width": 320
       },
       {
         "data": {
-          "description": "Generates text using OpenAI LLMs.",
-          "display_name": "OpenAI",
-          "id": "OpenAIModel-1ioeW",
+          "id": "CalculatorTool-2c9q3",
           "node": {
             "base_classes": [
-              "LanguageModel",
-              "Message"
+              "Data",
+              "list",
+              "Sequence",
+              "Tool"
             ],
             "beta": false,
             "conditional_paths": [],
             "custom_fields": {},
-            "description": "Generates text using OpenAI LLMs.",
-            "display_name": "OpenAI",
+            "description": "Perform basic arithmetic operations on a given expression.",
+            "display_name": "Calculator",
             "documentation": "",
             "edited": false,
             "field_order": [
-              "input_value",
-              "system_message",
-              "stream",
-              "max_tokens",
-              "model_kwargs",
-              "json_mode",
-              "output_schema",
-              "model_name",
-              "openai_api_base",
-              "api_key",
-              "temperature",
-              "seed"
+              "expression"
             ],
             "frozen": false,
-            "icon": "OpenAI",
+            "icon": "calculator",
             "legacy": false,
-            "lf_version": "1.0.16",
+            "lf_version": "1.0.19",
             "metadata": {},
+            "official": false,
             "output_types": [],
             "outputs": [
               {
                 "cache": true,
-                "display_name": "Text",
-                "method": "text_response",
-                "name": "text_output",
+                "display_name": "Data",
+                "method": "run_model",
+                "name": "api_run_model",
                 "required_inputs": [
-                  "input_value",
-                  "stream",
-                  "system_message"
+                  "expression"
                 ],
-                "selected": "Message",
+                "selected": "Data",
                 "types": [
-                  "Message"
+                  "Data"
                 ],
                 "value": "__UNDEFINED__"
               },
               {
                 "cache": true,
-                "display_name": "Language Model",
-                "method": "build_model",
-                "name": "model_output",
+                "display_name": "Tool",
+                "method": "build_tool",
+                "name": "api_build_tool",
                 "required_inputs": [
-                  "api_key",
-                  "json_mode",
-                  "max_tokens",
-                  "model_kwargs",
-                  "model_name",
-                  "openai_api_base",
-                  "output_schema",
-                  "seed",
-                  "temperature"
+                  "expression"
                 ],
-                "selected": "LanguageModel",
+                "selected": "Tool",
                 "types": [
-                  "LanguageModel"
+                  "Tool"
                 ],
                 "value": "__UNDEFINED__"
               }
@@ -638,25 +599,6 @@
             "pinned": false,
             "template": {
               "_type": "Component",
-              "api_key": {
-                "_input_type": "SecretStrInput",
-                "advanced": false,
-                "display_name": "OpenAI API Key",
-                "dynamic": false,
-                "info": "The OpenAI API Key to use for the OpenAI model.",
-                "input_types": [
-                  "Message"
-                ],
-                "load_from_db": true,
-                "name": "api_key",
-                "password": true,
-                "placeholder": "",
-                "required": false,
-                "show": true,
-                "title_case": false,
-                "type": "str",
-                "value": "OPENAI_API_KEY"
-              },
               "code": {
                 "advanced": true,
                 "dynamic": true,
@@ -673,20 +615,20 @@
                 "show": true,
                 "title_case": false,
                 "type": "code",
-                "value": "import operator\nfrom functools import reduce\n\nfrom langchain_openai import ChatOpenAI\nfrom pydantic.v1 import SecretStr\n\nfrom langflow.base.models.model import LCModelComponent\nfrom langflow.base.models.openai_constants import OPENAI_MODEL_NAMES\nfrom langflow.field_typing import LanguageModel\nfrom langflow.field_typing.range_spec import RangeSpec\nfrom langflow.inputs import BoolInput, DictInput, DropdownInput, FloatInput, IntInput, SecretStrInput, StrInput\nfrom langflow.inputs.inputs import HandleInput\n\n\nclass OpenAIModelComponent(LCModelComponent):\n    display_name = \"OpenAI\"\n    description = \"Generates text using OpenAI LLMs.\"\n    icon = \"OpenAI\"\n    name = \"OpenAIModel\"\n\n    inputs = [\n        *LCModelComponent._base_inputs,\n        IntInput(\n            name=\"max_tokens\",\n            display_name=\"Max Tokens\",\n            advanced=True,\n            info=\"The maximum number of tokens to generate. Set to 0 for unlimited tokens.\",\n            range_spec=RangeSpec(min=0, max=128000),\n        ),\n        DictInput(name=\"model_kwargs\", display_name=\"Model Kwargs\", advanced=True),\n        BoolInput(\n            name=\"json_mode\",\n            display_name=\"JSON Mode\",\n            advanced=True,\n            info=\"If True, it will output JSON regardless of passing a schema.\",\n        ),\n        DictInput(\n            name=\"output_schema\",\n            is_list=True,\n            display_name=\"Schema\",\n            advanced=True,\n            info=\"The schema for the Output of the model. \"\n            \"You must pass the word JSON in the prompt. \"\n            \"If left blank, JSON mode will be disabled. [DEPRECATED]\",\n        ),\n        DropdownInput(\n            name=\"model_name\",\n            display_name=\"Model Name\",\n            advanced=False,\n            options=OPENAI_MODEL_NAMES,\n            value=OPENAI_MODEL_NAMES[0],\n        ),\n        StrInput(\n            name=\"openai_api_base\",\n            display_name=\"OpenAI API Base\",\n            advanced=True,\n            info=\"The base URL of the OpenAI API. \"\n            \"Defaults to https://api.openai.com/v1. \"\n            \"You can change this to use other APIs like JinaChat, LocalAI and Prem.\",\n        ),\n        SecretStrInput(\n            name=\"api_key\",\n            display_name=\"OpenAI API Key\",\n            info=\"The OpenAI API Key to use for the OpenAI model.\",\n            advanced=False,\n            value=\"OPENAI_API_KEY\",\n        ),\n        FloatInput(name=\"temperature\", display_name=\"Temperature\", value=0.1),\n        IntInput(\n            name=\"seed\",\n            display_name=\"Seed\",\n            info=\"The seed controls the reproducibility of the job.\",\n            advanced=True,\n            value=1,\n        ),\n        HandleInput(\n            name=\"output_parser\",\n            display_name=\"Output Parser\",\n            info=\"The parser to use to parse the output of the model\",\n            advanced=True,\n            input_types=[\"OutputParser\"],\n        ),\n    ]\n\n    def build_model(self) -> LanguageModel:  # type: ignore[type-var]\n        # self.output_schema is a list of dictionaries\n        # let's convert it to a dictionary\n        output_schema_dict: dict[str, str] = reduce(operator.ior, self.output_schema or {}, {})\n        openai_api_key = self.api_key\n        temperature = self.temperature\n        model_name: str = self.model_name\n        max_tokens = self.max_tokens\n        model_kwargs = self.model_kwargs or {}\n        openai_api_base = self.openai_api_base or \"https://api.openai.com/v1\"\n        json_mode = bool(output_schema_dict) or self.json_mode\n        seed = self.seed\n\n        api_key = SecretStr(openai_api_key).get_secret_value() if openai_api_key else None\n        output = ChatOpenAI(\n            max_tokens=max_tokens or None,\n            model_kwargs=model_kwargs,\n            model=model_name,\n            base_url=openai_api_base,\n            api_key=api_key,\n            temperature=temperature if temperature is not None else 0.1,\n            seed=seed,\n        )\n        if json_mode:\n            if output_schema_dict:\n                output = output.with_structured_output(schema=output_schema_dict, method=\"json_mode\")\n            else:\n                output = output.bind(response_format={\"type\": \"json_object\"})\n\n        return output\n\n    def _get_exception_message(self, e: Exception):\n        \"\"\"Get a message from an OpenAI exception.\n\n        Args:\n            e (Exception): The exception to get the message from.\n\n        Returns:\n            str: The message from the exception.\n        \"\"\"\n        try:\n            from openai import BadRequestError\n        except ImportError:\n            return None\n        if isinstance(e, BadRequestError):\n            message = e.body.get(\"message\")\n            if message:\n                return message\n        return None\n"
+                "value": "import ast\nimport operator\n\nfrom langchain.tools import StructuredTool\nfrom loguru import logger\nfrom pydantic import BaseModel, Field\n\nfrom langflow.base.langchain_utilities.model import LCToolComponent\nfrom langflow.field_typing import Tool\nfrom langflow.inputs import MessageTextInput\nfrom langflow.schema import Data\n\n\nclass CalculatorToolComponent(LCToolComponent):\n    display_name = \"Calculator\"\n    description = \"Perform basic arithmetic operations on a given expression.\"\n    icon = \"calculator\"\n    name = \"CalculatorTool\"\n\n    inputs = [\n        MessageTextInput(\n            name=\"expression\",\n            display_name=\"Expression\",\n            info=\"The arithmetic expression to evaluate (e.g., '4*4*(33/22)+12-20').\",\n        ),\n    ]\n\n    class CalculatorToolSchema(BaseModel):\n        expression: str = Field(..., description=\"The arithmetic expression to evaluate.\")\n\n    def run_model(self) -> list[Data]:\n        return self._evaluate_expression(self.expression)\n\n    def build_tool(self) -> Tool:\n        return StructuredTool.from_function(\n            name=\"calculator\",\n            description=\"Evaluate basic arithmetic expressions. Input should be a string containing the expression.\",\n            func=self._evaluate_expression,\n            args_schema=self.CalculatorToolSchema,\n        )\n\n    def _eval_expr(self, node):\n        # Define the allowed operators\n        operators = {\n            ast.Add: operator.add,\n            ast.Sub: operator.sub,\n            ast.Mult: operator.mul,\n            ast.Div: operator.truediv,\n            ast.Pow: operator.pow,\n        }\n        if isinstance(node, ast.Num):\n            return node.n\n        if isinstance(node, ast.BinOp):\n            return operators[type(node.op)](self._eval_expr(node.left), self._eval_expr(node.right))\n        if isinstance(node, ast.UnaryOp):\n            return operators[type(node.op)](self._eval_expr(node.operand))\n        raise TypeError(node)\n\n    def _evaluate_expression(self, expression: str) -> list[Data]:\n        try:\n            # Parse the expression and evaluate it\n            tree = ast.parse(expression, mode=\"eval\")\n            result = self._eval_expr(tree.body)\n\n            # Format the result to a reasonable number of decimal places\n            formatted_result = f\"{result:.6f}\".rstrip(\"0\").rstrip(\".\")\n\n            self.status = formatted_result\n            return [Data(data={\"result\": formatted_result})]\n\n        except (SyntaxError, TypeError, KeyError) as e:\n            error_message = f\"Invalid expression: {e}\"\n            self.status = error_message\n            return [Data(data={\"error\": error_message})]\n        except ZeroDivisionError:\n            error_message = \"Error: Division by zero\"\n            self.status = error_message\n            return [Data(data={\"error\": error_message})]\n        except Exception as e:  # noqa: BLE001\n            logger.opt(exception=True).debug(\"Error evaluating expression\")\n            error_message = f\"Error: {e}\"\n            self.status = error_message\n            return [Data(data={\"error\": error_message})]\n"
               },
-              "input_value": {
-                "_input_type": "MessageInput",
+              "expression": {
+                "_input_type": "MessageTextInput",
                 "advanced": false,
-                "display_name": "Input",
+                "display_name": "Expression",
                 "dynamic": false,
-                "info": "",
+                "info": "The arithmetic expression to evaluate (e.g., '4*4*(33/22)+12-20').",
                 "input_types": [
                   "Message"
                 ],
                 "list": false,
                 "load_from_db": false,
-                "name": "input_value",
+                "name": "expression",
                 "placeholder": "",
                 "required": false,
                 "show": true,
@@ -694,275 +636,235 @@
                 "trace_as_input": true,
                 "trace_as_metadata": true,
                 "type": "str",
-                "value": ""
+                "value": "2+2"
+              }
+            }
+          },
+          "type": "CalculatorTool"
+        },
+        "dragging": false,
+        "height": 302,
+        "id": "CalculatorTool-2c9q3",
+        "position": {
+          "x": 57.99937502347552,
+          "y": 149.36767868834886
+        },
+        "positionAbsolute": {
+          "x": 57.99937502347552,
+          "y": 149.36767868834886
+        },
+        "selected": false,
+        "type": "genericNode",
+        "width": 320
+      },
+      {
+        "data": {
+          "description": "A tool for running Python code in a REPL environment.",
+          "display_name": "Python REPL Tool",
+          "id": "PythonREPLTool-QaSW0",
+          "node": {
+            "base_classes": [
+              "Data",
+              "Tool"
+            ],
+            "beta": false,
+            "conditional_paths": [],
+            "custom_fields": {},
+            "description": "A tool for running Python code in a REPL environment.",
+            "display_name": "Python REPL Tool",
+            "documentation": "",
+            "edited": false,
+            "field_order": [
+              "name",
+              "description",
+              "global_imports",
+              "code"
+            ],
+            "frozen": false,
+            "legacy": false,
+            "lf_version": "1.0.19",
+            "metadata": {},
+            "output_types": [],
+            "outputs": [
+              {
+                "cache": true,
+                "display_name": "Data",
+                "method": "run_model",
+                "name": "api_run_model",
+                "required_inputs": [
+                  "code",
+                  "description",
+                  "global_imports",
+                  "name"
+                ],
+                "selected": "Data",
+                "types": [
+                  "Data"
+                ],
+                "value": "__UNDEFINED__"
               },
-              "json_mode": {
-                "_input_type": "BoolInput",
+              {
+                "cache": true,
+                "display_name": "Tool",
+                "method": "build_tool",
+                "name": "api_build_tool",
+                "required_inputs": [
+                  "code",
+                  "description",
+                  "global_imports",
+                  "name"
+                ],
+                "selected": "Tool",
+                "types": [
+                  "Tool"
+                ],
+                "value": "__UNDEFINED__"
+              }
+            ],
+            "pinned": false,
+            "template": {
+              "_type": "Component",
+              "code": {
                 "advanced": true,
-                "display_name": "JSON Mode",
-                "dynamic": false,
-                "info": "If True, it will output JSON regardless of passing a schema.",
+                "dynamic": true,
+                "fileTypes": [],
+                "file_path": "",
+                "info": "",
                 "list": false,
-                "name": "json_mode",
+                "load_from_db": false,
+                "multiline": true,
+                "name": "code",
+                "password": false,
                 "placeholder": "",
-                "required": false,
+                "required": true,
                 "show": true,
                 "title_case": false,
-                "trace_as_metadata": true,
-                "type": "bool",
-                "value": false
+                "type": "code",
+                "value": "import importlib\n\nfrom langchain.tools import StructuredTool\nfrom langchain_experimental.utilities import PythonREPL\nfrom loguru import logger\nfrom pydantic import BaseModel, Field\n\nfrom langflow.base.langchain_utilities.model import LCToolComponent\nfrom langflow.field_typing import Tool\nfrom langflow.inputs import StrInput\nfrom langflow.schema import Data\n\n\nclass PythonREPLToolComponent(LCToolComponent):\n    display_name = \"Python REPL Tool\"\n    description = \"A tool for running Python code in a REPL environment.\"\n    name = \"PythonREPLTool\"\n\n    inputs = [\n        StrInput(\n            name=\"name\",\n            display_name=\"Tool Name\",\n            info=\"The name of the tool.\",\n            value=\"python_repl\",\n        ),\n        StrInput(\n            name=\"description\",\n            display_name=\"Tool Description\",\n            info=\"A description of the tool.\",\n            value=\"A Python shell. Use this to execute python commands. \"\n            \"Input should be a valid python command. \"\n            \"If you want to see the output of a value, you should print it out with `print(...)`.\",\n        ),\n        StrInput(\n            name=\"global_imports\",\n            display_name=\"Global Imports\",\n            info=\"A comma-separated list of modules to import globally, e.g. 'math,numpy'.\",\n            value=\"math\",\n        ),\n        StrInput(\n            name=\"code\",\n            display_name=\"Python Code\",\n            info=\"The Python code to execute.\",\n            value=\"print('Hello, World!')\",\n        ),\n    ]\n\n    class PythonREPLSchema(BaseModel):\n        code: str = Field(..., description=\"The Python code to execute.\")\n\n    def get_globals(self, global_imports: str | list[str]) -> dict:\n        global_dict = {}\n        if isinstance(global_imports, str):\n            modules = [module.strip() for module in global_imports.split(\",\")]\n        elif isinstance(global_imports, list):\n            modules = global_imports\n        else:\n            msg = \"global_imports must be either a string or a list\"\n            raise TypeError(msg)\n\n        for module in modules:\n            try:\n                imported_module = importlib.import_module(module)\n                global_dict[imported_module.__name__] = imported_module\n            except ImportError as e:\n                msg = f\"Could not import module {module}\"\n                raise ImportError(msg) from e\n        return global_dict\n\n    def build_tool(self) -> Tool:\n        _globals = self.get_globals(self.global_imports)\n        python_repl = PythonREPL(_globals=_globals)\n\n        def run_python_code(code: str) -> str:\n            try:\n                return python_repl.run(code)\n            except Exception as e:  # noqa: BLE001\n                logger.opt(exception=True).debug(\"Error running Python code\")\n                return f\"Error: {e}\"\n\n        tool = StructuredTool.from_function(\n            name=self.name,\n            description=self.description,\n            func=run_python_code,\n            args_schema=self.PythonREPLSchema,\n        )\n\n        self.status = f\"Python REPL Tool created with global imports: {self.global_imports}\"\n        return tool\n\n    def run_model(self) -> list[Data]:\n        tool = self.build_tool()\n        result = tool.run(self.code)\n        return [Data(data={\"result\": result})]\n"
               },
-              "max_tokens": {
-                "_input_type": "IntInput",
-                "advanced": true,
-                "display_name": "Max Tokens",
+              "description": {
+                "_input_type": "StrInput",
+                "advanced": false,
+                "display_name": "Tool Description",
                 "dynamic": false,
-                "info": "The maximum number of tokens to generate. Set to 0 for unlimited tokens.",
+                "info": "A description of the tool.",
                 "list": false,
-                "name": "max_tokens",
+                "load_from_db": false,
+                "name": "description",
                 "placeholder": "",
-                "range_spec": {
-                  "max": 128000,
-                  "min": 0,
-                  "step": 0.1,
-                  "step_type": "float"
-                },
                 "required": false,
                 "show": true,
                 "title_case": false,
                 "trace_as_metadata": true,
-                "type": "int",
-                "value": ""
+                "type": "str",
+                "value": "A Python shell. Use this to execute python commands. Input should be a valid python command. If you want to see the output of a value, you should print it out with `print(...)`."
               },
-              "model_kwargs": {
-                "_input_type": "DictInput",
-                "advanced": true,
-                "display_name": "Model Kwargs",
+              "global_imports": {
+                "_input_type": "StrInput",
+                "advanced": false,
+                "display_name": "Global Imports",
                 "dynamic": false,
-                "info": "",
+                "info": "A comma-separated list of modules to import globally, e.g. 'math,numpy'.",
                 "list": false,
-                "name": "model_kwargs",
+                "load_from_db": false,
+                "name": "global_imports",
                 "placeholder": "",
                 "required": false,
                 "show": true,
                 "title_case": false,
-                "trace_as_input": true,
-                "type": "dict",
-                "value": {}
+                "trace_as_metadata": true,
+                "type": "str",
+                "value": "math"
               },
-              "model_name": {
-                "_input_type": "DropdownInput",
+              "name": {
+                "_input_type": "StrInput",
                 "advanced": false,
-                "combobox": false,
-                "display_name": "Model Name",
+                "display_name": "Tool Name",
                 "dynamic": false,
-                "info": "",
+                "info": "The name of the tool.",
+                "list": false,
                 "load_from_db": false,
-                "name": "model_name",
-                "options": [
-                  "gpt-4o-mini",
-                  "gpt-4o",
-                  "gpt-4-turbo",
-                  "gpt-4-turbo-preview",
-                  "gpt-4",
-                  "gpt-3.5-turbo",
-                  "gpt-3.5-turbo-0125"
-                ],
-                "placeholder": "",
-                "required": false,
-                "show": true,
-                "title_case": false,
-                "trace_as_metadata": true,
-                "type": "str",
-                "value": "gpt-4o-mini"
-              },
-              "openai_api_base": {
-                "_input_type": "StrInput",
-                "advanced": true,
-                "display_name": "OpenAI API Base",
-                "dynamic": false,
-                "info": "The base URL of the OpenAI API. Defaults to https://api.openai.com/v1. You can change this to use other APIs like JinaChat, LocalAI and Prem.",
-                "list": false,
-                "load_from_db": false,
-                "name": "openai_api_base",
-                "placeholder": "",
-                "required": false,
-                "show": true,
-                "title_case": false,
-                "trace_as_metadata": true,
-                "type": "str",
-                "value": ""
-              },
-              "output_parser": {
-                "_input_type": "HandleInput",
-                "advanced": true,
-                "display_name": "Output Parser",
-                "dynamic": false,
-                "info": "The parser to use to parse the output of the model",
-                "input_types": [
-                  "OutputParser"
-                ],
-                "list": false,
-                "name": "output_parser",
-                "placeholder": "",
-                "required": false,
-                "show": true,
-                "title_case": false,
-                "trace_as_metadata": true,
-                "type": "other",
-                "value": ""
-              },
-              "output_schema": {
-                "_input_type": "DictInput",
-                "advanced": true,
-                "display_name": "Schema",
-                "dynamic": false,
-                "info": "The schema for the Output of the model. You must pass the word JSON in the prompt. If left blank, JSON mode will be disabled. [DEPRECATED]",
-                "list": true,
-                "name": "output_schema",
-                "placeholder": "",
-                "required": false,
-                "show": true,
-                "title_case": false,
-                "trace_as_input": true,
-                "type": "dict",
-                "value": {}
-              },
-              "seed": {
-                "_input_type": "IntInput",
-                "advanced": true,
-                "display_name": "Seed",
-                "dynamic": false,
-                "info": "The seed controls the reproducibility of the job.",
-                "list": false,
-                "name": "seed",
-                "placeholder": "",
-                "required": false,
-                "show": true,
-                "title_case": false,
-                "trace_as_metadata": true,
-                "type": "int",
-                "value": 1
-              },
-              "stream": {
-                "_input_type": "BoolInput",
-                "advanced": true,
-                "display_name": "Stream",
-                "dynamic": false,
-                "info": "Stream the response from the model. Streaming works only in Chat.",
-                "list": false,
-                "name": "stream",
-                "placeholder": "",
-                "required": false,
-                "show": true,
-                "title_case": false,
-                "trace_as_metadata": true,
-                "type": "bool",
-                "value": false
-              },
-              "system_message": {
-                "_input_type": "MessageTextInput",
-                "advanced": true,
-                "display_name": "System Message",
-                "dynamic": false,
-                "info": "System message to pass to the model.",
-                "input_types": [
-                  "Message"
-                ],
-                "list": false,
-                "load_from_db": false,
-                "name": "system_message",
+                "name": "name",
                 "placeholder": "",
                 "required": false,
                 "show": true,
                 "title_case": false,
-                "trace_as_input": true,
                 "trace_as_metadata": true,
                 "type": "str",
-                "value": ""
-              },
-              "temperature": {
-                "_input_type": "FloatInput",
-                "advanced": false,
-                "display_name": "Temperature",
-                "dynamic": false,
-                "info": "",
-                "list": false,
-                "name": "temperature",
-                "placeholder": "",
-                "required": false,
-                "show": true,
-                "title_case": false,
-                "trace_as_metadata": true,
-                "type": "float",
-                "value": 0.1
+                "value": "python_repl"
               }
             }
           },
-          "type": "OpenAIModel"
+          "type": "PythonREPLTool"
         },
         "dragging": false,
-        "height": 605,
-        "id": "OpenAIModel-1ioeW",
+        "height": 475,
+        "id": "PythonREPLTool-QaSW0",
         "position": {
-          "x": 2538.9919009235173,
-          "y": 1206.8619086167491
+          "x": 63.43047038993518,
+          "y": 536.9058769625287
         },
         "positionAbsolute": {
-          "x": 2538.9919009235173,
-          "y": 1206.8619086167491
+          "x": 63.43047038993518,
+          "y": 536.9058769625287
         },
         "selected": false,
         "type": "genericNode",
-        "width": 384
+        "width": 320
       },
       {
         "data": {
-          "id": "ToolCallingAgent-mf0BN",
+          "id": "Agent-7mKwO",
           "node": {
             "base_classes": [
-              "AgentExecutor",
               "Message"
             ],
             "beta": true,
+            "category": "agents",
             "conditional_paths": [],
             "custom_fields": {},
-            "description": "Agent that uses tools to perform the given task.",
+            "description": "Define the agent's instructions, then enter a task to complete using tools.",
             "display_name": "Agent",
             "documentation": "",
-            "edited": true,
+            "edited": false,
             "field_order": [
+              "agent_llm",
+              "max_tokens",
+              "model_kwargs",
+              "json_mode",
+              "output_schema",
+              "model_name",
+              "openai_api_base",
+              "api_key",
+              "temperature",
+              "seed",
+              "output_parser",
+              "system_prompt",
+              "tools",
               "input_value",
               "handle_parsing_errors",
               "verbose",
               "max_iterations",
-              "tools",
-              "llm",
-              "system_prompt",
-              "user_prompt",
-              "chat_history"
+              "memory",
+              "sender",
+              "sender_name",
+              "n_messages",
+              "session_id",
+              "order",
+              "template"
             ],
             "frozen": false,
-            "icon": "bot-message-square",
-            "lf_version": "1.0.16",
+            "icon": "bot",
+            "key": "Agent",
+            "legacy": false,
+            "lf_version": "1.0.19",
+            "metadata": {},
             "output_types": [],
             "outputs": [
-              {
-                "cache": true,
-                "display_name": "Agent",
-                "hidden": true,
-                "method": "build_agent",
-                "name": "agent",
-                "selected": "AgentExecutor",
-                "types": [
-                  "AgentExecutor"
-                ],
-                "value": "__UNDEFINED__"
-              },
               {
                 "cache": true,
                 "display_name": "Response",
-                "method": "message_response",
+                "method": "get_response",
                 "name": "response",
                 "selected": "Message",
                 "types": [
@@ -974,24 +876,47 @@
             "pinned": false,
             "template": {
               "_type": "Component",
-              "chat_history": {
-                "_input_type": "DataInput",
-                "advanced": true,
-                "display_name": "Chat History",
+              "agent_llm": {
+                "_input_type": "DropdownInput",
+                "advanced": false,
+                "combobox": false,
+                "display_name": "Model Provider",
                 "dynamic": false,
                 "info": "",
-                "input_types": [
-                  "Data"
+                "input_types": [],
+                "name": "agent_llm",
+                "options": [
+                  "Azure OpenAI",
+                  "OpenAI",
+                  "Custom"
                 ],
-                "list": true,
-                "name": "chat_history",
                 "placeholder": "",
+                "real_time_refresh": true,
+                "refresh_button": true,
                 "required": false,
                 "show": true,
                 "title_case": false,
-                "trace_as_input": true,
                 "trace_as_metadata": true,
-                "type": "other",
+                "type": "str",
+                "value": "OpenAI"
+              },
+              "api_key": {
+                "_input_type": "SecretStrInput",
+                "advanced": false,
+                "display_name": "OpenAI API Key",
+                "dynamic": false,
+                "info": "The OpenAI API Key to use for the OpenAI model.",
+                "input_types": [
+                  "Message"
+                ],
+                "load_from_db": true,
+                "name": "api_key",
+                "password": true,
+                "placeholder": "",
+                "required": false,
+                "show": true,
+                "title_case": false,
+                "type": "str",
                 "value": ""
               },
               "code": {
@@ -1010,7 +935,7 @@
                 "show": true,
                 "title_case": false,
                 "type": "code",
-                "value": "from typing import Optional, List\n\nfrom langchain.agents import create_tool_calling_agent\nfrom langchain_core.prompts import ChatPromptTemplate, PromptTemplate, HumanMessagePromptTemplate\nfrom langflow.base.agents.agent import LCToolsAgentComponent\nfrom langflow.inputs import MultilineInput\nfrom langflow.inputs.inputs import HandleInput, DataInput\nfrom langflow.schema import Data\n\n\nclass ToolCallingAgentComponent(LCToolsAgentComponent):\n    display_name: str = \"Tool Calling Agent\"\n    description: str = \"Agent that uses tools\"\n    icon = \"bot-message-square\"\n    beta = True\n    name = \"ToolCallingAgent\"\n\n    inputs = LCToolsAgentComponent._base_inputs + [\n        HandleInput(name=\"llm\", display_name=\"Language Model\", input_types=[\"LanguageModel\"], required=True),\n        MultilineInput(\n            name=\"system_prompt\",\n            display_name=\"System Prompt\",\n            info=\"System prompt for the agent.\",\n            value=\"You are a helpful assistant\",\n        ),\n        MultilineInput(\n            name=\"user_prompt\", display_name=\"Prompt\", info=\"This prompt must contain 'input' key.\", value=\"{input}\"\n        ),\n        DataInput(name=\"chat_history\", display_name=\"Chat History\", is_list=True, advanced=True),\n    ]\n\n    def get_chat_history_data(self) -> Optional[List[Data]]:\n        return self.chat_history\n\n    def create_agent_runnable(self):\n        if \"input\" not in self.user_prompt:\n            raise ValueError(\"Prompt must contain 'input' key.\")\n        messages = [\n            (\"system\", self.system_prompt),\n            (\"placeholder\", \"{chat_history}\"),\n            HumanMessagePromptTemplate(prompt=PromptTemplate(input_variables=[\"input\"], template=self.user_prompt)),\n            (\"placeholder\", \"{agent_scratchpad}\"),\n        ]\n        prompt = ChatPromptTemplate.from_messages(messages)\n        return create_tool_calling_agent(self.llm, self.tools, prompt)\n"
+                "value": "from langflow.base.agents.agent import LCToolsAgentComponent\nfrom langflow.base.models.model import LCModelComponent\nfrom langflow.components.agents.tool_calling import ToolCallingAgentComponent\nfrom langflow.components.helpers.memory import MemoryComponent\nfrom langflow.components.models.azure_openai import AzureChatOpenAIComponent\nfrom langflow.components.models.openai import OpenAIModelComponent\nfrom langflow.io import (\n    DropdownInput,\n    MultilineInput,\n    Output,\n)\nfrom langflow.schema.dotdict import dotdict\nfrom langflow.schema.message import Message\n\n\ndef set_advanced_true(component_input):\n    component_input.advanced = True\n    return component_input\n\n\nclass AgentComponent(ToolCallingAgentComponent):\n    display_name: str = \"Agent\"\n    description: str = \"Define the agent's instructions, then enter a task to complete using tools.\"\n    icon = \"bot\"\n    beta = True\n    name = \"Agent\"\n\n    azure_inputs = [\n        set_advanced_true(component_input) if component_input.name == \"temperature\" else component_input\n        for component_input in AzureChatOpenAIComponent().inputs\n        if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]\n    ]\n    openai_inputs = [\n        set_advanced_true(component_input) if component_input.name == \"temperature\" else component_input\n        for component_input in OpenAIModelComponent().inputs\n        if component_input.name not in [input_field.name for input_field in LCModelComponent._base_inputs]\n    ]\n\n    memory_inputs = [set_advanced_true(component_input) for component_input in MemoryComponent().inputs]\n\n    inputs = [\n        DropdownInput(\n            name=\"agent_llm\",\n            display_name=\"Model Provider\",\n            options=[\"Azure OpenAI\", \"OpenAI\", \"Custom\"],\n            value=\"OpenAI\",\n            real_time_refresh=True,\n            refresh_button=True,\n            input_types=[],\n        ),\n        *openai_inputs,\n        MultilineInput(\n            name=\"system_prompt\",\n            display_name=\"Agent Instructions\",\n            info=\"Initial instructions and context provided to guide the agent's behavior.\",\n            value=\"You are a helpful assistant that can use tools to answer questions and perform tasks.\",\n            advanced=False,\n        ),\n        *LCToolsAgentComponent._base_inputs,\n        *memory_inputs,\n    ]\n    outputs = [Output(name=\"response\", display_name=\"Response\", method=\"get_response\")]\n\n    async def get_response(self) -> Message:\n        llm_model = self.get_llm()\n        if llm_model is None:\n            msg = \"No language model selected\"\n            raise ValueError(msg)\n        self.chat_history = self.get_memory_data()\n\n        agent = ToolCallingAgentComponent().set(\n            llm=llm_model,\n            tools=[self.tools],\n            chat_history=self.chat_history,\n            input_value=self.input_value,\n            system_prompt=self.system_prompt,\n        )\n\n        return await agent.message_response()\n\n    def get_memory_data(self):\n        memory_kwargs = {\n            component_input.name: getattr(self, f\"{component_input.name}\") for component_input in self.memory_inputs\n        }\n\n        return MemoryComponent().set(**memory_kwargs).retrieve_messages()\n\n    def get_llm(self):\n        try:\n            if self.agent_llm == \"OpenAI\":\n                return self._build_llm_model(OpenAIModelComponent(), self.openai_inputs)\n            if self.agent_llm == \"Azure OpenAI\":\n                return self._build_llm_model(AzureChatOpenAIComponent(), self.azure_inputs, prefix=\"azure_param_\")\n        except Exception as e:\n            msg = f\"Error building {self.agent_llm} language model\"\n            raise ValueError(msg) from e\n        return self.agent_llm\n\n    def _build_llm_model(self, component, inputs, prefix=\"\"):\n        return component.set(\n            **{component_input.name: getattr(self, f\"{prefix}{component_input.name}\") for component_input in inputs}\n        ).build_model()\n\n    def delete_fields(self, build_config, fields):\n        for field in fields:\n            build_config.pop(field, None)\n\n    def update_build_config(self, build_config: dotdict, field_value: str, field_name: str | None = None):\n        if field_name == \"agent_llm\":\n            openai_fields = {component_input.name: component_input for component_input in self.openai_inputs}\n            azure_fields = {\n                f\"azure_param_{component_input.name}\": component_input for component_input in self.azure_inputs\n            }\n\n            if field_value == \"OpenAI\":\n                self.delete_fields(build_config, {**azure_fields})\n                if not any(field in build_config for field in openai_fields):\n                    build_config.update(openai_fields)\n                build_config[\"agent_llm\"][\"input_types\"] = []\n                build_config = self.update_input_types(build_config)\n\n            elif field_value == \"Azure OpenAI\":\n                self.delete_fields(build_config, {**openai_fields})\n                build_config.update(azure_fields)\n                build_config[\"agent_llm\"][\"input_types\"] = []\n                build_config = self.update_input_types(build_config)\n            elif field_value == \"Custom\":\n                self.delete_fields(build_config, {**openai_fields})\n                self.delete_fields(build_config, {**azure_fields})\n                new_component = DropdownInput(\n                    name=\"agent_llm\",\n                    display_name=\"Language Model\",\n                    options=[\"Azure OpenAI\", \"OpenAI\", \"Custom\"],\n                    value=\"Custom\",\n                    real_time_refresh=True,\n                    input_types=[\"LanguageModel\"],\n                )\n                build_config.update({\"agent_llm\": new_component.to_dict()})\n                build_config = self.update_input_types(build_config)\n            default_keys = [\"code\", \"_type\", \"agent_llm\", \"tools\", \"input_value\"]\n            missing_keys = [key for key in default_keys if key not in build_config]\n            if missing_keys:\n                msg = f\"Missing required keys in build_config: {missing_keys}\"\n                raise ValueError(msg)\n        return build_config\n\n    def update_input_types(self, build_config):\n        for key, value in build_config.items():\n            # Check if the value is a dictionary\n            if isinstance(value, dict):\n                if value.get(\"input_types\") is None:\n                    build_config[key][\"input_types\"] = []\n            # Check if the value has an attribute 'input_types' and it is None\n            elif hasattr(value, \"input_types\") and value.input_types is None:\n                value.input_types = []\n        return build_config\n"
               },
               "handle_parsing_errors": {
                 "_input_type": "BoolInput",
@@ -1049,24 +974,21 @@
                 "type": "str",
                 "value": ""
               },
-              "llm": {
-                "_input_type": "HandleInput",
-                "advanced": false,
-                "display_name": "Language Model",
+              "json_mode": {
+                "_input_type": "BoolInput",
+                "advanced": true,
+                "display_name": "JSON Mode",
                 "dynamic": false,
-                "info": "",
-                "input_types": [
-                  "LanguageModel"
-                ],
+                "info": "If True, it will output JSON regardless of passing a schema.",
                 "list": false,
-                "name": "llm",
+                "name": "json_mode",
                 "placeholder": "",
-                "required": true,
+                "required": false,
                 "show": true,
                 "title_case": false,
                 "trace_as_metadata": true,
-                "type": "other",
-                "value": ""
+                "type": "bool",
+                "value": false
               },
               "max_iterations": {
                 "_input_type": "IntInput",
@@ -1084,41 +1006,39 @@
                 "type": "int",
                 "value": 15
               },
-              "system_prompt": {
-                "_input_type": "MultilineInput",
-                "advanced": false,
-                "display_name": "System Prompt",
+              "max_tokens": {
+                "_input_type": "IntInput",
+                "advanced": true,
+                "display_name": "Max Tokens",
                 "dynamic": false,
-                "info": "System prompt for the agent.",
-                "input_types": [
-                  "Message"
-                ],
+                "info": "The maximum number of tokens to generate. Set to 0 for unlimited tokens.",
                 "list": false,
-                "load_from_db": false,
-                "multiline": true,
-                "name": "system_prompt",
+                "name": "max_tokens",
                 "placeholder": "",
+                "range_spec": {
+                  "max": 128000,
+                  "min": 0,
+                  "step": 0.1,
+                  "step_type": "float"
+                },
                 "required": false,
                 "show": true,
                 "title_case": false,
-                "trace_as_input": true,
                 "trace_as_metadata": true,
-                "type": "str",
-                "value": "You are an Amazing Agent that can use the tools provided to you and answer the question "
+                "type": "int",
+                "value": ""
               },
-              "tools": {
+              "memory": {
                 "_input_type": "HandleInput",
-                "advanced": false,
-                "display_name": "Tools",
+                "advanced": true,
+                "display_name": "External Memory",
                 "dynamic": false,
-                "info": "",
+                "info": "Retrieve messages from an external memory. If empty, it will use the Langflow tables.",
                 "input_types": [
-                  "Tool",
-                  "BaseTool"
+                  "BaseChatMessageHistory"
                 ],
-                "list": true,
-                "load_from_db": false,
-                "name": "tools",
+                "list": false,
+                "name": "memory",
                 "placeholder": "",
                 "required": false,
                 "show": true,
@@ -1127,153 +1047,184 @@
                 "type": "other",
                 "value": ""
               },
-              "user_prompt": {
-                "_input_type": "MultilineInput",
-                "advanced": false,
-                "display_name": "Prompt",
+              "model_kwargs": {
+                "_input_type": "DictInput",
+                "advanced": true,
+                "display_name": "Model Kwargs",
                 "dynamic": false,
-                "info": "This prompt must contain 'input' key.",
-                "input_types": [
-                  "Message"
-                ],
+                "info": "",
                 "list": false,
-                "load_from_db": false,
-                "multiline": true,
-                "name": "user_prompt",
+                "name": "model_kwargs",
                 "placeholder": "",
                 "required": false,
                 "show": true,
                 "title_case": false,
                 "trace_as_input": true,
-                "trace_as_metadata": true,
-                "type": "str",
-                "value": "{input}"
+                "type": "dict",
+                "value": {}
               },
-              "verbose": {
-                "_input_type": "BoolInput",
-                "advanced": true,
-                "display_name": "Verbose",
-                "dynamic": false,
-                "info": "",
-                "list": false,
-                "name": "verbose",
+              "model_name": {
+                "_input_type": "DropdownInput",
+                "advanced": false,
+                "combobox": false,
+                "display_name": "Model Name",
+                "dynamic": false,
+                "info": "",
+                "name": "model_name",
+                "options": [
+                  "gpt-4o-mini",
+                  "gpt-4o",
+                  "gpt-4-turbo",
+                  "gpt-4-turbo-preview",
+                  "gpt-4",
+                  "gpt-3.5-turbo",
+                  "gpt-3.5-turbo-0125"
+                ],
                 "placeholder": "",
                 "required": false,
                 "show": true,
                 "title_case": false,
                 "trace_as_metadata": true,
-                "type": "bool",
-                "value": true
-              }
-            }
-          },
-          "type": "ToolCallingAgent"
-        },
-        "dragging": false,
-        "height": 598,
-        "id": "ToolCallingAgent-mf0BN",
-        "position": {
-          "x": 3276.3854573966964,
-          "y": 516.3304705434241
-        },
-        "positionAbsolute": {
-          "x": 3276.3854573966964,
-          "y": 516.3304705434241
-        },
-        "selected": false,
-        "type": "genericNode",
-        "width": 384
-      },
-      {
-        "data": {
-          "id": "CalculatorTool-Nb4P5",
-          "node": {
-            "base_classes": [
-              "Data",
-              "list",
-              "Sequence",
-              "Tool"
-            ],
-            "beta": false,
-            "conditional_paths": [],
-            "custom_fields": {},
-            "description": "Perform basic arithmetic operations on a given expression.",
-            "display_name": "Calculator",
-            "documentation": "",
-            "edited": false,
-            "field_order": [
-              "expression"
-            ],
-            "frozen": false,
-            "icon": "calculator",
-            "legacy": false,
-            "lf_version": "1.0.16",
-            "metadata": {},
-            "official": false,
-            "output_types": [],
-            "outputs": [
-              {
-                "cache": true,
-                "display_name": "Data",
-                "method": "run_model",
-                "name": "api_run_model",
-                "required_inputs": [
-                  "expression"
-                ],
-                "selected": "Data",
-                "types": [
-                  "Data"
-                ],
-                "value": "__UNDEFINED__"
+                "type": "str",
+                "value": "gpt-4o-mini"
               },
-              {
-                "cache": true,
-                "display_name": "Tool",
-                "method": "build_tool",
-                "name": "api_build_tool",
-                "required_inputs": [
-                  "expression"
+              "n_messages": {
+                "_input_type": "IntInput",
+                "advanced": true,
+                "display_name": "Number of Messages",
+                "dynamic": false,
+                "info": "Number of messages to retrieve.",
+                "list": false,
+                "name": "n_messages",
+                "placeholder": "",
+                "required": false,
+                "show": true,
+                "title_case": false,
+                "trace_as_metadata": true,
+                "type": "int",
+                "value": 100
+              },
+              "openai_api_base": {
+                "_input_type": "StrInput",
+                "advanced": true,
+                "display_name": "OpenAI API Base",
+                "dynamic": false,
+                "info": "The base URL of the OpenAI API. Defaults to https://api.openai.com/v1. You can change this to use other APIs like JinaChat, LocalAI and Prem.",
+                "list": false,
+                "load_from_db": false,
+                "name": "openai_api_base",
+                "placeholder": "",
+                "required": false,
+                "show": true,
+                "title_case": false,
+                "trace_as_metadata": true,
+                "type": "str",
+                "value": ""
+              },
+              "order": {
+                "_input_type": "DropdownInput",
+                "advanced": true,
+                "combobox": false,
+                "display_name": "Order",
+                "dynamic": false,
+                "info": "Order of the messages.",
+                "name": "order",
+                "options": [
+                  "Ascending",
+                  "Descending"
                 ],
-                "selected": "Tool",
-                "types": [
-                  "Tool"
+                "placeholder": "",
+                "required": false,
+                "show": true,
+                "title_case": false,
+                "trace_as_metadata": true,
+                "type": "str",
+                "value": "Ascending"
+              },
+              "output_parser": {
+                "_input_type": "HandleInput",
+                "advanced": true,
+                "display_name": "Output Parser",
+                "dynamic": false,
+                "info": "The parser to use to parse the output of the model",
+                "input_types": [
+                  "OutputParser"
                 ],
-                "value": "__UNDEFINED__"
-              }
-            ],
-            "pinned": false,
-            "template": {
-              "_type": "Component",
-              "code": {
+                "list": false,
+                "name": "output_parser",
+                "placeholder": "",
+                "required": false,
+                "show": true,
+                "title_case": false,
+                "trace_as_metadata": true,
+                "type": "other",
+                "value": ""
+              },
+              "output_schema": {
+                "_input_type": "DictInput",
                 "advanced": true,
-                "dynamic": true,
-                "fileTypes": [],
-                "file_path": "",
-                "info": "",
+                "display_name": "Schema",
+                "dynamic": false,
+                "info": "The schema for the Output of the model. You must pass the word JSON in the prompt. If left blank, JSON mode will be disabled. [DEPRECATED]",
+                "list": true,
+                "name": "output_schema",
+                "placeholder": "",
+                "required": false,
+                "show": true,
+                "title_case": false,
+                "trace_as_input": true,
+                "type": "dict",
+                "value": {}
+              },
+              "seed": {
+                "_input_type": "IntInput",
+                "advanced": true,
+                "display_name": "Seed",
+                "dynamic": false,
+                "info": "The seed controls the reproducibility of the job.",
                 "list": false,
-                "load_from_db": false,
-                "multiline": true,
-                "name": "code",
-                "password": false,
+                "name": "seed",
                 "placeholder": "",
-                "required": true,
+                "required": false,
                 "show": true,
                 "title_case": false,
-                "type": "code",
-                "value": "import ast\nimport operator\n\nfrom langchain.tools import StructuredTool\nfrom loguru import logger\nfrom pydantic import BaseModel, Field\n\nfrom langflow.base.langchain_utilities.model import LCToolComponent\nfrom langflow.field_typing import Tool\nfrom langflow.inputs import MessageTextInput\nfrom langflow.schema import Data\n\n\nclass CalculatorToolComponent(LCToolComponent):\n    display_name = \"Calculator\"\n    description = \"Perform basic arithmetic operations on a given expression.\"\n    icon = \"calculator\"\n    name = \"CalculatorTool\"\n\n    inputs = [\n        MessageTextInput(\n            name=\"expression\",\n            display_name=\"Expression\",\n            info=\"The arithmetic expression to evaluate (e.g., '4*4*(33/22)+12-20').\",\n        ),\n    ]\n\n    class CalculatorToolSchema(BaseModel):\n        expression: str = Field(..., description=\"The arithmetic expression to evaluate.\")\n\n    def run_model(self) -> list[Data]:\n        return self._evaluate_expression(self.expression)\n\n    def build_tool(self) -> Tool:\n        return StructuredTool.from_function(\n            name=\"calculator\",\n            description=\"Evaluate basic arithmetic expressions. Input should be a string containing the expression.\",\n            func=self._evaluate_expression,\n            args_schema=self.CalculatorToolSchema,\n        )\n\n    def _eval_expr(self, node):\n        # Define the allowed operators\n        operators = {\n            ast.Add: operator.add,\n            ast.Sub: operator.sub,\n            ast.Mult: operator.mul,\n            ast.Div: operator.truediv,\n            ast.Pow: operator.pow,\n        }\n        if isinstance(node, ast.Num):\n            return node.n\n        if isinstance(node, ast.BinOp):\n            return operators[type(node.op)](self._eval_expr(node.left), self._eval_expr(node.right))\n        if isinstance(node, ast.UnaryOp):\n            return operators[type(node.op)](self._eval_expr(node.operand))\n        raise TypeError(node)\n\n    def _evaluate_expression(self, expression: str) -> list[Data]:\n        try:\n            # Parse the expression and evaluate it\n            tree = ast.parse(expression, mode=\"eval\")\n            result = self._eval_expr(tree.body)\n\n            # Format the result to a reasonable number of decimal places\n            formatted_result = f\"{result:.6f}\".rstrip(\"0\").rstrip(\".\")\n\n            self.status = formatted_result\n            return [Data(data={\"result\": formatted_result})]\n\n        except (SyntaxError, TypeError, KeyError) as e:\n            error_message = f\"Invalid expression: {e}\"\n            self.status = error_message\n            return [Data(data={\"error\": error_message})]\n        except ZeroDivisionError:\n            error_message = \"Error: Division by zero\"\n            self.status = error_message\n            return [Data(data={\"error\": error_message})]\n        except Exception as e:  # noqa: BLE001\n            logger.opt(exception=True).debug(\"Error evaluating expression\")\n            error_message = f\"Error: {e}\"\n            self.status = error_message\n            return [Data(data={\"error\": error_message})]\n"
+                "trace_as_metadata": true,
+                "type": "int",
+                "value": 1
               },
-              "expression": {
+              "sender": {
+                "_input_type": "DropdownInput",
+                "advanced": true,
+                "combobox": false,
+                "display_name": "Sender Type",
+                "dynamic": false,
+                "info": "Filter by sender type.",
+                "name": "sender",
+                "options": [
+                  "Machine",
+                  "User",
+                  "Machine and User"
+                ],
+                "placeholder": "",
+                "required": false,
+                "show": true,
+                "title_case": false,
+                "trace_as_metadata": true,
+                "type": "str",
+                "value": "Machine and User"
+              },
+              "sender_name": {
                 "_input_type": "MessageTextInput",
-                "advanced": false,
-                "display_name": "Expression",
+                "advanced": true,
+                "display_name": "Sender Name",
                 "dynamic": false,
-                "info": "The arithmetic expression to evaluate (e.g., '4*4*(33/22)+12-20').",
+                "info": "Filter by sender name.",
                 "input_types": [
                   "Message"
                 ],
                 "list": false,
                 "load_from_db": false,
-                "name": "expression",
+                "name": "sender_name",
                 "placeholder": "",
                 "required": false,
                 "show": true,
@@ -1281,194 +1232,158 @@
                 "trace_as_input": true,
                 "trace_as_metadata": true,
                 "type": "str",
-                "value": "2+2"
-              }
-            }
-          },
-          "type": "CalculatorTool"
-        },
-        "dragging": false,
-        "height": 375,
-        "id": "CalculatorTool-Nb4P5",
-        "position": {
-          "x": 2330.062076024461,
-          "y": 429.6717346334192
-        },
-        "positionAbsolute": {
-          "x": 2330.062076024461,
-          "y": 429.6717346334192
-        },
-        "selected": false,
-        "type": "genericNode",
-        "width": 384
-      },
-      {
-        "data": {
-          "description": "A tool for running Python code in a REPL environment.",
-          "display_name": "Python REPL Tool",
-          "id": "PythonREPLTool-i922a",
-          "node": {
-            "base_classes": [
-              "Data",
-              "Tool"
-            ],
-            "beta": false,
-            "conditional_paths": [],
-            "custom_fields": {},
-            "description": "A tool for running Python code in a REPL environment.",
-            "display_name": "Python REPL Tool",
-            "documentation": "",
-            "edited": false,
-            "field_order": [
-              "name",
-              "description",
-              "global_imports",
-              "code"
-            ],
-            "frozen": false,
-            "legacy": false,
-            "metadata": {},
-            "output_types": [],
-            "outputs": [
-              {
-                "cache": true,
-                "display_name": "Data",
-                "method": "run_model",
-                "name": "api_run_model",
-                "required_inputs": [
-                  "code",
-                  "description",
-                  "global_imports",
-                  "name"
-                ],
-                "selected": "Data",
-                "types": [
-                  "Data"
-                ],
-                "value": "__UNDEFINED__"
+                "value": ""
               },
-              {
-                "cache": true,
-                "display_name": "Tool",
-                "method": "build_tool",
-                "name": "api_build_tool",
-                "required_inputs": [
-                  "code",
-                  "description",
-                  "global_imports",
-                  "name"
-                ],
-                "selected": "Tool",
-                "types": [
-                  "Tool"
-                ],
-                "value": "__UNDEFINED__"
-              }
-            ],
-            "pinned": false,
-            "template": {
-              "_type": "Component",
-              "code": {
+              "session_id": {
+                "_input_type": "MessageTextInput",
                 "advanced": true,
-                "dynamic": true,
-                "fileTypes": [],
-                "file_path": "",
-                "info": "",
+                "display_name": "Session ID",
+                "dynamic": false,
+                "info": "The session ID of the chat. If empty, the current session ID parameter will be used.",
+                "input_types": [
+                  "Message"
+                ],
                 "list": false,
                 "load_from_db": false,
-                "multiline": true,
-                "name": "code",
-                "password": false,
+                "name": "session_id",
                 "placeholder": "",
-                "required": true,
+                "required": false,
                 "show": true,
                 "title_case": false,
-                "type": "code",
-                "value": "import importlib\n\nfrom langchain.tools import StructuredTool\nfrom langchain_experimental.utilities import PythonREPL\nfrom loguru import logger\nfrom pydantic import BaseModel, Field\n\nfrom langflow.base.langchain_utilities.model import LCToolComponent\nfrom langflow.field_typing import Tool\nfrom langflow.inputs import StrInput\nfrom langflow.schema import Data\n\n\nclass PythonREPLToolComponent(LCToolComponent):\n    display_name = \"Python REPL Tool\"\n    description = \"A tool for running Python code in a REPL environment.\"\n    name = \"PythonREPLTool\"\n\n    inputs = [\n        StrInput(\n            name=\"name\",\n            display_name=\"Tool Name\",\n            info=\"The name of the tool.\",\n            value=\"python_repl\",\n        ),\n        StrInput(\n            name=\"description\",\n            display_name=\"Tool Description\",\n            info=\"A description of the tool.\",\n            value=\"A Python shell. Use this to execute python commands. \"\n            \"Input should be a valid python command. \"\n            \"If you want to see the output of a value, you should print it out with `print(...)`.\",\n        ),\n        StrInput(\n            name=\"global_imports\",\n            display_name=\"Global Imports\",\n            info=\"A comma-separated list of modules to import globally, e.g. 'math,numpy'.\",\n            value=\"math\",\n        ),\n        StrInput(\n            name=\"code\",\n            display_name=\"Python Code\",\n            info=\"The Python code to execute.\",\n            value=\"print('Hello, World!')\",\n        ),\n    ]\n\n    class PythonREPLSchema(BaseModel):\n        code: str = Field(..., description=\"The Python code to execute.\")\n\n    def get_globals(self, global_imports: str | list[str]) -> dict:\n        global_dict = {}\n        if isinstance(global_imports, str):\n            modules = [module.strip() for module in global_imports.split(\",\")]\n        elif isinstance(global_imports, list):\n            modules = global_imports\n        else:\n            msg = \"global_imports must be either a string or a list\"\n            raise TypeError(msg)\n\n        for module in modules:\n            try:\n                imported_module = importlib.import_module(module)\n                global_dict[imported_module.__name__] = imported_module\n            except ImportError as e:\n                msg = f\"Could not import module {module}\"\n                raise ImportError(msg) from e\n        return global_dict\n\n    def build_tool(self) -> Tool:\n        _globals = self.get_globals(self.global_imports)\n        python_repl = PythonREPL(_globals=_globals)\n\n        def run_python_code(code: str) -> str:\n            try:\n                return python_repl.run(code)\n            except Exception as e:  # noqa: BLE001\n                logger.opt(exception=True).debug(\"Error running Python code\")\n                return f\"Error: {e}\"\n\n        tool = StructuredTool.from_function(\n            name=self.name,\n            description=self.description,\n            func=run_python_code,\n            args_schema=self.PythonREPLSchema,\n        )\n\n        self.status = f\"Python REPL Tool created with global imports: {self.global_imports}\"\n        return tool\n\n    def run_model(self) -> list[Data]:\n        tool = self.build_tool()\n        result = tool.run(self.code)\n        return [Data(data={\"result\": result})]\n"
+                "trace_as_input": true,
+                "trace_as_metadata": true,
+                "type": "str",
+                "value": ""
               },
-              "description": {
-                "_input_type": "StrInput",
+              "system_prompt": {
+                "_input_type": "MultilineInput",
                 "advanced": false,
-                "display_name": "Tool Description",
+                "display_name": "Agent Instructions",
                 "dynamic": false,
-                "info": "A description of the tool.",
+                "info": "Initial instructions and context provided to guide the agent's behavior.",
+                "input_types": [
+                  "Message"
+                ],
                 "list": false,
                 "load_from_db": false,
-                "name": "description",
+                "multiline": true,
+                "name": "system_prompt",
                 "placeholder": "",
                 "required": false,
                 "show": true,
                 "title_case": false,
+                "trace_as_input": true,
                 "trace_as_metadata": true,
                 "type": "str",
-                "value": "A Python shell. Use this to execute python commands. Input should be a valid python command. If you want to see the output of a value, you should print it out with `print(...)`."
+                "value": "You are a helpful assistant that can use tools to answer questions and perform tasks."
               },
-              "global_imports": {
-                "_input_type": "StrInput",
-                "advanced": false,
-                "display_name": "Global Imports",
+              "temperature": {
+                "_input_type": "FloatInput",
+                "advanced": true,
+                "display_name": "Temperature",
                 "dynamic": false,
-                "info": "A comma-separated list of modules to import globally, e.g. 'math,numpy'.",
+                "info": "",
+                "list": false,
+                "name": "temperature",
+                "placeholder": "",
+                "required": false,
+                "show": true,
+                "title_case": false,
+                "trace_as_metadata": true,
+                "type": "float",
+                "value": 0.1
+              },
+              "template": {
+                "_input_type": "MultilineInput",
+                "advanced": true,
+                "display_name": "Template",
+                "dynamic": false,
+                "info": "The template to use for formatting the data. It can contain the keys {text}, {sender} or any other key in the message data.",
+                "input_types": [
+                  "Message"
+                ],
                 "list": false,
                 "load_from_db": false,
-                "name": "global_imports",
+                "multiline": true,
+                "name": "template",
                 "placeholder": "",
                 "required": false,
                 "show": true,
                 "title_case": false,
+                "trace_as_input": true,
                 "trace_as_metadata": true,
                 "type": "str",
-                "value": "math"
+                "value": "{sender_name}: {text}"
               },
-              "name": {
-                "_input_type": "StrInput",
+              "tools": {
+                "_input_type": "HandleInput",
                 "advanced": false,
-                "display_name": "Tool Name",
+                "display_name": "Tools",
                 "dynamic": false,
-                "info": "The name of the tool.",
+                "info": "",
+                "input_types": [
+                  "Tool",
+                  "BaseTool",
+                  "StructuredTool"
+                ],
+                "list": true,
+                "name": "tools",
+                "placeholder": "",
+                "required": false,
+                "show": true,
+                "title_case": false,
+                "trace_as_metadata": true,
+                "type": "other",
+                "value": ""
+              },
+              "verbose": {
+                "_input_type": "BoolInput",
+                "advanced": true,
+                "display_name": "Verbose",
+                "dynamic": false,
+                "info": "",
                 "list": false,
-                "load_from_db": false,
-                "name": "name",
+                "name": "verbose",
                 "placeholder": "",
                 "required": false,
                 "show": true,
                 "title_case": false,
                 "trace_as_metadata": true,
-                "type": "str",
-                "value": "python_repl"
+                "type": "bool",
+                "value": true
               }
             }
           },
-          "type": "PythonREPLTool"
+          "type": "Agent"
         },
         "dragging": false,
-        "height": 547,
-        "id": "PythonREPLTool-i922a",
+        "height": 680,
+        "id": "Agent-7mKwO",
         "position": {
-          "x": 1763.1630547496572,
-          "y": 791.8164465037205
+          "x": 966.8637275749741,
+          "y": 198.5272428958864
         },
         "positionAbsolute": {
-          "x": 1763.1630547496572,
-          "y": 791.8164465037205
+          "x": 966.8637275749741,
+          "y": 198.5272428958864
         },
-        "selected": true,
+        "selected": false,
         "type": "genericNode",
-        "width": 384
+        "width": 320
       }
     ],
     "viewport": {
-      "x": -796.2952218140445,
-      "y": 174.7919632061971,
-      "zoom": 0.6144692758797546
+      "x": 147.77504195332347,
+      "y": 14.254381863292224,
+      "zoom": 0.5119423065126806
     }
   },
   "description": "Single Agent Flow to get you started. This flow contains a calculator and a Python REPL tool, that could be used by our tool calling agent.",
   "endpoint_name": null,
   "icon": "Users",
-  "id": "beda74a3-7e03-4c14-a148-a7740e810dbf",
+  "id": "ad7caf8a-3357-4a2c-81d5-90c0ffb4ad3f",
   "is_component": false,
-  "last_tested_version": "1.0.17",
+  "last_tested_version": "1.0.19",
   "name": "Simple Agent",
   "tags": [
     "agents",

From 43d2179dc1e049d7abf0625846c57341e2125176 Mon Sep 17 00:00:00 2001
From: italojohnny <italojohnnydosanjos@gmail.com>
Date: Sat, 2 Nov 2024 06:25:29 -0300
Subject: [PATCH 21/21] fix: attempt to fix frontend integration test

The issue occurs because the button for inspecting component code is overlaying
the element the test is trying to click. This likely started happening after
the recent frontend layout updates. The solution mainly attempts to resolve the
problem by adjusting the zoom level.
---
 src/frontend/tests/core/integrations/Simple Agent.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/frontend/tests/core/integrations/Simple Agent.spec.ts b/src/frontend/tests/core/integrations/Simple Agent.spec.ts
index b01e8b7f725..183ab51c9cf 100644
--- a/src/frontend/tests/core/integrations/Simple Agent.spec.ts	
+++ b/src/frontend/tests/core/integrations/Simple Agent.spec.ts	
@@ -77,6 +77,8 @@ test("Simple Agent", async ({ page }) => {
     .getByTestId("popover-anchor-input-api_key")
     .fill(process.env.OPENAI_API_KEY ?? "");
 
+  await page.getByTestId("fit_view").click();
+
   await page.getByTestId("dropdown_str_model_name").click();
   await page.getByTestId("gpt-4o-1-option").click();