-
);
}
diff --git a/src/frontend/src/pages/FlowPage/components/ParentDisclosureComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/ParentDisclosureComponent/index.tsx
index c5ff8d767..962e134d2 100644
--- a/src/frontend/src/pages/FlowPage/components/ParentDisclosureComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/ParentDisclosureComponent/index.tsx
@@ -18,7 +18,7 @@ export default function ParentDisclosureComponent({
data-testid={testId}
>
- {Object.keys(templates).length > 0 &&
- Object.keys(types).length > 0 ? (
- {
+ handleGroupNode();
+ }}
+ />
+
-
+ ) : (
+ <>
+ )}
-
-
+ {showCanvas ? (
+
)}
-
+
+
+ {
- handleGroupNode();
- }}
- />
-
- {!view &&
- ) : (
- <>
+ >
- {title}
+ {title}
{buttons.map((btn, index) => (
@@ -28,9 +28,9 @@ export default function ParentDisclosureComponent({
))}
-
-
- Get Started
-
- {/* */}
-
-
-
-
+ ((set, get) => ({
}
get().setFlowPool(newFlowPool);
},
+ getNodePosition: (nodeId: string) => {
+ const node = get().nodes.find((node) => node.id === nodeId);
+ return node?.position || { x: 0, y: 0 };
+ },
updateFlowPool: (
nodeId: string,
data: FlowPoolObjectType | ChatOutputType | chatInputType,
@@ -525,9 +529,9 @@ const useFlowStore = create((set, get) => ({
onGetOrderSuccess: () => {
setNoticeData({ title: "Running components" });
},
- onBuildComplete: () => {
+ onBuildComplete: (allNodesValid) => {
const nodeId = startNodeId || stopNodeId;
- if (nodeId) {
+ if (nodeId && allNodesValid) {
setSuccessData({
title: `${
get().nodes.find((node) => node.id === nodeId)?.data.node
diff --git a/src/frontend/src/stores/flowsManagerStore.ts b/src/frontend/src/stores/flowsManagerStore.ts
index 2ca51a4c4..9471889c3 100644
--- a/src/frontend/src/stores/flowsManagerStore.ts
+++ b/src/frontend/src/stores/flowsManagerStore.ts
@@ -96,19 +96,19 @@ const useFlowsManagerStore = create((set, get) => ({
});
});
},
- autoSaveCurrentFlow: debounce(
- (nodes: Node[], edges: Edge[], viewport: Viewport) => {
- set({ saveLoading: true });
- if (get().currentFlow) {
- get().saveFlow(
- { ...get().currentFlow!, data: { nodes, edges, viewport } },
- true
- );
- }
- },
- SAVE_DEBOUNCE_TIME
- ),
+ autoSaveCurrentFlow: (nodes: Node[], edges: Edge[], viewport: Viewport) => {
+ if (get().currentFlow) {
+ get().saveFlow(
+ { ...get().currentFlow!, data: { nodes, edges, viewport } },
+ true
+ );
+ }
+ },
saveFlow: (flow: FlowType, silent?: boolean) => {
+ set({ saveLoading: true }); // set saveLoading true immediately
+ return get().saveFlowDebounce(flow, silent); // call the debounced function directly
+ },
+ saveFlowDebounce: debounce((flow: FlowType, silent?: boolean) => {
set({ saveLoading: true });
return new Promise((resolve, reject) => {
updateFlowInDatabase(flow)
@@ -142,7 +142,7 @@ const useFlowsManagerStore = create((set, get) => ({
reject(err);
});
});
- },
+ }, SAVE_DEBOUNCE_TIME),
uploadFlows: () => {
return new Promise((resolve) => {
const input = document.createElement("input");
diff --git a/src/frontend/src/style/applies.css b/src/frontend/src/style/applies.css
index 5b1928e76..8900938bf 100644
--- a/src/frontend/src/style/applies.css
+++ b/src/frontend/src/style/applies.css
@@ -184,7 +184,7 @@
@apply fill-chat-trigger-disabled stroke-chat-trigger-disabled stroke-1;
}
.parent-disclosure-arrangement {
- @apply flex w-full select-none items-center justify-between border-y border-y-input bg-background px-3 py-2;
+ @apply flex w-full select-none items-center justify-between bg-background px-3 py-1;
}
.components-disclosure-arrangement {
@apply -mt-px flex w-full select-none items-center justify-between border-y border-y-input bg-muted px-3 py-2;
@@ -194,7 +194,7 @@
@apply -mt-px flex w-full select-none items-center justify-between border-y border-y-input bg-muted px-3 py-2;
}
.parent-disclosure-title {
- @apply p-2 px-2 text-sm font-semibold;
+ @apply p-2 px-2 text-sm font-medium;
}
.components-disclosure-title {
@apply flex items-center text-sm text-primary;
@@ -917,7 +917,7 @@
@apply mr-2 h-5 w-5 rotate-[44deg];
}
.form-modal-play-icon {
- @apply mx-1 h-5 w-5;
+ @apply mx-1 h-5 w-5 fill-current;
}
.form-modal-chat-position {
@apply flex-max-width px-2 py-6 pl-4 pr-9;
diff --git a/src/frontend/src/types/components/index.ts b/src/frontend/src/types/components/index.ts
index 8ae482716..3a92a1ba1 100644
--- a/src/frontend/src/types/components/index.ts
+++ b/src/frontend/src/types/components/index.ts
@@ -1,5 +1,6 @@
import { ReactElement, ReactNode, SetStateAction } from "react";
-import { ReactFlowJsonObject, XYPosition } from "reactflow";
+import { ReactFlowJsonObject } from "reactflow";
+import { InputOutput } from "../../constants/enums";
import { APIClassType, APITemplateType, TemplateVariableType } from "../api";
import { ChatMessageType } from "../chat";
import { FlowStyleType, FlowType, NodeDataType, NodeType } from "../flow/index";
@@ -171,6 +172,7 @@ export type RangeSpecType = {
export type IntComponentType = {
value: string;
disabled?: boolean;
+ rangeSpec: RangeSpecType;
onChange: (value: string) => void;
editNode?: boolean;
id?: string;
@@ -219,6 +221,8 @@ export type AccordionComponentType = {
open?: string[];
trigger?: string | ReactElement;
keyValue?: string;
+ openDisc?: boolean;
+ sideBar?: boolean;
};
export type Side = "top" | "right" | "bottom" | "left";
@@ -500,7 +504,6 @@ export type fileCardPropsType = {
export type nodeToolbarPropsType = {
data: NodeDataType;
deleteNode: (idx: string) => void;
- position: XYPosition;
setShowNode: (boolean: any) => void;
numberOfHandles: number;
showNode: boolean;
@@ -565,12 +568,6 @@ export type chatMessagePropsType = {
) => void;
};
-export type formModalPropsType = {
- open: boolean;
- setOpen: Function;
- flow: FlowType;
-};
-
export type genericModalPropsType = {
field_name?: string;
setValue: (value: string) => void;
@@ -585,6 +582,18 @@ export type genericModalPropsType = {
readonly?: boolean;
};
+export type newFlowModalPropsType = {
+ open: boolean;
+ setOpen: (open: boolean) => void;
+};
+
+export type IOModalPropsType = {
+ children: JSX.Element;
+ open: boolean;
+ setOpen: (open: boolean) => void;
+ disable?: boolean;
+};
+
export type buttonBoxPropsType = {
onClick: () => void;
title: string;
@@ -695,15 +704,21 @@ export type dropdownButtonPropsType = {
dropdownOptions?: boolean;
};
-export type IOInputProps = {
- inputType: string;
- inputId: string;
+export type IOFieldViewProps = {
+ type: InputOutput;
+ fieldType: string;
+ fieldId: string;
left?: boolean;
};
-export type IOOutputProps = {
- outputType: string;
- outputId: string;
- left?: boolean;
+
+export type UndrawCardComponentProps = { flow: FlowType };
+
+export type chatViewProps = {
+ sendMessage: (count?: number) => void;
+ chatValue: string;
+ setChatValue: (value: string) => void;
+ lockChat: boolean;
+ setLockChat: (lock: boolean) => void;
};
export type IOFileInputProps = {
diff --git a/src/frontend/src/types/zustand/flow/index.ts b/src/frontend/src/types/zustand/flow/index.ts
index 71853c5a7..d88504909 100644
--- a/src/frontend/src/types/zustand/flow/index.ts
+++ b/src/frontend/src/types/zustand/flow/index.ts
@@ -131,4 +131,5 @@ export type FlowStoreType = {
data: FlowPoolObjectType | ChatOutputType | chatInputType,
buildId?: string
) => void;
+ getNodePosition: (nodeId: string) => { x: number; y: number };
};
diff --git a/src/frontend/src/types/zustand/flowsManager/index.ts b/src/frontend/src/types/zustand/flowsManager/index.ts
index 87fbf9a22..817ddd3d1 100644
--- a/src/frontend/src/types/zustand/flowsManager/index.ts
+++ b/src/frontend/src/types/zustand/flowsManager/index.ts
@@ -11,7 +11,11 @@ export type FlowsManagerStoreType = {
isLoading: boolean;
setIsLoading: (isLoading: boolean) => void;
refreshFlows: () => Promise;
- saveFlow: (flow: FlowType, silent?: boolean) => Promise;
+ saveFlow: (flow: FlowType, silent?: boolean) => Promise | undefined;
+ saveFlowDebounce: (
+ flow: FlowType,
+ silent?: boolean
+ ) => Promise | undefined;
autoSaveCurrentFlow: (
nodes: Node[],
edges: Edge[],
diff --git a/src/frontend/src/utils/buildUtils.ts b/src/frontend/src/utils/buildUtils.ts
index 46b81ba9d..bc2cc62e7 100644
--- a/src/frontend/src/utils/buildUtils.ts
+++ b/src/frontend/src/utils/buildUtils.ts
@@ -204,12 +204,11 @@ export async function buildVertices({
if (stop) {
break;
}
-
- if (onBuildComplete) {
- const allNodesValid = buildResults.every((result) => result);
- onBuildComplete(allNodesValid);
- useFlowStore.getState().setIsBuilding(false);
- }
+ }
+ if (onBuildComplete) {
+ const allNodesValid = buildResults.every((result) => result);
+ onBuildComplete(allNodesValid);
+ useFlowStore.getState().setIsBuilding(false);
}
}
async function buildVertex({
diff --git a/src/frontend/src/utils/parameterUtils.ts b/src/frontend/src/utils/parameterUtils.ts
index d950ac0c1..087e7eb1f 100644
--- a/src/frontend/src/utils/parameterUtils.ts
+++ b/src/frontend/src/utils/parameterUtils.ts
@@ -1,4 +1,4 @@
-import { throttle } from "lodash";
+import { debounce } from "lodash";
import { postCustomComponentUpdate } from "../controllers/API";
import { ResponseErrorTypeAPI } from "../types/api";
import { NodeDataType } from "../types/flow";
@@ -38,4 +38,4 @@ export const handleUpdateValues = async (name: string, data: NodeDataType) => {
}
};
-export const throttledHandleUpdateValues = throttle(handleUpdateValues, 10);
+export const debouncedHandleUpdateValues = debounce(handleUpdateValues, 200);
diff --git a/src/frontend/src/utils/reactflowUtils.ts b/src/frontend/src/utils/reactflowUtils.ts
index 1a803bf82..f9de6099b 100644
--- a/src/frontend/src/utils/reactflowUtils.ts
+++ b/src/frontend/src/utils/reactflowUtils.ts
@@ -1170,7 +1170,7 @@ export function downloadNode(NodeFLow: FlowType) {
type: "application/json",
});
element.href = URL.createObjectURL(file);
- element.download = `${NodeFLow?.name??"node"}.json`;
+ element.download = `${NodeFLow?.name ?? "node"}.json`;
element.click();
}
diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts
index 245a2058d..7a828a204 100644
--- a/src/frontend/src/utils/styleUtils.ts
+++ b/src/frontend/src/utils/styleUtils.ts
@@ -22,6 +22,7 @@ import {
ChevronsRight,
ChevronsUpDown,
Circle,
+ ChevronsUpDownIcon,
CircleDot,
Clipboard,
Code,
@@ -116,6 +117,7 @@ import {
TerminalIcon,
TerminalSquare,
TextCursorInput,
+ TextSearch,
ToyBrick,
Trash2,
Type,
@@ -150,6 +152,7 @@ import { EvernoteIcon } from "../icons/Evernote";
import { FBIcon } from "../icons/FacebookMessenger";
import { GitBookIcon } from "../icons/GitBook";
import { GoogleIcon } from "../icons/Google";
+import { GoogleGenerativeAIIcon } from "../icons/GoogleGenerativeAI";
import {
GradientInfinity,
GradientSave,
@@ -217,11 +220,11 @@ export const gradients = [
];
export const nodeColors: { [char: string]: string } = {
- inputs: "#9AAE42",
+ inputs: "#10B981",
outputs: "#AA2411",
- data: "#6344BE",
+ data: "#4367BF",
prompts: "#4367BF",
- models: "#AA2411",
+ models: "#6344BE",
model_specs: "#6344BE",
chains: "#FE7500",
Document: "#7AAE42",
@@ -249,6 +252,9 @@ export const nodeColors: { [char: string]: string } = {
retrievers: "#e6b25a",
unknown: "#9CA3AF",
custom_components: "#ab11ab",
+ Records:"#31a3cc",
+ Record:"#31a3cc",
+
};
export const nodeNames: { [char: string]: string } = {
@@ -319,6 +325,7 @@ export const nodeIconsLucide: iconsType = {
BingSearchAPIWrapper: BingIcon,
BingSearchRun: BingIcon,
Cohere: CohereIcon,
+ ChevronsUpDownIcon,
CohereEmbeddings: CohereIcon,
EverNoteLoader: EvernoteIcon,
FacebookChatLoader: FBIcon,
@@ -327,6 +334,7 @@ export const nodeIconsLucide: iconsType = {
GoogleSearchResults: GoogleIcon,
GoogleSearchRun: GoogleIcon,
Google: GoogleIcon,
+ GoogleGenerativeAI: GoogleGenerativeAIIcon,
HNLoader: HackerNewsIcon,
HuggingFaceHub: HuggingFaceIcon,
HuggingFace: HuggingFaceIcon,
@@ -371,7 +379,7 @@ export const nodeIconsLucide: iconsType = {
saved_components: GradientSave,
documentloaders: Paperclip,
vectorstores: Layers,
- vectorsearch: Search,
+ vectorsearch: TextSearch,
toolkits: Package2,
textsplitters: Scissors,
wrappers: Gift,
diff --git a/src/frontend/src/utils/utils.ts b/src/frontend/src/utils/utils.ts
index 28d28fa90..9ac30a900 100644
--- a/src/frontend/src/utils/utils.ts
+++ b/src/frontend/src/utils/utils.ts
@@ -289,11 +289,10 @@ export function buildTweakObject(tweak: tweakType) {
/**
* Function to get Chat Input Field
- * @param {FlowType} flow - The current flow.
* @param {FlowsState} tabsState - The current tabs state.
* @returns {string} - The chat input field
*/
-export function getChatInputField(flow: FlowType, flowState?: FlowState) {
+export function getChatInputField(flowState?: FlowState) {
let chat_input_field = "text";
if (flowState && flowState.input_keys) {
@@ -305,13 +304,14 @@ export function getChatInputField(flow: FlowType, flowState?: FlowState) {
/**
* Function to get the python code for the API
* @param {string} flowId - The id of the flow
+ * @param {boolean} isAuth - If the API is authenticated
+ * @param {any[]} tweak - The tweaks
* @returns {string} - The python code
*/
export function getPythonApiCode(
flow: FlowType,
isAuth: boolean,
- tweak?: any[],
- flowState?: FlowState
+ tweak?: any[]
): string {
const flowId = flow.id;
@@ -320,13 +320,10 @@ export function getPythonApiCode(
// node.data.id
// }
const tweaks = buildTweaks(flow);
- const inputs = buildInputs();
return `import requests
from typing import Optional
-BASE_API_URL = "${window.location.protocol}//${
- window.location.host
- }/api/v1/process"
+BASE_API_URL = "${window.location.protocol}//${window.location.host}/api/v1/run"
FLOW_ID = "${flowId}"
# You can tweak the flow by adding a tweaks dictionary
# e.g {"OpenAI-XXXXX": {"model_name": "gpt-4"}}
@@ -336,9 +333,12 @@ TWEAKS = ${
: JSON.stringify(tweaks, null, 2)
}
-def run_flow(inputs: dict, flow_id: str, tweaks: Optional[dict] = None${
- !isAuth ? `, api_key: Optional[str] = None` : ""
- }) -> dict:
+def run_flow(message: str,
+ flow_id: str,
+ output_type: str = "chat",
+ input_type: str = "chat",
+ tweaks: Optional[dict] = None,
+ api_key: Optional[str] = None) -> dict:
"""
Run a flow with a given message and optional tweaks.
@@ -349,7 +349,11 @@ def run_flow(inputs: dict, flow_id: str, tweaks: Optional[dict] = None${
"""
api_url = f"{BASE_API_URL}/{flow_id}"
- payload = {"inputs": inputs}
+ payload = {
+ "input_value": message,
+ "output_type": output_type,
+ "input_type": input_type,
+ }
headers = None
if tweaks:
payload["tweaks"] = tweaks
@@ -359,9 +363,9 @@ def run_flow(inputs: dict, flow_id: str, tweaks: Optional[dict] = None${
return response.json()
# Setup any tweaks you want to apply to the flow
-inputs = ${inputs}
+message = "message"
${!isAuth ? `api_key = ""` : ""}
-print(run_flow(inputs, flow_id=FLOW_ID, tweaks=TWEAKS${
+print(run_flow(message=message, flow_id=FLOW_ID, tweaks=TWEAKS${
!isAuth ? `, api_key=api_key` : ""
}))`;
}
@@ -369,28 +373,27 @@ print(run_flow(inputs, flow_id=FLOW_ID, tweaks=TWEAKS${
/**
* Function to get the curl code for the API
* @param {string} flowId - The id of the flow
+ * @param {boolean} isAuth - If the API is authenticated
* @returns {string} - The curl code
*/
export function getCurlCode(
flow: FlowType,
isAuth: boolean,
- tweak?: any[],
- flowState?: FlowState
+ tweak?: any[]
): string {
const flowId = flow.id;
const tweaks = buildTweaks(flow);
- const inputs = buildInputs();
-
- const arrayOfOutputs = getOutputIds(flow);
return `curl -X POST \\
- ${window.location.protocol}//${window.location.host}/api/v1/run/${flowId} \\
+ ${window.location.protocol}//${
+ window.location.host
+ }/api/v1/run/${flowId}?stream=false \\
-H 'Content-Type: application/json'\\${
!isAuth ? `\n -H 'x-api-key: '\\` : ""
}
- -d '{"inputs": [${inputs}],
- "outputs": [${arrayOfOutputs}],
- "stream": false,
+ -d '{"input_value": "message",
+ "output_type": "chat",
+ "input_type": "chat",
"tweaks": ${
tweak && tweak.length > 0
? buildTweakObject(tweak)
@@ -419,26 +422,23 @@ export function getOutputIds(flow) {
/**
* Function to get the python code for the API
* @param {string} flow - The current flow
+ * @param {any[]} tweak - The tweaks
* @returns {string} - The python code
*/
-export function getPythonCode(
- flow: FlowType,
- tweak?: any[],
- flowState?: FlowState
-): string {
+export function getPythonCode(flow: FlowType, tweak?: any[]): string {
const flowName = flow.name;
const tweaks = buildTweaks(flow);
- const inputs = buildInputs();
- return `from langflow.load import load_flow_from_json
+
+ return `from langflow.load import run_flow_from_json
TWEAKS = ${
tweak && tweak.length > 0
? buildTweakObject(tweak)
: JSON.stringify(tweaks, null, 2)
}
-flow = load_flow_from_json("${flowName}.json", tweaks=TWEAKS)
-# Now you can use it like any chain
-inputs = ${inputs}
-flow(inputs)`;
+
+result = run_flow_from_json(flow="${flowName}.json",
+ input_value="message",
+ tweaks=TWEAKS)`;
}
/**
@@ -454,7 +454,7 @@ export function getWidgetCode(
const flowId = flow.id;
const flowName = flow.name;
const inputs = buildInputs();
- let chat_input_field = getChatInputField(flow, flowState);
+ let chat_input_field = getChatInputField(flowState);
return `
diff --git a/tests/conftest.py b/tests/conftest.py
index 83c7d031d..b890f9b6c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -10,6 +10,10 @@ import orjson
import pytest
from fastapi.testclient import TestClient
from httpx import AsyncClient
+from sqlmodel import Session, SQLModel, create_engine, select
+from sqlmodel.pool import StaticPool
+from typer.testing import CliRunner
+
from langflow.graph.graph.base import Graph
from langflow.initial_setup.setup import STARTER_FOLDER_NAME
from langflow.services.auth.utils import get_password_hash
@@ -18,9 +22,6 @@ from langflow.services.database.models.flow.model import Flow, FlowCreate
from langflow.services.database.models.user.model import User, UserCreate
from langflow.services.database.utils import session_getter
from langflow.services.deps import get_db_service
-from sqlmodel import Session, SQLModel, create_engine, select
-from sqlmodel.pool import StaticPool
-from typer.testing import CliRunner
if TYPE_CHECKING:
from langflow.services.database.service import DatabaseService
@@ -379,7 +380,9 @@ def created_api_key(active_user):
def get_starter_project(active_user):
# once the client is created, we can get the starter project
with session_getter(get_db_service()) as session:
- flow = session.exec(select(Flow).where(Flow.folder == STARTER_FOLDER_NAME)).first()
+ flow = session.exec(
+ select(Flow).where(Flow.folder == STARTER_FOLDER_NAME).where(Flow.name == "Basic Prompting")
+ ).first()
if not flow:
raise ValueError("No starter project found")
diff --git a/tests/test_endpoints.py b/tests/test_endpoints.py
index 7b1ccd2ef..a96b528bc 100644
--- a/tests/test_endpoints.py
+++ b/tests/test_endpoints.py
@@ -424,7 +424,7 @@ def test_build_vertex_invalid_vertex_id(client, added_flow_with_prompt_and_histo
assert response.status_code == 500
-def test_successful_run(client, starter_project, created_api_key):
+def test_successful_run_no_payload(client, starter_project, created_api_key):
headers = {"x-api-key": created_api_key.api_key}
flow_id = starter_project["id"]
response = client.post(f"/api/v1/run/{flow_id}", headers=headers)
@@ -441,25 +441,210 @@ def test_successful_run(client, starter_project, created_api_key):
assert "outputs" in outputs_dict
assert outputs_dict.get("inputs") == {"input_value": ""}
assert isinstance(outputs_dict.get("outputs"), list)
+ assert len(outputs_dict.get("outputs")) == 1
+ ids = [output.get("component_id") for output in outputs_dict.get("outputs")]
+ assert all(["ChatOutput" in _id for _id in ids])
+ display_names = [output.get("component_display_name") for output in outputs_dict.get("outputs")]
+ assert all([name in display_names for name in ["Chat Output"]])
+ inner_results = [output.get("results").get("result") for output in outputs_dict.get("outputs")]
+ expected_result = "Langflow"
+ assert all([expected_result in result for result in inner_results]), inner_results
+
+
+def test_successful_run_with_output_type_text(client, starter_project, created_api_key):
+ headers = {"x-api-key": created_api_key.api_key}
+ flow_id = starter_project["id"]
+ payload = {
+ "output_type": "text",
+ }
+ response = client.post(f"/api/v1/run/{flow_id}", headers=headers, json=payload)
+ assert response.status_code == status.HTTP_200_OK, response.text
+ # Add more assertions here to validate the response content
+ json_response = response.json()
+ assert "session_id" in json_response
+ assert "outputs" in json_response
+ outer_outputs = json_response["outputs"]
+ assert len(outer_outputs) == 1
+ outputs_dict = outer_outputs[0]
+ assert len(outputs_dict) == 2
+ assert "inputs" in outputs_dict
+ assert "outputs" in outputs_dict
+ assert outputs_dict.get("inputs") == {"input_value": ""}
+ assert isinstance(outputs_dict.get("outputs"), list)
+ assert len(outputs_dict.get("outputs")) == 1
+ ids = [output.get("component_id") for output in outputs_dict.get("outputs")]
+ assert all(["TextOutput" in _id for _id in ids]), ids
+ display_names = [output.get("component_display_name") for output in outputs_dict.get("outputs")]
+ assert all([name in display_names for name in ["Prompt Output"]]), display_names
+ inner_results = [output.get("results").get("result") for output in outputs_dict.get("outputs")]
+ expected_result = "Langflow"
+ assert all([expected_result in result for result in inner_results]), inner_results
+
+
+def test_successful_run_with_output_type_any(client, starter_project, created_api_key):
+ # This one should have both the ChatOutput and TextOutput components
+ headers = {"x-api-key": created_api_key.api_key}
+ flow_id = starter_project["id"]
+ payload = {
+ "output_type": "any",
+ }
+ response = client.post(f"/api/v1/run/{flow_id}", headers=headers, json=payload)
+ assert response.status_code == status.HTTP_200_OK, response.text
+ # Add more assertions here to validate the response content
+ json_response = response.json()
+ assert "session_id" in json_response
+ assert "outputs" in json_response
+ outer_outputs = json_response["outputs"]
+ assert len(outer_outputs) == 1
+ outputs_dict = outer_outputs[0]
+ assert len(outputs_dict) == 2
+ assert "inputs" in outputs_dict
+ assert "outputs" in outputs_dict
+ assert outputs_dict.get("inputs") == {"input_value": ""}
+ assert isinstance(outputs_dict.get("outputs"), list)
assert len(outputs_dict.get("outputs")) == 2
ids = [output.get("component_id") for output in outputs_dict.get("outputs")]
- assert all([id in ids for id in ["TextOutput-fTp5e", "ChatOutput-AVN8s"]])
+ assert all(["ChatOutput" in _id or "TextOutput" in _id for _id in ids]), ids
display_names = [output.get("component_display_name") for output in outputs_dict.get("outputs")]
- assert all([name in display_names for name in ["Prompt Output", "Chat Output"]])
+ assert all([name in display_names for name in ["Chat Output", "Prompt Output"]]), display_names
inner_results = [output.get("results").get("result") for output in outputs_dict.get("outputs")]
- expected_results = ["Write a press release \n\n- Cars\n- Bottle\n\n\nAnswer:\n\n", ""]
- assert all([result in inner_results for result in expected_results])
+ expected_result = "Langflow"
+ assert all([expected_result in result for result in inner_results]), inner_results
+
+
+def test_successful_run_with_output_type_debug(client, starter_project, created_api_key):
+ # This one should return outputs for all components
+ # Let's just check the amount of outputs(there hsould be 7)
+ headers = {"x-api-key": created_api_key.api_key}
+ flow_id = starter_project["id"]
+ payload = {
+ "output_type": "debug",
+ }
+ response = client.post(f"/api/v1/run/{flow_id}", headers=headers, json=payload)
+ assert response.status_code == status.HTTP_200_OK, response.text
+ # Add more assertions here to validate the response content
+ json_response = response.json()
+ assert "session_id" in json_response
+ assert "outputs" in json_response
+ outer_outputs = json_response["outputs"]
+ assert len(outer_outputs) == 1
+ outputs_dict = outer_outputs[0]
+ assert len(outputs_dict) == 2
+ assert "inputs" in outputs_dict
+ assert "outputs" in outputs_dict
+ assert outputs_dict.get("inputs") == {"input_value": ""}
+ assert isinstance(outputs_dict.get("outputs"), list)
+ assert len(outputs_dict.get("outputs")) == 7
+
+
+# To test input_type wel'l just set it with output_type debug and check if the value is correct
+def test_successful_run_with_input_type_text(client, starter_project, created_api_key):
+ headers = {"x-api-key": created_api_key.api_key}
+ flow_id = starter_project["id"]
+ payload = {
+ "input_type": "text",
+ "output_type": "debug",
+ "input_value": "value1",
+ }
+ response = client.post(f"/api/v1/run/{flow_id}", headers=headers, json=payload)
+ assert response.status_code == status.HTTP_200_OK, response.text
+ # Add more assertions here to validate the response content
+ json_response = response.json()
+ assert "session_id" in json_response
+ assert "outputs" in json_response
+ outer_outputs = json_response["outputs"]
+ assert len(outer_outputs) == 1
+ outputs_dict = outer_outputs[0]
+ assert len(outputs_dict) == 2
+ assert "inputs" in outputs_dict
+ assert "outputs" in outputs_dict
+ assert outputs_dict.get("inputs") == {"input_value": "value1"}
+ assert isinstance(outputs_dict.get("outputs"), list)
+ assert len(outputs_dict.get("outputs")) == 7
+ # Now we get all components that contain TextInput in the component_id
+ text_input_outputs = [output for output in outputs_dict.get("outputs") if "TextInput" in output.get("component_id")]
+ assert len(text_input_outputs) == 2
+ # Now we check if the input_value is correct
+ assert all([output.get("results").get("result") == "value1" for output in text_input_outputs]), text_input_outputs
+
+
+# Now do the same for "chat" input type
+def test_successful_run_with_input_type_chat(client, starter_project, created_api_key):
+ headers = {"x-api-key": created_api_key.api_key}
+ flow_id = starter_project["id"]
+ payload = {
+ "input_type": "chat",
+ "output_type": "debug",
+ "input_value": "value1",
+ }
+ response = client.post(f"/api/v1/run/{flow_id}", headers=headers, json=payload)
+ assert response.status_code == status.HTTP_200_OK, response.text
+ # Add more assertions here to validate the response content
+ json_response = response.json()
+ assert "session_id" in json_response
+ assert "outputs" in json_response
+ outer_outputs = json_response["outputs"]
+ assert len(outer_outputs) == 1
+ outputs_dict = outer_outputs[0]
+ assert len(outputs_dict) == 2
+ assert "inputs" in outputs_dict
+ assert "outputs" in outputs_dict
+ assert outputs_dict.get("inputs") == {"input_value": "value1"}
+ assert isinstance(outputs_dict.get("outputs"), list)
+ assert len(outputs_dict.get("outputs")) == 7
+ # Now we get all components that contain TextInput in the component_id
+ chat_input_outputs = [output for output in outputs_dict.get("outputs") if "ChatInput" in output.get("component_id")]
+ assert len(chat_input_outputs) == 1
+ # Now we check if the input_value is correct
+ assert all([output.get("results").get("result") == "value1" for output in chat_input_outputs]), chat_input_outputs
+
+
+def test_successful_run_with_input_type_any(client, starter_project, created_api_key):
+ headers = {"x-api-key": created_api_key.api_key}
+ flow_id = starter_project["id"]
+ payload = {
+ "input_type": "any",
+ "output_type": "debug",
+ "input_value": "value1",
+ }
+ response = client.post(f"/api/v1/run/{flow_id}", headers=headers, json=payload)
+ assert response.status_code == status.HTTP_200_OK, response.text
+ # Add more assertions here to validate the response content
+ json_response = response.json()
+ assert "session_id" in json_response
+ assert "outputs" in json_response
+ outer_outputs = json_response["outputs"]
+ assert len(outer_outputs) == 1
+ outputs_dict = outer_outputs[0]
+ assert len(outputs_dict) == 2
+ assert "inputs" in outputs_dict
+ assert "outputs" in outputs_dict
+ assert outputs_dict.get("inputs") == {"input_value": "value1"}
+ assert isinstance(outputs_dict.get("outputs"), list)
+ assert len(outputs_dict.get("outputs")) == 7
+ # Now we get all components that contain TextInput or ChatInput in the component_id
+ any_input_outputs = [
+ output
+ for output in outputs_dict.get("outputs")
+ if "TextInput" in output.get("component_id") or "ChatInput" in output.get("component_id")
+ ]
+ assert len(any_input_outputs) == 3
+ # Now we check if the input_value is correct
+ assert all([output.get("results").get("result") == "value1" for output in any_input_outputs]), any_input_outputs
def test_run_with_inputs_and_outputs(client, starter_project, created_api_key):
headers = {"x-api-key": created_api_key.api_key}
flow_id = starter_project["id"]
payload = {
- "inputs": [{"components": ["component1"], "input_value": "value1"}],
- "outputs": ["Component Name", "component_id"],
+ "input_value": "value1",
+ "input_type": "text",
+ "output_type": "text",
+ "tweaks": {"parameter_name": "value"},
+ "stream": False,
}
response = client.post(f"/api/v1/run/{flow_id}", json=payload, headers=headers)
- assert response.status_code == status.HTTP_200_OK
+ assert response.status_code == status.HTTP_200_OK, response.text
# Validate the response structure and content
@@ -475,16 +660,10 @@ def test_run_flow_with_caching_success(client: TestClient, starter_project, crea
flow_id = starter_project["id"]
headers = {"x-api-key": created_api_key.api_key}
payload = {
- "inputs": [
- {"components": ["component1"], "input_value": "value1"},
- {"components": ["component3"], "input_value": "value2"},
- ],
- "outputs": ["Component Name", "component_id"],
- "tweaks": {
- "parameter_name": "value",
- "Component Name": {"parameter_name": "value"},
- "component_id": {"parameter_name": "value"},
- },
+ "input_value": "value1",
+ "input_type": "text",
+ "output_type": "text",
+ "tweaks": {"parameter_name": "value"},
"stream": False,
}
response = client.post(f"/api/v1/run/{flow_id}", json=payload, headers=headers)
@@ -497,7 +676,7 @@ def test_run_flow_with_caching_success(client: TestClient, starter_project, crea
def test_run_flow_with_caching_invalid_flow_id(client: TestClient, created_api_key):
invalid_flow_id = uuid4()
headers = {"x-api-key": created_api_key.api_key}
- payload = {"inputs": [], "outputs": [], "tweaks": {}, "stream": False}
+ payload = {"input_value": "", "input_type": "text", "output_type": "text", "tweaks": {}, "stream": False}
response = client.post(f"/api/v1/run/{invalid_flow_id}", json=payload, headers=headers)
assert response.status_code == status.HTTP_404_NOT_FOUND
data = response.json()
@@ -508,8 +687,7 @@ def test_run_flow_with_caching_invalid_flow_id(client: TestClient, created_api_k
def test_run_flow_with_caching_invalid_input_format(client: TestClient, starter_project, created_api_key):
flow_id = starter_project["id"]
headers = {"x-api-key": created_api_key.api_key}
- payload = {"inputs": [{"invalid_key": "value"}], "outputs": [], "tweaks": {}, "stream": False}
- # This should raise an http 422 error not validation error
+ payload = {"input_value": {"key": "value"}, "input_type": "text", "output_type": "text", "tweaks": {}}
response = client.post(f"/api/v1/run/{flow_id}", json=payload, headers=headers)
assert response.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY
@@ -518,24 +696,24 @@ def test_run_flow_with_session_id(client, starter_project, created_api_key):
headers = {"x-api-key": created_api_key.api_key}
flow_id = starter_project["id"]
payload = {
- "inputs": [{"components": ["component1"], "input_value": "value1"}],
- "outputs": ["Component Name", "component_id"],
+ "input_value": "value1",
+ "input_type": "text",
+ "output_type": "text",
"session_id": "test-session-id",
}
response = client.post(f"/api/v1/run/{flow_id}", json=payload, headers=headers)
- assert response.status_code == status.HTTP_200_OK
+ assert response.status_code == status.HTTP_404_NOT_FOUND
data = response.json()
- assert "outputs" in data
- assert "session_id" in data
- assert data["session_id"] == "test-session-id"
+ assert {"detail": "Session test-session-id not found"} == data
def test_run_flow_with_invalid_session_id(client, starter_project, created_api_key):
headers = {"x-api-key": created_api_key.api_key}
flow_id = starter_project["id"]
payload = {
- "inputs": [{"components": ["component1"], "input_value": "value1"}],
- "outputs": ["Component Name", "component_id"],
+ "input_value": "value1",
+ "input_type": "text",
+ "output_type": "text",
"session_id": "invalid-session-id",
}
response = client.post(f"/api/v1/run/{flow_id}", json=payload, headers=headers)
@@ -549,8 +727,9 @@ def test_run_flow_with_invalid_tweaks(client, starter_project, created_api_key):
headers = {"x-api-key": created_api_key.api_key}
flow_id = starter_project["id"]
payload = {
- "inputs": [{"components": ["component1"], "input_value": "value1"}],
- "outputs": ["Component Name", "component_id"],
+ "input_value": "value1",
+ "input_type": "text",
+ "output_type": "text",
"tweaks": {"invalid_tweak": "value"},
}
response = client.post(f"/api/v1/run/{flow_id}", json=payload, headers=headers)
diff --git a/tests/test_helper_components.py b/tests/test_helper_components.py
index fcbb3b3f3..bae20a27a 100644
--- a/tests/test_helper_components.py
+++ b/tests/test_helper_components.py
@@ -1,5 +1,4 @@
from langchain_core.documents import Document
-
from langflow.components import helpers
from langflow.interface.custom.utils import build_custom_component_template
from langflow.schema import Record
@@ -52,23 +51,9 @@ def test_uuid_generator_component():
assert len(result) == 36
-def test_python_function_component():
- # Arrange
- python_function_component = helpers.PythonFunctionComponent()
-
- # Act
- # function must be a string representation
- function = "def function():\n return 'Hello, World!'"
- # result is the callable function
- result = python_function_component.build(function)
-
- # Assert
- assert result() == "Hello, World!"
-
-
def test_records_as_text_component():
# Arrange
- records_as_text_component = helpers.RecordsAsTextComponent()
+ records_as_text_component = helpers.RecordsToTextComponent()
# Act
# Replace with your actual test data
@@ -83,7 +68,7 @@ def test_records_as_text_component():
def test_text_to_record_component():
# Arrange
- text_to_record_component = helpers.TextToRecordComponent()
+ text_to_record_component = helpers.CreateRecordComponent()
# Act
# Replace with your actual test data
diff --git a/tests/test_initial_setup.py b/tests/test_initial_setup.py
index d60d4951a..6e1f00f0b 100644
--- a/tests/test_initial_setup.py
+++ b/tests/test_initial_setup.py
@@ -1,17 +1,18 @@
-from itertools import chain
+from datetime import datetime
import pytest
from sqlalchemy import func
from sqlmodel import select
from langflow.graph.graph.base import Graph
-from langflow.graph.schema import ResultData
+from langflow.graph.schema import RunOutputs
from langflow.initial_setup.setup import (
STARTER_FOLDER_NAME,
create_or_update_starter_projects,
get_project_data,
load_starter_projects,
)
+from langflow.memory import delete_messages
from langflow.services.database.models.flow.model import Flow
from langflow.services.deps import session_scope
@@ -24,9 +25,23 @@ def test_load_starter_projects():
def test_get_project_data():
projects = load_starter_projects()
- for project in projects:
- data = get_project_data(project)
- assert all(d is not None for d in data)
+ for _, project in projects:
+ (
+ project_name,
+ project_description,
+ project_is_component,
+ updated_at_datetime,
+ project_data,
+ project_icon,
+ project_icon_bg_color,
+ ) = get_project_data(project)
+ assert isinstance(project_name, str)
+ assert isinstance(project_description, str)
+ assert isinstance(project_is_component, bool)
+ assert isinstance(updated_at_datetime, datetime)
+ assert isinstance(project_data, dict)
+ assert isinstance(project_icon, str) or project_icon is None
+ assert isinstance(project_icon_bg_color, str) or project_icon_bg_color is None
def test_create_or_update_starter_projects(client):
@@ -62,16 +77,15 @@ async def test_starter_project_can_run_successfully(client):
# Get all the starter projects
projects = session.exec(select(Flow).where(Flow.folder == STARTER_FOLDER_NAME)).all()
- graphs: list[Graph] = [
+ graphs: list[tuple[str, Graph]] = [
(project.name, Graph.from_payload(project.data, flow_id=project.id)) for project in projects
]
assert len(graphs) == len(projects)
for name, graph in graphs:
- outputs = await graph.run(
+ outputs = await graph.arun(
inputs={},
outputs=[],
session_id="test",
)
- assert all(
- isinstance(output, ResultData) for output in chain.from_iterable(outputs)
- ), f"Project {name} error: {outputs}"
+ assert all(isinstance(output, RunOutputs) for output in outputs), f"Project {name} error: {outputs}"
+ delete_messages(session_id="test")
diff --git a/tests/text_experimental_components.py b/tests/text_experimental_components.py
new file mode 100644
index 000000000..a4ee47729
--- /dev/null
+++ b/tests/text_experimental_components.py
@@ -0,0 +1,15 @@
+from langflow.components import experimental
+
+
+def test_python_function_component():
+ # Arrange
+ python_function_component = experimental.PythonFunctionComponent()
+
+ # Act
+ # function must be a string representation
+ function = "def function():\n return 'Hello, World!'"
+ # result is the callable function
+ result = python_function_component.build(function)
+
+ # Assert
+ assert result() == "Hello, World!"
@@ -271,6 +285,11 @@ export default function ExtraSidebar(): JSX.Element {
+
onDragStart(event, {
//split type to remove type in nodes saved with same name removing it's
@@ -344,9 +363,7 @@ export default function ExtraSidebar(): JSX.Element {
)
)}{" "}
0 ? (
<>
state.hasStore);
const hasApiKey = useStoreStore((state) => state.hasApiKey);
const validApiKey = useStoreStore((state) => state.validApiKey);
- const [updateMinimize, setUpdateMinimize] = useState(showNode);
const isMinimal = numberOfHandles <= 1;
const isGroup = data.node?.flow ? true : false;
- const frozen = data.node?.frozen ?? false;
+ // const frozen = data.node?.frozen ?? false;
const paste = useFlowStore((state) => state.paste);
const nodes = useFlowStore((state) => state.nodes);
const edges = useFlowStore((state) => state.edges);
@@ -79,6 +77,7 @@ export default function NodeToolbarComponent({
const setEdges = useFlowStore((state) => state.setEdges);
const unselectAll = useFlowStore((state) => state.unselectAll);
const saveComponent = useFlowsManagerStore((state) => state.saveComponent);
+ const getNodePosition = useFlowStore((state) => state.getNodePosition);
const flows = useFlowsManagerStore((state) => state.flows);
const version = useDarkStore((state) => state.version);
const takeSnapshot = useFlowsManagerStore((state) => state.takeSnapshot);
@@ -146,7 +145,7 @@ export default function NodeToolbarComponent({
takeSnapshot();
expandGroupNode(
data.id,
- updateFlowPosition(position, data.node?.flow!),
+ updateFlowPosition(getNodePosition(data.id), data.node?.flow!),
data.node!.template,
nodes,
edges,
@@ -268,6 +267,15 @@ export default function NodeToolbarComponent({
useEffect(() => {
function onKeyDown(event: KeyboardEvent) {
+ if (
+ selected &&
+ (hasApiKey || hasStore) &&
+ (event.ctrlKey || event.metaKey) &&
+ event.key === "u"
+ ) {
+ event.preventDefault();
+ handleSelectChange("update");
+ }
if (
selected &&
isGroup &&
@@ -309,7 +317,7 @@ export default function NodeToolbarComponent({
selected &&
(event.ctrlKey || event.metaKey) &&
event.shiftKey &&
- event.key === "C"
+ event.key === "U"
) {
event.preventDefault();
if (hasCode) return setOpenModal((state) => !state);
@@ -318,8 +326,8 @@ export default function NodeToolbarComponent({
if (
selected &&
!isGroup &&
- (event.ctrlKey || event.metaKey) &&
- event.key === "e"
+ (event.ctrlKey || event.metaKey) && event.shiftKey&&
+ event.key === "A"
) {
event.preventDefault();
setShowModalAdvanced((state) => !state);
@@ -399,7 +407,23 @@ export default function NodeToolbarComponent({
-
+
+
+
+
+ {/*
-
+ */}
-
+
{Object.keys(dataFilter)
.sort(sortKeys)
.filter((x) => PRIORITY_SIDEBAR_ORDER.includes(x))
@@ -310,7 +329,7 @@ export default function ExtraSidebar(): JSX.Element {
+ Core Components
+
+
-
-