trainfabric 0.1.29 → 0.1.31

package/README.md

@@ -26,9 +26,11 @@ Secrets are stored in macOS Keychain when available. Other platforms use an encr
 
 ```bash
 trainfabric projects:list
+trainfabric projects:create --name <name>
+trainfabric projects:delete <projectId>
 trainfabric datasets:upload ./train.jsonl --project <projectId>
 trainfabric runs:quote --summary --project <projectId> --dataset <datasetId> --model llama-3-8b
-trainfabric runs:create --yes --quote <quoteId> --project <projectId> --dataset <datasetId> --model llama-3-8b
+trainfabric runs:create --yes --quote <quoteId>
 trainfabric runs:watch <runId> --timeout 30m
 trainfabric runs:cost-breakdown <runId> --summary
 ```

package/dist/index.cjs

@@ -8077,6 +8077,15 @@ var ResourceClient = class {
 };
 
 // ../sdk/dist/client/admin.js
+var apiKeyIdPattern = /^key_[A-Za-z0-9_-]+$/;
+var serviceAccountIdPattern = /^svc_[A-Za-z0-9_-]+$/;
+function normalizeRequiredId(value, pattern, label) {
+  const id = String(value ?? "").trim();
+  if (!pattern.test(id)) {
+    throw new Error(`${label} is invalid.`);
+  }
+  return encodeURIComponent(id);
+}
 var ApiKeysClient = class extends ResourceClient {
   create(input) {
     apiKeyCreateSchema.parse(input);
@@ -8086,7 +8095,7 @@ var ApiKeysClient = class extends ResourceClient {
     return this.requestGet("/v1/api-keys");
   }
   revoke(apiKeyId) {
-    return this.requestDelete(`/v1/api-keys/${apiKeyId}`);
+    return this.requestDelete(`/v1/api-keys/${normalizeRequiredId(apiKeyId, apiKeyIdPattern, "API key ID")}`);
   }
 };
 var ServiceAccountsClient = class extends ResourceClient {
@@ -8098,7 +8107,7 @@ var ServiceAccountsClient = class extends ResourceClient {
     return this.requestGet("/v1/service-accounts");
   }
   revoke(serviceAccountId) {
-    return this.requestDelete(`/v1/service-accounts/${serviceAccountId}`);
+    return this.requestDelete(`/v1/service-accounts/${normalizeRequiredId(serviceAccountId, serviceAccountIdPattern, "Service account ID")}`);
   }
 };
 
@@ -8164,6 +8173,14 @@ var ClusterClient = class extends ResourceClient {
 // ../sdk/dist/client/datasets.js
 var import_promises = __toESM(require("node:fs/promises"), 1);
 var import_node_path = __toESM(require("node:path"), 1);
+var datasetIdPattern = /^ds_[A-Za-z0-9_-]+$/;
+function encodeDatasetId(datasetId) {
+  const id = String(datasetId ?? "").trim();
+  if (!datasetIdPattern.test(id)) {
+    throw new Error("Dataset ID is invalid.");
+  }
+  return encodeURIComponent(id);
+}
 var DatasetsClient = class extends ResourceClient {
   async create(input) {
     const validation = await this.validate({
@@ -8178,7 +8195,7 @@ var DatasetsClient = class extends ResourceClient {
       throw new Error("projectId is required.");
     }
     const fileName = import_node_path.default.basename(input.path);
-    const fileBuffer = await import_promises.default.readFile(input.path);
+    const fileBuffer = await readDatasetFile(input.path);
     const uploadSessionInput = uploadSessionCreateSchema.parse({
       projectId,
       fileName,
@@ -8204,21 +8221,46 @@ var DatasetsClient = class extends ResourceClient {
     if (input.format !== "chat_jsonl") {
       throw new Error("Only chat_jsonl datasets are supported.");
     }
-    return validateChatJsonl(await import_promises.default.readFile(input.path, "utf8"));
+    return validateChatJsonl(await readDatasetFile(input.path, "utf8"));
   }
   get(datasetId) {
-    return this.requestGet(`/v1/datasets/${datasetId}`);
+    return this.requestGet(`/v1/datasets/${encodeDatasetId(datasetId)}`);
   }
   list(projectId) {
     const effectiveProjectId = projectId ?? this.parent.projectId;
-    return this.requestGet(`/v1/datasets${effectiveProjectId ? `?projectId=${effectiveProjectId}` : ""}`);
+    const params = new URLSearchParams();
+    if (effectiveProjectId) {
+      params.set("projectId", effectiveProjectId);
+    }
+    const query = params.toString();
+    return this.requestGet(`/v1/datasets${query ? `?${query}` : ""}`);
   }
   delete(datasetId) {
-    return this.requestDelete(`/v1/datasets/${datasetId}`);
+    return this.requestDelete(`/v1/datasets/${encodeDatasetId(datasetId)}`);
   }
 };
+async function readDatasetFile(pathname, encoding) {
+  let stats;
+  try {
+    stats = await import_promises.default.stat(pathname);
+  } catch {
+    throw new Error(`Dataset file not found: ${pathname}`);
+  }
+  if (!stats.isFile()) {
+    throw new Error(`Dataset path must be a file: ${pathname}`);
+  }
+  return encoding ? import_promises.default.readFile(pathname, encoding) : import_promises.default.readFile(pathname);
+}
 
 // ../sdk/dist/client/deployments.js
+var deploymentIdPattern = /^dep_[A-Za-z0-9_-]+$/;
+function encodeDeploymentId(deploymentId) {
+  const id = String(deploymentId ?? "").trim();
+  if (!deploymentIdPattern.test(id)) {
+    throw new Error("Deployment ID is invalid.");
+  }
+  return encodeURIComponent(id);
+}
 var DeploymentsClient = class extends ResourceClient {
   list() {
     return this.requestGet("/v1/deployments");
@@ -8227,23 +8269,31 @@ var DeploymentsClient = class extends ResourceClient {
     return this.requestPost("/v1/deployments", input);
   }
   get(id) {
-    return this.requestGet(`/v1/deployments/${id}`);
+    return this.requestGet(`/v1/deployments/${encodeDeploymentId(id)}`);
   }
   delete(id) {
-    return this.requestDelete(`/v1/deployments/${id}`);
+    return this.requestDelete(`/v1/deployments/${encodeDeploymentId(id)}`);
   }
 };
 
 // ../sdk/dist/client/models.js
+var modelIdPattern = /^mdl_[A-Za-z0-9_-]+$/;
+function normalizeModelId(modelId) {
+  const normalized = String(modelId ?? "").trim();
+  if (!modelIdPattern.test(normalized)) {
+    throw new Error("Model ID is invalid.");
+  }
+  return encodeURIComponent(normalized);
+}
 var ModelsClient = class extends ResourceClient {
   list() {
     return this.requestGet("/v1/models");
   }
   get(modelId) {
-    return this.requestGet(`/v1/models/${modelId}`);
+    return this.requestGet(`/v1/models/${normalizeModelId(modelId)}`);
   }
   export(modelId) {
-    return this.requestPost(`/v1/models/${modelId}/export`);
+    return this.requestPost(`/v1/models/${normalizeModelId(modelId)}/export`);
   }
 };
 
@@ -8255,12 +8305,20 @@ var ProjectsClient = class extends ResourceClient {
       organizationId: input.organizationId ?? this.parent.orgId
     });
   }
+  delete(projectId) {
+    return this.requestDelete(`/v1/projects/${projectId}`);
+  }
   get(projectId) {
     return this.requestGet(`/v1/projects/${projectId}`);
   }
   list(organizationId) {
     const suffix = organizationId ?? this.parent.orgId;
-    return this.requestGet(`/v1/projects${suffix ? `?organizationId=${suffix}` : ""}`);
+    const params = new URLSearchParams();
+    if (suffix) {
+      params.set("organizationId", suffix);
+    }
+    const query = params.toString();
+    return this.requestGet(`/v1/projects${query ? `?${query}` : ""}`);
   }
 };
 var OrganizationsClient = class extends ResourceClient {
@@ -8420,15 +8478,6 @@ var RunHandle = class {
       this.snapshot = detail.run;
       if (["completed", "failed", "canceled", "terminated"].includes(detail.run.status)) {
         this.close();
-        if (detail.run.status === "failed") {
-          throw new Error(detail.run.failureReason ?? "Run failed.");
-        }
-        if (detail.run.status === "canceled") {
-          throw new Error("Run was canceled.");
-        }
-        if (detail.run.status === "terminated") {
-          throw new Error("Run was terminated.");
-        }
         return detail;
       }
       if (timeoutMs !== void 0 && Date.now() - startedAt > timeoutMs) {
@@ -8514,6 +8563,14 @@ var RunHandle = class {
 };
 
 // ../sdk/dist/client/runs.js
+var runIdPattern = /^run_[A-Za-z0-9_-]+$/;
+function encodeRunId(runId) {
+  const id = String(runId ?? "").trim();
+  if (!runIdPattern.test(id)) {
+    throw new Error("Run ID is invalid.");
+  }
+  return encodeURIComponent(id);
+}
 var RunsClient = class extends ResourceClient {
   describeEmptyQuoteFailure(input) {
     const compute = input.compute && input.compute !== "auto" && input.compute !== "cpu-sim" ? input.compute : void 0;
@@ -8611,47 +8668,52 @@ var RunsClient = class extends ResourceClient {
         mode: selectedModeQuote.mode
       };
     }
-    const parsed = runCreateSchema.parse(payload);
+    const parsed = input.pricingQuoteId ? payload : runCreateSchema.parse(payload);
     const run = await this.requestPost("/v1/runs", parsed);
     return new RunHandle(this.parent, run);
   }
   get(runId) {
-    return this.requestGet(`/v1/runs/${runId}`);
+    return this.requestGet(`/v1/runs/${encodeRunId(runId)}`);
   }
   list(projectId) {
     const effectiveProjectId = projectId ?? this.parent.projectId;
-    return this.requestGet(`/v1/runs${effectiveProjectId ? `?projectId=${effectiveProjectId}` : ""}`);
+    const params = new URLSearchParams();
+    if (effectiveProjectId) {
+      params.set("projectId", effectiveProjectId);
+    }
+    const query = params.toString();
+    return this.requestGet(`/v1/runs${query ? `?${query}` : ""}`);
   }
   cancel(runId) {
-    return this.requestPost(`/v1/runs/${runId}/cancel`);
+    return this.requestPost(`/v1/runs/${encodeRunId(runId)}/cancel`);
   }
   resume(runId) {
-    return this.requestPost(`/v1/runs/${runId}/resume`);
+    return this.requestPost(`/v1/runs/${encodeRunId(runId)}/resume`);
   }
   terminate(runId) {
-    return this.requestPost(`/v1/runs/${runId}/terminate`);
+    return this.requestPost(`/v1/runs/${encodeRunId(runId)}/terminate`);
   }
   logs(runId) {
-    return this.requestGet(`/v1/runs/${runId}/logs`);
+    return this.requestGet(`/v1/runs/${encodeRunId(runId)}/logs`);
   }
   async watch(runId) {
     const detail = await this.get(runId);
     return new RunHandle(this.parent, detail.run);
   }
   allocation(runId) {
-    return this.requestGet(`/v1/runs/${runId}/allocation`);
+    return this.requestGet(`/v1/runs/${encodeRunId(runId)}/allocation`);
   }
   usage(runId) {
-    return this.requestGet(`/v1/runs/${runId}/usage`);
+    return this.requestGet(`/v1/runs/${encodeRunId(runId)}/usage`);
   }
   costBreakdown(runId) {
-    return this.requestGet(`/v1/runs/${runId}/cost-breakdown`);
+    return this.requestGet(`/v1/runs/${encodeRunId(runId)}/cost-breakdown`);
   }
   configuration(runId) {
-    return this.requestGet(`/v1/runs/${runId}/configuration`);
+    return this.requestGet(`/v1/runs/${encodeRunId(runId)}/configuration`);
   }
   explanation(runId) {
-    return this.requestGet(`/v1/runs/${runId}/explanation`);
+    return this.requestGet(`/v1/runs/${encodeRunId(runId)}/explanation`);
   }
   async wait(runId, options) {
     const handle = await this.watch(runId);
@@ -8666,7 +8728,12 @@ var RuntimeClient = class extends ResourceClient {
       projectId: input.projectId ?? this.parent.projectId,
       source: input.source
     });
-    return this.requestPost("/v1/runtime/detect", payload);
+    return this.requestPost("/v1/runtime/detect", payload).catch((error) => {
+      if (input.source.kind === "git" && error instanceof Error && /Request failed with status 404/.test(error.message)) {
+        throw new Error("Git repository could not be resolved. Check the repository URL, branch, and access permissions.");
+      }
+      throw error;
+    });
   }
   build(input) {
     const payload = runtimeBuildCreateSchema.parse({
@@ -8828,6 +8895,7 @@ var idPatterns = {
   org: /^org_[A-Za-z0-9_-]+$/,
   pool: /^pool_[A-Za-z0-9_-]+$/,
   project: /^proj_[A-Za-z0-9_-]+$/,
+  quote: /^quote_[A-Za-z0-9_-]+$/,
   run: /^run_[A-Za-z0-9_-]+$/,
   serviceAccount: /^svc_[A-Za-z0-9_-]+$/,
   supplier: /^[A-Za-z][A-Za-z0-9_-]*$/
@@ -9139,7 +9207,7 @@ function buildComputeSpec(options) {
 
 // src/index.ts
 var DEFAULT_TRAINFABRIC_API_URL2 = "https://api.trainfabric.com";
-var CLI_VERSION = "0.1.29";
+var CLI_VERSION = "0.1.31";
 var CONFIG_DIR = import_node_path3.default.join(import_node_os2.default.homedir(), ".trainfabric");
 var CONFIG_PATH = import_node_path3.default.join(CONFIG_DIR, "config.json");
 var FALLBACK_SECRET_PATH = import_node_path3.default.join(CONFIG_DIR, "session.enc");
@@ -9486,23 +9554,43 @@ function requireProjectId(options, config) {
 }
 function buildRunInput(options, config = loadConfig()) {
   const sourceOptions = buildSourceOptions(options);
-  return {
-    projectId: requireProjectId(options, config),
+  const quoteId = options.quote === void 0 ? void 0 : normalizeId(options.quote, "quote", "Pricing quote ID");
+  if (!quoteId && !options.dataset) {
+    throw new Error("Dataset is required unless --quote is provided.");
+  }
+  if (!quoteId && !options.model) {
+    throw new Error("Model is required unless --quote is provided.");
+  }
+  const projectId = normalizeOptionalId(options.project ?? config.projectId, "project", "Project ID");
+  if (!quoteId && !projectId) {
+    throw new Error("Project is required. Pass --project <projectId> or run `trainfabric config:set-project <projectId>`.");
+  }
+  const input = {
     task: "sft",
     method: "lora",
-    baseModel: normalizeBaseModel(options.model),
-    datasetId: normalizeId(options.dataset, "dataset", "Dataset ID"),
+    pricingQuoteId: quoteId,
     evalDatasetId: normalizeOptionalId(options.eval, "dataset", "Eval dataset ID"),
-    pricingQuoteId: options.quote,
     ...sourceOptions,
-    mode: normalizeTrainingMode(options.mode),
-    compute: buildComputeSpec(options),
-    hyperparameters: {
+    mode: normalizeTrainingMode(options.mode)
+  };
+  if (projectId) {
+    input.projectId = projectId;
+  }
+  if (options.model) {
+    input.baseModel = normalizeBaseModel(options.model);
+  }
+  if (options.dataset) {
+    input.datasetId = normalizeId(options.dataset, "dataset", "Dataset ID");
+  }
+  if (!quoteId) {
+    input.compute = buildComputeSpec(options);
+    input.hyperparameters = {
       epochs: normalizeEpochs(options.epochs),
       lr: normalizeLearningRate(options.lr),
       batchSize: "auto"
-    }
-  };
+    };
+  }
+  return input;
 }
 function assertQuoteOptions(bundle, options) {
   if (bundle.quotes.length > 0) {
@@ -9761,6 +9849,11 @@ program2.command("projects:create").requiredOption("--name <name>").option("--or
     })
   );
 });
+program2.command("projects:delete").argument("<projectId>").description("Delete an empty project").action(async (projectId) => {
+  const normalizedProjectId = normalizeId(projectId, "project", "Project ID");
+  await createClient(loadConfig()).projects.delete(normalizedProjectId);
+  printJson({ deleted: true, id: normalizedProjectId });
+});
 program2.command("datasets:validate").argument("<file>").description("Validate a local dataset file").action(async (file) => {
   assertReadableFile(file, "Dataset path");
   const validation = await createClient(loadConfig()).datasets.validate({
@@ -9796,7 +9889,7 @@ program2.command("datasets:upload").argument("<file>").option("--project <projec
   });
   printJson(dataset);
 });
-program2.command("runs:create").option("--project <projectId>").requiredOption("--dataset <datasetId>").requiredOption("--model <baseModel>").option("--eval <evalDatasetId>").option("--epochs <epochs>", "number of epochs", "3").option("--lr <lr>", "learning rate", "0.0002").option("--gpus <gpuCount>", "gpu count", "1").option("--nodes <nodeCount>", "node count", "1").option("--accelerator <acceleratorClass>", "optional hard accelerator constraint (for example: a10g, a100, h100)").option("--min-memory <gigabytes>", "minimum GPU memory in GB").option("--precision <precision>", "fp16_bf16, fp8, or fp32").option("--interconnect <interconnect>", "pcie or nvlink").option("--mode <mode>", "efficient, balanced, or power", "balanced").option("--quote <pricingQuoteId>", "launch the exact accepted quote id from runs:quote").option("--repo <path>", "local repo path for runtime autodetect").option("--git <url>", "git repo URL for runtime metadata").option("--branch <branch>", "git branch for runtime metadata").option("--yes", "confirm that you reviewed pricing with runs:quote --summary and accept fluctuating realized usage").description("Create a training run").action(async (options) => {
+program2.command("runs:create").option("--project <projectId>").option("--dataset <datasetId>").option("--model <baseModel>").option("--eval <evalDatasetId>").option("--epochs <epochs>", "number of epochs", "3").option("--lr <lr>", "learning rate", "0.0002").option("--gpus <gpuCount>", "gpu count", "1").option("--nodes <nodeCount>", "node count", "1").option("--accelerator <acceleratorClass>", "optional hard accelerator constraint (for example: a10g, a100, h100)").option("--min-memory <gigabytes>", "minimum GPU memory in GB").option("--precision <precision>", "fp16_bf16, fp8, or fp32").option("--interconnect <interconnect>", "pcie or nvlink").option("--mode <mode>", "efficient, balanced, or power").option("--quote <pricingQuoteId>", "launch the exact accepted quote id from runs:quote").option("--repo <path>", "local repo path for runtime autodetect").option("--git <url>", "git repo URL for runtime metadata").option("--branch <branch>", "git branch for runtime metadata").option("--yes", "confirm that you reviewed pricing with runs:quote --summary and accept fluctuating realized usage").description("Create a training run").action(async (options) => {
   const config = loadConfig();
   const runInput = buildRunInput(options, config);
   if (!options.yes) {
@@ -9812,10 +9905,23 @@ program2.command("runtime:detect").option("--project <projectId>").option("--rep
     throw new Error("Provide --repo or --git.");
   }
   const config = loadConfig();
-  const detection = await createClient(config).runtime.detect({
-    projectId: requireProjectId(options, config),
-    source: sourceOptions.source
-  });
+  let detection;
+  try {
+    detection = await createClient(config).runtime.detect({
+      projectId: requireProjectId(options, config),
+      source: sourceOptions.source
+    });
+  } catch (error) {
+    if (sourceOptions.source.kind === "git" && error instanceof Error && /Request failed with status 404/.test(error.message)) {
+      throw new Error("Git repository could not be resolved. Check the repository URL, branch, and access permissions.");
+    }
+    throw error;
+  }
+  if (sourceOptions.source.kind === "git" && detection.status !== "detected") {
+    throw new Error(
+      `Runtime source is ${detection.status}. Git repository could not be resolved into a supported runtime source.`
+    );
+  }
   printJson(redactInlineSource(detection));
 });
 program2.command("runtime:build").option("--project <projectId>").requiredOption("--detection <detectionId>").description("Build or reuse a cached runtime image from a runtime detection").action(async (options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trainfabric",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "Trainfabric CLI for launching GPU training jobs on the hosted Trainfabric backend.",
   "type": "module",
   "main": "dist/index.cjs",