@lde/search-indexer 0.19.4 → 0.20.1

package/dist/composition.d.ts

@@ -18,11 +18,12 @@ export declare function datasetSelectorFrom(config: IndexerConfig): DatasetSelec
  */
 export declare function writerFactoryFrom(client: Client, config: IndexerConfig): (searchType: RootType, schema: SearchSchema) => Writer<SearchDocument>;
 /**
- * The distribution resolver the configuration describes: with `QLEVER_IMAGE`
- * set, an {@link ImportResolver} that imports data dumps into a
- * pipeline-controlled QLever sibling container over the mounted Docker
- * socket; without it, `undefined`, leaving the pipeline its endpoint-only
- * default (a bare {@link SparqlDistributionResolver}).
+ * The distribution resolver the configuration describes: with a QLever
+ * configured, an {@link ImportResolver} that imports data dumps into a
+ * pipeline-controlled QLever – a sibling container over the mounted Docker
+ * socket, or a sidecar in the indexer’s pod; without one, `undefined`,
+ * leaving the pipeline its endpoint-only default (a bare
+ * {@link SparqlDistributionResolver}).
  */
 export declare function distributionResolverFrom(config: IndexerConfig): DistributionResolver | undefined;
 //# sourceMappingURL=composition.d.ts.map

package/dist/composition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"composition.d.ts","sourceRoot":"","sources":["../src/composition.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,QAAQ,EACR,cAAc,EACd,YAAY,EAEb,MAAM,aAAa,CAAC;AAOrB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,yEAAyE;AACzE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,eAAe,CAK1E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,aAAa,GACpB,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,KAAK,MAAM,CAAC,cAAc,CAAC,CAmBxE;AAED;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,aAAa,GACpB,oBAAoB,GAAG,SAAS,CA0BlC"}
+{"version":3,"file":"composition.d.ts","sourceRoot":"","sources":["../src/composition.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACZ,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EACV,QAAQ,EACR,cAAc,EACd,YAAY,EAEb,MAAM,aAAa,CAAC;AAOrB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,yEAAyE;AACzE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,eAAe,CAK1E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,aAAa,GACpB,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,KAAK,MAAM,CAAC,cAAc,CAAC,CAmBxE;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,aAAa,GACpB,oBAAoB,GAAG,SAAS,CA6BlC"}

package/dist/composition.js

@@ -44,33 +44,36 @@ export function writerFactoryFrom(client, config) {
     };
 }
 /**
- * The distribution resolver the configuration describes: with `QLEVER_IMAGE`
- * set, an {@link ImportResolver} that imports data dumps into a
- * pipeline-controlled QLever sibling container over the mounted Docker
- * socket; without it, `undefined`, leaving the pipeline its endpoint-only
- * default (a bare {@link SparqlDistributionResolver}).
+ * The distribution resolver the configuration describes: with a QLever
+ * configured, an {@link ImportResolver} that imports data dumps into a
+ * pipeline-controlled QLever – a sibling container over the mounted Docker
+ * socket, or a sidecar in the indexer’s pod; without one, `undefined`,
+ * leaving the pipeline its endpoint-only default (a bare
+ * {@link SparqlDistributionResolver}).
  */
 export function distributionResolverFrom(config) {
     if (!config.qlever) {
         return undefined;
     }
-    const { importer, server } = config.qlever.network
-        ? createQlever({
-            mode: 'docker',
-            image: config.qlever.image,
-            dataDir: config.qlever.dataDir,
-            network: config.qlever.network,
-            // The network-scoped name doubles as the endpoint hostname. It keeps
-            // stacks on different networks from removing each other’s QLever;
-            // indexers sharing one network would still collide, so run at most
-            // one indexer per network.
-            containerName: `qlever-${config.qlever.network}`,
-        })
-        : createQlever({
-            mode: 'docker',
-            image: config.qlever.image,
-            dataDir: config.qlever.dataDir,
-        });
+    const { importer, server } = config.qlever.mode === 'remote'
+        ? createQlever({ mode: 'remote', dataDir: config.qlever.dataDir })
+        : config.qlever.network
+            ? createQlever({
+                mode: 'docker',
+                image: config.qlever.image,
+                dataDir: config.qlever.dataDir,
+                network: config.qlever.network,
+                // The network-scoped name doubles as the endpoint hostname. It keeps
+                // stacks on different networks from removing each other’s QLever;
+                // indexers sharing one network would still collide, so run at most
+                // one indexer per network.
+                containerName: `qlever-${config.qlever.network}`,
+            })
+            : createQlever({
+                mode: 'docker',
+                image: config.qlever.image,
+                dataDir: config.qlever.dataDir,
+            });
     return new ImportResolver(new SparqlDistributionResolver(), {
         importer,
         server,

package/dist/config.d.ts

@@ -42,9 +42,10 @@ export interface IndexerConfig {
     /** Per-dataset processing memory: skip unchanged datasets
      *  (`PROVENANCE_FILE` + `PIPELINE_VERSION`). */
     readonly provenance?: ProvenanceConfig;
-    /** The QLever import path (`QLEVER_IMAGE` + `IMPORT_STRATEGY` +
-     *  `DATA_DIR`): import data dumps into a pipeline-controlled QLever
-     *  container instead of relying on live SPARQL endpoints alone. */
+    /** The QLever import path (`QLEVER_MODE` + `QLEVER_IMAGE` +
+     *  `IMPORT_STRATEGY` + `DATA_DIR`): import data dumps into a
+     *  pipeline-controlled QLever instead of relying on live SPARQL endpoints
+     *  alone. */
     readonly qlever?: QleverConfig;
 }
 /** Connection details of the Typesense node the indexer writes to. */
@@ -63,20 +64,30 @@ export interface ProvenanceConfig {
     /** Consumer-declared version of the indexer’s output-affecting logic. */
     readonly pipelineVersion: string;
 }
-/** The pipeline-controlled QLever sibling container (Docker socket mode). */
-export interface QleverConfig {
-    /** QLever Docker image to run, e.g. `adfreiburg/qlever:latest`. */
-    readonly image: string;
+/**
+ * The pipeline-controlled QLever the import path imports into, discriminated
+ * by `QLEVER_MODE`.
+ */
+export type QleverConfig = {
     /** When to import a data dump instead of querying a live endpoint. */
     readonly strategy: 'sparql' | 'sparqlWithImportFallback' | 'import';
     /** Directory for downloaded dumps and QLever index caches. */
     readonly dataDir: string;
-    /** Docker network the spawned QLever joins (`QLEVER_NETWORK`), reached by
-     *  container name. Required when the indexer itself runs containerized on
-     *  a bridge network; without it QLever is published on the host and
-     *  addressed as `localhost`. */
+} & ({
+    /** A sibling container the indexer starts over the Docker socket. */
+    readonly mode: 'docker';
+    /** QLever Docker image to run, e.g. `adfreiburg/qlever:latest`. */
+    readonly image: string;
+    /** Docker network the spawned QLever joins (`QLEVER_NETWORK`), reached
+     *  by container name. Required when the indexer itself runs
+     *  containerized on a bridge network; without it QLever is published on
+     *  the host and addressed as `localhost`. */
     readonly network?: string;
-}
+} | {
+    /** A sidecar in the indexer’s pod, controlled through the task agent
+     *  of `@lde/task-runner-http`. The pod sets its image. */
+    readonly mode: 'remote';
+});
 /**
  * Read the {@link IndexerConfig} from environment variables. Reports **all**
  * problems in one error – a misconfigured deployment learns everything

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,uEAAuE;IACvE,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC;iCAC6B;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC;IAC/B;;;;;;;OAOG;IACH,QAAQ,CAAC,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9C;;eAEW;IACX,QAAQ,CAAC,eAAe,EAAE,cAAc,CAAC;IACzC,yDAAyD;IACzD,QAAQ,CAAC,SAAS,EAAE,mBAAmB,CAAC;IACxC;wEACoE;IACpE,QAAQ,CAAC,WAAW,EAAE,UAAU,GAAG,YAAY,CAAC;IAChD;wEACoE;IACpE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC;;;;;OAKG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC;oDACgD;IAChD,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IACvC;;uEAEmE;IACnE,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC;CAChC;AAED,sEAAsE;AACtE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IACpC,uEAAuE;IACvE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;sEACsE;AACtE,MAAM,WAAW,gBAAgB;IAC/B,sEAAsE;IACtE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,yEAAyE;IACzE,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED,6EAA6E;AAC7E,MAAM,WAAW,YAAY;IAC3B,mEAAmE;IACnE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,sEAAsE;IACtE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,0BAA0B,GAAG,QAAQ,CAAC;IACpE,8DAA8D;IAC9D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB;;;oCAGgC;IAChC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAQD;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,GACxD,aAAa,CAsFf"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,uEAAuE;IACvE,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC;iCAC6B;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC;IAC/B;;;;;;;OAOG;IACH,QAAQ,CAAC,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC9C;;eAEW;IACX,QAAQ,CAAC,eAAe,EAAE,cAAc,CAAC;IACzC,yDAAyD;IACzD,QAAQ,CAAC,SAAS,EAAE,mBAAmB,CAAC;IACxC;wEACoE;IACpE,QAAQ,CAAC,WAAW,EAAE,UAAU,GAAG,YAAY,CAAC;IAChD;wEACoE;IACpE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC;;;;;OAKG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC;oDACgD;IAChD,QAAQ,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC;IACvC;;;iBAGa;IACb,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC;CAChC;AAED,sEAAsE;AACtE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IACpC,uEAAuE;IACvE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;sEACsE;AACtE,MAAM,WAAW,gBAAgB;IAC/B,sEAAsE;IACtE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,yEAAyE;IACzE,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAClC;AAED;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,sEAAsE;IACtE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,0BAA0B,GAAG,QAAQ,CAAC;IACpE,8DAA8D;IAC9D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,GAAG,CACA;IACE,qEAAqE;IACrE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,mEAAmE;IACnE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB;;;iDAG6C;IAC7C,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B,GACD;IACE;8DAC0D;IAC1D,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;CACzB,CACJ,CAAC;AAUF;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,GACxD,aAAa,CAsFf"}

package/dist/config.js

@@ -1,3 +1,4 @@
+const QLEVER_MODES = ['docker', 'remote'];
 const IMPORT_STRATEGIES = [
     'sparql',
     'sparqlWithImportFallback',
@@ -145,23 +146,42 @@ function qleverFromEnvironment(environment, problems) {
     const image = environment['QLEVER_IMAGE'];
     const strategy = environment['IMPORT_STRATEGY'];
     const network = environment['QLEVER_NETWORK'];
-    if (!image) {
+    // QLEVER_IMAGE alone is how the Docker mode has always been enabled. An
+    // empty QLEVER_MODE, as a template renders an unset one, counts as unset.
+    const mode = environment['QLEVER_MODE'] || (image ? 'docker' : undefined);
+    if (mode === undefined) {
         if (strategy) {
-            problems.push('IMPORT_STRATEGY requires QLEVER_IMAGE: without an import engine there is nothing to import into');
+            problems.push('IMPORT_STRATEGY requires QLEVER_IMAGE or QLEVER_MODE=remote: without an import engine there is nothing to import into');
         }
         if (network) {
             problems.push('QLEVER_NETWORK requires QLEVER_IMAGE: without an import engine there is no QLever container to attach');
         }
         return undefined;
     }
+    if (!QLEVER_MODES.includes(mode)) {
+        problems.push(`QLEVER_MODE must be one of ${QLEVER_MODES.map((name) => `“${name}”`).join(', ')}, got “${mode}”`);
+        return undefined;
+    }
     if (strategy !== undefined &&
         !IMPORT_STRATEGIES.includes(strategy)) {
         problems.push(`IMPORT_STRATEGY must be one of ${IMPORT_STRATEGIES.map((name) => `“${name}”`).join(', ')}, got “${strategy}”`);
     }
-    return {
-        image,
+    const common = {
         strategy: (strategy ?? 'sparql'),
         dataDir: environment['DATA_DIR'] ?? '/data',
-        network,
     };
+    if (mode === 'remote') {
+        if (image) {
+            problems.push('QLEVER_IMAGE cannot be combined with QLEVER_MODE=remote: the pod sets the QLever sidecar’s image');
+        }
+        if (network) {
+            problems.push('QLEVER_NETWORK cannot be combined with QLEVER_MODE=remote: the sidecar shares the indexer’s network namespace');
+        }
+        return { ...common, mode: 'remote' };
+    }
+    if (!image) {
+        problems.push('QLEVER_MODE=docker requires QLEVER_IMAGE: the image to start QLever containers from');
+        return undefined;
+    }
+    return { ...common, mode: 'docker', image, network };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lde/search-indexer",
-  "version": "0.19.4",
+  "version": "0.20.1",
   "description": "The @lde/search-pipeline indexer as a bootable process and prebuilt Docker image: loads a mounted schema-declaration module, dataset selection, Typesense connection and rebuild mode from the environment, then runs the object-grain searchIndexerPipeline once to completion. The composition layer that binds the engine-agnostic @lde/search-pipeline stages to @lde/search-typesense – the write-path counterpart of @lde/search-api-server.",
   "repository": {
     "url": "git+https://github.com/ldelements/lde.git",
@@ -28,13 +28,13 @@
     "!**/*.tsbuildinfo"
   ],
   "dependencies": {
-    "@lde/dataset-registry-client": "^0.9.5",
-    "@lde/pipeline": "^0.36.9",
-    "@lde/pipeline-console-reporter": "^0.27.9",
-    "@lde/search": "^0.27.2",
-    "@lde/search-pipeline": "^0.29.4",
-    "@lde/search-typesense": "^0.32.4",
-    "@lde/sparql-qlever": "^0.16.3",
+    "@lde/dataset-registry-client": "^0.10.0",
+    "@lde/pipeline": "^0.37.0",
+    "@lde/pipeline-console-reporter": "^0.28.0",
+    "@lde/search": "^0.28.1",
+    "@lde/search-pipeline": "^0.30.1",
+    "@lde/search-typesense": "^0.33.1",
+    "@lde/sparql-qlever": "^0.17.0",
     "commander": "^15.0.0",
     "tslib": "^2.3.0",
     "typesense": "^3.1.1"