@promptbook/editable 0.89.0-3 → 0.89.0-31

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.
Files changed (50) hide show
  1. package/README.md +9 -7
  2. package/esm/index.es.js +56 -11
  3. package/esm/index.es.js.map +1 -1
  4. package/esm/typings/servers.d.ts +40 -0
  5. package/esm/typings/src/_packages/core.index.d.ts +20 -8
  6. package/esm/typings/src/_packages/remote-client.index.d.ts +6 -8
  7. package/esm/typings/src/_packages/remote-server.index.d.ts +6 -6
  8. package/esm/typings/src/_packages/types.index.d.ts +24 -12
  9. package/esm/typings/src/cli/cli-commands/login.d.ts +0 -1
  10. package/esm/typings/src/cli/common/$addGlobalOptionsToCommand.d.ts +7 -0
  11. package/esm/typings/src/cli/common/$provideLlmToolsForCli.d.ts +28 -0
  12. package/esm/typings/src/cli/test/ptbk.d.ts +1 -1
  13. package/esm/typings/src/commands/EXPECT/expectCommandParser.d.ts +2 -0
  14. package/esm/typings/src/config.d.ts +24 -26
  15. package/esm/typings/src/errors/0-index.d.ts +9 -0
  16. package/esm/typings/src/errors/AuthenticationError.d.ts +9 -0
  17. package/esm/typings/src/errors/PipelineExecutionError.d.ts +1 -1
  18. package/esm/typings/src/errors/PromptbookFetchError.d.ts +9 -0
  19. package/esm/typings/src/errors/WrappedError.d.ts +10 -0
  20. package/esm/typings/src/errors/assertsError.d.ts +11 -0
  21. package/esm/typings/src/execution/PromptbookFetch.d.ts +1 -1
  22. package/esm/typings/src/llm-providers/_common/register/$provideEnvFilename.d.ts +12 -0
  23. package/esm/typings/src/llm-providers/_common/register/$provideLlmToolsConfigurationFromEnv.d.ts +2 -8
  24. package/esm/typings/src/llm-providers/_common/register/$provideLlmToolsForTestingAndScriptsAndPlayground.d.ts +2 -0
  25. package/esm/typings/src/llm-providers/_common/register/$provideLlmToolsForWizzardOrCli.d.ts +45 -1
  26. package/esm/typings/src/llm-providers/_common/register/$provideLlmToolsFromEnv.d.ts +1 -0
  27. package/esm/typings/src/llm-providers/anthropic-claude/AnthropicClaudeExecutionToolsOptions.d.ts +1 -1
  28. package/esm/typings/src/llm-providers/anthropic-claude/register-configuration.d.ts +1 -1
  29. package/esm/typings/src/remote-server/RemoteServer.d.ts +23 -0
  30. package/esm/typings/src/remote-server/openapi-types.d.ts +284 -0
  31. package/esm/typings/src/remote-server/openapi.d.ts +187 -0
  32. package/esm/typings/src/remote-server/socket-types/_subtypes/{PromptbookServer_Identification.d.ts → Identification.d.ts} +3 -3
  33. package/esm/typings/src/remote-server/socket-types/_subtypes/identificationToPromptbookToken.d.ts +11 -0
  34. package/esm/typings/src/remote-server/socket-types/_subtypes/promptbookTokenToIdentification.d.ts +10 -0
  35. package/esm/typings/src/remote-server/socket-types/listModels/PromptbookServer_ListModels_Request.d.ts +2 -2
  36. package/esm/typings/src/remote-server/socket-types/prepare/PromptbookServer_PreparePipeline_Request.d.ts +2 -2
  37. package/esm/typings/src/remote-server/socket-types/prompt/PromptbookServer_Prompt_Request.d.ts +2 -2
  38. package/esm/typings/src/remote-server/startRemoteServer.d.ts +3 -4
  39. package/esm/typings/src/remote-server/types/RemoteClientOptions.d.ts +4 -12
  40. package/esm/typings/src/remote-server/types/RemoteServerOptions.d.ts +84 -9
  41. package/esm/typings/src/scrapers/_common/utils/{scraperFetch.d.ts → promptbookFetch.d.ts} +2 -2
  42. package/esm/typings/src/storage/env-storage/$EnvStorage.d.ts +40 -0
  43. package/esm/typings/src/types/typeAliases.d.ts +19 -0
  44. package/esm/typings/src/utils/organization/TODO_narrow.d.ts +6 -0
  45. package/package.json +6 -2
  46. package/umd/index.umd.js +56 -11
  47. package/umd/index.umd.js.map +1 -1
  48. package/esm/typings/src/cli/test/ptbk2.d.ts +0 -5
  49. package/esm/typings/src/playground/BrjappConnector.d.ts +0 -67
  50. package/esm/typings/src/playground/brjapp-api-schema.d.ts +0 -12879
@@ -1,10 +1,16 @@
1
+ import type { Request, Response } from 'express';
1
2
  import type { Promisable } from 'type-fest';
2
3
  import type { PipelineCollection } from '../../collection/PipelineCollection';
4
+ import { AuthenticationError } from '../../errors/AuthenticationError';
3
5
  import type { CommonToolsOptions } from '../../execution/CommonToolsOptions';
6
+ import type { ExecutionTools } from '../../execution/ExecutionTools';
4
7
  import type { LlmExecutionTools } from '../../execution/LlmExecutionTools';
5
8
  import type { string_app_id } from '../../types/typeAliases';
6
- import type { string_uri } from '../../types/typeAliases';
9
+ import type { string_email } from '../../types/typeAliases';
10
+ import type { string_password } from '../../types/typeAliases';
7
11
  import type { string_user_id } from '../../types/typeAliases';
12
+ import type { ApplicationModeIdentification } from '../socket-types/_subtypes/Identification';
13
+ import type { Identification } from '../socket-types/_subtypes/Identification';
8
14
  /**
9
15
  * @@@
10
16
  *
@@ -16,7 +22,6 @@ import type { string_user_id } from '../../types/typeAliases';
16
22
  *
17
23
  * You can enable both modes at the same time.
18
24
  *
19
- * @public exported from `@promptbook/remote-client`
20
25
  * @public exported from `@promptbook/remote-server`
21
26
  */
22
27
  export type RemoteServerOptions<TCustomOptions> = CommonToolsOptions & {
@@ -25,15 +30,23 @@ export type RemoteServerOptions<TCustomOptions> = CommonToolsOptions & {
25
30
  */
26
31
  readonly port: number;
27
32
  /**
28
- * Root path of the server
33
+ * Creates execution tools the client
29
34
  *
30
- * Note: This is useful when you reverse proxy the server without changing the path
35
+ * This is relevant also in anonymous mode in oposition to `createLlmExecutionTools`
31
36
  *
32
- * @default '/'
33
- * @example '/api/promptbook/'
37
+ * Note: You can provide only some tools and leave the rest to the default ones also llm tools are created by `createLlmExecutionTools`
38
+ * Note: This is useful when you want to provide some custom restrictions for example:
39
+ * - Limit access to certain websites for some users
40
+ * - Bind user-interface tools to email agent
41
+ * - Allow / block script execution
42
+ * - And many more
34
43
  */
35
- readonly rootPath: string_uri;
36
- } & (AnonymousRemoteServerOptions | ApplicationRemoteServerOptions<TCustomOptions> | (AnonymousRemoteServerOptions & ApplicationRemoteServerOptions<TCustomOptions>));
44
+ createExecutionTools?(options: Identification<TCustomOptions>): Promisable<Partial<Omit<ExecutionTools, 'llm'>>>;
45
+ } & ((AnonymousRemoteServerOptions & {
46
+ readonly isApplicationModeAllowed?: false;
47
+ }) | ({
48
+ readonly isAnonymousModeAllowed?: false;
49
+ } & ApplicationRemoteServerOptions<TCustomOptions>) | (AnonymousRemoteServerOptions & ApplicationRemoteServerOptions<TCustomOptions>));
37
50
  export type AnonymousRemoteServerOptions = {
38
51
  /**
39
52
  * Enable anonymous mode
@@ -51,10 +64,22 @@ export type ApplicationRemoteServerOptions<TCustomOptions> = {
51
64
  * This is used to check validity of the prompt to prevent misuse
52
65
  */
53
66
  readonly collection: PipelineCollection;
67
+ /**
68
+ * User tries to login to the server, this function will be called verify the user and return the identification or throw an error
69
+ * This can be also doubled as a function to register the user
70
+ *
71
+ * Note: In most cases, you will return `PromptbookServer_ApplicationIdentification`
72
+ * `PromptbookServer_AnonymousIdentification` is useful only in scenarios when user stores its own api keys on the application server and
73
+ * server acts only as a api key provider
74
+ *
75
+ * Note: In most cases DO NOT THROW `AuthenticationError` but return `isSuccess: false` with message
76
+ * @throws `AuthenticationError` if the user is not allowed to login for example because of invalid credentials
77
+ */
78
+ login(loginRequest: LoginRequest): Promise<LoginResponse<TCustomOptions>>;
54
79
  /**
55
80
  * Creates llm execution tools for each client
56
81
  */
57
- createLlmExecutionTools(options: ApplicationRemoteServerClientOptions<TCustomOptions>): Promisable<LlmExecutionTools>;
82
+ createLlmExecutionTools(options: ApplicationModeIdentification<TCustomOptions>): Promisable<LlmExecutionTools>;
58
83
  };
59
84
  export type ApplicationRemoteServerClientOptions<TCustomOptions> = {
60
85
  /**
@@ -82,6 +107,56 @@ export type ApplicationRemoteServerClientOptions<TCustomOptions> = {
82
107
  */
83
108
  readonly customOptions?: TCustomOptions;
84
109
  };
110
+ /**
111
+ * Login request for the application mode
112
+ */
113
+ export type LoginRequest = {
114
+ /**
115
+ * Identifier of the application you are using
116
+ *
117
+ * Note: This is usefull when you use Promptbook remote server for multiple apps/frontends, if its used just for single app, use here just "app" or "your-app-name"
118
+ */
119
+ readonly appId: string_app_id | null;
120
+ /**
121
+ * Username (for example email) of the user
122
+ */
123
+ readonly username: string_email | string;
124
+ /**
125
+ * Password of the user
126
+ */
127
+ readonly password: string_password;
128
+ /**
129
+ * Request object from express if you want to access some request data for example headers, IP address, etc.
130
+ */
131
+ readonly rawRequest: Request;
132
+ /**
133
+ * Response object from express if you want to add some custom headers.
134
+ *
135
+ * Note: It is not recommended to use this object to send body of the response because it can confuse the client
136
+ */
137
+ readonly rawResponse: Response;
138
+ };
139
+ /**
140
+ * Login response for the application mode
141
+ */
142
+ export type LoginResponse<TCustomOptions> = {
143
+ /**
144
+ * Was the login successful
145
+ */
146
+ readonly isSuccess: boolean;
147
+ /**
148
+ * Message to display to the user, this message is always displayed
149
+ */
150
+ readonly message?: string;
151
+ /**
152
+ * Optional error if the login was not successful
153
+ */
154
+ readonly error?: AuthenticationError;
155
+ /**
156
+ * Identification of the user to be used in the future requests
157
+ */
158
+ readonly identification?: Identification<TCustomOptions>;
159
+ };
85
160
  /**
86
161
  * TODO: Constrain anonymous mode for specific models / providers
87
162
  */
@@ -2,9 +2,9 @@ import type { PromptbookFetch } from '../../../execution/PromptbookFetch';
2
2
  /**
3
3
  * The built-in `fetch' function with a lightweight error handling wrapper as default fetch function used in Promptbook scrapers
4
4
  *
5
- * @private as default `fetch` function used in Promptbook scrapers
5
+ * @public exported from `@promptbook/core`
6
6
  */
7
- export declare const scraperFetch: PromptbookFetch;
7
+ export declare const promptbookFetch: PromptbookFetch;
8
8
  /**
9
9
  * TODO: [🧠] Maybe rename because it is not used only for scrapers but also in `$getCompiledBook`
10
10
  */
@@ -0,0 +1,40 @@
1
+ import type { PromptbookStorage } from '../_common/PromptbookStorage';
2
+ /**
3
+ * Stores data in .env variables
4
+ *
5
+ * Note: `$` is used to indicate that this function is not a pure function - it uses filesystem to access `.env` file and also writes to `process.env`
6
+ *
7
+ * @private within the repository - for CLI utils
8
+ */
9
+ export declare class $EnvStorage<TItem> implements PromptbookStorage<TItem> {
10
+ private envFilename;
11
+ private $provideOrCreateEnvFile;
12
+ private transformKey;
13
+ /**
14
+ * Returns the number of key/value pairs currently present in the list associated with the object.
15
+ */
16
+ get length(): number;
17
+ /**
18
+ * Empties the list associated with the object of all key/value pairs, if there are any.
19
+ */
20
+ clear(): void;
21
+ /**
22
+ * Returns the current value associated with the given key, or null if the given key does not exist in the list associated with the object.
23
+ */
24
+ getItem(key: string): Promise<TItem | null>;
25
+ /**
26
+ * Returns the name of the nth key in the list, or null if n is greater than or equal to the number of key/value pairs in the object.
27
+ */
28
+ key(index: number): string | null;
29
+ /**
30
+ * Sets the value of the pair identified by key to value, creating a new key/value pair if none existed for key previously.
31
+ */
32
+ setItem(key: string, value: TItem): Promise<void>;
33
+ /**
34
+ * Removes the key/value pair with the given key from the list associated with the object, if a key/value pair with the given key exists.
35
+ */
36
+ removeItem(key: string): void;
37
+ }
38
+ /**
39
+ * TODO: Write file more securely - ensure that there can be no accidental overwriting of existing variables and other content
40
+ */
@@ -325,6 +325,12 @@ export type string_css_selector = string;
325
325
  * For example `"https://collboard.com/9SeSQTupmQHwuSrLi"`
326
326
  */
327
327
  export type string_url = string;
328
+ /**
329
+ * Semantic helper
330
+ *
331
+ * For example `"https://s1.ptbk.io/promptbook"`
332
+ */
333
+ export type string_promptbook_server_url = string;
328
334
  /**
329
335
  * Semantic helper
330
336
  *
@@ -521,6 +527,13 @@ export type string_person_profile = string;
521
527
  * For example `"MIT"`
522
528
  */
523
529
  export type string_license = string;
530
+ /**
531
+ * Semantic helper
532
+ *
533
+ * For example `"Pavol Hejný <pavol@ptbk.io> (https://www.pavolhejny.com/)"`
534
+ * For example `"AI Web, LLC <legal@ptbk.io> (https://www.ptbk.io/)"`
535
+ */
536
+ export type string_legal_entity = string | string_person_profile | string_title;
524
537
  /**
525
538
  * Semantic helper for attributes
526
539
  *
@@ -570,6 +583,12 @@ export type string_postprocessing_function_name = string;
570
583
  export type id = string | number;
571
584
  export type task_id = string;
572
585
  export type string_token = string;
586
+ /**
587
+ * Semantic helper
588
+ *
589
+ * Made by `identificationToPromptbookToken` exported from `@promptbook/core`
590
+ */
591
+ export type string_promptbook_token = string_token;
573
592
  export type string_license_token = string_token;
574
593
  export type string_password = string;
575
594
  export type string_ssh_key = string;
@@ -0,0 +1,6 @@
1
+ /**
2
+ * Organizational helper to better mark the place where the more specific type is missing
3
+ *
4
+ * @private within the repository
5
+ */
6
+ export type TODO_narrow<T> = T;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@promptbook/editable",
3
- "version": "0.89.0-3",
3
+ "version": "0.89.0-31",
4
4
  "description": "It's time for a paradigm shift. The future of software in plain English, French or Latin",
5
5
  "private": false,
6
6
  "sideEffects": false,
@@ -43,11 +43,15 @@
43
43
  "url": "https://github.com/webgptorg/promptbook/issues"
44
44
  },
45
45
  "homepage": "https://ptbk.io/",
46
+ "engines": {
47
+ "node": ">=16.0.0",
48
+ "npm": ">=8.0.0"
49
+ },
46
50
  "main": "./umd/index.umd.js",
47
51
  "module": "./esm/index.es.js",
48
52
  "typings": "./esm/typings/src/_packages/editable.index.d.ts",
49
53
  "peerDependencies": {
50
- "@promptbook/core": "0.89.0-3"
54
+ "@promptbook/core": "0.89.0-31"
51
55
  },
52
56
  "dependencies": {
53
57
  "crypto-js": "4.2.0",
package/umd/index.umd.js CHANGED
@@ -23,7 +23,7 @@
23
23
  * @generated
24
24
  * @see https://github.com/webgptorg/promptbook
25
25
  */
26
- const PROMPTBOOK_ENGINE_VERSION = '0.89.0-3';
26
+ const PROMPTBOOK_ENGINE_VERSION = '0.89.0-31';
27
27
  /**
28
28
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
29
29
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -69,6 +69,7 @@
69
69
  * @public exported from `@promptbook/core`
70
70
  */
71
71
  const ADMIN_GITHUB_NAME = 'hejny';
72
+ // <- TODO: [🐊] Pick the best claim
72
73
  /**
73
74
  * When the title is not provided, the default title is used
74
75
  *
@@ -102,7 +103,7 @@
102
103
  });
103
104
  /**
104
105
  * Note: [💞] Ignore a discrepancy between file name and entity name
105
- * TODO: [🧠][🧜‍♂️] Maybe join remoteUrl and path into single value
106
+ * TODO: [🧠][🧜‍♂️] Maybe join remoteServerUrl and path into single value
106
107
  */
107
108
 
108
109
  /**
@@ -423,6 +424,54 @@
423
424
  },
424
425
  };
425
426
 
427
+ /**
428
+ * This error type indicates that somewhere in the code non-Error object was thrown and it was wrapped into the `WrappedError`
429
+ *
430
+ * @public exported from `@promptbook/core`
431
+ */
432
+ class WrappedError extends Error {
433
+ constructor(whatWasThrown) {
434
+ const tag = `[🤮]`;
435
+ console.error(tag, whatWasThrown);
436
+ super(spaceTrim.spaceTrim(`
437
+ Non-Error object was thrown
438
+
439
+ Note: Look for ${tag} in the console for more details
440
+ Please report issue on ${ADMIN_EMAIL}
441
+ `));
442
+ this.name = 'WrappedError';
443
+ Object.setPrototypeOf(this, WrappedError.prototype);
444
+ }
445
+ }
446
+
447
+ /**
448
+ * Helper used in catch blocks to assert that the error is an instance of `Error`
449
+ *
450
+ * @param whatWasThrown Any object that was thrown
451
+ * @returns Nothing if the error is an instance of `Error`
452
+ * @throws `WrappedError` or `UnexpectedError` if the error is not standard
453
+ *
454
+ * @private within the repository
455
+ */
456
+ function assertsError(whatWasThrown) {
457
+ // Case 1: Handle error which was rethrown as `WrappedError`
458
+ if (whatWasThrown instanceof WrappedError) {
459
+ const wrappedError = whatWasThrown;
460
+ throw wrappedError;
461
+ }
462
+ // Case 2: Handle unexpected errors
463
+ if (whatWasThrown instanceof UnexpectedError) {
464
+ const unexpectedError = whatWasThrown;
465
+ throw unexpectedError;
466
+ }
467
+ // Case 3: Handle standard errors - keep them up to consumer
468
+ if (whatWasThrown instanceof Error) {
469
+ return;
470
+ }
471
+ // Case 4: Handle non-standard errors - wrap them into `WrappedError` and throw
472
+ throw new WrappedError(whatWasThrown);
473
+ }
474
+
426
475
  /**
427
476
  * Units of text measurement
428
477
  *
@@ -503,6 +552,8 @@
503
552
  */
504
553
 
505
554
  /**
555
+ import { WrappedError } from '../../errors/WrappedError';
556
+ import { assertsError } from '../../errors/assertsError';
506
557
  * Parses the expect command
507
558
  *
508
559
  * @see `documentationUrl` for more details
@@ -594,9 +645,7 @@
594
645
  };
595
646
  }
596
647
  catch (error) {
597
- if (!(error instanceof Error)) {
598
- throw error;
599
- }
648
+ assertsError(error);
600
649
  throw new ParseError(spaceTrim__default["default"]((block) => `
601
650
  Invalid FORMAT command
602
651
  ${block(error.message)}:
@@ -783,9 +832,7 @@
783
832
  return true;
784
833
  }
785
834
  catch (error) {
786
- if (!(error instanceof Error)) {
787
- throw error;
788
- }
835
+ assertsError(error);
789
836
  if (error.message.includes('Unexpected token')) {
790
837
  return false;
791
838
  }
@@ -1103,9 +1150,7 @@
1103
1150
  JSON.stringify(value); // <- TODO: [0]
1104
1151
  }
1105
1152
  catch (error) {
1106
- if (!(error instanceof Error)) {
1107
- throw error;
1108
- }
1153
+ assertsError(error);
1109
1154
  throw new UnexpectedError(spaceTrim__default["default"]((block) => `
1110
1155
  \`${name}\` is not serializable
1111
1156