@simulatte/doppler 0.1.4 → 0.1.6

package/src/version.js

@@ -0,0 +1,2 @@
+export const DOPPLER_VERSION = '0.1.6';
+export const DOPPLER_PROVIDER_VERSION = DOPPLER_VERSION;

package/tools/convert-safetensors-node.js

@@ -126,6 +126,51 @@ function normalizeExecutionConfig(rawExecution) {
   };
 }
 
+function printConvertContractSummary(result) {
+  const artifact = result?.executionContractArtifact;
+  if (!artifact || typeof artifact !== 'object') return;
+  const checks = Array.isArray(artifact.checks) ? artifact.checks : [];
+  const passedChecks = checks.filter((entry) => entry?.ok === true).length;
+  const layout = artifact.session?.layout ?? 'n/a';
+  console.log(
+    `[contract] status=${artifact.ok === true ? 'pass' : 'fail'} ` +
+    `checks=${checks.length > 0 ? `${passedChecks}/${checks.length}` : 'n/a'} layout=${layout}`
+  );
+  if (artifact.ok !== true && Array.isArray(artifact.errors)) {
+    for (const error of artifact.errors.slice(0, 3)) {
+      console.log(`[contract] error=${String(error)}`);
+    }
+  }
+  const graphArtifact = result?.executionV0GraphContractArtifact;
+  if (graphArtifact && typeof graphArtifact === 'object') {
+    const checks = Array.isArray(graphArtifact.checks) ? graphArtifact.checks : [];
+    const passedChecks = checks.filter((entry) => entry?.ok === true).length;
+    console.log(
+      `[graph] status=${graphArtifact.ok === true ? 'pass' : 'fail'} ` +
+      `checks=${checks.length > 0 ? `${passedChecks}/${checks.length}` : 'n/a'}`
+    );
+  }
+  for (const [label, extraArtifact] of [
+    ['layer-pattern', result?.layerPatternContractArtifact],
+    ['required-inference', result?.requiredInferenceFieldsArtifact],
+  ]) {
+    if (!extraArtifact || typeof extraArtifact !== 'object') continue;
+    const checks = Array.isArray(extraArtifact.checks) ? extraArtifact.checks : [];
+    const passedChecks = checks.filter((entry) => entry?.ok === true).length;
+    console.log(
+      `[${label}] status=${extraArtifact.ok === true ? 'pass' : 'fail'} ` +
+      `checks=${checks.length > 0 ? `${passedChecks}/${checks.length}` : 'n/a'}`
+    );
+  }
+}
+
+function printConvertReportSummary(result) {
+  const reportInfo = result?.reportInfo;
+  if (!reportInfo || typeof reportInfo !== 'object') return;
+  if (typeof reportInfo.path !== 'string' || reportInfo.path.length === 0) return;
+  console.log(`[report] ${reportInfo.path}`);
+}
+
 async function readJsonFile(filePath) {
   if (!filePath) return null;
   const raw = await fs.readFile(filePath, 'utf8');
@@ -172,6 +217,8 @@ async function main() {
   console.log(
     `[done] modelId=${result.manifest?.modelId ?? 'unknown'} preset=${result.presetId} modelType=${result.modelType} shards=${result.shardCount} tensors=${result.tensorCount}`
   );
+  printConvertContractSummary(result);
+  printConvertReportSummary(result);
 }
 
 main().catch((err) => {

package/tools/doppler-cli.js

@@ -66,6 +66,8 @@ function usage() {
     '  doppler debug --config <path.json|json> [--runtime-config <path|url|json>] [--surface auto|node|browser]',
     '  doppler bench --config <path.json|json> [--runtime-config <path|url|json>] [--surface auto|node|browser]',
     '  doppler verify --config <path.json|json> [--runtime-config <path|url|json>] [--surface auto|node|browser]',
+    '  doppler lora --config <path.json|json> [--surface auto|node]',
+    '  doppler distill --config <path.json|json> [--surface auto|node]',
     '',
     'Flags:',
     '  --config <path|json>            Required command config payload (file path or JSON object string).',
@@ -337,7 +339,89 @@ function resolveStaticRootDir(browserOptions = {}) {
   return process.cwd();
 }
 
-async function resolveBrowserModelUrl(request, browserOptions = {}) {
+function resolveRdrrRoot(options = {}) {
+  return path.resolve(asStringOrNull(options.rdrrRoot) || DEFAULT_EXTERNAL_RDRR_ROOT);
+}
+
+async function findResolvableModelCandidate(candidates) {
+  const discoveredManifestCandidates = [];
+
+  for (const candidate of candidates) {
+    if (!await pathExists(candidate.manifestPath)) {
+      continue;
+    }
+    discoveredManifestCandidates.push(candidate);
+
+    const modelDir = path.dirname(candidate.manifestPath);
+    try {
+      const files = await fs.readdir(modelDir, { withFileTypes: true });
+      const hasShards = files.some((entry) =>
+        entry.isFile() && /^shard_\d+\.bin$/u.test(entry.name)
+      );
+      if (hasShards) {
+        return { candidate, discoveredManifestCandidates };
+      }
+    } catch {
+      return { candidate, discoveredManifestCandidates };
+    }
+  }
+
+  return { candidate: null, discoveredManifestCandidates };
+}
+
+async function resolveExternalModelDirectory(rdrrRoot, modelId) {
+  const directModelDir = path.join(rdrrRoot, modelId);
+  const directManifestPath = path.join(directModelDir, 'manifest.json');
+  if (await pathExists(directManifestPath)) {
+    return {
+      modelDir: directModelDir,
+      manifestPath: directManifestPath,
+    };
+  }
+
+  let entries = [];
+  try {
+    entries = await fs.readdir(rdrrRoot, { withFileTypes: true });
+  } catch {
+    return null;
+  }
+
+  const matches = [];
+  for (const entry of entries) {
+    if (!entry.isDirectory()) {
+      continue;
+    }
+    const manifestPath = path.join(rdrrRoot, entry.name, 'manifest.json');
+    if (!await pathExists(manifestPath)) {
+      continue;
+    }
+    let manifest = null;
+    try {
+      manifest = JSON.parse(await fs.readFile(manifestPath, 'utf8'));
+    } catch {
+      continue;
+    }
+    if (manifest?.modelId !== modelId) {
+      continue;
+    }
+    matches.push({
+      modelDir: path.join(rdrrRoot, entry.name),
+      manifestPath,
+    });
+  }
+
+  if (matches.length > 1) {
+    const matchPaths = matches.map((match) => match.modelDir).join(', ');
+    throw new Error(
+      `Model "${modelId}" matched multiple external directories. ` +
+      `Disambiguate by setting request.modelUrl in --config. Matches: ${matchPaths}`
+    );
+  }
+
+  return matches[0] || null;
+}
+
+export async function resolveBrowserModelUrl(request, browserOptions = {}) {
   if (request.modelUrl || !request.modelId) {
     return request;
   }
@@ -353,49 +437,32 @@ async function resolveBrowserModelUrl(request, browserOptions = {}) {
   }
 
   const staticRootDir = resolveStaticRootDir(browserOptions);
-  const curatedCandidate = {
+  const externalModel = await resolveExternalModelDirectory(resolveRdrrRoot(browserOptions), modelId);
+  const candidates = [
+    {
     modelUrl: `/models/curated/${encodedModelId}`,
     manifestPath: path.join(staticRootDir, 'models', 'curated', modelId, 'manifest.json'),
-  };
-  const localCandidate = {
+    },
+    {
     modelUrl: `/models/local/${encodedModelId}`,
     manifestPath: path.join(staticRootDir, 'models', 'local', modelId, 'manifest.json'),
-  };
-  const legacyCandidate = {
+    },
+    {
     modelUrl: `/models/${encodedModelId}`,
     manifestPath: path.join(staticRootDir, 'models', modelId, 'manifest.json'),
-  };
-  const candidates = [
-    curatedCandidate,
-    localCandidate,
-    legacyCandidate,
+    },
+    {
+      modelUrl: `/models/external/${encodeURIComponent(path.basename(externalModel?.modelDir || modelId))}`,
+      manifestPath: externalModel?.manifestPath || path.join(resolveRdrrRoot(browserOptions), modelId, 'manifest.json'),
+    },
   ];
-  const discoveredManifestCandidates = [];
 
-  for (const candidate of candidates) {
-    if (!await pathExists(candidate.manifestPath)) {
-      continue;
-    }
-    discoveredManifestCandidates.push(candidate);
-
-    const modelDir = path.dirname(candidate.manifestPath);
-    try {
-      const files = await fs.readdir(modelDir, { withFileTypes: true });
-      const hasShards = files.some((entry) =>
-        entry.isFile() && /^shard_\d+\.bin$/u.test(entry.name)
-      );
-      if (hasShards) {
-        return {
-          ...request,
-          modelUrl: candidate.modelUrl,
-        };
-      }
-    } catch {
-      return {
-        ...request,
-        modelUrl: candidate.modelUrl,
-      };
-    }
+  const { candidate, discoveredManifestCandidates } = await findResolvableModelCandidate(candidates);
+  if (candidate) {
+    return {
+      ...request,
+      modelUrl: candidate.modelUrl,
+    };
   }
 
   if (discoveredManifestCandidates.length > 0) {
@@ -421,13 +488,13 @@ export async function resolveNodeModelUrl(request, options = {}) {
   }
 
   const modelId = String(request.modelId);
-  const rdrrRoot = path.resolve(asStringOrNull(options.rdrrRoot) || DEFAULT_EXTERNAL_RDRR_ROOT);
-  const manifestPath = path.join(rdrrRoot, modelId, 'manifest.json');
-  if (!await pathExists(manifestPath)) {
+  const rdrrRoot = resolveRdrrRoot(options);
+  const externalModel = await resolveExternalModelDirectory(rdrrRoot, modelId);
+  if (!externalModel) {
     return request;
   }
 
-  const modelDir = path.dirname(manifestPath);
+  const modelDir = externalModel.modelDir;
   try {
     const files = await fs.readdir(modelDir, { withFileTypes: true });
     const hasShards = files.some((entry) =>
@@ -593,10 +660,18 @@ function buildBrowserRunOptions(runConfig, jsonOutput, request = {}) {
     executablePath: asStringOrNull(browser.executablePath),
     runnerPath: asStringOrNull(browser.runnerPath),
     staticRootDir: asStringOrNull(browser.staticRootDir),
+    rdrrRoot: asStringOrNull(browser.rdrrRoot),
     baseUrl: asStringOrNull(browser.baseUrl),
     browserArgs: parseBrowserArgs(browser.browserArgs),
     headless: headed ? false : (explicitHeadless ?? true),
   };
+  const rdrrRoot = resolveRdrrRoot(options);
+  options.staticMounts = [
+    {
+      urlPrefix: '/models/external',
+      rootDir: rdrrRoot,
+    },
+  ];
 
   const port = parseNumberFlag(browser.port, 'run.browser.port');
   if (port !== null) {
@@ -644,6 +719,7 @@ function isNodeWebGPUFallbackCandidate(error, fallbackPolicy = DEFAULT_CLI_POLIC
 function isTrainingCommandFlow(request) {
   if (!request || typeof request !== 'object') return false;
   if (request.suite === 'training') return true;
+  if (request.command === 'lora' || request.command === 'distill') return true;
   return request.command === 'bench' && request.workloadType === 'training';
 }
 
@@ -713,7 +789,24 @@ function toSummary(result) {
   }
 
   if (result.manifest?.modelId) {
-    return `converted ${result.manifest.modelId} (${result.tensorCount} tensors, ${result.shardCount} shards)`;
+    const contractStatus = result.executionContractArtifact?.ok === true
+      ? ' contract=pass'
+      : result.executionContractArtifact
+        ? ' contract=fail'
+        : '';
+    const graphStatus = result.executionV0GraphContractArtifact?.ok === true
+      ? ' graph=pass'
+      : result.executionV0GraphContractArtifact
+        ? ' graph=fail'
+        : '';
+    return `converted ${result.manifest.modelId} (${result.tensorCount} tensors, ${result.shardCount} shards)${contractStatus}${graphStatus}`;
+  }
+
+  if (result.kind === 'lora' || result.kind === 'distill') {
+    const workloadId = result.workloadId || 'unknown';
+    const action = result.action || 'run';
+    const runRoot = result.runRoot || 'n/a';
+    return `${result.kind} ${action} workload=${workloadId} runRoot=${runRoot}`;
   }
 
   const suite = result.suite || result.report?.suite || 'suite';
@@ -1014,8 +1107,118 @@ function printMemoryReport(result) {
   console.log(`[memory] ${parts.join(' ')}`);
 }
 
+function printExecutionContractSummary(result) {
+  const artifact = result?.metrics?.executionContractArtifact;
+  if (!artifact || typeof artifact !== 'object') return;
+  const checks = Array.isArray(artifact.checks) ? artifact.checks : [];
+  const passedChecks = checks.filter((entry) => entry?.ok === true).length;
+  const session = artifact.session && typeof artifact.session === 'object'
+    ? artifact.session
+    : null;
+  const attentionPhases = artifact.steps?.attentionPhases && typeof artifact.steps.attentionPhases === 'object'
+    ? artifact.steps.attentionPhases
+    : null;
+  const parts = [
+    `status=${artifact.ok === true ? 'pass' : 'fail'}`,
+    checks.length > 0 ? `checks=${passedChecks}/${checks.length}` : 'checks=n/a',
+  ];
+  if (session?.layout) {
+    parts.push(`layout=${session.layout}`);
+  }
+  if (attentionPhases) {
+    parts.push(
+      `attn(prefill=${attentionPhases.prefill ?? 'n/a'},decode=${attentionPhases.decode ?? 'n/a'},both=${attentionPhases.both ?? 'n/a'})`
+    );
+  }
+  console.log(`[contract] ${parts.join(' ')}`);
+  if (artifact.ok !== true && Array.isArray(artifact.errors)) {
+    for (const error of artifact.errors.slice(0, 3)) {
+      console.log(`[contract] error=${quoteOneLine(error)}`);
+    }
+  }
+}
+
+function printExecutionV0GraphSummary(artifact) {
+  if (!artifact || typeof artifact !== 'object') return;
+  const checks = Array.isArray(artifact.checks) ? artifact.checks : [];
+  const passedChecks = checks.filter((entry) => entry?.ok === true).length;
+  const stats = artifact.stats && typeof artifact.stats === 'object' ? artifact.stats : null;
+  const parts = [
+    `status=${artifact.ok === true ? 'pass' : 'fail'}`,
+    checks.length > 0 ? `checks=${passedChecks}/${checks.length}` : 'checks=n/a',
+  ];
+  if (Number.isFinite(stats?.prefillSteps) || Number.isFinite(stats?.decodeSteps)) {
+    parts.push(`steps(prefill=${stats?.prefillSteps ?? 'n/a'},decode=${stats?.decodeSteps ?? 'n/a'})`);
+  }
+  console.log(`[graph] ${parts.join(' ')}`);
+  if (artifact.ok !== true && Array.isArray(artifact.errors)) {
+    for (const error of artifact.errors.slice(0, 3)) {
+      console.log(`[graph] error=${quoteOneLine(error)}`);
+    }
+  }
+}
+
+function printSimpleArtifactSummary(label, artifact) {
+  if (!artifact || typeof artifact !== 'object') return;
+  const checks = Array.isArray(artifact.checks) ? artifact.checks : [];
+  const passedChecks = checks.filter((entry) => entry?.ok === true).length;
+  console.log(
+    `[${label}] status=${artifact.ok === true ? 'pass' : 'fail'} ` +
+    `checks=${checks.length > 0 ? `${passedChecks}/${checks.length}` : 'n/a'}`
+  );
+  if (artifact.ok !== true && Array.isArray(artifact.errors)) {
+    for (const error of artifact.errors.slice(0, 2)) {
+      console.log(`[${label}] error=${quoteOneLine(error)}`);
+    }
+  }
+}
+
+function printConvertContractSummary(result) {
+  const artifact = result?.executionContractArtifact;
+  if (!artifact || typeof artifact !== 'object') return;
+  const checks = Array.isArray(artifact.checks) ? artifact.checks : [];
+  const passedChecks = checks.filter((entry) => entry?.ok === true).length;
+  const session = artifact.session && typeof artifact.session === 'object'
+    ? artifact.session
+    : null;
+  console.log(
+    `[contract] status=${artifact.ok === true ? 'pass' : 'fail'} ` +
+    `checks=${checks.length > 0 ? `${passedChecks}/${checks.length}` : 'n/a'} ` +
+    `layout=${session?.layout ?? 'n/a'}`
+  );
+  if (artifact.ok !== true && Array.isArray(artifact.errors)) {
+    for (const error of artifact.errors.slice(0, 3)) {
+      console.log(`[contract] error=${quoteOneLine(error)}`);
+    }
+  }
+  printExecutionV0GraphSummary(result?.executionV0GraphContractArtifact);
+  printSimpleArtifactSummary('layer-pattern', result?.layerPatternContractArtifact);
+  printSimpleArtifactSummary('required-inference', result?.requiredInferenceFieldsArtifact);
+}
+
+function printConvertReportSummary(result) {
+  const reportInfo = result?.reportInfo;
+  if (!reportInfo || typeof reportInfo !== 'object') return;
+  if (typeof reportInfo.path !== 'string' || reportInfo.path.length === 0) return;
+  console.log(`[report] ${reportInfo.path}`);
+}
+
 function printMetricsSummary(result) {
   if (!result || typeof result !== 'object') return;
+  if (result.kind === 'distill') {
+    const stageCount = Array.isArray(result.stageResults) ? result.stageResults.length : 0;
+    console.log(
+      `[metrics] kind=distill action=${result.action || 'run'} stages=${stageCount} runRoot=${quoteOneLine(result.runRoot)}`
+    );
+    return;
+  }
+  if (result.kind === 'lora') {
+    const exportCount = Array.isArray(result.exports) ? result.exports.length : 0;
+    console.log(
+      `[metrics] kind=lora action=${result.action || 'run'} exports=${exportCount} runRoot=${quoteOneLine(result.runRoot)}`
+    );
+    return;
+  }
   const suite = String(result.suite || '');
   const metrics = result.metrics;
   if (!metrics || typeof metrics !== 'object') return;
@@ -1038,6 +1241,8 @@ function printMetricsSummary(result) {
       `prefill=${formatNumber(metrics.prefillTokensPerSec)} ` +
       `decode=${formatNumber(metrics.decodeTokensPerSec)}`
     );
+    printExecutionContractSummary(result);
+    printExecutionV0GraphSummary(metrics.executionV0GraphContractArtifact);
     return;
   }
 
@@ -1052,6 +1257,8 @@ function printMetricsSummary(result) {
         `median=${formatMs(metrics.medianEmbeddingMs)} avg=${formatMs(metrics.avgEmbeddingMs)} ` +
         `eps=${formatNumber(metrics.avgEmbeddingsPerSec)}`
       );
+      printExecutionContractSummary(result);
+      printExecutionV0GraphSummary(metrics.executionV0GraphContractArtifact);
       return;
     }
 
@@ -1073,6 +1280,8 @@ function printMetricsSummary(result) {
       `[metrics] latency first=${formatMs(metrics.firstTokenMs)} ` +
       `prefill=${formatMs(metrics.prefillMs)} decode=${formatMs(metrics.decodeMs)}`
     );
+    printExecutionContractSummary(result);
+    printExecutionV0GraphSummary(metrics.executionV0GraphContractArtifact);
     printDeviceInfo(result);
     printGpuPhases(metrics);
     printMemoryReport(result);
@@ -1190,6 +1399,8 @@ async function main() {
     }
 
     console.log(`[ok] ${toSummary(response.result)}`);
+    printConvertContractSummary(response.result);
+    printConvertReportSummary(response.result);
     printMetricsSummary(response.result);
   } catch (error) {
     if (jsonOutputRequested) {