@nosana/node 1.1.24 → 1.1.25-rc

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nosana/node",
-    "version": "1.1.24",
+    "version": "1.1.25-rc",
     "description": "",
     "bin": {
         "nosana-node": "./dist/src/index.js"
@@ -73,7 +73,7 @@
         "@coral-xyz/anchor": "^0.28.1-beta.1",
         "@inquirer/prompts": "^4.3.0",
         "@nosana/ipfs": "^2.2.6",
-        "@nosana/sdk": "^0.4.82",
+        "@nosana/sdk": "^0.4.84",
         "@solana/web3.js": "^1.78.0",
         "bn.js": "^5.2.1",
         "chalk": "^5.3.0",

package/dist/src/NodeManager/node/job/jobHandler.js

@@ -111,7 +111,7 @@ export class JobHandler {
             return false;
         }
         if (jobDefinition.ops.some(op => op.type === "container/run" && op.args.trusted_execution_env)) {
-            if (!await this.provider.hasTrustedExecutionEnvCapability("SEV-SNP")) {
+            if (!await this.provider.hasTrustedExecutionEnvCapability()) {
                 this.repository.updateflowStateError(this.jobId(), {
                     status: 'validation-error',
                     error: 'Node does not support Trusted Execution Environments',

package/dist/src/NodeManager/provider/Provider.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { Flow, Operation, OperationArgsMap, OperationType, TrustedExecutionEnv } from '@nosana/sdk';
+import { Flow, Operation, OperationArgsMap, OperationType } from '@nosana/sdk';
 import EventEmitter from 'events';
 import { NodeRepository } from '../repository/NodeRepository.js';
 import { ResourceManager } from '../node/resource/resourceManager.js';
@@ -11,7 +11,7 @@ export declare class Provider {
     private readonly frpcImage;
     private proxyStartupAbortController;
     constructor(containerOrchestration: ContainerOrchestrationInterface, repository: NodeRepository, resourceManager: ResourceManager);
-    hasTrustedExecutionEnvCapability(required_environment: TrustedExecutionEnv): Promise<boolean>;
+    hasTrustedExecutionEnvCapability(): Promise<boolean>;
     stopReverseProxyApi(address: string): Promise<boolean>;
     setUpReverseProxyApi(address: string, port: string): Promise<boolean>;
     taskManagerContainerRunOperation(flow: Flow, op: Operation<'container/run'>, controller: AbortController, emitter: EventEmitter): Promise<void>;

package/dist/src/NodeManager/provider/Provider.js

@@ -17,8 +17,8 @@ export class Provider {
         this.proxyStartupAbortController = undefined;
         applyLoggingProxyToClass(this);
     }
-    async hasTrustedExecutionEnvCapability(required_environment) {
-        return this.containerOrchestration.teeRuntime === required_environment;
+    async hasTrustedExecutionEnvCapability() {
+        return this.containerOrchestration.teeRuntime !== undefined;
     }
     async stopReverseProxyApi(address) {
         const frpc_name = `frpc-api-${address}`;
@@ -216,6 +216,11 @@ export class Provider {
                     const resourceVolumes = await this.resourceManager.getResourceVolumes(op.args.resources ?? [], controller);
                     volumes.push(...resourceVolumes);
                 }
+                // The op only declares that it wants a TEE; the node's configured
+                // runtime decides how that is fulfilled.
+                const teeRuntime = op.args.trusted_execution_env
+                    ? this.containerOrchestration.teeRuntime
+                    : undefined;
                 const createContainerOptions = {
                     name,
                     cmd,
@@ -228,9 +233,9 @@ export class Provider {
                     volumes,
                     aliases,
                     restart_policy: op.args.restart_policy,
-                    runtime: op.args.trusted_execution_env
+                    runtime: teeRuntime,
                 };
-                if (op.args.trusted_execution_env) {
+                if (teeRuntime === 'SEV-SNP') {
                     await this.containerOrchestration.pullImage("busybox");
                     await this.resourceManager.images.setImage("busybox");
                     const bridgeContainer = await this.containerOrchestration.runFlowContainer("busybox", {
@@ -252,7 +257,7 @@ export class Provider {
                 emitter.emit('container:started');
                 const info = await container.inspect();
                 emitter.emit('updateOpState', { providerId: container.id });
-                if (!op.args.trusted_execution_env && info.NetworkSettings?.Networks["NOSANA_GATEWAY"].IPAddress) {
+                if (teeRuntime !== 'SEV-SNP' && info.NetworkSettings?.Networks["NOSANA_GATEWAY"].IPAddress) {
                     emitter.emit('setContainerInternalIp', info.NetworkSettings.Networks["NOSANA_GATEWAY"].IPAddress);
                 }
                 stateManager = new ContainerStateManager(container, controller, emitter, op.args.restart_policy);

package/dist/src/NodeManager/provider/containerOrchestration/docker/createDockerRunOptions.js

@@ -59,7 +59,7 @@ export function createDockerRunOptions(image, { name, cmd, gpu, volumes, env, wo
             })),
             NetworkMode: bind_network_to_container ? bind_network_to_container : 'bridge',
             DeviceRequests: devices,
-            ...(runtime === 'SEV-SNP' ? {
+            ...(runtime === 'SEV-SNP' || runtime === 'SEV-GUEST' ? {
                 Devices: [
                     {
                         PathOnHost: '/dev/sev-guest',
@@ -69,7 +69,7 @@ export function createDockerRunOptions(image, { name, cmd, gpu, volumes, env, wo
                 ]
             } : {}),
             RestartPolicy: parseRestartPolicy(restart_policy),
-            ...(runtime ? { Runtime: runtime } : {}),
+            ...(runtime === 'SEV-SNP' ? { Runtime: runtime } : {}),
         },
     };
 }

package/dist/src/NodeManager/provider/containerOrchestration/podman/index.d.ts

@@ -5,7 +5,7 @@ import { RequestInit, Response } from 'undici';
 export declare class PodmanContainerOrchestration extends DockerContainerOrchestration {
     private api;
     name: string;
-    constructor(server: string, gpu: string, _teeRuntime?: string);
+    constructor(server: string, gpu: string, teeRuntime?: string);
     libPodAPICall(path: string, options: RequestInit): Promise<Response>;
     createNetwork(_name: string, controller?: AbortController): Promise<void>;
     runFlowContainer(image: string, args: RunContainerArgs): Promise<Container>;

package/dist/src/NodeManager/provider/containerOrchestration/podman/index.js

@@ -3,8 +3,8 @@ import { createPodmanRunOptions } from './utils/createPodmanRunOptions.js';
 import { fetch, Agent } from 'undici';
 import { liveAbortSignal } from '../../../utils/liveAbortSignal.js';
 export class PodmanContainerOrchestration extends DockerContainerOrchestration {
-    constructor(server, gpu, _teeRuntime) {
-        super(server, gpu);
+    constructor(server, gpu, teeRuntime) {
+        super(server, gpu, teeRuntime);
         this.name = 'podman';
         if (this.protocol === 'socket') {
             this.api = `http://localhost/v4.5.0/libpod`;

package/dist/src/NodeManager/provider/containerOrchestration/podman/utils/createPodmanRunOptions.js

@@ -24,7 +24,7 @@ function parseRestartPolicy(restart_policy) {
  * @returns
  */
 export function createPodmanRunOptions(image, args, gpuOption) {
-    const { name, cmd, gpu, volumes, env, aliases, work_dir, entrypoint, restart_policy, } = args;
+    const { name, cmd, gpu, volumes, env, aliases, work_dir, entrypoint, restart_policy, runtime, } = args;
     const devices = gpu
         ? gpuOption === 'all'
             ? [
@@ -34,6 +34,9 @@ export function createPodmanRunOptions(image, args, gpuOption) {
             ]
             : gpuOption.split(',').map((id) => ({ path: `nvidia.com/gpu=${id}` }))
         : [];
+    if (runtime === 'SEV-GUEST') {
+        devices.push({ path: '/dev/sev-guest' });
+    }
     return {
         image,
         name,

package/dist/src/NodeManager/provider/containerOrchestration/selectContainerOrchestration.js

@@ -1,12 +1,12 @@
 import { DockerContainerOrchestration } from './docker/index.js';
 import { PodmanContainerOrchestration } from './podman/index.js';
 export function selectContainerOrchestrationProvider(provider, url, gpu, teeRuntime) {
-    if (provider !== 'docker' && teeRuntime) {
+    if (provider !== 'docker' && teeRuntime === 'SEV-SNP') {
         throw new Error('Custom runtimes are only supported with the Docker provider.');
     }
     switch (provider) {
         case 'podman':
-            return new PodmanContainerOrchestration(url, gpu, undefined);
+            return new PodmanContainerOrchestration(url, gpu, teeRuntime);
         case 'docker':
         default:
             return new DockerContainerOrchestration(url, gpu, teeRuntime);

package/npm-shrinkwrap.json

@@ -1,18 +1,18 @@
 {
   "name": "@nosana/node",
-  "version": "1.1.24",
+  "version": "1.1.25-rc",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@nosana/node",
-      "version": "1.1.24",
+      "version": "1.1.25-rc",
       "license": "ISC",
       "dependencies": {
         "@coral-xyz/anchor": "^0.28.1-beta.1",
         "@inquirer/prompts": "^4.3.0",
         "@nosana/ipfs": "^2.2.6",
-        "@nosana/sdk": "^0.4.82",
+        "@nosana/sdk": "^0.4.84",
         "@solana/web3.js": "^1.78.0",
         "bn.js": "^5.2.1",
         "chalk": "^5.3.0",
@@ -1609,9 +1609,9 @@
       }
     },
     "node_modules/@nosana/sdk": {
-      "version": "0.4.82",
-      "resolved": "https://registry.npmjs.org/@nosana/sdk/-/sdk-0.4.82.tgz",
-      "integrity": "sha512-s964bc25mLM/Jb5ctSttZ58lbB3SR3KcxECF/BKlOWiN8VUqUEY/GLG6NAzkQ97r23IhenXSewOhNWMbY405Ig==",
+      "version": "0.4.84",
+      "resolved": "https://registry.npmjs.org/@nosana/sdk/-/sdk-0.4.84.tgz",
+      "integrity": "sha512-N5qq1d1WYS0h+uXxxYb9CN39J/jb9x6rh1HG1yNDuUpv8ZpHjF+QerTm0BbaOD8VrX+/t+4WCVtlSADEcyVFqg==",
       "license": "ISC",
       "dependencies": {
         "@coral-xyz/anchor": "^0.28.1-beta.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nosana/node",
-  "version": "1.1.24",
+  "version": "1.1.25-rc",
   "description": "",
   "bin": {
     "nosana-node": "./dist/src/index.js"
@@ -73,7 +73,7 @@
     "@coral-xyz/anchor": "^0.28.1-beta.1",
     "@inquirer/prompts": "^4.3.0",
     "@nosana/ipfs": "^2.2.6",
-    "@nosana/sdk": "^0.4.82",
+    "@nosana/sdk": "^0.4.84",
     "@solana/web3.js": "^1.78.0",
     "bn.js": "^5.2.1",
     "chalk": "^5.3.0",
@@ -105,4 +105,4 @@
     "util": "^0.12.5",
     "yaml": "^2.8.0"
   }
-}
+}