fix tests to comply with updates and hotfixes (#230)

langflow-ai · May 1, 2023 · 007ebde · 007ebde
2 parents f413a5c + 00a766f
commit 007ebde
Show file tree

Hide file tree

Showing 9 changed files with 128 additions and 116 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langflow"
-version = "0.0.63"
+version = "0.0.64"
 description = "A Python package with a built-in web application"
 authors = ["Logspace <contact@logspace.ai>"]
 maintainers = [

diff --git a/src/backend/langflow/interface/agents/custom.py b/src/backend/langflow/interface/agents/custom.py
@@ -28,7 +28,7 @@
 from langchain.agents.mrkl.prompt import FORMAT_INSTRUCTIONS as SQL_FORMAT_INSTRUCTIONS
 from langchain.llms.base import BaseLLM
 from langchain.memory.chat_memory import BaseChatMemory
-from langchain.schema import BaseLanguageModel
+from langchain.base_language import BaseLanguageModel
 from langchain.sql_database import SQLDatabase
 from langchain.tools.python.tool import PythonAstREPLTool
 from langchain.tools.sql_database.prompt import QUERY_CHECKER

diff --git a/src/backend/langflow/interface/agents/prebuilt.py b/src/backend/langflow/interface/agents/prebuilt.py
@@ -3,7 +3,7 @@
 from langchain.agents.agent_toolkits.json.prompt import JSON_PREFIX, JSON_SUFFIX
 from langchain.agents.agent_toolkits.json.toolkit import JsonToolkit
 from langchain.agents.mrkl.prompt import FORMAT_INSTRUCTIONS
-from langchain.schema import BaseLanguageModel
+from langchain.base_language import BaseLanguageModel
 
 
 class MalfoyAgent(AgentExecutor):

diff --git a/src/backend/langflow/interface/tools/util.py b/src/backend/langflow/interface/tools/util.py
@@ -19,11 +19,19 @@ def get_func_tool_params(func, **kwargs) -> Union[Dict, None]:
                         tool_params = {}
                         for keyword in tool.keywords:
                             if keyword.arg == "name":
-                                tool_params["name"] = ast.literal_eval(keyword.value)
+                                try:
+                                    tool_params["name"] = ast.literal_eval(
+                                        keyword.value
+                                    )
+                                except ValueError:
+                                    break
                             elif keyword.arg == "description":
-                                tool_params["description"] = ast.literal_eval(
-                                    keyword.value
-                                )
+                                try:
+                                    tool_params["description"] = ast.literal_eval(
+                                        keyword.value
+                                    )
+                                except ValueError:
+                                    continue
 
                         return tool_params
                     return {

diff --git a/src/backend/langflow/interface/utils.py b/src/backend/langflow/interface/utils.py
@@ -3,7 +3,7 @@
 import json
 import os
 from PIL.Image import Image
-from langchain.callbacks.base import AsyncCallbackManager
+from langchain.callbacks.manager import AsyncCallbackManager
 from langchain.chat_models import AzureChatOpenAI, ChatOpenAI
 from langchain.llms import AzureOpenAI, OpenAI
 from langflow.api.callback import StreamingLLMCallbackHandler

diff --git a/src/backend/langflow/template/nodes.py b/src/backend/langflow/template/nodes.py
@@ -559,6 +559,10 @@ def format_field(field: TemplateField, name: Optional[str] = None) -> None:
             field.required = False
             field.show = True
             field.advanced = True
+        if field.name == "llm":
+            field.required = True
+            field.show = True
+            field.advanced = False
 
 
 class LLMFrontendNode(FrontendNode):

diff --git a/tests/test_agents_template.py b/tests/test_agents_template.py
@@ -149,7 +149,7 @@ def test_initialize_agent(client: TestClient):
         "name": "agent",
         "type": "str",
         "list": True,
-        "advanced": True,
+        "advanced": False,
     }
     assert template["memory"] == {
         "required": False,
@@ -160,7 +160,7 @@ def test_initialize_agent(client: TestClient):
         "name": "memory",
         "type": "BaseChatMemory",
         "list": False,
-        "advanced": True,
+        "advanced": False,
     }
     assert template["tools"] == {
         "required": False,
@@ -171,7 +171,7 @@ def test_initialize_agent(client: TestClient):
         "name": "tools",
         "type": "Tool",
         "list": True,
-        "advanced": True,
+        "advanced": False,
     }
     assert template["llm"] == {
         "required": True,
@@ -182,5 +182,5 @@ def test_initialize_agent(client: TestClient):
         "name": "llm",
         "type": "BaseLanguageModel",
         "list": False,
-        "advanced": True,
+        "advanced": False,
     }
diff --git a/tests/test_prompts_template.py b/tests/test_prompts_template.py
@@ -60,7 +60,7 @@ def test_prompt_template(client: TestClient):
         "name": "template",
         "type": "prompt",
         "list": False,
-        "advanced": True,
+        "advanced": False,
     }
     assert template["template_format"] == {
         "required": False,
@@ -106,7 +106,7 @@ def test_few_shot_prompt_template(client: TestClient):
         "name": "examples",
         "type": "prompt",
         "list": True,
-        "advanced": True,
+        "advanced": False,
     }
     assert template["example_selector"] == {
         "required": False,
@@ -139,7 +139,7 @@ def test_few_shot_prompt_template(client: TestClient):
         "name": "suffix",
         "type": "prompt",
         "list": False,
-        "advanced": True,
+        "advanced": False,
     }
     assert template["example_separator"] == {
         "required": False,
@@ -163,7 +163,7 @@ def test_few_shot_prompt_template(client: TestClient):
         "name": "prefix",
         "type": "prompt",
         "list": False,
-        "advanced": True,
+        "advanced": False,
     }