@nosana/node 1.1.29 → 1.1.30-rc

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nosana/node",
-    "version": "1.1.29",
+    "version": "1.1.30-rc",
     "description": "",
     "bin": {
         "nosana-node": "./dist/src/index.js"

package/dist/src/NodeManager/node/resource/resourceManager.d.ts

@@ -1,9 +1,19 @@
-import { Market } from '@nosana/sdk';
+import { Market, RequiredResource } from '@nosana/sdk';
 import { Resource } from '@nosana/sdk/dist/types/resources.js';
 import { ContainerOrchestrationInterface } from '../../provider/containerOrchestration/interface.js';
 import { NodeRepository } from '../../repository/NodeRepository.js';
 import { ImageManager } from './image/imageManager.js';
 import { VolumeManager } from './volume/volumeManager.js';
+/**
+ * The market endpoint reports an HF resource's model as `url`, the field it
+ * also uses for S3, while everywhere else in the node — job definitions
+ * included — an HF resource names it `repo`. Translate on the way in, so only
+ * one shape reaches the download path.
+ *
+ * Resources that already carry `repo` are left alone: this is the market
+ * boundary, but the same manager serves job resources.
+ */
+export declare function normalizeMarketResources(resources: RequiredResource[]): RequiredResource[];
 export declare class ResourceManager {
     private containerOrchestration;
     private repository;

package/dist/src/NodeManager/node/resource/resourceManager.js

@@ -2,6 +2,25 @@ import { HostManager } from '../market/hostManager.js';
 import { createResourceName } from './helpers/createResourceName.js';
 import { ImageManager } from './image/imageManager.js';
 import { VolumeManager } from './volume/volumeManager.js';
+/**
+ * The market endpoint reports an HF resource's model as `url`, the field it
+ * also uses for S3, while everywhere else in the node — job definitions
+ * included — an HF resource names it `repo`. Translate on the way in, so only
+ * one shape reaches the download path.
+ *
+ * Resources that already carry `repo` are left alone: this is the market
+ * boundary, but the same manager serves job resources.
+ */
+export function normalizeMarketResources(resources) {
+    return resources.map((resource) => {
+        if (resource.type !== 'HF')
+            return resource;
+        const hf = resource;
+        if (hf.repo || !hf.url)
+            return resource;
+        return { ...hf, repo: hf.url };
+    });
+}
 export class ResourceManager {
     constructor(containerOrchestration, repository) {
         this.containerOrchestration = containerOrchestration;
@@ -24,7 +43,7 @@ export class ResourceManager {
                 return;
             }
             await this.images.pullMarketRequiredImages(data.required_images);
-            await this.volumes.pullMarketRequiredVolumes(data.required_remote_resources);
+            await this.volumes.pullMarketRequiredVolumes(normalizeMarketResources(data.required_remote_resources));
         }
         catch (error) {
             throw error;

package/dist/src/NodeManager/node/resource/volume/volumeManager.js

@@ -36,7 +36,7 @@ function describeContainerState(state) {
  * last such line, since a run may log several before giving up.
  */
 export function findReportedError(logs) {
-    for (const log of logs.reverse()) {
+    for (const log of [...logs].reverse()) {
         if (log.log?.includes('{"event":"error"')) {
             try {
                 const parsed = JSON.parse(log.log.slice(log.log.indexOf('{')));
@@ -48,6 +48,14 @@ export function findReportedError(logs) {
     }
     return undefined;
 }
+/**
+ * A resource rendered for an error message. Resources carry credentials (`IAM`,
+ * HF `accessToken`), and errors reach the logs and the support channel, so
+ * those fields are replaced rather than reported.
+ */
+function describeResource(resource) {
+    return JSON.stringify(resource, (key, value) => key === 'IAM' || key === 'accessToken' ? '[hidden]' : value);
+}
 export class VolumeManager {
     constructor(containerOrchestration, repository) {
         this.containerOrchestration = containerOrchestration;
@@ -74,6 +82,12 @@ export class VolumeManager {
     }
     async createRemoteVolume(resource, controller) {
         const resourceName = createResourceName(resource);
+        // Checked before anything is allocated. Left to the download, an empty repo
+        // becomes a request for `/api/models//tree/main` and comes back as a bare
+        // 404 with nothing in it naming the resource at fault.
+        if (resource.type === 'HF' && !resource.repo) {
+            throw new Error(`missing repo for HF resource ${describeResource(resource)}`);
+        }
         let volumeName = this.repository.getVolumeResource(resourceName)?.volume;
         let sync = true;
         if (!volumeName) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@nosana/node",
-  "version": "1.1.29",
+  "version": "1.1.30-rc",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@nosana/node",
-      "version": "1.1.29",
+      "version": "1.1.30-rc",
       "license": "ISC",
       "dependencies": {
         "@coral-xyz/anchor": "^0.28.1-beta.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nosana/node",
-  "version": "1.1.29",
+  "version": "1.1.30-rc",
   "description": "",
   "bin": {
     "nosana-node": "./dist/src/index.js"