Merge branch 'dev' into NodeModal

src/backend/langflow/interface/agents/custom.py

@@ -174,7 +174,7 @@ class SQLAgent(AgentExecutor):
     def from_toolkit_and_llm(cls, llm: BaseLLM, database_uri: str, **kwargs: Any):
         """Construct a sql agent from an LLM and tools."""
         db = SQLDatabase.from_uri(database_uri)
-        toolkit = SQLDatabaseToolkit(db=db)
+        toolkit = SQLDatabaseToolkit(db=db, llm=llm)
 
         # The right code should be this, but there is a problem with tools = toolkit.get_tools()
         # related to `OPENAI_API_KEY`
@@ -274,7 +274,11 @@ class InitializeAgent(AgentExecutor):
 
     @classmethod
     def initialize(
-        cls, llm: BaseLLM, tools: List[Tool], agent: str, memory: BaseChatMemory
+        cls,
+        llm: BaseLLM,
+        tools: List[Tool],
+        agent: str,
+        memory: Optional[BaseChatMemory] = None,
     ):
         return initialize_agent(
             tools=tools,

src/backend/langflow/interface/loading.py

@@ -166,7 +166,9 @@ def load_agent_executor(agent_class: type[agent_module.Agent], params, **kwargs)
     allowed_tools = params["allowed_tools"]
     llm_chain = params["llm_chain"]
     tool_names = [tool.name for tool in allowed_tools]
-    agent = agent_class(allowed_tools=tool_names, llm_chain=llm_chain)
+    # Agent class requires an output_parser but Agent classes
+    # have a default output_parser.
+    agent = agent_class(allowed_tools=tool_names, llm_chain=llm_chain)  # type: ignore
     return AgentExecutor.from_agent_and_tools(
         agent=agent,
         tools=allowed_tools,

src/backend/langflow/interface/run.py

@@ -1,7 +1,7 @@
 import contextlib
 import io
 from typing import Any, Dict
-from chromadb.errors import NotEnoughElementsException
+from chromadb.errors import NotEnoughElementsException  # type: ignore
 
 from langflow.cache.utils import compute_dict_hash, load_cache, memoize_dict
 from langflow.graph.graph import Graph

src/backend/langflow/interface/tools/base.py

@@ -118,7 +118,6 @@ class ToolCreator(LangChainTypeCreator):
             params = self.type_to_loader_dict[name]["params"]  # type: ignore
             base_classes += [name]
         elif tool_type in OTHER_TOOLS:
-            print(tool_type)
             tool_dict = build_template_from_class(tool_type, OTHER_TOOLS)
             fields = tool_dict["template"]
 

src/backend/langflow/template/base.py

@@ -226,11 +226,19 @@ class FrontendNode(BaseModel):
                 field.is_list = True
         if "api_key" in key and "OpenAI" in str(name):
             field.display_name = "OpenAI API Key"
-            field.required = True
+            field.required = False
             if field.value is None:
                 field.value = ""
+        # If the field.name contains api or api and key, then it might be an api key
+        # other conditions are to make sure that it is not an input or output variable
+        if "api" in key.lower() and "key" in key.lower():
+            field.required = False
 
         if "kwargs" in field.name.lower():
             field.advanced = True
             field.required = False
             field.show = False
+        # If the field.name contains api or api and key, then it might be an api key
+        # other conditions are to make sure that it is not an input or output variable
+        if "api" in key.lower() and "key" in key.lower():
+            field.required = False

src/backend/langflow/template/nodes.py

@@ -445,7 +445,9 @@ class LLMFrontendNode(FrontendNode):
         if "api" in field.name and ("key" in field.name or "token" in field.name):
             field.password = True
             field.show = True
-            field.required = True
+            # Required should be False to support
+            # loading the API key from environment variables
+            field.required = False
 
         if field.name == "task":
             field.required = True