Skip to content

Commit ed11f6e

Browse files
committed
updates to include metadata in all formdatas
1 parent 8aa2266 commit ed11f6e

File tree

19 files changed

+168
-81
lines changed

19 files changed

+168
-81
lines changed

components/_2markdown/actions/html-file-to-markdown/html-file-to-markdown.mjs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import _2markdown from "../../_2markdown.app.mjs";
2-
import { getFileStream } from "@pipedream/platform";
2+
import { getFileStreamAndMetadata } from "@pipedream/platform";
33
import FormData from "form-data";
44

55
export default {
@@ -20,7 +20,14 @@ export default {
2020
async run({ $ }) {
2121
const form = new FormData();
2222

23-
form.append("document", await getFileStream(this.filePath));
23+
const {
24+
stream, metadata,
25+
} = await getFileStreamAndMetadata(this.filePath);
26+
form.append("document", stream, {
27+
contentType: metadata.contentType,
28+
knownLength: metadata.size,
29+
filename: metadata.name,
30+
});
2431

2532
const response = await this._2markdown.htmlFileToMarkdown({
2633
$,

components/_2markdown/actions/pdf-to-markdown/pdf-to-markdown.mjs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import _2markdown from "../../_2markdown.app.mjs";
2-
import { getFileStream } from "@pipedream/platform";
2+
import { getFileStreamAndMetadata } from "@pipedream/platform";
33
import FormData from "form-data";
44

55
export default {
@@ -27,7 +27,14 @@ export default {
2727
async run({ $ }) {
2828
const form = new FormData();
2929

30-
form.append("document", await getFileStream(this.filePath));
30+
const {
31+
stream, metadata,
32+
} = await getFileStreamAndMetadata(this.filePath);
33+
form.append("document", stream, {
34+
contentType: metadata.contentType,
35+
knownLength: metadata.size,
36+
filename: metadata.name,
37+
});
3138

3239
let response = await this._2markdown.pdfToMarkdown({
3340
$,

components/akeneo/actions/create-a-new-product-media-file/create-a-new-product-media-file.mjs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import app from "../../akeneo.app.mjs";
22
import {
3-
ConfigurationError, getFileStream,
3+
ConfigurationError, getFileStreamAndMetadata,
44
} from "@pipedream/platform";
55
import FormData from "form-data";
66

@@ -55,9 +55,14 @@ export default {
5555
data.append("product_model", JSON.stringify(payload));
5656
}
5757

58-
const fileStream = await getFileStream(this.filename);
59-
const fileParts = this.filename.split("/");
60-
data.append("file", fileStream, fileParts[fileParts.length - 1]);
58+
const {
59+
stream, metadata,
60+
} = await getFileStreamAndMetadata(this.filename);
61+
data.append("file", stream, {
62+
contentType: metadata.contentType,
63+
knownLength: metadata.size,
64+
filename: metadata.name,
65+
});
6166
const contentLength = data.getLengthSync();
6267
await this.app.createProductMediaFile({
6368
$,

components/askyourpdf/askyourpdf.app.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ export default {
2727
...headers,
2828
};
2929
},
30-
getConfig({
30+
async getConfig({
3131
headers, data: preData, ...args
3232
} = {}) {
3333
const contentType = constants.CONTENT_TYPE_KEY_HEADER;
3434
const hasMultipartHeader = utils.hasMultipartHeader(headers);
35-
const data = hasMultipartHeader && utils.getFormData(preData) || preData;
35+
const data = hasMultipartHeader && await utils.getFormData(preData) || preData;
3636
const currentHeaders = this.getHeaders(headers);
3737

3838
return {
@@ -49,7 +49,7 @@ export default {
4949
async makeRequest({
5050
step = this, path, headers, data, summary, ...args
5151
} = {}) {
52-
const config = this.getConfig({
52+
const config = await this.getConfig({
5353
url: this.getUrl(path),
5454
headers,
5555
data,

components/askyourpdf/common/utils.mjs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getFileStream } from "@pipedream/platform";
1+
import { getFileStreamAndMetadata } from "@pipedream/platform";
22
import FormData from "form-data";
33
import constants from "./constants.mjs";
44

@@ -8,16 +8,23 @@ async function buildFormData(formData, data, parentKey) {
88
await buildFormData(formData, data[key], parentKey && `${parentKey}[${key}]` || key);
99
}
1010
} else if (data && constants.FILE_PROP_NAMES.some((prop) => parentKey.includes(prop))) {
11-
formData.append(parentKey, await getFileStream(data));
11+
const {
12+
stream, metadata,
13+
} = await getFileStreamAndMetadata(data);
14+
formData.append(parentKey, stream, {
15+
contentType: metadata.contentType,
16+
knownLength: metadata.size,
17+
filename: metadata.name,
18+
});
1219
} else if (data) {
1320
formData.append(parentKey, (data).toString());
1421
}
1522
}
1623

17-
function getFormData(data) {
24+
async function getFormData(data) {
1825
try {
1926
const formData = new FormData();
20-
buildFormData(formData, data);
27+
await buildFormData(formData, data);
2128
return formData;
2229
} catch (error) {
2330
console.log("FormData Error", error);

components/fileforge/actions/generate-pdf/generate-pdf.mjs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import FormData from "form-data";
2-
import { getFileStream } from "@pipedream/platform";
2+
import { getFileStreamAndMetadata } from "@pipedream/platform";
33
import { parseObject } from "../../common/utils.mjs";
44
import fileforge from "../../fileforge.app.mjs";
55

@@ -63,7 +63,14 @@ export default {
6363
const parsedFiles = parseObject(files);
6464

6565
for (const file of parsedFiles) {
66-
formData.append("files", await getFileStream(file));
66+
const {
67+
stream, metadata,
68+
} = await getFileStreamAndMetadata(file);
69+
formData.append("files", stream, {
70+
contentType: metadata.contentType,
71+
knownLength: metadata.size,
72+
filename: metadata.name,
73+
});
6774
}
6875

6976
formData.append("options", JSON.stringify({

components/mapbox/actions/create-tileset/create-tileset.mjs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import mapbox from "../../mapbox.app.mjs";
2-
import { getFileStream } from "@pipedream/platform";
2+
import { getFileStreamAndMetadata } from "@pipedream/platform";
33
import FormData from "form-data";
44

55
export default {
@@ -51,8 +51,14 @@ export default {
5151
// Create Tileset Source
5252
try {
5353
const fileData = new FormData();
54-
const content = await getFileStream(filePath);
55-
fileData.append("file", content);
54+
const {
55+
stream, metadata,
56+
} = await getFileStreamAndMetadata(filePath);
57+
fileData.append("file", stream, {
58+
contentType: metadata.contentType,
59+
knownLength: metadata.size,
60+
filename: metadata.name,
61+
});
5662

5763
await this.mapbox.createTilesetSource({
5864
$,

components/mistral_ai/actions/upload-file/upload-file.mjs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import mistralAI from "../../mistral_ai.app.mjs";
2-
import { getFileStream } from "@pipedream/platform";
2+
import { getFileStreamAndMetadata } from "@pipedream/platform";
33
import FormData from "form-data";
44

55
export default {
@@ -28,9 +28,15 @@ export default {
2828
},
2929
},
3030
async run({ $ }) {
31-
const fileContent = await getFileStream(this.filePath);
31+
const {
32+
stream, metadata,
33+
} = await getFileStreamAndMetadata(this.filePath);
3234
const form = new FormData();
33-
form.append("file", fileContent);
35+
form.append("file", stream, {
36+
contentType: metadata.contentType,
37+
knownLength: metadata.size,
38+
filename: metadata.name,
39+
});
3440
if (this.purpose) {
3541
form.append("purpose", this.purpose);
3642
}

components/monday/actions/update-column-values/update-column-values.mjs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import common from "../common/column-values.mjs";
22
import {
3-
axios, getFileStream,
3+
axios, getFileStreamAndMetadata,
44
} from "@pipedream/platform";
55
import FormData from "form-data";
66
import { getColumnOptions } from "../../common/utils.mjs";
@@ -63,11 +63,17 @@ export default {
6363
$, itemId, column, filePath,
6464
}) {
6565
const query = `mutation ($file: File!) { add_file_to_column (file: $file, item_id: ${itemId}, column_id: "${column.id}") { id } }`;
66-
const content = await getFileStream(filePath);
66+
const {
67+
stream, metadata,
68+
} = await getFileStreamAndMetadata(filePath);
6769

6870
const formData = new FormData();
6971
formData.append("query", query);
70-
formData.append("variables[file]", content);
72+
formData.append("variables[file]", stream, {
73+
contentType: metadata.contentType,
74+
knownLength: metadata.size,
75+
filename: metadata.name,
76+
});
7177

7278
return axios($, {
7379
method: "POST",

components/nyckel/common/common-image.mjs

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import nyckel from "../nyckel.app.mjs";
22
import FormData from "form-data";
3-
import { getFileStream } from "@pipedream/platform";
3+
import { getFileStreamAndMetadata } from "@pipedream/platform";
44

55
export default {
66
props: {
@@ -13,22 +13,15 @@ export default {
1313
},
1414
methods: {
1515
async getImageData() {
16-
const { imageOrUrl } = this;
17-
const isUrl = imageOrUrl.startsWith("http");
18-
if (isUrl) {
19-
return {
20-
data: {
21-
data: imageOrUrl,
22-
},
23-
headers: {
24-
"Content-Type": "application/json",
25-
},
26-
};
27-
}
28-
2916
const data = new FormData();
30-
const stream = await getFileStream(imageOrUrl);
31-
data.append("data", stream);
17+
const {
18+
stream, metadata,
19+
} = await getFileStreamAndMetadata(this.imageOrUrl);
20+
data.append("data", stream, {
21+
contentType: metadata.contentType,
22+
knownLength: metadata.size,
23+
filename: metadata.name,
24+
});
3225

3326
return {
3427
data,

0 commit comments

Comments
 (0)