Merge branch 'FlowiseAI:main' into main

packages/server/src/index.ts

@@ -1825,8 +1825,10 @@ export class App {
                 flowGraph: getTelemetryFlowObj(nodes, edges)
             })
 
-            // Only return ChatId when its Internal OR incoming input has ChatId, to avoid confusion when calling API
-            if (incomingInput.chatId || isInternal) result.chatId = chatId
+            // Prepare response
+            result.chatId = chatId
+            if (sessionId) result.sessionId = sessionId
+            if (memoryType) result.memoryType = memoryType
 
             return res.json(result)
         } catch (e: any) {

packages/server/src/utils/index.ts

@@ -1099,6 +1099,7 @@ export const getTelemetryFlowObj = (nodes: IReactFlowNode[], edges: IReactFlowEd
  * TODO: move env variables to settings json file, easier configuration
  */
 export const getUserSettingsFilePath = () => {
+    if (process.env.SECRETKEY_PATH) return path.join(process.env.SECRETKEY_PATH, 'settings.json')
     const checkPaths = [path.join(getUserHome(), '.flowise', 'settings.json')]
     for (const checkPath of checkPaths) {
         if (fs.existsSync(checkPath)) {

packages/server/src/utils/telemetry.ts

@@ -25,7 +25,9 @@ export class Telemetry {
             const settings = {
                 instanceId
             }
-            const defaultLocation = path.join(getUserHome(), '.flowise', 'settings.json')
+            const defaultLocation = process.env.SECRETKEY_PATH
+                ? path.join(process.env.SECRETKEY_PATH, 'settings.json')
+                : path.join(getUserHome(), '.flowise', 'settings.json')
             await fs.promises.writeFile(defaultLocation, JSON.stringify(settings, null, 2))
             return instanceId
         }