@nosana/node 1.1.54-rc → 1.1.55-rc

package/dist/package.json

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

package/dist/src/NodeManager/node/resource/image/imageManager.d.ts

@@ -1,12 +1,21 @@
+import { DockerAuth } from '@nosana/sdk';
 import { ContainerOrchestrationInterface } from '../../../provider/containerOrchestration/interface.js';
 import { NodeRepository } from '../../../repository/NodeRepository.js';
+/**
+ * An image the market requires, and the registry credentials it takes to pull
+ * it. Public images carry none.
+ */
+export type RequiredImage = {
+    name: string;
+    auth?: DockerAuth;
+};
 export declare class ImageManager {
     private containerOrchestration;
     private repository;
     private fetched;
     private market_required_images;
     constructor(containerOrchestration: ContainerOrchestrationInterface, repository: NodeRepository);
-    pullMarketRequiredImages(required_images: string[]): Promise<void>;
+    pullMarketRequiredImages(required_images: RequiredImage[]): Promise<void>;
     pruneImages(): Promise<void>;
     resyncImagesDB(): Promise<void>;
     setImage(image: string, isPrivate?: boolean): Promise<void>;

package/dist/src/NodeManager/node/resource/image/imageManager.js

@@ -11,18 +11,24 @@ export class ImageManager {
     }
     async pullMarketRequiredImages(required_images) {
         this.fetched = true;
-        this.market_required_images = required_images;
-        for (const image of required_images) {
-            if (!(await this.containerOrchestration.hasImage(image))) {
-                await this.containerOrchestration.pullImage(image);
-            }
-            if (!this.repository.getImageResource(image)) {
-                this.repository.updateImageResource(image, {
-                    required: true,
-                    lastUsed: new Date(),
-                    usage: 1,
-                });
+        this.market_required_images = required_images.map(({ name }) => name);
+        for (const { name, auth } of required_images) {
+            if (!(await this.containerOrchestration.hasImage(name))) {
+                await this.containerOrchestration.pullImage(name, auth);
             }
+            // Written whether or not the image is already known: an image a job
+            // pulled first has an entry that says nothing about the market requiring
+            // it, and `pruneImages` deletes anything not marked required. `isPrivate`
+            // carries the same weight it does for a job image — a credentialed image
+            // is dropped rather than left cached — and only takes effect once the
+            // market stops requiring this one.
+            const known = this.repository.getImageResource(name);
+            this.repository.updateImageResource(name, {
+                required: true,
+                isPrivate: !!auth,
+                lastUsed: known?.lastUsed ?? new Date(),
+                usage: known?.usage ?? 1,
+            });
         }
     }
     async pruneImages() {

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

@@ -2,7 +2,7 @@ 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 { ImageManager, RequiredImage } from './image/imageManager.js';
 import { JobContext, VolumeManager } from './volume/volumeManager.js';
 /**
  * The market endpoint reports an HF resource's model as `url`, the field it
@@ -14,6 +14,27 @@ import { JobContext, VolumeManager } from './volume/volumeManager.js';
  * boundary, but the same manager serves job resources.
  */
 export declare function normalizeMarketResources(resources: RequiredResource[]): RequiredResource[];
+/**
+ * A required image as the market endpoint reports it. It reported bare image
+ * names before it could carry registry credentials, and the node and the host
+ * manager release independently, so a node has to read both shapes: the string
+ * form outlives the field it was replaced by.
+ */
+export type MarketRequiredImage = string | {
+    name: string;
+    server?: string;
+    username?: string;
+    password?: string;
+};
+/**
+ * Translates market required images into the shape the pull path reads.
+ *
+ * Credentials ride along only when the market names an account to pull as. A
+ * `server` on its own names a registry without authenticating to it, and the
+ * node still pulls from it anonymously, so it is not enough on its own to make
+ * the image a private one.
+ */
+export declare function normalizeMarketImages(required_images: MarketRequiredImage[]): RequiredImage[];
 export declare class ResourceManager {
     private containerOrchestration;
     private repository;

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

@@ -21,6 +21,24 @@ export function normalizeMarketResources(resources) {
         return { ...hf, repo: hf.url };
     });
 }
+/**
+ * Translates market required images into the shape the pull path reads.
+ *
+ * Credentials ride along only when the market names an account to pull as. A
+ * `server` on its own names a registry without authenticating to it, and the
+ * node still pulls from it anonymously, so it is not enough on its own to make
+ * the image a private one.
+ */
+export function normalizeMarketImages(required_images) {
+    return required_images.map((image) => {
+        if (typeof image === 'string')
+            return { name: image };
+        const { name, server, username, password } = image;
+        if (!username && !password)
+            return { name };
+        return { name, auth: { server, username, password } };
+    });
+}
 export class ResourceManager {
     constructor(containerOrchestration, repository) {
         this.containerOrchestration = containerOrchestration;
@@ -42,7 +60,7 @@ export class ResourceManager {
             if (!data) {
                 return;
             }
-            await this.images.pullMarketRequiredImages(data.required_images);
+            await this.images.pullMarketRequiredImages(normalizeMarketImages(data.required_images));
             await this.volumes.pullMarketRequiredVolumes(normalizeMarketResources(data.required_remote_resources));
         }
         catch (error) {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@nosana/node",
-  "version": "1.1.54-rc",
+  "version": "1.1.55-rc",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@nosana/node",
-      "version": "1.1.54-rc",
+      "version": "1.1.55-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.54-rc",
+  "version": "1.1.55-rc",
   "description": "",
   "bin": {
     "nosana-node": "./dist/src/index.js"