move s3client to another file

Author: Veikkosuhonen

src/server/routes/rag/ragIndex.ts

@@ -1,7 +1,6 @@
 import { type NextFunction, type Request, type Response, Router } from 'express'
 import multer from 'multer'
 import z from 'zod/v4'
-import { S3Client } from '@aws-sdk/client-s3'
 import multerS3 from 'multer-s3'
 import { shouldRenderAsText } from '../../../shared/utils'
 import { ChatInstance, RagFile, RagIndex, Responsibility } from '../../db/models'
@@ -12,17 +11,8 @@ import { ingestRagFiles } from '../../services/rag/ingestion'
 import { search } from '../../services/rag/search'
 import { getRedisVectorStore } from '../../services/rag/vectorStore'
 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: 'us-east-1',
-  endpoint: S3_HOST,
-  forcePathStyle: true,
-  credentials: {
-    accessKeyId: S3_ACCESS_KEY,
-    secretAccessKey: S3_SECRET_ACCESS_KEY,
-  },
-})
+import { S3_BUCKET } from '../../util/config'
+import { s3Client } from '../../util/s3client'
 
 const ragIndexRouter = Router()
 

src/server/services/rag/fileStore.ts

@@ -10,7 +10,7 @@ import type { RagFile, RagIndex } from '../../db/models'
 import { ApplicationError } from '../../util/ApplicationError'
 import { pdfToText, pdfToTextWithVLM } from '../../util/pdfToText'
 import { S3_BUCKET } from '../../util/config'
-import { s3Client } from '../../routes/rag/ragIndex'
+import { s3Client } from '../../util/s3client'
 
 const isPdf = (filePath: string) => filePath.endsWith('.pdf')
 const getPdfTextKey = (s3Key: string) => `${s3Key}.txt`

src/server/util/config.ts

@@ -26,9 +26,9 @@ export const REDIS_HOST = getEnv('REDIS_HOST', 'redis')
 
 export const REDIS_PORT = 6379
 
-export const BMQ_REDIS_HOST = getEnv('BMQ_REDIS_HOST', 'placeholder')
+export const BMQ_REDIS_HOST = getEnv('BMQ_REDIS_HOST', REDIS_HOST)
 
-export const BMQ_REDIS_PORT = getEnv('BMQ_REDIS_PORT', 'placeholder')
+export const BMQ_REDIS_PORT = getEnv('BMQ_REDIS_PORT', String(REDIS_PORT))
 
 export const BMQ_REDIS_CA = getEnv('BMQ_REDIS_CA', 'none')
 

src/server/util/s3client.ts

@@ -0,0 +1,12 @@
+import { S3Client } from '@aws-sdk/client-s3'
+import { S3_ACCESS_KEY, S3_HOST, S3_SECRET_ACCESS_KEY } from './config'
+
+export const s3Client = new S3Client({
+  region: 'us-east-1',
+  endpoint: S3_HOST,
+  forcePathStyle: true,
+  credentials: {
+    accessKeyId: S3_ACCESS_KEY,
+    secretAccessKey: S3_SECRET_ACCESS_KEY,
+  },
+})