Feature/paid-compute in cli

.github/workflows/ci.yml

@@ -121,8 +121,9 @@ jobs:
             sleep 10
             attempt=$((attempt + 1))
           done
+
       - name: docker logs
-        run: docker logs ocean-ocean-contracts-1 && docker logs ocean-ganache-1 && docker logs ocean-typesense-1 
+        run: docker logs ocean_ocean-contracts_1 && docker logs ocean_typesense_1
         if: ${{ failure() }}
 
       - name: Run system tests 
@@ -131,4 +132,9 @@ jobs:
           INDEXING_RETRY_INTERVAL: 4000
           INDEXING_MAX_RETRIES: 120
           NODE_URL: 'http://127.0.0.1:8001'
-          AVOID_LOOP_RUN: true
+          AVOID_LOOP_RUN: true
+      - name: Print Ocean Node Logs if tests fail
+        if: ${{ failure() }}
+        run: |
+          echo "========== Ocean Node Logs =========="
+          tac ${{ github.workspace }}/ocean-node/ocean-node.log || echo "Log file not found"

README.md

@@ -194,12 +194,19 @@ npm run cli <command> [options] <arguments>
 **Start Compute:**
 
 - **Positional:**  
-  `npm run cli startCompute did1,did2 algoDid env1`
+  `npm run cli startCompute -- did1,did2 algoDid env1 maxJobDuration paymentToken resources --accept true`
 
 - **Named Options:**  
-  `npm run cli startCompute --datasets did1,did2 --algo algoDid --env env1`  
+  `npm run cli startCompute --datasets did1,did2 --algo algoDid --env env1 --maxJobDuration maxJobDuration --token paymentToken --resources resources --accept true`  
   (Options can be provided in any order.)
 
+
+- `maxJobDuration` is a required parameter an represents the time measured in seconds for job maximum execution, the payment is based on this maxJobDuration value, user needs to provide this.
+- `paymentToken` is required and represents the address of the token that is supported by the environment for processing the compute job payment. It can be retrieved from `getComputeEnvironments` command output.
+- `resources` is required and represents a stringified JSON object obtained from `getComputeEnvironments` command output. `getComputeEnvironments` command shows the available resources and the selected resources by the user need to be within the available limits.
+e.g.: `'[{"id":"cpu","amount":3},{"id":"ram","amount":16772672536},{"id":"disk","amount":0}]'`
+-  `--accept` option can be set to `true` or `false`. If it is set to `false` a prompt will be displayed to the user for manual accepting the payment before starting a compute job. If it is set to `true`, the compute job starts automatically, without user input.
+
 ---
 
 **Start Free Compute:**
@@ -291,6 +298,11 @@ npm run cli <command> [options] <arguments>
   `-d, --datasets <datasetDids>`  
   `-a, --algo <algoDid>`  
   `-e, --env <computeEnvId>`
+  `--init <initializeResponse>`
+  `--maxJobDuration <maxJobDuration>`
+  `-t, --token <paymentToken>`
+  `--resources <resources>`
+  `--amountToDeposit <amountToDeposit>` (Id `''`, it will fallback to initialize compute payment amount.)
 
 - **startFreeCompute:**  
   `-d, --datasets <datasetDids>`  

metadata/downloadAssetPaymentUSDC.json

@@ -41,32 +41,32 @@
         "timeout": 86400
       }
     ],
-    "event": {
-    },
-    "nft": {
-      "address": "",
-      "name": "Ocean Data NFT",
-      "symbol": "OCEAN-NFT",
-      "state": 5,
-      "tokenURI": "",
-      "owner": "",
-      "created": ""
-    },
-    "purgatory": {
-      "state": false
+    "indexedMetadata": {
+      "event": {},
+      "nft": {
+        "address": "",
+        "name": "Ocean Data NFT",
+        "symbol": "OCEAN-NFT",
+        "state": 5,
+        "tokenURI": "",
+        "owner": "",
+        "created": ""
+      },
+      "purgatory": {
+        "state": false
+      },
+      "stats": [{
+        "orders": 0,
+        "token":  "0xf08A50178dfcDe18524640EA6618a1f965821715",
+        "prices": [
+          {
+            "price": "2"
+          }
+        ]
+      }]
     },
     "datatokens": [
     ],
-    "stats": {
-      "allocated": 0,
-      "orders": 0,
-      "price": {
-        "value": "2",
-        "tokenAddress":  "0xf08A50178dfcDe18524640EA6618a1f965821715",
-        "tokenSymbol": "USDC"
-      }
-    },
-
     "accessDetails": {
         "baseToken": {
             "address": "0xf08A50178dfcDe18524640EA6618a1f965821715",

metadata/jsAlgo.json

@@ -54,20 +54,30 @@
       }
     }
   ],
-  "stats": {
-    "allocated": 0,
-    "orders": 0,
-    "price": {
-      "value": "0"
-    }
-  },
-  "nft": {
-    "address": "",
-    "name": "Ocean Data NFT",
-    "symbol": "OCEAN-NFT",
-    "state": 5,
-    "tokenURI": "",
-    "owner": "",
-    "created": ""
+  "indexedMetadata": {
+      "event": {},
+      "nft": {
+        "address": "",
+        "name": "Ocean Data NFT",
+        "symbol": "OCEAN-NFT",
+        "state": 5,
+        "tokenURI": "",
+        "owner": "",
+        "created": ""
+      },
+      "purgatory": {
+        "state": false
+      },
+      "stats": [
+        {
+        "orders": 0,
+        "prices": [
+          {
+            "price": "0"
+          }
+        ]
+      }
+    ],
+    "datatokens": []
   }
 }

metadata/jsIPFSAlgo.json

@@ -51,20 +51,30 @@
         }
       }
     ],
-    "stats": {
-      "allocated": 0,
-      "orders": 0,
-      "price": {
-        "value": "0"
+    "indexedMetadata": {
+      "event": {},
+      "nft": {
+        "address": "",
+        "name": "Ocean Data NFT",
+        "symbol": "OCEAN-NFT",
+        "state": 5,
+        "tokenURI": "",
+        "owner": "",
+        "created": ""
+      },
+      "purgatory": {
+        "state": false
+      },
+      "stats": [
+        {
+        "orders": 0,
+        "prices": [
+          {
+            "price": "0"
+          }
+        ]
       }
-    },
-    "nft": {
-      "address": "",
-      "name": "Ocean Data NFT",
-      "symbol": "OCEAN-NFT",
-      "state": 5,
-      "tokenURI": "",
-      "owner": "",
-      "created": ""
-    }
+    ],
+    "datatokens": []
+  }
   }

metadata/pythonAlgo.json

@@ -48,20 +48,30 @@
       "serviceEndpoint": "http://10.84.128.6:8001"
     }
   ],
-  "stats": {
-    "allocated": 0,
-    "orders": 0,
-    "price": {
-      "value": "0"
-    }
-  },
-  "nft": {
-    "address": "",
-    "name": "Ocean Data NFT",
-    "symbol": "OCEAN-NFT",
-    "state": 5,
-    "tokenURI": "",
-    "owner": "",
-    "created": ""
+  "indexedMetadata": {
+      "event": {},
+      "nft": {
+        "address": "",
+        "name": "Ocean Data NFT",
+        "symbol": "OCEAN-NFT",
+        "state": 5,
+        "tokenURI": "",
+        "owner": "",
+        "created": ""
+      },
+      "purgatory": {
+        "state": false
+      },
+      "stats": [
+        {
+        "orders": 0,
+        "prices": [
+          {
+            "price": "0"
+          }
+        ]
+      }
+    ],
+    "datatokens": []
   }
 }

metadata/simpleComputeDataset.json

@@ -47,27 +47,30 @@
       }
     }
   ],
-  "event": {
-  },
-  "nft": {
-    "address": "",
-    "name": "Ocean Data NFT",
-    "symbol": "OCEAN-NFT",
-    "state": 5,
-    "tokenURI": "",
-    "owner": "",
-    "created": ""
-  },
-  "purgatory": {
-    "state": false
-  },
-  "datatokens": [
-  ],
-  "stats": {
-    "allocated": 0,
-    "orders": 0,
-    "price": {
-      "value": "0"
-    }
+  "indexedMetadata": {
+      "event": {},
+      "nft": {
+        "address": "",
+        "name": "Ocean Data NFT",
+        "symbol": "OCEAN-NFT",
+        "state": 5,
+        "tokenURI": "",
+        "owner": "",
+        "created": ""
+      },
+      "purgatory": {
+        "state": false
+      },
+      "stats": [
+        {
+        "orders": 0,
+        "prices": [
+          {
+            "price": "0"
+          }
+        ]
+      }
+    ],
+    "datatokens": []
   }
 }

metadata/simpleDownloadDataset.json

@@ -41,27 +41,30 @@
       "timeout": 86400
     }
   ],
-  "event": {
-  },
-  "nft": {
-    "address": "",
-    "name": "Ocean Data NFT",
-    "symbol": "OCEAN-NFT",
-    "state": 5,
-    "tokenURI": "",
-    "owner": "",
-    "created": ""
-  },
-  "purgatory": {
-    "state": false
-  },
-  "datatokens": [
-  ],
-  "stats": {
-    "allocated": 0,
-    "orders": 0,
-    "price": {
-      "value": "2"
-    }
+  "indexedMetadata": {
+      "event": {},
+      "nft": {
+        "address": "",
+        "name": "Ocean Data NFT",
+        "symbol": "OCEAN-NFT",
+        "state": 5,
+        "tokenURI": "",
+        "owner": "",
+        "created": ""
+      },
+      "purgatory": {
+        "state": false
+      },
+      "stats": [
+        {
+        "orders": 0,
+        "prices": [
+          {
+            "price": "0"
+          }
+        ]
+      }
+    ],
+    "datatokens": []
   }
 }