@tstdl/base 0.93.123 → 0.93.126

package/document-management/server/services/document-validation.service.d.ts

@@ -6,7 +6,7 @@ import { DocumentValidationResultStatus } from '../../models/index.js';
 import type { DocumentValidationExecutor, DocumentValidationExecutorContext, DocumentValidationExecutorContextDocumentData } from '../validators/index.js';
 export declare class DocumentValidationService {
     #private;
-    [afterResolve](_: unknown, { cancellationSignal }: AfterResolveContext<any>): void;
+    [afterResolve](_: unknown, { cancellationSignal }: AfterResolveContext): void;
     processQueue(cancellationSignal: CancellationSignal): void;
     startValidationWorkflow(tenantId: string, documentId: string): Promise<void>;
     setExecutionRunning(tenantId: string, executionId: string): Promise<void>;

package/document-management/server/services/document-workflow.service.d.ts

@@ -1,4 +1,4 @@
-import type { AfterResolveContext } from '../../../injector/index.js';
+import { type AfterResolveContext } from '../../../injector/index.js';
 import { afterResolve } from '../../../injector/interfaces.js';
 import { Transactional } from '../../../orm/server/index.js';
 import type { OneOrMany } from '../../../types/index.js';
@@ -7,7 +7,7 @@ export declare class DocumentWorkflowService extends Transactional {
     #private;
     private readonly documentService;
     readonly repository: import("../../../orm/server/index.js").EntityRepository<DocumentWorkflow>;
-    [afterResolve](_: unknown, { cancellationSignal }: AfterResolveContext<any>): void;
+    [afterResolve](_: unknown, { cancellationSignal }: AfterResolveContext): void;
     loadLatestWorkflow(tenantId: string, documentId: string): Promise<DocumentWorkflow>;
     loadLatestWorkflows(tenantId: string, documentIds: string[]): Promise<DocumentWorkflow[]>;
     loadWorkflows(tenantId: string, documentId: OneOrMany<string>): Promise<DocumentWorkflow[]>;
@@ -15,8 +15,9 @@ export declare class DocumentWorkflowService extends Transactional {
     initiateWorkflow(tenantId: string, documentId: string, step: DocumentWorkflowStep, skipAi: boolean): Promise<DocumentWorkflow>;
     private setWorkflowState;
     private processWorkflowJob;
+    private processContentExtractionWorkflow;
     private processClassificationWorkflow;
-    private processExtractionWorkflow;
+    private processDataExtractionWorkflow;
     private processAssignmentWorkflow;
     private processValidationWorkflow;
 }

package/document-management/server/services/document-workflow.service.js

@@ -9,6 +9,7 @@ var DocumentWorkflowService_1;
 import { match } from 'ts-pattern';
 import { BadRequestError } from '../../../errors/bad-request.error.js';
 import { NotImplementedError } from '../../../errors/not-implemented.error.js';
+import { forwardRef } from '../../../injector/index.js';
 import { inject } from '../../../injector/inject.js';
 import { afterResolve } from '../../../injector/interfaces.js';
 import { Logger } from '../../../logger/index.js';
@@ -38,7 +39,7 @@ let DocumentWorkflowService = DocumentWorkflowService_1 = class DocumentWorkflow
     #observationService = inject(DocumentManagementObservationService);
     #taskQueue = inject((TaskQueue), { namespace: 'DocumentManagement:DocumentWorkflow', visibilityTimeout: 5 * 60 * 1000, maxTries: 3 });
     #logger = inject(Logger, DocumentWorkflowService_1.name);
-    documentService = inject(DocumentService, undefined, { forwardRef: true });
+    documentService = inject(forwardRef(() => DocumentService));
     repository = injectRepository(DocumentWorkflow);
     [afterResolve](_, { cancellationSignal }) {
         if (this.isInTransaction) {
@@ -83,13 +84,19 @@ let DocumentWorkflowService = DocumentWorkflowService_1 = class DocumentWorkflow
             });
             if (targetState == DocumentWorkflowState.Completed) {
                 await match(workflow.step)
+                    .with(DocumentWorkflowStep.ContentExtraction, async () => {
+                    if (!workflow.skipAi) {
+                        throw new BadRequestError('Proceeding from content extraction occurs automatically.');
+                    }
+                    await this.withTransaction(tx).initiateWorkflow(tenantId, documentId, DocumentWorkflowStep.Classification, workflow.skipAi);
+                })
                     .with(DocumentWorkflowStep.Classification, async () => {
                     if (!workflow.skipAi) {
                         throw new BadRequestError('Proceeding from classification occurs automatically.');
                     }
-                    await this.withTransaction(tx).initiateWorkflow(tenantId, documentId, DocumentWorkflowStep.Extraction, workflow.skipAi);
+                    await this.withTransaction(tx).initiateWorkflow(tenantId, documentId, DocumentWorkflowStep.DataExtraction, workflow.skipAi);
                 })
-                    .with(DocumentWorkflowStep.Extraction, async () => await this.withTransaction(tx).initiateWorkflow(tenantId, documentId, DocumentWorkflowStep.Assignment, workflow.skipAi))
+                    .with(DocumentWorkflowStep.DataExtraction, async () => await this.withTransaction(tx).initiateWorkflow(tenantId, documentId, DocumentWorkflowStep.Assignment, workflow.skipAi))
                     .with(DocumentWorkflowStep.Assignment, async () => await this.withTransaction(tx).initiateWorkflow(tenantId, documentId, DocumentWorkflowStep.Validation, workflow.skipAi))
                     .with(DocumentWorkflowStep.Validation, () => { })
                     .exhaustive();
@@ -115,15 +122,21 @@ let DocumentWorkflowService = DocumentWorkflowService_1 = class DocumentWorkflow
         try {
             await this.setWorkflowState(workflow.id, DocumentWorkflowState.Running);
             await match(workflow.step)
+                .with(DocumentWorkflowStep.ContentExtraction, async () => await this.processContentExtractionWorkflow(workflow))
                 .with(DocumentWorkflowStep.Classification, async () => await this.processClassificationWorkflow(workflow))
-                .with(DocumentWorkflowStep.Extraction, async () => await this.processExtractionWorkflow(workflow))
+                .with(DocumentWorkflowStep.DataExtraction, async () => await this.processDataExtractionWorkflow(workflow))
                 .with(DocumentWorkflowStep.Assignment, async () => await this.processAssignmentWorkflow(workflow))
                 .with(DocumentWorkflowStep.Validation, async () => await this.processValidationWorkflow(workflow))
                 .exhaustive();
-            if (workflow.step == DocumentWorkflowStep.Classification) {
-                // no need for after classification review. Automatically start extraction.
+            if (workflow.step == DocumentWorkflowStep.ContentExtraction) {
+                // no need for after content extraction review. Automatically start classification.
                 await this.setWorkflowState(workflow.id, DocumentWorkflowState.Completed);
-                await this.initiateWorkflow(workflow.tenantId, workflow.documentId, DocumentWorkflowStep.Extraction, workflow.skipAi);
+                await this.initiateWorkflow(workflow.tenantId, workflow.documentId, DocumentWorkflowStep.Classification, workflow.skipAi);
+            }
+            else if (workflow.step == DocumentWorkflowStep.Classification) {
+                // no need for after classification review. Automatically start data extraction.
+                await this.setWorkflowState(workflow.id, DocumentWorkflowState.Completed);
+                await this.initiateWorkflow(workflow.tenantId, workflow.documentId, DocumentWorkflowStep.DataExtraction, workflow.skipAi);
             }
             else {
                 await this.setWorkflowState(workflow.id, DocumentWorkflowState.Review);
@@ -138,13 +151,17 @@ let DocumentWorkflowService = DocumentWorkflowService_1 = class DocumentWorkflow
             throw error;
         }
     }
+    async processContentExtractionWorkflow(workflow) {
+        const content = await this.#documentManagementAiService.extractContent(workflow.tenantId, workflow.documentId);
+        await this.documentService.setContent(workflow.tenantId, workflow.documentId, { content });
+    }
     async processClassificationWorkflow(workflow) {
         const typeId = await this.#documentManagementAiService.classifyDocumentType(workflow.tenantId, workflow.documentId);
         await this.documentService.repository.update(workflow.documentId, { typeId, approval: DocumentApproval.Pending });
         this.#observationService.documentChange(workflow.documentId, this.session);
     }
-    async processExtractionWorkflow(workflow) {
-        const extraction = await this.#documentManagementAiService.extractDocumentInformation(workflow.tenantId, workflow.documentId);
+    async processDataExtractionWorkflow(workflow) {
+        const extraction = await this.#documentManagementAiService.extractData(workflow.tenantId, workflow.documentId);
         await this.documentService.update(workflow.tenantId, workflow.documentId, extraction);
     }
     async processAssignmentWorkflow(workflow) {

package/document-management/server/services/document.service.d.ts

@@ -14,12 +14,16 @@ export declare class DocumentService extends Transactional {
         properties?: SetDocumentPropertyParameters[];
         collections?: UpdateDocumentCollectionsParameters;
     }): Promise<void>;
-    getContent(tenantId: string, documentId: string): Promise<Uint8Array>;
-    getContentStream(tenantId: string, documentId: string): ReadableStream<Uint8Array>;
-    getContentUrl(tenantId: string, documentId: string, download?: boolean): Promise<string>;
+    getFileContent(tenantId: string, documentId: string): Promise<Uint8Array>;
+    getFileContentStream(tenantId: string, documentId: string): ReadableStream<Uint8Array>;
+    getFileContentUrl(tenantId: string, documentId: string, download?: boolean): Promise<string>;
     getPreview(tenantId: string, documentId: string, page?: number): Promise<Uint8Array>;
     getPreviewStream(tenantId: string, documentId: string, page?: number): ReadableStream<Uint8Array>;
     getPreviewUrl(tenantId: string, documentId: string, page?: number): Promise<string>;
+    getContent(tenantId: string, documentId: string): Promise<string | null>;
+    setContent(tenantId: string, documentId: string, data: {
+        content: string;
+    }): Promise<void>;
     /**
      * @returns collectionIds from either direct assignment or automatic assignment scope
      */

package/document-management/server/services/document.service.js

@@ -17,7 +17,7 @@ import { objectKeys } from '../../../utils/object/object.js';
 import { readableStreamFromPromise } from '../../../utils/stream/from-promise.js';
 import { tryIgnoreLogAsync } from '../../../utils/try-ignore.js';
 import { isDefined, isNotReadableStream, isNotUint8Array, isUndefined } from '../../../utils/type-guards.js';
-import { Document, DocumentApproval, DocumentAssignmentScope, DocumentAssignmentTask, DocumentWorkflowStep } from '../../models/index.js';
+import { Document, DocumentApproval, DocumentAssignmentScope, DocumentAssignmentTask, DocumentContent, DocumentWorkflowStep } from '../../models/index.js';
 import { DocumentManagementConfiguration } from '../module.js';
 import { DocumentCollectionService } from './document-collection.service.js';
 import { DocumentFileService } from './document-file.service.js';
@@ -37,6 +37,7 @@ let DocumentService = DocumentService_1 = class DocumentService extends Transact
     #collectionService = injectTransactional(DocumentCollectionService);
     #documentAssignmentTaskRepository = injectRepository(DocumentAssignmentTask);
     #documentAssignmentScopeRepository = injectRepository(DocumentAssignmentScope);
+    #documentContentRepository = injectRepository(DocumentContent);
     #observationService = inject(DocumentManagementObservationService);
     #logger = inject(Logger, DocumentService_1.name);
     repository = injectRepository(Document);
@@ -113,17 +114,17 @@ let DocumentService = DocumentService_1 = class DocumentService extends Transact
             this.#observationService.documentChange(id, tx);
         });
     }
-    async getContent(tenantId, documentId) {
+    async getFileContent(tenantId, documentId) {
         const document = await this.repository.loadByQuery({ tenantId, id: documentId });
         return await this.#documentFileService.getContent(document);
     }
-    getContentStream(tenantId, documentId) {
+    getFileContentStream(tenantId, documentId) {
         return readableStreamFromPromise(async () => {
             const document = await this.repository.loadByQuery({ tenantId, id: documentId });
             return this.#documentFileService.getContentStream(document);
         });
     }
-    async getContentUrl(tenantId, documentId, download = false) {
+    async getFileContentUrl(tenantId, documentId, download = false) {
         const document = await this.repository.loadByQuery({ tenantId, id: documentId });
         return await this.#documentFileService.getContentUrl(document, download);
     }
@@ -141,6 +142,14 @@ let DocumentService = DocumentService_1 = class DocumentService extends Transact
         const document = await this.repository.loadByQuery({ tenantId, id: documentId });
         return await this.#documentFileService.getPreviewUrl(document, page);
     }
+    async getContent(tenantId, documentId) {
+        const documentContent = await this.#documentContentRepository.tryLoadByQuery({ tenantId, documentId });
+        return documentContent?.content ?? null;
+    }
+    async setContent(tenantId, documentId, data) {
+        await this.#documentContentRepository.upsert(['tenantId', 'documentId'], { tenantId, documentId, content: data.content });
+        // this.#observationService.documentChange(documentId, this.session);
+    }
     /**
      * @returns collectionIds from either direct assignment or automatic assignment scope
      */

package/document-management/server/services/index.d.ts

@@ -1,6 +1,7 @@
 export * from './document-category-type.service.js';
 export * from './document-collection.service.js';
 export * from './document-file.service.js';
+export * from './document-management-ai-provider.service.js';
 export * from './document-management-ai.service.js';
 export * from './document-management-ancillary.service.js';
 export * from './document-management-observation.service.js';

package/document-management/server/services/index.js

@@ -1,6 +1,7 @@
 export * from './document-category-type.service.js';
 export * from './document-collection.service.js';
 export * from './document-file.service.js';
+export * from './document-management-ai-provider.service.js';
 export * from './document-management-ai.service.js';
 export * from './document-management-ancillary.service.js';
 export * from './document-management-observation.service.js';