npm audit fix & formatting

Author: Veikkosuhonen

package-lock.json

@@ -43,6 +43,7 @@
     "@types/lodash": "^4.17.0",
     "@types/morgan": "^1.9.9",
     "@types/multer": "^1.4.11",
+    "@types/multer-s3": "^3.0.3",
     "@types/node": "^22.0.0",
     "@types/node-cron": "^3.0.11",
     "@types/react": "^18.2.52",

package.json

@@ -7,7 +7,6 @@ import type { User } from '../../../shared/user'
 import { ApplicationError } from '../../util/ApplicationError'
 import { TEST_COURSES } from '../../../shared/testData'
 import ragIndexRouter, { ragIndexMiddleware } from './ragIndex'
-import { randomUUID } from 'node:crypto'
 
 const router = Router()
 
@@ -56,14 +55,6 @@ router.post('/indices', async (req, res) => {
     throw ApplicationError.Forbidden(`Cannot create index, index already exists on the course ${chatInstance.courseId}`)
   }
 
-  // @todo langchain impl
-  /*
-  const client = getAzureOpenAIClient()
-  const vectorStore = await client.vectorStores.create({
-    name: `${name}-${user.id}-${chatInstance.id}`,
-  })
-   */
-
   const ragIndex = await RagIndex.create({
     userId: user.id,
     metadata: {
@@ -136,9 +127,6 @@ router.get('/indices', async (req, res) => {
       })
 
   if (includeExtras) {
-    // @todo langchain impl
-    //
-    // Add ragFileCount to each index
     const indicesWithCount = await Promise.all(
       indices.map(async (index: any) => {
         const count = await RagFile.count({ where: { ragIndexId: index.id } })

src/server/routes/rag/rag.ts

@@ -15,13 +15,13 @@ import { SearchSchema } from '../../../shared/rag'
 import { S3_ACCESS_KEY, S3_BUCKET, S3_HOST, S3_SECRET_ACCESS_KEY } from '../../util/config'
 
 export const s3Client = new S3Client({
-  region: "eu-north-1",
+  region: 'eu-north-1',
   endpoint: S3_HOST,
   forcePathStyle: true,
   credentials: {
     accessKeyId: S3_ACCESS_KEY,
     secretAccessKey: S3_SECRET_ACCESS_KEY,
-  }
+  },
 })
 
 const ragIndexRouter = Router()
@@ -179,18 +179,16 @@ const upload = multer({
   storage: multerS3({
     s3: s3Client,
     bucket: S3_BUCKET,
-    endpoint: "https://s3.datacloud.helsinki.fi",
-    acl: "private",
+    acl: 'private',
     metadata: (req, file, cb) => {
       cb(null, { fieldName: file.fieldName })
-
     },
     key: (req, file, cb) => {
       const { ragIndex } = req as RagIndexRequest
       const uniqueFilename = file.originalname
-      const s3key = `uploads/rag/${ragIndex.id}/${uniqueFilename}`
+      const s3key = `uploads/rag/${ragIndex.id}/${uniqueFilename}` // @todo Implement unique key generation logic. ragIndex.id is not unique accross multiple different instances of currechat
       cb(null, s3key)
-    }
+    },
   }),
   limits: {
     fileSize: 50 * 1024 * 1024, // 50 MB