@semiont/jobs 0.3.4 → 0.3.6

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 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';
 
 /**
@@ -277,9 +278,6 @@ interface JobQueryFilters {
  * Jobs are stored in directories by status for easy polling.
  */
 
-interface JobQueueConfig {
-    dataDir: string;
-}
 declare class JobQueue {
     private eventBus?;
     private jobsDir;
@@ -287,7 +285,7 @@ declare class JobQueue {
     private pendingQueue;
     private watcher;
     private loadDebounceTimer;
-    constructor(config: JobQueueConfig, logger: Logger, eventBus?: EventBus | undefined);
+    constructor(project: SemiontProject, logger: Logger, eventBus?: EventBus | undefined);
     /**
      * Initialize job queue directories, load pending jobs, and start fs.watch
      */
@@ -348,8 +346,6 @@ declare class JobQueue {
         cancelled: number;
     }>;
 }
-declare function getJobQueue(): JobQueue;
-declare function initializeJobQueue(config: JobQueueConfig, logger: Logger, eventBus?: EventBus): Promise<JobQueue>;
 
 /**
  * Job Worker Base Class
@@ -426,6 +422,7 @@ declare abstract class JobWorker {
  * emits events on the EventBus for all writes.
  */
 
+type Agent$4 = components['schemas']['Agent'];
 interface DetectedAnnotation {
     annotation: {
         selector: {
@@ -440,9 +437,10 @@ interface DetectedAnnotation {
 }
 declare class ReferenceAnnotationWorker extends JobWorker {
     private inferenceClient;
+    private generator;
     private eventBus;
     private contentFetcher;
-    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, generator: Agent$4, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<DetectionResult>;
@@ -504,12 +502,14 @@ declare class GenerationWorker extends JobWorker {
  * that should be highlighted and creates highlight annotations.
  */
 
+type Agent$3 = components['schemas']['Agent'];
 declare class HighlightAnnotationWorker extends JobWorker {
     private inferenceClient;
+    private generator;
     private eventBus;
     private contentFetcher;
     private isFirstProgress;
-    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, generator: Agent$3, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<HighlightDetectionResult>;
@@ -534,12 +534,14 @@ declare class HighlightAnnotationWorker extends JobWorker {
  * passages in the text and creates assessment annotations.
  */
 
+type Agent$2 = components['schemas']['Agent'];
 declare class AssessmentAnnotationWorker extends JobWorker {
     private inferenceClient;
+    private generator;
     private eventBus;
     private contentFetcher;
     private isFirstProgress;
-    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, generator: Agent$2, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<AssessmentDetectionResult>;
@@ -564,12 +566,14 @@ declare class AssessmentAnnotationWorker extends JobWorker {
  * that would benefit from explanatory comments and creates comment annotations.
  */
 
+type Agent$1 = components['schemas']['Agent'];
 declare class CommentAnnotationWorker extends JobWorker {
     private inferenceClient;
+    private generator;
     private eventBus;
     private contentFetcher;
     private isFirstProgress;
-    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, generator: Agent$1, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<CommentDetectionResult>;
@@ -595,12 +599,14 @@ declare class CommentAnnotationWorker extends JobWorker {
  * creates tag annotations with dual-body structure.
  */
 
+type Agent = components['schemas']['Agent'];
 declare class TagAnnotationWorker extends JobWorker {
     private inferenceClient;
+    private generator;
     private eventBus;
     private contentFetcher;
     private isFirstProgress;
-    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, generator: Agent, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<TagDetectionResult>;
@@ -722,4 +728,4 @@ declare function generateResourceFromTopic(topic: string, entityTypes: string[],
     content: string;
 }>;
 
-export { AnnotationDetection, type AnyJob, AssessmentAnnotationWorker, type AssessmentDetectionJob, type AssessmentDetectionParams, type AssessmentDetectionProgress, type AssessmentDetectionResult, type CancelledJob, CommentAnnotationWorker, type CommentDetectionJob, type CommentDetectionParams, type CommentDetectionProgress, type CommentDetectionResult, type CompleteJob, type ContentFetcher, type DetectionJob, type DetectionParams, type DetectionProgress, type DetectionResult, type FailedJob, type GenerationJob, type GenerationParams, type GenerationResult, GenerationWorker, HighlightAnnotationWorker, type HighlightDetectionJob, type HighlightDetectionParams, type HighlightDetectionProgress, type HighlightDetectionResult, type JobMetadata, type JobQueryFilters, JobQueue, type JobQueueConfig, type JobStatus, type JobType, JobWorker, type PendingJob, ReferenceAnnotationWorker, type RunningJob, TagAnnotationWorker, type TagDetectionJob, type TagDetectionParams, type TagDetectionProgress, type TagDetectionResult, type YieldProgress, generateResourceFromTopic, getJobQueue, initializeJobQueue, isCancelledJob, isCompleteJob, isFailedJob, isPendingJob, isRunningJob };
+export { AnnotationDetection, type AnyJob, AssessmentAnnotationWorker, type AssessmentDetectionJob, type AssessmentDetectionParams, type AssessmentDetectionProgress, type AssessmentDetectionResult, type CancelledJob, CommentAnnotationWorker, type CommentDetectionJob, type CommentDetectionParams, type CommentDetectionProgress, type CommentDetectionResult, type CompleteJob, type ContentFetcher, type DetectionJob, type DetectionParams, type DetectionProgress, type DetectionResult, type FailedJob, type GenerationJob, type GenerationParams, type GenerationResult, GenerationWorker, HighlightAnnotationWorker, type HighlightDetectionJob, type HighlightDetectionParams, type HighlightDetectionProgress, type HighlightDetectionResult, type JobMetadata, type JobQueryFilters, JobQueue, type JobStatus, type JobType, JobWorker, type PendingJob, ReferenceAnnotationWorker, type RunningJob, TagAnnotationWorker, type TagDetectionJob, type TagDetectionParams, type TagDetectionProgress, type TagDetectionResult, type YieldProgress, generateResourceFromTopic, isCancelledJob, isCompleteJob, isFailedJob, isPendingJob, isRunningJob };

package/dist/index.js

@@ -9712,9 +9712,9 @@ var require_operators = __commonJS({
   }
 });
 var JobQueue = class {
-  constructor(config, logger, eventBus) {
+  constructor(project, logger, eventBus) {
     this.eventBus = eventBus;
-    this.jobsDir = path.join(config.dataDir, "jobs");
+    this.jobsDir = project.jobsDir;
     this.logger = logger;
   }
   jobsDir;
@@ -9975,18 +9975,6 @@ var JobQueue = class {
     return stats;
   }
 };
-var jobQueue = null;
-function getJobQueue() {
-  if (!jobQueue) {
-    throw new Error("JobQueue not initialized. Call initializeJobQueue() first.");
-  }
-  return jobQueue;
-}
-async function initializeJobQueue(config, logger, eventBus) {
-  jobQueue = new JobQueue(config, logger, eventBus);
-  await jobQueue.initialize();
-  return jobQueue;
-}
 
 // src/job-worker.ts
 var JobWorker = class {
@@ -9996,8 +9984,8 @@ var JobWorker = class {
   errorBackoffMs;
   jobQueue;
   logger;
-  constructor(jobQueue2, pollIntervalMs = 1e3, errorBackoffMs = 5e3, logger) {
-    this.jobQueue = jobQueue2;
+  constructor(jobQueue, pollIntervalMs = 1e3, errorBackoffMs = 5e3, logger) {
+    this.jobQueue = jobQueue;
     this.pollIntervalMs = pollIntervalMs;
     this.errorBackoffMs = errorBackoffMs;
     this.logger = logger;
@@ -11083,9 +11071,10 @@ Example output:
 
 // src/workers/reference-annotation-worker.ts
 var ReferenceAnnotationWorker = class extends JobWorker {
-  constructor(jobQueue2, inferenceClient, eventBus, contentFetcher, logger) {
-    super(jobQueue2, void 0, void 0, logger);
+  constructor(jobQueue, inferenceClient, generator, eventBus, contentFetcher, logger) {
+    super(jobQueue, void 0, void 0, logger);
     this.inferenceClient = inferenceClient;
+    this.generator = generator;
     this.eventBus = eventBus;
     this.contentFetcher = contentFetcher;
   }
@@ -11201,6 +11190,7 @@ var ReferenceAnnotationWorker = class extends JobWorker {
             id: referenceId,
             motivation: "linking",
             creator,
+            generator: this.generator,
             created: (/* @__PURE__ */ new Date()).toISOString(),
             target: {
               source: job.params.resourceId,
@@ -11495,8 +11485,8 @@ Requirements:
 var import_rxjs = __toESM(require_cjs());
 var import_operators = __toESM(require_operators());
 var GenerationWorker = class extends JobWorker {
-  constructor(jobQueue2, inferenceClient, eventBus, logger) {
-    super(jobQueue2, void 0, void 0, logger);
+  constructor(jobQueue, inferenceClient, eventBus, logger) {
+    super(jobQueue, void 0, void 0, logger);
     this.inferenceClient = inferenceClient;
     this.eventBus = eventBus;
   }
@@ -11721,9 +11711,10 @@ var GenerationWorker = class extends JobWorker {
   }
 };
 var HighlightAnnotationWorker = class extends JobWorker {
-  constructor(jobQueue2, inferenceClient, eventBus, contentFetcher, logger) {
-    super(jobQueue2, void 0, void 0, logger);
+  constructor(jobQueue, inferenceClient, generator, eventBus, contentFetcher, logger) {
+    super(jobQueue, void 0, void 0, logger);
     this.inferenceClient = inferenceClient;
+    this.generator = generator;
     this.eventBus = eventBus;
     this.contentFetcher = contentFetcher;
   }
@@ -11883,6 +11874,7 @@ var HighlightAnnotationWorker = class extends JobWorker {
       "id": annotationIdVal,
       "motivation": "highlighting",
       creator,
+      generator: this.generator,
       created: (/* @__PURE__ */ new Date()).toISOString(),
       "target": {
         type: "SpecificResource",
@@ -11912,9 +11904,10 @@ var HighlightAnnotationWorker = class extends JobWorker {
   }
 };
 var AssessmentAnnotationWorker = class extends JobWorker {
-  constructor(jobQueue2, inferenceClient, eventBus, contentFetcher, logger) {
-    super(jobQueue2, void 0, void 0, logger);
+  constructor(jobQueue, inferenceClient, generator, eventBus, contentFetcher, logger) {
+    super(jobQueue, void 0, void 0, logger);
     this.inferenceClient = inferenceClient;
+    this.generator = generator;
     this.eventBus = eventBus;
     this.contentFetcher = contentFetcher;
   }
@@ -12075,6 +12068,7 @@ var AssessmentAnnotationWorker = class extends JobWorker {
       "id": annotationIdVal,
       "motivation": "assessing",
       creator,
+      generator: this.generator,
       created: (/* @__PURE__ */ new Date()).toISOString(),
       "target": {
         type: "SpecificResource",
@@ -12107,9 +12101,10 @@ var AssessmentAnnotationWorker = class extends JobWorker {
   }
 };
 var CommentAnnotationWorker = class extends JobWorker {
-  constructor(jobQueue2, inferenceClient, eventBus, contentFetcher, logger) {
-    super(jobQueue2, void 0, void 0, logger);
+  constructor(jobQueue, inferenceClient, generator, eventBus, contentFetcher, logger) {
+    super(jobQueue, void 0, void 0, logger);
     this.inferenceClient = inferenceClient;
+    this.generator = generator;
     this.eventBus = eventBus;
     this.contentFetcher = contentFetcher;
   }
@@ -12270,6 +12265,7 @@ var CommentAnnotationWorker = class extends JobWorker {
       id: annotationIdVal,
       motivation: "commenting",
       creator,
+      generator: this.generator,
       created: (/* @__PURE__ */ new Date()).toISOString(),
       target: {
         type: "SpecificResource",
@@ -12310,9 +12306,10 @@ var CommentAnnotationWorker = class extends JobWorker {
   }
 };
 var TagAnnotationWorker = class extends JobWorker {
-  constructor(jobQueue2, inferenceClient, eventBus, contentFetcher, logger) {
-    super(jobQueue2, void 0, void 0, logger);
+  constructor(jobQueue, inferenceClient, generator, eventBus, contentFetcher, logger) {
+    super(jobQueue, void 0, void 0, logger);
     this.inferenceClient = inferenceClient;
+    this.generator = generator;
     this.eventBus = eventBus;
     this.contentFetcher = contentFetcher;
   }
@@ -12505,6 +12502,7 @@ var TagAnnotationWorker = class extends JobWorker {
       id: annotationIdVal,
       motivation: "tagging",
       creator,
+      generator: this.generator,
       created: (/* @__PURE__ */ new Date()).toISOString(),
       target: {
         type: "SpecificResource",
@@ -12552,6 +12550,6 @@ var TagAnnotationWorker = class extends JobWorker {
   }
 };
 
-export { AnnotationDetection, AssessmentAnnotationWorker, CommentAnnotationWorker, GenerationWorker, HighlightAnnotationWorker, JobQueue, JobWorker, ReferenceAnnotationWorker, TagAnnotationWorker, generateResourceFromTopic, getJobQueue, initializeJobQueue, isCancelledJob, isCompleteJob, isFailedJob, isPendingJob, isRunningJob };
+export { AnnotationDetection, AssessmentAnnotationWorker, CommentAnnotationWorker, GenerationWorker, HighlightAnnotationWorker, JobQueue, JobWorker, ReferenceAnnotationWorker, TagAnnotationWorker, generateResourceFromTopic, isCancelledJob, isCompleteJob, isFailedJob, isPendingJob, isRunningJob };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map