@semiont/backend 0.3.3 → 0.3.5

package/dist/index.js

@@ -2,15 +2,15 @@
 import winston from 'winston';
 import { z } from 'zod';
 import jwt from 'jsonwebtoken';
-import { createConfigLoader, email, userId, accessToken, googleCredential, annotationId, resourceId, EventBus, jobId, entityType, assembleAnnotation, userToAgent } from '@semiont/core';
+import { email, userId, accessToken, googleCredential, annotationId, resourceId, EventBus, jobId, entityType, assembleAnnotation, userToAgent } from '@semiont/core';
 import { cors } from 'hono/cors';
 import { serve } from '@hono/node-server';
 import { Hono } from 'hono';
 import { swaggerUI } from '@hono/swagger-ui';
+import { SemiontProject, loadEnvironmentConfig } from '@semiont/core/node';
 import { exportBackup, importBackup, readEntityTypesProjection, exportLinkedData, importLinkedData, AnnotationContext, startMakeMeaning, ResourceContext, ResourceOperations } from '@semiont/make-meaning';
-import * as fs from 'fs';
-import * as path from 'path';
 import { PrismaClient } from '@prisma/client';
+import { PrismaPg } from '@prisma/adapter-pg';
 import { HTTPException } from 'hono/http-exception';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
@@ -19,6 +19,8 @@ import { Writable, Readable } from 'stream';
 import { streamSSE } from 'hono/streaming';
 import crypto2, { randomUUID } from 'crypto';
 import { EventQuery } from '@semiont/event-sourcing';
+import * as fs from 'fs';
+import * as path from 'path';
 import { fileURLToPath } from 'url';
 
 var __create = Object.create;
@@ -1069,7 +1071,7 @@ var require_Observable = __commonJS({
       Observable2.prototype.forEach = function(next, promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve2, reject) {
+        return new promiseCtor(function(resolve, reject) {
           var subscriber = new Subscriber_1.SafeSubscriber({
             next: /* @__PURE__ */ __name(function(value) {
               try {
@@ -1080,7 +1082,7 @@ var require_Observable = __commonJS({
               }
             }, "next"),
             error: reject,
-            complete: resolve2
+            complete: resolve
           });
           _this.subscribe(subscriber);
         });
@@ -1102,14 +1104,14 @@ var require_Observable = __commonJS({
       Observable2.prototype.toPromise = function(promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve2, reject) {
+        return new promiseCtor(function(resolve, reject) {
           var value;
           _this.subscribe(function(x) {
             return value = x;
           }, function(err) {
             return reject(err);
           }, function() {
-            return resolve2(value);
+            return resolve(value);
           });
         });
       };
@@ -3393,12 +3395,12 @@ var require_innerFrom = __commonJS({
   "../../node_modules/rxjs/dist/cjs/internal/observable/innerFrom.js"(exports$1) {
     var __awaiter = exports$1 && exports$1.__awaiter || function(thisArg, _arguments, P, generator) {
       function adopt(value) {
-        return value instanceof P ? value : new P(function(resolve2) {
-          resolve2(value);
+        return value instanceof P ? value : new P(function(resolve) {
+          resolve(value);
         });
       }
       __name(adopt, "adopt");
-      return new (P || (P = Promise))(function(resolve2, reject) {
+      return new (P || (P = Promise))(function(resolve, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -3416,7 +3418,7 @@ var require_innerFrom = __commonJS({
         }
         __name(rejected, "rejected");
         function step(result) {
-          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         __name(step, "step");
         step((generator = generator.apply(thisArg, _arguments || [])).next());
@@ -3525,14 +3527,14 @@ var require_innerFrom = __commonJS({
       }, i);
       function verb(n) {
         i[n] = o[n] && function(v) {
-          return new Promise(function(resolve2, reject) {
-            v = o[n](v), settle(resolve2, reject, v.done, v.value);
+          return new Promise(function(resolve, reject) {
+            v = o[n](v), settle(resolve, reject, v.done, v.value);
           });
         };
       }
-      function settle(resolve2, reject, d, v) {
+      function settle(resolve, reject, d, v) {
         Promise.resolve(v).then(function(v2) {
-          resolve2({
+          resolve({
             value: v2,
             done: d
           });
@@ -4245,7 +4247,7 @@ var require_lastValueFrom = __commonJS({
     var EmptyError_1 = require_EmptyError();
     function lastValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve2, reject) {
+      return new Promise(function(resolve, reject) {
         var _hasValue = false;
         var _value;
         source.subscribe({
@@ -4256,9 +4258,9 @@ var require_lastValueFrom = __commonJS({
           error: reject,
           complete: /* @__PURE__ */ __name(function() {
             if (_hasValue) {
-              resolve2(_value);
+              resolve(_value);
             } else if (hasConfig) {
-              resolve2(config2.defaultValue);
+              resolve(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -4282,16 +4284,16 @@ var require_firstValueFrom = __commonJS({
     var Subscriber_1 = require_Subscriber();
     function firstValueFrom4(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve2, reject) {
+      return new Promise(function(resolve, reject) {
         var subscriber = new Subscriber_1.SafeSubscriber({
           next: /* @__PURE__ */ __name(function(value) {
-            resolve2(value);
+            resolve(value);
             subscriber.unsubscribe();
           }, "next"),
           error: reject,
           complete: /* @__PURE__ */ __name(function() {
             if (hasConfig) {
-              resolve2(config2.defaultValue);
+              resolve(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -11896,20 +11898,17 @@ var require_operators = __commonJS({
     });
   }
 });
-var nodeFileReader = {
-  readIfExists: /* @__PURE__ */ __name((filePath) => {
-    const absolutePath = path.resolve(filePath);
-    return fs.existsSync(absolutePath) ? fs.readFileSync(absolutePath, "utf-8") : null;
-  }, "readIfExists"),
-  readRequired: /* @__PURE__ */ __name((filePath) => {
-    const absolutePath = path.resolve(filePath);
-    if (!fs.existsSync(absolutePath)) {
-      throw new Error(`Configuration file not found: ${absolutePath}`);
-    }
-    return fs.readFileSync(absolutePath, "utf-8");
-  }, "readRequired")
-};
-var loadEnvironmentConfig = createConfigLoader(nodeFileReader);
+function makeMeaningConfigFrom(config2) {
+  const meta = config2._metadata;
+  return {
+    services: {
+      graph: config2.services?.graph
+    },
+    actors: meta?.actors,
+    workers: meta?.workers
+  };
+}
+__name(makeMeaningConfigFrom, "makeMeaningConfigFrom");
 
 // src/index.ts
 init_logger();
@@ -11941,7 +11940,11 @@ var DatabaseConnection = class {
         emit: "event",
         level
       }));
+      const adapter = new PrismaPg({
+        connectionString: process.env.DATABASE_URL
+      });
       this.instance = new PrismaClient({
+        adapter,
         log: logConfig
       });
       this.instance.$on("query", (e) => {
@@ -12080,9 +12083,9 @@ healthRouter.get("/api/health", async (c) => {
   }
   let startupFailed = false;
   try {
-    const fs3 = await import('fs');
-    if (fs3.existsSync("/tmp/startup_status")) {
-      const startupStatus = fs3.readFileSync("/tmp/startup_status", "utf-8").trim();
+    const fs2 = await import('fs');
+    if (fs2.existsSync("/tmp/startup_status")) {
+      const startupStatus = fs2.readFileSync("/tmp/startup_status", "utf-8").trim();
       if (startupStatus.startsWith("FAILED")) {
         startupFailed = true;
         getRouteLogger().error("Startup script failure detected", {
@@ -15392,18 +15395,18 @@ __name(validateSchema, "validateSchema");
 function formatValidationErrors(errors) {
   if (errors.length === 0) return "Validation failed";
   const messages = errors.map((err) => {
-    const path3 = err.instancePath || "root";
+    const path2 = err.instancePath || "root";
     const message = err.message || "validation error";
     if (err.keyword === "required" && "missingProperty" in err.params) {
       return `Missing required property: ${err.params.missingProperty}`;
     }
     if (err.keyword === "type" && "type" in err.params) {
-      return `${path3}: ${message} (expected ${err.params.type})`;
+      return `${path2}: ${message} (expected ${err.params.type})`;
     }
     if (err.keyword === "enum" && "allowedValues" in err.params) {
-      return `${path3}: must be one of [${err.params.allowedValues.join(", ")}]`;
+      return `${path2}: must be one of [${err.params.allowedValues.join(", ")}]`;
     }
-    return `${path3}: ${message}`;
+    return `${path2}: ${message}`;
   });
   return messages.join("; ");
 }
@@ -16316,12 +16319,7 @@ exchangeRouter.post("/api/moderate/exchange/export", async (c) => {
   const config2 = c.get("config");
   const sourceUrl = config2.services?.backend?.publicURL ?? "http://localhost:4000";
   const includeArchived = c.req.query("includeArchived") === "true";
-  const entityTypes = await readEntityTypesProjection({
-    services: {
-      filesystem: config2.services?.filesystem
-    },
-    _metadata: config2._metadata
-  });
+  const entityTypes = await readEntityTypesProjection(new SemiontProject(config2._metadata.projectRoot));
   const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
   const filename = `semiont-export-${timestamp}.tar.gz`;
   let controller;
@@ -17009,8 +17007,8 @@ function registerAnnotateReferencesStream(router, jobQueue) {
       const subscriptions = [];
       let keepAliveInterval = null;
       let closeStreamCallback = null;
-      const streamPromise = new Promise((resolve2) => {
-        closeStreamCallback = resolve2;
+      const streamPromise = new Promise((resolve) => {
+        closeStreamCallback = resolve;
       });
       const cleanup = /* @__PURE__ */ __name(() => {
         if (isStreamClosed) return;
@@ -17211,8 +17209,8 @@ function registerAnnotateHighlightsStream(router, jobQueue) {
       const subscriptions = [];
       let keepAliveInterval = null;
       let closeStreamCallback = null;
-      const streamPromise = new Promise((resolve2) => {
-        closeStreamCallback = resolve2;
+      const streamPromise = new Promise((resolve) => {
+        closeStreamCallback = resolve;
       });
       const cleanup = /* @__PURE__ */ __name(() => {
         if (isStreamClosed) return;
@@ -17422,8 +17420,8 @@ function registerAnnotateAssessmentsStream(router, jobQueue) {
       const subscriptions = [];
       let keepAliveInterval = null;
       let closeStreamCallback = null;
-      const streamPromise = new Promise((resolve2) => {
-        closeStreamCallback = resolve2;
+      const streamPromise = new Promise((resolve) => {
+        closeStreamCallback = resolve;
       });
       const cleanup = /* @__PURE__ */ __name(() => {
         if (isStreamClosed) return;
@@ -17643,8 +17641,8 @@ function registerAnnotateCommentsStream(router, jobQueue) {
       const subscriptions = [];
       let keepAliveInterval = null;
       let closeStreamCallback = null;
-      const streamPromise = new Promise((resolve2) => {
-        closeStreamCallback = resolve2;
+      const streamPromise = new Promise((resolve) => {
+        closeStreamCallback = resolve;
       });
       const cleanup = /* @__PURE__ */ __name(() => {
         if (isStreamClosed) return;
@@ -18034,8 +18032,8 @@ function registerAnnotateTagsStream(router, jobQueue) {
       const subscriptions = [];
       let keepAliveInterval = null;
       let closeStreamCallback = null;
-      const streamPromise = new Promise((resolve2) => {
-        closeStreamCallback = resolve2;
+      const streamPromise = new Promise((resolve) => {
+        closeStreamCallback = resolve;
       });
       const cleanup = /* @__PURE__ */ __name(() => {
         if (isStreamClosed) return;
@@ -18377,8 +18375,8 @@ function registerBindSearchStream(router) {
       let isStreamClosed = false;
       const subscriptions = [];
       let closeStreamCallback = null;
-      const streamPromise = new Promise((resolve2) => {
-        closeStreamCallback = resolve2;
+      const streamPromise = new Promise((resolve) => {
+        closeStreamCallback = resolve;
       });
       const cleanup = /* @__PURE__ */ __name(() => {
         if (isStreamClosed) return;
@@ -18674,8 +18672,8 @@ function registerGetEventStream(router) {
       let subscription = null;
       let keepAliveInterval = null;
       let closeStreamCallback = null;
-      const streamPromise = new Promise((resolve2) => {
-        closeStreamCallback = resolve2;
+      const streamPromise = new Promise((resolve) => {
+        closeStreamCallback = resolve;
       });
       const cleanup = /* @__PURE__ */ __name(() => {
         if (isStreamClosed) return;
@@ -18954,8 +18952,8 @@ function registerYieldResourceStream(router, jobQueue) {
       const subscriptions = [];
       let keepAliveInterval = null;
       let closeStreamCallback = null;
-      const streamPromise = new Promise((resolve2) => {
-        closeStreamCallback = resolve2;
+      const streamPromise = new Promise((resolve) => {
+        closeStreamCallback = resolve;
       });
       const cleanup = /* @__PURE__ */ __name(() => {
         if (isStreamClosed) return;
@@ -19245,7 +19243,7 @@ operationsRouter.get("/api/annotations/:id/context", async (c) => {
 operationsRouter.get("/api/annotations/:id/summary", async (c) => {
   const { id } = c.req.param();
   const query = c.req.query();
-  const { kb, inferenceClient } = c.get("makeMeaning");
+  const { kb, gathererInferenceClient: inferenceClient } = c.get("makeMeaning");
   const resourceId20 = query.resourceId;
   if (!resourceId20) {
     throw new HTTPException(400, {
@@ -19346,8 +19344,8 @@ globalEventsRouter.get("/api/events/stream", async (c) => {
     let isStreamClosed = false;
     let keepAliveInterval = null;
     let closeStreamCallback = null;
-    const streamPromise = new Promise((resolve2) => {
-      closeStreamCallback = resolve2;
+    const streamPromise = new Promise((resolve) => {
+      closeStreamCallback = resolve;
     });
     const cleanup = /* @__PURE__ */ __name(() => {
       if (isStreamClosed) return;
@@ -19506,13 +19504,13 @@ var requestLoggerMiddleware = /* @__PURE__ */ __name(async (c, next) => {
   const logger2 = c.get("logger");
   const startTime = Date.now();
   const method = c.req.method;
-  const path3 = c.req.path;
+  const path2 = c.req.path;
   const query = c.req.query();
   const userAgent = c.req.header("User-Agent") || "unknown";
   logger2.http("Incoming request", {
     type: "request_incoming",
     method,
-    path: path3,
+    path: path2,
     query: Object.keys(query).length > 0 ? query : void 0,
     userAgent
   });
@@ -19522,7 +19520,7 @@ var requestLoggerMiddleware = /* @__PURE__ */ __name(async (c, next) => {
   logger2.http("Outgoing response", {
     type: "request_outgoing",
     method,
-    path: path3,
+    path: path2,
     status,
     duration,
     durationMs: duration
@@ -19592,7 +19590,7 @@ if (databaseUrlConstructed) {
   });
 }
 var eventBus = new EventBus();
-var makeMeaning = await startMakeMeaning(config, eventBus, logger);
+var makeMeaning = await startMakeMeaning(new SemiontProject(projectRoot), makeMeaningConfigFrom(config), eventBus, logger);
 var __filename$1 = fileURLToPath(import.meta.url);
 var __dirname$1 = path.dirname(__filename$1);
 var app = new Hono();