@malloy-publisher/server 0.0.245 → 0.0.246

package/dist/server.mjs

@@ -156292,15 +156292,6 @@ var BUNDLED_DEFAULT_CONFIG_PATH, PER_MODE_COLOR_KEYS, DEFAULT_HIGH_WATER_FRACTIO
     return value;
   }
   throw new Error(`PERSIST_STORAGE_MODE must be one of ${PERSIST_STORAGE_MODES.join(" | ")} (got ${JSON.stringify(raw)})`);
-}, PREAGGREGATE_MODES, getPreaggregateMode = () => {
-  const raw = process.env.PREAGGREGATE_MODE;
-  if (raw === undefined || raw.trim() === "")
-    return "off";
-  const value = raw.trim().toLowerCase();
-  if (PREAGGREGATE_MODES.includes(value)) {
-    return value;
-  }
-  throw new Error(`PREAGGREGATE_MODE must be one of ${PREAGGREGATE_MODES.join(" | ")} (got ${JSON.stringify(raw)})`);
 }, getPersistCollisionEnforce = () => parseBoolEnv("PERSIST_COLLISION_ENFORCE") ?? false, getQueryMetadataMode = () => {
   const raw = process.env.PUBLISHER_QUERY_METADATA;
   if (raw === undefined || raw.trim() === "")
@@ -156493,11 +156484,6 @@ var init_config = __esm(() => {
     "write-only",
     "on"
   ];
-  PREAGGREGATE_MODES = [
-    "off",
-    "build-only",
-    "on"
-  ];
 });
 
 // src/errors.ts
@@ -249681,6 +249667,7 @@ var init_model = __esm(() => {
     discoveryCurationEnabled = false;
     queryBoundary = { mode: "all", exploresDeclared: false, isQueryEntryPoint: true };
     freshnessResolver;
+    preaggregateEntityIdResolver;
     entryPointGatesBySource = new Map;
     meter = publisherMeter();
     queryExecutionHistogram = this.meter.createHistogram("malloy_model_query_duration", {
@@ -250135,6 +250122,18 @@ var init_model = __esm(() => {
       const entries = this.freshnessResolver?.();
       return entries ? { entries, strict: false } : undefined;
     }
+    setPreaggregateEntityIdResolver(resolver) {
+      this.preaggregateEntityIdResolver = resolver;
+    }
+    withoutPreaggregateEntries(manifest) {
+      if (!manifest)
+        return;
+      const preaggregateIds = this.preaggregateEntityIdResolver?.();
+      if (!preaggregateIds || preaggregateIds.size === 0)
+        return manifest;
+      const entries = Object.fromEntries(Object.entries(manifest.entries).filter(([sourceEntityId]) => !preaggregateIds.has(sourceEntityId)));
+      return Object.keys(entries).length > 0 ? { ...manifest, entries } : undefined;
+    }
     getSources() {
       return this.curateForDiscovery(this.sources);
     }
@@ -250475,8 +250474,12 @@ var init_model = __esm(() => {
       let serveVirtualMap;
       let serveShapeBindings = [];
       let servedFrom;
+      let preaggRouted = false;
       if (!this.modelMaterializer || !this.modelDef || !this.modelInfo)
         throw new BadRequestError("Model has no queryable entities.");
+      const buildManifest = this.resolveFreshBuildManifest();
+      const liveBuildManifest = this.withoutPreaggregateEntries(buildManifest);
+      const querySurfaceGivens = this.filterGivensToModelSurface(givens);
       const boundary = this.assertQueryBoundaryEarly(sourceName, queryName, query);
       const surfaceName = extractRunTargetSourceName(query);
       const earlySource = sourceName || (queryName ? this.queries?.find((q) => q.name === queryName)?.sourceName : undefined) || (surfaceName && !this.sources?.some((s) => s.name === surfaceName) ? this.queries?.find((q) => q.name === surfaceName)?.sourceName : undefined) || surfaceName;
@@ -250549,9 +250552,15 @@ run: ${sourceName ? `${quoteMalloyIdentifier(sourceName)} -> ` : ""}${quoteMallo
             });
           }
         }
-        if (getPreaggregateMode() === "on" && this.preaggregateServeMaterializer && !serveVirtualMap) {
+        if (this.preaggregateServeMaterializer && !serveVirtualMap) {
           try {
-            runnable = this.preaggregateServeMaterializer.loadRestrictedQuery(queryString);
+            const candidate = this.preaggregateServeMaterializer.loadRestrictedQuery(queryString);
+            await candidate.getSQL({
+              givens: querySurfaceGivens,
+              buildManifest
+            });
+            runnable = candidate;
+            preaggRouted = true;
           } catch (preaggErr) {
             logger.debug("query does not compile against the pre-aggregation model; serving live", {
               modelPath: this.modelPath,
@@ -250588,14 +250597,12 @@ run: ${sourceName ? `${quoteMalloyIdentifier(sourceName)} -> ` : ""}${quoteMallo
       await this.assertAuthorizedForAllSources(runnable, givens ?? {}, bypassAuthorize);
       const maxRows = getMaxQueryRows();
       const maxBytes = getMaxResponseBytes();
-      const buildManifest = this.resolveFreshBuildManifest();
-      const effectiveBuildManifest = serveVirtualMap ? undefined : buildManifest;
+      const effectiveBuildManifest = serveVirtualMap ? undefined : preaggRouted ? buildManifest : liveBuildManifest;
       let rowLimit = 0;
       let rowLimitSource = "server_default";
       let executionTime = 0;
       let queryResults;
       let appliedQueryMetadata;
-      const querySurfaceGivens = this.filterGivensToModelSurface(givens);
       const effectiveGivens = serveVirtualMap ? undefined : querySurfaceGivens;
       try {
         const preparedResult = await runnable.getPreparedResult({
@@ -250665,7 +250672,7 @@ run: ${sourceName ? `${quoteMalloyIdentifier(sourceName)} -> ` : ""}${quoteMallo
         try {
           const livePrepared = await liveRunnable.getPreparedResult({
             givens: querySurfaceGivens,
-            buildManifest
+            buildManifest: liveBuildManifest
           });
           const livePreparedLimit = livePrepared.resultExplore.limit;
           rowLimitSource = queryRowLimitSource(livePreparedLimit);
@@ -250678,7 +250685,7 @@ run: ${sourceName ? `${quoteMalloyIdentifier(sourceName)} -> ` : ""}${quoteMallo
             rowLimit,
             givens: querySurfaceGivens,
             abortSignal,
-            buildManifest,
+            buildManifest: liveBuildManifest,
             queryMetadata: appliedQueryMetadata
           });
         } catch (retryError) {
@@ -250843,7 +250850,7 @@ run: ${sourceName ? `${quoteMalloyIdentifier(sourceName)} -> ` : ""}${quoteMallo
           }
           const cellMaxRows = getMaxQueryRows();
           const cellMaxBytes = getMaxResponseBytes();
-          const buildManifest = this.resolveFreshBuildManifest();
+          const buildManifest = this.withoutPreaggregateEntries(this.resolveFreshBuildManifest());
           const cellSurfaceGivens = this.filterGivensToModelSurface(givens);
           const preparedCell = await runnableToExecute.getPreparedResult({
             givens: cellSurfaceGivens,
@@ -280746,7 +280753,6 @@ init_config();
 init_materialization_serve_transform();
 
 // src/service/build_plan.ts
-init_config();
 init_errors();
 init_constants();
 init_logger();
@@ -281274,27 +281280,25 @@ async function compilePackageBuildPlan(pkg, signal) {
       throw new Error("Build cancelled");
     const { runtime, modelURL, importBaseURL } = await Model.getModelRuntime(pkg.getPackagePath(), modelPath, pkg.getMalloyConfig());
     const malloyModel = await runtime.loadModel(modelURL, { importBaseURL }).getModel();
-    if (getPreaggregateMode() !== "off") {
-      const synthesized = await tryCompileSynthesizedPreaggregation({
-        packagePath: pkg.getPackagePath(),
-        modelPath,
-        malloyConfig: pkg.getMalloyConfig(),
-        contents: malloyModel._modelDef?.contents ?? {}
-      });
-      if (synthesized) {
-        const rollupPlan = synthesized.model.getBuildPlan();
-        const rollupNames = new Set(synthesized.plans.map((p) => p.rollupSourceName));
-        allGraphs.push(...rollupPlan.graphs);
-        const planByName = new Map(synthesized.plans.map((p) => [p.rollupSourceName, p]));
-        for (const [sourceID, source] of Object.entries(rollupPlan.sources)) {
-          if (!rollupNames.has(source.name))
-            continue;
-          allSources[sourceID] = source;
-          sourceModelPaths[sourceID] = modelPath;
-          const rollup = planByName.get(source.name);
-          if (rollup)
-            preaggregatePlans[sourceID] = rollup;
-        }
+    const synthesized = await tryCompileSynthesizedPreaggregation({
+      packagePath: pkg.getPackagePath(),
+      modelPath,
+      malloyConfig: pkg.getMalloyConfig(),
+      contents: malloyModel._modelDef?.contents ?? {}
+    });
+    if (synthesized) {
+      const rollupPlan = synthesized.model.getBuildPlan();
+      const rollupNames = new Set(synthesized.plans.map((p) => p.rollupSourceName));
+      allGraphs.push(...rollupPlan.graphs);
+      const planByName = new Map(synthesized.plans.map((p) => [p.rollupSourceName, p]));
+      for (const [sourceID, source] of Object.entries(rollupPlan.sources)) {
+        if (!rollupNames.has(source.name))
+          continue;
+        allSources[sourceID] = source;
+        sourceModelPaths[sourceID] = modelPath;
+        const rollup = planByName.get(source.name);
+        if (rollup)
+          preaggregatePlans[sourceID] = rollup;
       }
     }
     const modelTag = malloyModel.modelAnnotations.parseAsTag("!").tag;
@@ -282186,6 +282190,7 @@ class Package {
   manifestEntryCount = 0;
   boundManifestUri = null;
   buildPlan = null;
+  preaggregateEntityIdCache;
   droppedPersistSources = [];
   sourceEligibility = undefined;
   incrementalPolicySources = [];
@@ -282537,8 +282542,22 @@ class Package {
   wireFreshnessResolvers() {
     for (const model of this.models.values()) {
       model.setFreshnessResolver(() => this.getFreshBuildManifest());
+      model.setPreaggregateEntityIdResolver(() => this.getPreaggregateEntityIds());
     }
   }
+  getPreaggregateEntityIds() {
+    if (this.preaggregateEntityIdCache?.plan === this.buildPlan) {
+      return this.preaggregateEntityIdCache.ids;
+    }
+    const ids = new Set;
+    for (const source of Object.values(this.buildPlan?.sources ?? {})) {
+      if (source.origin === "preaggregate" && source.sourceEntityId) {
+        ids.add(source.sourceEntityId);
+      }
+    }
+    this.preaggregateEntityIdCache = { plan: this.buildPlan, ids };
+    return ids;
+  }
   setBoundManifestUri(uri) {
     this.boundManifestUri = uri;
   }
@@ -282578,8 +282597,6 @@ class Package {
     this.pushStorageServeBindingsToModels();
   }
   async pushPreaggregateServeModels() {
-    if (getPreaggregateMode() !== "on")
-      return;
     for (const model of this.models.values()) {
       await model.buildPreaggregateServeModel(this.packagePath, this.malloyConfig, this.buildManifestEntries);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/server",
    "description": "Malloy Publisher Server",
-   "version": "0.0.245",
+   "version": "0.0.246",
    "main": "dist/server.mjs",
    "bin": {
       "malloy-publisher": "dist/server.mjs"