- Input Variables:{" "}
- {wordsHighlight && wordsHighlight.length == 0 ? "-" : ""}
+ Input Variables:
{wordsHighlight.map((word, index) => (
@@ -251,7 +249,6 @@ export default function GenericModal({
key={getRandomKeyByssmm() + index}
content={word.replace(/[{}]/g, "")}
asChild={false}
- delayDuration={1500}
>
{
const [nodeLength, setNodeLength] = useState(
diff --git a/src/frontend/src/pages/FlowPage/index.tsx b/src/frontend/src/pages/FlowPage/index.tsx
index a13fabd98..f9b170197 100644
--- a/src/frontend/src/pages/FlowPage/index.tsx
+++ b/src/frontend/src/pages/FlowPage/index.tsx
@@ -1,8 +1,8 @@
import { useContext, useEffect, useState } from "react";
-import Page from "./components/PageComponent";
-import { TabsContext } from "../../contexts/tabsContext";
import { useParams } from "react-router-dom";
+import { TabsContext } from "../../contexts/tabsContext";
import { getVersion } from "../../controllers/API";
+import Page from "./components/PageComponent";
export default function FlowPage() {
const { flows, tabId, setTabId } = useContext(TabsContext);
diff --git a/src/frontend/src/pages/MainPage/index.tsx b/src/frontend/src/pages/MainPage/index.tsx
index 99df6a8a8..e2871a313 100644
--- a/src/frontend/src/pages/MainPage/index.tsx
+++ b/src/frontend/src/pages/MainPage/index.tsx
@@ -1,10 +1,10 @@
+import { Download, ExternalLink, Home, Plus, Upload } from "lucide-react";
import { useContext, useEffect } from "react";
-import { Download, Upload, Plus, Home, ExternalLink } from "lucide-react";
-import { TabsContext } from "../../contexts/tabsContext";
-import { Button } from "../../components/ui/button";
import { Link, useNavigate } from "react-router-dom";
import { CardComponent } from "../../components/cardComponent";
+import { Button } from "../../components/ui/button";
import { USER_PROJECTS_HEADER } from "../../constants";
+import { TabsContext } from "../../contexts/tabsContext";
export default function HomePage() {
const { flows, setTabId, downloadFlows, uploadFlows, addFlow, removeFlow } =
useContext(TabsContext);
diff --git a/src/frontend/src/prettierrc.js b/src/frontend/src/prettierrc.js
new file mode 100644
index 000000000..0be5884c6
--- /dev/null
+++ b/src/frontend/src/prettierrc.js
@@ -0,0 +1,4 @@
+module.exports = {
+ // ...
+ organizeImportsSkipDestructiveCodeActions: true,
+};
diff --git a/src/frontend/src/routes.tsx b/src/frontend/src/routes.tsx
index a208b121a..21b73f70b 100644
--- a/src/frontend/src/routes.tsx
+++ b/src/frontend/src/routes.tsx
@@ -1,7 +1,7 @@
import { Route, Routes } from "react-router-dom";
-import HomePage from "./pages/MainPage";
-import FlowPage from "./pages/FlowPage";
import CommunityPage from "./pages/CommunityPage";
+import FlowPage from "./pages/FlowPage";
+import HomePage from "./pages/MainPage";
const Router = () => {
return (
diff --git a/src/frontend/src/types/api/index.ts b/src/frontend/src/types/api/index.ts
index 505aae044..eaf862f29 100644
--- a/src/frontend/src/types/api/index.ts
+++ b/src/frontend/src/types/api/index.ts
@@ -1,4 +1,4 @@
-import { Node, Edge, Viewport } from "reactflow";
+import { Edge, Node, Viewport } from "reactflow";
//kind and class are just representative names to represent the actual structure of the object received by the API
export type APIObjectType = { kind: APIKindType; [key: string]: APIKindType };
diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts
index 984652b9a..56269627e 100644
--- a/src/frontend/src/types/components/index.ts
+++ b/src/frontend/src/types/components/index.ts
@@ -1,7 +1,7 @@
import { ReactElement, ReactNode } from "react";
+import { APIClassType } from "../api";
import { NodeDataType } from "../flow/index";
import { typesContextType } from "../typesContext";
-import { APIClassType } from "../api";
export type InputComponentType = {
value: string;
disabled?: boolean;
@@ -147,6 +147,7 @@ export type ShadToolTipType = {
asChild?: boolean;
children?: ReactElement;
delayDuration?: number;
+ style?: string;
};
export type TextHighlightType = {
diff --git a/src/frontend/src/types/flow/index.ts b/src/frontend/src/types/flow/index.ts
index b1f86392b..ccf9933ee 100644
--- a/src/frontend/src/types/flow/index.ts
+++ b/src/frontend/src/types/flow/index.ts
@@ -1,6 +1,5 @@
-import { ChatMessageType } from "./../chat/index";
-import { APIClassType } from "../api/index";
import { ReactFlowJsonObject, XYPosition } from "reactflow";
+import { APIClassType } from "../api/index";
export type FlowType = {
name: string;
diff --git a/src/frontend/src/utils.ts b/src/frontend/src/utils.ts
index 7626a7056..7fb0cacb1 100644
--- a/src/frontend/src/utils.ts
+++ b/src/frontend/src/utils.ts
@@ -1,34 +1,9 @@
-import { Connection, Edge, Node, ReactFlowInstance } from "reactflow";
-import { FlowType, NodeType } from "./types/flow";
-import { APITemplateType } from "./types/api";
-import _ from "lodash";
-import { ChromaIcon } from "./icons/ChromaIcon";
-import { AnthropicIcon } from "./icons/Anthropic";
-import { AirbyteIcon } from "./icons/Airbyte";
-import { BingIcon } from "./icons/Bing";
-import { CohereIcon } from "./icons/Cohere";
-import { EvernoteIcon } from "./icons/Evernote";
-import { FBIcon } from "./icons/FacebookMessenger";
-import { GitBookIcon } from "./icons/GitBook";
-import { GoogleIcon } from "./icons/Google";
-import { HackerNewsIcon } from "./icons/hackerNews";
-import { HugginFaceIcon } from "./icons/HuggingFace";
-import { IFixIcon } from "./icons/IFixIt";
-import { MetaIcon } from "./icons/Meta";
-import { MidjourneyIcon } from "./icons/Midjorney";
-import { NotionIcon } from "./icons/Notion";
-import { OpenAiIcon } from "./icons/OpenAi";
-import { QDrantIcon } from "./icons/QDrant";
-import { SearxIcon } from "./icons/Searx";
-import { SlackIcon } from "./icons/Slack";
-import { PineconeIcon } from "./icons/Pinecone";
import clsx, { ClassValue } from "clsx";
-import { twMerge } from "tailwind-merge";
-import { ADJECTIVES, DESCRIPTIONS, NOUNS } from "./flow_constants";
-import { ComponentType, SVGProps } from "react";
+import _ from "lodash";
import {
Compass,
Cpu,
+ FileSearch,
Fingerprint,
Gift,
Hammer,
@@ -41,15 +16,40 @@ import {
Paperclip,
Rocket,
Scissors,
- FileSearch,
TerminalSquare,
Wand2,
Wrench,
} from "lucide-react";
-import { SupabaseIcon } from "./icons/supabase";
+import { ComponentType, SVGProps } from "react";
+import { Connection, Edge, Node, ReactFlowInstance } from "reactflow";
+import { twMerge } from "tailwind-merge";
+import { ADJECTIVES, DESCRIPTIONS, NOUNS } from "./flow_constants";
+import { AirbyteIcon } from "./icons/Airbyte";
+import { AnthropicIcon } from "./icons/Anthropic";
+import { BingIcon } from "./icons/Bing";
+import { ChromaIcon } from "./icons/ChromaIcon";
+import { CohereIcon } from "./icons/Cohere";
+import { EvernoteIcon } from "./icons/Evernote";
+import { FBIcon } from "./icons/FacebookMessenger";
+import { GitBookIcon } from "./icons/GitBook";
+import { GoogleIcon } from "./icons/Google";
+import { HugginFaceIcon } from "./icons/HuggingFace";
+import { IFixIcon } from "./icons/IFixIt";
+import { MetaIcon } from "./icons/Meta";
+import { MidjourneyIcon } from "./icons/Midjorney";
import { MongoDBIcon } from "./icons/MongoDB";
+import { NotionIcon } from "./icons/Notion";
+import { OpenAiIcon } from "./icons/OpenAi";
+import { PineconeIcon } from "./icons/Pinecone";
+import { QDrantIcon } from "./icons/QDrant";
+import { SearxIcon } from "./icons/Searx";
+import { SlackIcon } from "./icons/Slack";
import { VertexAIIcon } from "./icons/VertexAI";
+import { HackerNewsIcon } from "./icons/hackerNews";
+import { SupabaseIcon } from "./icons/supabase";
+import { APITemplateType } from "./types/api";
import { IVarHighlightType } from "./types/components";
+import { FlowType, NodeType } from "./types/flow";
export function classNames(...classes: Array) {
return classes.filter(Boolean).join(" ");
@@ -911,7 +911,7 @@ export function buildInputs(tabsState, id) {
tabsState[id].formKeysData.input_keys &&
Object.keys(tabsState[id].formKeysData.input_keys).length > 0
? JSON.stringify(tabsState[id].formKeysData.input_keys)
- : '{"input": message}';
+ : '{"input": "message"}';
}
export function buildTweaks(flow) {
diff --git a/src/frontend/vite.config.ts b/src/frontend/vite.config.ts
index 860c690ea..f051c2eee 100644
--- a/src/frontend/vite.config.ts
+++ b/src/frontend/vite.config.ts
@@ -1,5 +1,5 @@
-import { defineConfig } from "vite";
import react from "@vitejs/plugin-react-swc";
+import { defineConfig } from "vite";
import svgr from "vite-plugin-svgr";
const apiRoutes = ["^/api/v1/", "/health"];
diff --git a/tests/test_agents_template.py b/tests/test_agents_template.py
index bf89f9996..93f4f8b5b 100644
--- a/tests/test_agents_template.py
+++ b/tests/test_agents_template.py
@@ -16,30 +16,94 @@ def test_zero_shot_agent(client: TestClient):
}
template = zero_shot_agent["template"]
- assert template["llm_chain"] == {
+ assert template["tools"] == {
"required": True,
"placeholder": "",
"show": True,
"multiline": False,
"password": False,
- "name": "llm_chain",
- "type": "LLMChain",
+ "name": "tools",
+ "type": "BaseTool",
+ "list": True,
+ "advanced": False,
+ "info": "",
+ }
+
+ # Additional assertions for other template variables
+ assert template["callback_manager"] == {
+ "required": False,
+ "placeholder": "",
+ "show": False,
+ "multiline": False,
+ "password": False,
+ "name": "callback_manager",
+ "type": "BaseCallbackManager",
"list": False,
"advanced": False,
"info": "",
}
- assert template["allowed_tools"] == {
- "required": False,
+ assert template["llm"] == {
+ "required": True,
"placeholder": "",
"show": True,
"multiline": False,
"password": False,
- "name": "allowed_tools",
- "type": "Tool",
+ "name": "llm",
+ "type": "BaseLanguageModel",
+ "list": False,
+ "advanced": False,
+ "info": "",
+ }
+ assert template["output_parser"] == {
+ "required": False,
+ "placeholder": "",
+ "show": False,
+ "multiline": False,
+ "password": False,
+ "name": "output_parser",
+ "type": "AgentOutputParser",
+ "list": False,
+ "advanced": False,
+ "info": "",
+ }
+ assert template["input_variables"] == {
+ "required": False,
+ "placeholder": "",
+ "show": False,
+ "multiline": False,
+ "password": False,
+ "name": "input_variables",
+ "type": "str",
"list": True,
"advanced": False,
"info": "",
}
+ assert template["prefix"] == {
+ "required": False,
+ "placeholder": "",
+ "show": True,
+ "multiline": True,
+ "value": "Answer the following questions as best you can. You have access to the following tools:",
+ "password": False,
+ "name": "prefix",
+ "type": "str",
+ "list": False,
+ "advanced": False,
+ "info": "",
+ }
+ assert template["suffix"] == {
+ "required": False,
+ "placeholder": "",
+ "show": True,
+ "multiline": True,
+ "value": "Begin!\n\nQuestion: {input}\nThought:{agent_scratchpad}",
+ "password": False,
+ "name": "suffix",
+ "type": "str",
+ "list": False,
+ "advanced": False,
+ "info": "",
+ }
def test_json_agent(client: TestClient):
diff --git a/tests/test_endpoints.py b/tests/test_endpoints.py
index 9e07dfb24..045af1ba5 100644
--- a/tests/test_endpoints.py
+++ b/tests/test_endpoints.py
@@ -1,6 +1,86 @@
import pytest
from fastapi.testclient import TestClient
from langflow.interface.tools.constants import CUSTOM_TOOLS
+from langflow.template.frontend_node.chains import TimeTravelGuideChainNode
+
+
+PROMPT_REQUEST = {
+ "name": "string",
+ "template": "string",
+ "frontend_node": {
+ "template": {},
+ "description": "string",
+ "base_classes": ["string"],
+ "name": "",
+ "display_name": "",
+ "documentation": "",
+ "custom_fields": {},
+ "output_types": [],
+ "field_formatters": {
+ "formatters": {"openai_api_key": {}},
+ "base_formatters": {
+ "kwargs": {},
+ "optional": {},
+ "list": {},
+ "dict": {},
+ "union": {},
+ "multiline": {},
+ "show": {},
+ "password": {},
+ "default": {},
+ "headers": {},
+ "dict_code_file": {},
+ "model_fields": {
+ "MODEL_DICT": {
+ "OpenAI": [
+ "text-davinci-003",
+ "text-davinci-002",
+ "text-curie-001",
+ "text-babbage-001",
+ "text-ada-001",
+ ],
+ "ChatOpenAI": [
+ "gpt-3.5-turbo-0613",
+ "gpt-3.5-turbo",
+ "gpt-3.5-turbo-16k-0613",
+ "gpt-3.5-turbo-16k",
+ "gpt-4-0613",
+ "gpt-4-32k-0613",
+ "gpt-4",
+ "gpt-4-32k",
+ ],
+ "Anthropic": [
+ "claude-v1",
+ "claude-v1-100k",
+ "claude-instant-v1",
+ "claude-instant-v1-100k",
+ "claude-v1.3",
+ "claude-v1.3-100k",
+ "claude-v1.2",
+ "claude-v1.0",
+ "claude-instant-v1.1",
+ "claude-instant-v1.1-100k",
+ "claude-instant-v1.0",
+ ],
+ "ChatAnthropic": [
+ "claude-v1",
+ "claude-v1-100k",
+ "claude-instant-v1",
+ "claude-instant-v1-100k",
+ "claude-v1.3",
+ "claude-v1.3-100k",
+ "claude-v1.2",
+ "claude-v1.0",
+ "claude-instant-v1.1",
+ "claude-instant-v1.1-100k",
+ "claude-instant-v1.0",
+ ],
+ }
+ },
+ },
+ },
+ },
+}
def test_get_all(client: TestClient):
@@ -8,7 +88,7 @@ def test_get_all(client: TestClient):
assert response.status_code == 200
json_response = response.json()
# We need to test the custom nodes
- assert "ZeroShotPrompt" in json_response["prompts"]
+ assert "PromptTemplate" in json_response["prompts"]
# All CUSTOM_TOOLS(dict) should be in the response
assert all(tool in json_response["tools"] for tool in CUSTOM_TOOLS.keys())
@@ -95,15 +175,20 @@ INVALID_PROMPT = "This is an invalid prompt without any input variable."
def test_valid_prompt(client: TestClient):
- response = client.post("api/v1/validate/prompt", json={"template": VALID_PROMPT})
+ PROMPT_REQUEST["template"] = VALID_PROMPT
+ response = client.post("api/v1/validate/prompt", json=PROMPT_REQUEST)
assert response.status_code == 200
- assert response.json() == {"input_variables": ["product"]}
+ assert response.json()["input_variables"] == ["product"]
def test_invalid_prompt(client: TestClient):
- response = client.post("api/v1/validate/prompt", json={"template": INVALID_PROMPT})
+ PROMPT_REQUEST["template"] = INVALID_PROMPT
+ response = client.post(
+ "api/v1/validate/prompt",
+ json=PROMPT_REQUEST,
+ )
assert response.status_code == 200
- assert response.json() == {"input_variables": []}
+ assert response.json()["input_variables"] == []
@pytest.mark.parametrize(
@@ -116,8 +201,8 @@ def test_invalid_prompt(client: TestClient):
],
)
def test_various_prompts(client, prompt, expected_input_variables):
- response = client.post("api/v1/validate/prompt", json={"template": prompt})
+ TimeTravelGuideChainNode().to_dict()
+ PROMPT_REQUEST["template"] = prompt
+ response = client.post("api/v1/validate/prompt", json=PROMPT_REQUEST)
assert response.status_code == 200
- assert response.json() == {
- "input_variables": expected_input_variables,
- }
+ assert response.json()["input_variables"] == expected_input_variables
diff --git a/tests/test_graph.py b/tests/test_graph.py
index 11f97e044..228bbb4d6 100644
--- a/tests/test_graph.py
+++ b/tests/test_graph.py
@@ -9,13 +9,9 @@ from langchain.chains.base import Chain
from langchain.llms.fake import FakeListLLM
from langflow.graph import Graph
from langflow.graph.vertex.types import (
- AgentVertex,
- ChainVertex,
FileToolVertex,
LLMVertex,
- PromptVertex,
ToolkitVertex,
- ToolVertex,
WrapperVertex,
)
from langflow.processing.process import get_result_and_thought
@@ -244,10 +240,9 @@ def test_build_params(basic_graph):
assert "memory" in root.params
-def test_build(basic_graph, complex_graph):
+def test_build(basic_graph):
"""Test Node's build method"""
assert_agent_was_built(basic_graph)
- assert_agent_was_built(complex_graph)
def assert_agent_was_built(graph):
@@ -260,34 +255,6 @@ def assert_agent_was_built(graph):
assert isinstance(result, Chain)
-def test_agent_node_build(complex_graph):
- agent_node = get_node_by_type(complex_graph, AgentVertex)
- assert agent_node is not None
- built_object = agent_node.build()
- assert built_object is not None
-
-
-def test_tool_node_build(complex_graph):
- tool_node = get_node_by_type(complex_graph, ToolVertex)
- assert tool_node is not None
- built_object = tool_node.build()
- assert built_object is not None
-
-
-def test_chain_node_build(complex_graph):
- chain_node = get_node_by_type(complex_graph, ChainVertex)
- assert chain_node is not None
- built_object = chain_node.build()
- assert built_object is not None
-
-
-def test_prompt_node_build(complex_graph):
- prompt_node = get_node_by_type(complex_graph, PromptVertex)
- assert prompt_node is not None
- built_object = prompt_node.build()
- assert built_object is not None
-
-
def test_llm_node_build(basic_graph):
llm_node = get_node_by_type(basic_graph, LLMVertex)
assert llm_node is not None
diff --git a/tests/test_prompts_template.py b/tests/test_prompts_template.py
index 4e6030cab..5486f3034 100644
--- a/tests/test_prompts_template.py
+++ b/tests/test_prompts_template.py
@@ -92,51 +92,3 @@ def test_prompt_template(client: TestClient):
"advanced": False,
"info": "",
}
-
-
-def test_zero_shot_prompt(client: TestClient):
- response = client.get("api/v1/all")
- assert response.status_code == 200
- json_response = response.json()
- prompts = json_response["prompts"]
- prompt = prompts["ZeroShotPrompt"]
- template = prompt["template"]
- assert template["prefix"] == {
- "required": False,
- "placeholder": "",
- "show": True,
- "multiline": True,
- "value": "Answer the following questions as best you can. You have access to the following tools:", # noqa: E501
- "password": False,
- "name": "prefix",
- "type": "prompt",
- "list": False,
- "advanced": False,
- "info": "",
- }
- assert template["suffix"] == {
- "required": True,
- "placeholder": "",
- "show": True,
- "multiline": True,
- "value": "Begin!\n\nQuestion: {input}\nThought:{agent_scratchpad}",
- "password": False,
- "name": "suffix",
- "type": "prompt",
- "list": False,
- "advanced": False,
- "info": "",
- }
- assert template["format_instructions"] == {
- "required": True,
- "placeholder": "",
- "show": True,
- "multiline": True,
- "value": "Use the following format:\n\nQuestion: the input question you must answer\nThought: you should always think about what to do\nAction: the action to take, should be one of [{tool_names}]\nAction Input: the input to the action\nObservation: the result of the action\n... (this Thought/Action/Action Input/Observation can repeat N times)\nThought: I now know the final answer\nFinal Answer: the final answer to the original input question", # noqa: E501
- "password": False,
- "name": "format_instructions",
- "type": "prompt",
- "list": False,
- "advanced": False,
- "info": "",
- }