Merge branch 'main' into release

src/backend/langflow/api/v1/chat.py

@@ -155,7 +155,7 @@ async def stream_build(flow_id: str):
                 )
             else:
                 input_keys_response = {
-                    "input_keys": None,
+                    "input_keys": {},
                     "memory_keys": [],
                     "handle_keys": [],
                 }

src/backend/langflow/chat/manager.py

@@ -117,7 +117,7 @@ class ChatManager:
         self, client_id: str, payload: Dict, langchain_object: Any
     ):
         # Process the graph data and chat message
-        chat_inputs = payload.pop("inputs", {})
+        chat_inputs = payload.pop("inputs", "")
         chat_inputs = ChatMessage(message=chat_inputs)
         self.chat_history.add_message(client_id, chat_inputs)
 

src/backend/langflow/chat/utils.py

@@ -21,9 +21,9 @@ async def process_graph(
 
     # Generate result and thought
     try:
-        if chat_inputs.message is None:
+        if not chat_inputs.message:
             logger.debug("No message provided")
-            chat_inputs.message = {}
+            raise ValueError("No message provided")
 
         logger.debug("Generating result and thought")
         result, intermediate_steps = await get_result_and_steps(

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

@@ -171,7 +171,11 @@ def initialize_pinecone(class_object: Type[Pinecone], params: dict):
 def initialize_chroma(class_object: Type[Chroma], params: dict):
     """Initialize a ChromaDB object from the params"""
     if (  # type: ignore
-        "chroma_server_host" in params or "chroma_server_http_port" in params
+        "chroma_server_host" in params
+        or "chroma_server_http_port" in params
+        or "chroma_server_ssl_enabled" in params
+        or "chroma_server_grpc_port" in params
+        or "chroma_server_cors_allow_origins" in params
     ):
         import chromadb  # type: ignore
 
@@ -182,14 +186,6 @@ def initialize_chroma(class_object: Type[Chroma], params: dict):
         }
         chroma_settings = chromadb.config.Settings(**settings_params)
         params["client_settings"] = chroma_settings
-    else:
-        # remove all chroma_server_ keys from params
-        params = {
-            key: value
-            for key, value in params.items()
-            if not key.startswith("chroma_server_")
-        }
-
     persist = params.pop("persist", False)
     if not docs_in_params(params):
         params.pop("documents", None)

src/frontend/src/components/chatComponent/buildTrigger/index.tsx

@@ -82,15 +82,13 @@ export default function BuildTrigger({
       const parsedData = JSON.parse(event.data);
       // if the event is the end of the stream, close the connection
       if (parsedData.end_of_stream) {
-        // Close the connection and finish
-        finished = true;
         eventSource.close();
 
         return;
       } else if (parsedData.log) {
         // If the event is a log, log it
         setSuccessData({ title: parsedData.log });
-      } else if (parsedData.input_keys !== undefined) {
+      } else if (parsedData.input_keys) {
         setTabsState((old) => {
           return {
             ...old,

src/frontend/src/components/chatComponent/index.tsx

@@ -62,7 +62,8 @@ export default function Chat({ flow }: ChatType) {
       tabsState &&
       tabsState[flow.id] &&
       tabsState[flow.id].formKeysData &&
-      tabsState[flow.id].formKeysData.input_keys !== null
+      tabsState[flow.id].formKeysData.input_keys &&
+      Object.keys(tabsState[flow.id].formKeysData.input_keys).length > 0
     ) {
       setCanOpen(true);
     } else {

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

@@ -67,17 +67,14 @@ export default function FormModal({
   const id = useRef(flow.id);
   const tabsStateFlowId = tabsState[flow.id];
   const tabsStateFlowIdFormKeysData = tabsStateFlowId.formKeysData;
-  const [chatKey, setChatKey] = useState(() => {
+  const [chatKey, setChatKey] = useState(
-    if (tabsState[flow.id]?.formKeysData?.input_keys) {
+    Object.keys(tabsState[flow.id].formKeysData.input_keys).find(
-      return Object.keys(tabsState[flow.id].formKeysData.input_keys).find(
       (k) =>
         !tabsState[flow.id].formKeysData.handle_keys.some((j) => j === k) &&
         tabsState[flow.id].formKeysData.input_keys[k] === ""
+    )
   );
-    }
+
-    // TODO: return a sensible default
-    return "";
-  });
   useEffect(() => {
     if (messagesRef.current) {
       messagesRef.current.scrollTop = messagesRef.current.scrollHeight;
@@ -422,10 +419,8 @@ export default function FormModal({
                 </div>
               </div>
 
-              {tabsState[id.current]?.formKeysData?.input_keys
+              {Object.keys(tabsState[id.current].formKeysData.input_keys).map(
-                ? Object.keys(
+                (i, k) => (
-                    tabsState[id.current].formKeysData.input_keys
-                  ).map((i, k) => (
                   <div className="file-component-accordion-div" key={k}>
                     <AccordionComponent
                       trigger={
@@ -472,9 +467,9 @@ export default function FormModal({
                           onChange={(e) => {
                             setTabsState((old) => {
                               let newTabsState = _.cloneDeep(old);
-                                newTabsState[
+                              newTabsState[id.current].formKeysData.input_keys[
-                                  id.current
+                                i
-                                ].formKeysData.input_keys[i] = e.target.value;
+                              ] = e.target.value;
                               return newTabsState;
                             });
                           }}
@@ -484,8 +479,8 @@ export default function FormModal({
                       </div>
                     </AccordionComponent>
                   </div>
-                  ))
+                )
-                : null}
+              )}
               {tabsState[id.current].formKeysData.memory_keys.map((i, k) => (
                 <div className="file-component-accordion-div" key={k}>
                   <AccordionComponent

src/frontend/src/utils/utils.ts

@@ -248,27 +248,6 @@ export function buildTweakObject(tweak) {
   return tweakString;
 }
 
-/**
- * Function to get Chat Input Field
- * @param {FlowType} flow - The current flow.
- * @param {TabsState} tabsState - The current tabs state.
- * @returns {string} - The chat input field
- */
-export function getChatInputField(flow: FlowType, tabsState?: TabsState) {
-  let chat_input_field = "text";
-
-  if (
-    tabsState[flow.id] &&
-    tabsState[flow.id].formKeysData &&
-    tabsState[flow.id].formKeysData.input_keys
-  ) {
-    chat_input_field = Object.keys(
-      tabsState[flow.id].formKeysData.input_keys
-    )[0];
-  }
-  return chat_input_field;
-}
-
 /**
  * Function to get the python code for the API
  * @param {string} flowId - The id of the flow
@@ -386,7 +365,6 @@ export function getWidgetCode(flow: FlowType, tabsState?: TabsState): string {
   const flowId = flow.id;
   const flowName = flow.name;
   const inputs = buildInputs(tabsState, flow.id);
-  let chat_input_field = getChatInputField(flow, tabsState);
 
   return `<script src="https://cdn.jsdelivr.net/gh/logspace-ai/langflow-embedded-chat@main/dist/build/static/js/bundle.min.js"></script>
 
@@ -399,7 +377,9 @@ chat_input_field: Input key that you want the chat to send the user message with
   ${
     tabsState[flow.id] && tabsState[flow.id].formKeysData
       ? `chat_inputs='${inputs}'
-  chat_input_field="${chat_input_field}"
+  chat_input_field="${
+    Object.keys(tabsState[flow.id].formKeysData.input_keys)[0]
+  }"
   `
       : ""
   }host_url="http://localhost:7860"