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

Optimized groupByFamily and implemented output tooltip showing the nodes that receive its output

Browse source
This commit is contained in:
Lucas Oliveira 2023-07-28 21:26:08 -03:00
commit 1590aa491a
2 changed files with 25 additions and 230 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,9 +25,7 @@ import {
} from "../../../../utils/styleUtils"; } from "../../../../utils/styleUtils";
import { import {
classNames, classNames,
getRandomKeyByssmm,
groupByFamily, groupByFamily,
groupByFamilyCustom,
} from "../../../../utils/utils"; } from "../../../../utils/utils";
export default function ParameterComponent({ export default function ParameterComponent({
@ -104,17 +102,7 @@ export default function ParameterComponent({
}, [info]); }, [info]);
function renderTooltips() { function renderTooltips() {
let groupedObj = groupByFamily(myData, tooltipTitle, left, data.type, flow); let groupedObj = groupByFamily(myData, tooltipTitle, left);
if (groupedObj?.length === 0 && flow && flow.length > 0) {
groupedObj = groupByFamilyCustom(
myData,
tooltipTitle,
left,
data.type,
flow
);
}
if (groupedObj) { if (groupedObj) {
refNumberComponents.current = groupedObj[0]?.type?.length; refNumberComponents.current = groupedObj[0]?.type?.length;
@ -125,7 +113,7 @@ export default function ParameterComponent({
return ( return (
<span <span
key={getRandomKeyByssmm() + item.family + i} key={i}
className={classNames( className={classNames(
i > 0 ? "mt-2 flex items-center" : "flex items-center" i > 0 ? "mt-2 flex items-center" : "flex items-center"
)} )}
@ -145,9 +133,7 @@ export default function ParameterComponent({
/> />
</div> </div>
<span className="ps-2 text-xs text-foreground"> <span className="ps-2 text-xs text-foreground">
{item.family !== "custom_components" {nodeNames[item.family]}
? nodeNames[item.family]
: item.component ?? ""}{" "}
<span className="text-xs"> <span className="text-xs">
{" "} {" "}
{item.type === "" ? "" : " - "} {item.type === "" ? "" : " - "}

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

@ -89,222 +89,31 @@ export function checkUpperWords(str: string) {
export const isWrappedWithClass = (event: any, className: string | undefined) => export const isWrappedWithClass = (event: any, className: string | undefined) =>
event.target.closest(`.${className}`); event.target.closest(`.${className}`);
export function groupByFamily(data, baseClasses, left, type, flow) { export function groupByFamily(data, baseClasses, left) {
let parentOutput: string; const baseClassesSet = new Set(baseClasses.split("\n"));
let arrOfParent: string[] = []; let arrOfPossibleInputs = [];
let arrOfType: { family: string; type: string; component: string }[] = []; let arrOfPossibleOutputs = [];
let arrOfLength: { length: number; type: string }[] = [];
let lastType = "";
Object.keys(data).forEach((d) => { for (const [d, nodes] of Object.entries(data)) {
Object.keys(data[d]).forEach((n) => { let tempInputs = [], tempOutputs = [];
try {
if (
data[d][n].base_classes.some((r) =>
baseClasses.split("\n").includes(r)
)
) {
arrOfParent.push(d);
}
if (n === type) {
parentOutput = d;
}
if (d !== lastType) { for (const [n, node] of Object.entries(nodes)) {
arrOfLength.push({ const hasBaseClassInTemplate = Object.values(node.template).some((t: any) => t.type && baseClassesSet.has(t.type));
length: Object.keys(data[d]).length, const hasBaseClassInBaseClasses = node.base_classes.some(t => baseClassesSet.has(t));
type: d,
});
lastType = d; if(hasBaseClassInTemplate) tempInputs.push(n);
} if(hasBaseClassInBaseClasses) tempOutputs.push(n);
} catch (e) {
console.log(e);
}
});
});
Object.keys(data).map((d) => {
Object.keys(data[d]).map((n) => {
try {
baseClasses.split("\n").forEach((tol) => {
data[d][n].base_classes.forEach((data) => {
if (tol === data) {
arrOfType.push({
family: d,
type: data,
component: n,
});
}
});
});
} catch (e) {
console.log(e);
}
});
});
if (left === false) {
let groupedBy = arrOfType.filter((object, index, self) => {
const foundIndex = self.findIndex(
(o) => o.family === object.family && o.type === object.type
);
return foundIndex === index;
});
return groupedBy.reduce((result, item) => {
const existingGroup = result.find(
(group) => group.family === item.family
);
if (existingGroup) {
existingGroup.type += `, ${item.type}`;
} else {
result.push({
family: item.family,
type: item.type,
component: item.component,
});
} }
if (parentOutput !== "custom_components") { const totalNodes = Object.keys(nodes).length;
let resFil = result.filter((group) => group.family === parentOutput); if(tempInputs.length) arrOfPossibleInputs.push({category: d, nodes: tempInputs, full: tempInputs.length === totalNodes});
result = resFil; if(tempOutputs.length) arrOfPossibleOutputs.push({category: d, nodes: tempOutputs, full: tempOutputs.length === totalNodes});
}
return result;
}, []);
} else {
const groupedArray = [];
const groupedData = {};
arrOfType.forEach((item) => {
const { family, type, component } = item;
const key = `${family}-${type}`;
if (!groupedData[key]) {
groupedData[key] = { family, type, component: [component] };
} else {
groupedData[key].component.push(component);
}
});
for (const key in groupedData) {
groupedArray.push(groupedData[key]);
} }
groupedArray.forEach((object, index, self) => { return left
const findObj = arrOfLength.find((x) => x.type === object.family); ? arrOfPossibleOutputs.map(t => ({family: t.category, type: t.full ? "" : t.nodes.join(", ")}))
if (object.component.length === findObj.length) { : arrOfPossibleInputs.map(t => ({family: t.category, type: t.full ? "" : t.nodes.join(", ")}));
self[index]["type"] = "";
} else {
self[index]["type"] = object.component.join(", ");
}
});
return groupedArray;
} }
}
export function groupByFamilyCustom(data, baseClasses, left, type, flow) {
let arrOfParentCustom: string[] = [];
let arrOfType: { family: string; type: string; component: string }[] = [];
if (type === "CustomComponent") {
const uniqueValuesSet = new Set();
flow.forEach((element) => {
element["data"]["node"]["base_classes"].forEach((el) => {
if (!uniqueValuesSet.has(el)) {
arrOfParentCustom.push(el);
uniqueValuesSet.add(el);
}
});
});
}
if (left === false) {
arrOfParentCustom.map((n) => {
try {
arrOfType.push({
family: "custom_components",
type: n,
component: nodeNames["custom_components"],
});
} catch (e) {
console.log(e);
}
});
} else {
flow.forEach((element) => {
Object.keys(element["data"]["node"]["template"]).map((el) => {
if (
element["data"]["node"]["template"][el].input_types &&
element["data"]["node"]["template"][el].input_types.length > 0
) {
element["data"]["node"]["template"][el].input_types.map((n) => {
try {
arrOfType.push({
family: "custom_components",
type: n,
component: nodeNames["custom_components"],
});
} catch (e) {
console.log(e);
}
});
}
});
});
}
const groupedResult = {};
arrOfType.forEach((item) => {
const { family, type, component } = item;
if (groupedResult.hasOwnProperty(family)) {
if (!groupedResult[family].type.includes(type)) {
groupedResult[family].type += `, ${type}`;
}
} else {
groupedResult[family] = { family, type, component };
}
});
const result = Object.values(groupedResult);
if (left === false) {
let resultFiltered = [];
flow.forEach((element) => {
Object.keys(element["data"]["node"]["template"]).map((el) => {
if (
element["data"]["node"]["template"][el].input_types &&
element["data"]["node"]["template"][el].input_types.length > 0
) {
element["data"]["node"]["template"][el].input_types.map((n) => {
resultFiltered.push({
family: "custom_components",
type: n,
component: element["data"]["node"]["display_name"],
});
});
}
});
});
if (resultFiltered.length === 0) {
Object.keys(groupedResult).forEach((el) => {
resultFiltered.push({
family: "custom_components",
type: groupedResult[el].type,
component: nodeNames["custom_components"],
});
});
}
return resultFiltered;
} else {
return result;
}
}
export function buildInputs(tabsState, id) { export function buildInputs(tabsState, id) {
return tabsState && return tabsState &&