Feat/paragraph-extraction

.eslintrc.js

@@ -234,7 +234,11 @@ module.exports = {
       excludedFiles: './**/*.cy.tsx',
       parser: '@typescript-eslint/parser',
       parserOptions: { project: './tsconfig.json' },
-      rules: { ...rules },
+      rules: {
+        ...rules,
+        'no-empty-function': ['error', { allow: ['constructors'] }],
+        'no-useless-constructor': 'off',
+      },
     },
     {
       files: ['./cypress/**/*.ts', './cypress/**/*.d.ts', './**/*.cy.tsx'],

app/api/api.js

@@ -44,4 +44,6 @@ export default (app, server) => {
   require('./relationships.v2/routes/routes').default(app);
   require('./stats/routes').default(app);
   require('./testing_errors/routes').default(app);
+
+  require('./paragraphExtraction/adapters/PXRoutes').paragraphExtractionRoutes(app);
 };

app/api/common.v2/AbstractController.ts

@@ -0,0 +1,87 @@
+import util from 'util';
+import { ValidationError } from 'ajv';
+import { ZodError } from 'zod';
+import { Request, Response } from 'express';
+
+import { config } from 'api/config';
+import { LanguageISO6391 } from 'shared/types/commonTypes';
+
+export type Dependencies<RequestBody = any> = {
+  response: Response;
+  request: Request<unknown, any, RequestBody>;
+};
+
+export abstract class AbstractController<RequestBody = any> {
+  constructor(private dependencies: Dependencies<RequestBody>) {}
+
+  protected abstract handle(): Promise<void>;
+
+  async handleAsync() {
+    try {
+      await this.handle();
+    } catch (e) {
+      if (e instanceof ZodError) {
+        const error = new ValidationError(
+          e.errors.map(issue => ({
+            instancePath: issue.path.join('.'),
+            message: issue.message,
+          }))
+        );
+
+        error.message = util.inspect(error, false, null);
+
+        throw error;
+      }
+
+      throw e;
+    }
+  }
+
+  /**
+   * Adapts a controller class to an Express route handler.
+   *
+   * This method takes a controller class (not an instance), instantiates it with
+   * the request and response objects, and calls its `handleAsync` method.
+   *
+   */
+  static adapt<Controller extends AbstractController>(
+    ControllerClass: new (dependencies: Dependencies) => Controller
+  ) {
+    return async (request: Request, response: Response) =>
+      new ControllerClass({ request, response }).handleAsync();
+  }
+
+  protected get request() {
+    return this.dependencies.request;
+  }
+
+  protected get response() {
+    return this.dependencies.response;
+  }
+
+  protected get language() {
+    return this.request.language as LanguageISO6391;
+  }
+
+  protected get tenantName() {
+    return this.request.get('tenant') ?? config.defaultTenant.name;
+  }
+
+  protected serverError(error: Error) {
+    this.response.status(500).json({
+      message: error.message,
+    });
+  }
+
+  protected clientError(message: string) {
+    this.response.status(400).json({ message });
+  }
+
+  protected jsonResponse(body: any) {
+    this.response.status(200).json(body);
+  }
+
+  protected ok() {
+    this.response.status(200).send();
+  }
+}

app/api/common.v2/contracts/HttpClient.ts

@@ -0,0 +1,19 @@
+import { File } from 'api/files.v2/model/File';
+import { HttpField } from './HttpField';
+
+type PostFormDataInput = {
+  url: string;
+  fields: Record<string, HttpField>;
+  files: Record<string, File[]>;
+};
+
+type GetInput = {
+  url: string;
+};
+
+interface HttpClient {
+  postFormData<T>(input: PostFormDataInput): Promise<T>;
+  get<Response>(input: GetInput): Promise<Response>;
+}
+
+export type { PostFormDataInput, HttpClient, GetInput };

app/api/common.v2/contracts/HttpField.ts

@@ -0,0 +1,15 @@
+export class HttpField {
+  value: string;
+
+  constructor(value: any) {
+    this.value = HttpField.parseValue(value);
+  }
+
+  private static parseValue(value: any): string {
+    if (Array.isArray(value) || typeof value === 'object') {
+      return JSON.stringify(value);
+    }
+
+    return `${value}`;
+  }
+}

app/api/common.v2/contracts/UseCase.ts

@@ -0,0 +1,3 @@
+export interface UseCase<Input, Output> {
+  execute(input: Input): Promise<Output>;
+}

app/api/common.v2/contracts/specs/HttpField.spec.ts

@@ -0,0 +1,38 @@
+import { HttpField } from '../HttpField';
+
+describe('HttpField', () => {
+  it('should parse a string value correctly', () => {
+    const field = new HttpField('test');
+    expect(field.value).toBe('test');
+  });
+
+  it('should parse a number value correctly', () => {
+    const field = new HttpField(123);
+    expect(field.value).toBe('123');
+  });
+
+  it('should parse a boolean value correctly', () => {
+    const field = new HttpField(true);
+    expect(field.value).toBe('true');
+  });
+
+  it('should parse an array value correctly', () => {
+    const field = new HttpField([1, 2, 3]);
+    expect(field.value).toBe('[1,2,3]');
+  });
+
+  it('should parse an object value correctly', () => {
+    const field = new HttpField({ key: 'value' });
+    expect(field.value).toBe('{"key":"value"}');
+  });
+
+  it('should parse a null value correctly', () => {
+    const field = new HttpField(null);
+    expect(field.value).toBe('null');
+  });
+
+  it('should parse an undefined value correctly', () => {
+    const field = new HttpField(undefined);
+    expect(field.value).toBe('undefined');
+  });
+});

app/api/common.v2/database/MongoDataSource.ts

@@ -16,10 +16,12 @@ export abstract class MongoDataSource<TSchema extends Document = Document> {
     this.transactionManager = transactionManager;
   }
 
-  protected getCollection(collectionName = this.collectionName) {
-    return new SyncedCollection<TSchema>(
-      new SessionScopedCollection<TSchema>(
-        this.db.collection<TSchema>(collectionName),
+  protected getCollection<Collection extends Document = TSchema>(
+    collectionName = this.collectionName
+  ) {
+    return new SyncedCollection<Collection>(
+      new SessionScopedCollection<Collection>(
+        this.db.collection<Collection>(collectionName),
         this.transactionManager
       ),
       this.transactionManager,

app/api/common.v2/infrastructure/HttpClientFactory.ts

@@ -0,0 +1,7 @@
+import { SuperAgentHttpClient } from './SuperAgentHttpClient';
+
+export class HttpClientFactory {
+  static createDefault() {
+    return new SuperAgentHttpClient();
+  }
+}

app/api/common.v2/infrastructure/SuperAgentHttpClient.ts

@@ -0,0 +1,44 @@
+import superagent from 'superagent';
+import { File } from 'api/files.v2/model/File';
+import { GetInput, HttpClient, PostFormDataInput } from '../contracts/HttpClient';
+import { HttpField } from '../contracts/HttpField';
+
+export class SuperAgentHttpClient implements HttpClient {
+  private client = superagent;
+
+  async get<Response>(input: GetInput): Promise<Response> {
+    const response = await this.client.get(input.url);
+
+    return response.body as Response;
+  }
+
+  async postFormData<T>(input: PostFormDataInput): Promise<T> {
+    const request = this.client.post(input.url);
+
+    await SuperAgentHttpClient.attachFiles(request, input.files);
+    SuperAgentHttpClient.appendFields(request, input.fields);
+
+    const response = await request;
+
+    return response.body as T;
+  }
+
+  private static async attachFiles(request: superagent.Request, files: Record<string, File[]>) {
+    const promises = Object.entries(files).flatMap(([key, _files]) =>
+      _files.map(async file => {
+        const buffer = await file.toBuffer();
+
+        // This is necessary because when we actually 'await' for 'request.[attach/field]' the 'superagent' library kicks off the request
+        // This is not what we want here.
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        request.attach(key, buffer, file.filename);
+      })
+    );
+
+    return Promise.all(promises);
+  }
+
+  private static appendFields(request: superagent.Request, fields: Record<string, HttpField>) {
+    Object.entries(fields).forEach(([key, value]) => request.field(key, value.value));
+  }
+}

app/api/config.ts

@@ -72,6 +72,9 @@ export const config = {
     },
   },
   externalServices: Boolean(process.env.EXTERNAL_SERVICES) || false,
+  externalServicesUrls: {
+    paragraphExtraction: process.env.PARAGRAPH_EXTRACTION_URL || 'http://localhost:5056',
+  },
 
   redis: {
     activated: CLUSTER_MODE,

app/api/files.v2/contracts/FileStorage.ts

@@ -1,7 +1,16 @@
 import { StoredFile } from '../model/StoredFile';
 import { UwaziFile } from '../model/UwaziFile';
+import { FileType } from '../model/FileType';
+import { File } from '../model/File';
+
+export type GetFileInput = {
+  type: FileType;
+  filename: string;
+};
 
 export interface FileStorage {
   list(): Promise<StoredFile[]>;
   getPath(file: UwaziFile): string;
+  getFiles(inputs: GetFileInput[]): Promise<File[]>;
+  getFile(input: GetFileInput): Promise<File>;
 }

app/api/files.v2/contracts/FileStorageStrategy.ts

@@ -0,0 +1,41 @@
+import { Tenant } from 'api/tenants/tenantContext';
+import { FileStorage, GetFileInput } from './FileStorage';
+import { File } from '../model/File';
+import { StoredFile } from '../model/StoredFile';
+import { UwaziFile } from '../model/UwaziFile';
+
+type Strategy = {
+  s3Storage: FileStorage;
+  fileSystemStorage: FileStorage;
+};
+
+type FileStorageStrategyProps = {
+  tenant: Tenant;
+  strategy: Strategy;
+};
+
+export class FileStorageStrategy implements FileStorage {
+  constructor(private props: FileStorageStrategyProps) {}
+
+  private get currentStrategy() {
+    if (this.props.tenant.featureFlags?.s3Storage) return this.props.strategy.s3Storage;
+
+    return this.props.strategy.fileSystemStorage;
+  }
+
+  async list(): Promise<StoredFile[]> {
+    return this.currentStrategy.list();
+  }
+
+  getPath(file: UwaziFile): string {
+    return this.currentStrategy.getPath(file);
+  }
+
+  async getFiles(inputs: GetFileInput[]): Promise<File[]> {
+    return this.currentStrategy.getFiles(inputs);
+  }
+
+  async getFile(input: GetFileInput): Promise<File> {
+    return this.currentStrategy.getFile(input);
+  }
+}

app/api/files.v2/contracts/FilesDataSource.ts

@@ -1,7 +1,12 @@
 import { ResultSet } from 'api/common.v2/contracts/ResultSet';
 import { UwaziFile } from '../model/UwaziFile';
+import { Segmentation } from '../model/Segmentation';
+import { Document } from '../model/Document';
 
-export interface FilesDataSource {
+interface FilesDataSource {
   filesExistForEntities(files: { entity: string; _id: string }[]): Promise<boolean>;
   getAll(): ResultSet<UwaziFile>;
+  getSegmentations(fileId: string[]): ResultSet<Segmentation>;
+  getDocumentsForEntity(entitySharedId: string): ResultSet<Document>;
 }
+export type { FilesDataSource };

app/api/files.v2/database/FilesMappers.ts

@@ -1,22 +1,21 @@
-// import { OptionalId } from 'mongodb';
-
+import { LanguageUtils } from 'shared/language';
 import { FileDBOType } from './schemas/filesTypes';
 import { UwaziFile } from '../model/UwaziFile';
 import { Document } from '../model/Document';
 import { URLAttachment } from '../model/URLAttachment';
 import { Attachment } from '../model/Attachment';
 import { CustomUpload } from '../model/CustomUpload';
 
-export const FileMappers = {
-  // toDBO(file: UwaziFile): OptionalId<FileDBOType> {
-  //   return {
-  //     filename: file.filename,
-  //     entity: file.entity,
-  //     type: 'document',
-  //     totalPages: file.totalPages,
-  //   };
-  // },
+const toDocumentModel = (fileDBO: FileDBOType) =>
+  new Document(
+    fileDBO._id.toString(),
+    fileDBO.entity,
+    fileDBO.totalPages,
+    fileDBO.filename,
+    LanguageUtils.fromISO639_3(fileDBO.language).ISO639_1!
+  ).withCreationDate(new Date(fileDBO.creationDate));
 
+export const FileMappers = {
   toModel(fileDBO: FileDBOType): UwaziFile {
     if (fileDBO.type === 'attachment' && fileDBO.url) {
       return new URLAttachment(
@@ -43,11 +42,8 @@ export const FileMappers = {
         fileDBO.filename
       ).withCreationDate(new Date(fileDBO.creationDate));
     }
-    return new Document(
-      fileDBO._id.toString(),
-      fileDBO.entity,
-      fileDBO.totalPages,
-      fileDBO.filename
-    ).withCreationDate(new Date(fileDBO.creationDate));
+    return toDocumentModel(fileDBO);
   },
+
+  toDocumentModel,
 };