Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -1338,7 +1338,7 @@ starts a free compute job and returns jobId if succesfull
"algorithm": {
"meta": { "container": { "image": "ubuntu", "entrypoint": "/bin/bash'" } }
},
"consumerAddress": "0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687",
"consumerAddress": "0x00",
"signature": "123",
"nonce": 1,
"environment": "0x7d187e4c751367be694497ead35e2937ece3c7f3b325dcb4f7571e5972d092bd-0xbeaf12703d708f39ef98c3d8939ce458553254176dbb69fe83d535883c4cee38",
Expand All @@ -1352,7 +1352,7 @@ starts a free compute job and returns jobId if succesfull
```json
[
{
"owner": "0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687",
"owner": "0x00",
"jobId": "0x7d187e4c751367be694497ead35e2937ece3c7f3b325dcb4f7571e5972d092bd-a4ad237d-dfd8-404c-a5d6-b8fc3a1f66d3",
"dateCreated": "1742291065.119",
"dateFinished": null,
Expand Down Expand Up @@ -1396,7 +1396,7 @@ Required at least one of the following parameters:
```json
[
{
"owner": "0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687",
"owner": "0x00",
"did": null,
"jobId": "a4ad237d-dfd8-404c-a5d6-b8fc3a1f66d3",
"dateCreated": "1742291065.119",
Expand Down
8 changes: 4 additions & 4 deletions docs/GPU.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ root@gpu-1:/repos/ocean/ocean-node# curl http://localhost:8000/api/services/comp
{
"id": "0xd6b10b27aab01a72070a5164c07d0517755838b9cb9857e2d5649287ec3aaaa2-0x66073c81f833deaa2f8e2a508f69cf78f8a99b17ba1a64f369af921750f93914",
"runningJobs": 0,
"consumerAddress": "0x4fb80776C8eb4cAbe7730dcBCdb1fa6ecD3c460E",
"consumerAddress": "0x00",
"platform": { "architecture": "x86_64", "os": "Ubuntu 22.04.3 LTS" },
"fees": {
"1": [
Expand Down Expand Up @@ -194,7 +194,7 @@ Start a free job using:
"rawcode": "import tensorflow as tf\nsess = tf.compat.v1.Session(config=tf.compat.v1.ConfigProto(log_device_placement=True))\nprint(\"Num GPUs Available: \", len(tf.config.list_physical_devices('GPU')))\ngpus = tf.config.list_physical_devices('GPU')\nfor gpu in gpus:\n\tprint('Name:', gpu.name, ' Type:', gpu.device_type)"
}
},
"consumerAddress": "0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687",
"consumerAddress": "0x00",
"signature": "123",
"nonce": 1,
"environment": "0xd6b10b27aab01a72070a5164c07d0517755838b9cb9857e2d5649287ec3aaaa2-0x66073c81f833deaa2f8e2a508f69cf78f8a99b17ba1a64f369af921750f93914",
Expand Down Expand Up @@ -325,7 +325,7 @@ root@gpu-1:/repos/ocean/ocean-node# curl http://localhost:8000/api/services/comp
{
"id": "0xbb5773e734e1b188165dac88d9a3dc8ac28bc9f5624b45fa8bbd8fca043de7c1-0x2c2761f938cf186eeb81f71dee06ad7edb299493e39c316c390d0c0691e6585c",
"runningJobs": 0,
"consumerAddress": "0x4fb80776C8eb4cAbe7730dcBCdb1fa6ecD3c460E",
"consumerAddress": "0x00",
"platform": {
"architecture": "x86_64",
"os": "Ubuntu 24.04.2 LTS"
Expand Down Expand Up @@ -450,7 +450,7 @@ Start a free job with
"rawcode": "import tensorflow as tf\nsess = tf.compat.v1.Session(config=tf.compat.v1.ConfigProto(log_device_placement=True))\nprint(\"Num GPUs Available: \", len(tf.config.list_physical_devices('GPU')))\ngpus = tf.config.list_physical_devices('GPU')\nfor gpu in gpus:\n\tprint('Name:', gpu.name, ' Type:', gpu.device_type)"
}
},
"consumerAddress": "0xC7EC1970B09224B317c52d92f37F5e1E4fF6B687",
"consumerAddress": "0x00",
"signature": "123",
"nonce": 1,
"environment": "0xbb5773e734e1b188165dac88d9a3dc8ac28bc9f5624b45fa8bbd8fca043de7c1-0x2c2761f938cf186eeb81f71dee06ad7edb299493e39c316c390d0c0691e6585c",
Expand Down
20 changes: 20 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"@types/node": "^20.14.2",
"@types/node-cron": "^3.0.11",
"@types/sinon": "^17.0.4",
"@types/tar-stream": "^3.1.4",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"auto-changelog": "^2.4.0",
Expand Down
26 changes: 23 additions & 3 deletions src/@types/C2D/C2D.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MetadataAlgorithm } from '@oceanprotocol/ddo-js'
import { MetadataAlgorithm, ConsumerParameter } from '@oceanprotocol/ddo-js'
import type { BaseFileObject } from '../fileObject.js'
export enum C2DClusterType {
// eslint-disable-next-line no-unused-vars
Expand Down Expand Up @@ -129,6 +129,7 @@ export interface C2DDockerConfig {
}

export type ComputeResultType =
| 'imageLog'
| 'algorithmLog'
| 'output'
| 'configurationLog'
Expand Down Expand Up @@ -180,12 +181,23 @@ export interface ComputeAsset {
transferTxId?: string
userdata?: { [key: string]: any }
}

export interface ExtendedMetadataAlgorithm extends MetadataAlgorithm {
container: {
// retain existing properties
entrypoint: string
image: string
tag: string
checksum: string
dockerfile?: string // optional
additionalDockerFiles?: { [key: string]: any }
consumerParameters?: ConsumerParameter[]
}
}
export interface ComputeAlgorithm {
documentId?: string
serviceId?: string
fileObject?: BaseFileObject
meta?: MetadataAlgorithm
meta?: ExtendedMetadataAlgorithm
transferTxId?: string
algocustomdata?: { [key: string]: any }
userdata?: { [key: string]: any }
Expand Down Expand Up @@ -235,6 +247,10 @@ export enum C2DStatusNumber {
// eslint-disable-next-line no-unused-vars
PullImageFailed = 11,
// eslint-disable-next-line no-unused-vars
BuildImage = 12,
// eslint-disable-next-line no-unused-vars
BuildImageFailed = 13,
// eslint-disable-next-line no-unused-vars
ConfiguringVolumes = 20,
// eslint-disable-next-line no-unused-vars
VolumeCreationFailed = 21,
Expand Down Expand Up @@ -271,6 +287,10 @@ export enum C2DStatusText {
// eslint-disable-next-line no-unused-vars
PullImageFailed = 'Pulling algorithm image failed',
// eslint-disable-next-line no-unused-vars
BuildImage = 'Building algorithm image',
// eslint-disable-next-line no-unused-vars
BuildImageFailed = 'Building algorithm image failed',
// eslint-disable-next-line no-unused-vars
ConfiguringVolumes = 'Configuring volumes',
// eslint-disable-next-line no-unused-vars
VolumeCreationFailed = 'Volume creation failed',
Expand Down
Loading
Loading