@promptbook/documents 0.89.0-2 → 0.89.0-20
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 +10 -6
- package/esm/index.es.js +122 -39
- package/esm/index.es.js.map +1 -1
- package/esm/typings/servers.d.ts +40 -0
- package/esm/typings/src/_packages/core.index.d.ts +20 -8
- package/esm/typings/src/_packages/remote-client.index.d.ts +6 -8
- package/esm/typings/src/_packages/remote-server.index.d.ts +6 -6
- package/esm/typings/src/_packages/types.index.d.ts +18 -16
- package/esm/typings/src/cli/cli-commands/login.d.ts +0 -1
- package/esm/typings/src/cli/common/$addGlobalOptionsToCommand.d.ts +7 -0
- package/esm/typings/src/cli/common/$provideLlmToolsForCli.d.ts +28 -0
- package/esm/typings/src/cli/test/ptbk.d.ts +1 -1
- package/esm/typings/src/commands/EXPECT/expectCommandParser.d.ts +2 -0
- package/esm/typings/src/config.d.ts +24 -26
- package/esm/typings/src/errors/0-index.d.ts +9 -0
- package/esm/typings/src/errors/AuthenticationError.d.ts +9 -0
- package/esm/typings/src/errors/PipelineExecutionError.d.ts +1 -1
- package/esm/typings/src/errors/PromptbookFetchError.d.ts +9 -0
- package/esm/typings/src/errors/WrappedError.d.ts +10 -0
- package/esm/typings/src/errors/assertsError.d.ts +11 -0
- package/esm/typings/src/execution/PromptbookFetch.d.ts +1 -1
- package/esm/typings/src/llm-providers/_common/register/$provideEnvFilename.d.ts +12 -0
- package/esm/typings/src/llm-providers/_common/register/$provideLlmToolsConfigurationFromEnv.d.ts +2 -8
- package/esm/typings/src/llm-providers/_common/register/$provideLlmToolsForTestingAndScriptsAndPlayground.d.ts +2 -0
- package/esm/typings/src/llm-providers/_common/register/$provideLlmToolsForWizzardOrCli.d.ts +45 -1
- package/esm/typings/src/llm-providers/_common/register/$provideLlmToolsFromEnv.d.ts +1 -0
- package/esm/typings/src/llm-providers/anthropic-claude/AnthropicClaudeExecutionToolsOptions.d.ts +1 -1
- package/esm/typings/src/llm-providers/anthropic-claude/register-configuration.d.ts +1 -1
- package/esm/typings/src/remote-server/RemoteServer.d.ts +23 -0
- package/esm/typings/src/remote-server/socket-types/_subtypes/{PromptbookServer_Identification.d.ts → Identification.d.ts} +3 -3
- package/esm/typings/src/remote-server/socket-types/_subtypes/identificationToPromptbookToken.d.ts +11 -0
- package/esm/typings/src/remote-server/socket-types/_subtypes/promptbookTokenToIdentification.d.ts +10 -0
- package/esm/typings/src/remote-server/socket-types/listModels/PromptbookServer_ListModels_Request.d.ts +2 -2
- package/esm/typings/src/remote-server/socket-types/prepare/PromptbookServer_PreparePipeline_Request.d.ts +2 -2
- package/esm/typings/src/remote-server/socket-types/prompt/PromptbookServer_Prompt_Request.d.ts +2 -2
- package/esm/typings/src/remote-server/startRemoteServer.d.ts +2 -3
- package/esm/typings/src/remote-server/types/RemoteClientOptions.d.ts +4 -12
- package/esm/typings/src/remote-server/types/RemoteServerOptions.d.ts +89 -4
- package/esm/typings/src/scrapers/_common/utils/{scraperFetch.d.ts → promptbookFetch.d.ts} +2 -2
- package/esm/typings/src/storage/env-storage/$EnvStorage.d.ts +40 -0
- package/esm/typings/src/types/typeAliases.d.ts +19 -0
- package/esm/typings/src/utils/organization/TODO_narrow.d.ts +6 -0
- package/package.json +8 -4
- package/umd/index.umd.js +122 -39
- package/umd/index.umd.js.map +1 -1
- package/esm/typings/src/cli/test/ptbk2.d.ts +0 -5
- package/esm/typings/src/playground/BrjappConnector.d.ts +0 -67
- package/esm/typings/src/playground/brjapp-api-schema.d.ts +0 -12879
package/umd/index.umd.js
CHANGED
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
* @generated
|
|
27
27
|
* @see https://github.com/webgptorg/promptbook
|
|
28
28
|
*/
|
|
29
|
-
const PROMPTBOOK_ENGINE_VERSION = '0.89.0-
|
|
29
|
+
const PROMPTBOOK_ENGINE_VERSION = '0.89.0-20';
|
|
30
30
|
/**
|
|
31
31
|
* TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
|
|
32
32
|
* Note: [💞] Ignore a discrepancy between file name and entity name
|
|
@@ -89,6 +89,7 @@
|
|
|
89
89
|
* @public exported from `@promptbook/core`
|
|
90
90
|
*/
|
|
91
91
|
const ADMIN_GITHUB_NAME = 'hejny';
|
|
92
|
+
// <- TODO: [🐊] Pick the best claim
|
|
92
93
|
/**
|
|
93
94
|
* When the title is not provided, the default title is used
|
|
94
95
|
*
|
|
@@ -121,6 +122,7 @@
|
|
|
121
122
|
infinity: '(infinity; ∞)',
|
|
122
123
|
negativeInfinity: '(negative infinity; -∞)',
|
|
123
124
|
unserializable: '(unserializable value)',
|
|
125
|
+
circular: '(circular JSON)',
|
|
124
126
|
};
|
|
125
127
|
/**
|
|
126
128
|
* Small number limit
|
|
@@ -160,6 +162,7 @@
|
|
|
160
162
|
*/
|
|
161
163
|
const DEFAULT_MAX_EXECUTION_ATTEMPTS = 10; // <- TODO: [🤹♂️]
|
|
162
164
|
// <- TODO: [🕝] Make also `BOOKS_DIRNAME_ALTERNATIVES`
|
|
165
|
+
// TODO: Just `.promptbook` in config, hardcode subfolders like `download-cache` or `execution-cache`
|
|
163
166
|
/**
|
|
164
167
|
* Where to store the temporary downloads
|
|
165
168
|
*
|
|
@@ -211,7 +214,7 @@
|
|
|
211
214
|
true);
|
|
212
215
|
/**
|
|
213
216
|
* Note: [💞] Ignore a discrepancy between file name and entity name
|
|
214
|
-
* TODO: [🧠][🧜♂️] Maybe join
|
|
217
|
+
* TODO: [🧠][🧜♂️] Maybe join remoteServerUrl and path into single value
|
|
215
218
|
*/
|
|
216
219
|
|
|
217
220
|
/**
|
|
@@ -1067,6 +1070,54 @@
|
|
|
1067
1070
|
* TODO: Maybe split `ParseError` and `ApplyError`
|
|
1068
1071
|
*/
|
|
1069
1072
|
|
|
1073
|
+
/**
|
|
1074
|
+
* This error type indicates that somewhere in the code non-Error object was thrown and it was wrapped into the `WrappedError`
|
|
1075
|
+
*
|
|
1076
|
+
* @public exported from `@promptbook/core`
|
|
1077
|
+
*/
|
|
1078
|
+
class WrappedError extends Error {
|
|
1079
|
+
constructor(whatWasThrown) {
|
|
1080
|
+
const tag = `[🤮]`;
|
|
1081
|
+
console.error(tag, whatWasThrown);
|
|
1082
|
+
super(spaceTrim.spaceTrim(`
|
|
1083
|
+
Non-Error object was thrown
|
|
1084
|
+
|
|
1085
|
+
Note: Look for ${tag} in the console for more details
|
|
1086
|
+
Please report issue on ${ADMIN_EMAIL}
|
|
1087
|
+
`));
|
|
1088
|
+
this.name = 'WrappedError';
|
|
1089
|
+
Object.setPrototypeOf(this, WrappedError.prototype);
|
|
1090
|
+
}
|
|
1091
|
+
}
|
|
1092
|
+
|
|
1093
|
+
/**
|
|
1094
|
+
* Helper used in catch blocks to assert that the error is an instance of `Error`
|
|
1095
|
+
*
|
|
1096
|
+
* @param whatWasThrown Any object that was thrown
|
|
1097
|
+
* @returns Nothing if the error is an instance of `Error`
|
|
1098
|
+
* @throws `WrappedError` or `UnexpectedError` if the error is not standard
|
|
1099
|
+
*
|
|
1100
|
+
* @private within the repository
|
|
1101
|
+
*/
|
|
1102
|
+
function assertsError(whatWasThrown) {
|
|
1103
|
+
// Case 1: Handle error which was rethrown as `WrappedError`
|
|
1104
|
+
if (whatWasThrown instanceof WrappedError) {
|
|
1105
|
+
const wrappedError = whatWasThrown;
|
|
1106
|
+
throw wrappedError;
|
|
1107
|
+
}
|
|
1108
|
+
// Case 2: Handle unexpected errors
|
|
1109
|
+
if (whatWasThrown instanceof UnexpectedError) {
|
|
1110
|
+
const unexpectedError = whatWasThrown;
|
|
1111
|
+
throw unexpectedError;
|
|
1112
|
+
}
|
|
1113
|
+
// Case 3: Handle standard errors - keep them up to consumer
|
|
1114
|
+
if (whatWasThrown instanceof Error) {
|
|
1115
|
+
return;
|
|
1116
|
+
}
|
|
1117
|
+
// Case 4: Handle non-standard errors - wrap them into `WrappedError` and throw
|
|
1118
|
+
throw new WrappedError(whatWasThrown);
|
|
1119
|
+
}
|
|
1120
|
+
|
|
1070
1121
|
/**
|
|
1071
1122
|
* Function isValidJsonString will tell you if the string is valid JSON or not
|
|
1072
1123
|
*
|
|
@@ -1078,9 +1129,7 @@
|
|
|
1078
1129
|
return true;
|
|
1079
1130
|
}
|
|
1080
1131
|
catch (error) {
|
|
1081
|
-
|
|
1082
|
-
throw error;
|
|
1083
|
-
}
|
|
1132
|
+
assertsError(error);
|
|
1084
1133
|
if (error.message.includes('Unexpected token')) {
|
|
1085
1134
|
return false;
|
|
1086
1135
|
}
|
|
@@ -1433,9 +1482,7 @@
|
|
|
1433
1482
|
JSON.stringify(value); // <- TODO: [0]
|
|
1434
1483
|
}
|
|
1435
1484
|
catch (error) {
|
|
1436
|
-
|
|
1437
|
-
throw error;
|
|
1438
|
-
}
|
|
1485
|
+
assertsError(error);
|
|
1439
1486
|
throw new UnexpectedError(spaceTrim__default["default"]((block) => `
|
|
1440
1487
|
\`${name}\` is not serializable
|
|
1441
1488
|
|
|
@@ -2206,7 +2253,7 @@
|
|
|
2206
2253
|
}
|
|
2207
2254
|
}
|
|
2208
2255
|
/**
|
|
2209
|
-
* TODO:
|
|
2256
|
+
* TODO: [🧠][🌂] Add id to all errors
|
|
2210
2257
|
*/
|
|
2211
2258
|
|
|
2212
2259
|
/**
|
|
@@ -2306,6 +2353,19 @@
|
|
|
2306
2353
|
}
|
|
2307
2354
|
}
|
|
2308
2355
|
|
|
2356
|
+
/**
|
|
2357
|
+
* AuthenticationError is thrown from login function which is dependency of remote server
|
|
2358
|
+
*
|
|
2359
|
+
* @public exported from `@promptbook/core`
|
|
2360
|
+
*/
|
|
2361
|
+
class AuthenticationError extends Error {
|
|
2362
|
+
constructor(message) {
|
|
2363
|
+
super(message);
|
|
2364
|
+
this.name = 'AuthenticationError';
|
|
2365
|
+
Object.setPrototypeOf(this, AuthenticationError.prototype);
|
|
2366
|
+
}
|
|
2367
|
+
}
|
|
2368
|
+
|
|
2309
2369
|
/**
|
|
2310
2370
|
* This error indicates that the pipeline collection cannot be propperly loaded
|
|
2311
2371
|
*
|
|
@@ -2371,6 +2431,19 @@
|
|
|
2371
2431
|
}
|
|
2372
2432
|
}
|
|
2373
2433
|
|
|
2434
|
+
/**
|
|
2435
|
+
* Error thrown when a fetch request fails
|
|
2436
|
+
*
|
|
2437
|
+
* @public exported from `@promptbook/core`
|
|
2438
|
+
*/
|
|
2439
|
+
class PromptbookFetchError extends Error {
|
|
2440
|
+
constructor(message) {
|
|
2441
|
+
super(message);
|
|
2442
|
+
this.name = 'PromptbookFetchError';
|
|
2443
|
+
Object.setPrototypeOf(this, PromptbookFetchError.prototype);
|
|
2444
|
+
}
|
|
2445
|
+
}
|
|
2446
|
+
|
|
2374
2447
|
/**
|
|
2375
2448
|
* Index of all custom errors
|
|
2376
2449
|
*
|
|
@@ -2391,7 +2464,10 @@
|
|
|
2391
2464
|
PipelineExecutionError,
|
|
2392
2465
|
PipelineLogicError,
|
|
2393
2466
|
PipelineUrlError,
|
|
2467
|
+
AuthenticationError,
|
|
2468
|
+
PromptbookFetchError,
|
|
2394
2469
|
UnexpectedError,
|
|
2470
|
+
WrappedError,
|
|
2395
2471
|
// TODO: [🪑]> VersionMismatchError,
|
|
2396
2472
|
};
|
|
2397
2473
|
/**
|
|
@@ -2530,8 +2606,8 @@
|
|
|
2530
2606
|
updatedAt = new Date();
|
|
2531
2607
|
errors.push(...executionResult.errors);
|
|
2532
2608
|
warnings.push(...executionResult.warnings);
|
|
2533
|
-
// <- TODO:
|
|
2534
|
-
// TODO: [🧠]
|
|
2609
|
+
// <- TODO: [🌂] Only unique errors and warnings should be added (or filtered)
|
|
2610
|
+
// TODO: [🧠] !! errors, warning, isSuccessful are redundant both in `ExecutionTask` and `ExecutionTask.currentValue`
|
|
2535
2611
|
// Also maybe move `ExecutionTask.currentValue.usage` -> `ExecutionTask.usage`
|
|
2536
2612
|
// And delete `ExecutionTask.currentValue.preparedPipeline`
|
|
2537
2613
|
assertsTaskSuccessful(executionResult);
|
|
@@ -2541,6 +2617,7 @@
|
|
|
2541
2617
|
partialResultSubject.next(executionResult);
|
|
2542
2618
|
}
|
|
2543
2619
|
catch (error) {
|
|
2620
|
+
assertsError(error);
|
|
2544
2621
|
status = 'ERROR';
|
|
2545
2622
|
errors.push(error);
|
|
2546
2623
|
partialResultSubject.error(error);
|
|
@@ -2607,6 +2684,10 @@
|
|
|
2607
2684
|
|
|
2608
2685
|
Cannot serialize error with name "${name}"
|
|
2609
2686
|
|
|
2687
|
+
Authors of Promptbook probably forgot to add this error into the list of errors:
|
|
2688
|
+
https://github.com/webgptorg/promptbook/blob/main/src/errors/0-index.ts
|
|
2689
|
+
|
|
2690
|
+
|
|
2610
2691
|
${block(stack || message)}
|
|
2611
2692
|
|
|
2612
2693
|
`));
|
|
@@ -2928,14 +3009,15 @@
|
|
|
2928
3009
|
}
|
|
2929
3010
|
}
|
|
2930
3011
|
catch (error) {
|
|
2931
|
-
|
|
3012
|
+
assertsError(error);
|
|
3013
|
+
if (error instanceof UnexpectedError) {
|
|
2932
3014
|
throw error;
|
|
2933
3015
|
}
|
|
2934
3016
|
errors.push({ llmExecutionTools, error });
|
|
2935
3017
|
}
|
|
2936
3018
|
}
|
|
2937
3019
|
if (errors.length === 1) {
|
|
2938
|
-
throw errors[0];
|
|
3020
|
+
throw errors[0].error;
|
|
2939
3021
|
}
|
|
2940
3022
|
else if (errors.length > 1) {
|
|
2941
3023
|
throw new PipelineExecutionError(
|
|
@@ -3373,17 +3455,22 @@
|
|
|
3373
3455
|
/**
|
|
3374
3456
|
* The built-in `fetch' function with a lightweight error handling wrapper as default fetch function used in Promptbook scrapers
|
|
3375
3457
|
*
|
|
3376
|
-
* @
|
|
3458
|
+
* @public exported from `@promptbook/core`
|
|
3377
3459
|
*/
|
|
3378
|
-
const
|
|
3460
|
+
const promptbookFetch = async (urlOrRequest, init) => {
|
|
3379
3461
|
try {
|
|
3380
|
-
return await fetch(
|
|
3462
|
+
return await fetch(urlOrRequest, init);
|
|
3381
3463
|
}
|
|
3382
3464
|
catch (error) {
|
|
3383
|
-
|
|
3384
|
-
|
|
3465
|
+
assertsError(error);
|
|
3466
|
+
let url;
|
|
3467
|
+
if (typeof urlOrRequest === 'string') {
|
|
3468
|
+
url = urlOrRequest;
|
|
3469
|
+
}
|
|
3470
|
+
else if (urlOrRequest instanceof Request) {
|
|
3471
|
+
url = urlOrRequest.url;
|
|
3385
3472
|
}
|
|
3386
|
-
throw new
|
|
3473
|
+
throw new PromptbookFetchError(spaceTrim__default["default"]((block) => `
|
|
3387
3474
|
Can not fetch "${url}"
|
|
3388
3475
|
|
|
3389
3476
|
Fetch error:
|
|
@@ -3404,7 +3491,7 @@
|
|
|
3404
3491
|
async function makeKnowledgeSourceHandler(knowledgeSource, tools, options) {
|
|
3405
3492
|
// console.log('!! makeKnowledgeSourceHandler', knowledgeSource);
|
|
3406
3493
|
var _a;
|
|
3407
|
-
const { fetch =
|
|
3494
|
+
const { fetch = promptbookFetch } = tools;
|
|
3408
3495
|
const { knowledgeSourceContent } = knowledgeSource;
|
|
3409
3496
|
let { name } = knowledgeSource;
|
|
3410
3497
|
const { rootDirname = null,
|
|
@@ -3606,9 +3693,7 @@
|
|
|
3606
3693
|
knowledgePreparedUnflatten[index] = pieces;
|
|
3607
3694
|
}
|
|
3608
3695
|
catch (error) {
|
|
3609
|
-
|
|
3610
|
-
throw error;
|
|
3611
|
-
}
|
|
3696
|
+
assertsError(error);
|
|
3612
3697
|
console.warn(error);
|
|
3613
3698
|
// <- TODO: [🏮] Some standard way how to transform errors into warnings and how to handle non-critical fails during the tasks
|
|
3614
3699
|
}
|
|
@@ -3900,13 +3985,19 @@
|
|
|
3900
3985
|
return value.toISOString();
|
|
3901
3986
|
}
|
|
3902
3987
|
else {
|
|
3903
|
-
|
|
3988
|
+
try {
|
|
3989
|
+
return JSON.stringify(value);
|
|
3990
|
+
}
|
|
3991
|
+
catch (error) {
|
|
3992
|
+
if (error instanceof TypeError && error.message.includes('circular structure')) {
|
|
3993
|
+
return VALUE_STRINGS.circular;
|
|
3994
|
+
}
|
|
3995
|
+
throw error;
|
|
3996
|
+
}
|
|
3904
3997
|
}
|
|
3905
3998
|
}
|
|
3906
3999
|
catch (error) {
|
|
3907
|
-
|
|
3908
|
-
throw error;
|
|
3909
|
-
}
|
|
4000
|
+
assertsError(error);
|
|
3910
4001
|
console.error(error);
|
|
3911
4002
|
return VALUE_STRINGS.unserializable;
|
|
3912
4003
|
}
|
|
@@ -3963,9 +4054,7 @@
|
|
|
3963
4054
|
}
|
|
3964
4055
|
}
|
|
3965
4056
|
catch (error) {
|
|
3966
|
-
|
|
3967
|
-
throw error;
|
|
3968
|
-
}
|
|
4057
|
+
assertsError(error);
|
|
3969
4058
|
throw new ParseError(spaceTrim.spaceTrim((block) => `
|
|
3970
4059
|
Can not extract variables from the script
|
|
3971
4060
|
${block(error.stack || error.message)}
|
|
@@ -4830,9 +4919,7 @@
|
|
|
4830
4919
|
break scripts;
|
|
4831
4920
|
}
|
|
4832
4921
|
catch (error) {
|
|
4833
|
-
|
|
4834
|
-
throw error;
|
|
4835
|
-
}
|
|
4922
|
+
assertsError(error);
|
|
4836
4923
|
if (error instanceof UnexpectedError) {
|
|
4837
4924
|
throw error;
|
|
4838
4925
|
}
|
|
@@ -4902,9 +4989,7 @@
|
|
|
4902
4989
|
break scripts;
|
|
4903
4990
|
}
|
|
4904
4991
|
catch (error) {
|
|
4905
|
-
|
|
4906
|
-
throw error;
|
|
4907
|
-
}
|
|
4992
|
+
assertsError(error);
|
|
4908
4993
|
if (error instanceof UnexpectedError) {
|
|
4909
4994
|
throw error;
|
|
4910
4995
|
}
|
|
@@ -5525,9 +5610,7 @@
|
|
|
5525
5610
|
await Promise.all(resolving);
|
|
5526
5611
|
}
|
|
5527
5612
|
catch (error /* <- Note: [3] */) {
|
|
5528
|
-
|
|
5529
|
-
throw error;
|
|
5530
|
-
}
|
|
5613
|
+
assertsError(error);
|
|
5531
5614
|
// Note: No need to rethrow UnexpectedError
|
|
5532
5615
|
// if (error instanceof UnexpectedError) {
|
|
5533
5616
|
// Note: Count usage, [🧠] Maybe put to separate function executionReportJsonToUsage + DRY [🤹♂️]
|