@promptbook/cli 0.75.6 โ 0.75.8
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/esm/index.es.js +85 -67
- package/esm/index.es.js.map +1 -1
- package/esm/typings/src/_packages/types.index.d.ts +0 -2
- package/esm/typings/src/execution/createPipelineExecutor/10-executePipeline.d.ts +1 -1
- package/esm/typings/src/execution/createPipelineExecutor/20-executeTask.d.ts +1 -1
- package/esm/typings/src/execution/createPipelineExecutor/40-executeAttempts.d.ts +1 -1
- package/esm/typings/src/prepare/PrepareAndScrapeOptions.d.ts +6 -4
- package/package.json +1 -1
- package/umd/index.umd.js +85 -67
- package/umd/index.umd.js.map +1 -1
- package/esm/typings/src/_packages/langtail.index.d.ts +0 -6
- package/esm/typings/src/llm-providers/langtail/LangtailExecutionTools.d.ts +0 -17
- package/esm/typings/src/llm-providers/langtail/LangtailExecutionToolsOptions.d.ts +0 -13
- package/esm/typings/src/llm-providers/langtail/playground/playground.d.ts +0 -5
|
@@ -55,7 +55,6 @@ import type { AnthropicClaudeExecutionToolsOptions } from '../llm-providers/anth
|
|
|
55
55
|
import type { AnthropicClaudeExecutionToolsDirectOptions } from '../llm-providers/anthropic-claude/AnthropicClaudeExecutionToolsOptions';
|
|
56
56
|
import type { AnthropicClaudeExecutionToolsProxiedOptions } from '../llm-providers/anthropic-claude/AnthropicClaudeExecutionToolsOptions';
|
|
57
57
|
import type { AzureOpenAiExecutionToolsOptions } from '../llm-providers/azure-openai/AzureOpenAiExecutionToolsOptions';
|
|
58
|
-
import type { LangtailExecutionToolsOptions } from '../llm-providers/langtail/LangtailExecutionToolsOptions';
|
|
59
58
|
import type { OpenAiAssistantExecutionToolsOptions } from '../llm-providers/openai/OpenAiAssistantExecutionToolsOptions';
|
|
60
59
|
import type { OpenAiExecutionToolsOptions } from '../llm-providers/openai/OpenAiExecutionToolsOptions';
|
|
61
60
|
import type { PromptbookServer_Error } from '../llm-providers/remote/interfaces/PromptbookServer_Error';
|
|
@@ -309,7 +308,6 @@ export type { AnthropicClaudeExecutionToolsOptions };
|
|
|
309
308
|
export type { AnthropicClaudeExecutionToolsDirectOptions };
|
|
310
309
|
export type { AnthropicClaudeExecutionToolsProxiedOptions };
|
|
311
310
|
export type { AzureOpenAiExecutionToolsOptions };
|
|
312
|
-
export type { LangtailExecutionToolsOptions };
|
|
313
311
|
export type { OpenAiAssistantExecutionToolsOptions };
|
|
314
312
|
export type { OpenAiExecutionToolsOptions };
|
|
315
313
|
export type { PromptbookServer_Error };
|
|
@@ -9,7 +9,7 @@ import type { CreatePipelineExecutorOptions } from './00-CreatePipelineExecutorO
|
|
|
9
9
|
*
|
|
10
10
|
* @private internal type of `executePipeline`
|
|
11
11
|
*/
|
|
12
|
-
type ExecutePipelineOptions = CreatePipelineExecutorOptions & {
|
|
12
|
+
type ExecutePipelineOptions = Required<CreatePipelineExecutorOptions> & {
|
|
13
13
|
/**
|
|
14
14
|
* @@@
|
|
15
15
|
*/
|
|
@@ -10,7 +10,7 @@ import type { CreatePipelineExecutorOptions } from './00-CreatePipelineExecutorO
|
|
|
10
10
|
*
|
|
11
11
|
* @private internal type of `executeTask`
|
|
12
12
|
*/
|
|
13
|
-
type executeSingleTaskOptions = CreatePipelineExecutorOptions & {
|
|
13
|
+
type executeSingleTaskOptions = Required<CreatePipelineExecutorOptions> & {
|
|
14
14
|
/**
|
|
15
15
|
* @@@
|
|
16
16
|
*/
|
|
@@ -11,7 +11,7 @@ import type { CreatePipelineExecutorOptions } from './00-CreatePipelineExecutorO
|
|
|
11
11
|
*
|
|
12
12
|
* @private internal type of `executeAttempts`
|
|
13
13
|
*/
|
|
14
|
-
export type ExecuteAttemptsOptions = Omit<CreatePipelineExecutorOptions, 'pipeline'
|
|
14
|
+
export type ExecuteAttemptsOptions = Required<Omit<CreatePipelineExecutorOptions, 'pipeline'>> & {
|
|
15
15
|
/**
|
|
16
16
|
* @@@
|
|
17
17
|
*/
|
|
@@ -10,7 +10,7 @@ export type PrepareAndScrapeOptions = {
|
|
|
10
10
|
* Note: When the pipeline is not created from files, it is `null`
|
|
11
11
|
* Note: This folder must exist (=it is not created recursively)
|
|
12
12
|
*
|
|
13
|
-
* @default process.cwd()
|
|
13
|
+
* @default null or `process.cwd()` when created via `$provide...` function in node
|
|
14
14
|
*/
|
|
15
15
|
readonly rootDirname?: string_dirname | null;
|
|
16
16
|
/**
|
|
@@ -18,7 +18,7 @@ export type PrepareAndScrapeOptions = {
|
|
|
18
18
|
*
|
|
19
19
|
* Note: When the folder does not exist, it is created recursively
|
|
20
20
|
*
|
|
21
|
-
* @default
|
|
21
|
+
* @default DEFAULT_SCRAPE_CACHE_DIRNAME
|
|
22
22
|
*/
|
|
23
23
|
readonly cacheDirname?: string_dirname;
|
|
24
24
|
/**
|
|
@@ -30,17 +30,19 @@ export type PrepareAndScrapeOptions = {
|
|
|
30
30
|
/**
|
|
31
31
|
* Maximum number of tasks running in parallel
|
|
32
32
|
*
|
|
33
|
-
* @default
|
|
33
|
+
* @default DEFAULT_MAX_PARALLEL_COUNT
|
|
34
34
|
*/
|
|
35
35
|
readonly maxParallelCount?: number;
|
|
36
36
|
/**
|
|
37
37
|
* If true, the missing software is automatically installed
|
|
38
|
+
*
|
|
39
|
+
* @default DEFAULT_IS_AUTO_INSTALLED
|
|
38
40
|
*/
|
|
39
41
|
readonly isAutoInstalled?: boolean;
|
|
40
42
|
/**
|
|
41
43
|
* If true, the preparation logs additional information
|
|
42
44
|
*
|
|
43
|
-
* @default
|
|
45
|
+
* @default DEFAULT_IS_VERBOSE
|
|
44
46
|
*/
|
|
45
47
|
readonly isVerbose?: boolean;
|
|
46
48
|
};
|
package/package.json
CHANGED
package/umd/index.umd.js
CHANGED
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
*
|
|
50
50
|
* @see https://github.com/webgptorg/promptbook
|
|
51
51
|
*/
|
|
52
|
-
var PROMPTBOOK_ENGINE_VERSION = '0.75.
|
|
52
|
+
var PROMPTBOOK_ENGINE_VERSION = '0.75.7';
|
|
53
53
|
/**
|
|
54
54
|
* TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
|
|
55
55
|
* Note: [๐] Ignore a discrepancy between file name and entity name
|
|
@@ -566,6 +566,12 @@
|
|
|
566
566
|
* @public exported from `@promptbook/core`
|
|
567
567
|
*/
|
|
568
568
|
var DEFAULT_IS_VERBOSE = false;
|
|
569
|
+
/**
|
|
570
|
+
* @@@
|
|
571
|
+
*
|
|
572
|
+
* @public exported from `@promptbook/core`
|
|
573
|
+
*/
|
|
574
|
+
var DEFAULT_IS_AUTO_INSTALLED = false;
|
|
569
575
|
/**
|
|
570
576
|
* @@@
|
|
571
577
|
*
|
|
@@ -4205,12 +4211,12 @@
|
|
|
4205
4211
|
*/
|
|
4206
4212
|
function executeTask(options) {
|
|
4207
4213
|
return __awaiter(this, void 0, void 0, function () {
|
|
4208
|
-
var currentTask, preparedPipeline, parametersToPass, tools, onProgress, $executionReport, pipelineIdentification,
|
|
4209
|
-
var e_1,
|
|
4210
|
-
return __generator(this, function (
|
|
4211
|
-
switch (
|
|
4214
|
+
var currentTask, preparedPipeline, parametersToPass, tools, onProgress, $executionReport, pipelineIdentification, maxExecutionAttempts, maxParallelCount, csvSettings, isVerbose, rootDirname, cacheDirname, intermediateFilesStrategy, isAutoInstalled, isNotPreparedWarningSupressed, name, title, priority, usedParameterNames, dependentParameterNames, definedParameters, _a, _b, _c, definedParameterNames, parameters, _loop_1, _d, _e, parameterName, maxAttempts, jokerParameterNames, preparedContent, resultString;
|
|
4215
|
+
var e_1, _f, _g;
|
|
4216
|
+
return __generator(this, function (_h) {
|
|
4217
|
+
switch (_h.label) {
|
|
4212
4218
|
case 0:
|
|
4213
|
-
currentTask = options.currentTask, preparedPipeline = options.preparedPipeline, parametersToPass = options.parametersToPass, tools = options.tools, onProgress = options.onProgress, $executionReport = options.$executionReport, pipelineIdentification = options.pipelineIdentification,
|
|
4219
|
+
currentTask = options.currentTask, preparedPipeline = options.preparedPipeline, parametersToPass = options.parametersToPass, tools = options.tools, onProgress = options.onProgress, $executionReport = options.$executionReport, pipelineIdentification = options.pipelineIdentification, maxExecutionAttempts = options.maxExecutionAttempts, maxParallelCount = options.maxParallelCount, csvSettings = options.csvSettings, isVerbose = options.isVerbose, rootDirname = options.rootDirname, cacheDirname = options.cacheDirname, intermediateFilesStrategy = options.intermediateFilesStrategy, isAutoInstalled = options.isAutoInstalled, isNotPreparedWarningSupressed = options.isNotPreparedWarningSupressed;
|
|
4214
4220
|
name = "pipeline-executor-frame-".concat(currentTask.name);
|
|
4215
4221
|
title = currentTask.title;
|
|
4216
4222
|
priority = preparedPipeline.tasks.length - preparedPipeline.tasks.indexOf(currentTask);
|
|
@@ -4225,7 +4231,7 @@
|
|
|
4225
4231
|
// <- [๐ธ]
|
|
4226
4232
|
})];
|
|
4227
4233
|
case 1:
|
|
4228
|
-
|
|
4234
|
+
_h.sent();
|
|
4229
4235
|
usedParameterNames = extractParameterNamesFromTask(currentTask);
|
|
4230
4236
|
dependentParameterNames = new Set(currentTask.dependentParameterNames);
|
|
4231
4237
|
// TODO: [๐ฉ๐พโ๐คโ๐ฉ๐ป] Use here `mapAvailableToExpectedParameters`
|
|
@@ -4236,15 +4242,15 @@
|
|
|
4236
4242
|
.map(function (name) { return "{".concat(name, "}"); })
|
|
4237
4243
|
.join(', '), "\n\n ").concat(block(pipelineIdentification), "\n\n "); }));
|
|
4238
4244
|
}
|
|
4239
|
-
|
|
4240
|
-
|
|
4245
|
+
_b = (_a = Object).freeze;
|
|
4246
|
+
_c = [{}];
|
|
4241
4247
|
return [4 /*yield*/, getReservedParametersForTask({
|
|
4242
4248
|
preparedPipeline: preparedPipeline,
|
|
4243
4249
|
task: currentTask,
|
|
4244
4250
|
pipelineIdentification: pipelineIdentification,
|
|
4245
4251
|
})];
|
|
4246
4252
|
case 2:
|
|
4247
|
-
definedParameters =
|
|
4253
|
+
definedParameters = _b.apply(_a, [__assign.apply(void 0, [__assign.apply(void 0, _c.concat([(_h.sent())])), parametersToPass])]);
|
|
4248
4254
|
definedParameterNames = new Set(Object.keys(definedParameters));
|
|
4249
4255
|
parameters = {};
|
|
4250
4256
|
_loop_1 = function (parameterName) {
|
|
@@ -4264,15 +4270,15 @@
|
|
|
4264
4270
|
try {
|
|
4265
4271
|
// Note: [2] Check that all used parameters are defined and removing unused parameters for this task
|
|
4266
4272
|
// TODO: [๐ฉ๐พโ๐คโ๐ฉ๐ป] Use here `mapAvailableToExpectedParameters`
|
|
4267
|
-
for (
|
|
4268
|
-
parameterName =
|
|
4273
|
+
for (_d = __values(Array.from(union(definedParameterNames, usedParameterNames, dependentParameterNames))), _e = _d.next(); !_e.done; _e = _d.next()) {
|
|
4274
|
+
parameterName = _e.value;
|
|
4269
4275
|
_loop_1(parameterName);
|
|
4270
4276
|
}
|
|
4271
4277
|
}
|
|
4272
4278
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
4273
4279
|
finally {
|
|
4274
4280
|
try {
|
|
4275
|
-
if (
|
|
4281
|
+
if (_e && !_e.done && (_f = _d.return)) _f.call(_d);
|
|
4276
4282
|
}
|
|
4277
4283
|
finally { if (e_1) throw e_1.error; }
|
|
4278
4284
|
}
|
|
@@ -4292,9 +4298,18 @@
|
|
|
4292
4298
|
tools: tools,
|
|
4293
4299
|
$executionReport: $executionReport,
|
|
4294
4300
|
pipelineIdentification: pipelineIdentification,
|
|
4301
|
+
maxExecutionAttempts: maxExecutionAttempts,
|
|
4302
|
+
maxParallelCount: maxParallelCount,
|
|
4303
|
+
csvSettings: csvSettings,
|
|
4304
|
+
isVerbose: isVerbose,
|
|
4305
|
+
rootDirname: rootDirname,
|
|
4306
|
+
cacheDirname: cacheDirname,
|
|
4307
|
+
intermediateFilesStrategy: intermediateFilesStrategy,
|
|
4308
|
+
isAutoInstalled: isAutoInstalled,
|
|
4309
|
+
isNotPreparedWarningSupressed: isNotPreparedWarningSupressed,
|
|
4295
4310
|
})];
|
|
4296
4311
|
case 3:
|
|
4297
|
-
resultString =
|
|
4312
|
+
resultString = _h.sent();
|
|
4298
4313
|
return [4 /*yield*/, onProgress({
|
|
4299
4314
|
name: name,
|
|
4300
4315
|
title: title,
|
|
@@ -4306,12 +4321,12 @@
|
|
|
4306
4321
|
// <- [๐ธ]
|
|
4307
4322
|
})];
|
|
4308
4323
|
case 4:
|
|
4309
|
-
|
|
4310
|
-
return [2 /*return*/, Object.freeze((
|
|
4311
|
-
|
|
4324
|
+
_h.sent();
|
|
4325
|
+
return [2 /*return*/, Object.freeze((_g = {},
|
|
4326
|
+
_g[currentTask.resultingParameterName] =
|
|
4312
4327
|
// <- Note: [๐ฉโ๐ฉโ๐ง] No need to detect parameter collision here because pipeline checks logic consistency during construction
|
|
4313
4328
|
resultString,
|
|
4314
|
-
|
|
4329
|
+
_g))];
|
|
4315
4330
|
}
|
|
4316
4331
|
});
|
|
4317
4332
|
});
|
|
@@ -4370,12 +4385,12 @@
|
|
|
4370
4385
|
*/
|
|
4371
4386
|
function executePipeline(options) {
|
|
4372
4387
|
return __awaiter(this, void 0, void 0, function () {
|
|
4373
|
-
var inputParameters, tools, onProgress, pipeline, setPreparedPipeline, pipelineIdentification, maxParallelCount, rootDirname,
|
|
4374
|
-
var e_1,
|
|
4375
|
-
return __generator(this, function (
|
|
4376
|
-
switch (
|
|
4388
|
+
var inputParameters, tools, onProgress, pipeline, setPreparedPipeline, pipelineIdentification, maxParallelCount, rootDirname, isVerbose, preparedPipeline, errors, warnings, executionReport, isReturned, _a, _b, parameter, e_1_1, _loop_1, _c, _d, parameterName, state_1, e_2_1, parametersToPass, resovedParameterNames_1, unresovedTasks_1, resolving_1, loopLimit, _loop_2, error_1, usage_1, outputParameters_1, usage, outputParameters;
|
|
4389
|
+
var e_1, _e, e_2, _f;
|
|
4390
|
+
return __generator(this, function (_g) {
|
|
4391
|
+
switch (_g.label) {
|
|
4377
4392
|
case 0:
|
|
4378
|
-
inputParameters = options.inputParameters, tools = options.tools, onProgress = options.onProgress, pipeline = options.pipeline, setPreparedPipeline = options.setPreparedPipeline, pipelineIdentification = options.pipelineIdentification, maxParallelCount = options.maxParallelCount, rootDirname = options.rootDirname,
|
|
4393
|
+
inputParameters = options.inputParameters, tools = options.tools, onProgress = options.onProgress, pipeline = options.pipeline, setPreparedPipeline = options.setPreparedPipeline, pipelineIdentification = options.pipelineIdentification, maxParallelCount = options.maxParallelCount, rootDirname = options.rootDirname, isVerbose = options.isVerbose;
|
|
4379
4394
|
preparedPipeline = options.preparedPipeline;
|
|
4380
4395
|
if (!(preparedPipeline === undefined)) return [3 /*break*/, 2];
|
|
4381
4396
|
return [4 /*yield*/, preparePipeline(pipeline, tools, {
|
|
@@ -4384,9 +4399,9 @@
|
|
|
4384
4399
|
maxParallelCount: maxParallelCount,
|
|
4385
4400
|
})];
|
|
4386
4401
|
case 1:
|
|
4387
|
-
preparedPipeline =
|
|
4402
|
+
preparedPipeline = _g.sent();
|
|
4388
4403
|
setPreparedPipeline(preparedPipeline);
|
|
4389
|
-
|
|
4404
|
+
_g.label = 2;
|
|
4390
4405
|
case 2:
|
|
4391
4406
|
errors = [];
|
|
4392
4407
|
warnings = [];
|
|
@@ -4399,17 +4414,17 @@
|
|
|
4399
4414
|
promptExecutions: [],
|
|
4400
4415
|
};
|
|
4401
4416
|
isReturned = false;
|
|
4402
|
-
|
|
4417
|
+
_g.label = 3;
|
|
4403
4418
|
case 3:
|
|
4404
|
-
|
|
4405
|
-
|
|
4419
|
+
_g.trys.push([3, 9, 10, 11]);
|
|
4420
|
+
_a = __values(preparedPipeline.parameters.filter(function (_a) {
|
|
4406
4421
|
var isInput = _a.isInput;
|
|
4407
4422
|
return isInput;
|
|
4408
|
-
})),
|
|
4409
|
-
|
|
4423
|
+
})), _b = _a.next();
|
|
4424
|
+
_g.label = 4;
|
|
4410
4425
|
case 4:
|
|
4411
|
-
if (!!
|
|
4412
|
-
parameter =
|
|
4426
|
+
if (!!_b.done) return [3 /*break*/, 8];
|
|
4427
|
+
parameter = _b.value;
|
|
4413
4428
|
if (!(inputParameters[parameter.name] === undefined)) return [3 /*break*/, 7];
|
|
4414
4429
|
isReturned = true;
|
|
4415
4430
|
if (!(onProgress !== undefined)) return [3 /*break*/, 6];
|
|
@@ -4417,8 +4432,8 @@
|
|
|
4417
4432
|
return [4 /*yield*/, waitasecond.forTime(IMMEDIATE_TIME)];
|
|
4418
4433
|
case 5:
|
|
4419
4434
|
// Note: Wait a short time to prevent race conditions
|
|
4420
|
-
|
|
4421
|
-
|
|
4435
|
+
_g.sent();
|
|
4436
|
+
_g.label = 6;
|
|
4422
4437
|
case 6: return [2 /*return*/, $asDeeplyFrozenSerializableJson("Unuccessful PipelineExecutorResult (with missing parameter {".concat(parameter.name, "}) PipelineExecutorResult"), {
|
|
4423
4438
|
isSuccessful: false,
|
|
4424
4439
|
errors: __spreadArray([
|
|
@@ -4431,24 +4446,24 @@
|
|
|
4431
4446
|
preparedPipeline: preparedPipeline,
|
|
4432
4447
|
})];
|
|
4433
4448
|
case 7:
|
|
4434
|
-
|
|
4449
|
+
_b = _a.next();
|
|
4435
4450
|
return [3 /*break*/, 4];
|
|
4436
4451
|
case 8: return [3 /*break*/, 11];
|
|
4437
4452
|
case 9:
|
|
4438
|
-
e_1_1 =
|
|
4453
|
+
e_1_1 = _g.sent();
|
|
4439
4454
|
e_1 = { error: e_1_1 };
|
|
4440
4455
|
return [3 /*break*/, 11];
|
|
4441
4456
|
case 10:
|
|
4442
4457
|
try {
|
|
4443
|
-
if (
|
|
4458
|
+
if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
|
|
4444
4459
|
}
|
|
4445
4460
|
finally { if (e_1) throw e_1.error; }
|
|
4446
4461
|
return [7 /*endfinally*/];
|
|
4447
4462
|
case 11:
|
|
4448
4463
|
_loop_1 = function (parameterName) {
|
|
4449
4464
|
var parameter;
|
|
4450
|
-
return __generator(this, function (
|
|
4451
|
-
switch (
|
|
4465
|
+
return __generator(this, function (_h) {
|
|
4466
|
+
switch (_h.label) {
|
|
4452
4467
|
case 0:
|
|
4453
4468
|
parameter = preparedPipeline.parameters.find(function (_a) {
|
|
4454
4469
|
var name = _a.name;
|
|
@@ -4465,8 +4480,8 @@
|
|
|
4465
4480
|
return [4 /*yield*/, waitasecond.forTime(IMMEDIATE_TIME)];
|
|
4466
4481
|
case 2:
|
|
4467
4482
|
// Note: Wait a short time to prevent race conditions
|
|
4468
|
-
|
|
4469
|
-
|
|
4483
|
+
_h.sent();
|
|
4484
|
+
_h.label = 3;
|
|
4470
4485
|
case 3: return [2 /*return*/, { value: $asDeeplyFrozenSerializableJson(spaceTrim.spaceTrim(function (block) { return "\n Unuccessful PipelineExecutorResult (with extra parameter {".concat(parameter.name, "}) PipelineExecutorResult\n\n ").concat(block(pipelineIdentification), "\n "); }), {
|
|
4471
4486
|
isSuccessful: false,
|
|
4472
4487
|
errors: __spreadArray([
|
|
@@ -4482,39 +4497,39 @@
|
|
|
4482
4497
|
}
|
|
4483
4498
|
});
|
|
4484
4499
|
};
|
|
4485
|
-
|
|
4500
|
+
_g.label = 12;
|
|
4486
4501
|
case 12:
|
|
4487
|
-
|
|
4488
|
-
|
|
4489
|
-
|
|
4502
|
+
_g.trys.push([12, 17, 18, 19]);
|
|
4503
|
+
_c = __values(Object.keys(inputParameters)), _d = _c.next();
|
|
4504
|
+
_g.label = 13;
|
|
4490
4505
|
case 13:
|
|
4491
|
-
if (!!
|
|
4492
|
-
parameterName =
|
|
4506
|
+
if (!!_d.done) return [3 /*break*/, 16];
|
|
4507
|
+
parameterName = _d.value;
|
|
4493
4508
|
return [5 /*yield**/, _loop_1(parameterName)];
|
|
4494
4509
|
case 14:
|
|
4495
|
-
state_1 =
|
|
4510
|
+
state_1 = _g.sent();
|
|
4496
4511
|
if (typeof state_1 === "object")
|
|
4497
4512
|
return [2 /*return*/, state_1.value];
|
|
4498
|
-
|
|
4513
|
+
_g.label = 15;
|
|
4499
4514
|
case 15:
|
|
4500
|
-
|
|
4515
|
+
_d = _c.next();
|
|
4501
4516
|
return [3 /*break*/, 13];
|
|
4502
4517
|
case 16: return [3 /*break*/, 19];
|
|
4503
4518
|
case 17:
|
|
4504
|
-
e_2_1 =
|
|
4519
|
+
e_2_1 = _g.sent();
|
|
4505
4520
|
e_2 = { error: e_2_1 };
|
|
4506
4521
|
return [3 /*break*/, 19];
|
|
4507
4522
|
case 18:
|
|
4508
4523
|
try {
|
|
4509
|
-
if (
|
|
4524
|
+
if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
|
|
4510
4525
|
}
|
|
4511
4526
|
finally { if (e_2) throw e_2.error; }
|
|
4512
4527
|
return [7 /*endfinally*/];
|
|
4513
4528
|
case 19:
|
|
4514
4529
|
parametersToPass = inputParameters;
|
|
4515
|
-
|
|
4530
|
+
_g.label = 20;
|
|
4516
4531
|
case 20:
|
|
4517
|
-
|
|
4532
|
+
_g.trys.push([20, 25, , 28]);
|
|
4518
4533
|
resovedParameterNames_1 = preparedPipeline.parameters
|
|
4519
4534
|
.filter(function (_a) {
|
|
4520
4535
|
var isInput = _a.isInput;
|
|
@@ -4529,8 +4544,8 @@
|
|
|
4529
4544
|
loopLimit = LOOP_LIMIT;
|
|
4530
4545
|
_loop_2 = function () {
|
|
4531
4546
|
var currentTask, work_1;
|
|
4532
|
-
return __generator(this, function (
|
|
4533
|
-
switch (
|
|
4547
|
+
return __generator(this, function (_j) {
|
|
4548
|
+
switch (_j.label) {
|
|
4534
4549
|
case 0:
|
|
4535
4550
|
if (loopLimit-- < 0) {
|
|
4536
4551
|
// Note: Really UnexpectedError not LimitReachedError - this should be catched during validatePipeline
|
|
@@ -4566,7 +4581,7 @@
|
|
|
4566
4581
|
if (!!currentTask) return [3 /*break*/, 3];
|
|
4567
4582
|
/* [๐คนโโ๏ธ] */ return [4 /*yield*/, Promise.race(resolving_1)];
|
|
4568
4583
|
case 2:
|
|
4569
|
-
/* [๐คนโโ๏ธ] */
|
|
4584
|
+
/* [๐คนโโ๏ธ] */ _j.sent();
|
|
4570
4585
|
return [3 /*break*/, 4];
|
|
4571
4586
|
case 3:
|
|
4572
4587
|
unresovedTasks_1 = unresovedTasks_1.filter(function (task) { return task !== currentTask; });
|
|
@@ -4591,24 +4606,24 @@
|
|
|
4591
4606
|
// <- Note: Errors are catched here [3]
|
|
4592
4607
|
// TODO: BUT if in multiple tasks are errors, only the first one is catched so maybe we should catch errors here and save them to errors array here
|
|
4593
4608
|
resolving_1.push(work_1);
|
|
4594
|
-
|
|
4609
|
+
_j.label = 4;
|
|
4595
4610
|
case 4: return [2 /*return*/];
|
|
4596
4611
|
}
|
|
4597
4612
|
});
|
|
4598
4613
|
};
|
|
4599
|
-
|
|
4614
|
+
_g.label = 21;
|
|
4600
4615
|
case 21:
|
|
4601
4616
|
if (!(unresovedTasks_1.length > 0)) return [3 /*break*/, 23];
|
|
4602
4617
|
return [5 /*yield**/, _loop_2()];
|
|
4603
4618
|
case 22:
|
|
4604
|
-
|
|
4619
|
+
_g.sent();
|
|
4605
4620
|
return [3 /*break*/, 21];
|
|
4606
4621
|
case 23: return [4 /*yield*/, Promise.all(resolving_1)];
|
|
4607
4622
|
case 24:
|
|
4608
|
-
|
|
4623
|
+
_g.sent();
|
|
4609
4624
|
return [3 /*break*/, 28];
|
|
4610
4625
|
case 25:
|
|
4611
|
-
error_1 =
|
|
4626
|
+
error_1 = _g.sent();
|
|
4612
4627
|
if (!(error_1 instanceof Error)) {
|
|
4613
4628
|
throw error_1;
|
|
4614
4629
|
}
|
|
@@ -4628,8 +4643,8 @@
|
|
|
4628
4643
|
return [4 /*yield*/, waitasecond.forTime(IMMEDIATE_TIME)];
|
|
4629
4644
|
case 26:
|
|
4630
4645
|
// Note: Wait a short time to prevent race conditions
|
|
4631
|
-
|
|
4632
|
-
|
|
4646
|
+
_g.sent();
|
|
4647
|
+
_g.label = 27;
|
|
4633
4648
|
case 27: return [2 /*return*/, $asDeeplyFrozenSerializableJson('Unuccessful PipelineExecutorResult (with misc errors) PipelineExecutorResult', {
|
|
4634
4649
|
isSuccessful: false,
|
|
4635
4650
|
errors: __spreadArray([error_1], __read(errors), false).map(serializeError),
|
|
@@ -4656,8 +4671,8 @@
|
|
|
4656
4671
|
return [4 /*yield*/, waitasecond.forTime(IMMEDIATE_TIME)];
|
|
4657
4672
|
case 29:
|
|
4658
4673
|
// Note: Wait a short time to prevent race conditions
|
|
4659
|
-
|
|
4660
|
-
|
|
4674
|
+
_g.sent();
|
|
4675
|
+
_g.label = 30;
|
|
4661
4676
|
case 30: return [2 /*return*/, $asDeeplyFrozenSerializableJson('Successful PipelineExecutorResult', {
|
|
4662
4677
|
isSuccessful: true,
|
|
4663
4678
|
errors: errors.map(serializeError),
|
|
@@ -4684,7 +4699,7 @@
|
|
|
4684
4699
|
*/
|
|
4685
4700
|
function createPipelineExecutor(options) {
|
|
4686
4701
|
var _this = this;
|
|
4687
|
-
var pipeline = options.pipeline, tools = options.tools, _a = options.maxExecutionAttempts, maxExecutionAttempts = _a === void 0 ? DEFAULT_MAX_EXECUTION_ATTEMPTS : _a, _b = options.maxParallelCount, maxParallelCount = _b === void 0 ? DEFAULT_MAX_PARALLEL_COUNT : _b, _c = options.csvSettings, csvSettings = _c === void 0 ? DEFAULT_CSV_SETTINGS : _c, _d = options.isVerbose, isVerbose = _d === void 0 ? DEFAULT_IS_VERBOSE : _d, _e = options.isNotPreparedWarningSupressed, isNotPreparedWarningSupressed = _e === void 0 ? false : _e, _f = options.rootDirname, rootDirname =
|
|
4702
|
+
var pipeline = options.pipeline, tools = options.tools, _a = options.maxExecutionAttempts, maxExecutionAttempts = _a === void 0 ? DEFAULT_MAX_EXECUTION_ATTEMPTS : _a, _b = options.maxParallelCount, maxParallelCount = _b === void 0 ? DEFAULT_MAX_PARALLEL_COUNT : _b, _c = options.csvSettings, csvSettings = _c === void 0 ? DEFAULT_CSV_SETTINGS : _c, _d = options.isVerbose, isVerbose = _d === void 0 ? DEFAULT_IS_VERBOSE : _d, _e = options.isNotPreparedWarningSupressed, isNotPreparedWarningSupressed = _e === void 0 ? false : _e, _f = options.cacheDirname, cacheDirname = _f === void 0 ? DEFAULT_SCRAPE_CACHE_DIRNAME : _f, _g = options.intermediateFilesStrategy, intermediateFilesStrategy = _g === void 0 ? DEFAULT_INTERMEDIATE_FILES_STRATEGY : _g, _h = options.isAutoInstalled, isAutoInstalled = _h === void 0 ? DEFAULT_IS_AUTO_INSTALLED : _h, _j = options.rootDirname, rootDirname = _j === void 0 ? null : _j;
|
|
4688
4703
|
validatePipeline(pipeline);
|
|
4689
4704
|
var pipelineIdentification = (function () {
|
|
4690
4705
|
// Note: This is a ๐ implementation of [๐]
|
|
@@ -4724,6 +4739,9 @@
|
|
|
4724
4739
|
isVerbose: isVerbose,
|
|
4725
4740
|
isNotPreparedWarningSupressed: isNotPreparedWarningSupressed,
|
|
4726
4741
|
rootDirname: rootDirname,
|
|
4742
|
+
cacheDirname: cacheDirname,
|
|
4743
|
+
intermediateFilesStrategy: intermediateFilesStrategy,
|
|
4744
|
+
isAutoInstalled: isAutoInstalled,
|
|
4727
4745
|
})];
|
|
4728
4746
|
});
|
|
4729
4747
|
}); };
|