trainfabric 0.1.22 → 0.1.24

package/dist/index.cjs

@@ -8816,6 +8816,11 @@ var import_node_crypto = __toESM(require("node:crypto"), 1);
 var import_node_fs = __toESM(require("node:fs"), 1);
 var import_node_os = __toESM(require("node:os"), 1);
 var import_node_path2 = __toESM(require("node:path"), 1);
+var idPatterns = {
+  org: /^org_[A-Za-z0-9_-]+$/,
+  project: /^proj_[A-Za-z0-9_-]+$/,
+  run: /^run_[A-Za-z0-9_-]+$/
+};
 function collectRuntimeFiles(repoPath) {
   const manifestFiles = /* @__PURE__ */ new Set([
     "training.yaml",
@@ -8912,6 +8917,29 @@ function parseApiKeyScopes(input) {
   }
   return scopes;
 }
+function normalizeHumanName(value, label) {
+  let name = String(value ?? "").trim();
+  while (name.length >= 2 && (name.startsWith("'") && name.endsWith("'") || name.startsWith('"') && name.endsWith('"'))) {
+    name = name.slice(1, -1).trim();
+  }
+  if (!/[A-Za-z0-9]/.test(name)) {
+    throw new Error(`${label} is required.`);
+  }
+  return name;
+}
+function normalizeId(value, kind, label) {
+  const id = String(value ?? "").trim();
+  if (!id || !idPatterns[kind].test(id)) {
+    throw new Error(`${label} is invalid.`);
+  }
+  return id;
+}
+function normalizeOptionalId(value, kind, label) {
+  if (value === void 0) {
+    return void 0;
+  }
+  return normalizeId(value, kind, label);
+}
 
 // src/run_input.ts
 var BASE_MODEL_ALIASES = {
@@ -8954,7 +8982,7 @@ function buildComputeSpec(options) {
 
 // src/index.ts
 var DEFAULT_TRAINFABRIC_API_URL2 = "https://api.trainfabric.com";
-var CLI_VERSION = "0.1.22";
+var CLI_VERSION = "0.1.24";
 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");
@@ -9293,7 +9321,7 @@ function visibleConfig(config) {
   };
 }
 function requireProjectId(options, config) {
-  const projectId = options.project ?? config.projectId;
+  const projectId = normalizeOptionalId(options.project ?? config.projectId, "project", "Project ID");
   if (!projectId) {
     throw new Error("Project is required. Pass --project <projectId> or run `trainfabric config:set-project <projectId>`.");
   }
@@ -9418,6 +9446,32 @@ function createClient(config) {
     projectId: config.projectId
   });
 }
+function assertReadableFile(filePath, label) {
+  let stats;
+  try {
+    stats = import_node_fs2.default.statSync(filePath);
+  } catch {
+    throw new Error(`${label} not found: ${filePath}`);
+  }
+  if (!stats.isFile()) {
+    throw new Error(`${label} must be a file: ${filePath}`);
+  }
+}
+function normalizeHttpBaseUrl(value) {
+  let url;
+  try {
+    url = new URL(value);
+  } catch {
+    throw new Error(`Invalid base URL "${value}". Use an absolute http(s) URL such as https://api.trainfabric.com.`);
+  }
+  if (url.protocol !== "https:" && url.protocol !== "http:") {
+    throw new Error(`Invalid base URL "${value}". Use an absolute http(s) URL such as https://api.trainfabric.com.`);
+  }
+  url.pathname = url.pathname.replace(/\/+$/, "");
+  url.search = "";
+  url.hash = "";
+  return url.toString().replace(/\/+$/, "");
+}
 async function login(config) {
   const apiKey = await promptApiKey();
   if (!apiKey) {
@@ -9463,20 +9517,34 @@ program2.command("config:show").description("Show the active CLI configuration")
   printJson(visibleConfig(loadConfig()));
 });
 program2.command("config:set-base-url").argument("<baseUrl>").description("Set the backend base URL").action((baseUrl) => {
+  const normalizedBaseUrl = normalizeHttpBaseUrl(String(baseUrl));
   const config = updateConfig((current) => {
-    current.baseUrl = String(baseUrl);
+    current.baseUrl = normalizedBaseUrl;
   });
   printJson(visibleConfig(config));
 });
-program2.command("config:set-org").argument("<orgId>").description("Set the default organization ID").action((orgId) => {
-  const config = updateConfig((current) => {
-    current.orgId = String(orgId);
+program2.command("config:set-org").argument("<orgId>").description("Set the default organization ID").action(async (orgId) => {
+  const normalizedOrgId = normalizeId(orgId, "org", "Organization ID");
+  const currentConfig = loadConfig();
+  const organization = await createClient(currentConfig).organizations.get(normalizedOrgId);
+  const updatedConfig = updateConfig((current) => {
+    current.orgId = organization.id;
+    if (current.projectId) {
+      current.projectId = void 0;
+    }
   });
-  printJson(visibleConfig(config));
+  printJson(visibleConfig(updatedConfig));
 });
-program2.command("config:set-project").argument("<projectId>").description("Set the default project ID").action((projectId) => {
+program2.command("config:set-project").argument("<projectId>").description("Set the default project ID").action(async (projectId) => {
+  const normalizedProjectId = normalizeId(projectId, "project", "Project ID");
+  const currentConfig = loadConfig();
+  const project = await createClient(currentConfig).projects.get(normalizedProjectId);
+  if (currentConfig.orgId && project.organizationId !== currentConfig.orgId) {
+    throw new Error(`Project ${project.id} does not belong to configured organization ${currentConfig.orgId}.`);
+  }
   const config = updateConfig((current) => {
-    current.projectId = String(projectId);
+    current.projectId = project.id;
+    current.orgId ??= project.organizationId;
   });
   printJson(visibleConfig(config));
 });
@@ -9505,9 +9573,15 @@ program2.command("projects:list").description("List projects in the active organ
   printJson(await createClient(loadConfig()).projects.list());
 });
 program2.command("projects:create").requiredOption("--name <name>").option("--org <organizationId>").description("Create a project").action(async (options) => {
-  printJson(await createClient(loadConfig()).projects.create({ name: options.name, organizationId: options.org }));
+  printJson(
+    await createClient(loadConfig()).projects.create({
+      name: normalizeHumanName(options.name, "Project name"),
+      organizationId: normalizeOptionalId(options.org, "org", "Organization ID")
+    })
+  );
 });
 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({
     path: file,
     format: "chat_jsonl"
@@ -9518,7 +9592,7 @@ program2.command("datasets:validate").argument("<file>").description("Validate a
   }
 });
 program2.command("datasets:list").option("--project <projectId>").description("List datasets").action(async (options) => {
-  printJson(await createClient(loadConfig()).datasets.list(options.project));
+  printJson(await createClient(loadConfig()).datasets.list(normalizeOptionalId(options.project, "project", "Project ID")));
 });
 program2.command("datasets:get").argument("<datasetId>").description("Fetch dataset detail").action(async (datasetId) => {
   printJson(await createClient(loadConfig()).datasets.get(String(datasetId)));
@@ -9528,12 +9602,15 @@ program2.command("datasets:delete").argument("<datasetId>").description("Delete
   printJson({ deleted: true, id: String(datasetId) });
 });
 program2.command("datasets:upload").argument("<file>").option("--project <projectId>").option("--name <name>").description("Upload a dataset through upload sessions").action(async (file, options) => {
+  assertReadableFile(file, "Dataset path");
   const config = loadConfig();
+  const projectId = normalizeOptionalId(options.project ?? config.projectId, "project", "Project ID");
+  const name = options.name === void 0 ? void 0 : normalizeHumanName(options.name, "Dataset name");
   const dataset = await createClient(config).datasets.create({
     path: file,
     format: "chat_jsonl",
-    name: options.name,
-    projectId: options.project ?? config.projectId
+    name,
+    projectId
   });
   printJson(dataset);
 });
@@ -9582,7 +9659,7 @@ program2.command("runs:quote").option("--project <projectId>").requiredOption("-
   }
 });
 program2.command("runs:list").option("--project <projectId>").description("List runs").action(async (options) => {
-  printJson(await createClient(loadConfig()).runs.list(options.project));
+  printJson(await createClient(loadConfig()).runs.list(normalizeOptionalId(options.project, "project", "Project ID")));
 });
 program2.command("runs:status").argument("<runId>").description("Fetch full run detail").action(async (runId) => {
   printJson(await createClient(loadConfig()).runs.get(String(runId)));
@@ -9664,7 +9741,7 @@ program2.command("billing:summary").description("Fetch billing summary").action(
   printJson(await createClient(loadConfig()).billing.getSummary());
 });
 program2.command("billing:usage").option("--unit <unit>", "normalized_tflop_seconds, reserved_gpu_seconds, or usd").option("--run <runId>", "filter usage records to one run").description("List billing usage records").action(async (options) => {
-  printJson(await createClient(loadConfig()).billing.getUsage(options.unit, options.run));
+  printJson(await createClient(loadConfig()).billing.getUsage(options.unit, normalizeOptionalId(options.run, "run", "Run ID")));
 });
 program2.command("billing:invoices").description("List invoices").action(async () => {
   printJson(await createClient(loadConfig()).billing.listInvoices());
@@ -9697,7 +9774,7 @@ program2.command("api-keys:create").requiredOption("--name <name>").option("--ow
   const config = loadConfig();
   const session = await createClient(config).auth.me();
   const apiKey = await createClient(config).apiKeys.create({
-    name: options.name,
+    name: normalizeHumanName(options.name, "API key name"),
     ownerType: options.ownerType,
     ownerId: options.ownerId ?? session.user.id,
     scopes: parseApiKeyScopes(String(options.scopes))
@@ -9714,7 +9791,7 @@ program2.command("api-keys:revoke").argument("<apiKeyId>").description("Revoke a
 program2.command("service-accounts:create").requiredOption("--name <name>").option("--scopes <scopes>", "comma-separated scopes", "org:read,project:read,project:write,dataset:read,dataset:write,run:read,run:write").description("Create a service account").action(async (options) => {
   printJson(
     await createClient(loadConfig()).serviceAccounts.create({
-      name: options.name,
+      name: normalizeHumanName(options.name, "Service account name"),
       scopes: parseApiKeyScopes(String(options.scopes))
     })
   );

package/package.json

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