@ornncompute/cli 1.0.118 → 1.0.119

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ornncompute/cli",
-  "version": "1.0.118",
+  "version": "1.0.119",
   "description": "Command-line interface for Ornn compute access workflows.",
   "type": "module",
   "bin": {

package/src/gpu-catalog.mjs

@@ -1,4 +1,5 @@
-import { gpuDisplay, HARDWARE_CATALOG_PATH, parseHardwareCatalog } from "../vendor/capabilities/cli.js";
+import { getHardwareCatalog } from "../vendor/api-client/orchestrator.js";
+import { gpuDisplay, parseHardwareCatalog } from "../vendor/capabilities/cli.js";
 
 const catalogs = new WeakMap();
 
@@ -7,11 +8,11 @@ const catalogs = new WeakMap();
  * per fetch. An unreadable catalog renders GPUs as unknown instead of
  * failing the command.
  */
-export async function gpuLabeler(fetch, path = HARDWARE_CATALOG_PATH) {
+export async function gpuLabeler(fetch) {
   let terms = catalogs.get(fetch);
   if (!terms) {
     terms = Promise.resolve()
-      .then(() => fetch(path, { method: "GET" }))
+      .then(() => getHardwareCatalog(fetch))
       .then((payload) => parseHardwareCatalog(payload).terms)
       .catch(() => []);
     catalogs.set(fetch, terms);

package/vendor/api-client/orchestrator.js

@@ -0,0 +1,38 @@
+// ../../packages/api-client/dist/orchestrator/catalog.js
+var hardwareCatalogPath = "/v1/orchestrator/catalog/hardware";
+function getHardwareCatalog(request, signal) {
+  return request(hardwareCatalogPath, {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+function getSoftwareCatalog(request, signal) {
+  return request("/v1/orchestrator/catalog/software", {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+
+// ../../packages/api-client/dist/orchestrator/locality.js
+var localityGeolocatePath = "/v1/orchestrator/locality/geolocate";
+function listLocalityRegions(request, signal) {
+  return request("/v1/orchestrator/locality/regions", {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+function geolocate(request, query, signal) {
+  const target = query.ip !== void 0 ? `ip=${encodeURIComponent(query.ip)}` : `address=${encodeURIComponent(query.address)}`;
+  return request(`${localityGeolocatePath}?${target}`, {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+export {
+  geolocate,
+  getHardwareCatalog,
+  getSoftwareCatalog,
+  hardwareCatalogPath,
+  listLocalityRegions,
+  localityGeolocatePath
+};

package/vendor/capabilities/cli.js

@@ -1320,6 +1320,25 @@ function listOffers(request, filter = {}) {
 // ../../packages/capabilities/dist/capabilities/admin-capacity-reservations.js
 import { z as z9 } from "zod";
 
+// ../../packages/api-client/dist/orchestrator/catalog.js
+var hardwareCatalogPath = "/v1/orchestrator/catalog/hardware";
+function getHardwareCatalog(request, signal) {
+  return request(hardwareCatalogPath, {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+
+// ../../packages/api-client/dist/orchestrator/locality.js
+var localityGeolocatePath = "/v1/orchestrator/locality/geolocate";
+function geolocate(request, query3, signal) {
+  const target = query3.ip !== void 0 ? `ip=${encodeURIComponent(query3.ip)}` : `address=${encodeURIComponent(query3.address)}`;
+  return request(`${localityGeolocatePath}?${target}`, {
+    method: "GET",
+    ...signal ? { signal } : {}
+  });
+}
+
 // ../../packages/capabilities/dist/capabilities/staff-shared.js
 function statusOf(error) {
   if (error && typeof error === "object" && "status" in error) {
@@ -1331,16 +1350,13 @@ function statusOf(error) {
 }
 
 // ../../packages/capabilities/dist/capabilities/locality.js
-var LOCALITY_GEOLOCATE_PATH = "/v1/orchestrator/locality/geolocate";
 async function locateRegion(fetch, place) {
   const address = place.trim();
   if (!address)
     return null;
   let located;
   try {
-    located = await fetch(`${LOCALITY_GEOLOCATE_PATH}?address=${encodeURIComponent(address)}`, {
-      method: "GET"
-    });
+    located = await geolocate(fetch, { address });
   } catch (error) {
     if (statusOf(error) === 404)
       return null;
@@ -1941,7 +1957,6 @@ var commerceMarketCapabilities = [
 import { z as z11 } from "zod";
 
 // ../../packages/capabilities/dist/spec-catalog.js
-var HARDWARE_CATALOG_PATH = "/v1/orchestrator/catalog/hardware";
 var UNRESOLVED_CATALOG_HINT = "Leave this field empty. Only dictionary.csv product names are allowed. Do not ask to add spec-sheet text to the dictionary.";
 var HARDWARE_LISTING_FIELDS = [
   { field: "gpu_type", kind: "gpu" },
@@ -1994,7 +2009,7 @@ function parseHardwareCatalog(payload) {
   return { terms };
 }
 async function loadHardwareCatalog(fetchImpl) {
-  return parseHardwareCatalog(await fetchImpl(HARDWARE_CATALOG_PATH, { method: "GET" }));
+  return parseHardwareCatalog(await getHardwareCatalog(fetchImpl));
 }
 var UNKNOWN_GPU = "Unknown GPU";
 function gpuDisplay(terms, slug) {
@@ -5253,7 +5268,7 @@ var listCatalogTermsCapability = defineCapability({
   roles: ["admin"],
   description: "Dump the orchestrator hardware dictionary (display name + aliases). Call once and pick from it. Hardware fields on listings must match a term. Optional kind filter: gpu, cpu, node, or link.",
   mutation: "read",
-  http: { method: "GET", path: "/v1/orchestrator/catalog/hardware" },
+  http: { method: "GET", path: hardwareCatalogPath },
   slack: {
     parameters: {
       type: "object",
@@ -8072,15 +8087,10 @@ var LEGACY_CLI_MIGRATIONS = [
 function findLegacyCliMigration(argv) {
   return [...LEGACY_CLI_MIGRATIONS].sort((left, right) => right.legacy.length - left.legacy.length).find((entry) => entry.legacy.every((part, index) => argv[index] === part)) ?? null;
 }
-
-// ../../packages/capabilities/dist/software-catalog.js
-var SOFTWARE_CATALOG_PATH = "/v1/orchestrator/catalog/software";
 export {
   ADMIN_CLI_ROOTS,
   CLI_MIGRATION_GUIDE_URL,
-  HARDWARE_CATALOG_PATH,
   LEGACY_CLI_MIGRATIONS,
-  SOFTWARE_CATALOG_PATH,
   byCliCommand,
   byMcpName,
   catalog,