using singleton for OcrManager and InformationExtraction

app/api/files/ocrRoutes.ts

@@ -1,7 +1,7 @@
 import { Application, Request, Response, NextFunction } from 'express';
 import { storage } from 'api/files';
 import needsAuthorization from 'api/auth/authMiddleware';
-import { isOcrEnabled, getOcrStatus, OcrManager } from 'api/services/ocr/OcrManager';
+import { isOcrEnabled, getOcrStatus, ocrManager } from 'api/services/ocr/OcrManager';
 import { files } from './files';
 import { validation, createError } from '../utils';
 
@@ -57,11 +57,9 @@ const ocrRoutes = (app: Application) => {
     needsAuthorization(['admin', 'editor']),
     validation.validateRequest(ocrRequestDecriptor),
     async (req, res) => {
-      const ocrManager = new OcrManager();
       const file = await fileFromRequest(req);
 
       await ocrManager.addToQueue(file);
-      await ocrManager.stop();
 
       res.sendStatus(200);
     }

app/api/services/informationextraction/SingletonInformationExtraction.ts

@@ -0,0 +1,11 @@
+import { InformationExtraction } from './InformationExtraction';
+
+let informationExtraction: InformationExtraction;
+
+export const getSingletonInformationExtraction = () => {
+  if (!informationExtraction) {
+    informationExtraction = new InformationExtraction();
+  }
+
+  return informationExtraction;
+};

app/api/services/ocr/OcrManager.ts

@@ -227,4 +227,6 @@ class OcrManager {
   }
 }
 
-export { OcrManager, isEnabled as isOcrEnabled, getStatus as getOcrStatus };
+const ocrManager = new OcrManager();
+
+export { ocrManager, OcrManager, isEnabled as isOcrEnabled, getStatus as getOcrStatus };

app/api/suggestions/routes.ts

@@ -3,27 +3,28 @@ import { Application, Request, Response } from 'express';
 import { ObjectId } from 'mongodb';
 
 import { Suggestions } from 'api/suggestions/suggestions';
-import { InformationExtraction } from 'api/services/informationextraction/InformationExtraction';
 import { validateAndCoerceRequest } from 'api/utils/validateRequest';
 import { needsAuthorization } from 'api/auth';
 import { parseQuery } from 'api/utils/parseQueryMiddleware';
 import { ObjectIdSchema } from 'shared/types/commonTypes';
 import { SuggestionsQueryFilterSchema } from 'shared/types/suggestionSchema';
 import { objectIdSchema } from 'shared/types/commonSchemas';
+import { getSingletonInformationExtraction } from 'api/services/informationextraction/SingletonInformationExtraction';
 import {
   IXAggregationQuery,
   IXSuggestionAggregation,
   IXSuggestionsQuery,
 } from 'shared/types/suggestionType';
 import { serviceMiddleware } from './serviceMiddleware';
 
+const informationExtraction = getSingletonInformationExtraction();
+
 async function processTrainFunction(
   callback: (extractorId: ObjectIdSchema) => Promise<{ message: string; status: string }>,
   req: Request,
   res: Response
 ) {
-  const IX = new InformationExtraction();
-  if (!IX) {
+  if (!informationExtraction) {
     res.status(500).json({
       error: 'Information Extraction service is not available',
     });
@@ -134,9 +135,7 @@ export const suggestionsRoutes = (app: Application) => {
     needsAuthorization(['admin', 'editor']),
     extractorIdRequestValidation('body'),
     async (req, res, _next) => {
-      const IX = new InformationExtraction();
-      await processTrainFunction(IX.stopModel, req, res);
-      await IX.stop();
+      await processTrainFunction(informationExtraction.stopModel, req, res);
     }
   );
 
@@ -146,9 +145,7 @@ export const suggestionsRoutes = (app: Application) => {
     needsAuthorization(['admin', 'editor']),
     extractorIdRequestValidation('body'),
     async (req, res, _next) => {
-      const IX = new InformationExtraction();
-      await processTrainFunction(IX.trainModel, req, res);
-      await IX.stop();
+      await processTrainFunction(informationExtraction.trainModel, req, res);
     }
   );
 
@@ -158,9 +155,7 @@ export const suggestionsRoutes = (app: Application) => {
     needsAuthorization(['admin', 'editor']),
     extractorIdRequestValidation('body'),
     async (req, res, _next) => {
-      const IX = new InformationExtraction();
-      await processTrainFunction(IX.status, req, res);
-      await IX.stop();
+      await processTrainFunction(informationExtraction.status, req, res);
     }
   );
 

app/worker.ts

@@ -3,14 +3,14 @@ import { DB } from 'api/odm';
 import { config } from 'api/config';
 import { tenants } from 'api/tenants';
 import { permissionsContext } from 'api/permissions/permissionsContext';
-import { OcrManager } from 'api/services/ocr/OcrManager';
+import { ocrManager } from 'api/services/ocr/OcrManager';
 import { PDFSegmentation } from 'api/services/pdfsegmentation/PDFSegmentation';
 import { DistributedLoop } from 'api/services/tasksmanager/DistributedLoop';
 import { TwitterIntegration } from 'api/services/twitterintegration/TwitterIntegration';
 import { preserveSync } from 'api/services/preserve/preserveSync';
 import { tocService } from 'api/toc_generation/tocService';
 import { syncWorker } from 'api/sync/syncWorker';
-import { InformationExtraction } from 'api/services/informationextraction/InformationExtraction';
+import { getSingletonInformationExtraction } from 'api/services/informationextraction/SingletonInformationExtraction';
 import { setupWorkerSockets } from 'api/socketio/setupSockets';
 import { ConvertToPdfWorker } from 'api/services/convertToPDF/ConvertToPdfWorker';
 import { ATServiceListener } from 'api/externalIntegrations.v2/automaticTranslation/adapters/driving/ATServiceListener';
@@ -45,9 +45,9 @@ DB.connect(config.DBHOST, dbAuth)
       permissionsContext.setCommandContext();
 
       const servicesList = [
-        new OcrManager(),
+        ocrManager,
         new ATServiceListener(),
-        new InformationExtraction(),
+        getSingletonInformationExtraction(),
         new ConvertToPdfWorker(),
       ] as any[];