From 06f0e0e0f89bc5b5c33bbd23320843bda0b41af7 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira Date: Mon, 18 Mar 2024 13:12:31 +0100 Subject: [PATCH] Added dropdown and global page --- langflow1.db | Bin 0 -> 90112 bytes src/backend/langflow/services/chat/utils.py | 15 -- src/backend/langflow/utils/chat.py | 34 --- src/backend/langflow/utils/prompt.py | 58 ------ .../components/parameterComponent/index.tsx | 8 +- .../src/components/inputComponent/index.tsx | 197 ++++++++++-------- .../components/addNewVariableButton.tsx | 19 +- src/frontend/src/utils/styleUtils.ts | 2 + 8 files changed, 118 insertions(+), 215 deletions(-) create mode 100644 langflow1.db delete mode 100644 src/backend/langflow/utils/chat.py delete mode 100644 src/backend/langflow/utils/prompt.py diff --git a/langflow1.db b/langflow1.db new file mode 100644 index 0000000000000000000000000000000000000000..2b39da5dd15e9197718ae2575b99af51f65a1115 GIT binary patch literal 90112 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 X9RKrzoX<;g9xe;;H_y`X dict: - return self.func(inputs, callbacks) diff --git a/src/backend/langflow/utils/prompt.py b/src/backend/langflow/utils/prompt.py deleted file mode 100644 index 871193f45..000000000 --- a/src/backend/langflow/utils/prompt.py +++ /dev/null @@ -1,58 +0,0 @@ -from typing import Any, Union - -from langchain_core.prompts import PromptTemplate as LCPromptTemplate -from llama_index.prompts import PromptTemplate as LIPromptTemplate - -PromptTemplateTypes = Union[LCPromptTemplate, LIPromptTemplate] - - -class GenericPromptTemplate: - def __init__(self, prompt_template: PromptTemplateTypes): - object.__setattr__(self, "prompt_template", prompt_template) - - @property - def input_keys(self): - prompt_template = object.__getattribute__(self, "prompt_template") - if isinstance(prompt_template, LCPromptTemplate): - return prompt_template.input_variables - elif isinstance(prompt_template, LIPromptTemplate): - return prompt_template.template_vars - else: - raise TypeError(f"Unknown prompt template type {type(prompt_template)}") - - def to_lc_prompt(self): - prompt_template = object.__getattribute__(self, "prompt_template") - if isinstance(prompt_template, LCPromptTemplate): - return prompt_template - elif isinstance(prompt_template, LIPromptTemplate): - return LCPromptTemplate.from_template(prompt_template.get_template()) - else: - raise TypeError(f"Unknown prompt template type {type(prompt_template)}") - - def to_li_prompt(self): - prompt_template = object.__getattribute__(self, "prompt_template") - if isinstance(prompt_template, LIPromptTemplate): - return prompt_template - elif isinstance(prompt_template, LCPromptTemplate): - return LIPromptTemplate(template=prompt_template.template) - else: - raise TypeError(f"Unknown prompt template type {type(prompt_template)}") - - def __or__(self, other): - prompt_template = object.__getattribute__(self, "prompt_template") - if isinstance(prompt_template, LIPromptTemplate): - return self.to_lc_prompt() | other - else: - raise TypeError(f"Unknown prompt template type {type(other)}") - - def __getattribute__(self, name: str) -> Any: - if name in { - "input_keys", - "to_lc_prompt", - "to_li_prompt", - "__or__", - "prompt_template", - }: - return object.__getattribute__(self, name) - prompt_template = object.__getattribute__(self, "prompt_template") - return getattr(prompt_template, name) diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx index 7b04f6be4..9278f2b23 100644 --- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx @@ -314,9 +314,8 @@ export default function ParameterComponent({ <>
{proxy ? ( @@ -429,8 +428,7 @@ export default function ParameterComponent({ newNode.data.node.template[name].load_from_db = true; return newNode; }); - } - else{ + } else { setNode(data.id, (oldNode) => { let newNode = cloneDeep(oldNode); newNode.data = { diff --git a/src/frontend/src/components/inputComponent/index.tsx b/src/frontend/src/components/inputComponent/index.tsx index 9dfc96a9a..cd2846cdb 100644 --- a/src/frontend/src/components/inputComponent/index.tsx +++ b/src/frontend/src/components/inputComponent/index.tsx @@ -1,11 +1,13 @@ import { Listbox, Transition } from "@headlessui/react"; import * as Form from "@radix-ui/react-form"; import { Fragment, useEffect, useRef, useState } from "react"; +import AddNewVariableButton from "../../pages/globalVariablesPage/components/addNewVariableButton"; import { InputComponentType } from "../../types/components"; import { handleKeyDown } from "../../utils/reactflowUtils"; -import { classNames } from "../../utils/utils"; +import { classNames, cn } from "../../utils/utils"; import IconComponent from "../genericIconComponent"; import { Input } from "../ui/input"; +import { Separator } from "../ui/separator"; export default function InputComponent({ autoFocus = false, @@ -26,7 +28,6 @@ export default function InputComponent({ const [pwdVisible, setPwdVisible] = useState(false); const refInput = useRef(null); const [showOptions, setShowOptions] = useState(false); - const [filteredOpts, setFilteredValue] = useState(options); // Clear component state useEffect(() => { @@ -35,13 +36,12 @@ export default function InputComponent({ } }, [disabled]); - const filteredOptions = filteredOpts.filter((option) => + const filteredOptions = options.filter((option) => option.toLowerCase().includes(value.toLowerCase()) ); function onInputLostFocus(event): void { if (onBlur) onBlur(event); - setShowOptions(false); } return ( @@ -107,103 +107,115 @@ export default function InputComponent({ handleKeyDown(e, value, ""); if (blurOnEnter && e.key === "Enter") refInput.current?.blur(); }} - onFocus={() => setShowOptions(true)} /> - { - /* options.length > 0 && filteredOptions.length > 0 */ true ? ( - { - onChange(val); - }} - > - <> -
- - { + onChange(val); + }} + > + <> +
+ + +
+
+ + Global Variables +
+
+ + + +
+
+ + {filteredOptions.map((option, id) => ( + + classNames( + active ? " bg-accent" : "", + editNode + ? "dropdown-component-false-option" + : "dropdown-component-true-option", + " hover:bg-accent" + ) + } + value={option} > - {filteredOptions.map((option, id) => ( - - classNames( - active ? " bg-accent" : "", - editNode - ? "dropdown-component-false-option" - : "dropdown-component-true-option", - " hover:bg-accent" - ) - } - value={option} - > - {({ selected, active }) => ( - <> - - {option} - + {({ selected, active }) => ( + <> + + {option} + - {selected ? ( - - - ) : null} - - )} - - ))} - - -
- - - ) : null - } + {selected ? ( + + + ) : null} + + )} + + ))} + + +
+ + )} {options.length > 0 && ( - )} @@ -212,6 +224,7 @@ export default function InputComponent({ type="button" tabIndex={-1} className={classNames( + "mb-px", editNode ? "input-component-true-button" : "input-component-false-button" diff --git a/src/frontend/src/pages/globalVariablesPage/components/addNewVariableButton.tsx b/src/frontend/src/pages/globalVariablesPage/components/addNewVariableButton.tsx index c0a7deba2..51f88ddf0 100644 --- a/src/frontend/src/pages/globalVariablesPage/components/addNewVariableButton.tsx +++ b/src/frontend/src/pages/globalVariablesPage/components/addNewVariableButton.tsx @@ -10,7 +10,7 @@ import { useGlobalVariablesStore } from "../../../stores/globalVariables"; //TODO IMPLEMENT FORM LOGIC -export default function AddNewVariableButton(): JSX.Element { +export default function AddNewVariableButton({children}): JSX.Element { const [key, setKey] = useState(""); const [value, setValue] = useState(""); const [provider, setProvider] = useState(""); @@ -33,25 +33,24 @@ export default function AddNewVariableButton(): JSX.Element { }); } return ( - + Create a new Variable - + {children} -
-
+
{ setKey(e.target.value); }} - placeholder="example name" + placeholder="Insert a name for the variable..." > -
-