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

Merge branch 'dev' into vecstores

Browse source
This commit is contained in:
Ibis Prevedello 2023-04-04 21:04:46 -03:00
commit 137070437c
2 changed files with 53 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/frontend/package.json
View file

@ -59,5 +59,5 @@
"last 1 safari version" "last 1 safari version"
] ]
}, },
"proxy": "http://localhost:7860" "proxy": "http://backend:7860"
} }

73
src/frontend/src/components/chatComponent/index.tsx
View file

@ -5,7 +5,13 @@ import {
PaperAirplaneIcon, PaperAirplaneIcon,
XMarkIcon, XMarkIcon,
} from "@heroicons/react/24/outline"; } from "@heroicons/react/24/outline";
import { MouseEventHandler, useContext, useEffect, useRef, useState } from "react"; import {
MouseEventHandler,
useContext,
useEffect,
useRef,
useState,
} from "react";
import { sendAll } from "../../controllers/API"; import { sendAll } from "../../controllers/API";
import { alertContext } from "../../contexts/alertContext"; import { alertContext } from "../../contexts/alertContext";
import { classNames, nodeColors } from "../../utils"; import { classNames, nodeColors } from "../../utils";
@ -13,11 +19,11 @@ import { TabsContext } from "../../contexts/tabsContext";
import { ChatType } from "../../types/chat"; import { ChatType } from "../../types/chat";
import ChatMessage from "./chatMessage"; import ChatMessage from "./chatMessage";
const _ = require("lodash"); const _ = require("lodash");
export default function Chat({ flow, reactFlowInstance }: ChatType) { export default function Chat({ flow, reactFlowInstance }: ChatType) {
const { updateFlow,lockChat,setLockChat,flows,tabIndex } = useContext(TabsContext); const { updateFlow, lockChat, setLockChat, flows, tabIndex } =
useContext(TabsContext);
const [saveChat, setSaveChat] = useState(false); const [saveChat, setSaveChat] = useState(false);
const [open, setOpen] = useState(true); const [open, setOpen] = useState(true);
const [chatValue, setChatValue] = useState(""); const [chatValue, setChatValue] = useState("");
@ -26,14 +32,14 @@ export default function Chat({ flow, reactFlowInstance }: ChatType) {
const addChatHistory = ( const addChatHistory = (
message: string, message: string,
isSend: boolean, isSend: boolean,
thought?: string, thought?: string
) => { ) => {
let tabsChange = false; let tabsChange = false;
setChatHistory((old) => { setChatHistory((old) => {
let newChat = _.cloneDeep(old); let newChat = _.cloneDeep(old);
if(JSON.stringify(flow.chat) !==JSON.stringify(old)){ if (JSON.stringify(flow.chat) !== JSON.stringify(old)) {
tabsChange = true tabsChange = true;
return old return old;
} }
if (thought) { if (thought) {
newChat.push({ message, isSend, thought }); newChat.push({ message, isSend, thought });
@ -42,12 +48,17 @@ export default function Chat({ flow, reactFlowInstance }: ChatType) {
} }
return newChat; return newChat;
}); });
if(tabsChange){ if (tabsChange) {
if(thought){ if (thought) {
updateFlow({..._.cloneDeep(flow),chat:[...flow.chat,{isSend,message,thought}]}) updateFlow({
} ..._.cloneDeep(flow),
else{ chat: [...flow.chat, { isSend, message, thought }],
updateFlow({..._.cloneDeep(flow),chat:[...flow.chat,{isSend,message}]}) });
} else {
updateFlow({
..._.cloneDeep(flow),
chat: [...flow.chat, { isSend, message }],
});
} }
} }
setSaveChat((chat) => !chat); setSaveChat((chat) => !chat);
@ -98,19 +109,38 @@ export default function Chat({ flow, reactFlowInstance }: ChatType) {
setChatValue(""); setChatValue("");
addChatHistory(message, true); addChatHistory(message, true);
sendAll({ ...reactFlowInstance.toObject(), message, chatHistory,name:flow.name,description:flow.description}) sendAll({
...reactFlowInstance.toObject(),
message,
chatHistory,
name: flow.name,
description: flow.description,
})
.then((r) => { .then((r) => {
addChatHistory(r.data.result, false,r.data.thought); addChatHistory(r.data.result, false, r.data.thought);
setLockChat(false); setLockChat(false);
}) })
.catch((error) => { .catch((error) => {
setErrorData({ title: error.message ?? "Unknown Error", list: [error.response.data.detail]}); setErrorData({
title: error.message ?? "Unknown Error",
list: [error.response.data.detail],
});
setLockChat(false); setLockChat(false);
let lastMessage;
setChatHistory((chatHistory) => {
let newChat = chatHistory;
lastMessage= newChat.pop().message;
return newChat;
});
setChatValue(lastMessage)
}); });
} else { } else {
setErrorData({ setErrorData({
title: "Error sending message", title: "Error sending message",
list: [ "Oops! Looks like you missed some required information. Please fill in all the required fields before continuing."], list: [
"Oops! Looks like you missed some required information. Please fill in all the required fields before continuing.",
],
}); });
} }
} else { } else {
@ -121,8 +151,8 @@ export default function Chat({ flow, reactFlowInstance }: ChatType) {
} }
} }
function clearChat() { function clearChat() {
setChatHistory([]) setChatHistory([]);
updateFlow({ ..._.cloneDeep(flow), chat: []}); updateFlow({ ..._.cloneDeep(flow), chat: [] });
} }
return ( return (
@ -152,9 +182,10 @@ export default function Chat({ flow, reactFlowInstance }: ChatType) {
/> />
Chat Chat
</div> </div>
<button className="hover:text-blue-500 dark:text-white" <button
className="hover:text-blue-500 dark:text-white"
onClick={(e) => { onClick={(e) => {
e.stopPropagation() e.stopPropagation();
clearChat(); clearChat();
}} }}
> >