merge fix

src/frontend/src/App.tsx

@@ -1,3 +1,4 @@
+import axios from "axios";
 import { useContext, useEffect, useState } from "react";
 import { ErrorBoundary } from "react-error-boundary";
 import { useNavigate } from "react-router-dom";
@@ -15,6 +16,7 @@ import {
 } from "./constants/constants";
 import { AuthContext } from "./contexts/authContext";
 import { autoLogin, getGlobalVariables, getHealth } from "./controllers/API";
+import { setupAxiosDefaults } from "./controllers/API/utils";
 import useTrackLastVisitedPath from "./hooks/use-track-last-visited-path";
 import Router from "./routes";
 import useAlertStore from "./stores/alertStore";
@@ -114,9 +116,11 @@ export default function App() {
     return new Promise<void>(async (resolve, reject) => {
       if (isAuthenticated) {
         try {
+          await setupAxiosDefaults();
           await getFoldersApi();
           await getTypes();
           await refreshFlows();
+          console.log(axios.defaults);
           const res = await getGlobalVariables();
           setGlobalVariables(res);
           checkHasStore();

src/frontend/src/controllers/API/utils.tsx

@@ -0,0 +1,32 @@
+import axios from "axios";
+import { BASE_URL_API } from "../../constants/constants";
+
+/**
+ * Fetches the configuration data from the API.
+ * @returns {Promise<any>} A promise that resolves to the configuration data.
+ * @throws {Error} If there was an error fetching the configuration data.
+ */
+export async function fetchConfig() {
+  try {
+    const response = await axios.get(`${BASE_URL_API}config`);
+    return response.data;
+  } catch (error) {
+    console.error("Failed to fetch configuration:", error);
+    throw error;
+  }
+}
+
+/**
+ * Sets up default configurations for Axios.
+ * Fetches the timeout configuration and sets it as the default timeout for Axios requests.
+ */
+export async function setupAxiosDefaults() {
+  const config = await fetchConfig();
+  // Create Axios instance with the fetched timeout configuration
+
+  const timeoutInMilliseconds = config.frontend_timeout
+    ? config.frontend_timeout * 1000
+    : 30000;
+  axios.defaults.baseURL = "";
+  axios.defaults.timeout = timeoutInMilliseconds;
+}

src/frontend/src/modals/apiModal/utils/get-python-api-code.tsx

@@ -12,47 +12,47 @@ export default function getPythonApiCode(
 ): string {
   const tweaksObject = tweaksBuildedObject[0];
   return `import requests
-  from typing import Optional
+from typing import Optional
 
-  BASE_API_URL = "${window.location.protocol}//${window.location.host}/api/v1/run"
-  FLOW_ID = "${flowId}"
-  # You can tweak the flow by adding a tweaks dictionary
-  # e.g {"OpenAI-XXXXX": {"model_name": "gpt-4"}}
-  TWEAKS = ${JSON.stringify(tweaksObject, null, 2)}
+BASE_API_URL = "${window.location.protocol}//${window.location.host}/api/v1/run"
+FLOW_ID = "${flowId}"
+# You can tweak the flow by adding a tweaks dictionary
+# e.g {"OpenAI-XXXXX": {"model_name": "gpt-4"}}
+TWEAKS = ${JSON.stringify(tweaksObject, null, 2)}
 
-  def run_flow(message: str,
-    flow_id: str,
-    output_type: str = "chat",
-    input_type: str = "chat",
-    tweaks: Optional[dict] = None,
-    api_key: Optional[str] = None) -> dict:
-      """
-      Run a flow with a given message and optional tweaks.
+def run_flow(message: str,
+  flow_id: str,
+  output_type: str = "chat",
+  input_type: str = "chat",
+  tweaks: Optional[dict] = None,
+  api_key: Optional[str] = None) -> dict:
+    """
+    Run a flow with a given message and optional tweaks.
 
-      :param message: The message to send to the flow
-      :param flow_id: The ID of the flow to run
-      :param tweaks: Optional tweaks to customize the flow
-      :return: The JSON response from the flow
-      """
-      api_url = f"{BASE_API_URL}/{flow_id}"
+    :param message: The message to send to the flow
+    :param flow_id: The ID of the flow to run
+    :param tweaks: Optional tweaks to customize the flow
+    :return: The JSON response from the flow
+    """
+    api_url = f"{BASE_API_URL}/{flow_id}"
 
-      payload = {
-          "input_value": message,
-          "output_type": output_type,
-          "input_type": input_type,
-      }
-      headers = None
-      if tweaks:
-          payload["tweaks"] = tweaks
-      if api_key:
-          headers = {"x-api-key": api_key}
-      response = requests.post(api_url, json=payload, headers=headers)
-      return response.json()
+    payload = {
+        "input_value": message,
+        "output_type": output_type,
+        "input_type": input_type,
+    }
+    headers = None
+    if tweaks:
+        payload["tweaks"] = tweaks
+    if api_key:
+        headers = {"x-api-key": api_key}
+    response = requests.post(api_url, json=payload, headers=headers)
+    return response.json()
 
-  # Setup any tweaks you want to apply to the flow
-  message = "message"
-  ${!isAuth ? `api_key = "<your api key>"` : ""}
-  print(run_flow(message=message, flow_id=FLOW_ID, tweaks=TWEAKS${
+# Setup any tweaks you want to apply to the flow
+message = "message"
+${!isAuth ? `api_key = "<your api key>"` : ""}
+print(run_flow(message=message, flow_id=FLOW_ID, tweaks=TWEAKS${
     !isAuth ? `, api_key=api_key` : ""
   }))`;
 }

src/frontend/src/modals/apiModal/utils/get-python-code.tsx

@@ -11,10 +11,10 @@ export default function getPythonCode(
   const tweaksObject = tweaksBuildedObject[0];
 
   return `from langflow.load import run_flow_from_json
-  TWEAKS = ${JSON.stringify(tweaksObject, null, 2)}
+TWEAKS = ${JSON.stringify(tweaksObject, null, 2)}
 
-  result = run_flow_from_json(flow="${flowName}.json",
-                              input_value="message",
-                              fallback_to_env_vars=True, # False by default
-                              tweaks=TWEAKS)`;
+result = run_flow_from_json(flow="${flowName}.json",
+                            input_value="message",
+                            fallback_to_env_vars=True, # False by default
+                            tweaks=TWEAKS)`;
 }

src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx

@@ -271,7 +271,7 @@ export default function NodeToolbarComponent({
         selected &&
         (hasApiKey || hasStore) &&
         (event.ctrlKey || event.metaKey) &&
-        event.key === "u"
+        event.key.toUpperCase() === "U"
       ) {
         event.preventDefault();
         handleSelectChange("update");
@@ -280,7 +280,7 @@ export default function NodeToolbarComponent({
         selected &&
         isGroup &&
         (event.ctrlKey || event.metaKey) &&
-        event.key === "g"
+        event.key.toUpperCase() === "G"
       ) {
         event.preventDefault();
         handleSelectChange("ungroup");
@@ -290,7 +290,7 @@ export default function NodeToolbarComponent({
         (hasApiKey || hasStore) &&
         (event.ctrlKey || event.metaKey) &&
         event.shiftKey &&
-        event.key === "S"
+        event.key.toUpperCase() === "S"
       ) {
         event.preventDefault();
         setShowconfirmShare((state) => !state);
@@ -300,7 +300,7 @@ export default function NodeToolbarComponent({
         selected &&
         (event.ctrlKey || event.metaKey) &&
         event.shiftKey &&
-        event.key === "Q"
+        event.key.toUpperCase() === "Q"
       ) {
         event.preventDefault();
         if (isMinimal) {
@@ -317,7 +317,7 @@ export default function NodeToolbarComponent({
         selected &&
         (event.ctrlKey || event.metaKey) &&
         event.shiftKey &&
-        event.key === "U"
+        event.key.toUpperCase() === "U"
       ) {
         event.preventDefault();
         if (hasCode) return setOpenModal((state) => !state);
@@ -327,12 +327,16 @@ export default function NodeToolbarComponent({
         selected &&
         (event.ctrlKey || event.metaKey) &&
         event.shiftKey &&
-        event.key === "A"
+        event.key.toUpperCase() === "A"
       ) {
         event.preventDefault();
         setShowModalAdvanced((state) => !state);
       }
-      if (selected && (event.ctrlKey || event.metaKey) && event.key === "s") {
+      if (
+        selected &&
+        (event.ctrlKey || event.metaKey) &&
+        event.key.toUpperCase() === "S"
+      ) {
         if (isSaved) {
           event.preventDefault();
           return setShowOverrideModal((state) => !state);
@@ -347,7 +351,7 @@ export default function NodeToolbarComponent({
         selected &&
         (event.ctrlKey || event.metaKey) &&
         event.shiftKey &&
-        event.key === "D"
+        event.key.toUpperCase() === "D"
       ) {
         event.preventDefault();
         if (data.node?.documentation) {
@@ -357,7 +361,11 @@ export default function NodeToolbarComponent({
           title: `${data.id} docs is not available at the moment.`,
         });
       }
-      if (selected && (event.ctrlKey || event.metaKey) && event.key === "j") {
+      if (
+        selected &&
+        (event.ctrlKey || event.metaKey) &&
+        event.key.toUpperCase() === "J"
+      ) {
         event.preventDefault();
         downloadNode(flowComponent!);
       }