@tuned-tensor/cli 0.11.0 → 0.12.0-beta.1

package/dist/local-runtime.js

@@ -15,6 +15,7 @@ import {
   createLocalStore,
   datasetFormatSchema,
   datasetPrebuiltSchema,
+  defaultBaseModelRevision,
   defaultLocalHome,
   evalExampleResultSchema,
   evalReportSchema,
@@ -46,6 +47,8 @@ import {
   prefetchBaseModel,
   reportInBackground,
   resolveLocalRunInputPaths,
+  resolveModelLoader,
+  resolveRequestedBaseModelRevision,
   resolveTrainingModel,
   runLocalFineTune,
   runLocalPipeline,
@@ -58,11 +61,12 @@ import {
   validateLocalFineTuneInput,
   validateLocalPipeline,
   verifyLocalBaseModel,
+  verifyModelPrefetchCacheReport,
   withBundledPythonEnvironment,
   withHuggingFaceCacheEnvironment,
   withOfflineHuggingFaceCacheEnvironment,
   writeJsonAtomic
-} from "./chunk-DAP2Z7EZ.js";
+} from "./chunk-HDGBDHOB.js";
 
 // src/local-runtime/index.ts
 import { readFileSync, realpathSync } from "fs";
@@ -293,10 +297,10 @@ function placeholderSpecCheck(request) {
     message: placeholder ? "The spec still contains generated placeholder content; edit it before training." : `${request.spec_snapshot.examples.length} spec example(s); base model ${request.spec_snapshot.base_model}`
   };
 }
-async function localBaseModelCheck(path) {
+async function localBaseModelCheck(path, expectedModelId, modelCache) {
   const resolvedPath = resolve(path);
   try {
-    const verified = await verifyLocalBaseModel(resolvedPath);
+    const verified = await verifyLocalBaseModel(resolvedPath, expectedModelId, modelCache);
     return {
       name: "local-base-model",
       ok: true,
@@ -323,7 +327,13 @@ async function runDoctor(config, request) {
     "model-cache",
     config.paths.modelCache ?? process.env.HF_HOME ?? join(homedir(), ".cache", "huggingface")
   ));
-  if (config.paths.baseModel) checks.push(await localBaseModelCheck(config.paths.baseModel));
+  if (config.paths.baseModel) {
+    checks.push(await localBaseModelCheck(
+      config.paths.baseModel,
+      request?.spec_snapshot.base_model,
+      config.paths.modelCache
+    ));
+  }
   if (request) {
     checks.push(placeholderSpecCheck(request));
     resolveTrainingModel(request.spec_snapshot.base_model);
@@ -451,16 +461,21 @@ function buildModelServerLaunch(args) {
     );
   }
   const localBaseModelPath = recordedBaseModelPath ?? configuredBaseModelPath;
-  resolveTrainingModel(args.baseModel);
+  const requestedBaseModelRevision = resolveRequestedBaseModelRevision(
+    args.baseModel,
+    options.baseModelRevision
+  );
+  const baseModelRevision = localBaseModelPath ? defaultBaseModelRevision(args.baseModel) : requestedBaseModelRevision;
   const entrypoint = buildBundledPythonCommand("serve.py");
   const env = withBundledPythonEnvironment(
     withOfflineHuggingFaceCacheEnvironment({
       ...minimalMachineLearningEnvironment(process.env),
       ...artifactPath ? { TT_MODEL_ARTIFACT: artifactPath } : {},
-      TT_BASE_MODEL: localBaseModelPath ?? args.baseModel,
-      ...options.baseModelRevision && !localBaseModelPath ? { TT_BASE_MODEL_REVISION: options.baseModelRevision } : {},
+      TT_BASE_MODEL: args.baseModel,
+      ...localBaseModelPath ? { TT_MODEL_SOURCE: localBaseModelPath } : {},
+      ...baseModelRevision ? { TT_BASE_MODEL_REVISION: baseModelRevision } : {},
       TT_MODEL_NAME: args.modelName,
-      TT_MODEL_LOADER: "causal_lm",
+      TT_MODEL_LOADER: resolveModelLoader(args.baseModel),
       TT_HOST: host,
       TT_PORT: String(port),
       TT_DEVICE: options.device ?? args.config.evaluation.inference.device,
@@ -500,7 +515,15 @@ function buildLocalBaseModelServerLaunch(args) {
     options: args.options
   });
 }
+async function verifyLocalModelServerLaunch(launch) {
+  const modelSource = launch.env.TT_MODEL_SOURCE;
+  const expectedModelId = launch.env.TT_BASE_MODEL;
+  if (modelSource && expectedModelId) {
+    await verifyLocalBaseModel(modelSource, expectedModelId, launch.env.HF_HOME);
+  }
+}
 async function serveLocalModel(launch) {
+  await verifyLocalModelServerLaunch(launch);
   await new Promise((resolveServer, reject) => {
     const child = spawn2(launch.command, launch.commandArgs, {
       env: launch.env,
@@ -1012,7 +1035,7 @@ function createConsoleReporter(options) {
     }
   };
 }
-async function verifyStoredModel(model) {
+async function verifyStoredModel(model, config) {
   const manifestPath = join3(model.artifact_dir, "artifact-manifest.json");
   const integrity = await assertArtifactManifest(manifestPath, {
     requiredPaths: ["stage-metadata.json", "training-report.json"],
@@ -1025,7 +1048,11 @@ async function verifyStoredModel(model) {
   }
   const artifact = await assertUsableModelArtifact(model.artifact_uri);
   if (typeof manifest.model.base_model_artifact_uri === "string" && typeof manifest.model.base_model_fingerprint === "string") {
-    const actualBaseFingerprint = await fingerprintLocalBaseModel(manifest.model.base_model_artifact_uri);
+    const actualBaseFingerprint = await fingerprintLocalBaseModel(
+      manifest.model.base_model_artifact_uri,
+      typeof manifest.model.base_model === "string" ? manifest.model.base_model : void 0,
+      config.paths.modelCache
+    );
     if (actualBaseFingerprint !== manifest.model.base_model_fingerprint) {
       throw new Error("Recorded local base-model content no longer matches the model artifact contract.");
     }
@@ -1054,7 +1081,7 @@ async function verifyActivationEvidence(model) {
     verifyModel: true
   });
 }
-async function verifyModelArtifactPath(input) {
+async function verifyModelArtifactPath(input, config) {
   const inputPath = resolve3(input);
   let manifestPath;
   let artifactUri = inputPath;
@@ -1096,7 +1123,11 @@ async function verifyModelArtifactPath(input) {
   if (!manifest.model) throw new Error(`Artifact manifest does not contain a model contract: ${manifestPath}`);
   const artifact = await assertUsableModelArtifact(artifactUri);
   if (typeof manifest.model.base_model_artifact_uri === "string" && typeof manifest.model.base_model_fingerprint === "string") {
-    const actualBaseFingerprint = await fingerprintLocalBaseModel(manifest.model.base_model_artifact_uri);
+    const actualBaseFingerprint = await fingerprintLocalBaseModel(
+      manifest.model.base_model_artifact_uri,
+      typeof manifest.model.base_model === "string" ? manifest.model.base_model : void 0,
+      config.paths.modelCache
+    );
     if (actualBaseFingerprint !== manifest.model.base_model_fingerprint) {
       throw new Error("Recorded local base-model content no longer matches the model artifact contract.");
     }
@@ -1157,7 +1188,7 @@ function modelServeDevice(argv) {
 async function serveStoredModelFromCli(args) {
   const store = createLocalStore(args.config.storeRoot);
   const model = await store.getModel(args.modelId);
-  const verified = await verifyStoredModel(model);
+  const verified = await verifyStoredModel(model, args.config);
   const launch = buildLocalModelServerLaunch({
     model,
     config: args.config,
@@ -1241,7 +1272,7 @@ async function serveBaseModelFromCli(args) {
     options: {
       ...serveOptionsFromArgv(args.argv),
       systemPrompt: explicitSpecPath && !hasFlag(args.argv, "--no-spec-prompt") ? buildSystemMessage(spec) : void 0,
-      baseModelRevision: spec?.hyperparameters?.base_model_revision
+      baseModelRevision: spec?.hyperparameters?.base_model_revision ?? defaultBaseModelRevision(baseModel)
     }
   });
   if (hasFlag(args.argv, "--print-command")) {
@@ -1490,10 +1521,10 @@ async function main(argv) {
       const id = cli.positionals[0];
       if (!id) throw new Error("models verify requires <model-id-or-artifact-path>");
       if (await stat(resolve3(id)).then(() => true, () => false)) {
-        return printJson({ ok: true, model: null, ...await verifyModelArtifactPath(id) });
+        return printJson({ ok: true, model: null, ...await verifyModelArtifactPath(id, config) });
       }
       const model = await store.getModel(id);
-      const verified = await verifyStoredModel(model);
+      const verified = await verifyStoredModel(model, config);
       return printJson({ ok: true, model, ...verified });
     }
     if (subcommand === "active") {
@@ -1508,7 +1539,7 @@ async function main(argv) {
       const id = cli.positionals[0];
       if (!id) throw new Error("models activate requires <model-id>");
       const model = await store.getModel(id);
-      const verified = await verifyStoredModel(model);
+      const verified = await verifyStoredModel(model, config);
       await verifyActivationEvidence(model);
       const pointer = await activateModel(store, model.id);
       return printJson({
@@ -1522,7 +1553,7 @@ async function main(argv) {
       const current = await getActiveModel(store);
       if (current.pointer?.previous_model_id) {
         const previous = await store.getModel(current.pointer.previous_model_id);
-        await verifyStoredModel(previous);
+        await verifyStoredModel(previous, config);
         await verifyActivationEvidence(previous);
       }
       const pointer = await rollbackActiveModel(store);
@@ -1625,6 +1656,8 @@ export {
   trainingReportSchema,
   validateLocalFineTuneInput,
   validateLocalPipeline,
-  verifyLocalBaseModel
+  verifyLocalBaseModel,
+  verifyLocalModelServerLaunch,
+  verifyModelPrefetchCacheReport
 };
 //# sourceMappingURL=local-runtime.js.map