chore: free compute for v5

Author: AdriGeorge

src/cli.ts

@@ -328,7 +328,7 @@ export async function createCLI() {
     .description('Displays the compute job status')
     .argument('<datasetDid>', 'Dataset DID')
     .argument('<jobId>', 'Job ID')
-    .argument('<agreementId>', 'Agreement ID')
+    .argument('[agreementId]', 'Agreement ID')
     .option('-d, --dataset <datasetDid>', 'Dataset DID')
     .option('-j, --job <jobId>', 'Job ID')
     .option('-a, --agreement [agreementId]', 'Agreement ID')

src/commands.ts

@@ -34,7 +34,7 @@ import { Signer, ethers, getAddress } from "ethers";
 import { interactiveFlow } from "./interactiveFlow.js";
 import { publishAsset } from "./publishAsset.js";
 import chalk from 'chalk';
-import { getPolicyServerOBJ } from "./policyServerhELPER.js";
+import { getPolicyServerOBJ, getPolicyServerOBJs } from "./policyServerHelper.js";
 
 export class Commands {
 	public signer: Signer;
@@ -867,8 +867,10 @@ export class Commands {
 			return;
 		}
 		let providerURI = this.oceanNodeUrl;
+		const ddoInstance = DDOManager.getDDOClass(ddos[0]);
+		const { services } = ddoInstance.getDDOFields();
 		if (ddos.length > 0) {
-			providerURI = ddos[0].services[0].serviceEndpoint;
+			providerURI = services[0].serviceEndpoint;
 		}
 
 		const algoDdo = await this.aquarius.waitForIndexer(
@@ -888,7 +890,6 @@ export class Commands {
 		const computeEnvs = await ProviderInstance.getComputeEnvironments(
 			this.oceanNodeUrl
 		);
-
 		if (!computeEnvs || computeEnvs.length < 1) {
 			console.error(
 				"Error fetching compute environments. No compute environments available."
@@ -904,7 +905,6 @@ export class Commands {
 		// NO chainId needed anymore (is not part of ComputeEnvironment spec anymore)
 		// const chainComputeEnvs = computeEnvs[computeEnvID]; // was algoDdo.chainId
 		let computeEnv = null; // chainComputeEnvs[0];
-
 		if (computeEnvID && computeEnvID.length > 1) {
 			for (const env of computeEnvs) {
 				if (computeEnvID == env.id && env.free) {
@@ -921,18 +921,33 @@ export class Commands {
 			);
 			return;
 		}
-
+		const ddoInstanceAlgo = DDOManager.getDDOClass(algoDdo);
+		const { services: servicesAlgo, metadata: metadataAlgo, version: versionAlgo } = ddoInstanceAlgo.getDDOFields();
 		const algo: ComputeAlgorithm = {
 			documentId: algoDdo.id,
-			serviceId: algoDdo.services[0].id,
-			meta: algoDdo.metadata.algorithm,
+			serviceId: servicesAlgo[0].id,
+			meta: metadataAlgo.algorithm,
+		};
+
+		const assetAlgo: {
+			documentId: string;
+			serviceId: string;
+			asset: Asset;
+			version?: string;
+		} = {
+			documentId: algoDdo.id,
+			serviceId: servicesAlgo[0].id,
+			asset: algoDdo,
+			version: versionAlgo
 		};
 
 		const assets = [];
 		for (const dataDdo in ddos) {
+			const ddoInstanceDdo = DDOManager.getDDOClass(ddos[dataDdo]);
+			const { services: servicesDdo, version: versionDdo } = ddoInstanceDdo.getDDOFields();
 			const canStartCompute = isOrderable(
 				ddos[dataDdo],
-				ddos[dataDdo].services[0].id,
+				servicesDdo[0].id,
 				algo,
 				algoDdo
 			);
@@ -944,7 +959,9 @@ export class Commands {
 			}
 			assets.push({
 				documentId: ddos[dataDdo].id,
-				serviceId: ddos[dataDdo].services[0].id,
+				serviceId: servicesDdo[0].id,
+				asset: ddos[dataDdo],
+				version: versionDdo
 			});
 		}
 
@@ -977,6 +994,7 @@ export class Commands {
 			metadataUri: await getMetadataURI(),
 		};
 
+		const policiesServer = await getPolicyServerOBJs(assets, assetAlgo, this.signer, this.oceanNodeUrl);
 		const computeJobs = await ProviderInstance.freeComputeStart(
 			providerURI,
 			this.signer,
@@ -986,7 +1004,8 @@ export class Commands {
 			null,
 			null,
 			null,
-			output
+			output,
+			policiesServer
 		);
 
 		console.log("compute jobs: ", computeJobs);

src/helpers.ts

@@ -3,7 +3,7 @@ import fetch from "cross-fetch";
 import { promises as fs, readFileSync } from "fs";
 import * as path from "path";
 import * as sapphire from '@oasisprotocol/sapphire-paratime';
-import { Asset, DDO } from '@oceanprotocol/ddo-js';
+import { Asset, DDO, DDOManager } from '@oceanprotocol/ddo-js';
 import {
 	AccesslistFactory,
 	Aquarius,
@@ -257,7 +257,9 @@ export async function isOrderable(
 	algorithm: ComputeAlgorithm,
 	algorithmDDO: Asset | DDO
 ): Promise<boolean> {
-	const datasetService = asset.services.find((s) => s.id === serviceId);
+	const ddoInstanceAsset = DDOManager.getDDOClass(asset);
+	const { services: servicesAsset } = ddoInstanceAsset.getDDOFields();
+	const datasetService = servicesAsset.find((s) => s.id === serviceId);
 	if (!datasetService) return false;
 
 	if (datasetService.type === "compute") {

src/policyServerHelper.ts

@@ -1,5 +1,5 @@
 import { Asset } from "@oceanprotocol/ddo-js"
-import { PolicyServerActions, PolicyServerGetPdAction, PolicyServerInitiateAction, PolicyServerInitiateActionData, PolicyServerPresentationDefinition, SsiVerifiableCredential, SsiWalletDid, SsiWalletSession } from "./policyServerInterfaces"
+import { PolicyServerActions, PolicyServerGetPdAction, PolicyServerInitiateAction, PolicyServerInitiateActionData, PolicyServerInitiateComputeActionData, PolicyServerPresentationDefinition, SsiVerifiableCredential, SsiWalletDid, SsiWalletSession } from "./policyServerInterfaces"
 import axios from "axios"
 import { Signer } from "ethers"
 
@@ -333,3 +333,67 @@ export async function getPolicyServerOBJ(
   }
 }
 
+export async function getPolicyServerOBJs(
+  ddos: {
+    documentId: string
+    serviceId: string
+    asset: Asset
+    version?: string
+  }[],
+  algo: {
+    documentId: string
+    serviceId: string
+    asset: Asset
+    version?: string
+  },
+  signer: Signer,
+  providerUrl: string
+): Promise<PolicyServerInitiateComputeActionData[] | null> {
+  try {
+    const results: PolicyServerInitiateComputeActionData[] = []
+
+    // --- datasets
+    for (const ddo of ddos) {
+      if (!ddo.version || ddo.version < '5.0.0') {
+        return null
+      }
+      const result = await getPolicyServerOBJ(
+        ddo.asset,
+        ddo.serviceId,
+        signer,
+        providerUrl
+      )
+      results.push({
+        ...result,
+        documentId: ddo.documentId,
+        serviceId: ddo.serviceId
+      })
+    }
+
+    // --- algo
+    if (!algo?.version || algo.version < '5.0.0') {
+      return null
+    }
+    if (algo.serviceId) {
+      const algoResult = await getPolicyServerOBJ(
+        algo.asset,
+        algo.serviceId,
+        signer,
+        providerUrl
+      )
+      results.push({
+        ...algoResult,
+        documentId: algo.documentId,
+        serviceId: algo.serviceId
+      })
+    }
+
+    return results
+  } catch (error: any) {
+    console.error('getPolicyServerOBJs error:', error)
+    if (error?.message) {
+      throw new Error(`getPolicyServerOBJs failed: ${error.message}`)
+    }
+    throw new Error('getPolicyServerOBJs failed')
+  }
+}

src/policyServerInterfaces.ts

@@ -46,6 +46,13 @@ export interface PolicyServerInitiateActionData {
   presentationDefinitionUri: string
 }
 
+export interface PolicyServerInitiateComputeActionData
+  extends PolicyServerInitiateActionData {
+  documentId: string
+  serviceId: string
+}
+
+
 export interface PolicyServerInitiateComputeActionData
   extends PolicyServerInitiateActionData {
   documentId: string