@oceanprotocol/lib 4.2.1 → 4.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +16 -0
- package/ComputeExamples.md +7 -1
- package/dist/lib.cjs +1 -1
- package/dist/lib.cjs.map +1 -1
- package/dist/lib.modern.js +1 -1
- package/dist/lib.modern.js.map +1 -1
- package/dist/lib.module.mjs +1 -1
- package/dist/lib.module.mjs.map +1 -1
- package/dist/lib.umd.js +1 -1
- package/dist/lib.umd.js.map +1 -1
- package/dist/types/@types/Compute.d.ts +4 -0
- package/dist/types/services/Provider.d.ts +10 -5
- package/package.json +2 -2
|
@@ -56,6 +56,9 @@ export interface ComputeResult {
|
|
|
56
56
|
type: ComputeResultType;
|
|
57
57
|
index?: number;
|
|
58
58
|
}
|
|
59
|
+
export type ComputeJobMetadata = {
|
|
60
|
+
[key: string]: string | number | boolean;
|
|
61
|
+
};
|
|
59
62
|
export interface ComputeJob {
|
|
60
63
|
owner: string;
|
|
61
64
|
did?: string;
|
|
@@ -69,6 +72,7 @@ export interface ComputeJob {
|
|
|
69
72
|
algoDID?: string;
|
|
70
73
|
agreementId?: string;
|
|
71
74
|
expireTimestamp: number;
|
|
75
|
+
metadata?: ComputeJobMetadata;
|
|
72
76
|
}
|
|
73
77
|
export interface ComputeOutput {
|
|
74
78
|
publishAlgorithmLog?: boolean;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Signer } from 'ethers';
|
|
2
|
-
import { Arweave, FileInfo, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ProviderInitialize, ProviderComputeInitializeResults, ServiceEndpoint, UrlFile, UserCustomParameters, Ipfs, ComputeResourceRequest } from '../@types';
|
|
2
|
+
import { Arweave, FileInfo, ComputeJob, ComputeOutput, ComputeAlgorithm, ComputeAsset, ComputeEnvironment, ProviderInitialize, ProviderComputeInitializeResults, ServiceEndpoint, UrlFile, UserCustomParameters, Ipfs, ComputeResourceRequest, ComputeJobMetadata } from '../@types';
|
|
3
3
|
export declare class Provider {
|
|
4
4
|
private getConsumerAddress;
|
|
5
5
|
private getSignature;
|
|
@@ -111,10 +111,11 @@ export declare class Provider {
|
|
|
111
111
|
* @param {SignerOrAuthToken} signerOrAuthToken Signer or auth token
|
|
112
112
|
* @param {ComputeResourceRequest[]} resources The resources to start compute job with.
|
|
113
113
|
* @param {number} chainId The chain used to do payments
|
|
114
|
+
* @param {any} policyServer Policy server data.
|
|
114
115
|
* @param {AbortSignal} signal abort signal
|
|
115
116
|
* @return {Promise<ProviderComputeInitialize>} ProviderComputeInitialize data
|
|
116
117
|
*/
|
|
117
|
-
initializeCompute(assets: ComputeAsset[], algorithm: ComputeAlgorithm, computeEnv: string, token: string, validUntil: number, providerUri: string, signerOrAuthToken: Signer | string, resources: ComputeResourceRequest[], chainId: number, signal?: AbortSignal): Promise<ProviderComputeInitializeResults>;
|
|
118
|
+
initializeCompute(assets: ComputeAsset[], algorithm: ComputeAlgorithm, computeEnv: string, token: string, validUntil: number, providerUri: string, signerOrAuthToken: Signer | string, resources: ComputeResourceRequest[], chainId: number, policyServer?: any, signal?: AbortSignal): Promise<ProviderComputeInitializeResults>;
|
|
118
119
|
/**
|
|
119
120
|
* Gets the download URL.
|
|
120
121
|
* @param {string} did - The DID.
|
|
@@ -123,7 +124,7 @@ export declare class Provider {
|
|
|
123
124
|
* @param {string} transferTxId - The transfer transaction ID.
|
|
124
125
|
* @param {string} providerUri - The provider URI.
|
|
125
126
|
* @param {SignerOrAuthToken} signerOrAuthToken - The signer or auth token.
|
|
126
|
-
* @param {any} policyServer
|
|
127
|
+
* @param {any} policyServer Policy server data.
|
|
127
128
|
* @param {UserCustomParameters} userCustomParameters - The user custom parameters.
|
|
128
129
|
* @returns {Promise<any>} The download URL.
|
|
129
130
|
*/
|
|
@@ -151,12 +152,14 @@ export declare class Provider {
|
|
|
151
152
|
* @param {string} token The token address for compute payment.
|
|
152
153
|
* @param {ComputeResourceRequest} resources The resources to start compute job with.
|
|
153
154
|
* @param {chainId} chainId The chain used to do payments
|
|
155
|
+
* @param {ComputeJobMetadata} metadata The compute job metadata. Additional metadata to be stored in the database.
|
|
154
156
|
* @param {ComputeOutput} output The compute job output settings.
|
|
157
|
+
* @param {any} policyServer Policy server data.
|
|
155
158
|
* @param {AbortSignal} signal abort signal
|
|
156
159
|
* @return {Promise<ComputeJob | ComputeJob[]>} The compute job or jobs.
|
|
157
160
|
*/
|
|
158
161
|
computeStart(providerUri: string, signerOrAuthToken: Signer | string, computeEnv: string, datasets: ComputeAsset[], algorithm: ComputeAlgorithm, maxJobDuration: number, token: string, resources: ComputeResourceRequest[], chainId: number, // network used by payment (only for payed compute jobs)
|
|
159
|
-
output?: ComputeOutput, signal?: AbortSignal): Promise<ComputeJob | ComputeJob[]>;
|
|
162
|
+
metadata?: ComputeJobMetadata, output?: ComputeOutput, policyServer?: any, signal?: AbortSignal): Promise<ComputeJob | ComputeJob[]>;
|
|
160
163
|
/** Instruct the provider to start a FREE compute job (new C2D V2)
|
|
161
164
|
* @param {string} providerUri The provider URI.
|
|
162
165
|
* @param {SignerOrAuthToken} signerOrAuthToken The consumer signer object or auth token.
|
|
@@ -164,11 +167,13 @@ export declare class Provider {
|
|
|
164
167
|
* @param {ComputeAsset} datasets The dataset to start compute on + additionalDatasets (the additional datasets if that is the case)
|
|
165
168
|
* @param {ComputeAlgorithm} algorithm The algorithm to start compute with.
|
|
166
169
|
* @param {ComputeResourceRequest} resources The resources to start compute job with.
|
|
170
|
+
* @param {ComputeJobMetadata} metadata The compute job metadata. Additional metadata to be stored in the database.
|
|
167
171
|
* @param {ComputeOutput} output The compute job output settings.
|
|
172
|
+
* @param {any} policyServer Policy server data.
|
|
168
173
|
* @param {AbortSignal} signal abort signal
|
|
169
174
|
* @return {Promise<ComputeJob | ComputeJob[]>} The compute job or jobs.
|
|
170
175
|
*/
|
|
171
|
-
freeComputeStart(providerUri: string, signerOrAuthToken: Signer | string, computeEnv: string, datasets: ComputeAsset[], algorithm: ComputeAlgorithm, resources?: ComputeResourceRequest[], output?: ComputeOutput, signal?: AbortSignal): Promise<ComputeJob | ComputeJob[]>;
|
|
176
|
+
freeComputeStart(providerUri: string, signerOrAuthToken: Signer | string, computeEnv: string, datasets: ComputeAsset[], algorithm: ComputeAlgorithm, resources?: ComputeResourceRequest[], metadata?: ComputeJobMetadata, output?: ComputeOutput, policyServer?: any, signal?: AbortSignal): Promise<ComputeJob | ComputeJob[]>;
|
|
172
177
|
/**
|
|
173
178
|
*
|
|
174
179
|
* @param providerUri provider URL
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oceanprotocol/lib",
|
|
3
3
|
"source": "./src/index.ts",
|
|
4
|
-
"version": "4.
|
|
4
|
+
"version": "4.3.1",
|
|
5
5
|
"description": "JavaScript client library for Ocean Protocol",
|
|
6
6
|
"main": "./dist/lib.cjs",
|
|
7
7
|
"umd:main": "dist/lib.umd.js",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"dependencies": {
|
|
59
59
|
"@oasisprotocol/sapphire-paratime": "^1.3.2",
|
|
60
60
|
"@oceanprotocol/contracts": "^2.3.0",
|
|
61
|
-
"@oceanprotocol/ddo-js": "^0.1.
|
|
61
|
+
"@oceanprotocol/ddo-js": "^0.1.2",
|
|
62
62
|
"@rdfjs/dataset": "^2.0.2",
|
|
63
63
|
"@rdfjs/formats-common": "^3.1.0",
|
|
64
64
|
"@zazuko/env-node": "^2.1.4",
|