@prosopo/datasets-fs 1.0.2 → 2.0.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/README.md +17 -5
- package/dist/cjs/cli/cli.cjs +8 -5
- package/dist/cli/cli.d.ts +2 -2
- package/dist/cli/cli.d.ts.map +1 -1
- package/dist/cli/cli.js +18 -13
- package/dist/cli/cli.js.map +1 -1
- package/dist/cli/cliCommand.d.ts +3 -3
- package/dist/cli/cliCommand.d.ts.map +1 -1
- package/dist/cli/cliCommand.js +6 -6
- package/dist/cli/cliCommand.js.map +1 -1
- package/dist/cli/cliCommandComposite.d.ts +3 -3
- package/dist/cli/cliCommandComposite.d.ts.map +1 -1
- package/dist/cli/cliCommandComposite.js +1 -1
- package/dist/cli/cliCommandComposite.js.map +1 -1
- package/dist/cli.js +11 -11
- package/dist/cli.js.map +1 -1
- package/dist/commands/flatten.d.ts +2 -2
- package/dist/commands/flatten.d.ts.map +1 -1
- package/dist/commands/flatten.js +22 -22
- package/dist/commands/flatten.js.map +1 -1
- package/dist/commands/generate.d.ts +3 -3
- package/dist/commands/generate.d.ts.map +1 -1
- package/dist/commands/generate.js +32 -28
- package/dist/commands/generate.js.map +1 -1
- package/dist/commands/generateV1.d.ts +2 -2
- package/dist/commands/generateV1.d.ts.map +1 -1
- package/dist/commands/generateV1.js +27 -25
- package/dist/commands/generateV1.js.map +1 -1
- package/dist/commands/generateV2.d.ts +6 -6
- package/dist/commands/generateV2.d.ts.map +1 -1
- package/dist/commands/generateV2.js +34 -28
- package/dist/commands/generateV2.js.map +1 -1
- package/dist/commands/get.d.ts +2 -2
- package/dist/commands/get.d.ts.map +1 -1
- package/dist/commands/get.js +11 -11
- package/dist/commands/get.js.map +1 -1
- package/dist/commands/labels.d.ts +2 -2
- package/dist/commands/labels.d.ts.map +1 -1
- package/dist/commands/labels.js +14 -11
- package/dist/commands/labels.js.map +1 -1
- package/dist/commands/relocate.d.ts +2 -2
- package/dist/commands/relocate.d.ts.map +1 -1
- package/dist/commands/relocate.js +19 -17
- package/dist/commands/relocate.js.map +1 -1
- package/dist/commands/resize.d.ts +2 -2
- package/dist/commands/resize.d.ts.map +1 -1
- package/dist/commands/resize.js +26 -24
- package/dist/commands/resize.js.map +1 -1
- package/dist/dummy.js +5 -5
- package/dist/dummy.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/tests/data/flat_resized/labels.json +11 -1
- package/dist/tests/lodash.test.js +10 -7
- package/dist/tests/lodash.test.js.map +1 -1
- package/dist/tests/mocked.test.js +51 -45
- package/dist/tests/mocked.test.js.map +1 -1
- package/dist/tests/utils.d.ts +1 -1
- package/dist/tests/utils.d.ts.map +1 -1
- package/dist/tests/utils.js +11 -11
- package/dist/tests/utils.js.map +1 -1
- package/dist/utils/input.d.ts +2 -2
- package/dist/utils/input.d.ts.map +1 -1
- package/dist/utils/input.js +10 -10
- package/dist/utils/input.js.map +1 -1
- package/dist/utils/inputOutput.d.ts +2 -2
- package/dist/utils/inputOutput.d.ts.map +1 -1
- package/dist/utils/inputOutput.js +3 -3
- package/dist/utils/inputOutput.js.map +1 -1
- package/dist/utils/output.d.ts +2 -2
- package/dist/utils/output.d.ts.map +1 -1
- package/dist/utils/output.js +14 -14
- package/dist/utils/output.js.map +1 -1
- package/package.json +63 -68
- package/vite.cjs.config.ts +3 -3
- package/vite.test.config.ts +12 -12
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import
|
|
6
|
-
import
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import { ProsopoDatasetError } from "@prosopo/common";
|
|
3
|
+
import { DataSchema, LabelledDataSchema, LabelsContainerSchema, } from "@prosopo/types";
|
|
4
|
+
import { lodash, setSeedGlobal } from "@prosopo/util/lodash";
|
|
5
|
+
import * as z from "zod";
|
|
6
|
+
import { OutputArgsSchema, OutputCliCommand } from "../utils/output.js";
|
|
7
7
|
export const ArgsSchema = OutputArgsSchema.extend({
|
|
8
8
|
labels: z.string().optional(),
|
|
9
9
|
labelled: z.string().optional(),
|
|
@@ -21,8 +21,8 @@ export class Generate extends OutputCliCommand {
|
|
|
21
21
|
this.labelled = [];
|
|
22
22
|
this.unlabelled = [];
|
|
23
23
|
this.labels = [];
|
|
24
|
-
this.labelledMapFile =
|
|
25
|
-
this.unlabelledMapFile =
|
|
24
|
+
this.labelledMapFile = "";
|
|
25
|
+
this.unlabelledMapFile = "";
|
|
26
26
|
this.labelToImages = {};
|
|
27
27
|
this.targets = [];
|
|
28
28
|
this.saltRounds = 10;
|
|
@@ -30,42 +30,42 @@ export class Generate extends OutputCliCommand {
|
|
|
30
30
|
getOptions() {
|
|
31
31
|
return lodash().merge(super.getOptions(), {
|
|
32
32
|
output: {
|
|
33
|
-
description:
|
|
33
|
+
description: "Where to write the captchas JSON file",
|
|
34
34
|
},
|
|
35
35
|
labelled: {
|
|
36
36
|
string: true,
|
|
37
37
|
demand: true,
|
|
38
|
-
description:
|
|
38
|
+
description: "Path to JSON file containing labelled data",
|
|
39
39
|
},
|
|
40
40
|
unlabelled: {
|
|
41
41
|
string: true,
|
|
42
42
|
demand: true,
|
|
43
|
-
description:
|
|
43
|
+
description: "Path to JSON file containing unlabelled data",
|
|
44
44
|
},
|
|
45
45
|
seed: {
|
|
46
46
|
number: true,
|
|
47
47
|
demand: true,
|
|
48
|
-
description:
|
|
48
|
+
description: "Seed for random number generator",
|
|
49
49
|
},
|
|
50
50
|
size: {
|
|
51
51
|
number: true,
|
|
52
|
-
description:
|
|
52
|
+
description: "Number of images in each captcha",
|
|
53
53
|
},
|
|
54
54
|
labels: {
|
|
55
55
|
string: true,
|
|
56
|
-
description:
|
|
56
|
+
description: "Path to JSON file containing labels which unlabelled data will be assigned to. If not given, labels will be deduced from the labelled data.",
|
|
57
57
|
},
|
|
58
58
|
allowDuplicates: {
|
|
59
59
|
boolean: true,
|
|
60
|
-
description:
|
|
60
|
+
description: "If true, allow duplicates in the data (labelled and unlabelled)",
|
|
61
61
|
},
|
|
62
62
|
allowDuplicatesLabelled: {
|
|
63
63
|
boolean: true,
|
|
64
|
-
description:
|
|
64
|
+
description: "If true, allow duplicates in the labelled data",
|
|
65
65
|
},
|
|
66
66
|
allowDuplicatesUnlabelled: {
|
|
67
67
|
boolean: true,
|
|
68
|
-
description:
|
|
68
|
+
description: "If true, allow duplicates in the unlabelled data",
|
|
69
69
|
},
|
|
70
70
|
});
|
|
71
71
|
}
|
|
@@ -73,26 +73,26 @@ export class Generate extends OutputCliCommand {
|
|
|
73
73
|
const labelledMapFile = args.labelled;
|
|
74
74
|
if (labelledMapFile && !fs.existsSync(labelledMapFile)) {
|
|
75
75
|
throw new ProsopoDatasetError(new Error(`labelled map file does not exist: ${labelledMapFile}`), {
|
|
76
|
-
translationKey:
|
|
76
|
+
translationKey: "FS.FILE_NOT_FOUND",
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
79
|
const unlabelledMapFile = args.unlabelled;
|
|
80
80
|
if (unlabelledMapFile && !fs.existsSync(unlabelledMapFile)) {
|
|
81
81
|
throw new ProsopoDatasetError(new Error(`unlabelled map file does not exist: ${unlabelledMapFile}`), {
|
|
82
|
-
translationKey:
|
|
82
|
+
translationKey: "FS.FILE_NOT_FOUND",
|
|
83
83
|
});
|
|
84
84
|
}
|
|
85
|
-
this.labelledMapFile = labelledMapFile ||
|
|
86
|
-
this.unlabelledMapFile = unlabelledMapFile ||
|
|
85
|
+
this.labelledMapFile = labelledMapFile || "";
|
|
86
|
+
this.unlabelledMapFile = unlabelledMapFile || "";
|
|
87
87
|
}
|
|
88
88
|
loadData(args) {
|
|
89
89
|
const allowDuplicatesLabelled = args.allowDuplicatesLabelled || args.allowDuplicates || false;
|
|
90
90
|
const allowDuplicatesUnlabelled = args.allowDuplicatesUnlabelled || args.allowDuplicates || false;
|
|
91
91
|
this.labelled = this.labelledMapFile
|
|
92
|
-
? LabelledDataSchema.parse(JSON.parse(fs.readFileSync(this.labelledMapFile,
|
|
92
|
+
? LabelledDataSchema.parse(JSON.parse(fs.readFileSync(this.labelledMapFile, "utf8"))).items
|
|
93
93
|
: [];
|
|
94
94
|
this.unlabelled = this.unlabelledMapFile
|
|
95
|
-
? DataSchema.parse(JSON.parse(fs.readFileSync(this.unlabelledMapFile,
|
|
95
|
+
? DataSchema.parse(JSON.parse(fs.readFileSync(this.unlabelledMapFile, "utf8"))).items
|
|
96
96
|
: [];
|
|
97
97
|
checkDuplicates(this.labelled, this.unlabelled, {
|
|
98
98
|
allowDuplicatesLabelled,
|
|
@@ -109,7 +109,9 @@ export class Generate extends OutputCliCommand {
|
|
|
109
109
|
loadLabels(args) {
|
|
110
110
|
this.labels = [];
|
|
111
111
|
if (args.labels && fs.existsSync(args.labels)) {
|
|
112
|
-
this.labels.push(...[
|
|
112
|
+
this.labels.push(...[
|
|
113
|
+
...LabelsContainerSchema.parse(JSON.parse(fs.readFileSync(args.labels, "utf8"))).labels,
|
|
114
|
+
]);
|
|
113
115
|
}
|
|
114
116
|
else {
|
|
115
117
|
this.labels.push(...[...this.targets]);
|
|
@@ -126,9 +128,9 @@ export class Generate extends OutputCliCommand {
|
|
|
126
128
|
export const checkDuplicates = (labelled, unlabelled, options) => {
|
|
127
129
|
const all = new Set();
|
|
128
130
|
if (!options.allowDuplicatesLabelled)
|
|
129
|
-
addAllUnique(all, labelled,
|
|
131
|
+
addAllUnique(all, labelled, "labelled");
|
|
130
132
|
if (!options.allowDuplicatesUnlabelled)
|
|
131
|
-
addAllUnique(all, unlabelled,
|
|
133
|
+
addAllUnique(all, unlabelled, "unlabelled");
|
|
132
134
|
};
|
|
133
135
|
const addAllUnique = (all, entries, dataType) => {
|
|
134
136
|
for (const entry of entries) {
|
|
@@ -137,8 +139,10 @@ const addAllUnique = (all, entries, dataType) => {
|
|
|
137
139
|
};
|
|
138
140
|
const addUnique = (all, entry, dataType) => {
|
|
139
141
|
if (all.has(entry.data)) {
|
|
140
|
-
throw new ProsopoDatasetError(
|
|
141
|
-
context: {
|
|
142
|
+
throw new ProsopoDatasetError("DATASET.DUPLICATE_IMAGE", {
|
|
143
|
+
context: {
|
|
144
|
+
error: `Duplicate data entry in ${dataType} data: ${JSON.stringify(entry)}`,
|
|
145
|
+
},
|
|
142
146
|
});
|
|
143
147
|
}
|
|
144
148
|
all.add(entry.data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../src/commands/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="yargs" />
|
|
2
|
-
import * as z from
|
|
3
|
-
import { Generate } from
|
|
2
|
+
import * as z from "zod";
|
|
3
|
+
import { Generate } from "./generate.js";
|
|
4
4
|
export declare const ArgsSchema: z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<{
|
|
5
5
|
output: z.ZodString;
|
|
6
6
|
overwrite: z.ZodOptional<z.ZodBoolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV1.d.ts","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"generateV1.d.ts","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":";AA4BA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAoC,MAAM,eAAe,CAAC;AAE3E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAKrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,UAAW,SAAQ,QAAQ,CAAC,cAAc,CAAC;IACvC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAqB1B,OAAO,CAAC,cAAc;IAkGtB,OAAO,CAAC,gBAAgB;IA0DF,IAAI,CAAC,IAAI,EAAE,IAAI;CA6CrC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import { at, get } from
|
|
6
|
-
import {
|
|
7
|
-
import
|
|
8
|
-
import
|
|
9
|
-
import
|
|
10
|
-
import
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import { blake2AsHex } from "@polkadot/util-crypto/blake2";
|
|
3
|
+
import { ProsopoDatasetError, ProsopoEnvError } from "@prosopo/common";
|
|
4
|
+
import { CaptchaTypes, CaptchasContainerSchema, } from "@prosopo/types";
|
|
5
|
+
import { at, get } from "@prosopo/util";
|
|
6
|
+
import { lodash } from "@prosopo/util/lodash";
|
|
7
|
+
import bcrypt from "bcrypt";
|
|
8
|
+
import cliProgress from "cli-progress";
|
|
9
|
+
import * as z from "zod";
|
|
10
|
+
import { Generate, ArgsSchema as GenerateArgsSchema } from "./generate.js";
|
|
11
11
|
export const ArgsSchema = GenerateArgsSchema.extend({
|
|
12
12
|
solved: z.number().optional(),
|
|
13
13
|
unsolved: z.number().optional(),
|
|
@@ -19,24 +19,24 @@ export class GenerateV1 extends Generate {
|
|
|
19
19
|
return ArgsSchema;
|
|
20
20
|
}
|
|
21
21
|
getDescription() {
|
|
22
|
-
return
|
|
22
|
+
return "Generate distinct captchas producing captcha challenges comprising 2 rounds, one labelled and one unlabelled";
|
|
23
23
|
}
|
|
24
24
|
getOptions() {
|
|
25
25
|
return lodash().merge(super.getOptions(), {
|
|
26
26
|
solved: {
|
|
27
|
-
description:
|
|
27
|
+
description: "Number of captchas to generate that are solved",
|
|
28
28
|
number: true,
|
|
29
29
|
},
|
|
30
30
|
unsolved: {
|
|
31
|
-
description:
|
|
31
|
+
description: "Number of captchas to generate that are unsolved",
|
|
32
32
|
number: true,
|
|
33
33
|
},
|
|
34
34
|
minCorrect: {
|
|
35
|
-
description:
|
|
35
|
+
description: "Minimum number of target images in each captcha",
|
|
36
36
|
number: true,
|
|
37
37
|
},
|
|
38
38
|
maxCorrect: {
|
|
39
|
-
description:
|
|
39
|
+
description: "Maximum number of target images in each captcha",
|
|
40
40
|
number: true,
|
|
41
41
|
},
|
|
42
42
|
});
|
|
@@ -47,8 +47,8 @@ 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 ProsopoDatasetError(new Error(
|
|
51
|
-
translationKey:
|
|
50
|
+
throw new ProsopoDatasetError(new Error("not enough different labels in labelled data"), {
|
|
51
|
+
translationKey: "DATASET.NOT_ENOUGH_LABELS",
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
const target = at(this.targets, i % this.targets.length);
|
|
@@ -56,15 +56,15 @@ export class GenerateV1 extends Generate {
|
|
|
56
56
|
const nCorrect = _.random(minCorrect, maxCorrect);
|
|
57
57
|
const nIncorrect = size - nCorrect;
|
|
58
58
|
const targetItems = get(this.labelToImages, target);
|
|
59
|
-
const notTargetItems = notTargets.
|
|
59
|
+
const notTargetItems = notTargets.flatMap((notTarget) => get(this.labelToImages, notTarget));
|
|
60
60
|
if (targetItems.length < nCorrect) {
|
|
61
61
|
throw new ProsopoEnvError(new Error(`not enough images for target (${target})`), {
|
|
62
|
-
translationKey:
|
|
62
|
+
translationKey: "DATASET.NOT_ENOUGH_IMAGES",
|
|
63
63
|
});
|
|
64
64
|
}
|
|
65
65
|
if (notTargetItems.length < nIncorrect) {
|
|
66
66
|
throw new ProsopoDatasetError(new Error(`not enough non-matching images for target (${target})`), {
|
|
67
|
-
translationKey:
|
|
67
|
+
translationKey: "DATASET.NOT_ENOUGH_IMAGES",
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
70
|
const correctItems = _.sampleSize(targetItems, nCorrect);
|
|
@@ -108,13 +108,13 @@ export class GenerateV1 extends Generate {
|
|
|
108
108
|
for (let i = 0; i < unsolved; i++) {
|
|
109
109
|
bar.increment();
|
|
110
110
|
if (this.unlabelled.length <= size) {
|
|
111
|
-
throw new ProsopoDatasetError(new Error(
|
|
112
|
-
translationKey:
|
|
111
|
+
throw new ProsopoDatasetError(new Error("unlabelled map file does not contain enough data"), {
|
|
112
|
+
translationKey: "DATASET.NOT_ENOUGH_IMAGES",
|
|
113
113
|
});
|
|
114
114
|
}
|
|
115
115
|
if (this.labels.length <= 0) {
|
|
116
|
-
throw new ProsopoDatasetError(new Error(
|
|
117
|
-
translationKey:
|
|
116
|
+
throw new ProsopoDatasetError(new Error("no labels found for unlabelled data"), {
|
|
117
|
+
translationKey: "DATASET.NOT_ENOUGH_LABELS",
|
|
118
118
|
});
|
|
119
119
|
}
|
|
120
120
|
const index = _.random(0, this.labels.length - 1);
|
|
@@ -160,7 +160,9 @@ export class GenerateV1 extends Generate {
|
|
|
160
160
|
format: CaptchaTypes.SelectAll,
|
|
161
161
|
};
|
|
162
162
|
CaptchasContainerSchema.parse(output);
|
|
163
|
-
fs.mkdirSync(args.output.split(
|
|
163
|
+
fs.mkdirSync(args.output.split("/").slice(0, -1).join("/"), {
|
|
164
|
+
recursive: true,
|
|
165
|
+
});
|
|
164
166
|
fs.writeFileSync(outFile, JSON.stringify(output, null, 4));
|
|
165
167
|
}
|
|
166
168
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV1.js","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generateV1.js","sourceRoot":"","sources":["../../src/commands/generateV1.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="yargs" />
|
|
2
|
-
import * as z from
|
|
3
|
-
import { Generate } from
|
|
2
|
+
import * as z from "zod";
|
|
3
|
+
import { Generate } from "./generate.js";
|
|
4
4
|
export declare const ArgsSchema: z.ZodObject<z.objectUtil.extendShape<z.objectUtil.extendShape<{
|
|
5
5
|
output: z.ZodString;
|
|
6
6
|
overwrite: z.ZodOptional<z.ZodBoolean>;
|
|
@@ -23,7 +23,6 @@ export declare const ArgsSchema: z.ZodObject<z.objectUtil.extendShape<z.objectUt
|
|
|
23
23
|
}>, "strip", z.ZodTypeAny, {
|
|
24
24
|
output: string;
|
|
25
25
|
seed: number;
|
|
26
|
-
count?: number | undefined;
|
|
27
26
|
overwrite?: boolean | undefined;
|
|
28
27
|
allowDuplicates?: boolean | undefined;
|
|
29
28
|
labels?: string | undefined;
|
|
@@ -36,10 +35,10 @@ export declare const ArgsSchema: z.ZodObject<z.objectUtil.extendShape<z.objectUt
|
|
|
36
35
|
minIncorrect?: number | undefined;
|
|
37
36
|
minLabelled?: number | undefined;
|
|
38
37
|
maxLabelled?: number | undefined;
|
|
38
|
+
count?: number | undefined;
|
|
39
39
|
}, {
|
|
40
40
|
output: string;
|
|
41
41
|
seed: number;
|
|
42
|
-
count?: number | undefined;
|
|
43
42
|
overwrite?: boolean | undefined;
|
|
44
43
|
allowDuplicates?: boolean | undefined;
|
|
45
44
|
labels?: string | undefined;
|
|
@@ -52,6 +51,7 @@ export declare const ArgsSchema: z.ZodObject<z.objectUtil.extendShape<z.objectUt
|
|
|
52
51
|
minIncorrect?: number | undefined;
|
|
53
52
|
minLabelled?: number | undefined;
|
|
54
53
|
maxLabelled?: number | undefined;
|
|
54
|
+
count?: number | undefined;
|
|
55
55
|
}>;
|
|
56
56
|
export type ArgsSchemaType = typeof ArgsSchema;
|
|
57
57
|
export type Args = z.infer<ArgsSchemaType>;
|
|
@@ -79,7 +79,6 @@ export declare class GenerateV2 extends Generate<ArgsSchemaType> {
|
|
|
79
79
|
}>, "strip", z.ZodTypeAny, {
|
|
80
80
|
output: string;
|
|
81
81
|
seed: number;
|
|
82
|
-
count?: number | undefined;
|
|
83
82
|
overwrite?: boolean | undefined;
|
|
84
83
|
allowDuplicates?: boolean | undefined;
|
|
85
84
|
labels?: string | undefined;
|
|
@@ -92,10 +91,10 @@ export declare class GenerateV2 extends Generate<ArgsSchemaType> {
|
|
|
92
91
|
minIncorrect?: number | undefined;
|
|
93
92
|
minLabelled?: number | undefined;
|
|
94
93
|
maxLabelled?: number | undefined;
|
|
94
|
+
count?: number | undefined;
|
|
95
95
|
}, {
|
|
96
96
|
output: string;
|
|
97
97
|
seed: number;
|
|
98
|
-
count?: number | undefined;
|
|
99
98
|
overwrite?: boolean | undefined;
|
|
100
99
|
allowDuplicates?: boolean | undefined;
|
|
101
100
|
labels?: string | undefined;
|
|
@@ -108,6 +107,7 @@ export declare class GenerateV2 extends Generate<ArgsSchemaType> {
|
|
|
108
107
|
minIncorrect?: number | undefined;
|
|
109
108
|
minLabelled?: number | undefined;
|
|
110
109
|
maxLabelled?: number | undefined;
|
|
110
|
+
count?: number | undefined;
|
|
111
111
|
}>;
|
|
112
112
|
getDescription(): string;
|
|
113
113
|
getOptions(): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV2.d.ts","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"generateV2.d.ts","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":";AA4BA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,QAAQ,EAAoC,MAAM,eAAe,CAAC;AAE3E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMrB,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,UAAU,CAAC;AAC/C,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAE3C,qBAAa,UAAW,SAAQ,QAAQ,CAAC,cAAc,CAAC;;IAmBvC,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIZ,cAAc,IAAI,MAAM;IAIxB,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyB1B,OAAO,CAAC,WAAW;IA2DG,IAAI,CAAC,IAAI,EAAE,IAAI;CAuIrC"}
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
var _GenerateV2_size, _GenerateV2_minCorrect, _GenerateV2_saltRounds, _GenerateV2_allowDuplicatesLabelled, _GenerateV2_allowDuplicatesUnlabelled, _GenerateV2_minIncorrect, _GenerateV2_minLabelled, _GenerateV2_maxLabelled, _GenerateV2_count, _GenerateV2_nCorrect, _GenerateV2_nIncorrect, _GenerateV2_nLabelled, _GenerateV2_nUnlabelled, _GenerateV2_target, _GenerateV2_targets, _GenerateV2_targetItems, _GenerateV2_notTargetItems;
|
|
2
2
|
import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
|
|
3
|
-
import
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import { at, get } from
|
|
8
|
-
import {
|
|
9
|
-
import
|
|
10
|
-
import
|
|
11
|
-
import
|
|
12
|
-
import
|
|
3
|
+
import fs from "node:fs";
|
|
4
|
+
import { blake2AsHex } from "@polkadot/util-crypto/blake2";
|
|
5
|
+
import { ProsopoDatasetError } from "@prosopo/common";
|
|
6
|
+
import { CaptchaTypes, CaptchasContainerSchema, } from "@prosopo/types";
|
|
7
|
+
import { at, get } from "@prosopo/util";
|
|
8
|
+
import { lodash } from "@prosopo/util/lodash";
|
|
9
|
+
import bcrypt from "bcrypt";
|
|
10
|
+
import cliProgress from "cli-progress";
|
|
11
|
+
import * as z from "zod";
|
|
12
|
+
import { Generate, ArgsSchema as GenerateArgsSchema } from "./generate.js";
|
|
13
13
|
export const ArgsSchema = GenerateArgsSchema.extend({
|
|
14
14
|
minCorrect: z.number().optional(),
|
|
15
15
|
minIncorrect: z.number().optional(),
|
|
@@ -33,7 +33,7 @@ export class GenerateV2 extends Generate {
|
|
|
33
33
|
_GenerateV2_nIncorrect.set(this, 0);
|
|
34
34
|
_GenerateV2_nLabelled.set(this, 0);
|
|
35
35
|
_GenerateV2_nUnlabelled.set(this, 0);
|
|
36
|
-
_GenerateV2_target.set(this,
|
|
36
|
+
_GenerateV2_target.set(this, "");
|
|
37
37
|
_GenerateV2_targets.set(this, []);
|
|
38
38
|
_GenerateV2_targetItems.set(this, []);
|
|
39
39
|
_GenerateV2_notTargetItems.set(this, []);
|
|
@@ -42,37 +42,37 @@ export class GenerateV2 extends Generate {
|
|
|
42
42
|
return ArgsSchema;
|
|
43
43
|
}
|
|
44
44
|
getDescription() {
|
|
45
|
-
return
|
|
45
|
+
return "Generate distinct captchas producing captcha challenges comprising one or more rounds, mixing labelled and unlabelled data into a single round";
|
|
46
46
|
}
|
|
47
47
|
getOptions() {
|
|
48
48
|
return lodash().merge(super.getOptions(), {
|
|
49
49
|
count: {
|
|
50
50
|
number: true,
|
|
51
|
-
description:
|
|
51
|
+
description: "Number of captchas to generate",
|
|
52
52
|
},
|
|
53
53
|
minCorrect: {
|
|
54
54
|
number: true,
|
|
55
|
-
description:
|
|
55
|
+
description: "Minimum number of correct images in each captcha",
|
|
56
56
|
},
|
|
57
57
|
minIncorrect: {
|
|
58
58
|
number: true,
|
|
59
|
-
description:
|
|
59
|
+
description: "Minimum number of incorrect images in each captcha",
|
|
60
60
|
},
|
|
61
61
|
minLabelled: {
|
|
62
62
|
number: true,
|
|
63
|
-
description:
|
|
63
|
+
description: "Minimum number of labelled images in each captcha",
|
|
64
64
|
},
|
|
65
65
|
maxLabelled: {
|
|
66
66
|
number: true,
|
|
67
|
-
description:
|
|
67
|
+
description: "Maximum number of labelled images in each captcha",
|
|
68
68
|
},
|
|
69
69
|
});
|
|
70
70
|
}
|
|
71
71
|
setupTarget(i) {
|
|
72
72
|
const _ = lodash();
|
|
73
73
|
if (this.targets.length <= 1) {
|
|
74
|
-
throw new ProsopoDatasetError(new Error(
|
|
75
|
-
translationKey:
|
|
74
|
+
throw new ProsopoDatasetError(new Error("not enough different labels in labelled data"), {
|
|
75
|
+
translationKey: "DATASET.NOT_ENOUGH_LABELS",
|
|
76
76
|
});
|
|
77
77
|
}
|
|
78
78
|
const target = at(this.targets, i % this.targets.length);
|
|
@@ -83,20 +83,20 @@ export class GenerateV2 extends Generate {
|
|
|
83
83
|
const nIncorrect = nLabelled - nCorrect;
|
|
84
84
|
const nUnlabelled = __classPrivateFieldGet(this, _GenerateV2_size, "f") - nLabelled;
|
|
85
85
|
const targetItems = get(this.labelToImages, target);
|
|
86
|
-
const notTargetItems = notTargets.
|
|
86
|
+
const notTargetItems = notTargets.flatMap((notTarget) => get(this.labelToImages, notTarget));
|
|
87
87
|
if (nUnlabelled > this.unlabelled.length) {
|
|
88
|
-
throw new ProsopoDatasetError(new Error(
|
|
89
|
-
translationKey:
|
|
88
|
+
throw new ProsopoDatasetError(new Error("not enough unlabelled data"), {
|
|
89
|
+
translationKey: "DATASET.NOT_ENOUGH_IMAGES",
|
|
90
90
|
});
|
|
91
91
|
}
|
|
92
92
|
if (nCorrect > targetItems.length) {
|
|
93
93
|
throw new ProsopoDatasetError(new Error(`not enough images for target (${target})`), {
|
|
94
|
-
translationKey:
|
|
94
|
+
translationKey: "DATASET.NOT_ENOUGH_IMAGES",
|
|
95
95
|
});
|
|
96
96
|
}
|
|
97
97
|
if (nIncorrect > notTargetItems.length) {
|
|
98
98
|
throw new ProsopoDatasetError(new Error(`not enough non-matching images for target (${target})`), {
|
|
99
|
-
translationKey:
|
|
99
|
+
translationKey: "DATASET.NOT_ENOUGH_IMAGES",
|
|
100
100
|
});
|
|
101
101
|
}
|
|
102
102
|
__classPrivateFieldSet(this, _GenerateV2_nCorrect, nCorrect, "f");
|
|
@@ -134,7 +134,11 @@ export class GenerateV2 extends Generate {
|
|
|
134
134
|
const image = at(this.unlabelled, _.random(0, this.unlabelled.length - 1));
|
|
135
135
|
unlabelledItems.add(image);
|
|
136
136
|
}
|
|
137
|
-
const itemsConcat = [
|
|
137
|
+
const itemsConcat = [
|
|
138
|
+
...correctItems,
|
|
139
|
+
...incorrectItems,
|
|
140
|
+
...unlabelledItems,
|
|
141
|
+
];
|
|
138
142
|
let indices = [...Array(itemsConcat.length).keys()];
|
|
139
143
|
indices = _.shuffle(indices);
|
|
140
144
|
const items = indices
|
|
@@ -183,10 +187,12 @@ export class GenerateV2 extends Generate {
|
|
|
183
187
|
captchas,
|
|
184
188
|
format: CaptchaTypes.SelectAll,
|
|
185
189
|
};
|
|
186
|
-
this.logger.info(
|
|
190
|
+
this.logger.info("verifying data");
|
|
187
191
|
CaptchasContainerSchema.parse(output);
|
|
188
|
-
this.logger.info(
|
|
189
|
-
fs.mkdirSync(args.output.split(
|
|
192
|
+
this.logger.info("writing data");
|
|
193
|
+
fs.mkdirSync(args.output.split("/").slice(0, -1).join("/"), {
|
|
194
|
+
recursive: true,
|
|
195
|
+
});
|
|
190
196
|
fs.writeFileSync(outFile, JSON.stringify(output, null, 4));
|
|
191
197
|
}
|
|
192
198
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateV2.js","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"generateV2.js","sourceRoot":"","sources":["../../src/commands/generateV2.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/get.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as z from
|
|
2
|
-
import { InputCliCommand } from
|
|
1
|
+
import * as z from "zod";
|
|
2
|
+
import { InputCliCommand } from "../utils/input.js";
|
|
3
3
|
export declare const ArgsSchema: z.ZodObject<z.objectUtil.extendShape<{
|
|
4
4
|
input: z.ZodString;
|
|
5
5
|
}, {}>, "strip", z.ZodTypeAny, {
|