@promptbook/documents 0.84.0-11 → 0.84.0-13

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.
@@ -19,7 +19,8 @@ import { DEFAULT_MAX_EXECUTION_ATTEMPTS } from '../config';
19
19
  import { DEFAULT_MAX_KNOWLEDGE_SOURCES_SCRAPING_DEPTH } from '../config';
20
20
  import { DEFAULT_MAX_KNOWLEDGE_SOURCES_SCRAPING_TOTAL } from '../config';
21
21
  import { DEFAULT_BOOKS_DIRNAME } from '../config';
22
- import { DEFAULT_EXECUTIONS_CACHE_DIRNAME } from '../config';
22
+ import { DEFAULT_DOWNLOAD_CACHE_DIRNAME } from '../config';
23
+ import { DEFAULT_EXECUTION_CACHE_DIRNAME } from '../config';
23
24
  import { DEFAULT_SCRAPE_CACHE_DIRNAME } from '../config';
24
25
  import { DEFAULT_PIPELINE_COLLECTION_BASE_FILENAME } from '../config';
25
26
  import { DEFAULT_REMOTE_URL } from '../config';
@@ -145,7 +146,8 @@ export { DEFAULT_MAX_EXECUTION_ATTEMPTS };
145
146
  export { DEFAULT_MAX_KNOWLEDGE_SOURCES_SCRAPING_DEPTH };
146
147
  export { DEFAULT_MAX_KNOWLEDGE_SOURCES_SCRAPING_TOTAL };
147
148
  export { DEFAULT_BOOKS_DIRNAME };
148
- export { DEFAULT_EXECUTIONS_CACHE_DIRNAME };
149
+ export { DEFAULT_DOWNLOAD_CACHE_DIRNAME };
150
+ export { DEFAULT_EXECUTION_CACHE_DIRNAME };
149
151
  export { DEFAULT_SCRAPE_CACHE_DIRNAME };
150
152
  export { DEFAULT_PIPELINE_COLLECTION_BASE_FILENAME };
151
153
  export { DEFAULT_REMOTE_URL };
@@ -166,6 +166,14 @@ export declare const DEFAULT_MAX_KNOWLEDGE_SOURCES_SCRAPING_TOTAL = 200;
166
166
  * @public exported from `@promptbook/core`
167
167
  */
168
168
  export declare const DEFAULT_BOOKS_DIRNAME = "./books";
169
+ /**
170
+ * Where to store the temporary downloads
171
+ *
172
+ * Note: When the folder does not exist, it is created recursively
173
+ *
174
+ * @public exported from `@promptbook/core`
175
+ */
176
+ export declare const DEFAULT_DOWNLOAD_CACHE_DIRNAME = "./.promptbook/download-cache";
169
177
  /**
170
178
  * Where to store the cache of executions for promptbook CLI
171
179
  *
@@ -173,7 +181,7 @@ export declare const DEFAULT_BOOKS_DIRNAME = "./books";
173
181
  *
174
182
  * @public exported from `@promptbook/core`
175
183
  */
176
- export declare const DEFAULT_EXECUTIONS_CACHE_DIRNAME = "./.promptbook/executions-cache";
184
+ export declare const DEFAULT_EXECUTION_CACHE_DIRNAME = "./.promptbook/execution-cache";
177
185
  /**
178
186
  * Where to store the scrape cache
179
187
  *
@@ -3,7 +3,7 @@ import type fs from 'fs/promises';
3
3
  /**
4
4
  * Container for all the tools needed to manipulate with filesystem
5
5
  */
6
- export type FilesystemTools = Pick<typeof fs, 'access' | 'constants' | 'readFile' | 'writeFile' | 'stat' | 'readdir'>;
6
+ export type FilesystemTools = Pick<typeof fs, 'access' | 'constants' | 'readFile' | 'writeFile' | 'stat' | 'readdir' | 'mkdir'>;
7
7
  /**
8
8
  * TODO: Implement destroyable pattern to free resources
9
9
  */
@@ -6,6 +6,7 @@ import type { PipelineString } from '../pipeline/PipelineString';
6
6
  import type { TaskProgress } from '../types/TaskProgress';
7
7
  import type { InputParameters } from '../types/typeAliases';
8
8
  import type { string_filename } from '../types/typeAliases';
9
+ import type { string_parameter_value } from '../types/typeAliases';
9
10
  import type { string_pipeline_url } from '../types/typeAliases';
10
11
  /**
11
12
  * Wizzard for simple usage of the Promptbook
@@ -27,7 +28,12 @@ declare class Wizzard {
27
28
  *
28
29
  * Note: This works simmilar to the `ptbk run` command
29
30
  */
30
- execute(book: string_pipeline_url | string_filename | PipelineString, inputParameters: InputParameters, onProgress?: (taskProgress: TaskProgress) => Promisable<void>): Promise<PipelineExecutorResult>;
31
+ execute(book: string_pipeline_url | string_filename | PipelineString, inputParameters: InputParameters, onProgress?: (taskProgress: TaskProgress) => Promisable<void>): Promise<{
32
+ /**
33
+ * Simple result of the execution
34
+ */
35
+ result: string_parameter_value;
36
+ } & PipelineExecutorResult>;
31
37
  private executionTools;
32
38
  /**
33
39
  * Provides the tools automatically for the Node.js environment
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@promptbook/documents",
3
- "version": "0.84.0-11",
3
+ "version": "0.84.0-13",
4
4
  "description": "It's time for a paradigm shift. The future of software in plain English, French or Latin",
5
5
  "--note-0": " <- [🐊]",
6
6
  "private": false,
@@ -54,7 +54,7 @@
54
54
  "module": "./esm/index.es.js",
55
55
  "typings": "./esm/typings/src/_packages/documents.index.d.ts",
56
56
  "peerDependencies": {
57
- "@promptbook/core": "0.84.0-11"
57
+ "@promptbook/core": "0.84.0-13"
58
58
  },
59
59
  "dependencies": {
60
60
  "colors": "1.4.0",
package/umd/index.umd.js CHANGED
@@ -1,8 +1,8 @@
1
1
  (function (global, factory) {
2
- typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('fs/promises'), require('spacetrim'), require('child_process'), require('colors'), require('waitasecond'), require('crypto-js'), require('crypto-js/enc-hex'), require('path'), require('prettier'), require('prettier/parser-html'), require('mime-types'), require('papaparse')) :
3
- typeof define === 'function' && define.amd ? define(['exports', 'fs/promises', 'spacetrim', 'child_process', 'colors', 'waitasecond', 'crypto-js', 'crypto-js/enc-hex', 'path', 'prettier', 'prettier/parser-html', 'mime-types', 'papaparse'], factory) :
4
- (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["promptbook-documents"] = {}, global.promises, global.spaceTrim, global.child_process, global.colors, global.waitasecond, global.cryptoJs, global.hexEncoder, global.path, global.prettier, global.parserHtml, global.mimeTypes, global.papaparse));
5
- })(this, (function (exports, promises, spaceTrim, child_process, colors, waitasecond, cryptoJs, hexEncoder, path, prettier, parserHtml, mimeTypes, papaparse) { 'use strict';
2
+ typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('fs/promises'), require('spacetrim'), require('child_process'), require('colors'), require('waitasecond'), require('crypto-js'), require('crypto-js/enc-hex'), require('path'), require('prettier'), require('prettier/parser-html'), require('crypto-js/sha256'), require('mime-types'), require('papaparse')) :
3
+ typeof define === 'function' && define.amd ? define(['exports', 'fs/promises', 'spacetrim', 'child_process', 'colors', 'waitasecond', 'crypto-js', 'crypto-js/enc-hex', 'path', 'prettier', 'prettier/parser-html', 'crypto-js/sha256', 'mime-types', 'papaparse'], factory) :
4
+ (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["promptbook-documents"] = {}, global.promises, global.spaceTrim, global.child_process, global.colors, global.waitasecond, global.cryptoJs, global.hexEncoder, global.path, global.prettier, global.parserHtml, global.sha256, global.mimeTypes, global.papaparse));
5
+ })(this, (function (exports, promises, spaceTrim, child_process, colors, waitasecond, cryptoJs, hexEncoder, path, prettier, parserHtml, sha256, mimeTypes, papaparse) { 'use strict';
6
6
 
7
7
  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
8
8
 
@@ -10,6 +10,7 @@
10
10
  var colors__default = /*#__PURE__*/_interopDefaultLegacy(colors);
11
11
  var hexEncoder__default = /*#__PURE__*/_interopDefaultLegacy(hexEncoder);
12
12
  var parserHtml__default = /*#__PURE__*/_interopDefaultLegacy(parserHtml);
13
+ var sha256__default = /*#__PURE__*/_interopDefaultLegacy(sha256);
13
14
 
14
15
  // ⚠️ WARNING: This code has been generated so that any manual changes will be overwritten
15
16
  /**
@@ -25,7 +26,7 @@
25
26
  * @generated
26
27
  * @see https://github.com/webgptorg/promptbook
27
28
  */
28
- var PROMPTBOOK_ENGINE_VERSION = '0.84.0-10';
29
+ var PROMPTBOOK_ENGINE_VERSION = '0.84.0-12';
29
30
  /**
30
31
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
31
32
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -229,6 +230,12 @@
229
230
  * @private within the repository - too low-level in comparison with other `MAX_...`
230
231
  */
231
232
  var IMMEDIATE_TIME = 10;
233
+ /**
234
+ * The maximum length of the (generated) filename
235
+ *
236
+ * @public exported from `@promptbook/core`
237
+ */
238
+ var MAX_FILENAME_LENGTH = 30;
232
239
  /**
233
240
  * Strategy for caching the intermediate results for knowledge sources
234
241
  *
@@ -248,6 +255,15 @@
248
255
  * @public exported from `@promptbook/core`
249
256
  */
250
257
  var DEFAULT_MAX_EXECUTION_ATTEMPTS = 3; // <- TODO: [🤹‍♂️]
258
+ // <- TODO: [🕝] Make also `BOOKS_DIRNAME_ALTERNATIVES`
259
+ /**
260
+ * Where to store the temporary downloads
261
+ *
262
+ * Note: When the folder does not exist, it is created recursively
263
+ *
264
+ * @public exported from `@promptbook/core`
265
+ */
266
+ var DEFAULT_DOWNLOAD_CACHE_DIRNAME = './.promptbook/download-cache';
251
267
  /**
252
268
  * Where to store the scrape cache
253
269
  *
@@ -3750,10 +3766,11 @@
3750
3766
  function makeKnowledgeSourceHandler(knowledgeSource, tools, options) {
3751
3767
  var _a;
3752
3768
  return __awaiter(this, void 0, void 0, function () {
3753
- var _b, fetch, knowledgeSourceContent, name, _c, _d, rootDirname, url, response_1, mimeType, filename_1, fileExtension, mimeType;
3754
- return __generator(this, function (_f) {
3755
- switch (_f.label) {
3769
+ var _b, fetch, knowledgeSourceContent, name, _c, _d, rootDirname, url, response_1, mimeType, basename, hash, rootDirname_1, filepath, _f, _g, _h, _j, _k, filename_1, fileExtension, mimeType;
3770
+ return __generator(this, function (_l) {
3771
+ switch (_l.label) {
3756
3772
  case 0:
3773
+ console.log('!!! makeKnowledgeSourceHandler', knowledgeSource);
3757
3774
  _b = tools.fetch, fetch = _b === void 0 ? scraperFetch : _b;
3758
3775
  knowledgeSourceContent = knowledgeSource.knowledgeSourceContent;
3759
3776
  name = knowledgeSource.name;
@@ -3761,54 +3778,74 @@
3761
3778
  if (!name) {
3762
3779
  name = knowledgeSourceContentToName(knowledgeSourceContent);
3763
3780
  }
3764
- if (!isValidUrl(knowledgeSourceContent)) return [3 /*break*/, 2];
3781
+ if (!isValidUrl(knowledgeSourceContent)) return [3 /*break*/, 5];
3765
3782
  url = knowledgeSourceContent;
3766
3783
  return [4 /*yield*/, fetch(url)];
3767
3784
  case 1:
3768
- response_1 = _f.sent();
3785
+ response_1 = _l.sent();
3769
3786
  mimeType = ((_a = response_1.headers.get('content-type')) === null || _a === void 0 ? void 0 : _a.split(';')[0]) || 'text/html';
3770
- return [2 /*return*/, {
3771
- source: name,
3772
- filename: null,
3773
- url: url,
3774
- mimeType: mimeType,
3775
- /*
3776
- TODO: [🥽]
3777
- > async asBlob() {
3778
- > // TODO: [👨🏻‍🤝‍👨🏻] This can be called multiple times BUT when called second time, response in already consumed
3779
- > const content = await response.blob();
3780
- > return content;
3781
- > },
3782
- */
3783
- asJson: function () {
3784
- return __awaiter(this, void 0, void 0, function () {
3785
- var content;
3786
- return __generator(this, function (_a) {
3787
- switch (_a.label) {
3788
- case 0: return [4 /*yield*/, response_1.json()];
3789
- case 1:
3790
- content = _a.sent();
3791
- return [2 /*return*/, content];
3792
- }
3787
+ if (tools.fs === undefined || !url.endsWith('.pdf')) {
3788
+ return [2 /*return*/, {
3789
+ source: name,
3790
+ filename: null,
3791
+ url: url,
3792
+ mimeType: mimeType,
3793
+ /*
3794
+ TODO: [🥽]
3795
+ > async asBlob() {
3796
+ > // TODO: [👨🏻‍🤝‍👨🏻] This can be called multiple times BUT when called second time, response in already consumed
3797
+ > const content = await response.blob();
3798
+ > return content;
3799
+ > },
3800
+ */
3801
+ asJson: function () {
3802
+ return __awaiter(this, void 0, void 0, function () {
3803
+ var content;
3804
+ return __generator(this, function (_a) {
3805
+ switch (_a.label) {
3806
+ case 0: return [4 /*yield*/, response_1.json()];
3807
+ case 1:
3808
+ content = _a.sent();
3809
+ return [2 /*return*/, content];
3810
+ }
3811
+ });
3793
3812
  });
3794
- });
3795
- },
3796
- asText: function () {
3797
- return __awaiter(this, void 0, void 0, function () {
3798
- var content;
3799
- return __generator(this, function (_a) {
3800
- switch (_a.label) {
3801
- case 0: return [4 /*yield*/, response_1.text()];
3802
- case 1:
3803
- content = _a.sent();
3804
- return [2 /*return*/, content];
3805
- }
3813
+ },
3814
+ asText: function () {
3815
+ return __awaiter(this, void 0, void 0, function () {
3816
+ var content;
3817
+ return __generator(this, function (_a) {
3818
+ switch (_a.label) {
3819
+ case 0: return [4 /*yield*/, response_1.text()];
3820
+ case 1:
3821
+ content = _a.sent();
3822
+ return [2 /*return*/, content];
3823
+ }
3824
+ });
3806
3825
  });
3807
- });
3808
- },
3809
- }];
3826
+ },
3827
+ }];
3828
+ }
3829
+ basename = url.split('/').pop() || titleToName(url);
3830
+ hash = sha256__default["default"](hexEncoder__default["default"].parse(url)).toString( /* hex */);
3831
+ rootDirname_1 = path.join(process.cwd(), DEFAULT_DOWNLOAD_CACHE_DIRNAME);
3832
+ filepath = path.join.apply(void 0, __spreadArray(__spreadArray([], __read(nameToSubfolderPath(hash /* <- TODO: [🎎] Maybe add some SHA256 prefix */)), false), ["".concat(basename.substring(0, MAX_FILENAME_LENGTH), ".pdf")], false));
3833
+ return [4 /*yield*/, tools.fs.mkdir(path.dirname(path.join(rootDirname_1, filepath)), { recursive: true })];
3810
3834
  case 2:
3811
- if (!isValidFilePath(knowledgeSourceContent)) return [3 /*break*/, 4];
3835
+ _l.sent();
3836
+ _g = (_f = tools.fs).writeFile;
3837
+ _h = [path.join(rootDirname_1, filepath)];
3838
+ _k = (_j = Buffer).from;
3839
+ return [4 /*yield*/, response_1.arrayBuffer()];
3840
+ case 3: return [4 /*yield*/, _g.apply(_f, _h.concat([_k.apply(_j, [_l.sent()])]))];
3841
+ case 4:
3842
+ _l.sent();
3843
+ // TODO: !!!!!!!! Check the file security
3844
+ // TODO: !!!!!!!! Check the file size (if it is not too big)
3845
+ // TODO: !!!!!!!! Delete the file
3846
+ return [2 /*return*/, makeKnowledgeSourceHandler({ name: name, knowledgeSourceContent: filepath }, tools, __assign(__assign({}, options), { rootDirname: rootDirname_1 }))];
3847
+ case 5:
3848
+ if (!isValidFilePath(knowledgeSourceContent)) return [3 /*break*/, 7];
3812
3849
  if (tools.fs === undefined) {
3813
3850
  throw new EnvironmentMismatchError('Can not import file knowledge without filesystem tools');
3814
3851
  // <- TODO: [🧠] What is the best error type here`
@@ -3821,8 +3858,8 @@
3821
3858
  fileExtension = getFileExtension(filename_1);
3822
3859
  mimeType = extensionToMimeType(fileExtension || '');
3823
3860
  return [4 /*yield*/, isFileExisting(filename_1, tools.fs)];
3824
- case 3:
3825
- if (!(_f.sent())) {
3861
+ case 6:
3862
+ if (!(_l.sent())) {
3826
3863
  throw new NotFoundError(spaceTrim__default["default"](function (block) { return "\n Can not make source handler for file which does not exist:\n\n File:\n ".concat(block(knowledgeSourceContent), "\n\n Full file path:\n ").concat(block(filename_1), "\n "); }));
3827
3864
  }
3828
3865
  // TODO: [🧠][😿] Test security file - file is scoped to the project (BUT maybe do this in `filesystemTools`)
@@ -3868,7 +3905,7 @@
3868
3905
  });
3869
3906
  },
3870
3907
  }];
3871
- case 4: return [2 /*return*/, {
3908
+ case 7: return [2 /*return*/, {
3872
3909
  source: name,
3873
3910
  filename: null,
3874
3911
  url: null,