jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'dev' into python_custom_node_component

Browse source
This commit is contained in:
Lucas Oliveira 2023-07-25 09:41:01 -03:00
commit d283ce5600
9 changed files with 1316 additions and 2533 deletions
Download patch file Download diff file Expand all files Collapse all files

3443
src/frontend/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

224
src/frontend/src/components/codeTabsComponent/index.tsx
View file

@ -1,4 +1,5 @@
import { useContext, useState } from "react"; import { cloneDeep } from "lodash";
import { useContext, useEffect, useState } from "react";
import { Prism as SyntaxHighlighter } from "react-syntax-highlighter"; import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
import { oneDark } from "react-syntax-highlighter/dist/cjs/styles/prism"; import { oneDark } from "react-syntax-highlighter/dist/cjs/styles/prism";
import AccordionComponent from "../../components/AccordionComponent"; import AccordionComponent from "../../components/AccordionComponent";
@ -54,9 +55,16 @@ export default function CodeTabsComponent({
}; };
}) { }) {
const [isCopied, setIsCopied] = useState<Boolean>(false); const [isCopied, setIsCopied] = useState<Boolean>(false);
const [data, setData] = useState(flow ? flow["data"]["nodes"] : null);
const [openAccordion, setOpenAccordion] = useState([]); const [openAccordion, setOpenAccordion] = useState([]);
const { dark } = useContext(darkContext); const { dark } = useContext(darkContext);
useEffect(() => {
if (flow && flow["data"]["nodes"]) {
setData(flow["data"]["nodes"]);
}
}, [flow]);
const copyToClipboard = () => { const copyToClipboard = () => {
if (!navigator.clipboard || !navigator.clipboard.writeText) { if (!navigator.clipboard || !navigator.clipboard.writeText) {
return; return;
@ -185,7 +193,7 @@ export default function CodeTabsComponent({
: "overflow-hidden" : "overflow-hidden"
)} )}
> >
{flow["data"]["nodes"].map((t: any, index) => ( {data.map((t: any, index) => (
<div className="px-3" key={index}> <div className="px-3" key={index}>
{tweaks.tweaksList.current.includes(t["data"]["id"]) && ( {tweaks.tweaksList.current.includes(t["data"]["id"]) && (
<AccordionComponent <AccordionComponent
@ -254,8 +262,17 @@ export default function CodeTabsComponent({
n n
].value ].value
} }
onChange={(k) => {}} onChange={(k) => {
onAddInput={(k) => { setData((old) => {
let newInputList =
cloneDeep(old);
newInputList[
index
].data.node.template[
n
].value = k;
return newInputList;
});
tweaks.buildTweakObject( tweaks.buildTweakObject(
t["data"]["id"], t["data"]["id"],
k, k,
@ -275,16 +292,29 @@ export default function CodeTabsComponent({
<TextAreaComponent <TextAreaComponent
disabled={false} disabled={false}
editNode={true} editNode={true}
value={tweaks.getValue( value={
!t.data.node.template[
n
].value ||
t.data.node.template[ t.data.node.template[
n n
].value, ].value === ""
t.data, ? ""
t.data.node.template[ : t.data.node
n .template[n]
] .value
)} }
onChange={(k) => { onChange={(k) => {
setData((old) => {
let newInputList =
cloneDeep(old);
newInputList[
index
].data.node.template[
n
].value = k;
return newInputList;
});
tweaks.buildTweakObject( tweaks.buildTweakObject(
t["data"]["id"], t["data"]["id"],
k, k,
@ -303,13 +333,27 @@ export default function CodeTabsComponent({
t.data.node.template[n] t.data.node.template[n]
.password ?? false .password ?? false
} }
value={tweaks.getValue( value={
!t.data.node.template[n]
.value ||
t.data.node.template[n] t.data.node.template[n]
.value, .value === ""
t.data, ? ""
t.data.node.template[n] : t.data.node.template[
)} n
].value
}
onChange={(k) => { onChange={(k) => {
setData((old) => {
let newInputList =
cloneDeep(old);
newInputList[
index
].data.node.template[
n
].value = k;
return newInputList;
});
tweaks.buildTweakObject( tweaks.buildTweakObject(
t["data"]["id"], t["data"]["id"],
k, k,
@ -329,9 +373,16 @@ export default function CodeTabsComponent({
.value .value
} }
setEnabled={(e) => { setEnabled={(e) => {
t.data.node.template[ setData((old) => {
let newInputList =
cloneDeep(old);
newInputList[
index
].data.node.template[
n n
].value = e; ].value = e;
return newInputList;
});
tweaks.buildTweakObject( tweaks.buildTweakObject(
t["data"]["id"], t["data"]["id"],
e, e,
@ -346,12 +397,13 @@ export default function CodeTabsComponent({
"file" ? ( "file" ? (
<ShadTooltip <ShadTooltip
content={tweaks.buildContent( content={tweaks.buildContent(
tweaks.getValue( !t.data.node.template[n]
.value ||
t.data.node.template[n] t.data.node.template[n]
.value, .value === ""
t.data, ? ""
t.data.node.template[n] : t.data.node.template[n]
) .value
)} )}
> >
<div className="mx-auto"> <div className="mx-auto">
@ -383,13 +435,26 @@ export default function CodeTabsComponent({
<FloatComponent <FloatComponent
disabled={false} disabled={false}
editNode={true} editNode={true}
value={tweaks.getValue( value={
!t.data.node.template[n]
.value ||
t.data.node.template[n] t.data.node.template[n]
.value, .value === ""
t.data, ? ""
t.data.node.template[n] : t.data.node.template[n]
)} .value
}
onChange={(k) => { onChange={(k) => {
setData((old) => {
let newInputList =
cloneDeep(old);
newInputList[
index
].data.node.template[
n
].value = k;
return newInputList;
});
tweaks.buildTweakObject( tweaks.buildTweakObject(
t["data"]["id"], t["data"]["id"],
k, k,
@ -411,18 +476,31 @@ export default function CodeTabsComponent({
.options .options
} }
onSelect={(k) => { onSelect={(k) => {
setData((old) => {
let newInputList =
cloneDeep(old);
newInputList[
index
].data.node.template[
n
].value = k;
return newInputList;
});
tweaks.buildTweakObject( tweaks.buildTweakObject(
t["data"]["id"], t["data"]["id"],
k, k,
t.data.node.template[n] t.data.node.template[n]
); );
}} }}
value={tweaks.getValue( value={
!t.data.node.template[n]
.value ||
t.data.node.template[n] t.data.node.template[n]
.value, .value === ""
t.data, ? ""
t.data.node.template[n] : t.data.node.template[n]
)} .value
}
></Dropdown> ></Dropdown>
</div> </div>
) : t.data.node.template[n].type === ) : t.data.node.template[n].type ===
@ -431,13 +509,26 @@ export default function CodeTabsComponent({
<IntComponent <IntComponent
disabled={false} disabled={false}
editNode={true} editNode={true}
value={tweaks.getValue( value={
!t.data.node.template[n]
.value ||
t.data.node.template[n] t.data.node.template[n]
.value, .value === ""
t.data, ? ""
t.data.node.template[n] : t.data.node.template[n]
)} .value
}
onChange={(k) => { onChange={(k) => {
setData((old) => {
let newInputList =
cloneDeep(old);
newInputList[
index
].data.node.template[
n
].value = k;
return newInputList;
});
tweaks.buildTweakObject( tweaks.buildTweakObject(
t["data"]["id"], t["data"]["id"],
k, k,
@ -450,25 +541,40 @@ export default function CodeTabsComponent({
"prompt" ? ( "prompt" ? (
<ShadTooltip <ShadTooltip
content={tweaks.buildContent( content={tweaks.buildContent(
tweaks.getValue( !t.data.node.template[n]
.value ||
t.data.node.template[n] t.data.node.template[n]
.value, .value === ""
t.data, ? ""
t.data.node.template[n] : t.data.node.template[n]
) .value
)} )}
> >
<div className="mx-auto"> <div className="mx-auto">
<PromptAreaComponent <PromptAreaComponent
editNode={true} editNode={true}
disabled={false} disabled={false}
value={tweaks.getValue( value={
!t.data.node.template[n]
.value ||
t.data.node.template[n] t.data.node.template[n]
.value, .value === ""
t.data, ? ""
t.data.node.template[n] : t.data.node.template[
)} n
].value
}
onChange={(k) => { onChange={(k) => {
setData((old) => {
let newInputList =
cloneDeep(old);
newInputList[
index
].data.node.template[
n
].value = k;
return newInputList;
});
tweaks.buildTweakObject( tweaks.buildTweakObject(
t["data"]["id"], t["data"]["id"],
k, k,
@ -494,13 +600,27 @@ export default function CodeTabsComponent({
<CodeAreaComponent <CodeAreaComponent
disabled={false} disabled={false}
editNode={true} editNode={true}
value={tweaks.getValue( value={
!t.data.node.template[n]
.value ||
t.data.node.template[n] t.data.node.template[n]
.value, .value === ""
t.data, ? ""
t.data.node.template[n] : t.data.node.template[
)} n
].value
}
onChange={(k) => { onChange={(k) => {
setData((old) => {
let newInputList =
cloneDeep(old);
newInputList[
index
].data.node.template[
n
].value = k;
return newInputList;
});
tweaks.buildTweakObject( tweaks.buildTweakObject(
t["data"]["id"], t["data"]["id"],
k, k,

41
src/frontend/src/components/inputListComponent/index.tsx
View file

@ -1,8 +1,7 @@
import { useContext, useEffect, useState } from "react"; import { useEffect } from "react";
import { InputListComponentType } from "../../types/components"; import { InputListComponentType } from "../../types/components";
import _ from "lodash"; import _ from "lodash";
import { PopUpContext } from "../../contexts/popUpContext";
import IconComponent from "../genericIconComponent"; import IconComponent from "../genericIconComponent";
export default function InputListComponent({ export default function InputListComponent({
@ -10,23 +9,12 @@ export default function InputListComponent({
onChange, onChange,
disabled, disabled,
editNode = false, editNode = false,
onAddInput,
}: InputListComponentType) { }: InputListComponentType) {
const [inputList, setInputList] = useState(value ?? [""]);
const { closeEdit } = useContext(PopUpContext);
useEffect(() => {
if (value) {
setInputList(value);
}
}, [closeEdit]);
useEffect(() => { useEffect(() => {
if (disabled) { if (disabled) {
setInputList([""]);
onChange([""]); onChange([""]);
} }
}, [disabled, onChange]); }, [disabled]);
return ( return (
<div <div
@ -35,7 +23,7 @@ export default function InputListComponent({
"flex flex-col gap-3" "flex flex-col gap-3"
} }
> >
{inputList.map((i, idx) => { {value.map((i, idx) => {
return ( return (
<div key={idx} className="flex w-full gap-3"> <div key={idx} className="flex w-full gap-3">
<input <input
@ -49,23 +37,17 @@ export default function InputListComponent({
} }
placeholder="Type something..." placeholder="Type something..."
onChange={(e) => { onChange={(e) => {
setInputList((old) => { let newInputList = _.cloneDeep(value);
let newInputList = _.cloneDeep(inputList);
newInputList[idx] = e.target.value; newInputList[idx] = e.target.value;
return newInputList; onChange(newInputList);
});
onChange(inputList);
}} }}
/> />
{idx === inputList.length - 1 ? ( {idx === value.length - 1 ? (
<button <button
onClick={() => { onClick={() => {
setInputList((old) => { let newInputList = _.cloneDeep(value);
let newInputList = _.cloneDeep(old);
newInputList.push(""); newInputList.push("");
return newInputList; onChange(newInputList);
});
onChange(inputList);
}} }}
> >
<IconComponent <IconComponent
@ -76,12 +58,9 @@ export default function InputListComponent({
) : ( ) : (
<button <button
onClick={() => { onClick={() => {
setInputList((old) => { let newInputList = _.cloneDeep(value);
let newInputList = _.cloneDeep(old);
newInputList.splice(idx, 1); newInputList.splice(idx, 1);
return newInputList; onChange(newInputList);
});
onChange(inputList);
}} }}
> >
<IconComponent <IconComponent

1
src/frontend/src/components/toggleShadComponent/index.tsx
View file

@ -25,6 +25,7 @@ export default function ToggleShadComponent({
scaleX = 1; scaleX = 1;
scaleY = 1; scaleY = 1;
} }
return ( return (
<div className={disabled ? "pointer-events-none cursor-not-allowed " : ""}> <div className={disabled ? "pointer-events-none cursor-not-allowed " : ""}>
<Switch <Switch

5
src/frontend/src/modals/EditNodeModal/index.tsx
View file

@ -22,11 +22,10 @@ import {
TableRow, TableRow,
} from "../../components/ui/table"; } from "../../components/ui/table";
import { limitScrollFieldsModal } from "../../constants/constants"; import { limitScrollFieldsModal } from "../../constants/constants";
import { PopUpContext } from "../../contexts/popUpContext";
import { TabsContext } from "../../contexts/tabsContext"; import { TabsContext } from "../../contexts/tabsContext";
import { typesContext } from "../../contexts/typesContext"; import { typesContext } from "../../contexts/typesContext";
import { NodeDataType } from "../../types/flow"; import { NodeDataType } from "../../types/flow";
import { classNames, getRandomKeyByssmm } from "../../utils/utils"; import { classNames } from "../../utils/utils";
import BaseModal from "../baseModal"; import BaseModal from "../baseModal";
const EditNodeModal = forwardRef( const EditNodeModal = forwardRef(
@ -48,7 +47,6 @@ const EditNodeModal = forwardRef(
const [myData, setMyData] = useState(data); const [myData, setMyData] = useState(data);
const { setTabsState, tabId } = useContext(TabsContext); const { setTabsState, tabId } = useContext(TabsContext);
const { reactFlowInstance } = useContext(typesContext); const { reactFlowInstance } = useContext(typesContext);
const { setCloseEdit } = useContext(PopUpContext);
let disabled = let disabled =
reactFlowInstance?.getEdges().some((e) => e.targetHandle === data.id) ?? reactFlowInstance?.getEdges().some((e) => e.targetHandle === data.id) ??
@ -72,7 +70,6 @@ const EditNodeModal = forwardRef(
useEffect(() => { useEffect(() => {
setMyData(data); // reset data to what it is on node when opening modal setMyData(data); // reset data to what it is on node when opening modal
setCloseEdit(getRandomKeyByssmm().toString());
}, [modalOpen]); }, [modalOpen]);
return ( return (

8
src/frontend/src/modals/formModal/chatMessage/index.tsx
View file

@ -78,7 +78,13 @@ export default function ChatMessage({
<div className="w-full dark:text-white"> <div className="w-full dark:text-white">
<div className="w-full"> <div className="w-full">
{useMemo( {useMemo(
() => ( () =>
chat.message.toString() === "" && lockChat ? (
<IconComponent
name="MoreHorizontal"
className="h-8 w-8 animate-pulse"
/>
) : (
<ReactMarkdown <ReactMarkdown
remarkPlugins={[remarkGfm, remarkMath]} remarkPlugins={[remarkGfm, remarkMath]}
rehypePlugins={[rehypeMathjax]} rehypePlugins={[rehypeMathjax]}

1
src/frontend/src/types/components/index.ts
View file

@ -45,7 +45,6 @@ export type InputListComponentType = {
onChange: (value: string[]) => void; onChange: (value: string[]) => void;
disabled: boolean; disabled: boolean;
editNode?: boolean; editNode?: boolean;
onAddInput?: (value?: string[]) => void;
}; };
export type TextAreaComponentType = { export type TextAreaComponentType = {

2
src/frontend/src/utils/styleUtils.ts
View file

@ -42,6 +42,7 @@ import {
MessageSquare, MessageSquare,
MessagesSquare, MessagesSquare,
MoonIcon, MoonIcon,
MoreHorizontal,
Paperclip, Paperclip,
Plus, Plus,
Redo, Redo,
@ -274,6 +275,7 @@ export const nodeIconsLucide = {
Copy, Copy,
Upload, Upload,
MessageSquare, MessageSquare,
MoreHorizontal,
}; };
export function getConnectedNodes(edge: Edge, nodes: Array<Node>): Array<Node> { export function getConnectedNodes(edge: Edge, nodes: Array<Node>): Array<Node> {
const sourceId = edge.source; const sourceId = edge.source;

2
src/frontend/src/utils/utils.ts
View file

@ -367,7 +367,7 @@ export function buildTweakObject(tweak) {
}); });
}); });
const tweakString = JSON.stringify(tweak, null, 2); const tweakString = JSON.stringify(tweak.at(-1), null, 2);
return tweakString; return tweakString;
} }