Merge branch 'dev' into NodeModal

README.md

@@ -5,6 +5,7 @@
 ~ A User Interface For [LangChain](https://github.com/hwchase17/langchain) ~
 
 <p>
+<a href="https://huggingface.co/spaces/Logspace/LangFlow"><img src="https://huggingface.co/datasets/huggingface/badges/raw/main/open-in-hf-spaces-sm.svg" alt="HuggingFace Spaces"></a>
 <img alt="GitHub Contributors" src="https://img.shields.io/github/contributors/logspace-ai/langflow" />
 <img alt="GitHub Last Commit" src="https://img.shields.io/github/last-commit/logspace-ai/langflow" />
 <img alt="" src="https://img.shields.io/github/repo-size/logspace-ai/langflow" />

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langflow"
-version = "0.0.57"
+version = "0.0.59"
 description = "A Python package with a built-in web application"
 authors = ["Logspace <contact@logspace.ai>"]
 maintainers = [
@@ -29,7 +29,7 @@ google-search-results = "^2.4.1"
 google-api-python-client = "^2.79.0"
 typer = "^0.7.0"
 gunicorn = "^20.1.0"
-langchain = "^0.0.131"
+langchain = "~0.0.150"
 openai = "^0.27.2"
 types-pyyaml = "^6.0.12.8"
 dill = "^0.3.6"
@@ -57,6 +57,8 @@ httpx = "^0.23.3"
 pytest = "^7.2.2"
 types-requests = "^2.28.11"
 requests = "^2.28.0"
+pytest-cov = "^4.0.0"
+
 
 [tool.ruff]
 line-length = 120

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

src/frontend/src/modals/importModal/index.tsx

@@ -109,10 +109,12 @@ export default function ImportModal() {
                         <ArrowLeftIcon className="h-6 w-6" aria-hidden="true" />
                       </button>
                     </div>
-										<div className="z-50 absolute bottom-2 left-0 hidden pt-4 pl-2 sm:block">
+                    <div className="z-50 absolute bottom-2 left-1/2 transform -translate-x-1/2 hidden pt-4 pl-2 sm:block text-center">
                       <a
                         href="https://github.com/logspace-ai/langflow_examples"
                         target="_blank"
+                        className="flex items-center justify-center"
+                        rel="noreferrer"
                       >
                         <svg
                           width="24"
@@ -126,6 +128,7 @@ export default function ImportModal() {
                             fill="#24292f"
                           />
                         </svg>
+                        <span className="ml-2">LangFlow Examples</span>
                       </a>
                     </div>
                   </>
@@ -143,7 +146,7 @@ export default function ImportModal() {
                         as="h3"
                         className="text-lg font-medium dark:text-white leading-10 text-gray-900"
                       >
-												{showExamples ?"Select an example":"Import from"}
+                        {showExamples ? "Select an example" : "Import from"}
                       </Dialog.Title>
                     </div>
                   </div>

tests/test_llms_template.py

@@ -83,7 +83,7 @@ def test_hugging_face_hub(client: TestClient):
         "list": False,
     }
     assert template["huggingfacehub_api_token"] == {
-        "required": True,
+        "required": False,
         "placeholder": "",
         "show": True,
         "multiline": False,
@@ -241,7 +241,7 @@ def test_openai(client: TestClient):
         "list": False,
     }
     assert template["openai_api_key"] == {
-        "required": True,
+        "required": False,
         "placeholder": "",
         "show": True,
         "multiline": False,
@@ -371,7 +371,7 @@ def test_chat_open_ai(client: TestClient):
         "list": False,
     }
     assert template["openai_api_key"] == {
-        "required": True,
+        "required": False,
         "placeholder": "",
         "show": True,
         "multiline": False,