@promptbook/cli 0.89.0-21 → 0.89.0-28

package/esm/index.es.js

@@ -23,7 +23,7 @@ import moment from 'moment';
 import express from 'express';
 import http from 'http';
 import { Server } from 'socket.io';
-import swaggerJsdoc from 'swagger-jsdoc';
+import * as OpenApiValidator from 'express-openapi-validator';
 import swaggerUi from 'swagger-ui-express';
 import Anthropic from '@anthropic-ai/sdk';
 import { OpenAIClient, AzureKeyCredential } from '@azure/openai';
@@ -46,7 +46,7 @@ const BOOK_LANGUAGE_VERSION = '1.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.89.0-21';
+const PROMPTBOOK_ENGINE_VERSION = '0.89.0-28';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -64,10 +64,12 @@ const REMOTE_SERVER_URLS = [
         owner: 'AI Web, LLC <legal@ptbk.io> (https://www.ptbk.io/)',
         isAnonymousModeAllowed: true,
         urls: [
-            'https://s5.ptbk.io/promptbook',
+            'https://promptbook.s5.ptbk.io/',
             // Note: Servers 1-4 are not running
         ],
     },
+    /*
+    Note: Working on older version of Promptbook and not supported anymore
     {
         title: 'Pavol Promptbook Server',
         description: `Personal server of Pavol Hejný with simple testing server, DO NOT USE IT FOR PRODUCTION`,
@@ -75,6 +77,7 @@ const REMOTE_SERVER_URLS = [
         isAnonymousModeAllowed: true,
         urls: ['https://api.pavolhejny.com/promptbook'],
     },
+    */
 ];
 /**
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -2429,11 +2432,25 @@ function deserializeError(error) {
  */
 async function createRemoteClient(options) {
     const { remoteServerUrl } = options;
-    console.log('!!! Connecting to socket.io server', remoteServerUrl, {
-        retries: CONNECTION_RETRIES_LIMIT,
-        timeout: CONNECTION_TIMEOUT_MS,
-        path: '/socket.io',
-    });
+    if (!isValidUrl(remoteServerUrl)) {
+        throw new Error(`Invalid \`remoteServerUrl\`: "${remoteServerUrl}"`);
+    }
+    const remoteServerUrlParsed = new URL(remoteServerUrl);
+    if (remoteServerUrlParsed.pathname !== '/' && remoteServerUrlParsed.pathname !== '') {
+        remoteServerUrlParsed.pathname = '/';
+        throw new Error(spaceTrim((block) => `
+                        Remote server requires root url \`/\`
+
+                        You have provided \`remoteServerUrl\`:
+                        ${block(remoteServerUrl)}
+
+                        But something like this is expected:
+                        ${block(remoteServerUrlParsed.href)}
+
+                        Note: If you need to run multiple services on the same server, use 3rd or 4th degree subdomain
+
+                    `));
+    }
     return new Promise((resolve, reject) => {
         const socket = io(remoteServerUrl, {
             retries: CONNECTION_RETRIES_LIMIT,
@@ -13091,6 +13108,198 @@ function $initializeRunCommand(program) {
  * TODO: [🖇] What about symlinks? Maybe flag --follow-symlinks
  */
 
+// TODO: !!! List running services from REMOTE_SERVER_URLS
+// TODO: !!! Import directly from YML
+/**
+ * @private !!!! Decide how to expose this
+ */
+const openapiJson = {
+    openapi: '3.0.0',
+    info: {
+        title: 'Promptbook Remote Server API (!!! From TS)',
+        version: '1.0.0',
+        description: 'API documentation for the Promptbook Remote Server',
+    },
+    paths: {
+        '/': {
+            get: {
+                summary: 'Get server details',
+                description: 'Returns details about the Promptbook server.',
+                responses: {
+                    '200': {
+                        description: 'Server details in markdown format.',
+                    },
+                },
+            },
+        },
+        '/login': {
+            post: {
+                summary: 'Login to the server',
+                description: 'Login to the server and get identification.',
+                requestBody: {
+                    required: true,
+                    content: {
+                        'application/json': {
+                            schema: {
+                                type: 'object',
+                                properties: {
+                                    username: {
+                                        type: 'string',
+                                    },
+                                    password: {
+                                        type: 'string',
+                                    },
+                                    appId: {
+                                        type: 'string',
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+                responses: {
+                    '200': {
+                        description: 'Successful login',
+                        content: {
+                            'application/json': {
+                                schema: {
+                                    type: 'object',
+                                    properties: {
+                                        identification: {
+                                            type: 'object',
+                                        },
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        },
+        '/books': {
+            get: {
+                summary: 'List all books',
+                description: 'Returns a list of all available books in the collection.',
+                responses: {
+                    '200': {
+                        description: 'A list of books.',
+                        content: {
+                            'application/json': {
+                                schema: {
+                                    type: 'array',
+                                    items: {
+                                        type: 'string',
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        },
+        '/books/{bookId}': {
+            get: {
+                summary: 'Get book content',
+                description: 'Returns the content of a specific book.',
+                parameters: [
+                    {
+                        in: 'path',
+                        name: 'bookId',
+                        required: true,
+                        schema: {
+                            type: 'string',
+                        },
+                        description: 'The ID of the book to retrieve.',
+                    },
+                ],
+                responses: {
+                    '200': {
+                        description: 'The content of the book.',
+                        content: {
+                            'text/markdown': {
+                                schema: {
+                                    type: 'string',
+                                },
+                            },
+                        },
+                    },
+                    '404': {
+                        description: 'Book not found.',
+                    },
+                },
+            },
+        },
+        '/executions': {
+            get: {
+                summary: 'List all executions',
+                description: 'Returns a list of all running execution tasks.',
+                responses: {
+                    '200': {
+                        description: 'A list of execution tasks.',
+                        content: {
+                            'application/json': {
+                                schema: {
+                                    type: 'array',
+                                    items: {
+                                        type: 'object',
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        },
+        '/executions/new': {
+            post: {
+                summary: 'Start a new execution',
+                description: 'Starts a new execution task for a given pipeline.',
+                requestBody: {
+                    required: true,
+                    content: {
+                        'application/json': {
+                            schema: {
+                                type: 'object',
+                                properties: {
+                                    pipelineUrl: {
+                                        type: 'string',
+                                    },
+                                    inputParameters: {
+                                        type: 'object',
+                                    },
+                                    identification: {
+                                        type: 'object',
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+                responses: {
+                    '200': {
+                        description: 'The newly created execution task.',
+                        content: {
+                            'application/json': {
+                                schema: {
+                                    type: 'object',
+                                },
+                            },
+                        },
+                    },
+                    '400': {
+                        description: 'Invalid input.',
+                    },
+                },
+            },
+        },
+    },
+    components: {},
+    tags: [],
+};
+/**
+ * Note: [💞] Ignore a discrepancy between file name and entity name
+ */
+
 /**
  * Remote server is a proxy server that uses its execution tools internally and exposes the executor interface externally.
  *
@@ -13165,43 +13374,34 @@ function startRemoteServer(options) {
         response.setHeader('X-Powered-By', 'Promptbook engine');
         next();
     });
-    const swaggerOptions = {
-        definition: {
-            openapi: '3.0.0',
-            info: {
-                title: 'Promptbook Remote Server API',
-                version: '1.0.0',
-                description: 'API documentation for the Promptbook Remote Server',
-            },
-            /*
-            TODO:
-            servers: [
-                {
-                    url: `http://localhost:${port}${rootPath}`,
-                    // <- TODO: Pass some public URLs here
-                },
-            ],
-            */
+    // TODO: !!! Expose openapiJson to consumer and also allow to add new routes
+    app.use(OpenApiValidator.middleware({
+        apiSpec: openapiJson,
+        // TODO: !!! Adjust
+        ignorePaths(...args) {
+            console.warn(`!!! Ignoring paths`, ...args);
+            return true;
         },
-        apis: ['./src/remote-server/**/*.ts'], // Adjust path as needed
-    };
-    const swaggerSpec = swaggerJsdoc(swaggerOptions);
-    const rootPath = ''; // <- TODO: !!!! Remove after merging into feature/elysia+openai+swagger-2
-    app.use([`/api-docs`, `${rootPath}/api-docs`], swaggerUi.serve, swaggerUi.setup(swaggerSpec));
+        // TODO: !!! Validate both
+        validateRequests: false,
+        validateResponses: false, // false by default
+    }));
+    app.use([`/api-docs`, `/swagger`], swaggerUi.serve, swaggerUi.setup(openapiJson, {
+    // customCss: '.swagger-ui .topbar { display: none }',
+    // customSiteTitle: 'BRJ API',
+    // customfavIcon: 'https://brj.app/favicon.ico',
+    }));
+    app.get(`/openapi`, (request, response) => {
+        response.json(openapiJson);
+    });
+    // TODO: !!! Remove:
+    app.get(`/xxx`, (request, response) => {
+        response.json(openapiJson);
+    });
     const runningExecutionTasks = [];
     // <- TODO: [🤬] Identify the users
     // TODO: [🧠] Do here some garbage collection of finished tasks
-    /**
-     * @swagger
-     * /:
-     *   get:
-     *     summary: Get server details
-     *     description: Returns details about the Promptbook server.
-     *     responses:
-     *       200:
-     *         description: Server details in markdown format.
-     */
-    app.get(['/', rootPath], async (request, response) => {
+    app.get('/', async (request, response) => {
         var _a;
         if ((_a = request.url) === null || _a === void 0 ? void 0 : _a.includes('socket.io')) {
             return;
@@ -13220,7 +13420,6 @@ function startRemoteServer(options) {
                     ## Details
 
                     **Server port:** ${port}
-                    **Server root path:** ${rootPath}
                     **Startup date:** ${startupDate.toISOString()}
                     **Anonymouse mode:** ${isAnonymousModeAllowed ? 'enabled' : 'disabled'}
                     **Application mode:** ${isApplicationModeAllowed ? 'enabled' : 'disabled'}
@@ -13259,38 +13458,7 @@ function startRemoteServer(options) {
                     https://github.com/webgptorg/promptbook
                 `));
     });
-    /**
-     * @swagger
-     *
-     * /login:
-     *  post:
-     *   summary: Login to the server
-     *   description: Login to the server and get identification.
-     *   requestBody:
-     *    required: true
-     *    content:
-     *     application/json:
-     *      schema:
-     *       type: object
-     *       properties:
-     *        username:
-     *         type: string
-     *        password:
-     *         type: string
-     *        appId:
-     *         type: string
-     *   responses:
-     *    200:
-     *     description: Successful login
-     *     content:
-     *      application/json:
-     *       schema:
-     *        type: object
-     *        properties:
-     *         identification:
-     *          type: object
-     */
-    app.post([`/login`, `${rootPath}/login`], async (request, response) => {
+    app.post(`/login`, async (request, response) => {
         if (!isApplicationModeAllowed || login === null) {
             response.status(400).send('Application mode is not allowed');
             return;
@@ -13330,23 +13498,7 @@ function startRemoteServer(options) {
             response.status(400).send({ error: serializeError(error) });
         }
     });
-    /**
-     * @swagger
-     * /books:
-     *   get:
-     *     summary: List all books
-     *     description: Returns a list of all available books in the collection.
-     *     responses:
-     *       200:
-     *         description: A list of books.
-     *         content:
-     *           application/json:
-     *             schema:
-     *               type: array
-     *               items:
-     *                 type: string
-     */
-    app.get([`/books`, `${rootPath}/books`], async (request, response) => {
+    app.get(`/books`, async (request, response) => {
         if (collection === null) {
             response.status(500).send('No collection available');
             return;
@@ -13356,30 +13508,7 @@ function startRemoteServer(options) {
         response.send(pipelines);
     });
     // TODO: [🧠] Is it secure / good idea to expose source codes of hosted books
-    /**
-     * @swagger
-     * /books/{bookId}:
-     *   get:
-     *     summary: Get book content
-     *     description: Returns the content of a specific book.
-     *     parameters:
-     *       - in: path
-     *         name: bookId
-     *         required: true
-     *         schema:
-     *           type: string
-     *         description: The ID of the book to retrieve.
-     *     responses:
-     *       200:
-     *         description: The content of the book.
-     *         content:
-     *           text/markdown:
-     *             schema:
-     *               type: string
-     *       404:
-     *         description: Book not found.
-     */
-    app.get([`/books/*`, `${rootPath}/books/*`], async (request, response) => {
+    app.get(`/books/*`, async (request, response) => {
         try {
             if (collection === null) {
                 response.status(500).send('No collection nor books available');
@@ -13431,26 +13560,10 @@ function startRemoteServer(options) {
             };
         }
     }
-    /**
-     * @swagger
-     * /executions:
-     *   get:
-     *     summary: List all executions
-     *     description: Returns a list of all running execution tasks.
-     *     responses:
-     *       200:
-     *         description: A list of execution tasks.
-     *         content:
-     *           application/json:
-     *             schema:
-     *               type: array
-     *               items:
-     *                 type: object
-     */
-    app.get([`/executions`, `${rootPath}/executions`], async (request, response) => {
+    app.get(`/executions`, async (request, response) => {
         response.send(runningExecutionTasks.map((runningExecutionTask) => exportExecutionTask(runningExecutionTask, false)));
     });
-    app.get([`/executions/last`, `${rootPath}/executions/last`], async (request, response) => {
+    app.get(`/executions/last`, async (request, response) => {
         // TODO: [🤬] Filter only for user
         if (runningExecutionTasks.length === 0) {
             response.status(404).send('No execution tasks found');
@@ -13459,7 +13572,7 @@ function startRemoteServer(options) {
         const lastExecutionTask = runningExecutionTasks[runningExecutionTasks.length - 1];
         response.send(exportExecutionTask(lastExecutionTask, true));
     });
-    app.get([`/executions/:taskId`, `${rootPath}/executions/:taskId`], async (request, response) => {
+    app.get(`/executions/:taskId`, async (request, response) => {
         const { taskId } = request.params;
         // TODO: [🤬] Filter only for user
         const executionTask = runningExecutionTasks.find((executionTask) => executionTask.taskId === taskId);
@@ -13471,36 +13584,7 @@ function startRemoteServer(options) {
         }
         response.send(exportExecutionTask(executionTask, true));
     });
-    /**
-     * @swagger
-     * /executions/new:
-     *   post:
-     *     summary: Start a new execution
-     *     description: Starts a new execution task for a given pipeline.
-     *     requestBody:
-     *       required: true
-     *       content:
-     *         application/json:
-     *           schema:
-     *             type: object
-     *             properties:
-     *               pipelineUrl:
-     *                 type: string
-     *               inputParameters:
-     *                 type: object
-     *               identification:
-     *                 type: object
-     *     responses:
-     *       200:
-     *         description: The newly created execution task.
-     *         content:
-     *           application/json:
-     *             schema:
-     *               type: object
-     *       400:
-     *         description: Invalid input.
-     */
-    app.post([`/executions/new`, `${rootPath}/executions/new`], async (request, response) => {
+    app.post(`/executions/new`, async (request, response) => {
         try {
             const { inputParameters, identification /* <- [🤬] */ } = request.body;
             const pipelineUrl = request.body.pipelineUrl || request.body.book;