Merge branch 'dev' into newHandleId

src/backend/langflow/interface/initialize/loading.py

@@ -60,7 +60,12 @@ def convert_kwargs(params):
     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])
+            try:
+                params[key] = json.loads(params[key])
+            except json.JSONDecodeError:
+                # if the string is not a valid json string, we will
+                # remove the key from the params
+                params.pop(key, None)
     return params
 
 

src/backend/langflow/template/frontend_node/constants.py

@@ -65,4 +65,4 @@ INPUT_KEY_INFO = """The variable to be used as Chat Input when more than one var
 OUTPUT_KEY_INFO = """The variable to be used as Chat Output (e.g. answer in a ConversationalRetrievalChain)"""
 
 
-CLASSES_TO_REMOVE = ["Serializable", "BaseModel", "object"]
+CLASSES_TO_REMOVE = ["Serializable", "BaseModel", "object", "Runnable", "Generic"]

src/frontend/src/modals/exportModal/index.tsx

@@ -13,6 +13,7 @@ const ExportModal = forwardRef((props: { children: ReactNode }, ref) => {
     useContext(TabsContext);
   const [checked, setChecked] = useState(false);
   const [name, setName] = useState(flows.find((f) => f.id === tabId).name);
+  const [invalidName, setInvalidName] = useState(false);
   const [description, setDescription] = useState(
     flows.find((f) => f.id === tabId).description
   );
@@ -30,6 +31,8 @@ const ExportModal = forwardRef((props: { children: ReactNode }, ref) => {
       </BaseModal.Header>
       <BaseModal.Content>
         <EditFlowSettings
+          invalidName={invalidName}
+          setInvalidName={setInvalidName}
           name={name}
           description={description}
           flows={flows}

src/frontend/src/modals/formModal/index.tsx

@@ -112,7 +112,6 @@ export default function FormModal({
       return newChat;
     });
   };
-
   //add proper type signature for function
 
   function updateLastMessage({
@@ -371,10 +370,6 @@ export default function FormModal({
     if (lockChat) setLockChat(false);
   }
 
-  function setModalOpen(x: boolean) {
-    setOpen(x);
-  }
-
   function handleOnCheckedChange(checked: boolean, i: string) {
     if (checked === true) {
       setChatKey(i);
@@ -494,22 +489,12 @@ export default function FormModal({
                         <Badge variant="gray" size="md">
                           {i}
                         </Badge>
-
-                        <div
-                          className="-mb-1"
-                          onClick={(event) => {
-                            event.stopPropagation();
-                          }}
-                        >
+                        <div className="-mb-1">
                           <ToggleShadComponent
                             enabled={chatKey === i}
-                            setEnabled={(value) =>
-                              handleOnCheckedChange(value, i)
-                            }
+                            setEnabled={() => {}}
                             size="small"
-                            disabled={tabsState[
-                              id.current
-                            ].formKeysData.handle_keys.some((t) => t === i)}
+                            disabled={true}
                           />
                         </div>
                       </div>
@@ -518,28 +503,9 @@ export default function FormModal({
                     keyValue={i}
                   >
                     <div className="file-component-tab-column">
-                      {tabsState[id.current].formKeysData.handle_keys.some(
-                        (t) => t === i
-                      ) && (
-                        <div className="font-normal text-muted-foreground ">
-                          Source: Component
-                        </div>
-                      )}
-                      <Textarea
-                        className="custom-scroll"
-                        value={tabsState[id.current].formKeysData.input_keys[i]}
-                        onChange={(e) => {
-                          setTabsState((old) => {
-                            let newTabsState = _.cloneDeep(old);
-                            newTabsState[id.current].formKeysData.input_keys[
-                              i
-                            ] = e.target.value;
-                            return newTabsState;
-                          });
-                        }}
-                        disabled={chatKey === i}
-                        placeholder="Enter text..."
-                      ></Textarea>
+                      <div className="font-normal text-muted-foreground ">
+                        Source: Memory
+                      </div>
                     </div>
                   </AccordionComponent>
                 </div>

src/frontend/src/utils/reactflowUtils.ts

@@ -270,3 +270,12 @@ export function updateEdgesHandleIds({
   });
   setEdges(newEdges);
 }
+
+export function getConnectedNodes(
+  edge: Edge,
+  nodes: Array<NodeType>
+): Array<NodeType> {
+  const sourceId = edge.source;
+  const targetId = edge.target;
+  return nodes.filter((node) => node.id === targetId || node.id === sourceId);
+}

src/frontend/src/utils/styleUtils.ts

@@ -65,7 +65,6 @@ import {
   XCircle,
   Zap,
 } from "lucide-react";
-import { Edge, Node } from "reactflow";
 import { AirbyteIcon } from "../icons/Airbyte";
 import { AnthropicIcon } from "../icons/Anthropic";
 import { BingIcon } from "../icons/Bing";
@@ -277,8 +276,3 @@ export const nodeIconsLucide = {
   MessageSquare,
   MoreHorizontal,
 };
-export function getConnectedNodes(edge: Edge, nodes: Array<Node>): Array<Node> {
-  const sourceId = edge.source;
-  const targetId = edge.target;
-  return nodes.filter((node) => node.id === targetId || node.id === sourceId);
-}