@semiont/jobs 0.2.46 → 0.3.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Readable } from 'stream';
-import { ResourceId, JobId, UserId, EntityType, AnnotationId, components, YieldContext, Logger, EventBus, EnvironmentConfig } from '@semiont/core';
+import { ResourceId, JobId, UserId, EntityType, AnnotationId, components, GatheredContext, Logger, EventBus } from '@semiont/core';
 import { InferenceClient } from '@semiont/inference';
 
 /**
@@ -58,7 +58,7 @@ interface GenerationParams {
     title?: string;
     entityTypes?: EntityType[];
     language?: string;
-    context?: YieldContext;
+    context?: GatheredContext;
     temperature?: number;
     maxTokens?: number;
 }
@@ -439,11 +439,10 @@ interface DetectedAnnotation {
     };
 }
 declare class ReferenceAnnotationWorker extends JobWorker {
-    private config;
     private inferenceClient;
     private eventBus;
     private contentFetcher;
-    constructor(jobQueue: JobQueue, config: EnvironmentConfig, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<DetectionResult>;
@@ -478,10 +477,9 @@ declare class ReferenceAnnotationWorker extends JobWorker {
  */
 
 declare class GenerationWorker extends JobWorker {
-    private config;
     private inferenceClient;
     private eventBus;
-    constructor(jobQueue: JobQueue, config: EnvironmentConfig, inferenceClient: InferenceClient, eventBus: EventBus, logger: Logger);
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, eventBus: EventBus, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<GenerationResult>;
@@ -507,12 +505,11 @@ declare class GenerationWorker extends JobWorker {
  */
 
 declare class HighlightAnnotationWorker extends JobWorker {
-    private config;
     private inferenceClient;
     private eventBus;
     private contentFetcher;
     private isFirstProgress;
-    constructor(jobQueue: JobQueue, config: EnvironmentConfig, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<HighlightDetectionResult>;
@@ -538,12 +535,11 @@ declare class HighlightAnnotationWorker extends JobWorker {
  */
 
 declare class AssessmentAnnotationWorker extends JobWorker {
-    private config;
     private inferenceClient;
     private eventBus;
     private contentFetcher;
     private isFirstProgress;
-    constructor(jobQueue: JobQueue, config: EnvironmentConfig, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<AssessmentDetectionResult>;
@@ -569,12 +565,11 @@ declare class AssessmentAnnotationWorker extends JobWorker {
  */
 
 declare class CommentAnnotationWorker extends JobWorker {
-    private config;
     private inferenceClient;
     private eventBus;
     private contentFetcher;
     private isFirstProgress;
-    constructor(jobQueue: JobQueue, config: EnvironmentConfig, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<CommentDetectionResult>;
@@ -601,12 +596,11 @@ declare class CommentAnnotationWorker extends JobWorker {
  */
 
 declare class TagAnnotationWorker extends JobWorker {
-    private config;
     private inferenceClient;
     private eventBus;
     private contentFetcher;
     private isFirstProgress;
-    constructor(jobQueue: JobQueue, config: EnvironmentConfig, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
+    constructor(jobQueue: JobQueue, inferenceClient: InferenceClient, eventBus: EventBus, contentFetcher: ContentFetcher, logger: Logger);
     protected getWorkerName(): string;
     protected canProcessJob(job: AnyJob): boolean;
     protected executeJob(job: AnyJob): Promise<TagDetectionResult>;
@@ -714,4 +708,18 @@ declare class AnnotationDetection {
     static detectTags(content: string, client: InferenceClient, schemaId: string, category: string): Promise<TagMatch[]>;
 }
 
-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, getJobQueue, initializeJobQueue, isCancelledJob, isCompleteJob, isFailedJob, isPendingJob, isRunningJob };
+/**
+ * Resource Generation
+ *
+ * Generates markdown resources from topics using AI inference.
+ */
+
+/**
+ * Generate resource content using inference
+ */
+declare function generateResourceFromTopic(topic: string, entityTypes: string[], client: InferenceClient, userPrompt?: string, locale?: string, context?: GatheredContext, temperature?: number, maxTokens?: number, logger?: Logger): Promise<{
+    title: 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 };

package/dist/index.js

@@ -2,7 +2,7 @@ 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, resourceIdToURI, userId, jobId, CREATION_METHODS, resourceUri, annotationId, annotationUri } from '@semiont/core';
+import { userToAgent, userId, jobId, CREATION_METHODS, annotationId } from '@semiont/core';
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -11083,9 +11083,8 @@ Example output:
 
 // src/workers/reference-annotation-worker.ts
 var ReferenceAnnotationWorker = class extends JobWorker {
-  constructor(jobQueue2, config, inferenceClient, eventBus, contentFetcher, logger) {
+  constructor(jobQueue2, inferenceClient, eventBus, contentFetcher, logger) {
     super(jobQueue2, void 0, void 0, logger);
-    this.config = config;
     this.inferenceClient = inferenceClient;
     this.eventBus = eventBus;
     this.contentFetcher = contentFetcher;
@@ -11188,17 +11187,7 @@ var ReferenceAnnotationWorker = class extends JobWorker {
           this.logger?.warn("Skipping undefined entity", { index: idx });
           continue;
         }
-        let referenceId;
-        try {
-          const backendUrl = this.config.services.backend?.publicURL;
-          if (!backendUrl) {
-            throw new Error("Backend publicURL not configured");
-          }
-          referenceId = generateAnnotationId(backendUrl);
-        } catch (error) {
-          this.logger?.error("Failed to generate annotation ID", { error });
-          throw new Error("Configuration error: Backend publicURL not set");
-        }
+        const referenceId = generateAnnotationId();
         try {
           const creator = userToAgent({
             id: job.metadata.userId,
@@ -11214,8 +11203,7 @@ var ReferenceAnnotationWorker = class extends JobWorker {
             creator,
             created: (/* @__PURE__ */ new Date()).toISOString(),
             target: {
-              source: resourceIdToURI(job.params.resourceId, this.config.services.backend.publicURL),
-              // Convert to full URI
+              source: job.params.resourceId,
               selector: [
                 {
                   type: "TextPositionSelector",
@@ -11385,11 +11373,38 @@ function getLanguageName(locale) {
   return getLocaleEnglishName(locale) || locale;
 }
 async function generateResourceFromTopic(topic, entityTypes, client, userPrompt, locale, context, temperature, maxTokens, logger) {
+  logger?.debug("Generating resource from topic", {
+    topicPreview: topic.substring(0, 100),
+    entityTypes,
+    hasUserPrompt: !!userPrompt,
+    locale,
+    hasContext: !!context,
+    temperature,
+    maxTokens
+  });
   const finalTemperature = temperature ?? 0.7;
   const finalMaxTokens = maxTokens ?? 500;
   const languageInstruction = locale && locale !== "en" ? `
 
 IMPORTANT: Write the entire resource in ${getLanguageName(locale)}.` : "";
+  let annotationSection = "";
+  if (context) {
+    const parts = [];
+    parts.push(`- Annotation motivation: ${context.annotation.motivation}`);
+    parts.push(`- Source resource: ${context.sourceResource.name}`);
+    const { motivation, body } = context.annotation;
+    if (motivation === "commenting" || motivation === "assessing") {
+      const bodyItem = Array.isArray(body) ? body[0] : body;
+      if (bodyItem && "value" in bodyItem && bodyItem.value) {
+        const label = motivation === "commenting" ? "Comment" : "Assessment";
+        parts.push(`- ${label}: ${bodyItem.value}`);
+      }
+    }
+    annotationSection = `
+
+Annotation context:
+${parts.join("\n")}`;
+  }
   let contextSection = "";
   if (context?.sourceContext) {
     const { before, selected, after } = context.sourceContext;
@@ -11403,9 +11418,36 @@ ${after ? `${after}...` : ""}
 ---
 `;
   }
+  let graphContextSection = "";
+  if (context?.graphContext) {
+    const gc = context.graphContext;
+    const connections = gc.connections ?? [];
+    const citedBy = gc.citedBy ?? [];
+    const parts = [];
+    if (connections.length > 0) {
+      const connList = connections.map((c) => `${c.resourceName}${c.entityTypes?.length ? ` (${c.entityTypes.join(", ")})` : ""}`).join(", ");
+      parts.push(`- Connected resources: ${connList}`);
+    }
+    if (gc.citedByCount && gc.citedByCount > 0) {
+      const citedNames = citedBy.map((c) => c.resourceName).join(", ");
+      parts.push(`- This resource is cited by ${gc.citedByCount} other resource${gc.citedByCount > 1 ? "s" : ""}${citedNames ? `: ${citedNames}` : ""}`);
+    }
+    if (gc.siblingEntityTypes && gc.siblingEntityTypes.length > 0) {
+      parts.push(`- Related entity types in this document: ${gc.siblingEntityTypes.join(", ")}`);
+    }
+    if (gc.inferredRelationshipSummary) {
+      parts.push(`- Relationship summary: ${gc.inferredRelationshipSummary}`);
+    }
+    if (parts.length > 0) {
+      graphContextSection = `
+
+Knowledge graph context:
+${parts.join("\n")}`;
+    }
+  }
   const prompt = `Generate a concise, informative resource about "${topic}".
 ${entityTypes.length > 0 ? `Focus on these entity types: ${entityTypes.join(", ")}.` : ""}
-${userPrompt ? `Additional context: ${userPrompt}` : ""}${contextSection}${languageInstruction}
+${userPrompt ? `Additional context: ${userPrompt}` : ""}${annotationSection}${contextSection}${graphContextSection}${languageInstruction}
 
 Requirements:
 - Start with a clear heading (# Title)
@@ -11434,16 +11476,27 @@ Requirements:
       content
     };
   };
+  logger?.debug("Sending prompt to inference", {
+    promptLength: prompt.length,
+    temperature: finalTemperature,
+    maxTokens: finalMaxTokens
+  });
   const response = await client.generateText(prompt, finalMaxTokens, finalTemperature);
+  logger?.debug("Got response from inference", { responseLength: response.length });
   const result = parseResponse(response);
+  logger?.debug("Parsed response", {
+    hasTitle: !!result.title,
+    titleLength: result.title?.length,
+    hasContent: !!result.content,
+    contentLength: result.content?.length
+  });
   return result;
 }
 var import_rxjs = __toESM(require_cjs());
 var import_operators = __toESM(require_operators());
 var GenerationWorker = class extends JobWorker {
-  constructor(jobQueue2, config, inferenceClient, eventBus, logger) {
+  constructor(jobQueue2, inferenceClient, eventBus, logger) {
     super(jobQueue2, void 0, void 0, logger);
-    this.config = config;
     this.inferenceClient = inferenceClient;
     this.eventBus = eventBus;
   }
@@ -11562,18 +11615,16 @@ var GenerationWorker = class extends JobWorker {
     };
     this.logger?.debug("Generation progress", { stage: updatedJob.progress.stage, message: updatedJob.progress.message });
     await this.updateJobProgress(updatedJob);
-    const newResourceUri = resourceUri(`${this.config.services.backend.publicURL}/resources/${rId}`);
     const operations = [{
       op: "add",
       item: {
         type: "SpecificResource",
-        source: newResourceUri,
+        source: rId,
         purpose: "linking"
       }
     }];
-    const annotationIdSegment = job.params.referenceId.split("/").pop();
     this.eventBus.get("mark:update-body").next({
-      annotationId: annotationId(annotationIdSegment),
+      annotationId: annotationId(job.params.referenceId),
       userId: userId(job.metadata.userId),
       resourceId: job.params.sourceResourceId,
       operations
@@ -11609,7 +11660,7 @@ var GenerationWorker = class extends JobWorker {
       jobType: "generation",
       result: {
         resultResourceId: result.resourceId,
-        annotationUri: annotationUri(`${this.config.services.backend.publicURL}/annotations/${job.params.referenceId}`)
+        annotationId: job.params.referenceId
       }
     });
   }
@@ -11670,9 +11721,8 @@ var GenerationWorker = class extends JobWorker {
   }
 };
 var HighlightAnnotationWorker = class extends JobWorker {
-  constructor(jobQueue2, config, inferenceClient, eventBus, contentFetcher, logger) {
+  constructor(jobQueue2, inferenceClient, eventBus, contentFetcher, logger) {
     super(jobQueue2, void 0, void 0, logger);
-    this.config = config;
     this.inferenceClient = inferenceClient;
     this.eventBus = eventBus;
     this.contentFetcher = contentFetcher;
@@ -11820,10 +11870,7 @@ var HighlightAnnotationWorker = class extends JobWorker {
     };
   }
   async createHighlightAnnotation(resourceId, metadata, highlight) {
-    const backendUrl = this.config.services.backend?.publicURL;
-    if (!backendUrl) throw new Error("Backend publicURL not configured");
-    const annotationIdVal = generateAnnotationId(backendUrl);
-    const resourceUri2 = resourceIdToURI(resourceId, backendUrl);
+    const annotationIdVal = generateAnnotationId();
     const creator = userToAgent({
       id: metadata.userId,
       name: metadata.userName,
@@ -11839,7 +11886,7 @@ var HighlightAnnotationWorker = class extends JobWorker {
       created: (/* @__PURE__ */ new Date()).toISOString(),
       "target": {
         type: "SpecificResource",
-        source: resourceUri2,
+        source: resourceId,
         selector: [
           {
             type: "TextPositionSelector",
@@ -11865,9 +11912,8 @@ var HighlightAnnotationWorker = class extends JobWorker {
   }
 };
 var AssessmentAnnotationWorker = class extends JobWorker {
-  constructor(jobQueue2, config, inferenceClient, eventBus, contentFetcher, logger) {
+  constructor(jobQueue2, inferenceClient, eventBus, contentFetcher, logger) {
     super(jobQueue2, void 0, void 0, logger);
-    this.config = config;
     this.inferenceClient = inferenceClient;
     this.eventBus = eventBus;
     this.contentFetcher = contentFetcher;
@@ -12016,10 +12062,7 @@ var AssessmentAnnotationWorker = class extends JobWorker {
     };
   }
   async createAssessmentAnnotation(resourceId, metadata, assessment) {
-    const backendUrl = this.config.services.backend?.publicURL;
-    if (!backendUrl) throw new Error("Backend publicURL not configured");
-    const annotationIdVal = generateAnnotationId(backendUrl);
-    const resourceUri2 = resourceIdToURI(resourceId, backendUrl);
+    const annotationIdVal = generateAnnotationId();
     const creator = userToAgent({
       id: metadata.userId,
       name: metadata.userName,
@@ -12035,7 +12078,7 @@ var AssessmentAnnotationWorker = class extends JobWorker {
       created: (/* @__PURE__ */ new Date()).toISOString(),
       "target": {
         type: "SpecificResource",
-        source: resourceUri2,
+        source: resourceId,
         selector: [
           {
             type: "TextPositionSelector",
@@ -12064,9 +12107,8 @@ var AssessmentAnnotationWorker = class extends JobWorker {
   }
 };
 var CommentAnnotationWorker = class extends JobWorker {
-  constructor(jobQueue2, config, inferenceClient, eventBus, contentFetcher, logger) {
+  constructor(jobQueue2, inferenceClient, eventBus, contentFetcher, logger) {
     super(jobQueue2, void 0, void 0, logger);
-    this.config = config;
     this.inferenceClient = inferenceClient;
     this.eventBus = eventBus;
     this.contentFetcher = contentFetcher;
@@ -12215,12 +12257,7 @@ var CommentAnnotationWorker = class extends JobWorker {
     };
   }
   async createCommentAnnotation(resourceId, metadata, comment) {
-    const backendUrl = this.config.services.backend?.publicURL;
-    if (!backendUrl) {
-      throw new Error("Backend publicURL not configured");
-    }
-    const resourceUri2 = resourceIdToURI(resourceId, backendUrl);
-    const annotationIdVal = generateAnnotationId(backendUrl);
+    const annotationIdVal = generateAnnotationId();
     const creator = userToAgent({
       id: metadata.userId,
       name: metadata.userName,
@@ -12236,7 +12273,7 @@ var CommentAnnotationWorker = class extends JobWorker {
       created: (/* @__PURE__ */ new Date()).toISOString(),
       target: {
         type: "SpecificResource",
-        source: resourceUri2,
+        source: resourceId,
         selector: [
           {
             type: "TextPositionSelector",
@@ -12273,9 +12310,8 @@ var CommentAnnotationWorker = class extends JobWorker {
   }
 };
 var TagAnnotationWorker = class extends JobWorker {
-  constructor(jobQueue2, config, inferenceClient, eventBus, contentFetcher, logger) {
+  constructor(jobQueue2, inferenceClient, eventBus, contentFetcher, logger) {
     super(jobQueue2, void 0, void 0, logger);
-    this.config = config;
     this.inferenceClient = inferenceClient;
     this.eventBus = eventBus;
     this.contentFetcher = contentFetcher;
@@ -12456,12 +12492,7 @@ var TagAnnotationWorker = class extends JobWorker {
     };
   }
   async createTagAnnotation(resourceId, metadata, schemaId, tag) {
-    const backendUrl = this.config.services.backend?.publicURL;
-    if (!backendUrl) {
-      throw new Error("Backend publicURL not configured");
-    }
-    const resourceUri2 = resourceIdToURI(resourceId, backendUrl);
-    const annotationIdVal = generateAnnotationId(backendUrl);
+    const annotationIdVal = generateAnnotationId();
     const creator = userToAgent({
       id: metadata.userId,
       name: metadata.userName,
@@ -12477,7 +12508,7 @@ var TagAnnotationWorker = class extends JobWorker {
       created: (/* @__PURE__ */ new Date()).toISOString(),
       target: {
         type: "SpecificResource",
-        source: resourceUri2,
+        source: resourceId,
         selector: [
           {
             type: "TextPositionSelector",
@@ -12521,6 +12552,6 @@ var TagAnnotationWorker = class extends JobWorker {
   }
 };
 
-export { AnnotationDetection, AssessmentAnnotationWorker, CommentAnnotationWorker, GenerationWorker, HighlightAnnotationWorker, JobQueue, JobWorker, ReferenceAnnotationWorker, TagAnnotationWorker, getJobQueue, initializeJobQueue, isCancelledJob, isCompleteJob, isFailedJob, isPendingJob, isRunningJob };
+export { AnnotationDetection, AssessmentAnnotationWorker, CommentAnnotationWorker, GenerationWorker, HighlightAnnotationWorker, JobQueue, JobWorker, ReferenceAnnotationWorker, TagAnnotationWorker, generateResourceFromTopic, getJobQueue, initializeJobQueue, isCancelledJob, isCompleteJob, isFailedJob, isPendingJob, isRunningJob };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map