@semiont/make-meaning 0.2.32-build.70 → 0.2.32-build.71

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { JobWorker, JobQueue, AnyJob } from '@semiont/jobs';
+import { JobWorker, JobQueue, AnyJob, DetectionResult, RunningJob, DetectionParams, DetectionProgress, GenerationResult, GenerationParams, GenerationProgress, HighlightDetectionResult, HighlightDetectionParams, HighlightDetectionProgress, AssessmentDetectionResult, AssessmentDetectionParams, AssessmentDetectionProgress, CommentDetectionResult, CommentDetectionParams, CommentDetectionProgress, TagDetectionResult, TagDetectionParams, TagDetectionProgress } from '@semiont/jobs';
 import { EventStore } from '@semiont/event-sourcing';
 import { RepresentationStore } from '@semiont/content';
 import { EnvironmentConfig, ResourceId, StoredEvent, ResourceAnnotations, AnnotationId, AnnotationCategory, GraphPath, GraphConnection } from '@semiont/core';
@@ -35,7 +35,7 @@ declare class ReferenceDetectionWorker extends JobWorker {
     constructor(jobQueue: JobQueue, config: EnvironmentConfig, eventStore: EventStore, inferenceClient: InferenceClient);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
-    protected executeJob(job: AnyJob): Promise<void>;
+    protected executeJob(job: AnyJob): Promise<DetectionResult>;
     /**
      * Detect entity references in resource using AI
      * Self-contained implementation for reference detection
@@ -44,6 +44,11 @@ declare class ReferenceDetectionWorker extends JobWorker {
      */
     detectReferences(resource: ResourceDescriptor$2, entityTypes: string[], includeDescriptiveReferences?: boolean): Promise<DetectedAnnotation[]>;
     private processDetectionJob;
+    /**
+     * Emit completion event with result data
+     * Override base class to emit job.completed event with foundCount
+     */
+    protected emitCompletionEvent(job: RunningJob<DetectionParams, DetectionProgress>, result: DetectionResult): Promise<void>;
     protected handleJobFailure(job: AnyJob, error: any): Promise<void>;
     /**
      * Update job progress and emit events to Event Store
@@ -68,8 +73,13 @@ declare class GenerationWorker extends JobWorker {
     constructor(jobQueue: JobQueue, config: EnvironmentConfig, eventStore: EventStore, inferenceClient: InferenceClient);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
-    protected executeJob(job: AnyJob): Promise<void>;
+    protected executeJob(job: AnyJob): Promise<GenerationResult>;
     private processGenerationJob;
+    /**
+     * Emit completion event with result data
+     * Override base class to emit job.completed event with resultResourceId
+     */
+    protected emitCompletionEvent(job: RunningJob<GenerationParams, GenerationProgress>, result: GenerationResult): Promise<void>;
     /**
      * Update job progress and emit events to Event Store
      * Overrides base class to also emit job progress events
@@ -92,7 +102,12 @@ declare class HighlightDetectionWorker extends JobWorker {
     constructor(jobQueue: JobQueue, config: EnvironmentConfig, eventStore: EventStore, inferenceClient: InferenceClient);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
-    protected executeJob(job: AnyJob): Promise<void>;
+    protected executeJob(job: AnyJob): Promise<HighlightDetectionResult>;
+    /**
+     * Emit completion event with result data
+     * Override base class to emit job.completed event
+     */
+    protected emitCompletionEvent(job: RunningJob<HighlightDetectionParams, HighlightDetectionProgress>, _result: HighlightDetectionResult): Promise<void>;
     /**
      * Override updateJobProgress to emit events to Event Store
      */
@@ -117,7 +132,12 @@ declare class AssessmentDetectionWorker extends JobWorker {
     constructor(jobQueue: JobQueue, config: EnvironmentConfig, eventStore: EventStore, inferenceClient: InferenceClient);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
-    protected executeJob(job: AnyJob): Promise<void>;
+    protected executeJob(job: AnyJob): Promise<AssessmentDetectionResult>;
+    /**
+     * Emit completion event with result data
+     * Override base class to emit job.completed event
+     */
+    protected emitCompletionEvent(job: RunningJob<AssessmentDetectionParams, AssessmentDetectionProgress>, _result: AssessmentDetectionResult): Promise<void>;
     /**
      * Override updateJobProgress to emit events to Event Store
      */
@@ -142,7 +162,12 @@ declare class CommentDetectionWorker extends JobWorker {
     constructor(jobQueue: JobQueue, config: EnvironmentConfig, eventStore: EventStore, inferenceClient: InferenceClient);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
-    protected executeJob(job: AnyJob): Promise<void>;
+    protected executeJob(job: AnyJob): Promise<CommentDetectionResult>;
+    /**
+     * Emit completion event with result data
+     * Override base class to emit job.completed event
+     */
+    protected emitCompletionEvent(job: RunningJob<CommentDetectionParams, CommentDetectionProgress>, _result: CommentDetectionResult): Promise<void>;
     /**
      * Override updateJobProgress to emit events to Event Store
      */
@@ -168,7 +193,12 @@ declare class TagDetectionWorker extends JobWorker {
     constructor(jobQueue: JobQueue, config: EnvironmentConfig, eventStore: EventStore, inferenceClient: InferenceClient);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
-    protected executeJob(job: AnyJob): Promise<void>;
+    protected executeJob(job: AnyJob): Promise<TagDetectionResult>;
+    /**
+     * Emit completion event with result data
+     * Override base class to emit job.completed event
+     */
+    protected emitCompletionEvent(job: RunningJob<TagDetectionParams, TagDetectionProgress>, _result: TagDetectionResult): Promise<void>;
     /**
      * Override updateJobProgress to emit events to Event Store
      */

package/dist/index.js

@@ -219,7 +219,7 @@ var ReferenceDetectionWorker = class extends JobWorker {
     if (job.status !== "running") {
       throw new Error(`Job must be in running state to execute, got: ${job.status}`);
     }
-    await this.processDetectionJob(job);
+    return await this.processDetectionJob(job);
   }
   /**
    * Detect entity references in resource using AI
@@ -375,6 +375,28 @@ var ReferenceDetectionWorker = class extends JobWorker {
       await this.updateJobProgress(updatedJob);
     }
     console.log(`[ReferenceDetectionWorker] \u2705 Detection complete: ${totalFound} entities found, ${totalEmitted} events emitted, ${totalErrors} errors`);
+    return {
+      totalFound,
+      totalEmitted,
+      errors: totalErrors
+    };
+  }
+  /**
+   * Emit completion event with result data
+   * Override base class to emit job.completed event with foundCount
+   */
+  async emitCompletionEvent(job, result) {
+    await this.eventStore.appendEvent({
+      type: "job.completed",
+      resourceId: job.params.resourceId,
+      userId: job.metadata.userId,
+      version: 1,
+      payload: {
+        jobId: job.metadata.id,
+        jobType: "detection",
+        foundCount: result.totalFound
+      }
+    });
   }
   async handleJobFailure(job, error) {
     await super.handleJobFailure(job, error);
@@ -412,7 +434,6 @@ var ReferenceDetectionWorker = class extends JobWorker {
       version: 1
     };
     const isFirstUpdate = detJob.progress.processedEntityTypes === 0;
-    const isFinalUpdate = detJob.progress.processedEntityTypes === detJob.progress.totalEntityTypes && detJob.progress.totalEntityTypes > 0;
     if (isFirstUpdate) {
       await this.eventStore.appendEvent({
         type: "job.started",
@@ -423,16 +444,6 @@ var ReferenceDetectionWorker = class extends JobWorker {
           totalSteps: detJob.params.entityTypes.length
         }
       });
-    } else if (isFinalUpdate) {
-      await this.eventStore.appendEvent({
-        type: "job.completed",
-        ...baseEvent,
-        payload: {
-          jobId: detJob.metadata.id,
-          jobType: detJob.metadata.type,
-          foundCount: detJob.progress.entitiesFound
-        }
-      });
     } else {
       const percentage = Math.round(detJob.progress.processedEntityTypes / detJob.progress.totalEntityTypes * 100);
       await this.eventStore.appendEvent({
@@ -588,7 +599,7 @@ var GenerationWorker = class extends JobWorker2 {
     if (job.status !== "running") {
       throw new Error(`Job must be in running state to execute, got: ${job.status}`);
     }
-    await this.processGenerationJob(job);
+    return await this.processGenerationJob(job);
   }
   async processGenerationJob(job) {
     console.log(`[GenerationWorker] Processing generation for reference ${job.params.referenceId} (job: ${job.metadata.id})`);
@@ -705,9 +716,7 @@ var GenerationWorker = class extends JobWorker2 {
       progress: {
         stage: "linking",
         percentage: 95,
-        message: "Linking reference...",
-        resultResourceId: rId
-        // Store for job.completed event
+        message: "Linking reference..."
       }
     };
     console.log(`[GenerationWorker] \u{1F517} ${updatedJob.progress.message}`);
@@ -738,13 +747,33 @@ var GenerationWorker = class extends JobWorker2 {
       progress: {
         stage: "linking",
         percentage: 100,
-        message: "Complete!",
-        resultResourceId: rId
-        // Store for job.completed event
+        message: "Complete!"
       }
     };
     await this.updateJobProgress(updatedJob);
     console.log(`[GenerationWorker] \u2705 Generation complete: created resource ${rId}`);
+    return {
+      resourceId: rId,
+      resourceName
+    };
+  }
+  /**
+   * Emit completion event with result data
+   * Override base class to emit job.completed event with resultResourceId
+   */
+  async emitCompletionEvent(job, result) {
+    await this.eventStore.appendEvent({
+      type: "job.completed",
+      resourceId: job.params.sourceResourceId,
+      userId: job.metadata.userId,
+      version: 1,
+      payload: {
+        jobId: job.metadata.id,
+        jobType: "generation",
+        resultResourceId: result.resourceId,
+        annotationUri: annotationUri(`${this.config.services.backend.publicURL}/annotations/${job.params.referenceId}`)
+      }
+    });
   }
   /**
    * Update job progress and emit events to Event Store
@@ -775,17 +804,6 @@ var GenerationWorker = class extends JobWorker2 {
           // fetching, generating, creating, linking, complete
         }
       });
-    } else if (genJob.progress.stage === "linking" && genJob.progress.percentage === 100) {
-      await this.eventStore.appendEvent({
-        type: "job.completed",
-        ...baseEvent,
-        payload: {
-          jobId: genJob.metadata.id,
-          jobType: genJob.metadata.type,
-          resultResourceId: genJob.progress.resultResourceId,
-          annotationUri: annotationUri(`${this.config.services.backend.publicURL}/annotations/${genJob.params.referenceId}`)
-        }
-      });
     } else {
       await this.eventStore.appendEvent({
         type: "job.progress",
@@ -829,7 +847,23 @@ var HighlightDetectionWorker = class extends JobWorker3 {
       throw new Error(`Job must be in running state to execute, got: ${job.status}`);
     }
     this.isFirstProgress = true;
-    await this.processHighlightDetectionJob(job);
+    return await this.processHighlightDetectionJob(job);
+  }
+  /**
+   * Emit completion event with result data
+   * Override base class to emit job.completed event
+   */
+  async emitCompletionEvent(job, _result) {
+    await this.eventStore.appendEvent({
+      type: "job.completed",
+      resourceId: job.params.resourceId,
+      userId: job.metadata.userId,
+      version: 1,
+      payload: {
+        jobId: job.metadata.id,
+        jobType: "highlight-detection"
+      }
+    });
   }
   /**
    * Override updateJobProgress to emit events to Event Store
@@ -846,7 +880,6 @@ var HighlightDetectionWorker = class extends JobWorker3 {
       userId: hlJob.metadata.userId,
       version: 1
     };
-    const isComplete = hlJob.progress.percentage === 100;
     if (this.isFirstProgress) {
       this.isFirstProgress = false;
       await this.eventStore.appendEvent({
@@ -857,16 +890,6 @@ var HighlightDetectionWorker = class extends JobWorker3 {
           jobType: hlJob.metadata.type
         }
       });
-    } else if (isComplete) {
-      await this.eventStore.appendEvent({
-        type: "job.completed",
-        ...baseEvent,
-        payload: {
-          jobId: hlJob.metadata.id,
-          jobType: hlJob.metadata.type
-          // Note: result would come from job.result, but that's handled by base class
-        }
-      });
     } else {
       await this.eventStore.appendEvent({
         type: "job.progress",
@@ -956,6 +979,10 @@ var HighlightDetectionWorker = class extends JobWorker3 {
     };
     await this.updateJobProgress(updatedJob);
     console.log(`[HighlightDetectionWorker] \u2705 Created ${created}/${highlights.length} highlights`);
+    return {
+      highlightsFound: highlights.length,
+      highlightsCreated: created
+    };
   }
   async createHighlightAnnotation(resourceId2, creatorUserId, highlight) {
     const backendUrl = this.config.services.backend?.publicURL;
@@ -1026,7 +1053,23 @@ var AssessmentDetectionWorker = class extends JobWorker4 {
       throw new Error(`Job must be in running state to execute, got: ${job.status}`);
     }
     this.isFirstProgress = true;
-    await this.processAssessmentDetectionJob(job);
+    return await this.processAssessmentDetectionJob(job);
+  }
+  /**
+   * Emit completion event with result data
+   * Override base class to emit job.completed event
+   */
+  async emitCompletionEvent(job, _result) {
+    await this.eventStore.appendEvent({
+      type: "job.completed",
+      resourceId: job.params.resourceId,
+      userId: job.metadata.userId,
+      version: 1,
+      payload: {
+        jobId: job.metadata.id,
+        jobType: "assessment-detection"
+      }
+    });
   }
   /**
    * Override updateJobProgress to emit events to Event Store
@@ -1043,7 +1086,6 @@ var AssessmentDetectionWorker = class extends JobWorker4 {
       userId: assJob.metadata.userId,
       version: 1
     };
-    const isComplete = assJob.progress.percentage === 100;
     if (this.isFirstProgress) {
       this.isFirstProgress = false;
       await this.eventStore.appendEvent({
@@ -1054,16 +1096,6 @@ var AssessmentDetectionWorker = class extends JobWorker4 {
           jobType: assJob.metadata.type
         }
       });
-    } else if (isComplete) {
-      await this.eventStore.appendEvent({
-        type: "job.completed",
-        ...baseEvent,
-        payload: {
-          jobId: assJob.metadata.id,
-          jobType: assJob.metadata.type
-          // Note: result would come from job.result, but that's handled by base class
-        }
-      });
     } else {
       await this.eventStore.appendEvent({
         type: "job.progress",
@@ -1154,6 +1186,10 @@ var AssessmentDetectionWorker = class extends JobWorker4 {
     };
     await this.updateJobProgress(updatedJob);
     console.log(`[AssessmentDetectionWorker] \u2705 Created ${created}/${assessments.length} assessments`);
+    return {
+      assessmentsFound: assessments.length,
+      assessmentsCreated: created
+    };
   }
   async createAssessmentAnnotation(resourceId2, creatorUserId, assessment) {
     const backendUrl = this.config.services.backend?.publicURL;
@@ -1227,7 +1263,23 @@ var CommentDetectionWorker = class extends JobWorker5 {
       throw new Error(`Job must be in running state to execute, got: ${job.status}`);
     }
     this.isFirstProgress = true;
-    await this.processCommentDetectionJob(job);
+    return await this.processCommentDetectionJob(job);
+  }
+  /**
+   * Emit completion event with result data
+   * Override base class to emit job.completed event
+   */
+  async emitCompletionEvent(job, _result) {
+    await this.eventStore.appendEvent({
+      type: "job.completed",
+      resourceId: job.params.resourceId,
+      userId: job.metadata.userId,
+      version: 1,
+      payload: {
+        jobId: job.metadata.id,
+        jobType: "comment-detection"
+      }
+    });
   }
   /**
    * Override updateJobProgress to emit events to Event Store
@@ -1244,7 +1296,6 @@ var CommentDetectionWorker = class extends JobWorker5 {
       userId: cdJob.metadata.userId,
       version: 1
     };
-    const isComplete = cdJob.progress.percentage === 100;
     if (this.isFirstProgress) {
       this.isFirstProgress = false;
       await this.eventStore.appendEvent({
@@ -1255,16 +1306,6 @@ var CommentDetectionWorker = class extends JobWorker5 {
           jobType: cdJob.metadata.type
         }
       });
-    } else if (isComplete) {
-      await this.eventStore.appendEvent({
-        type: "job.completed",
-        ...baseEvent,
-        payload: {
-          jobId: cdJob.metadata.id,
-          jobType: cdJob.metadata.type
-          // Note: result would come from job.result, but that's handled by base class
-        }
-      });
     } else {
       await this.eventStore.appendEvent({
         type: "job.progress",
@@ -1355,6 +1396,10 @@ var CommentDetectionWorker = class extends JobWorker5 {
     };
     await this.updateJobProgress(updatedJob);
     console.log(`[CommentDetectionWorker] \u2705 Created ${created}/${comments.length} comments`);
+    return {
+      commentsFound: comments.length,
+      commentsCreated: created
+    };
   }
   async createCommentAnnotation(resourceId2, userId_, comment) {
     const backendUrl = this.config.services.backend?.publicURL;
@@ -1436,7 +1481,23 @@ var TagDetectionWorker = class extends JobWorker6 {
       throw new Error(`Job must be in running state to execute, got: ${job.status}`);
     }
     this.isFirstProgress = true;
-    await this.processTagDetectionJob(job);
+    return await this.processTagDetectionJob(job);
+  }
+  /**
+   * Emit completion event with result data
+   * Override base class to emit job.completed event
+   */
+  async emitCompletionEvent(job, _result) {
+    await this.eventStore.appendEvent({
+      type: "job.completed",
+      resourceId: job.params.resourceId,
+      userId: job.metadata.userId,
+      version: 1,
+      payload: {
+        jobId: job.metadata.id,
+        jobType: "tag-detection"
+      }
+    });
   }
   /**
    * Override updateJobProgress to emit events to Event Store
@@ -1453,7 +1514,6 @@ var TagDetectionWorker = class extends JobWorker6 {
       userId: tdJob.metadata.userId,
       version: 1
     };
-    const isComplete = tdJob.progress.percentage === 100;
     if (this.isFirstProgress) {
       this.isFirstProgress = false;
       await this.eventStore.appendEvent({
@@ -1464,16 +1524,6 @@ var TagDetectionWorker = class extends JobWorker6 {
           jobType: tdJob.metadata.type
         }
       });
-    } else if (isComplete) {
-      await this.eventStore.appendEvent({
-        type: "job.completed",
-        ...baseEvent,
-        payload: {
-          jobId: tdJob.metadata.id,
-          jobType: tdJob.metadata.type
-          // Note: result would come from job.result, but that's handled by base class
-        }
-      });
     } else {
       await this.eventStore.appendEvent({
         type: "job.progress",
@@ -1588,6 +1638,11 @@ var TagDetectionWorker = class extends JobWorker6 {
     };
     await this.updateJobProgress(updatedJob);
     console.log(`[TagDetectionWorker] \u2705 Created ${created}/${allTags.length} tags across ${job.params.categories.length} categories`);
+    return {
+      tagsFound: allTags.length,
+      tagsCreated: created,
+      byCategory
+    };
   }
   async createTagAnnotation(resourceId2, userId_, schemaId, tag) {
     const backendUrl = this.config.services.backend?.publicURL;