trainfabric 0.1.15 → 0.1.17

package/dist/index.cjs

@@ -8113,8 +8113,16 @@ var BillingClient = class extends ResourceClient {
   getSummary() {
     return this.requestGet("/v1/billing/summary");
   }
-  getUsage(unit) {
-    return this.requestGet(`/v1/billing/usage${unit ? `?unit=${unit}` : ""}`);
+  getUsage(unit, runId) {
+    const params = new URLSearchParams();
+    if (unit) {
+      params.set("unit", unit);
+    }
+    if (runId) {
+      params.set("runId", runId);
+    }
+    const query = params.toString();
+    return this.requestGet(`/v1/billing/usage${query ? `?${query}` : ""}`);
   }
   listInvoices() {
     return this.requestGet("/v1/billing/invoices");
@@ -8379,6 +8387,9 @@ var RunHandle = class {
     this.client = client;
     this.snapshot = snapshot;
   }
+  isTerminal() {
+    return ["completed", "failed", "canceled", "terminated"].includes(this.snapshot.status);
+  }
   on(event, listener) {
     if (!this.listeners.has(event)) {
       this.listeners.set(event, /* @__PURE__ */ new Set());
@@ -8422,7 +8433,7 @@ var RunHandle = class {
     this.abortController.abort();
   }
   ensureStreaming() {
-    if (this.streaming || !this.shouldStream) {
+    if (this.streaming || !this.shouldStream || this.isTerminal()) {
       return;
     }
     this.streaming = true;
@@ -8458,7 +8469,7 @@ var RunHandle = class {
         }
         await new Promise((resolve) => setTimeout(resolve, 1e3));
       }
-      if (["completed", "failed", "canceled", "terminated"].includes(this.snapshot.status)) {
+      if (this.isTerminal()) {
         break;
       }
     }
@@ -8799,11 +8810,16 @@ 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);
 function collectRuntimeFiles(repoPath) {
-  const candidates = ["training.yaml", "train.runtime.yaml", "pyproject.toml", "requirements.txt", "environment.yml", "Dockerfile", "train.py"];
+  const manifestFiles = /* @__PURE__ */ new Set(["training.yaml", "train.runtime.yaml", "pyproject.toml", "requirements.txt", "environment.yml", "Dockerfile"]);
   const ignoredDirectories = /* @__PURE__ */ new Set([".git", ".hg", ".svn", "node_modules", ".venv", "venv", "__pycache__", ".mypy_cache", ".pytest_cache", "dist", "build"]);
   const found = [];
+  const maxFiles = 256;
+  const maxFileBytes = 256 * 1024;
+  function shouldIncludeFile(fileName) {
+    return manifestFiles.has(fileName) || fileName.endsWith(".py");
+  }
   function walk(currentPath) {
-    if (found.length >= 64) {
+    if (found.length >= maxFiles) {
       return;
     }
     for (const entry of import_node_fs.default.readdirSync(currentPath, { withFileTypes: true })) {
@@ -8815,11 +8831,11 @@ function collectRuntimeFiles(repoPath) {
         }
         continue;
       }
-      if (!entry.isFile() || !candidates.includes(entry.name)) {
+      if (!entry.isFile() || !shouldIncludeFile(entry.name)) {
         continue;
       }
       const stat = import_node_fs.default.statSync(absolute);
-      if (stat.size > 256 * 1024) {
+      if (stat.size > maxFileBytes) {
         continue;
       }
       found.push({
@@ -8922,7 +8938,7 @@ function buildComputeSpec(options) {
 
 // src/index.ts
 var DEFAULT_TRAINFABRIC_API_URL2 = "https://api.trainfabric.com";
-var CLI_VERSION = "0.1.15";
+var CLI_VERSION = "0.1.17";
 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");
@@ -9340,16 +9356,17 @@ async function watchRun(runId, json = false, timeoutMs, pollMs) {
     });
     handle.on("metric", (event) => {
       const payload = event.payload;
-      console.log(
-        `[metric] step=${payload.step ?? "?"} loss=${payload.loss ?? "?"} evalLoss=${payload.evalLoss ?? "?"}`
-      );
+      const evalLoss = payload.evalLoss === void 0 ? "" : ` evalLoss=${payload.evalLoss}`;
+      console.log(`[metric] step=${payload.step ?? "?"} loss=${payload.loss ?? "?"}${evalLoss}`);
     });
     handle.on("checkpoint", (event) => {
       const payload = event.payload;
       console.log(`[checkpoint] count=${payload.checkpointCount ?? "?"} path=${payload.checkpointPath ?? ""}`);
     });
-    handle.on("completed", () => {
-      console.log("[completed]");
+    handle.on("completed", (event) => {
+      const payload = event.payload;
+      const metrics = payload.metrics ? ` finalLoss=${payload.metrics.finalLoss ?? "?"} evalLoss=${payload.metrics.evalLoss ?? "?"}` : "";
+      console.log(`[completed]${metrics}`);
     });
     handle.on("failed", (event) => {
       const payload = event.payload;
@@ -9622,8 +9639,8 @@ program2.command("deployments:get").argument("<deploymentId>").description("Fetc
 program2.command("billing:summary").description("Fetch billing summary").action(async () => {
   printJson(await createClient(loadConfig()).billing.getSummary());
 });
-program2.command("billing:usage").option("--unit <unit>", "normalized_tflop_seconds, reserved_gpu_seconds, or usd").description("List billing usage records").action(async (options) => {
-  printJson(await createClient(loadConfig()).billing.getUsage(options.unit));
+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));
 });
 program2.command("billing:invoices").description("List invoices").action(async () => {
   printJson(await createClient(loadConfig()).billing.listInvoices());

package/package.json

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