@promptbook/cli 0.85.0-1 → 0.85.0-3

package/bin/promptbook-cli.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 //               <- TODO: [🎺] Ensure correct version of Node.js is used
+// promptbook-cli.js
 
 /**
  * Note: [🔺] Purpose of this file is to run CLI in production environment

package/esm/index.es.js

@@ -43,7 +43,7 @@ var BOOK_LANGUAGE_VERSION = '1.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-var PROMPTBOOK_ENGINE_VERSION = '0.85.0-0';
+var PROMPTBOOK_ENGINE_VERSION = '0.85.0-2';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -11416,6 +11416,17 @@ function normalizeWhitespaces(sentence) {
     return sentence.replace(/\s+/gs, ' ').trim();
 }
 
+/**
+ * Adds suffix to the URL
+ *
+ * @public exported from `@promptbook/utils`
+ */
+function suffixUrl(value, suffix) {
+    var baseUrl = value.href.endsWith('/') ? value.href.slice(0, -1) : value.href;
+    var normalizedSuffix = suffix.replace(/\/+/g, '/');
+    return (baseUrl + normalizedSuffix);
+}
+
 /**
  * Function trimCodeBlock will trim starting and ending code block from the string if it is present.
  *
@@ -14174,19 +14185,31 @@ function $initializeStartServerCommand(program) {
     // <- TODO: [🧟‍♂️] Unite path to promptbook collection argument
     'Path to promptbook collection directory', DEFAULT_BOOKS_DIRNAME);
     startServerCommand.option('--port <port>', "Port to start the server on", '4460');
+    startServerCommand.option('-u, --url', spaceTrim("\n            Public root url of the server\n            It is used for following purposes:\n\n            1) It is suffixed with /books and used as rootUrl for all served books\n            2) Path (if not just /) is used as rootPath for the server\n        "));
     startServerCommand.option('--allow-anonymous', "Is anonymous mode allowed", false);
     startServerCommand.option('-r, --reload', "Call LLM models even if same prompt with result is in the cache", false);
     startServerCommand.option('-v, --verbose', "Is output verbose", false);
     startServerCommand.description(spaceTrim("\n            Starts a remote server to execute books\n        "));
     startServerCommand.action(function (path, _a) {
-        var port = _a.port, isAnonymousModeAllowed = _a.allowAnonymous, isCacheReloaded = _a.reload, isVerbose = _a.verbose;
+        var port = _a.port, rawUrl = _a.url, isAnonymousModeAllowed = _a.allowAnonymous, isCacheReloaded = _a.reload, isVerbose = _a.verbose;
         return __awaiter(_this, void 0, void 0, function () {
-            var prepareAndScrapeOptions, fs, llm, executables, tools, collection;
+            var url, rootUrl, rootPath, prepareAndScrapeOptions, fs, llm, executables, tools, collection;
             var _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        console.log('startServerCommand.action', { port: port, isAnonymousModeAllowed: isAnonymousModeAllowed, isCacheReloaded: isCacheReloaded, isVerbose: isVerbose });
+                        url = !rawUrl ? null : new URL(rawUrl);
+                        if (url !== null && url.port !== port) {
+                            console.warn(colors.yellow("Port in --url is different from --port which the server will listen on, this is ok only if you proxy from one port to another, for exaple via nginx or docker"));
+                        }
+                        rootUrl = undefined;
+                        if (url !== null) {
+                            rootUrl = suffixUrl(url, '/books');
+                        }
+                        rootPath = '/';
+                        if (url !== null) {
+                            rootPath = url.pathname;
+                        }
                         prepareAndScrapeOptions = {
                             isVerbose: isVerbose,
                             isCacheReloaded: isCacheReloaded,
@@ -14211,8 +14234,7 @@ function $initializeStartServerCommand(program) {
                             _b);
                         return [4 /*yield*/, createCollectionFromDirectory(path, tools, {
                                 isVerbose: isVerbose,
-                                // TODO: [🧠] Utilize implicit urls for books
-                                // rootUrl: `http://localhost:${port}/books`,
+                                rootUrl: rootUrl,
                                 isRecursive: true,
                                 isLazyLoaded: false,
                                 isCrashedOnError: true,
@@ -14221,7 +14243,7 @@ function $initializeStartServerCommand(program) {
                     case 4:
                         collection = _c.sent();
                         startRemoteServer({
-                            rootPath: '/',
+                            rootPath: rootPath,
                             port: parseInt(port, 10),
                             isAnonymousModeAllowed: isAnonymousModeAllowed,
                             isApplicationModeAllowed: true,