@semiont/jobs 0.4.14 → 0.4.16

package/README.md

@@ -146,12 +146,12 @@ Jobs use TypeScript discriminated unions for type safety:
 ```typescript
 function handleJob(job: AnyJob) {
   if (job.status === 'running') {
-    console.log(job.progress);    // Available
+    console.log(job:progress);    // Available
     // console.log(job.result);   // Compile error
   }
   if (job.status === 'complete') {
     console.log(job.result);      // Available
-    // console.log(job.progress); // Compile error
+    // console.log(job:progress); // Compile error
   }
 }
 ```

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { Readable } from 'stream';
 import { ResourceId, JobId, UserId, EntityType, AnnotationId, components, GatheredContext, Logger, EventBus } from '@semiont/core';
 import { SemiontProject } from '@semiont/core/node';
 import { InferenceClient } from '@semiont/inference';
+import { WorkingTreeStore } from '@semiont/content';
 
 /**
  * Job Queue Type Definitions - Discriminated Union Design
@@ -482,7 +483,8 @@ declare class GenerationWorker extends JobWorker {
     private inferenceClient;
     private generator;
     private eventBus;
-    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, generator: Agent$4, eventBus: EventBus, logger: Logger);
+    private contentStore;
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, generator: Agent$4, eventBus: EventBus, contentStore: WorkingTreeStore, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<GenerationResult>;

package/dist/index.js

@@ -2,7 +2,8 @@ import { promises, watch } from 'fs';
 import * as path from 'path';
 import { validateAndCorrectOffsets, getTargetSelector, getExactText, getLocaleEnglishName } from '@semiont/api-client';
 import { generateAnnotationId } from '@semiont/event-sourcing';
-import { userToAgent, userId, jobId, CREATION_METHODS, annotationId } from '@semiont/core';
+import { userToAgent, userId, jobId, CREATION_METHODS, resourceId, annotationId } from '@semiont/core';
+import { deriveStorageUri } from '@semiont/content';
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -11267,7 +11268,17 @@ var ReferenceAnnotationWorker = class extends JobWorker {
       userId: userId(job.metadata.userId),
       jobId: jobId(job.metadata.id),
       jobType: "reference-annotation",
-      result: { result }
+      result
+    });
+    const resourceBus = this.eventBus.scope(String(job.params.resourceId));
+    resourceBus.get("mark:assist-finished").next({
+      motivation: "linking",
+      resourceId: String(job.params.resourceId),
+      status: "complete",
+      percentage: 100,
+      foundCount: result.totalFound,
+      createdCount: result.totalEmitted,
+      message: "Detection complete"
     });
   }
   async handleJobFailure(job, error) {
@@ -11281,6 +11292,11 @@ var ReferenceAnnotationWorker = class extends JobWorker {
         jobType: detJob.metadata.type,
         error: "Entity detection failed. Please try again later."
       });
+      const resourceBus = this.eventBus.scope(String(detJob.params.resourceId));
+      resourceBus.get("mark:assist-failed").next({
+        resourceId: String(detJob.params.resourceId),
+        message: "Entity detection failed. Please try again later."
+      });
     }
   }
   /**
@@ -11339,10 +11355,14 @@ var ReferenceAnnotationWorker = class extends JobWorker {
         jobType: detJob.metadata.type,
         percentage,
         progress: {
-          currentStep: detJob.progress.currentEntityType,
-          processedSteps: detJob.progress.processedEntityTypes,
-          totalSteps: detJob.progress.totalEntityTypes,
-          foundCount: detJob.progress.entitiesFound
+          stage: "scanning",
+          percentage,
+          message: detJob.progress.currentEntityType ? `Processing ${detJob.progress.currentEntityType}` : "Processing...",
+          totalEntityTypes: detJob.progress.totalEntityTypes,
+          processedEntityTypes: detJob.progress.processedEntityTypes,
+          entitiesFound: detJob.progress.entitiesFound,
+          entitiesEmitted: detJob.progress.entitiesEmitted,
+          currentEntityType: detJob.progress.currentEntityType
         }
       });
       this.logger?.debug("[EventBus] Emitting mark:progress", {
@@ -11486,11 +11506,12 @@ Requirements:
 var import_rxjs = __toESM(require_cjs());
 var import_operators = __toESM(require_operators());
 var GenerationWorker = class extends JobWorker {
-  constructor(jobQueue, inferenceClient, generator, eventBus, logger) {
+  constructor(jobQueue, inferenceClient, generator, eventBus, contentStore, logger) {
     super(jobQueue, void 0, void 0, logger);
     this.inferenceClient = inferenceClient;
     this.generator = generator;
     this.eventBus = eventBus;
+    this.contentStore = contentStore;
   }
   getWorkerName() {
     return "GenerationWorker";
@@ -11576,28 +11597,32 @@ var GenerationWorker = class extends JobWorker {
     };
     this.logger?.debug("Generation progress", { stage: updatedJob.progress.stage, message: updatedJob.progress.message });
     await this.updateJobProgress(updatedJob);
+    const format = "text/markdown";
+    const resolvedUri = job.params.storageUri || deriveStorageUri(resourceName, format);
+    const stored = await this.contentStore.store(Buffer.from(generatedContent.content), resolvedUri);
     const createParams = {
       name: resourceName,
-      content: Buffer.from(generatedContent.content),
-      format: "text/markdown",
+      storageUri: resolvedUri,
+      contentChecksum: stored.checksum,
+      byteSize: stored.byteSize,
+      format,
       userId: userId(job.metadata.userId),
       entityTypes: job.params.entityTypes || annotationEntityTypes,
       language: job.params.language,
       creationMethod: CREATION_METHODS.GENERATED,
       isDraft: true,
       generatedFrom: { resourceId: job.params.sourceResourceId, annotationId: job.params.referenceId },
-      storageUri: job.params.storageUri,
       generator: this.generator
     };
     const result$ = (0, import_rxjs.race)(
-      this.eventBus.get("yield:created").pipe((0, import_operators.take)(1), (0, import_operators.map)((r) => ({ ok: true, result: r }))),
-      this.eventBus.get("yield:create-failed").pipe((0, import_operators.take)(1), (0, import_operators.map)((f) => ({ ok: false, error: f.error }))),
+      this.eventBus.get("yield:create-ok").pipe((0, import_operators.take)(1), (0, import_operators.map)((r) => ({ ok: true, result: r }))),
+      this.eventBus.get("yield:create-failed").pipe((0, import_operators.take)(1), (0, import_operators.map)((f) => ({ ok: false, error: new Error(f.message) }))),
       (0, import_rxjs.timer)(3e4).pipe((0, import_operators.map)(() => ({ ok: false, error: new Error("Resource creation timed out") })))
     );
     this.eventBus.get("yield:create").next(createParams);
     const outcome = await (0, import_rxjs.firstValueFrom)(result$);
     if (!outcome.ok) throw outcome.error;
-    const rId = outcome.result.resourceId;
+    const rId = resourceId(outcome.result.resourceId);
     this.logger?.info("Resource created via EventBus", { resourceId: rId });
     updatedJob = {
       ...updatedJob,
@@ -11653,10 +11678,20 @@ var GenerationWorker = class extends JobWorker {
       jobId: jobId(job.metadata.id),
       jobType: "generation",
       result: {
-        resultResourceId: result.resourceId,
-        annotationId: job.params.referenceId
+        resourceId: result.resourceId,
+        resourceName: result.resourceName
       }
     });
+    const resourceBus = this.eventBus.scope(String(job.params.sourceResourceId));
+    resourceBus.get("yield:finished").next({
+      status: "complete",
+      referenceId: String(job.params.referenceId),
+      resourceName: result.resourceName,
+      resourceId: result.resourceId,
+      sourceResourceId: String(job.params.sourceResourceId),
+      percentage: 100,
+      message: "Draft resource created! Ready for review."
+    });
   }
   async handleJobFailure(job, error) {
     await super.handleJobFailure(job, error);
@@ -11669,6 +11704,14 @@ var GenerationWorker = class extends JobWorker {
         jobType: genJob.metadata.type,
         error: "Resource generation failed. Please try again later."
       });
+      const resourceBus = this.eventBus.scope(String(genJob.params.sourceResourceId));
+      resourceBus.get("yield:failed").next({
+        error: "Resource generation failed. Please try again later.",
+        status: "error",
+        referenceId: String(genJob.params.referenceId),
+        percentage: 0,
+        message: "Resource generation failed. Please try again later."
+      });
     }
   }
   /**
@@ -11700,8 +11743,9 @@ var GenerationWorker = class extends JobWorker {
         jobType: genJob.metadata.type,
         percentage: genJob.progress.percentage,
         progress: {
-          currentStep: genJob.progress.stage,
-          message: genJob.progress.message
+          stage: genJob.progress.stage,
+          percentage: genJob.progress.percentage,
+          message: genJob.progress.message || ""
         }
       });
       resourceBus.get("yield:progress").next({
@@ -11749,7 +11793,17 @@ var HighlightAnnotationWorker = class extends JobWorker {
       userId: userId(job.metadata.userId),
       jobId: jobId(job.metadata.id),
       jobType: "highlight-annotation",
-      result: { result }
+      result
+    });
+    const resourceBus = this.eventBus.scope(String(job.params.resourceId));
+    resourceBus.get("mark:assist-finished").next({
+      motivation: "highlighting",
+      resourceId: String(job.params.resourceId),
+      status: "complete",
+      percentage: 100,
+      foundCount: result.highlightsFound,
+      createdCount: result.highlightsCreated,
+      message: "Detection complete"
     });
   }
   /**
@@ -11777,7 +11831,7 @@ var HighlightAnnotationWorker = class extends JobWorker {
         jobId: jobId(hlJob.metadata.id),
         jobType: hlJob.metadata.type,
         percentage: hlJob.progress.percentage,
-        progress: { progress: hlJob.progress }
+        progress: { stage: hlJob.progress.stage, percentage: hlJob.progress.percentage, message: hlJob.progress.message || "" }
       });
       const resourceBus = this.eventBus.scope(hlJob.params.resourceId);
       resourceBus.get("mark:progress").next({
@@ -11798,6 +11852,11 @@ var HighlightAnnotationWorker = class extends JobWorker {
         jobType: hlJob.metadata.type,
         error: "Highlight detection failed. Please try again later."
       });
+      const resourceBus = this.eventBus.scope(String(hlJob.params.resourceId));
+      resourceBus.get("mark:assist-failed").next({
+        resourceId: String(hlJob.params.resourceId),
+        message: "Highlight detection failed. Please try again later."
+      });
     }
   }
   async processHighlightDetectionJob(job) {
@@ -11942,7 +12001,17 @@ var AssessmentAnnotationWorker = class extends JobWorker {
       userId: userId(job.metadata.userId),
       jobId: jobId(job.metadata.id),
       jobType: "assessment-annotation",
-      result: { result }
+      result
+    });
+    const resourceBus = this.eventBus.scope(String(job.params.resourceId));
+    resourceBus.get("mark:assist-finished").next({
+      motivation: "assessing",
+      resourceId: String(job.params.resourceId),
+      status: "complete",
+      percentage: 100,
+      foundCount: result.assessmentsFound,
+      createdCount: result.assessmentsCreated,
+      message: "Detection complete"
     });
   }
   /**
@@ -11970,7 +12039,7 @@ var AssessmentAnnotationWorker = class extends JobWorker {
         jobId: jobId(assJob.metadata.id),
         jobType: assJob.metadata.type,
         percentage: assJob.progress.percentage,
-        progress: { progress: assJob.progress }
+        progress: { stage: assJob.progress.stage, percentage: assJob.progress.percentage, message: assJob.progress.message || "" }
       });
       const resourceBus = this.eventBus.scope(assJob.params.resourceId);
       resourceBus.get("mark:progress").next({
@@ -11991,6 +12060,11 @@ var AssessmentAnnotationWorker = class extends JobWorker {
         jobType: aJob.metadata.type,
         error: "Assessment detection failed. Please try again later."
       });
+      const resourceBus = this.eventBus.scope(String(aJob.params.resourceId));
+      resourceBus.get("mark:assist-failed").next({
+        resourceId: String(aJob.params.resourceId),
+        message: "Assessment detection failed. Please try again later."
+      });
     }
   }
   async processAssessmentDetectionJob(job) {
@@ -12140,7 +12214,17 @@ var CommentAnnotationWorker = class extends JobWorker {
       userId: userId(job.metadata.userId),
       jobId: jobId(job.metadata.id),
       jobType: "comment-annotation",
-      result: { result }
+      result
+    });
+    const resourceBus = this.eventBus.scope(String(job.params.resourceId));
+    resourceBus.get("mark:assist-finished").next({
+      motivation: "commenting",
+      resourceId: String(job.params.resourceId),
+      status: "complete",
+      percentage: 100,
+      foundCount: result.commentsFound,
+      createdCount: result.commentsCreated,
+      message: "Detection complete"
     });
   }
   /**
@@ -12168,7 +12252,7 @@ var CommentAnnotationWorker = class extends JobWorker {
         jobId: jobId(cdJob.metadata.id),
         jobType: cdJob.metadata.type,
         percentage: cdJob.progress.percentage,
-        progress: { progress: cdJob.progress }
+        progress: { stage: cdJob.progress.stage, percentage: cdJob.progress.percentage, message: cdJob.progress.message || "" }
       });
       const resourceBus = this.eventBus.scope(cdJob.params.resourceId);
       resourceBus.get("mark:progress").next({
@@ -12189,6 +12273,11 @@ var CommentAnnotationWorker = class extends JobWorker {
         jobType: cdJob.metadata.type,
         error: "Comment detection failed. Please try again later."
       });
+      const resourceBus = this.eventBus.scope(String(cdJob.params.resourceId));
+      resourceBus.get("mark:assist-failed").next({
+        resourceId: String(cdJob.params.resourceId),
+        message: "Comment detection failed. Please try again later."
+      });
     }
   }
   async processCommentDetectionJob(job) {
@@ -12345,7 +12434,17 @@ var TagAnnotationWorker = class extends JobWorker {
       userId: userId(job.metadata.userId),
       jobId: jobId(job.metadata.id),
       jobType: "tag-annotation",
-      result: { result }
+      result
+    });
+    const resourceBus = this.eventBus.scope(String(job.params.resourceId));
+    resourceBus.get("mark:assist-finished").next({
+      motivation: "tagging",
+      resourceId: String(job.params.resourceId),
+      status: "complete",
+      percentage: 100,
+      foundCount: result.tagsFound,
+      createdCount: result.tagsCreated,
+      message: "Detection complete"
     });
   }
   /**
@@ -12373,7 +12472,7 @@ var TagAnnotationWorker = class extends JobWorker {
         jobId: jobId(tdJob.metadata.id),
         jobType: tdJob.metadata.type,
         percentage: tdJob.progress.percentage,
-        progress: { progress: tdJob.progress }
+        progress: { stage: tdJob.progress.stage, percentage: tdJob.progress.percentage, message: tdJob.progress.message || "", currentCategory: tdJob.progress.currentCategory, processedCategories: tdJob.progress.processedCategories, totalCategories: tdJob.progress.totalCategories }
       });
       const resourceBus = this.eventBus.scope(tdJob.params.resourceId);
       resourceBus.get("mark:progress").next({
@@ -12397,6 +12496,11 @@ var TagAnnotationWorker = class extends JobWorker {
         jobType: tdJob.metadata.type,
         error: "Tag detection failed. Please try again later."
       });
+      const resourceBus = this.eventBus.scope(String(tdJob.params.resourceId));
+      resourceBus.get("mark:assist-failed").next({
+        resourceId: String(tdJob.params.resourceId),
+        message: "Tag detection failed. Please try again later."
+      });
     }
   }
   async processTagDetectionJob(job) {