@ornncompute/cli 1.0.121 → 1.0.123

package/src/storage-commands.mjs

@@ -1,3 +1,4 @@
+import * as storageApi from "../vendor/api-client/orchestrator.js";
 import { createHash } from "node:crypto";
 import { createReadStream } from "node:fs";
 import { stat } from "node:fs/promises";
@@ -6,7 +7,6 @@ import { Readable } from "node:stream";
 
 import {
   CliApiError,
-  computeEndpoint,
   loadRequiredSession,
   raiseForFailedResponse,
   resolveApiBaseUrl,
@@ -20,7 +20,6 @@ import {
 
 const DEFAULT_PAGE_LIMIT = 50;
 const MAX_PAGE_LIMIT = 500;
-const STORAGE_PREFIX = "/nodes/storage-drives";
 
 /**
  * Narrow CLI adapter expected by executeStorageCommand:
@@ -143,13 +142,6 @@ function normalizeRemotePath(value, { allowEmpty = false, field = "path" } = {})
   return segments.join("/");
 }
 
-function encodedRemotePath(path) {
-  return path
-    .split("/")
-    .map((segment) => encodeURIComponent(segment))
-    .join("/");
-}
-
 function isManagedVolume(drive) {
   const provider = String(drive?.provider ?? "").toLocaleLowerCase("en-US");
   const sourceProvider = String(
@@ -255,19 +247,6 @@ export function codeOf(error) {
   return nested && /^[a-z][a-z0-9_]*$/.test(nested) ? nested : null;
 }
 
-const SAFE_ERROR_MESSAGES = {
-  storage_content_busy: "The volume content is still changing. Inspect the volume and try again.",
-  storage_drive_attached_to_reservation:
-    "This volume still has a reservation relationship. Detach every volume mount before deleting it.",
-  storage_drive_mounted: "This volume is mounted. Detach it before changing its files.",
-  storage_drive_not_found: "The requested volume was not found.",
-  storage_file_not_found: "The requested volume file was not found.",
-  storage_folder_not_found: "The requested volume folder was not found.",
-  storage_object_file_api_unsupported: "This volume does not support nested file operations.",
-  storage_pending_uploads:
-    "This volume has an upload still being finalized. Inspect it and try again.",
-};
-
 function safeStorageError(error, fallback, { action } = {}) {
   if (error instanceof StorageCommandError) return error;
   if (error instanceof AtomicOutputExistsError) {
@@ -285,8 +264,7 @@ function safeStorageError(error, fallback, { action } = {}) {
   const unavailable = code === "service_unavailable";
   const ownerMessage = detailOf(error)?.message;
   return new StorageCommandError(
-    SAFE_ERROR_MESSAGES[code] ??
-      (typeof ownerMessage === "string" && ownerMessage.trim() ? ownerMessage : fallback),
+    typeof ownerMessage === "string" && ownerMessage.trim() ? ownerMessage : fallback,
     {
       action,
       code,
@@ -313,11 +291,11 @@ export async function fetchDrivePage(runtime, { limit = 25, cursor, scope = "all
   if (!Number.isInteger(Number(limit)) || Number(limit) < 1 || Number(limit) > 100) {
     usage("--limit must be an integer from 1 through 100.", "limit");
   }
-  const params = new URLSearchParams({ limit: String(limit), scope });
-  if (cursor) params.set("cursor", cursor);
   try {
-    const payload = await runtime.fetch(computeEndpoint(`${STORAGE_PREFIX}?${params}`), {
-      method: "GET",
+    const payload = await storageApi.listDrives(runtime.fetch, {
+      limit: Number(limit),
+      scope,
+      ...(cursor ? { cursor } : {}),
     });
     return { drives: volumeRows(payload), next_cursor: payload?.next_cursor ?? null };
   } catch (error) {
@@ -367,10 +345,7 @@ function resolveFromRows(rows, reference, { source = false } = {}) {
 
 export async function resolveVolume(runtime, reference) {
   if (/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(reference)) {
-    const drive = await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(reference)}`),
-      { method: "GET" }
-    );
+    const drive = await storageApi.getDrive(runtime.fetch, reference);
     return resolveFromRows([drive], reference);
   }
   return resolveFromRows(await fetchDrives(runtime), reference);
@@ -418,10 +393,8 @@ async function createVolume(input, runtime) {
 
   const body = { name, source_drive_id: source ? String(source.id) : null };
   try {
-    const created = await runtime.fetch(computeEndpoint(STORAGE_PREFIX), {
-      body,
+    const created = await storageApi.createDrive(runtime.fetch, body, {
       headers: idempotencyHeaders(input),
-      method: "POST",
     });
     return runtime.interaction.result({
       data: { effective_input: effective, replayed: false, volume: safeVolume(created) },
@@ -477,10 +450,7 @@ async function showVolume(input, runtime, { refresh = false } = {}) {
     return runtime.interaction.result({ data: { volume: safeVolume(drive) } });
   }
   try {
-    const refreshed = await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/refresh`),
-      { method: "POST" }
-    );
+    const refreshed = await storageApi.getDrive(runtime.fetch, String(drive.id), { refresh: true });
     return runtime.interaction.result({
       data: { volume: safeVolume(refreshed) },
       outcome: { class: "ready", phase: "refreshed" },
@@ -495,10 +465,7 @@ async function clearVolume(input, runtime) {
   const [reference] = positionals(input, 1, "Usage: ornn volumes clear <volume>");
   const drive = await resolveVolume(runtime, reference);
   try {
-    const payload = await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/contents`),
-      { method: "DELETE" }
-    );
+    const payload = await storageApi.clearDriveContents(runtime.fetch, String(drive.id));
     return runtime.interaction.result({
       data: {
         cleared: true,
@@ -533,12 +500,11 @@ async function deleteVolume(input, runtime) {
   requireMachineMutationKey(input, runtime);
   const drive = await resolveVolume(runtime, reference);
   try {
-    await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}`),
-      {
-        headers: idempotencyHeaders(input),
-        method: "DELETE",
-      }
+    await storageApi.deleteDrive(
+      runtime.fetch,
+      String(drive.id),
+      {},
+      { headers: idempotencyHeaders(input) }
     );
     return runtime.interaction.result({
       data: { deleted: true, volume: safeVolume(drive) },
@@ -590,17 +556,13 @@ async function fetchFileRows(runtime, drive, prefix) {
   const entries = [];
   let cursor = 0;
   while (cursor !== null) {
-    const query = new URLSearchParams({ recursive: "true" });
-    if (folder) query.set("path", folder);
-    if (cursor) query.set("cursor", String(cursor));
     let page;
     try {
-      page = await runtime.fetch(
-        computeEndpoint(
-          `${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/contents?${query}`
-        ),
-        { method: "GET" }
-      );
+      page = await storageApi.listDriveContents(runtime.fetch, String(drive.id), {
+        recursive: true,
+        ...(folder ? { path: folder } : {}),
+        ...(cursor ? { cursor } : {}),
+      });
     } catch (error) {
       throw safeStorageError(error, "Volume files could not be listed safely.");
     }
@@ -719,12 +681,7 @@ async function putSignedUpload({
 
 async function cancelUpload(runtime, driveId, uploadId) {
   try {
-    await runtime.fetch(
-      computeEndpoint(
-        `${STORAGE_PREFIX}/${encodeURIComponent(driveId)}/file-uploads/${encodeURIComponent(uploadId)}`
-      ),
-      { method: "DELETE" }
-    );
+    await storageApi.cancelDriveUpload(runtime.fetch, driveId, uploadId);
   } catch {
     // Preserve the transfer error. Finalizing sessions are owner-reconciled.
   }
@@ -762,13 +719,11 @@ async function uploadFile(input, runtime) {
   const sha256 = requestHash.digest("hex");
   let session;
   try {
-    session = await runtime.fetch(
-      computeEndpoint(`${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/file-upload-url`),
-      {
-        body: { content_type: contentType, path: remotePath, size_bytes: fileInfo.size, sha256 },
-        headers: idempotencyHeaders(input),
-        method: "POST",
-      }
+    session = await storageApi.startDriveUpload(
+      runtime.fetch,
+      String(drive.id),
+      { content_type: contentType, path: remotePath, size_bytes: fileInfo.size, sha256 },
+      { headers: idempotencyHeaders(input) }
     );
   } catch (error) {
     throw safeStorageError(error, "The upload could not be staged safely.");
@@ -803,24 +758,25 @@ async function uploadFile(input, runtime) {
       sizeBytes: fileInfo.size,
       uploadUrl: session.upload_url,
     });
-    const completionPath = computeEndpoint(
-      `${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/file-uploads/${encodeURIComponent(uploadId)}/complete`
-    );
     let completed;
     try {
-      completed = await runtime.fetch(completionPath, {
-        body: { uploaded_generation: uploaded.generation },
-        headers: idempotencyHeaders(input),
-        method: "POST",
-      });
+      completed = await storageApi.completeDriveUpload(
+        runtime.fetch,
+        String(drive.id),
+        uploadId,
+        { uploaded_generation: uploaded.generation },
+        { headers: idempotencyHeaders(input) }
+      );
     } catch (error) {
       if (!(error instanceof CliApiError) || (error.status !== undefined && error.status < 500))
         throw error;
-      completed = await runtime.fetch(completionPath, {
-        body: { uploaded_generation: uploaded.generation },
-        headers: idempotencyHeaders(input),
-        method: "POST",
-      });
+      completed = await storageApi.completeDriveUpload(
+        runtime.fetch,
+        String(drive.id),
+        uploadId,
+        { uploaded_generation: uploaded.generation },
+        { headers: idempotencyHeaders(input) }
+      );
     }
     const file = safeFile(completed?.file ?? { path: remotePath, size_bytes: fileInfo.size });
     return runtime.interaction.result({
@@ -888,16 +844,19 @@ async function downloadFile(input, runtime) {
   const drive = await resolveVolume(runtime, reference);
   const session = await loadRequiredSession({ env: runtime.env });
   const baseUrl = resolveApiBaseUrl({ env: runtime.env, session });
-  const endpoint = computeEndpoint(
-    `${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/files/${encodedRemotePath(remotePath)}`
-  );
+  const endpoint = storageApi.driveFilePath(String(drive.id), remotePath);
   const url = new URL(endpoint, `${baseUrl}/`);
   let response;
   try {
-    response = await runtime.fetchImpl(url, {
-      headers: userCredentialHeaders(session),
-      method: "GET",
-    });
+    response = await storageApi.downloadDriveFile(
+      (path, init) =>
+        runtime.fetchImpl(new URL(path, `${baseUrl}/`), {
+          ...init,
+          headers: userCredentialHeaders(session),
+        }),
+      String(drive.id),
+      remotePath
+    );
   } catch {
     throw new StorageCommandError("The volume file could not be downloaded safely.", {
       code: "service_unavailable",
@@ -950,11 +909,11 @@ async function deleteContent(command, input, runtime) {
   );
   const remotePath = normalizeRemotePath(rawRemotePath);
   const drive = await resolveVolume(runtime, reference);
-  const endpoint = computeEndpoint(
-    `${STORAGE_PREFIX}/${encodeURIComponent(String(drive.id))}/${kind}s/${encodedRemotePath(remotePath)}`
-  );
+
   try {
-    const payload = await runtime.fetch(endpoint, { method: "DELETE" });
+    const payload = await (
+      kind === "file" ? storageApi.deleteDriveFile : storageApi.deleteDriveFolder
+    )(runtime.fetch, String(drive.id), remotePath);
     return runtime.interaction.result({
       data: {
         deleted: true,