From 6aa7702cbca600fa284df4503e1ebcd81aed5b01 Mon Sep 17 00:00:00 2001 From: Igor Carvalho Date: Fri, 16 Jun 2023 01:01:13 -0300 Subject: [PATCH 001/238] Add new random gradient colors --- src/frontend/src/utils.ts | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/utils.ts b/src/frontend/src/utils.ts index 8859b3050..fc5d0f320 100644 --- a/src/frontend/src/utils.ts +++ b/src/frontend/src/utils.ts @@ -213,7 +213,23 @@ export const gradients = [ "bg-gradient-to-br from-green-500 to-green-700", "bg-gradient-to-br from-rose-400 via-fuchsia-500 to-indigo-500", "bg-gradient-to-br from-sky-400 to-blue-500", - + "bg-gradient-to-br from-green-200 via-green-400 to-green-500", + "bg-gradient-to-br from-red-400 via-gray-300 to-blue-500", + "bg-gradient-to-br from-gray-900 to-gray-600 bg-gradient-to-r", + "bg-gradient-to-br from-rose-500 via-red-400 to-red-500", + "bg-gradient-to-br from-fuchsia-600 to-pink-600", + "bg-gradient-to-br from-emerald-500 to-lime-600", + "bg-gradient-to-br from-rose-500 to-indigo-700", + "bg-gradient-to-br bg-gradient-to-tr from-violet-500 to-orange-300", + "bg-gradient-to-br from-gray-900 via-purple-900 to-violet-600", + "bg-gradient-to-br from-yellow-200 via-red-500 to-fuchsia-500", + "bg-gradient-to-br from-sky-400 to-indigo-900", + "bg-gradient-to-br from-amber-200 via-violet-600 to-sky-900", + "bg-gradient-to-br from-amber-700 via-orange-300 to-rose-800", + "bg-gradient-to-br from-gray-300 via-fuchsia-600 to-orange-600", + "bg-gradient-to-br from-fuchsia-500 via-red-600 to-orange-400", + "bg-gradient-to-br from-sky-400 via-rose-400 to-lime-400", + "bg-gradient-to-br from-lime-600 via-yellow-300 to-red-600", ]; export const bgColors = { From af14c843d3309d2177fec2e04aa958923ea934a6 Mon Sep 17 00:00:00 2001 From: Igor Carvalho Date: Fri, 16 Jun 2023 13:46:25 -0300 Subject: [PATCH 002/238] Add MainPage style constants --- src/frontend/src/constants.tsx | 22 ++++++++++++ .../components/nodeToolbarComponent/index.tsx | 4 +-- src/frontend/src/pages/MainPage/index.tsx | 34 ++++++++++--------- 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/frontend/src/constants.tsx b/src/frontend/src/constants.tsx index e32336578..64a64b7d6 100644 --- a/src/frontend/src/constants.tsx +++ b/src/frontend/src/constants.tsx @@ -148,3 +148,25 @@ export const EXPORT_CODE_DIALOG = */ export const INPUT_STYLE = " focus:ring-1 focus:ring-offset-1 focus:ring-ring focus:outline-none "; + + +/** + * The base text for subtitle of code dialog + * @constant + */ +export const COLUMN_DIV_STYLE = + " w-full h-full flex overflow-auto flex-col bg-muted px-16 "; + +/** + * The base text for subtitle of code dialog + * @constant + */ +export const NAV_DISPLAY_STYLE = + " w-full flex justify-between py-12 pb-2 px-6 "; + +/** + * The base text for subtitle of code dialog + * @constant + */ +export const BUTTON_DIV_STYLE = + " flex gap-2 "; diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx index 70d1268f0..a5827b932 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx @@ -82,7 +82,7 @@ const NodeToolbarComponent = (props) => { )} - {/* + - */} + diff --git a/src/frontend/src/pages/MainPage/index.tsx b/src/frontend/src/pages/MainPage/index.tsx index 0657000c1..e6bfaa58d 100644 --- a/src/frontend/src/pages/MainPage/index.tsx +++ b/src/frontend/src/pages/MainPage/index.tsx @@ -1,24 +1,26 @@ 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"; -export default function HomePage() { - const { flows, setTabId, downloadFlows, uploadFlows, addFlow, removeFlow } = +import { COLUMN_DIV_STYLE, NAV_DISPLAY_STYLE } from "../../constants"; + + 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"; + export default function HomePage() { + const { flows, setTabId, downloadFlows, uploadFlows, addFlow, removeFlow } = useContext(TabsContext); - useEffect(() => { - setTabId(""); - }, []); - const navigate = useNavigate(); + useEffect(() => { + setTabId(""); + }, []); + const navigate = useNavigate(); return ( -
-
- - +
+
+ + My Projects -
+
-
+
{ + handleBuild(flow); + }} + > + +
+
); diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx index 7bec0517c..f8a5dc106 100644 --- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx @@ -158,13 +158,13 @@ export default function ExtraSidebar() { .map((t: string, k) => (
My Projects -
+
-
+
+ +
+
); From 662564653effbd3ebcedf905e3dcc27abfc5676b Mon Sep 17 00:00:00 2001 From: Igor Carvalho Date: Mon, 19 Jun 2023 19:29:18 -0300 Subject: [PATCH 005/238] feat[tailwind.config.js]: Add new colors variables and remove hex colors from the code --- .../chatComponent/buildTrigger/index.tsx | 8 ++++---- src/frontend/src/index.css | 14 ++++++++++++++ .../components/extraSidebarComponent/index.tsx | 8 ++++---- .../components/nodeToolbarComponent/index.tsx | 15 ++++++++------- src/frontend/tailwind.config.js | 7 +++++++ 5 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/frontend/src/components/chatComponent/buildTrigger/index.tsx b/src/frontend/src/components/chatComponent/buildTrigger/index.tsx index a2fd118e5..8b11ffdcb 100644 --- a/src/frontend/src/components/chatComponent/buildTrigger/index.tsx +++ b/src/frontend/src/components/chatComponent/buildTrigger/index.tsx @@ -142,8 +142,8 @@ export default function BuildTrigger({ side="left" >
{ handleBuild(flow); }} @@ -152,9 +152,9 @@ export default function BuildTrigger({
{isBuilding ? ( // Render your loading animation here when isBuilding is true - + ) : ( - + )}
diff --git a/src/frontend/src/index.css b/src/frontend/src/index.css index 30eea80ba..58506ee7e 100644 --- a/src/frontend/src/index.css +++ b/src/frontend/src/index.css @@ -34,6 +34,14 @@ --ring: 215 20.2% 65.1%; /* hsl(215 20% 65%) */ --radius: 0.5rem; + + --build: 11, 65% 61%; /* hsl(11, 65%, 61%) */ + + --build-background: #E2E7EE; /* hsl(215, 26%, 91%) */ + + --round-btn-shadow: #00000063; + + --hover-btn-background: #242f47; } .dark { @@ -67,6 +75,8 @@ --ring: 216 34% 17%; /* hsl(216 34% 17%) */ --radius: 0.5rem; + + --build-trigger: 11, 65% 61%; /* hsl(11, 65%, 61%) */ } } @@ -91,6 +101,10 @@ --destructive-foreground: 210 40% 98%; /* hsl(210 40% 98%) */ --ring: 215 20.2% 65.1%; /* hsl(215 20% 65%) */ --radius: 0.5rem; + --build-trigger: #dc735b; /* hsl(11, 65%, 61%) */ + --build-background: #E2E7EE; /* hsl(215, 26%, 91%) */ + --round-btn-shadow: #00000063; + --hover-btn-background: #242f47; } .dark { diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx index f8a5dc106..bce0c6919 100644 --- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx @@ -66,7 +66,7 @@ export default function ExtraSidebar() {
- + */}
diff --git a/src/frontend/tailwind.config.js b/src/frontend/tailwind.config.js index 4c871cfa3..55feba232 100644 --- a/src/frontend/tailwind.config.js +++ b/src/frontend/tailwind.config.js @@ -16,6 +16,9 @@ module.exports = { }, extend: { colors: { + 'btn-shadow': "var(--round-btn-shadow)", + buildBackground: "var(--build-background)", + build: "var(--build-trigger)", border: "hsl(var(--border))", input: "hsl(var(--input))", ring: "hsl(var(--ring))", @@ -91,6 +94,10 @@ module.exports = { }, extend: { colors: { + 'btn-hover-bg': "var(--hover-btn-background)", + 'btn-shadow': "var(--round-btn-shadow)", + buildBackground: "var(--build-background)", + build: "var(--build-trigger)", border: "hsl(var(--border))", input: "hsl(var(--input))", ring: "hsl(var(--ring))", From 3ac3bfbf1fb1c1b301f8a6cfd57ffb700db5cc35 Mon Sep 17 00:00:00 2001 From: Igor Carvalho Date: Mon, 19 Jun 2023 19:33:09 -0300 Subject: [PATCH 006/238] ~ --- src/frontend/src/index.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/frontend/src/index.css b/src/frontend/src/index.css index 58506ee7e..331dabefa 100644 --- a/src/frontend/src/index.css +++ b/src/frontend/src/index.css @@ -105,6 +105,7 @@ --build-background: #E2E7EE; /* hsl(215, 26%, 91%) */ --round-btn-shadow: #00000063; --hover-btn-background: #242f47; + } .dark { From f0c507a6604b87b8fb941f1117f55fca3cab1aec Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Tue, 20 Jun 2023 16:14:16 -0300 Subject: [PATCH 007/238] =?UTF-8?q?=F0=9F=90=9B=20fix(loading.py):=20inclu?= =?UTF-8?q?de=20"config"=20in=20the=20list=20of=20keys=20to=20check=20for?= =?UTF-8?q?=20*kwargs=20=E2=9C=A8=20feat(constants.py):=20add=20default=20?= =?UTF-8?q?config=20for=20CTransformers=20=F0=9F=9A=80=20feat(llms.py):=20?= =?UTF-8?q?add=20method=20to=20format=20ctransformers=20field=20in=20LLMFr?= =?UTF-8?q?ontendNode=20The=20fix=20in=20loading.py=20ensures=20that=20the?= =?UTF-8?q?=20*kwargs=20are=20converted=20to=20a=20dictionary=20when=20the?= =?UTF-8?q?=20key=20contains=20"config".=20The=20addition=20of=20the=20def?= =?UTF-8?q?ault=20config=20for=20CTransformers=20in=20constants.py=20provi?= =?UTF-8?q?des=20a=20default=20configuration=20for=20the=20CTransformers?= =?UTF-8?q?=20model.=20The=20new=20method=20in=20llms.py=20formats=20the?= =?UTF-8?q?=20ctransformers=20field=20in=20the=20LLMFrontendNode.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/langflow/interface/loading.py | 10 ++++++++-- .../template/frontend_node/constants.py | 17 +++++++++++++++++ .../langflow/template/frontend_node/llms.py | 10 ++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/backend/langflow/interface/loading.py b/src/backend/langflow/interface/loading.py index a765d3b9b..85ace0b41 100644 --- a/src/backend/langflow/interface/loading.py +++ b/src/backend/langflow/interface/loading.py @@ -53,8 +53,8 @@ def convert_params_to_sets(params): def convert_kwargs(params): # if *kwargs are passed as a string, convert to dict - # first find any key that has kwargs in it - kwargs_keys = [key for key in params.keys() if "kwargs" in key] + # first find any key that has kwargs or config in it + kwargs_keys = [key for key in params.keys() if "kwargs" in key or "config" in key] for key in kwargs_keys: if isinstance(params[key], str): params[key] = json.loads(params[key]) @@ -82,10 +82,16 @@ def instantiate_based_on_type(class_object, base_type, node_type, params): return instantiate_utility(node_type, class_object, params) elif base_type == "chains": return instantiate_chains(node_type, class_object, params) + elif base_type == "llms": + return instantiate_llm(node_type, class_object, params) else: return class_object(**params) +def instantiate_llm(node_type, class_object, params): + return class_object(**params) + + def instantiate_chains(node_type, class_object, params): if "retriever" in params and hasattr(params["retriever"], "as_retriever"): params["retriever"] = params["retriever"].as_retriever() diff --git a/src/backend/langflow/template/frontend_node/constants.py b/src/backend/langflow/template/frontend_node/constants.py index 20b8a0c61..f9894a317 100644 --- a/src/backend/langflow/template/frontend_node/constants.py +++ b/src/backend/langflow/template/frontend_node/constants.py @@ -32,3 +32,20 @@ You are a good listener and you can talk about anything. HUMAN_PROMPT = "{input}" QA_CHAIN_TYPES = ["stuff", "map_reduce", "map_rerank", "refine"] + +CTRANSFORMERS_DEFAULT_CONFIG = { + "top_k": 40, + "top_p": 0.95, + "temperature": 0.8, + "repetition_penalty": 1.1, + "last_n_tokens": 64, + "seed": -1, + "max_new_tokens": 256, + "stop": None, + "stream": False, + "reset": True, + "batch_size": 8, + "threads": -1, + "context_length": -1, + "gpu_layers": 0, +} diff --git a/src/backend/langflow/template/frontend_node/llms.py b/src/backend/langflow/template/frontend_node/llms.py index 272e42c7f..fcd28df6c 100644 --- a/src/backend/langflow/template/frontend_node/llms.py +++ b/src/backend/langflow/template/frontend_node/llms.py @@ -1,7 +1,9 @@ +import json from typing import Optional from langflow.template.field.base import TemplateField from langflow.template.frontend_node.base import FrontendNode +from langflow.template.frontend_node.constants import CTRANSFORMERS_DEFAULT_CONFIG class LLMFrontendNode(FrontendNode): @@ -31,6 +33,13 @@ class LLMFrontendNode(FrontendNode): field.show = True field.advanced = not field.required + @staticmethod + def format_ctransformers_field(field: TemplateField): + if field.name == "config": + field.show = True + field.advanced = True + field.value = json.dumps(CTRANSFORMERS_DEFAULT_CONFIG, indent=2) + @staticmethod def format_field(field: TemplateField, name: Optional[str] = None) -> None: display_names_dict = { @@ -38,6 +47,7 @@ class LLMFrontendNode(FrontendNode): } FrontendNode.format_field(field, name) LLMFrontendNode.format_openai_field(field) + LLMFrontendNode.format_ctransformers_field(field) if name and "azure" in name.lower(): LLMFrontendNode.format_azure_field(field) if name and "llama" in name.lower(): From 838e5b2af7d90bc82e9890bc02605713e5919a0d Mon Sep 17 00:00:00 2001 From: Igor Carvalho Date: Tue, 20 Jun 2023 19:21:00 -0300 Subject: [PATCH 008/238] feat[tailwind colors]: Change all tailwind default colors to variables colors --- .../components/parameterComponent/index.tsx | 6 +- .../src/CustomNodes/GenericNode/index.tsx | 28 +++--- .../src/alerts/alertDropDown/index.tsx | 12 +-- src/frontend/src/alerts/error/index.tsx | 8 +- src/frontend/src/alerts/notice/index.tsx | 8 +- src/frontend/src/alerts/success/index.tsx | 6 +- .../components/CrashErrorComponent/index.tsx | 10 +-- .../EditFlowSettingsComponent/index.tsx | 2 +- .../ExtraSidebarComponent/index.tsx | 30 +++---- .../ReactTooltipComponent/index.tsx | 2 +- .../chatComponent/buildTrigger/index.tsx | 2 +- .../chatComponent/chatMessage/index.tsx | 2 +- .../chatComponent/chatTrigger/index.tsx | 4 +- .../components/codeAreaComponent/index.tsx | 8 +- .../components/dropdownComponent/index.tsx | 12 +-- .../src/components/floatComponent/index.tsx | 6 +- .../components/menuBar/index.tsx | 6 +- .../src/components/headerComponent/index.tsx | 4 +- .../src/components/inputComponent/index.tsx | 12 +-- .../components/inputFileComponent/index.tsx | 6 +- .../components/inputListComponent/index.tsx | 8 +- .../src/components/intComponent/index.tsx | 6 +- .../src/components/loadingComponent/index.tsx | 4 +- .../src/components/promptComponent/index.tsx | 8 +- .../components/textAreaComponent/index.tsx | 8 +- .../src/components/toggleComponent/index.tsx | 6 +- .../src/components/ui/rename-label.tsx | 2 +- src/frontend/src/index.css | 86 ++++++++++++++++++- src/frontend/src/modals/ApiModal/index.tsx | 4 +- .../src/modals/EditNodeModal/index.tsx | 12 +-- .../NodeModal/components/ModalField/index.tsx | 4 +- src/frontend/src/modals/NodeModal/index.tsx | 16 ++-- .../src/modals/chatModal/chatInput/index.tsx | 10 +-- .../modals/chatModal/chatMessage/index.tsx | 18 ++-- .../modals/chatModal/fileComponent/index.tsx | 8 +- src/frontend/src/modals/chatModal/index.tsx | 18 ++-- .../src/modals/codeAreaModal/index.tsx | 4 +- src/frontend/src/modals/exportModal/index.tsx | 2 +- .../src/modals/flowSettingsModal/index.tsx | 2 +- .../src/modals/genericModal/index.tsx | 4 +- .../modals/importModal/buttonBox/index.tsx | 2 +- src/frontend/src/modals/importModal/index.tsx | 20 ++--- src/frontend/src/modals/promptModal/index.tsx | 22 ++--- .../src/modals/textAreaModal/index.tsx | 22 ++--- .../ConnectionLineComponent/index.tsx | 4 +- .../components/DisclosureComponent/index.tsx | 8 +- .../components/PageComponent/index.tsx | 8 +- .../extraSidebarComponent/index.tsx | 20 ++--- .../components/nodeToolbarComponent/index.tsx | 14 +-- src/frontend/tailwind.config.js | 74 ++++++++++++++++ 50 files changed, 378 insertions(+), 220 deletions(-) diff --git a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx index 65f946ba2..e2c651519 100644 --- a/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx @@ -121,12 +121,12 @@ export default function ParameterComponent({ return (
<>
{title} - {required ? " *" : ""} + {required ? " *" : ""}
{left && (type === "str" || @@ -153,7 +153,7 @@ export default function ParameterComponent({ } className={classNames( left ? "-ml-0.5 " : "-mr-0.5 ", - "w-3 h-3 rounded-full border-2 bg-white dark:bg-gray-800" + "w-3 h-3 rounded-full border-2 bg-white dark:bg-dark-gray" )} style={{ borderColor: color, diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx index fdf830408..378a02344 100644 --- a/src/frontend/src/CustomNodes/GenericNode/index.tsx +++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx @@ -75,11 +75,11 @@ export default function GenericNode({
-
+
-
{data.type}
+
{data.type}
@@ -122,25 +122,25 @@ export default function GenericNode({
@@ -149,7 +149,7 @@ export default function GenericNode({
-
+
{data.node.description}
diff --git a/src/frontend/src/alerts/alertDropDown/index.tsx b/src/frontend/src/alerts/alertDropDown/index.tsx index edd3bb23f..7ba779c02 100644 --- a/src/frontend/src/alerts/alertDropDown/index.tsx +++ b/src/frontend/src/alerts/alertDropDown/index.tsx @@ -24,13 +24,13 @@ export default function AlertDropdown({}: AlertDropdownType) { return (
-
+
Notifications
-
+
{notificationList.length !== 0 ? ( notificationList.map((alertItem, index) => ( )) ) : ( -
+
No new notifications
)} diff --git a/src/frontend/src/alerts/error/index.tsx b/src/frontend/src/alerts/error/index.tsx index bcabe764f..01c8fbb7e 100644 --- a/src/frontend/src/alerts/error/index.tsx +++ b/src/frontend/src/alerts/error/index.tsx @@ -39,21 +39,21 @@ export default function ErrorAlert({ removeAlert(id); }, 500); }} - className="rounded-md w-96 mt-6 shadow-xl bg-red-50 dark:bg-red-900 p-4 cursor-pointer" + className="rounded-md w-96 mt-6 shadow-xl bg-light-red dark:bg-dark-red p-4 cursor-pointer" >
-

+

{title}

{list.length !== 0 ? ( -
+