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

Merge branch 'form_io' of github.com:logspace-ai/langflow into form_io

Browse source
This commit is contained in:
Lucas Oliveira 2023-06-27 19:15:56 -03:00
commit 2f5d721ba8
13 changed files with 419 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/frontend/src/CustomNodes/GenericNode/components/parameterComponent/index.tsx
View file

@ -229,6 +229,10 @@ export default function ParameterComponent({
</div>
) : left === true && type === "code" ? (
<CodeAreaComponent
setNodeClass={(nodeClass) => {
data.node = nodeClass;
}}
nodeClass={data.node}
disabled={disabled}
value={data.node.template[name].value ?? ""}
onChange={handleOnNewValue}
@ -256,6 +260,7 @@ export default function ParameterComponent({
</div>
) : left === true && type === "prompt" ? (
<PromptAreaComponent
nodeClass={data.node}
disabled={disabled}
value={data.node.template[name].value ?? ""}
onChange={handleOnNewValue}

2
src/frontend/src/CustomNodes/GenericNode/index.tsx
View file

@ -78,7 +78,7 @@ export default function GenericNode({
}
useEffect(() => {}, [closePopUp, data.node.template]);
console.log({data})
return (
<>
<NodeToolbar>

10
src/frontend/src/components/codeAreaComponent/index.tsx
View file

@ -2,7 +2,7 @@ import { useContext, useEffect, useState } from "react";
import { PopUpContext } from "../../contexts/popUpContext";
import CodeAreaModal from "../../modals/codeAreaModal";
import TextAreaModal from "../../modals/textAreaModal";
import { TextAreaComponentType } from "../../types/components";
import { CodeAreaComponentType, TextAreaComponentType } from "../../types/components";
import { INPUT_STYLE } from "../../constants";
import { ExternalLink } from "lucide-react";
@ -11,7 +11,9 @@ export default function CodeAreaComponent({
onChange,
disabled,
editNode = false,
}: TextAreaComponentType) {
nodeClass,
setNodeClass,
}: CodeAreaComponentType) {
const [myValue, setMyValue] = useState(value);
const { openPopUp } = useContext(PopUpContext);
useEffect(() => {
@ -37,6 +39,8 @@ export default function CodeAreaComponent({
openPopUp(
<CodeAreaModal
value={myValue}
nodeClass={nodeClass}
setNodeClass={setNodeClass}
setValue={(t: string) => {
setMyValue(t);
onChange(t);
@ -59,7 +63,9 @@ export default function CodeAreaComponent({
onClick={() => {
openPopUp(
<CodeAreaModal
setNodeClass={setNodeClass}
value={myValue}
nodeClass={nodeClass}
setValue={(t: string) => {
setMyValue(t);
onChange(t);

2
src/frontend/src/components/promptComponent/index.tsx
View file

@ -7,6 +7,7 @@ import { INPUT_STYLE } from "../../constants";
import { ExternalLink } from "lucide-react";
export default function PromptAreaComponent({
nodeClass,
value,
onChange,
disabled,
@ -44,6 +45,7 @@ export default function PromptAreaComponent({
setMyValue(t);
onChange(t);
}}
nodeClass={nodeClass}
/>
);
}}

16
src/frontend/src/controllers/API/index.ts
View file

@ -4,6 +4,7 @@ import {
errorsTypeAPI,
InitTypeAPI,
UploadFileTypeAPI,
APIClassType,
} from "./../../types/api/index";
import { APIObjectType, sendAllProps } from "../../types/api/index";
import axios, { AxiosResponse } from "axios";
@ -56,9 +57,13 @@ export async function postValidateCode(
* @returns {Promise<AxiosResponse<PromptTypeAPI>>} A promise that resolves to an AxiosResponse containing the validation results.
*/
export async function checkPrompt(
template: string
template: string,
frontend_node: APIClassType
): Promise<AxiosResponse<PromptTypeAPI>> {
return await axios.post("/api/v1/validate/prompt", { template });
return await axios.post("/api/v1/validate/prompt", {
template: template,
frontend_node: frontend_node,
});
}
/**
@ -331,3 +336,10 @@ export async function uploadFile(
formData.append("file", file);
return await axios.post(`/api/v1/upload/${id}`, formData);
}
export async function postCustomComponent(
code: string,
apiClass: APIClassType
): Promise<AxiosResponse<APIClassType>> {
return await axios.post(`/api/v1/custom_component`, { code });
}

105
src/frontend/src/modals/codeAreaModal/index.tsx
View file

@ -1,4 +1,4 @@
import { Fragment, useContext, useRef, useState } from "react";
import { useContext, useRef, useState } from "react";
import { PopUpContext } from "../../contexts/popUpContext";
import AceEditor from "react-ace";
import "ace-builds/src-noconflict/mode-python";
@ -7,9 +7,8 @@ import "ace-builds/src-noconflict/theme-twilight";
import "ace-builds/src-noconflict/ext-language_tools";
// import "ace-builds/webpack-resolver";
import { darkContext } from "../../contexts/darkContext";
import { postValidateCode } from "../../controllers/API";
import { postCustomComponent, postValidateCode } from "../../controllers/API";
import { alertContext } from "../../contexts/alertContext";
import { TabsContext } from "../../contexts/tabsContext";
import {
Dialog,
DialogContent,
@ -22,16 +21,22 @@ import {
import { Button } from "../../components/ui/button";
import { CODE_PROMPT_DIALOG_SUBTITLE } from "../../constants";
import { TerminalSquare } from "lucide-react";
import { APIClassType } from "../../types/api";
export default function CodeAreaModal({
value,
setValue,
nodeClass,
setNodeClass,
}: {
setValue: (value: string) => void;
value: string;
nodeClass: APIClassType;
setNodeClass: (Class: APIClassType) => void;
}) {
const [open, setOpen] = useState(true);
const [code, setCode] = useState(value);
const [loading, setLoading] = useState(false);
const { dark } = useContext(darkContext);
const { setErrorData, setSuccessData } = useContext(alertContext);
const { closePopUp } = useContext(PopUpContext);
@ -44,6 +49,55 @@ export default function CodeAreaModal({
}, 300);
}
}
function handleClick() {
setLoading(true);
postValidateCode(code)
.then((apiReturn) => {
setLoading(false);
if (apiReturn.data) {
let importsErrors = apiReturn.data.imports.errors;
let funcErrors = apiReturn.data.function.errors;
if (funcErrors.length === 0 && importsErrors.length === 0) {
setSuccessData({
title: "Code is ready to run",
});
// setValue(code);
} else {
if (funcErrors.length !== 0) {
setErrorData({
title: "There is an error in your function",
list: funcErrors,
});
}
if (importsErrors.length !== 0) {
setErrorData({
title: "There is an error in your imports",
list: importsErrors,
});
}
}
} else {
setErrorData({
title: "Something went wrong, please try again",
});
}
})
.catch((_) => {
setLoading(false);
setErrorData({
title: "There is something wrong with this code, please review it",
});
});
postCustomComponent(code, nodeClass).then((apiReturn) => {
const data = apiReturn.data;
if (data) {
setNodeClass(data);
setModalOpen(false);
}
});
}
return (
<Dialog open={true} onOpenChange={setModalOpen}>
<DialogTrigger></DialogTrigger>
@ -78,49 +132,8 @@ export default function CodeAreaModal({
</div>
<DialogFooter>
<Button
className="mt-3"
onClick={() => {
postValidateCode(code)
.then((apiReturn) => {
if (apiReturn.data) {
let importsErrors = apiReturn.data.imports.errors;
let funcErrors = apiReturn.data.function.errors;
if (funcErrors.length === 0 && importsErrors.length === 0) {
setSuccessData({
title: "Code is ready to run",
});
setModalOpen(false);
setValue(code);
} else {
if (funcErrors.length !== 0) {
setErrorData({
title: "There is an error in your function",
list: funcErrors,
});
}
if (importsErrors.length !== 0) {
setErrorData({
title: "There is an error in your imports",
list: importsErrors,
});
}
}
} else {
setErrorData({
title: "Something went wrong, please try again",
});
}
})
.catch((_) =>
setErrorData({
title:
"There is something wrong with this code, please review it",
})
);
}}
type="submit"
>
<Button className="mt-3" onClick={handleClick} type="submit">
{/* {loading?(<Loading/>):'Check & Save'} */}
Check & Save
</Button>
</DialogFooter>

12
src/frontend/src/modals/genericModal/index.tsx
View file

@ -1,9 +1,8 @@
import { Fragment, useContext, useRef, useState } from "react";
import { useContext, useRef, useState } from "react";
import { PopUpContext } from "../../contexts/popUpContext";
import { darkContext } from "../../contexts/darkContext";
import { checkPrompt } from "../../controllers/API";
import { alertContext } from "../../contexts/alertContext";
import { TypeModal } from "../../utils";
import {
Dialog,
DialogContent,
@ -17,6 +16,7 @@ import { Button } from "../../components/ui/button";
import { Textarea } from "../../components/ui/textarea";
import { PROMPT_DIALOG_SUBTITLE, TEXT_DIALOG_SUBTITLE } from "../../constants";
import { FileText } from "lucide-react";
import { APIClassType } from "../../types/api";
export default function GenericModal({
value,
@ -24,12 +24,14 @@ export default function GenericModal({
buttonText,
modalTitle,
type,
nodeClass,
}: {
setValue: (value: string) => void;
value: string;
buttonText: string;
modalTitle: string;
type: number;
nodeClass: APIClassType;
}) {
const [myButtonText] = useState(buttonText);
const [myModalTitle] = useState(modalTitle);
@ -97,9 +99,13 @@ export default function GenericModal({
setModalOpen(false);
break;
case 2:
checkPrompt(myValue)
checkPrompt(myValue, nodeClass)
.then((apiReturn) => {
if (apiReturn.data) {
if (apiReturn.data) {
setNodeClass(data);
setModalOpen(false);
}
let inputVariables = apiReturn.data.input_variables;
if (inputVariables.length === 0) {
setErrorData({

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

@ -1,12 +1,7 @@
import {
ComponentType,
ForwardRefExoticComponent,
ReactElement,
ReactNode,
SVGProps,
} from "react";
import { ReactElement, ReactNode } from "react";
import { NodeDataType } from "../flow/index";
import { typesContextType } from "../typesContext";
import { APIClassType } from "../api";
export type InputComponentType = {
value: string;
disabled?: boolean;
@ -50,12 +45,22 @@ export type InputListComponentType = {
};
export type TextAreaComponentType = {
nodeClass?: APIClassType;
disabled: boolean;
onChange: (value: string[] | string) => void;
value: string;
editNode?: boolean;
};
export type CodeAreaComponentType = {
disabled: boolean;
onChange: (value: string[] | string) => void;
value: string;
editNode?: boolean;
nodeClass: APIClassType;
setNodeClass: (value: APIClassType) => void;
};
export type FileComponentType = {
disabled: boolean;
onChange: (value: string[] | string) => void;