feature/export-import-3

packages/server/src/services/chat-messages/index.ts

@@ -1,15 +1,15 @@
-import { DeleteResult, FindOptionsWhere } from 'typeorm'
+import { removeFilesFromStorage } from 'flowise-components'
 import { StatusCodes } from 'http-status-codes'
+import { DeleteResult, FindOptionsWhere } from 'typeorm'
+import { ChatMessage } from '../../database/entities/ChatMessage'
+import { ChatMessageFeedback } from '../../database/entities/ChatMessageFeedback'
+import { InternalFlowiseError } from '../../errors/internalFlowiseError'
+import { getErrorMessage } from '../../errors/utils'
 import { ChatMessageRatingType, ChatType, IChatMessage, MODE } from '../../Interface'
-import { utilGetChatMessage } from '../../utils/getChatMessage'
 import { utilAddChatMessage } from '../../utils/addChatMesage'
+import { utilGetChatMessage } from '../../utils/getChatMessage'
 import { getRunningExpressApp } from '../../utils/getRunningExpressApp'
-import { ChatMessageFeedback } from '../../database/entities/ChatMessageFeedback'
-import { removeFilesFromStorage } from 'flowise-components'
 import logger from '../../utils/logger'
-import { ChatMessage } from '../../database/entities/ChatMessage'
-import { InternalFlowiseError } from '../../errors/internalFlowiseError'
-import { getErrorMessage } from '../../errors/utils'
 
 // Add chatmessages for chatflowid
 const createChatMessage = async (chatMessage: Partial<IChatMessage>) => {
@@ -178,11 +178,23 @@ const abortChatMessage = async (chatId: string, chatflowid: string) => {
     }
 }
 
+async function getAllMessages(): Promise<ChatMessage[]> {
+    const appServer = getRunningExpressApp()
+    return await appServer.AppDataSource.getRepository(ChatMessage).find()
+}
+
+async function getAllMessagesFeedback(): Promise<ChatMessageFeedback[]> {
+    const appServer = getRunningExpressApp()
+    return await appServer.AppDataSource.getRepository(ChatMessageFeedback).find()
+}
+
 export default {
     createChatMessage,
     getAllChatMessages,
     getAllInternalChatMessages,
     removeAllChatMessages,
     removeChatMessagesByMessageIds,
-    abortChatMessage
+    abortChatMessage,
+    getAllMessages,
+    getAllMessagesFeedback
 }

packages/server/src/services/chatflows/index.ts

@@ -1,6 +1,8 @@
 import { ICommonObject, removeFolderFromStorage } from 'flowise-components'
 import { StatusCodes } from 'http-status-codes'
+import { QueryRunner } from 'typeorm'
 import { ChatflowType, IReactFlowObject } from '../../Interface'
+import { FLOWISE_COUNTER_STATUS, FLOWISE_METRIC_COUNTERS } from '../../Interface.Metrics'
 import { ChatFlow } from '../../database/entities/ChatFlow'
 import { ChatMessage } from '../../database/entities/ChatMessage'
 import { ChatMessageFeedback } from '../../database/entities/ChatMessageFeedback'
@@ -13,8 +15,6 @@ import { containsBase64File, updateFlowDataWithFilePaths } from '../../utils/fil
 import { getRunningExpressApp } from '../../utils/getRunningExpressApp'
 import { utilGetUploadsConfig } from '../../utils/getUploadsConfig'
 import logger from '../../utils/logger'
-import { FLOWISE_METRIC_COUNTERS, FLOWISE_COUNTER_STATUS } from '../../Interface.Metrics'
-import { QueryRunner } from 'typeorm'
 
 // Check if chatflow valid for streaming
 const checkIfChatflowIsValidForStreaming = async (chatflowId: string): Promise<any> => {
@@ -120,6 +120,8 @@ const getAllChatflows = async (type?: ChatflowType): Promise<ChatFlow[]> => {
         const dbResponse = await appServer.AppDataSource.getRepository(ChatFlow).find()
         if (type === 'MULTIAGENT') {
             return dbResponse.filter((chatflow) => chatflow.type === 'MULTIAGENT')
+        } else if (type === 'ASSISTANT') {
+            return dbResponse.filter((chatflow) => chatflow.type === 'ASSISTANT')
         } else if (type === 'CHATFLOW') {
             // fetch all chatflows that are not agentflow
             return dbResponse.filter((chatflow) => chatflow.type === 'CHATFLOW' || !chatflow.type)