@vertesia/client 0.57.0 → 0.58.0
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/lib/cjs/store/FilesApi.js +29 -19
- package/lib/cjs/store/FilesApi.js.map +1 -1
- package/lib/cjs/store/ObjectsApi.js +20 -17
- package/lib/cjs/store/ObjectsApi.js.map +1 -1
- package/lib/esm/store/FilesApi.js +29 -19
- package/lib/esm/store/FilesApi.js.map +1 -1
- package/lib/esm/store/ObjectsApi.js +20 -17
- package/lib/esm/store/ObjectsApi.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/types/AccountApi.d.ts +1 -0
- package/lib/types/AccountsApi.d.ts +1 -0
- package/lib/types/AnalyticsApi.d.ts +1 -0
- package/lib/types/ApiKeysApi.d.ts +1 -0
- package/lib/types/CommandsApi.d.ts +1 -0
- package/lib/types/EnvironmentsApi.d.ts +1 -0
- package/lib/types/IamApi.d.ts +1 -0
- package/lib/types/InteractionBase.d.ts +1 -0
- package/lib/types/InteractionsApi.d.ts +1 -0
- package/lib/types/PluginsApi.d.ts +1 -0
- package/lib/types/ProjectsApi.d.ts +1 -0
- package/lib/types/PromptsApi.d.ts +1 -0
- package/lib/types/RefsApi.d.ts +1 -0
- package/lib/types/RunsApi.d.ts +1 -0
- package/lib/types/StreamSource.d.ts +1 -0
- package/lib/types/TrainingApi.d.ts +1 -0
- package/lib/types/UsersApi.d.ts +1 -0
- package/lib/types/client.d.ts +1 -0
- package/lib/types/execute.d.ts +1 -0
- package/lib/types/index.d.ts +1 -0
- package/lib/types/nodejs/NodeStreamSource.d.ts +1 -0
- package/lib/types/nodejs/index.d.ts +1 -0
- package/lib/types/store/AgentsApi.d.ts +1 -0
- package/lib/types/store/AnalyzeDocApi.d.ts +1 -0
- package/lib/types/store/CollectionsApi.d.ts +1 -0
- package/lib/types/store/CommandsApi.d.ts +1 -0
- package/lib/types/store/EmbeddingsApi.d.ts +1 -0
- package/lib/types/store/FilesApi.d.ts +2 -0
- package/lib/types/store/FilesApi.d.ts.map +1 -1
- package/lib/types/store/ObjectsApi.d.ts +2 -7
- package/lib/types/store/ObjectsApi.d.ts.map +1 -1
- package/lib/types/store/TypesApi.d.ts +1 -0
- package/lib/types/store/WorkflowsApi.d.ts +1 -0
- package/lib/types/store/client.d.ts +1 -0
- package/lib/types/store/errors.d.ts +1 -0
- package/lib/types/store/index.d.ts +1 -0
- package/lib/vertesia-client.js +1 -1
- package/lib/vertesia-client.js.map +1 -1
- package/package.json +4 -4
- package/src/store/FilesApi.ts +83 -55
- package/src/store/ObjectsApi.ts +311 -296
|
@@ -4,7 +4,7 @@ exports.FilesApi = exports.MEMORIES_PREFIX = void 0;
|
|
|
4
4
|
exports.getMemoryFilePath = getMemoryFilePath;
|
|
5
5
|
const api_fetch_client_1 = require("@vertesia/api-fetch-client");
|
|
6
6
|
const StreamSource_js_1 = require("../StreamSource.js");
|
|
7
|
-
exports.MEMORIES_PREFIX =
|
|
7
|
+
exports.MEMORIES_PREFIX = "memories";
|
|
8
8
|
function getMemoryFilePath(name) {
|
|
9
9
|
const nameWithExt = name.endsWith(".tar.gz") ? name : name + ".tar.gz";
|
|
10
10
|
return `${exports.MEMORIES_PREFIX}/${nameWithExt}`;
|
|
@@ -13,6 +13,10 @@ class FilesApi extends api_fetch_client_1.ApiTopic {
|
|
|
13
13
|
constructor(parent) {
|
|
14
14
|
super(parent, "/api/v1/files");
|
|
15
15
|
}
|
|
16
|
+
async deleteFile(path, prefix) {
|
|
17
|
+
const res = await this.delete(`/${path}`, { query: { prefix } });
|
|
18
|
+
return res.count;
|
|
19
|
+
}
|
|
16
20
|
/**
|
|
17
21
|
* get the metadata of a blob given its URI. Supported URI are:
|
|
18
22
|
* starting with s3:// and gs://.
|
|
@@ -23,8 +27,8 @@ class FilesApi extends api_fetch_client_1.ApiTopic {
|
|
|
23
27
|
getMetadata(uri) {
|
|
24
28
|
return this.get("/metadata", {
|
|
25
29
|
query: {
|
|
26
|
-
file: uri
|
|
27
|
-
}
|
|
30
|
+
file: uri,
|
|
31
|
+
},
|
|
28
32
|
});
|
|
29
33
|
}
|
|
30
34
|
/**
|
|
@@ -33,18 +37,18 @@ class FilesApi extends api_fetch_client_1.ApiTopic {
|
|
|
33
37
|
* @returns
|
|
34
38
|
*/
|
|
35
39
|
getOrCreateBucket() {
|
|
36
|
-
return this.post(
|
|
40
|
+
return this.post("/bucket");
|
|
37
41
|
}
|
|
38
42
|
getUploadUrl(payload) {
|
|
39
|
-
return this.post(
|
|
40
|
-
payload
|
|
43
|
+
return this.post("/upload-url", {
|
|
44
|
+
payload,
|
|
41
45
|
});
|
|
42
46
|
}
|
|
43
47
|
getDownloadUrl(file) {
|
|
44
|
-
return this.post(
|
|
48
|
+
return this.post("/download-url", {
|
|
45
49
|
payload: {
|
|
46
|
-
file
|
|
47
|
-
}
|
|
50
|
+
file,
|
|
51
|
+
},
|
|
48
52
|
});
|
|
49
53
|
}
|
|
50
54
|
/**
|
|
@@ -56,14 +60,15 @@ class FilesApi extends api_fetch_client_1.ApiTopic {
|
|
|
56
60
|
const isStream = source instanceof StreamSource_js_1.StreamSource;
|
|
57
61
|
const { url, path } = await this.getUploadUrl(source);
|
|
58
62
|
await fetch(url, {
|
|
59
|
-
method:
|
|
63
|
+
method: "PUT",
|
|
60
64
|
body: isStream ? source.stream : source,
|
|
61
65
|
//@ts-ignore: duplex is not in the types. See https://github.com/node-fetch/node-fetch/issues/1769
|
|
62
66
|
duplex: isStream ? "half" : undefined,
|
|
63
67
|
headers: {
|
|
64
|
-
|
|
65
|
-
}
|
|
66
|
-
})
|
|
68
|
+
"Content-Type": source.type || "application/gzip",
|
|
69
|
+
},
|
|
70
|
+
})
|
|
71
|
+
.then((res) => {
|
|
67
72
|
if (res.ok) {
|
|
68
73
|
return res;
|
|
69
74
|
}
|
|
@@ -71,8 +76,9 @@ class FilesApi extends api_fetch_client_1.ApiTopic {
|
|
|
71
76
|
console.log(res);
|
|
72
77
|
throw new Error(`Failed to upload file: ${res.statusText}`);
|
|
73
78
|
}
|
|
74
|
-
})
|
|
75
|
-
|
|
79
|
+
})
|
|
80
|
+
.catch((err) => {
|
|
81
|
+
console.error("Failed to upload file", err);
|
|
76
82
|
throw err;
|
|
77
83
|
});
|
|
78
84
|
return path;
|
|
@@ -80,8 +86,9 @@ class FilesApi extends api_fetch_client_1.ApiTopic {
|
|
|
80
86
|
async downloadFile(name) {
|
|
81
87
|
const { url } = await this.getDownloadUrl(name);
|
|
82
88
|
const res = await fetch(url, {
|
|
83
|
-
method:
|
|
84
|
-
})
|
|
89
|
+
method: "GET",
|
|
90
|
+
})
|
|
91
|
+
.then((res) => {
|
|
85
92
|
if (res.ok) {
|
|
86
93
|
return res;
|
|
87
94
|
}
|
|
@@ -95,7 +102,8 @@ class FilesApi extends api_fetch_client_1.ApiTopic {
|
|
|
95
102
|
console.log(res);
|
|
96
103
|
throw new Error(`Failed to download file ${name}: ${res.statusText}`);
|
|
97
104
|
}
|
|
98
|
-
})
|
|
105
|
+
})
|
|
106
|
+
.catch((err) => {
|
|
99
107
|
console.error(`Failed to download file ${name}.`, err);
|
|
100
108
|
throw err;
|
|
101
109
|
});
|
|
@@ -106,7 +114,9 @@ class FilesApi extends api_fetch_client_1.ApiTopic {
|
|
|
106
114
|
}
|
|
107
115
|
async uploadMemoryPack(source) {
|
|
108
116
|
const fileId = getMemoryFilePath(source.name);
|
|
109
|
-
const nameWithExt = source.name.endsWith(".tar.gz")
|
|
117
|
+
const nameWithExt = source.name.endsWith(".tar.gz")
|
|
118
|
+
? source.name
|
|
119
|
+
: source.name + ".tar.gz";
|
|
110
120
|
if (source instanceof File) {
|
|
111
121
|
let file = source;
|
|
112
122
|
return this.uploadFile(new StreamSource_js_1.StreamSource(file.stream(), nameWithExt, file.type, fileId));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilesApi.js","sourceRoot":"","sources":["../../../src/store/FilesApi.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"FilesApi.js","sourceRoot":"","sources":["../../../src/store/FilesApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,21 +95,21 @@ class ObjectsApi extends api_fetch_client_1.ApiTopic {
|
|
|
95
95
|
});
|
|
96
96
|
// upload the file content to the signed URL
|
|
97
97
|
/*const res = await this.fetch(url, {
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
98
|
+
method: 'PUT',
|
|
99
|
+
//@ts-ignore: duplex is not in the types. See https://github.com/node-fetch/node-fetch/issues/1769
|
|
100
|
+
duplex: isStream ? "half" : undefined,
|
|
101
|
+
body: isStream ? source.stream : source,
|
|
102
|
+
headers: {
|
|
103
|
+
'Content-Type': mime_type || 'application/octet-stream'
|
|
104
|
+
}
|
|
105
|
+
}).then((res: Response) => {
|
|
106
|
+
if (res.ok) {
|
|
107
|
+
return res;
|
|
108
|
+
} else {
|
|
109
|
+
console.log(res);
|
|
110
|
+
throw new Error(`Failed to upload file: ${res.statusText}`);
|
|
111
|
+
}
|
|
112
|
+
});*/
|
|
113
113
|
const res = await fetch(url, {
|
|
114
114
|
method: "PUT",
|
|
115
115
|
body: isStream ? source.stream : source,
|
|
@@ -148,7 +148,8 @@ class ObjectsApi extends api_fetch_client_1.ApiTopic {
|
|
|
148
148
|
const createPayload = {
|
|
149
149
|
...payload,
|
|
150
150
|
};
|
|
151
|
-
if (payload.content instanceof StreamSource_js_1.StreamSource ||
|
|
151
|
+
if (payload.content instanceof StreamSource_js_1.StreamSource ||
|
|
152
|
+
payload.content instanceof File) {
|
|
152
153
|
createPayload.content = await this.upload(payload.content);
|
|
153
154
|
}
|
|
154
155
|
return await this.post("/", {
|
|
@@ -195,7 +196,8 @@ class ObjectsApi extends api_fetch_client_1.ApiTopic {
|
|
|
195
196
|
...payload,
|
|
196
197
|
};
|
|
197
198
|
// Handle file upload if content is provided as File or StreamSource
|
|
198
|
-
if (payload.content instanceof StreamSource_js_1.StreamSource ||
|
|
199
|
+
if (payload.content instanceof StreamSource_js_1.StreamSource ||
|
|
200
|
+
payload.content instanceof File) {
|
|
199
201
|
updatePayload.content = await this.upload(payload.content);
|
|
200
202
|
}
|
|
201
203
|
if (options?.createRevision) {
|
|
@@ -235,6 +237,7 @@ class ObjectsApi extends api_fetch_client_1.ApiTopic {
|
|
|
235
237
|
const query = {
|
|
236
238
|
max_hw: options.max_hw,
|
|
237
239
|
generate_if_missing: options.generate_if_missing,
|
|
240
|
+
as_signed_url: options.sign_url,
|
|
238
241
|
};
|
|
239
242
|
return this.get(`/${documentId}/renditions/${options.format}`, { query });
|
|
240
243
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectsApi.js","sourceRoot":"","sources":["../../../src/store/ObjectsApi.ts"],"names":[],"mappings":";;;AAAA,iEAAkE;
|
|
1
|
+
{"version":3,"file":"ObjectsApi.js","sourceRoot":"","sources":["../../../src/store/ObjectsApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ApiTopic } from "@vertesia/api-fetch-client";
|
|
2
2
|
import { StreamSource } from "../StreamSource.js";
|
|
3
|
-
export const MEMORIES_PREFIX =
|
|
3
|
+
export const MEMORIES_PREFIX = "memories";
|
|
4
4
|
export function getMemoryFilePath(name) {
|
|
5
5
|
const nameWithExt = name.endsWith(".tar.gz") ? name : name + ".tar.gz";
|
|
6
6
|
return `${MEMORIES_PREFIX}/${nameWithExt}`;
|
|
@@ -9,6 +9,10 @@ export class FilesApi extends ApiTopic {
|
|
|
9
9
|
constructor(parent) {
|
|
10
10
|
super(parent, "/api/v1/files");
|
|
11
11
|
}
|
|
12
|
+
async deleteFile(path, prefix) {
|
|
13
|
+
const res = await this.delete(`/${path}`, { query: { prefix } });
|
|
14
|
+
return res.count;
|
|
15
|
+
}
|
|
12
16
|
/**
|
|
13
17
|
* get the metadata of a blob given its URI. Supported URI are:
|
|
14
18
|
* starting with s3:// and gs://.
|
|
@@ -19,8 +23,8 @@ export class FilesApi extends ApiTopic {
|
|
|
19
23
|
getMetadata(uri) {
|
|
20
24
|
return this.get("/metadata", {
|
|
21
25
|
query: {
|
|
22
|
-
file: uri
|
|
23
|
-
}
|
|
26
|
+
file: uri,
|
|
27
|
+
},
|
|
24
28
|
});
|
|
25
29
|
}
|
|
26
30
|
/**
|
|
@@ -29,18 +33,18 @@ export class FilesApi extends ApiTopic {
|
|
|
29
33
|
* @returns
|
|
30
34
|
*/
|
|
31
35
|
getOrCreateBucket() {
|
|
32
|
-
return this.post(
|
|
36
|
+
return this.post("/bucket");
|
|
33
37
|
}
|
|
34
38
|
getUploadUrl(payload) {
|
|
35
|
-
return this.post(
|
|
36
|
-
payload
|
|
39
|
+
return this.post("/upload-url", {
|
|
40
|
+
payload,
|
|
37
41
|
});
|
|
38
42
|
}
|
|
39
43
|
getDownloadUrl(file) {
|
|
40
|
-
return this.post(
|
|
44
|
+
return this.post("/download-url", {
|
|
41
45
|
payload: {
|
|
42
|
-
file
|
|
43
|
-
}
|
|
46
|
+
file,
|
|
47
|
+
},
|
|
44
48
|
});
|
|
45
49
|
}
|
|
46
50
|
/**
|
|
@@ -52,14 +56,15 @@ export class FilesApi extends ApiTopic {
|
|
|
52
56
|
const isStream = source instanceof StreamSource;
|
|
53
57
|
const { url, path } = await this.getUploadUrl(source);
|
|
54
58
|
await fetch(url, {
|
|
55
|
-
method:
|
|
59
|
+
method: "PUT",
|
|
56
60
|
body: isStream ? source.stream : source,
|
|
57
61
|
//@ts-ignore: duplex is not in the types. See https://github.com/node-fetch/node-fetch/issues/1769
|
|
58
62
|
duplex: isStream ? "half" : undefined,
|
|
59
63
|
headers: {
|
|
60
|
-
|
|
61
|
-
}
|
|
62
|
-
})
|
|
64
|
+
"Content-Type": source.type || "application/gzip",
|
|
65
|
+
},
|
|
66
|
+
})
|
|
67
|
+
.then((res) => {
|
|
63
68
|
if (res.ok) {
|
|
64
69
|
return res;
|
|
65
70
|
}
|
|
@@ -67,8 +72,9 @@ export class FilesApi extends ApiTopic {
|
|
|
67
72
|
console.log(res);
|
|
68
73
|
throw new Error(`Failed to upload file: ${res.statusText}`);
|
|
69
74
|
}
|
|
70
|
-
})
|
|
71
|
-
|
|
75
|
+
})
|
|
76
|
+
.catch((err) => {
|
|
77
|
+
console.error("Failed to upload file", err);
|
|
72
78
|
throw err;
|
|
73
79
|
});
|
|
74
80
|
return path;
|
|
@@ -76,8 +82,9 @@ export class FilesApi extends ApiTopic {
|
|
|
76
82
|
async downloadFile(name) {
|
|
77
83
|
const { url } = await this.getDownloadUrl(name);
|
|
78
84
|
const res = await fetch(url, {
|
|
79
|
-
method:
|
|
80
|
-
})
|
|
85
|
+
method: "GET",
|
|
86
|
+
})
|
|
87
|
+
.then((res) => {
|
|
81
88
|
if (res.ok) {
|
|
82
89
|
return res;
|
|
83
90
|
}
|
|
@@ -91,7 +98,8 @@ export class FilesApi extends ApiTopic {
|
|
|
91
98
|
console.log(res);
|
|
92
99
|
throw new Error(`Failed to download file ${name}: ${res.statusText}`);
|
|
93
100
|
}
|
|
94
|
-
})
|
|
101
|
+
})
|
|
102
|
+
.catch((err) => {
|
|
95
103
|
console.error(`Failed to download file ${name}.`, err);
|
|
96
104
|
throw err;
|
|
97
105
|
});
|
|
@@ -102,7 +110,9 @@ export class FilesApi extends ApiTopic {
|
|
|
102
110
|
}
|
|
103
111
|
async uploadMemoryPack(source) {
|
|
104
112
|
const fileId = getMemoryFilePath(source.name);
|
|
105
|
-
const nameWithExt = source.name.endsWith(".tar.gz")
|
|
113
|
+
const nameWithExt = source.name.endsWith(".tar.gz")
|
|
114
|
+
? source.name
|
|
115
|
+
: source.name + ".tar.gz";
|
|
106
116
|
if (source instanceof File) {
|
|
107
117
|
let file = source;
|
|
108
118
|
return this.uploadFile(new StreamSource(file.stream(), nameWithExt, file.type, fileId));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilesApi.js","sourceRoot":"","sources":["../../../src/store/FilesApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"FilesApi.js","sourceRoot":"","sources":["../../../src/store/FilesApi.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,21 +92,21 @@ export class ObjectsApi extends ApiTopic {
|
|
|
92
92
|
});
|
|
93
93
|
// upload the file content to the signed URL
|
|
94
94
|
/*const res = await this.fetch(url, {
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
95
|
+
method: 'PUT',
|
|
96
|
+
//@ts-ignore: duplex is not in the types. See https://github.com/node-fetch/node-fetch/issues/1769
|
|
97
|
+
duplex: isStream ? "half" : undefined,
|
|
98
|
+
body: isStream ? source.stream : source,
|
|
99
|
+
headers: {
|
|
100
|
+
'Content-Type': mime_type || 'application/octet-stream'
|
|
101
|
+
}
|
|
102
|
+
}).then((res: Response) => {
|
|
103
|
+
if (res.ok) {
|
|
104
|
+
return res;
|
|
105
|
+
} else {
|
|
106
|
+
console.log(res);
|
|
107
|
+
throw new Error(`Failed to upload file: ${res.statusText}`);
|
|
108
|
+
}
|
|
109
|
+
});*/
|
|
110
110
|
const res = await fetch(url, {
|
|
111
111
|
method: "PUT",
|
|
112
112
|
body: isStream ? source.stream : source,
|
|
@@ -145,7 +145,8 @@ export class ObjectsApi extends ApiTopic {
|
|
|
145
145
|
const createPayload = {
|
|
146
146
|
...payload,
|
|
147
147
|
};
|
|
148
|
-
if (payload.content instanceof StreamSource ||
|
|
148
|
+
if (payload.content instanceof StreamSource ||
|
|
149
|
+
payload.content instanceof File) {
|
|
149
150
|
createPayload.content = await this.upload(payload.content);
|
|
150
151
|
}
|
|
151
152
|
return await this.post("/", {
|
|
@@ -192,7 +193,8 @@ export class ObjectsApi extends ApiTopic {
|
|
|
192
193
|
...payload,
|
|
193
194
|
};
|
|
194
195
|
// Handle file upload if content is provided as File or StreamSource
|
|
195
|
-
if (payload.content instanceof StreamSource ||
|
|
196
|
+
if (payload.content instanceof StreamSource ||
|
|
197
|
+
payload.content instanceof File) {
|
|
196
198
|
updatePayload.content = await this.upload(payload.content);
|
|
197
199
|
}
|
|
198
200
|
if (options?.createRevision) {
|
|
@@ -232,6 +234,7 @@ export class ObjectsApi extends ApiTopic {
|
|
|
232
234
|
const query = {
|
|
233
235
|
max_hw: options.max_hw,
|
|
234
236
|
generate_if_missing: options.generate_if_missing,
|
|
237
|
+
as_signed_url: options.sign_url,
|
|
235
238
|
};
|
|
236
239
|
return this.get(`/${documentId}/renditions/${options.format}`, { query });
|
|
237
240
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectsApi.js","sourceRoot":"","sources":["../../../src/store/ObjectsApi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAc,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"ObjectsApi.js","sourceRoot":"","sources":["../../../src/store/ObjectsApi.ts"],"names":[],"mappings":"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"}
|