@prosopo/datasets-fs 0.2.24 → 0.2.29
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/dist/cjs/cli/cli.cjs +1 -1
- package/dist/cli/cli.d.ts.map +1 -1
- package/dist/cli/cli.js +2 -2
- package/dist/cli/cli.js.map +1 -1
- package/dist/commands/flatten.d.ts.map +1 -1
- package/dist/commands/flatten.js +4 -1
- package/dist/commands/flatten.js.map +1 -1
- package/dist/commands/generate.d.ts.map +1 -1
- package/dist/commands/generate.js +10 -4
- package/dist/commands/generate.js.map +1 -1
- package/dist/commands/generateV1.d.ts.map +1 -1
- package/dist/commands/generateV1.js +16 -6
- package/dist/commands/generateV1.js.map +1 -1
- package/dist/commands/generateV2.d.ts.map +1 -1
- package/dist/commands/generateV2.js +13 -5
- package/dist/commands/generateV2.js.map +1 -1
- package/dist/commands/labels.d.ts.map +1 -1
- package/dist/commands/labels.js +4 -2
- package/dist/commands/labels.js.map +1 -1
- package/dist/commands/resize.d.ts.map +1 -1
- package/dist/commands/resize.js +7 -3
- package/dist/commands/resize.js.map +1 -1
- package/dist/utils/input.d.ts.map +1 -1
- package/dist/utils/input.js +6 -4
- package/dist/utils/input.js.map +1 -1
- package/dist/utils/output.d.ts.map +1 -1
- package/dist/utils/output.js +6 -4
- package/dist/utils/output.js.map +1 -1
- package/package.json +4 -4
package/dist/cjs/cli/cli.cjs
CHANGED
package/dist/cli/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAY,QAAQ,
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAY,QAAQ,EAA8B,MAAM,iBAAiB,CAAA;AAOhF,qBAAa,GAAI,SAAQ,QAAQ;;gBAGjB,QAAQ,EAAE,aAAa,EAAE;IAMrC,OAAO,CAAC,MAAM;IAsCD,IAAI,CAAC,IAAI,GAAE,MAAM,EAA0B;CAK3D"}
|
package/dist/cli/cli.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
var _Cli_commands;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
|
-
import { LogLevel, Loggable, getLogger } from '@prosopo/common';
|
|
3
|
+
import { LogLevel, Loggable, ProsopoCliError, getLogger } from '@prosopo/common';
|
|
4
4
|
import { hideBin } from 'yargs/helpers';
|
|
5
5
|
import yargs from 'yargs';
|
|
6
6
|
const dirname = process.cwd();
|
|
@@ -37,7 +37,7 @@ export class Cli extends Loggable {
|
|
|
37
37
|
});
|
|
38
38
|
if (!__classPrivateFieldGet(this, _Cli_commands, "f").find((c) => c.getCommandName() === '$0')) {
|
|
39
39
|
y = y.command('$0', 'default command', (y) => y, (argv) => {
|
|
40
|
-
throw new
|
|
40
|
+
throw new ProsopoCliError('CLI.PARAMETER_ERROR', { context: { error: `no command specified` } });
|
|
41
41
|
});
|
|
42
42
|
}
|
|
43
43
|
y = y.demandCommand().strict().showHelpOnFail(false, 'Specify --help for available options');
|
package/dist/cli/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flatten.d.ts","sourceRoot":"","sources":["../../src/commands/flatten.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,EAAkD,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"flatten.d.ts","sourceRoot":"","sources":["../../src/commands/flatten.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,EAAkD,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAS/G,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;EAErB,CAAA;AACF,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAA;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAE1C,qBAAa,OAAQ,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IAC9C,YAAY;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;IAeJ,IAAI,CAAC,IAAI,EAAE,IAAI;CAkFxC"}
|
package/dist/commands/flatten.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as z from 'zod';
|
|
2
2
|
import { CaptchaItemTypes, DataSchema } from '@prosopo/types';
|
|
3
3
|
import { InputOutputArgsSchema as InputOutputArgsSchema, InputOutputCliCommand } from '../utils/inputOutput.js';
|
|
4
|
+
import { ProsopoDatasetError } from '@prosopo/common';
|
|
4
5
|
import { at } from '@prosopo/util';
|
|
5
6
|
import { blake2b } from '@noble/hashes/blake2b';
|
|
6
7
|
import { lodash } from '@prosopo/util/lodash';
|
|
@@ -66,7 +67,9 @@ export class Flatten extends InputOutputCliCommand {
|
|
|
66
67
|
}
|
|
67
68
|
}
|
|
68
69
|
if (!args.allowDuplicates) {
|
|
69
|
-
throw new
|
|
70
|
+
throw new ProsopoDatasetError('DATASET.DUPLICATE_IMAGE', {
|
|
71
|
+
context: { image: `${label}/${image}` },
|
|
72
|
+
});
|
|
70
73
|
}
|
|
71
74
|
}
|
|
72
75
|
fs.copyFileSync(`${dataDir}/${label}/${image}`, `${imageDir}/${name}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flatten.js","sourceRoot":"","sources":["../../src/commands/flatten.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"flatten.js","sourceRoot":"","sources":["../../src/commands/flatten.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAc,IAAI,EAAsB,YAAY,EAAyB,MAAM,gBAAgB,CAAA;AAC1G,OAAO,EAAoB,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAKvE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUrB,CAAA;AACF,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAA;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAE1C,8BAAsB,QAAQ,CAAC,CAAC,SAAS,cAAc,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAChE,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4CJ,MAAM,CAAC,IAAI,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAc,IAAI,EAAsB,YAAY,EAAyB,MAAM,gBAAgB,CAAA;AAC1G,OAAO,EAAoB,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAKvE,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUrB,CAAA;AACF,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAA;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAE1C,8BAAsB,QAAQ,CAAC,CAAC,SAAS,cAAc,CAAE,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAChE,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA4CJ,MAAM,CAAC,IAAI,EAAE,IAAI;IAkBvC,QAAQ,EAAE,YAAY,EAAE,CAAK;IAC7B,UAAU,EAAE,IAAI,EAAE,CAAK;IACvB,MAAM,EAAE,MAAM,EAAE,CAAK;IACrB,eAAe,SAAK;IACpB,iBAAiB,SAAK;IACtB,aAAa,EAAE;QAAE,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,CAAA;KAAE,CAAK;IAC/C,OAAO,EAAE,MAAM,EAAE,CAAK;IACtB,UAAU,SAAK;IAEf,OAAO,CAAC,QAAQ;IA4BhB,OAAO,CAAC,UAAU;IAeI,IAAI,CAAC,IAAI,EAAE,IAAI;CAWxC;AAED,eAAO,MAAM,eAAe,aACd,YAAY,EAAE,cACZ,IAAI,EAAE,WACT;IACL,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,yBAAyB,CAAC,EAAE,OAAO,CAAA;CACtC,SAMJ,CAAA"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as z from 'zod';
|
|
2
2
|
import { DataSchema, LabelledDataSchema, LabelsContainerSchema } from '@prosopo/types';
|
|
3
3
|
import { OutputArgsSchema, OutputCliCommand } from '../utils/output.js';
|
|
4
|
-
import {
|
|
4
|
+
import { ProsopoDatasetError } from '@prosopo/common';
|
|
5
5
|
import { lodash, setSeedGlobal } from '@prosopo/util/lodash';
|
|
6
6
|
import fs from 'fs';
|
|
7
7
|
export const ArgsSchema = OutputArgsSchema.extend({
|
|
@@ -72,11 +72,15 @@ export class Generate extends OutputCliCommand {
|
|
|
72
72
|
async _check(args) {
|
|
73
73
|
const labelledMapFile = args.labelled;
|
|
74
74
|
if (labelledMapFile && !fs.existsSync(labelledMapFile)) {
|
|
75
|
-
throw new
|
|
75
|
+
throw new ProsopoDatasetError(new Error(`labelled map file does not exist: ${labelledMapFile}`), {
|
|
76
|
+
translationKey: 'FS.FILE_NOT_FOUND',
|
|
77
|
+
});
|
|
76
78
|
}
|
|
77
79
|
const unlabelledMapFile = args.unlabelled;
|
|
78
80
|
if (unlabelledMapFile && !fs.existsSync(unlabelledMapFile)) {
|
|
79
|
-
throw new
|
|
81
|
+
throw new ProsopoDatasetError(new Error(`unlabelled map file does not exist: ${unlabelledMapFile}`), {
|
|
82
|
+
translationKey: 'FS.FILE_NOT_FOUND',
|
|
83
|
+
});
|
|
80
84
|
}
|
|
81
85
|
this.labelledMapFile = labelledMapFile || '';
|
|
82
86
|
this.unlabelledMapFile = unlabelledMapFile || '';
|
|
@@ -133,7 +137,9 @@ const addAllUnique = (all, entries, dataType) => {
|
|
|
133
137
|
};
|
|
134
138
|
const addUnique = (all, entry, dataType) => {
|
|
135
139
|
if (all.has(entry.data)) {
|
|
136
|
-
throw new
|
|
140
|
+
throw new ProsopoDatasetError('DATASET.DUPLICATE_IMAGE', {
|
|
141
|
+
context: { error: `Duplicate data entry in ${dataType} data: ${JSON.stringify(entry)}` },
|
|
142
|
+
});
|
|
137
143
|
}
|
|
138
144
|
all.add(entry.data);
|
|
139
145
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,UAAU,EAAQ,kBAAkB,EAAgB,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAC1G,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACvE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV1.d.ts","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,EAAE,QAAQ,EAAoC,MAAM,eAAe,CAAA;AAS1E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKrB,CAAA;AACF,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAA;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAE1C,qBAAa,UAAW,SAAQ,QAAQ,CAAC,cAAc,CAAC;IACpC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqB1B,OAAO,CAAC,cAAc;
|
|
1
|
+
{"version":3,"file":"generateV1.d.ts","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,EAAE,QAAQ,EAAoC,MAAM,eAAe,CAAA;AAS1E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKrB,CAAA;AACF,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAA;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAE1C,qBAAa,UAAW,SAAQ,QAAQ,CAAC,cAAc,CAAC;IACpC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqB1B,OAAO,CAAC,cAAc;IAuFtB,OAAO,CAAC,gBAAgB;IAgDF,IAAI,CAAC,IAAI,EAAE,IAAI;CAkCxC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as z from 'zod';
|
|
2
2
|
import { CaptchaTypes, CaptchasContainerSchema } from '@prosopo/types';
|
|
3
3
|
import { Generate, ArgsSchema as GenerateArgsSchema } from './generate.js';
|
|
4
|
-
import { ProsopoEnvError } from '@prosopo/common';
|
|
4
|
+
import { ProsopoDatasetError, ProsopoEnvError } from '@prosopo/common';
|
|
5
5
|
import { at, get } from '@prosopo/util';
|
|
6
6
|
import { blake2AsHex } from '@polkadot/util-crypto/blake2';
|
|
7
7
|
import { lodash } from '@prosopo/util/lodash';
|
|
@@ -47,7 +47,9 @@ export class GenerateV1 extends Generate {
|
|
|
47
47
|
for (let i = 0; i < solved; i++) {
|
|
48
48
|
bar.increment();
|
|
49
49
|
if (this.targets.length <= 1) {
|
|
50
|
-
throw new
|
|
50
|
+
throw new ProsopoDatasetError(new Error(`not enough different labels in labelled data`), {
|
|
51
|
+
translationKey: 'DATASET.NOT_ENOUGH_LABELS',
|
|
52
|
+
});
|
|
51
53
|
}
|
|
52
54
|
const target = at(this.targets, i % this.targets.length);
|
|
53
55
|
const notTargets = this.targets.filter((t) => t !== target);
|
|
@@ -56,10 +58,14 @@ export class GenerateV1 extends Generate {
|
|
|
56
58
|
const targetItems = get(this.labelToImages, target);
|
|
57
59
|
const notTargetItems = notTargets.map((notTarget) => get(this.labelToImages, notTarget)).flat();
|
|
58
60
|
if (targetItems.length < nCorrect) {
|
|
59
|
-
throw new ProsopoEnvError(new Error(`not enough images for target (${target})`),
|
|
61
|
+
throw new ProsopoEnvError(new Error(`not enough images for target (${target})`), {
|
|
62
|
+
translationKey: 'DATASET.NOT_ENOUGH_IMAGES',
|
|
63
|
+
});
|
|
60
64
|
}
|
|
61
65
|
if (notTargetItems.length < nIncorrect) {
|
|
62
|
-
throw new
|
|
66
|
+
throw new ProsopoDatasetError(new Error(`not enough non-matching images for target (${target})`), {
|
|
67
|
+
translationKey: 'DATASET.NOT_ENOUGH_IMAGES',
|
|
68
|
+
});
|
|
63
69
|
}
|
|
64
70
|
const correctItems = _.sampleSize(targetItems, nCorrect);
|
|
65
71
|
const incorrectItems = _.sampleSize(notTargetItems, nIncorrect);
|
|
@@ -102,10 +108,14 @@ export class GenerateV1 extends Generate {
|
|
|
102
108
|
for (let i = 0; i < unsolved; i++) {
|
|
103
109
|
bar.increment();
|
|
104
110
|
if (this.unlabelled.length <= size) {
|
|
105
|
-
throw new
|
|
111
|
+
throw new ProsopoDatasetError(new Error(`unlabelled map file does not contain enough data`), {
|
|
112
|
+
translationKey: 'DATASET.NOT_ENOUGH_IMAGES',
|
|
113
|
+
});
|
|
106
114
|
}
|
|
107
115
|
if (this.labels.length <= 0) {
|
|
108
|
-
throw new
|
|
116
|
+
throw new ProsopoDatasetError(new Error(`no labels found for unlabelled data`), {
|
|
117
|
+
translationKey: 'DATASET.NOT_ENOUGH_LABELS',
|
|
118
|
+
});
|
|
109
119
|
}
|
|
110
120
|
const index = _.random(0, this.labels.length - 1);
|
|
111
121
|
const target = at(this.labels, index);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV1.js","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,YAAY,EAA8B,uBAAuB,EAAqB,MAAM,gBAAgB,CAAA;AACrH,OAAO,EAAE,QAAQ,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"generateV1.js","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV2.d.ts","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,EAAE,QAAQ,EAAoC,MAAM,eAAe,CAAA;AAS1E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMrB,CAAA;AACF,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAA;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAE1C,qBAAa,UAAW,SAAQ,QAAQ,CAAC,cAAc,CAAC;;IAmBpC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyB1B,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"generateV2.d.ts","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,EAAE,QAAQ,EAAoC,MAAM,eAAe,CAAA;AAS1E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMrB,CAAA;AACF,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAA;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAE1C,qBAAa,UAAW,SAAQ,QAAQ,CAAC,cAAc,CAAC;;IAmBpC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyB1B,OAAO,CAAC,WAAW;IAgDG,IAAI,CAAC,IAAI,EAAE,IAAI;CAiHxC"}
|
|
@@ -3,7 +3,7 @@ import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
|
3
3
|
import * as z from 'zod';
|
|
4
4
|
import { CaptchaTypes, CaptchasContainerSchema } from '@prosopo/types';
|
|
5
5
|
import { Generate, ArgsSchema as GenerateArgsSchema } from './generate.js';
|
|
6
|
-
import {
|
|
6
|
+
import { ProsopoDatasetError } from '@prosopo/common';
|
|
7
7
|
import { at, get } from '@prosopo/util';
|
|
8
8
|
import { blake2AsHex } from '@polkadot/util-crypto/blake2';
|
|
9
9
|
import { lodash } from '@prosopo/util/lodash';
|
|
@@ -71,7 +71,9 @@ export class GenerateV2 extends Generate {
|
|
|
71
71
|
setupTarget(i) {
|
|
72
72
|
const _ = lodash();
|
|
73
73
|
if (this.targets.length <= 1) {
|
|
74
|
-
throw new
|
|
74
|
+
throw new ProsopoDatasetError(new Error(`not enough different labels in labelled data`), {
|
|
75
|
+
translationKey: 'DATASET.NOT_ENOUGH_LABELS',
|
|
76
|
+
});
|
|
75
77
|
}
|
|
76
78
|
const target = at(this.targets, i % this.targets.length);
|
|
77
79
|
const notTargets = this.targets.filter((t) => t !== target);
|
|
@@ -83,13 +85,19 @@ export class GenerateV2 extends Generate {
|
|
|
83
85
|
const targetItems = get(this.labelToImages, target);
|
|
84
86
|
const notTargetItems = notTargets.map((notTarget) => get(this.labelToImages, notTarget)).flat();
|
|
85
87
|
if (nUnlabelled > this.unlabelled.length) {
|
|
86
|
-
throw new
|
|
88
|
+
throw new ProsopoDatasetError(new Error(`not enough unlabelled data`), {
|
|
89
|
+
translationKey: 'DATASET.NOT_ENOUGH_IMAGES',
|
|
90
|
+
});
|
|
87
91
|
}
|
|
88
92
|
if (nCorrect > targetItems.length) {
|
|
89
|
-
throw new
|
|
93
|
+
throw new ProsopoDatasetError(new Error(`not enough images for target (${target})`), {
|
|
94
|
+
translationKey: 'DATASET.NOT_ENOUGH_IMAGES',
|
|
95
|
+
});
|
|
90
96
|
}
|
|
91
97
|
if (nIncorrect > notTargetItems.length) {
|
|
92
|
-
throw new
|
|
98
|
+
throw new ProsopoDatasetError(new Error(`not enough non-matching images for target (${target})`), {
|
|
99
|
+
translationKey: 'DATASET.NOT_ENOUGH_IMAGES',
|
|
100
|
+
});
|
|
93
101
|
}
|
|
94
102
|
__classPrivateFieldSet(this, _GenerateV2_nCorrect, nCorrect, "f");
|
|
95
103
|
__classPrivateFieldSet(this, _GenerateV2_nIncorrect, nIncorrect, "f");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV2.js","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,YAAY,EAA8B,uBAAuB,EAAqB,MAAM,gBAAgB,CAAA;AACrH,OAAO,EAAE,QAAQ,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAC1E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"generateV2.js","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,YAAY,EAA8B,uBAAuB,EAAqB,MAAM,gBAAgB,CAAA;AACrH,OAAO,EAAE,QAAQ,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,WAAW,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,CAAC,MAAM,UAAU,GAAG,kBAAkB,CAAC,MAAM,CAAC;IAChD,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACjC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACnC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,WAAW,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAA;AAIF,MAAM,OAAO,UAAW,SAAQ,QAAwB;IAAxD;;QACI,2BAAQ,CAAC,EAAA;QACT,iCAAc,CAAC,EAAA;QACf,iCAAc,EAAE,EAAA;QAChB,8CAA2B,KAAK,EAAA;QAChC,gDAA6B,KAAK,EAAA;QAClC,mCAAgB,CAAC,EAAA;QACjB,kCAAe,CAAC,EAAA;QAChB,kCAAe,CAAC,EAAA;QAChB,4BAAS,CAAC,EAAA;QACV,+BAAY,CAAC,EAAA;QACb,iCAAc,CAAC,EAAA;QACf,gCAAa,CAAC,EAAA;QACd,kCAAe,CAAC,EAAA;QAChB,6BAAU,EAAE,EAAA;QACZ,8BAAqB,EAAE,EAAA;QACvB,kCAAuB,EAAE,EAAA;QACzB,qCAA0B,EAAE,EAAA;IAoMhC,CAAC;IAlMmB,YAAY;QACxB,OAAO,UAAU,CAAA;IACrB,CAAC;IAEe,cAAc;QAC1B,OAAO,gJAAgJ,CAAA;IAC3J,CAAC;IAEe,UAAU;QACtB,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YACtC,KAAK,EAAE;gBACH,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,gCAAgC;aAChD;YACD,UAAU,EAAE;gBACR,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,kDAAkD;aAClE;YACD,YAAY,EAAE;gBACV,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,oDAAoD;aACpE;YACD,WAAW,EAAE;gBACT,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,mDAAmD;aACnE;YACD,WAAW,EAAE;gBACT,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,mDAAmD;aACnE;SACJ,CAAC,CAAA;IACN,CAAC;IAEO,WAAW,CAAC,CAAS;QACzB,MAAM,CAAC,GAAG,MAAM,EAAE,CAAA;QAClB,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE;YAC1B,MAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,CAAC,8CAA8C,CAAC,EAAE;gBACrF,cAAc,EAAE,2BAA2B;aAC9C,CAAC,CAAA;SACL;QAGD,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACxD,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,CAAA;QAE3D,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC,uBAAA,IAAI,+BAAa,EAAE,uBAAA,IAAI,+BAAa,CAAC,CAAA;QAEhE,MAAM,UAAU,GAAG,SAAS,GAAG,uBAAA,IAAI,8BAAY,CAAA;QAC/C,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CAAC,uBAAA,IAAI,8BAAY,EAAE,UAAU,CAAC,CAAA;QACvD,MAAM,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAA;QACvC,MAAM,WAAW,GAAG,uBAAA,IAAI,wBAAM,GAAG,SAAS,CAAA;QAE1C,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;QACnD,MAAM,cAAc,GAAW,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAEvG,IAAI,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YACtC,MAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,CAAC,4BAA4B,CAAC,EAAE;gBACnE,cAAc,EAAE,2BAA2B;aAC9C,CAAC,CAAA;SACL;QACD,IAAI,QAAQ,GAAG,WAAW,CAAC,MAAM,EAAE;YAC/B,MAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,CAAC,iCAAiC,MAAM,GAAG,CAAC,EAAE;gBACjF,cAAc,EAAE,2BAA2B;aAC9C,CAAC,CAAA;SACL;QACD,IAAI,UAAU,GAAG,cAAc,CAAC,MAAM,EAAE;YACpC,MAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,CAAC,8CAA8C,MAAM,GAAG,CAAC,EAAE;gBAC9F,cAAc,EAAE,2BAA2B;aAC9C,CAAC,CAAA;SACL;QAED,uBAAA,IAAI,wBAAa,QAAQ,MAAA,CAAA;QACzB,uBAAA,IAAI,0BAAe,UAAU,MAAA,CAAA;QAC7B,uBAAA,IAAI,yBAAc,SAAS,MAAA,CAAA;QAC3B,uBAAA,IAAI,2BAAgB,WAAW,MAAA,CAAA;QAC/B,uBAAA,IAAI,sBAAW,MAAM,MAAA,CAAA;QACrB,uBAAA,IAAI,uBAAY,UAAU,MAAA,CAAA;QAC1B,uBAAA,IAAI,2BAAgB,WAAW,MAAA,CAAA;QAC/B,uBAAA,IAAI,8BAAmB,cAAc,MAAA,CAAA;IACzC,CAAC;IAEe,KAAK,CAAC,IAAI,CAAC,IAAU;QACjC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEtB,MAAM,OAAO,GAAW,IAAI,CAAC,MAAM,CAAA;QAGnC,MAAM,CAAC,GAAG,MAAM,EAAE,CAAA;QAElB,uBAAA,IAAI,oBAAS,IAAI,CAAC,IAAI,IAAI,CAAC,MAAA,CAAA;QAC3B,uBAAA,IAAI,0BAAe,IAAI,CAAC,UAAU,IAAI,CAAC,MAAA,CAAA;QACvC,uBAAA,IAAI,0BAAe,EAAE,MAAA,CAAA;QACrB,uBAAA,IAAI,uCAA4B,IAAI,CAAC,uBAAuB,IAAI,IAAI,CAAC,eAAe,IAAI,KAAK,MAAA,CAAA;QAC7F,uBAAA,IAAI,yCAA8B,IAAI,CAAC,yBAAyB,IAAI,IAAI,CAAC,eAAe,IAAI,KAAK,MAAA,CAAA;QACjG,uBAAA,IAAI,4BAAiB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,EAAE,CAAC,CAAC,MAAA,CAAA;QACxD,uBAAA,IAAI,2BAAgB,uBAAA,IAAI,8BAAY,GAAG,uBAAA,IAAI,gCAAc,MAAA,CAAA;QACzD,uBAAA,IAAI,2BAAgB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,uBAAA,IAAI,wBAAM,EAAE,uBAAA,IAAI,wBAAM,CAAC,MAAA,CAAA;QACxE,uBAAA,IAAI,qBAAU,IAAI,CAAC,KAAK,IAAI,CAAC,MAAA,CAAA;QAO7B,MAAM,GAAG,GAAG,IAAI,WAAW,CAAC,SAAS,CAAC,EAAE,EAAE,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAC7E,GAAG,CAAC,KAAK,CAAC,uBAAA,IAAI,yBAAO,EAAE,CAAC,CAAC,CAAA;QAGzB,MAAM,QAAQ,GAAuB,EAAE,CAAA;QACvC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,uBAAA,IAAI,yBAAO,EAAE,CAAC,EAAE,EAAE;YAClC,GAAG,CAAC,SAAS,EAAE,CAAA;YAEf,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;YAGnB,MAAM,YAAY,GAAW,CAAC,CAAC,UAAU,CAAC,uBAAA,IAAI,+BAAa,EAAE,uBAAA,IAAI,4BAAU,CAAC,CAAA;YAG5E,MAAM,cAAc,GAAW,CAAC,CAAC,UAAU,CAAC,uBAAA,IAAI,kCAAgB,EAAE,uBAAA,IAAI,8BAAY,CAAC,CAAA;YAGnF,MAAM,eAAe,GAAG,IAAI,GAAG,EAAQ,CAAA;YACvC,OAAO,eAAe,CAAC,IAAI,GAAG,uBAAA,IAAI,wBAAM,GAAG,uBAAA,IAAI,6BAAW,EAAE;gBAExD,MAAM,KAAK,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;gBAC1E,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;aAC7B;YAED,MAAM,WAAW,GAAW,CAAC,GAAG,YAAY,EAAE,GAAG,cAAc,EAAE,GAAG,eAAe,CAAC,CAAA;YACpF,IAAI,OAAO,GAAa,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;YAC7D,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YAC5B,MAAM,KAAK,GAAG,OAAO;iBAChB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;iBAC9B,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACV,OAAO;oBACH,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;iBAClB,CAAA;YACL,CAAC,CAAC,CAAA;YAGN,MAAM,QAAQ,GAAkB,OAAO;iBAClC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;gBACd,OAAO;oBACH,GAAG,EAAE,KAAK;oBACV,IAAI,EAAE,CAAC;iBACV,CAAA;YACL,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,MAAM,CAAC;iBAChD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACV,OAAO,IAAI,CAAC,IAAI,CAAA;YACpB,CAAC,CAAC,CAAA;YAGN,MAAM,iBAAiB,GAAkB,OAAO;iBAC3C,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;gBACd,OAAO;oBACH,GAAG,EAAE,KAAK;oBACV,IAAI,EAAE,CAAC;iBACV,CAAA;YACL,CAAC,CAAC;iBACD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,YAAY,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;iBACzE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACV,OAAO,IAAI,CAAC,IAAI,CAAA;YACpB,CAAC,CAAC,CAAA;YAEN,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,uBAAA,IAAI,8BAAY,CAAC,CAAC,CAAA;YAE9D,MAAM,OAAO,GAAqB;gBAC9B,IAAI;gBACJ,MAAM,EAAE,uBAAA,IAAI,0BAAQ;gBACpB,KAAK;gBACL,QAAQ;gBACR,UAAU,EAAE,iBAAiB;aAChC,CAAA;YACD,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;SACzB;QACD,GAAG,CAAC,IAAI,EAAE,CAAA;QAGV,MAAM,MAAM,GAAa;YACrB,QAAQ;YACR,MAAM,EAAE,YAAY,CAAC,SAAS;SACjC,CAAA;QAGD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAClC,uBAAuB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAErC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAChC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAChF,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAC9D,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"labels.d.ts","sourceRoot":"","sources":["../../src/commands/labels.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAkD,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAM/G,eAAO,MAAM,UAAU;;;;;;;;;;;;EAAmC,CAAA;AAC1D,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAA;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAE1C,qBAAa,MAAO,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IAC7C,YAAY;;;;;;;;;;;;;IAIZ,UAAU;;;;;;;;;;IAWJ,IAAI,CAAC,IAAI,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"labels.d.ts","sourceRoot":"","sources":["../../src/commands/labels.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAkD,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAM/G,eAAO,MAAM,UAAU;;;;;;;;;;;;EAAmC,CAAA;AAC1D,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAA;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAE1C,qBAAa,MAAO,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IAC7C,YAAY;;;;;;;;;;;;;IAIZ,UAAU;;;;;;;;;;IAWJ,IAAI,CAAC,IAAI,EAAE,IAAI;IAyBrB,cAAc,IAAI,MAAM;CAG3C"}
|
package/dist/commands/labels.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { InputOutputArgsSchema as InputOutputArgsSchema, InputOutputCliCommand } from '../utils/inputOutput.js';
|
|
2
2
|
import { LabelledDataSchema } from '@prosopo/types';
|
|
3
|
-
import {
|
|
3
|
+
import { ProsopoDatasetError } from '@prosopo/common';
|
|
4
4
|
import { lodash } from '@prosopo/util/lodash';
|
|
5
5
|
import fs from 'fs';
|
|
6
6
|
export const ArgsSchema = InputOutputArgsSchema.extend({});
|
|
@@ -22,7 +22,9 @@ export class Labels extends InputOutputCliCommand {
|
|
|
22
22
|
await super._run(args);
|
|
23
23
|
const file = args.input;
|
|
24
24
|
if (!fs.existsSync(file)) {
|
|
25
|
-
throw new
|
|
25
|
+
throw new ProsopoDatasetError(new Error(`file does not exist: ${file}`), {
|
|
26
|
+
translationKey: 'FS.FILE_NOT_FOUND',
|
|
27
|
+
});
|
|
26
28
|
}
|
|
27
29
|
const labelled = file
|
|
28
30
|
? LabelledDataSchema.parse(JSON.parse(fs.readFileSync(file, 'utf8'))).items
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"labels.js","sourceRoot":"","sources":["../../src/commands/labels.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,IAAI,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/G,OAAO,EAAE,kBAAkB,EAAgB,MAAM,gBAAgB,CAAA;AACjE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"labels.js","sourceRoot":"","sources":["../../src/commands/labels.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,IAAI,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/G,OAAO,EAAE,kBAAkB,EAAgB,MAAM,gBAAgB,CAAA;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,CAAC,MAAM,UAAU,GAAG,qBAAqB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AAI1D,MAAM,OAAO,MAAO,SAAQ,qBAAqC;IAC7C,YAAY;QACxB,OAAO,UAAU,CAAA;IACrB,CAAC;IAEe,UAAU;QACtB,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YACtC,KAAK,EAAE;gBACH,WAAW,EAAE,oCAAoC;aACpD;YACD,MAAM,EAAE;gBACJ,WAAW,EAAE,8CAA8C;aAC9D;SACJ,CAAC,CAAA;IACN,CAAC;IAEe,KAAK,CAAC,IAAI,CAAC,IAAU;QACjC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAEtB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAA;QACvB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACtB,MAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,CAAC,wBAAwB,IAAI,EAAE,CAAC,EAAE;gBACrE,cAAc,EAAE,mBAAmB;aACtC,CAAC,CAAA;SACL;QAED,MAAM,QAAQ,GAAmB,IAAI;YACjC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK;YAC3E,CAAC,CAAC,EAAE,CAAA;QAER,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAA;QAChC,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE;YACzB,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;SACzB;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACrC,UAAU,CAAC,IAAI,EAAE,CAAA;QAEjB,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAChF,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC;IAEe,cAAc;QAC1B,OAAO,+BAA+B,CAAA;IAC1C,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../src/commands/resize.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,EAAkD,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAS/G,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;EAGrB,CAAA;AACF,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAA;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAE1C,qBAAa,MAAO,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IAC7C,YAAY;;;;;;;;;;;;;;;;;;;IAIZ,UAAU;;;;;;;;;;;;;;;;;;IAsBJ,IAAI,CAAC,IAAI,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"resize.d.ts","sourceRoot":"","sources":["../../src/commands/resize.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AAExB,OAAO,EAAkD,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAS/G,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;EAGrB,CAAA;AACF,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAA;AAC9C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;AAE1C,qBAAa,MAAO,SAAQ,qBAAqB,CAAC,cAAc,CAAC;IAC7C,YAAY;;;;;;;;;;;;;;;;;;;IAIZ,UAAU;;;;;;;;;;;;;;;;;;IAsBJ,IAAI,CAAC,IAAI,EAAE,IAAI;IA4FrB,cAAc,IAAI,MAAM;CAG3C"}
|
package/dist/commands/resize.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as z from 'zod';
|
|
2
2
|
import { DataSchema } from '@prosopo/types';
|
|
3
3
|
import { InputOutputArgsSchema as InputOutputArgsSchema, InputOutputCliCommand } from '../utils/inputOutput.js';
|
|
4
|
-
import { ProsopoEnvError } from '@prosopo/common';
|
|
4
|
+
import { ProsopoDatasetError, ProsopoEnvError } from '@prosopo/common';
|
|
5
5
|
import { blake2b } from '@noble/hashes/blake2b';
|
|
6
6
|
import { lodash } from '@prosopo/util/lodash';
|
|
7
7
|
import { u8aToHex } from '@polkadot/util/u8a';
|
|
@@ -40,12 +40,16 @@ export class Resize extends InputOutputCliCommand {
|
|
|
40
40
|
const square = args.square ?? false;
|
|
41
41
|
const mapFile = args.input;
|
|
42
42
|
if (!fs.existsSync(mapFile)) {
|
|
43
|
-
throw new
|
|
43
|
+
throw new ProsopoDatasetError(new Error(`Map file does not exist: ${mapFile}`), {
|
|
44
|
+
translationKey: 'FS.FILE_NOT_FOUND',
|
|
45
|
+
});
|
|
44
46
|
}
|
|
45
47
|
const outDir = args.output;
|
|
46
48
|
const overwrite = args.overwrite || false;
|
|
47
49
|
if (!overwrite && fs.existsSync(outDir)) {
|
|
48
|
-
throw new ProsopoEnvError(new Error(`Output directory already exists: ${outDir}`),
|
|
50
|
+
throw new ProsopoEnvError(new Error(`Output directory already exists: ${outDir}`), {
|
|
51
|
+
translationKey: 'FS.FILE_NOT_FOUND',
|
|
52
|
+
});
|
|
49
53
|
}
|
|
50
54
|
const imgDir = `${outDir}/images`;
|
|
51
55
|
fs.mkdirSync(imgDir, { recursive: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resize.js","sourceRoot":"","sources":["../../src/commands/resize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAQ,UAAU,EAAQ,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,qBAAqB,IAAI,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAC/G,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"resize.js","sourceRoot":"","sources":["../../src/commands/resize.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAIjD,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAA;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAEvD,qBAAa,eAAe,CAAC,CAAC,SAAS,OAAO,eAAe,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAChE,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;IAWJ,MAAM,CAAC,IAAI,EAAE,SAAS;
|
|
1
|
+
{"version":3,"file":"input.d.ts","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAIjD,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAA;AAEF,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAEvD,qBAAa,eAAe,CAAC,CAAC,SAAS,OAAO,eAAe,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;IAChE,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;IAWJ,MAAM,CAAC,IAAI,EAAE,SAAS;CAU/C"}
|
package/dist/utils/input.js
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import * as z from 'zod';
|
|
2
2
|
import { CliCommand } from '../cli/cliCommand.js';
|
|
3
|
-
import {
|
|
3
|
+
import { ProsopoDatasetError, ProsopoError } from '@prosopo/common';
|
|
4
4
|
import fs from 'fs';
|
|
5
5
|
export const InputArgsSchema = z.object({
|
|
6
6
|
input: z.string(),
|
|
7
7
|
});
|
|
8
8
|
export class InputCliCommand extends CliCommand {
|
|
9
9
|
getArgSchema() {
|
|
10
|
-
throw new
|
|
10
|
+
throw new ProsopoError('DEVELOPER.METHOD_NOT_IMPLEMENTED');
|
|
11
11
|
}
|
|
12
12
|
getDescription() {
|
|
13
|
-
throw new
|
|
13
|
+
throw new ProsopoError('DEVELOPER.METHOD_NOT_IMPLEMENTED');
|
|
14
14
|
}
|
|
15
15
|
getOptions() {
|
|
16
16
|
return {
|
|
@@ -26,7 +26,9 @@ export class InputCliCommand extends CliCommand {
|
|
|
26
26
|
this.logger.debug('input _check');
|
|
27
27
|
await super._check(args);
|
|
28
28
|
if (!fs.existsSync(args.input)) {
|
|
29
|
-
throw new
|
|
29
|
+
throw new ProsopoDatasetError(new Error(`input path does not exist: ${args.input}`), {
|
|
30
|
+
translationKey: 'FS.FILE_NOT_FOUND',
|
|
31
|
+
});
|
|
30
32
|
}
|
|
31
33
|
}
|
|
32
34
|
}
|
package/dist/utils/input.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"input.js","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"input.js","sourceRoot":"","sources":["../../src/utils/input.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AACnE,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;CACpB,CAAC,CAAA;AAIF,MAAM,OAAO,eAAkD,SAAQ,UAAa;IAChE,YAAY;QACxB,MAAM,IAAI,YAAY,CAAC,kCAAkC,CAAC,CAAA;IAC9D,CAAC;IACe,cAAc;QAC1B,MAAM,IAAI,YAAY,CAAC,kCAAkC,CAAC,CAAA;IAC9D,CAAC;IACe,UAAU;QACtB,OAAO;YACH,KAAK,EAAE;gBACH,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,gBAAgB;aAChC;SACJ,CAAA;IACL,CAAC;IAEe,KAAK,CAAC,MAAM,CAAC,IAAe;QACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QACjC,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAExB,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAC5B,MAAM,IAAI,mBAAmB,CAAC,IAAI,KAAK,CAAC,8BAA8B,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE;gBACjF,cAAc,EAAE,mBAAmB;aACtC,CAAC,CAAA;SACL;IACL,CAAC;CACJ"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAA2B,KAAK,IAAI,MAAM,EAAE,MAAM,KAAK,CAAA;AAI9D,eAAO,MAAM,gBAAgB;;;;;;;;;EAG3B,CAAA;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAExD,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,gBAAgB,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;;IAG3E,YAAY;IAIH,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;;;;;;;IAeJ,MAAM,CAAC,IAAI,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAA2B,KAAK,IAAI,MAAM,EAAE,MAAM,KAAK,CAAA;AAI9D,eAAO,MAAM,gBAAgB;;;;;;;;;EAG3B,CAAA;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAExD,qBAAa,gBAAgB,CAAC,CAAC,SAAS,OAAO,gBAAgB,CAAE,SAAQ,UAAU,CAAC,CAAC,CAAC;;IAG3E,YAAY;IAIH,YAAY,IAAI,CAAC;IAGjB,cAAc,IAAI,MAAM;IAGxB,UAAU;;;;;;;;;;;;;;IAeJ,MAAM,CAAC,IAAI,EAAE,UAAU;IAiBvB,IAAI,CAAC,IAAI,EAAE,UAAU;CAS9C"}
|
package/dist/utils/output.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var _OutputCliCommand_outputExists;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
3
|
import { CliCommand } from '../cli/cliCommand.js';
|
|
4
|
-
import { ProsopoEnvError } from '@prosopo/common';
|
|
4
|
+
import { ProsopoEnvError, ProsopoError } from '@prosopo/common';
|
|
5
5
|
import { boolean, object, string } from 'zod';
|
|
6
6
|
import { lodash } from '@prosopo/util/lodash';
|
|
7
7
|
import fs from 'fs';
|
|
@@ -18,10 +18,10 @@ export class OutputCliCommand extends CliCommand {
|
|
|
18
18
|
return __classPrivateFieldGet(this, _OutputCliCommand_outputExists, "f");
|
|
19
19
|
}
|
|
20
20
|
getArgSchema() {
|
|
21
|
-
throw new
|
|
21
|
+
throw new ProsopoError('DEVELOPER.METHOD_NOT_IMPLEMENTED');
|
|
22
22
|
}
|
|
23
23
|
getDescription() {
|
|
24
|
-
throw new
|
|
24
|
+
throw new ProsopoError('DEVELOPER.METHOD_NOT_IMPLEMENTED');
|
|
25
25
|
}
|
|
26
26
|
getOptions() {
|
|
27
27
|
return lodash().merge(super.getOptions(), {
|
|
@@ -43,7 +43,9 @@ export class OutputCliCommand extends CliCommand {
|
|
|
43
43
|
__classPrivateFieldSet(this, _OutputCliCommand_outputExists, fs.existsSync(args.output), "f");
|
|
44
44
|
if (this.outputExists()) {
|
|
45
45
|
if (!args.overwrite) {
|
|
46
|
-
throw new ProsopoEnvError(new Error(`output path already exists: ${args.output}`),
|
|
46
|
+
throw new ProsopoEnvError(new Error(`output path already exists: ${args.output}`), {
|
|
47
|
+
translationKey: 'FS.FILE_ALREADY_EXISTS',
|
|
48
|
+
});
|
|
47
49
|
}
|
|
48
50
|
}
|
|
49
51
|
}
|
package/dist/utils/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAmB,MAAM,KAAK,CAAA;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,MAAM,IAAI,CAAA;AAEnB,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC;IACnC,MAAM,EAAE,MAAM,EAAE;IAChB,SAAS,EAAE,OAAO,EAAE,CAAC,QAAQ,EAAE;CAClC,CAAC,CAAA;AAIF,MAAM,OAAO,gBAAoD,SAAQ,UAAa;IAAtF;;QACI,yCAAgB,KAAK,EAAA;IAqDzB,CAAC;IAnDU,YAAY;QACf,OAAO,uBAAA,IAAI,sCAAc,CAAA;IAC7B,CAAC;IAEe,YAAY;QACxB,MAAM,IAAI,YAAY,CAAC,kCAAkC,CAAC,CAAA;IAC9D,CAAC;IACe,cAAc;QAC1B,MAAM,IAAI,YAAY,CAAC,kCAAkC,CAAC,CAAA;IAC9D,CAAC;IACe,UAAU;QACtB,OAAO,MAAM,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE;YACtC,MAAM,EAAE;gBACJ,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,IAAI;gBACZ,MAAM,EAAE,IAAI;gBACZ,WAAW,EAAE,iBAAiB;aACjC;YACD,SAAS,EAAE;gBACP,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,0DAA0D;aAC1E;SACJ,CAAC,CAAA;IACN,CAAC;IAEe,KAAK,CAAC,MAAM,CAAC,IAAgB;QACzC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAClC,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAGxB,uBAAA,IAAI,kCAAiB,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAA,CAAA;QAG/C,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACjB,MAAM,IAAI,eAAe,CAAC,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE;oBAC/E,cAAc,EAAE,wBAAwB;iBAC3C,CAAC,CAAA;aACL;SACJ;IACL,CAAC;IAEe,KAAK,CAAC,IAAI,CAAC,IAAgB;QACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC/B,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;YAEvC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;YAChD,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;SAC9C;IACL,CAAC;CACJ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prosopo/datasets-fs",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.29",
|
|
4
4
|
"author": "PROSOPO LIMITED <info@prosopo.io>",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"private": false,
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
"types": "./dist/index.d.ts",
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@polkadot/util": "^12.3.2",
|
|
35
|
-
"@prosopo/common": "0.2.
|
|
36
|
-
"@prosopo/types": "0.2.
|
|
37
|
-
"@prosopo/util": "0.2.
|
|
35
|
+
"@prosopo/common": "0.2.29",
|
|
36
|
+
"@prosopo/types": "0.2.29",
|
|
37
|
+
"@prosopo/util": "0.2.29",
|
|
38
38
|
"bcrypt": "^5.1.0",
|
|
39
39
|
"cli-progress": "^3.12.0",
|
|
40
40
|
"fs": "^0.0.1-security",
|