Added validation for fields in initialize command and start compute. Fixed tests parsing.

Author: mariacarmina

src/commands.ts

@@ -315,8 +315,6 @@ export class Commands {
 			return;
 		}
 
-		// TODO: check valid maxJobDuration
-
 		const computeEnvID = args[3];
 		// NO chainId needed anymore (is not part of ComputeEnvironment spec anymore)
 		// const chainComputeEnvs = computeEnvs[computeEnvID]; // was algoDdo.chainId
@@ -374,6 +372,20 @@ export class Commands {
 			);
 			return;
 		}
+		if (maxJobDuration < 0) {
+			console.error(
+				"Error initializing Provider for the compute job using dataset DID " +
+					args[1] +
+					" and algorithm DID " +
+					args[2] +
+					" because maxJobDuration is less than 0. It should be in seconds."
+			);
+			return;
+		}
+		let supportedMaxJobDuration: number = maxJobDuration;
+		if (maxJobDuration > computeEnv.maxJobDuration) {
+			supportedMaxJobDuration = computeEnv.maxJobDuration;
+		}
 		const paymentToken = args[5]
 		if (!paymentToken) {
 			console.error(
@@ -385,6 +397,31 @@ export class Commands {
 			);
 			return;
 		}
+		const chainId = await this.signer.getChainId()
+		if (!computeEnv.fees.keys().includes(chainId)) {
+			console.error(
+				"Error starting paid compute using dataset DID " +
+					args[1] +
+					" and algorithm DID " +
+					args[2] +
+					" because chainId is not supported by compute environment. " +
+					args[3] +
+					". Supported chain IDs: " +
+					computeEnv.fees.keys()
+			);
+			return;
+		}
+		if (computeEnv.fees[chainId].feeToken !== paymentToken) {
+			console.error(
+				"Error initializing Provider for the compute job using dataset DID " +
+					args[1] +
+					" and algorithm DID " +
+					args[2] +
+					" because paymentToken is not supported by this environment " +
+					args[3]
+			);
+			return;
+		}
 		const resources = args[6] // resources object should be stringified in cli when calling initializeCompute
 		if (!resources) {
 			console.error(
@@ -396,16 +433,22 @@ export class Commands {
 			);
 			return;
 		}
+		const parsedResources = JSON.parse(resources);
+		// for (const resource of parsedResources) {
+		// 	if (resource.amount > computeEnv.resources[resource.id].amount) {
+
+		// 	}
+		// }
 		const providerInitializeComputeJob =
 			await ProviderInstance.initializeCompute(
 				assets,
 				algo,
 				computeEnv.id,
 				paymentToken,
-				maxJobDuration,
+				supportedMaxJobDuration,
 				providerURI,
 				this.signer, // V1 was this.signer.getAddress()
-				JSON.parse(resources)
+				parsedResources
 			);
 		if (
 			!providerInitializeComputeJob ||
@@ -594,7 +637,6 @@ export class Commands {
 			}
 		}
 		// payment check
-		// TODO: check valid maxJobDuration
 		const maxJobDuration = Number(args[5])
 		if (!maxJobDuration) {
 			console.error(
@@ -606,21 +648,61 @@ export class Commands {
 			);
 			return;
 		}
+		if (maxJobDuration < 0) {
+			console.error(
+				"Error starting paid compute using dataset DID " +
+					args[1] +
+					" and algorithm DID " +
+					args[2] +
+					" because maxJobDuration is less than 0. It should be in seconds."
+			);
+			return;
+		}
+		let supportedMaxJobDuration: number = maxJobDuration;
+		if (maxJobDuration > computeEnv.maxJobDuration) {
+			supportedMaxJobDuration = computeEnv.maxJobDuration;
+		}
+		const chainId = await this.signer.getChainId()
 		const paymentToken = args[6]
 		if (!paymentToken) {
 			console.error(
-				"Error initializing Provider for the compute job using dataset DID " +
+				"Error starting paid compute using dataset DID " +
 					args[1] +
 					" and algorithm DID " +
 					args[2] +
 					" because paymentToken was not provided."
 			);
 			return;
 		}
+		if (!computeEnv.fees.keys().includes(chainId)) {
+			console.error(
+				"Error starting paid compute using dataset DID " +
+					args[1] +
+					" and algorithm DID " +
+					args[2] +
+					" because chainId is not supported by compute environment. " +
+					args[3] +
+					". Supported chain IDs: " +
+					computeEnv.fees.keys()
+			);
+			return;
+		}
+		
+		if (computeEnv.fees[chainId].feeToken !== paymentToken) {
+			console.error(
+				"Error starting paid compute using dataset DID " +
+					args[1] +
+					" and algorithm DID " +
+					args[2] +
+					" because paymentToken is not supported by this environment " +
+					args[3]
+			);
+			return;
+		}
 		const resources = args[7] // resources object should be stringified in cli when calling initializeCompute
 		if (!resources) {
 			console.error(
-				"Error initializing Provider for the compute job using dataset DID " +
+				"Error starting paid compute using dataset DID " +
 					args[1] +
 					" and algorithm DID " +
 					args[2] +
@@ -634,7 +716,7 @@ export class Commands {
 				algo,
 				computeEnv.id,
 				paymentToken,
-				maxJobDuration,
+				supportedMaxJobDuration,
 				providerURI,
 				this.signer, // V1 was this.signer.getAddress()
 				JSON.parse(resources)

test/computeFlow.test.ts

@@ -158,14 +158,15 @@ describe("Ocean CLI Compute", function() {
 		expect(firstEnv).to.have.property("resources").that.is.an("array");
 
 		computeEnvId = firstEnv.id;
+        console.log(`firstEnv.resources: ${JSON.stringify(firstEnv.resources)}`)
         resources = [
             {
                 id: 'cpu',
-                amount: firstEnv.resources[0].max - 1 
+                amount: firstEnv.resources[0].max - firstEnv.resources[0].inUse - 1 
             },
             {
                 id: 'ram',
-                amount: firstEnv.resources[1].max - 1000
+                amount: firstEnv.resources[1].max - firstEnv.resources[1].inUse - 1000
             },
             {
                 id: 'disk',
@@ -183,11 +184,13 @@ describe("Ocean CLI Compute", function() {
 			console.error("Raw output:", output);
 			throw new Error("Could not find initialize response in the output");
 		}
+        const match = jsonMatch[0].match(/initialize compute details:\s*(.*)/s);
+        const result = match ? match[1].trim() : null;
 
 		try {
-			providerInitializeResponse = eval(`(${jsonMatch[1]})`);
+			providerInitializeResponse = eval(result);
 		} catch (error) {
-			console.error("Extracted output:", jsonMatch[1]);
+			console.error("Extracted output:", jsonMatch[0]);
 			throw new Error("Failed to parse the extracted output:\n" + error);
 		}
         console.log(`providerInitializeResponse: ${JSON.stringify(providerInitializeResponse)}`)
@@ -205,15 +208,9 @@ describe("Ocean CLI Compute", function() {
 			console.error("Raw output:", output);
 			throw new Error("Could not find initialize response in the output");
 		}
-
-		let jobId;
-		try {
-			jobId = eval(`(${jsonMatch[0]})`);
-		} catch (error) {
-			console.error("Extracted output:", jsonMatch[0]);
-			throw new Error("Failed to parse the extracted output:\n" + error);
-		}
-        computeJobId = jobId
+        const match = jsonMatch[0].match(/JobID:\s*(.*)/s);
+        const result = match ? match[1].trim() : null;
+        computeJobId = result
         expect(computeJobId).to.be.a("string");
     });