Skip to content

Commit 7482e7f

Browse files
authored
Chore/Update multer path if blob storage path is set (#3609)
update multer path if blob storage path is set
1 parent bd203a1 commit 7482e7f

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

packages/server/src/routes/attachments/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import express from 'express'
22
import multer from 'multer'
3-
import path from 'path'
43
import attachmentsController from '../../controllers/attachments'
4+
import { getUploadPath } from '../../utils'
55

66
const router = express.Router()
77

8-
const upload = multer({ dest: `${path.join(__dirname, '..', '..', '..', 'uploads')}/` })
8+
const upload = multer({ dest: getUploadPath() })
99

1010
// CREATE
1111
router.post('/:chatflowId/:chatId', upload.array('files'), attachmentsController.createAttachment)

packages/server/src/routes/documentstore/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import express from 'express'
2-
import documentStoreController from '../../controllers/documentstore'
32
import multer from 'multer'
4-
import path from 'path'
3+
import { getUploadPath } from '../../utils'
4+
import documentStoreController from '../../controllers/documentstore'
55

66
const router = express.Router()
7-
const upload = multer({ dest: `${path.join(__dirname, '..', '..', '..', 'uploads')}/` })
7+
const upload = multer({ dest: getUploadPath() })
88

99
router.post(['/upsert/', '/upsert/:id'], upload.array('files'), documentStoreController.upsertDocStoreMiddleware)
1010

packages/server/src/routes/openai-assistants-files/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import express from 'express'
22
import multer from 'multer'
3-
import path from 'path'
43
import openaiAssistantsController from '../../controllers/openai-assistants'
4+
import { getUploadPath } from '../../utils'
55

66
const router = express.Router()
7-
const upload = multer({ dest: `${path.join(__dirname, '..', '..', '..', 'uploads')}/` })
7+
const upload = multer({ dest: getUploadPath() })
88

99
router.post('/download/', openaiAssistantsController.getFileFromAssistant)
1010
router.post('/upload/', upload.array('files'), openaiAssistantsController.uploadAssistantFiles)

packages/server/src/routes/openai-assistants-vector-store/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import express from 'express'
22
import multer from 'multer'
3-
import path from 'path'
43
import openaiAssistantsVectorStoreController from '../../controllers/openai-assistants-vector-store'
4+
import { getUploadPath } from '../../utils'
55

66
const router = express.Router()
7-
const upload = multer({ dest: `${path.join(__dirname, '..', '..', '..', 'uploads')}/` })
7+
const upload = multer({ dest: getUploadPath() })
88

99
// CREATE
1010
router.post('/', openaiAssistantsVectorStoreController.createAssistantVectorStore)

packages/server/src/routes/predictions/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import express from 'express'
22
import multer from 'multer'
3-
import path from 'path'
43
import predictionsController from '../../controllers/predictions'
4+
import { getUploadPath } from '../../utils'
55

66
const router = express.Router()
77

8-
const upload = multer({ dest: `${path.join(__dirname, '..', '..', '..', 'uploads')}/` })
8+
const upload = multer({ dest: getUploadPath() })
99

1010
// CREATE
1111
router.post(['/', '/:id'], upload.array('files'), predictionsController.getRateLimiterMiddleware, predictionsController.createPrediction)

packages/server/src/routes/vectors/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import express from 'express'
22
import multer from 'multer'
3-
import path from 'path'
43
import vectorsController from '../../controllers/vectors'
4+
import { getUploadPath } from '../../utils'
55

66
const router = express.Router()
77

8-
const upload = multer({ dest: `${path.join(__dirname, '..', '..', '..', 'uploads')}/` })
8+
const upload = multer({ dest: getUploadPath() })
99

1010
// CREATE
1111
router.post(

packages/server/src/utils/index.ts

+6
Original file line numberDiff line numberDiff line change
@@ -1680,3 +1680,9 @@ export const getAPIOverrideConfig = (chatflow: IChatFlow) => {
16801680
return { nodeOverrides: {}, variableOverrides: [], apiOverrideStatus: false }
16811681
}
16821682
}
1683+
1684+
export const getUploadPath = (): string => {
1685+
return process.env.BLOB_STORAGE_PATH
1686+
? path.join(process.env.BLOB_STORAGE_PATH, 'uploads')
1687+
: path.join(getUserHome(), '.flowise', 'uploads')
1688+
}

0 commit comments

Comments
 (0)