@tuned-tensor/local 0.3.0 → 0.4.0

package/dist/model-server.js

@@ -24,7 +24,7 @@ function isLoopbackHost(host) {
 function httpHost(host) {
     return host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
 }
-export function buildLocalModelServerLaunch(args) {
+function buildModelServerLaunch(args) {
     const options = args.options ?? {};
     const host = options.host ?? "127.0.0.1";
     const remote = !isLoopbackHost(host);
@@ -42,7 +42,9 @@ export function buildLocalModelServerLaunch(args) {
     const temperature = boundedNumber("temperature", options.temperature ?? 0, 0, 5);
     const topP = boundedNumber("topP", options.topP ?? 1, 0, 1);
     const maxConcurrentRequests = boundedNumber("maxConcurrentRequests", options.maxConcurrentRequests ?? 1, 1, 8, true);
-    const artifactPath = localArtifactPath(args.model.artifact_uri);
+    const artifactPath = args.artifactUri
+        ? localArtifactPath(args.artifactUri)
+        : undefined;
     const recordedBaseModelPath = options.baseModelArtifactUri
         ? localArtifactPath(options.baseModelArtifactUri)
         : undefined;
@@ -56,17 +58,16 @@ export function buildLocalModelServerLaunch(args) {
             + recordedBaseModelPath);
     }
     const localBaseModelPath = recordedBaseModelPath ?? configuredBaseModelPath;
-    resolveTrainingModel(args.model.base_model);
+    resolveTrainingModel(args.baseModel);
     const entrypoint = buildBundledPythonCommand("serve.py");
-    const modelName = args.model.id;
     const env = withBundledPythonEnvironment(withOfflineHuggingFaceCacheEnvironment({
         ...minimalMachineLearningEnvironment(process.env),
-        TT_MODEL_ARTIFACT: artifactPath,
-        TT_BASE_MODEL: localBaseModelPath ?? args.model.base_model,
+        ...(artifactPath ? { TT_MODEL_ARTIFACT: artifactPath } : {}),
+        TT_BASE_MODEL: localBaseModelPath ?? args.baseModel,
         ...(options.baseModelRevision && !localBaseModelPath
             ? { TT_BASE_MODEL_REVISION: options.baseModelRevision }
             : {}),
-        TT_MODEL_NAME: modelName,
+        TT_MODEL_NAME: args.modelName,
         TT_MODEL_LOADER: "causal_lm",
         TT_HOST: host,
         TT_PORT: String(port),
@@ -85,10 +86,27 @@ export function buildLocalModelServerLaunch(args) {
         displayCommand: entrypoint.displayCommand,
         env,
         url: `http://${httpHost(host)}:${port}`,
-        modelName,
+        modelName: args.modelName,
         artifactPath,
     };
 }
+export function buildLocalModelServerLaunch(args) {
+    return buildModelServerLaunch({
+        modelName: args.model.id,
+        baseModel: args.model.base_model,
+        artifactUri: args.model.artifact_uri,
+        config: args.config,
+        options: args.options,
+    });
+}
+export function buildLocalBaseModelServerLaunch(args) {
+    return buildModelServerLaunch({
+        modelName: `base:${args.baseModel}`,
+        baseModel: args.baseModel,
+        config: args.config,
+        options: args.options,
+    });
+}
 export async function serveLocalModel(launch) {
     await new Promise((resolveServer, reject) => {
         const child = spawn(launch.command, launch.commandArgs, {

package/dist/model-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-server.js","sourceRoot":"","sources":["../src/model-server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-server.js","sourceRoot":"","sources":["../src/model-server.ts"],"names":[],"mappings":"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"}

package/dist/orchestrator.js

@@ -7,7 +7,7 @@ import { basename, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { defaultArtifactPrefix, fileUri, assertArtifactManifest, ARTIFACT_WORKFLOW_LOCK_FILE, claimRunArtifactDirectory, prepareRunDirectories, readJson, resolveRunArtifacts, writeArtifactManifest, writeFileAtomic, writeJsonAtomic, } from "./artifacts.js";
 import { evalReportSchema, fineTuneRunRequestSchema, localRunnerConfigSchema, runReportSchema, trainingReportSchema, } from "./contracts.js";
-import { buildSystemMessage, compileSpecToJsonl, examplesFromChatJsonl, examplesFromSpec, normalizeChatJsonlForRelocation, } from "./dataset.js";
+import { buildSystemMessage, compileSpecToJsonl, evaluationSuiteFromChatJsonl, examplesFromChatJsonl, examplesFromSpec, normalizeChatJsonlForRelocation, } from "./dataset.js";
 import { INFERENCE_PROTOCOL_VERSION, compareEvalReports, deriveSampleSeed, evaluateExamples, splitSpecExamples, } from "./evaluation.js";
 import { launchProcessTraining } from "./process-training.js";
 import { assertUsableModelArtifact, localModelArtifactPath } from "./model-registry.js";
@@ -15,6 +15,7 @@ import { ProcessCancelledError } from "./process-runner.js";
 import { createLocalStore } from "./store.js";
 import { withHuggingFaceCacheEnvironment } from "./huggingface-cache.js";
 import { verifyLocalBaseModel } from "./prefetch.js";
+import { evaluateGeneralRegressionGate } from "./general-regression.js";
 export async function loadJsonFile(path) {
     return JSON.parse(await readFile(path, "utf8"));
 }
@@ -44,6 +45,15 @@ export async function loadLocalRunnerConfig(path) {
             baseModel: configPathValue(config.paths.baseModel),
             modelCache: configPathValue(config.paths.modelCache),
         },
+        evaluation: {
+            ...config.evaluation,
+            generalRegression: config.evaluation.generalRegression
+                ? {
+                    ...config.evaluation.generalRegression,
+                    dataset: configPathValue(config.evaluation.generalRegression.dataset),
+                }
+                : undefined,
+        },
     };
 }
 function elapsed(started) {
@@ -198,6 +208,9 @@ export async function validateLocalFineTuneInput(input) {
     const config = localRunnerConfigSchema.parse(input.config);
     const request = fineTuneRunRequestSchema.parse(addDryRunPlaceholders(input.request, config.dryRun));
     await validateDatasetInputs(request, config);
+    if (config.evaluation.generalRegression) {
+        await evaluationSuiteFromChatJsonl(config.evaluation.generalRegression.dataset, config.evaluation.generalRegression.systemPrompt);
+    }
     return { request, config };
 }
 function artifactPrefix(request) {
@@ -378,6 +391,8 @@ async function cleanupStageArtifacts(artifacts, stage) {
         await Promise.all([
             removePrefixedArtifacts(artifacts.baselineEvalJson),
             removePrefixedArtifacts(artifacts.candidateEvalJson),
+            removePrefixedArtifacts(artifacts.generalBaselineEvalJson),
+            removePrefixedArtifacts(artifacts.generalCandidateEvalJson),
             rm(artifacts.trainingDir, { recursive: true, force: true }),
             removePrefixedArtifacts(artifacts.trainingReportJson),
             rm(resolve(artifacts.runDir, "model.tar.gz"), { force: true }),
@@ -389,6 +404,7 @@ async function cleanupStageArtifacts(artifacts, stage) {
     if (stage === "baseline") {
         await Promise.all([
             removePrefixedArtifacts(artifacts.baselineEvalJson),
+            removePrefixedArtifacts(artifacts.generalBaselineEvalJson),
             removeReport(),
         ]);
         return;
@@ -399,6 +415,7 @@ async function cleanupStageArtifacts(artifacts, stage) {
             removePrefixedArtifacts(artifacts.trainingReportJson),
             rm(resolve(artifacts.runDir, "model.tar.gz"), { force: true }),
             removePrefixedArtifacts(artifacts.candidateEvalJson),
+            removePrefixedArtifacts(artifacts.generalCandidateEvalJson),
             removeReport(),
         ]);
         await prepareRunDirectories(artifacts);
@@ -407,6 +424,7 @@ async function cleanupStageArtifacts(artifacts, stage) {
     if (stage === "candidate") {
         await Promise.all([
             removePrefixedArtifacts(artifacts.candidateEvalJson),
+            removePrefixedArtifacts(artifacts.generalCandidateEvalJson),
             removeReport(),
         ]);
         return;
@@ -581,6 +599,12 @@ async function stageFingerprint(args) {
         scoring: args.config.evaluation.scoring,
         timeout_ms: args.config.evaluation.timeoutMs,
         baseline_cache: args.config.evaluation.baselineCache,
+        general_regression: args.prepared.generalRegression
+            ? {
+                dataset_sha256: args.prepared.generalRegression.datasetSha256,
+                system_prompt: args.prepared.generalRegression.system,
+            }
+            : null,
         model_cache: args.config.paths.modelCache,
     };
     return hashJson({
@@ -695,6 +719,14 @@ async function computePreparedRun(args) {
     const maxEvalExamples = config.evaluation.maxExamples ?? request.hyperparameters.max_eval_examples;
     const evalExamplesUsed = Math.min(maxEvalExamples ?? examples.length, examples.length);
     const fingerprints = await datasetFingerprints(request);
+    const generalRegressionConfig = config.evaluation.generalRegression;
+    const generalRegression = generalRegressionConfig
+        ? {
+            datasetPath: generalRegressionConfig.dataset,
+            datasetSha256: await hashFile(generalRegressionConfig.dataset),
+            ...await evaluationSuiteFromChatJsonl(generalRegressionConfig.dataset, generalRegressionConfig.systemPrompt),
+        }
+        : undefined;
     const requestFingerprint = hashJson(request);
     const runtimeFingerprintValue = await runtimeFingerprint();
     const baseModelRevision = await resolveBaseModelRevision(request, config);
@@ -746,8 +778,22 @@ async function computePreparedRun(args) {
         system,
         baseModelForEvaluation,
         maxEvalExamples,
+        generalRegression,
     };
 }
+function generalRegressionEvaluationConfig(config) {
+    const { maxExamples: _maxExamples, sampleSeed: _sampleSeed, ...evaluation } = config.evaluation;
+    return { ...config, evaluation };
+}
+function generalRegressionRequiredPaths(prepared, kind) {
+    if (!prepared.generalRegression)
+        return [];
+    return [
+        kind === "baseline"
+            ? prepared.artifacts.generalBaselineEvalJson
+            : prepared.artifacts.generalCandidateEvalJson,
+    ];
+}
 async function prepareStage(args) {
     const preparedExists = await pathExists(args.artifacts.stageMetadataJson)
         && await pathExists(args.artifacts.trainingJsonl);
@@ -795,6 +841,7 @@ async function runBaselineStage(args) {
         stage: "baseline",
         prepared: args.prepared,
         config: args.config,
+        additionalPaths: generalRegressionRequiredPaths(args.prepared, "baseline"),
     })) {
         await throwIfCancelled(args.store, args.prepared.request);
         await updateRun({
@@ -845,6 +892,36 @@ async function runBaselineStage(args) {
         sampleSeed: args.prepared.metadata.eval_sample_seed,
         shouldCancel: () => args.store.isCancellationRequested(args.prepared.request.run_id),
     });
+    if (args.prepared.generalRegression) {
+        await updateRun({
+            store: args.store,
+            reporter: args.reporter,
+            request: args.prepared.request,
+            status: "evaluating_baseline",
+            stage: "evaluating_baseline",
+            message: "Running baseline general regression evaluation.",
+            details: {
+                examples: args.prepared.generalRegression.examples.length,
+                dataset: args.prepared.generalRegression.datasetPath,
+            },
+        });
+        await evaluateExamples({
+            kind: "baseline",
+            modelId: args.prepared.baseModelForEvaluation,
+            baseModelId: args.prepared.baseModelForEvaluation,
+            baseModelRevision: args.config.paths.baseModel
+                ? undefined
+                : args.prepared.metadata.base_model_revision ?? undefined,
+            sourceFingerprint: args.prepared.metadata.base_model_fingerprint ?? undefined,
+            examples: args.prepared.generalRegression.examples,
+            system: args.prepared.generalRegression.system,
+            config: generalRegressionEvaluationConfig(args.config),
+            outputPath: args.prepared.artifacts.generalBaselineEvalJson,
+            reporter: args.runReporter,
+            evalSplit: "general_regression",
+            shouldCancel: () => args.store.isCancellationRequested(args.prepared.request.run_id),
+        });
+    }
     await throwIfCancelled(args.store, args.prepared.request);
     await writeStageFingerprint({ stage: "baseline", prepared: args.prepared, config: args.config });
     return report;
@@ -943,6 +1020,7 @@ async function runCandidateStage(args) {
             additionalPaths: [
                 args.prepared.artifacts.trainingReportJson,
                 stageFingerprintPath(args.prepared, "train"),
+                ...generalRegressionRequiredPaths(args.prepared, "candidate"),
             ],
         })) {
         await throwIfCancelled(args.store, args.prepared.request);
@@ -1015,6 +1093,36 @@ async function runCandidateStage(args) {
         sampleSeed: args.prepared.metadata.eval_sample_seed,
         shouldCancel: () => args.store.isCancellationRequested(args.prepared.request.run_id),
     });
+    if (args.prepared.generalRegression) {
+        await updateRun({
+            store: args.store,
+            reporter: args.reporter,
+            request: args.prepared.request,
+            status: "evaluating_candidate",
+            stage: "evaluating_candidate",
+            message: "Running candidate general regression evaluation.",
+            details: {
+                examples: args.prepared.generalRegression.examples.length,
+                dataset: args.prepared.generalRegression.datasetPath,
+            },
+        });
+        await evaluateExamples({
+            kind: "candidate",
+            modelId: modelArtifact,
+            baseModelId: args.prepared.baseModelForEvaluation,
+            baseModelRevision: args.config.paths.baseModel
+                ? undefined
+                : args.prepared.metadata.base_model_revision ?? undefined,
+            adapterPath: modelArtifact,
+            examples: args.prepared.generalRegression.examples,
+            system: args.prepared.generalRegression.system,
+            config: generalRegressionEvaluationConfig(args.config),
+            outputPath: args.prepared.artifacts.generalCandidateEvalJson,
+            reporter: args.runReporter,
+            evalSplit: "general_regression",
+            shouldCancel: () => args.store.isCancellationRequested(args.prepared.request.run_id),
+        });
+    }
     await throwIfCancelled(args.store, args.prepared.request);
     await writeStageFingerprint({
         stage: "candidate",
@@ -1034,6 +1142,11 @@ async function runReportStage(args) {
     if (!await pathExists(args.prepared.artifacts.trainingReportJson)) {
         throw new Error("Run reporting requires training-report.json.");
     }
+    if (args.prepared.generalRegression
+        && (!await pathExists(args.prepared.artifacts.generalBaselineEvalJson)
+            || !await pathExists(args.prepared.artifacts.generalCandidateEvalJson))) {
+        throw new Error("Run reporting requires both general regression evaluations.");
+    }
     const currentTraining = await canReuseStageArtifact({
         stage: "train",
         prepared: args.prepared,
@@ -1044,12 +1157,18 @@ async function runReportStage(args) {
         stage: "baseline",
         prepared: args.prepared,
         config: args.config,
+        additionalPaths: generalRegressionRequiredPaths(args.prepared, "baseline"),
     });
     const currentCandidate = await canReuseStageArtifact({
         stage: "candidate",
         prepared: args.prepared,
         config: args.config,
         verifyModel: true,
+        additionalPaths: [
+            args.prepared.artifacts.trainingReportJson,
+            stageFingerprintPath(args.prepared, "train"),
+            ...generalRegressionRequiredPaths(args.prepared, "candidate"),
+        ],
     });
     if (!currentTraining || !currentBaseline || !currentCandidate) {
         throw new Error("report stage inputs are stale for the current request/config. Re-run baseline, train, and candidate as needed.");
@@ -1061,6 +1180,8 @@ async function runReportStage(args) {
         stageFingerprintPath(args.prepared, "candidate"),
         args.prepared.artifacts.trainingReportJson,
         stageFingerprintPath(args.prepared, "train"),
+        ...generalRegressionRequiredPaths(args.prepared, "baseline"),
+        ...generalRegressionRequiredPaths(args.prepared, "candidate"),
     ], { verifyModel: true });
     await throwIfCancelled(args.store, args.prepared.request);
     await args.store.invalidateRunOutputs(args.prepared.request.run_id, { report: true });
@@ -1078,6 +1199,27 @@ async function runReportStage(args) {
     const candidate = evalReportSchema.parse(await readJson(args.prepared.artifacts.candidateEvalJson));
     const training = trainingReportSchema.parse(await readJson(args.prepared.artifacts.trainingReportJson));
     const comparison = compareEvalReports(baseline, candidate);
+    let generalRegression;
+    if (args.prepared.generalRegression) {
+        const generalBaseline = evalReportSchema.parse(await readJson(args.prepared.artifacts.generalBaselineEvalJson));
+        const generalCandidate = evalReportSchema.parse(await readJson(args.prepared.artifacts.generalCandidateEvalJson));
+        const generalComparison = compareEvalReports(generalBaseline, generalCandidate);
+        const policy = args.config.evaluation.generalRegression;
+        const gate = evaluateGeneralRegressionGate(generalComparison, policy);
+        generalRegression = {
+            dataset_uri: fileUri(args.prepared.generalRegression.datasetPath),
+            dataset_sha256: args.prepared.generalRegression.datasetSha256,
+            baseline: generalBaseline,
+            candidate: generalCandidate,
+            comparison: generalComparison,
+            policy: {
+                max_score_drop: policy.maxScoreDrop,
+                max_pass_rate_drop: policy.maxPassRateDrop,
+            },
+            passed: gate.passed,
+            failures: gate.failures,
+        };
+    }
     const completedAt = new Date().toISOString();
     const duration = elapsed(args.startedPerf);
     const report = runReportSchema.parse({
@@ -1091,11 +1233,18 @@ async function runReportStage(args) {
         baseline,
         candidate,
         comparison,
+        general_regression: generalRegression,
         training,
         artifact_uris: {
             dataset: fileUri(args.prepared.artifacts.trainingJsonl),
             baseline_eval: fileUri(args.prepared.artifacts.baselineEvalJson),
             candidate_eval: fileUri(args.prepared.artifacts.candidateEvalJson),
+            general_baseline_eval: generalRegression
+                ? fileUri(args.prepared.artifacts.generalBaselineEvalJson)
+                : undefined,
+            general_candidate_eval: generalRegression
+                ? fileUri(args.prepared.artifacts.generalCandidateEvalJson)
+                : undefined,
             report: fileUri(args.prepared.artifacts.runReportJson),
         },
         run_metadata: {
@@ -1132,6 +1281,7 @@ async function runReportStage(args) {
             report_path: args.prepared.artifacts.runReportJson,
             ...(!isDryTraining(training) ? { model_id: `local-${args.prepared.request.run_id}` } : {}),
             avg_score_delta: comparison.avg_score_delta,
+            general_regression_passed: generalRegression?.passed,
             elapsed_seconds: duration.seconds,
         },
     });