@kapeta/local-cluster-service 0.67.2 → 0.67.3

package/dist/esm/src/storm/PageGenerator.js

@@ -16,12 +16,16 @@ const page_utils_1 = require("./page-utils");
 class PageQueue extends node_events_1.EventEmitter {
     queue;
     systemId;
+    systemPrompt;
     references = new Map();
+    pages = new Map();
+    images = new Map();
     uiShells = [];
     theme = '';
-    constructor(systemId, concurrency = 5) {
+    constructor(systemId, systemPrompt, concurrency = 5) {
         super();
         this.systemId = systemId;
+        this.systemPrompt = systemPrompt;
         this.queue = new PromiseQueue_1.PromiseQueue(concurrency);
     }
     on(event, listener) {
@@ -36,68 +40,128 @@ class PageQueue extends node_events_1.EventEmitter {
     setUiTheme(theme) {
         this.theme = theme;
     }
-    addPrompt(initialPrompt, conversationId = node_uuid_1.default.v4(), overwrite = false) {
-        if (!overwrite && this.references.has(initialPrompt.path)) {
+    hasPrompt(path) {
+        if (this.references.has(path)) {
             //console.log('Ignoring duplicate prompt', initialPrompt.path);
-            return Promise.resolve();
+            return true;
         }
-        if (!overwrite && (0, page_utils_1.hasPageOnDisk)(this.systemId, initialPrompt.method, initialPrompt.path)) {
+        if ((0, page_utils_1.hasPageOnDisk)(this.systemId, 'GET', path)) {
             //console.log('Ignoring prompt with existing page', initialPrompt.path);
+            return true;
+        }
+        return false;
+    }
+    addPrompt(initialPrompt, conversationId = node_uuid_1.default.v4(), overwrite = false) {
+        if (!overwrite && this.hasPrompt(initialPrompt.path)) {
+            //console.log('Ignoring duplicate prompt', initialPrompt.path);
             return Promise.resolve();
         }
         const prompt = {
             ...initialPrompt,
             shell_page: this.uiShells.find((shell) => shell.screens.includes(initialPrompt.name))?.content,
+            prompt: this.wrapPagePrompt(initialPrompt.path, initialPrompt.prompt),
             theme: this.theme,
         };
         const generator = new PageGenerator(prompt, conversationId);
         this.references.set(prompt.path, generator);
+        this.pages.set(prompt.path, prompt.description);
         return this.addPageGenerator(generator);
     }
-    async addPageGenerator(generator) {
-        generator.on('event', (event) => this.emit('event', event));
-        generator.on('page_refs', async ({ event, references }) => {
-            const promises = references.map(async (reference) => {
-                if (reference.url.startsWith('#') ||
-                    reference.url.startsWith('javascript:') ||
-                    reference.url.startsWith('http://') ||
-                    reference.url.startsWith('https://')) {
+    getPrefix() {
+        let promptPrefix = '';
+        if (this.systemPrompt) {
+            promptPrefix = `For a system with this description: ${this.systemPrompt}\n`;
+        }
+        return promptPrefix;
+    }
+    wrapPagePrompt(pagePath, prompt) {
+        let promptPrefix = this.getPrefix();
+        let promptPostfix = '';
+        if (this.pages.size > 0) {
+            promptPostfix = `\nThe following pages are already implemented:\n`;
+            this.pages.forEach((description, path) => {
+                if (pagePath === path) {
                     return;
                 }
-                switch (reference.type) {
-                    case 'image':
-                        await this.addImagePrompt({
-                            ...reference,
-                            content: event.payload.content,
-                        });
-                        break;
-                    case 'css':
-                    case 'javascript':
-                        //console.log('Ignoring reference', reference);
-                        break;
-                    case 'html':
-                        //console.log('Adding page generator for', reference);
-                        const paths = Array.from(this.references.keys());
-                        this.addPrompt({
-                            name: reference.name,
-                            title: reference.title,
-                            path: reference.url,
-                            method: 'GET',
-                            storage_prefix: this.systemId + '_',
-                            prompt: `Implement a page for ${reference.name} at ${reference.url} with the following description: ${reference.description}.\n` +
-                                `The page was referenced from this page: \`\`\`html\n${event.payload.content}\n\`\`\`\n` +
-                                (paths.length > 0
-                                    ? `\nThese paths are already implemented:\n- ${paths.join('\n - ')}\n\n`
-                                    : ''),
-                            description: reference.description,
-                            filename: '',
-                            theme: this.theme,
-                        });
-                        break;
-                }
+                promptPostfix += `- PAGE: '${path}' -> ${description}.\n`;
+            });
+        }
+        if (this.images.size > 0) {
+            promptPostfix += `\nThe following images already exist:\n`;
+            this.images.forEach((description, path) => {
+                promptPostfix += `- IMAGE: '${path}' -> ${description}.\n`;
             });
-            await Promise.allSettled(promises);
-            this.emit('page', event);
+        }
+        return promptPrefix + prompt + promptPostfix;
+    }
+    async addPageGenerator(generator) {
+        generator.on('event', (event) => this.emit('event', event));
+        generator.on('page_refs', async ({ event, references, future }) => {
+            try {
+                const initialPrompts = [];
+                let promises = references.map(async (reference) => {
+                    if (reference.url.startsWith('#') ||
+                        reference.url.startsWith('javascript:') ||
+                        reference.url.startsWith('http://') ||
+                        reference.url.startsWith('https://')) {
+                        return;
+                    }
+                    switch (reference.type) {
+                        case 'image':
+                            await this.addImagePrompt({
+                                ...reference,
+                                content: event.payload.content,
+                            });
+                            break;
+                        case 'css':
+                        case 'javascript':
+                            //console.log('Ignoring reference', reference);
+                            break;
+                        case 'html':
+                            //console.log('Adding page generator for', reference);
+                            this.pages.set(reference.url, reference.description);
+                            initialPrompts.push({
+                                name: reference.name,
+                                title: reference.title,
+                                path: reference.url,
+                                method: 'GET',
+                                storage_prefix: this.systemId + '_',
+                                prompt: `Implement a page for ${reference.name} at ${reference.url} with the following description: ${reference.description}.\n` +
+                                    `The page was referenced from this page: \n### PATH: ${event.payload.path}\n\`\`\`html\n${event.payload.content}\n\`\`\`\n`,
+                                description: reference.description,
+                                filename: '',
+                                theme: this.theme,
+                            });
+                            break;
+                    }
+                });
+                await Promise.allSettled(promises);
+                initialPrompts.forEach((prompt) => {
+                    if (!this.hasPrompt(prompt.path)) {
+                        this.emit('page', {
+                            type: 'PAGE',
+                            reason: 'reference',
+                            created: Date.now(),
+                            payload: {
+                                name: prompt.name,
+                                title: prompt.title,
+                                filename: '',
+                                method: 'GET',
+                                path: prompt.path,
+                                prompt: prompt.description,
+                                conversationId: '',
+                                content: '',
+                                description: prompt.description,
+                            },
+                        });
+                    }
+                    this.addPrompt(prompt);
+                });
+                this.emit('page', event);
+            }
+            finally {
+                future.resolve();
+            }
         });
         return this.queue.add(() => generator.generate());
     }
@@ -108,7 +172,14 @@ class PageQueue extends node_events_1.EventEmitter {
         return this.queue.wait();
     }
     async addImagePrompt(prompt) {
-        const result = await stormClient_1.stormClient.createImage(`Create an image for the url "${prompt.url}" with this description: ${prompt.description}`.trim());
+        if (this.images.has(prompt.url)) {
+            //console.log('Ignoring duplicate image prompt', prompt);
+            return;
+        }
+        this.images.set(prompt.url, prompt.description);
+        const prefix = this.getPrefix();
+        const result = await stormClient_1.stormClient.createImage(prefix + `Create an image for the url "${prompt.url}" with this description: ${prompt.description}`.trim());
+        //console.log('Adding image prompt', prompt);
         const futures = [];
         result.on('data', async (event) => {
             if (event.type === 'IMAGE') {
@@ -144,27 +215,29 @@ class PageGenerator extends node_events_1.EventEmitter {
     }
     async generate() {
         return new Promise(async (resolve) => {
-            const screenStream = await stormClient_1.stormClient.createUIPage(this.prompt, this.conversationId);
             const promises = [];
+            const screenStream = await stormClient_1.stormClient.createUIPage(this.prompt, this.conversationId);
             screenStream.on('data', (event) => {
                 if (event.type === 'PAGE') {
                     event.payload.conversationId = this.conversationId;
                     promises.push((async () => {
                         const references = await this.resolveReferences(event.payload.content);
                         //console.log('Resolved references for page', references, event.payload);
+                        const future = (0, PromiseQueue_1.createFuture)();
                         this.emit('page_refs', {
                             event,
                             references,
+                            future,
                         });
+                        await future.promise;
                     })());
                     return;
                 }
                 this.emit('event', event);
             });
-            screenStream.on('end', () => {
-                Promise.allSettled(promises).finally(resolve);
-            });
             await screenStream.waitForDone();
+            await Promise.all(promises);
+            resolve();
         });
     }
     async resolveReferences(content) {

package/dist/esm/src/storm/routes.js

@@ -23,6 +23,7 @@ const page_utils_1 = require("./page-utils");
 const UIServer_1 = require("./UIServer");
 const crypto_1 = require("crypto");
 const PageGenerator_1 = require("./PageGenerator");
+const PromiseQueue_1 = require("./PromiseQueue");
 const UI_SERVERS = {};
 const router = (0, express_promise_router_1.default)();
 router.use('/', cors_1.corsHandler);
@@ -47,7 +48,7 @@ function convertPageEvent(screenData, innerConversationId, mainConversationId) {
                 description: screenData.payload.description,
                 prompt: screenData.payload.prompt,
                 path: screenData.payload.path,
-                url: server ? server.resolveUrl(screenData) : '',
+                url: server && screenData.payload.content ? server.resolveUrl(screenData) : '',
                 method: screenData.payload.method,
                 conversationId: innerConversationId,
             },
@@ -68,7 +69,7 @@ router.post('/ui/screen', async (req, res) => {
         res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
         res.set(stormClient_1.ConversationIdHeader, conversationId);
         const parentConversationId = systemId ?? '';
-        const queue = new PageGenerator_1.PageQueue(parentConversationId, 5);
+        const queue = new PageGenerator_1.PageQueue(parentConversationId, '', 5);
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
@@ -100,6 +101,8 @@ router.post('/ui/screen', async (req, res) => {
     }
     catch (err) {
         sendError(err, res);
+    }
+    finally {
         if (!res.closed) {
             res.end();
         }
@@ -133,10 +136,16 @@ router.post('/:handle/ui/iterative', async (req, res) => {
         const promises = {};
         const pageEventPromises = [];
         const systemId = landingPagesStream.getConversationId();
-        const pageQueue = new PageGenerator_1.PageQueue(systemId, 5);
+        const systemPrompt = (0, PromiseQueue_1.createFuture)();
+        if (aiRequest.skipImprovement) {
+            systemPrompt.resolve(aiRequest.prompt);
+        }
         landingPagesStream.on('data', async (data) => {
             try {
                 sendEvent(res, data);
+                if (data.type === 'PROMPT_IMPROVE') {
+                    systemPrompt.resolve(data.payload.prompt);
+                }
                 if (data.type !== 'LANDING_PAGE') {
                     return;
                 }
@@ -168,6 +177,12 @@ router.post('/:handle/ui/iterative', async (req, res) => {
         });
         UI_SERVERS[systemId] = new UIServer_1.UIServer(systemId);
         await UI_SERVERS[systemId].start();
+        waitForStormStream(landingPagesStream).then(() => {
+            if (!systemPrompt.isResolved()) {
+                systemPrompt.resolve(aiRequest.prompt);
+            }
+        });
+        const pageQueue = new PageGenerator_1.PageQueue(systemId, await systemPrompt.promise, 5);
         onRequestAborted(req, res, () => {
             pageQueue.cancel();
         });
@@ -218,9 +233,13 @@ router.post('/:handle/ui', async (req, res) => {
         res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
         res.set(stormClient_1.ConversationIdHeader, outerConversationId);
         const uniqueUserJourneyScreens = {};
+        let systemPrompt = aiRequest.prompt;
         userJourneysStream.on('data', (data) => {
             try {
                 sendEvent(res, data);
+                if (data.type === 'PROMPT_IMPROVE') {
+                    systemPrompt = data.payload.prompt;
+                }
                 if (data.type !== 'USER_JOURNEY') {
                     return;
                 }
@@ -249,7 +268,6 @@ router.post('/:handle/ui', async (req, res) => {
                 themeStream.abort();
             });
             themeStream.on('data', (evt) => {
-                sendEvent(res, evt);
                 if (evt.type === 'FILE_DONE') {
                     theme = evt.payload.content;
                     (0, page_utils_1.writeAssetToDisk)(outerConversationId, evt).catch((err) => {
@@ -298,7 +316,7 @@ router.post('/:handle/ui', async (req, res) => {
         onRequestAborted(req, res, () => {
             shellsStream.abort();
         });
-        const queue = new PageGenerator_1.PageQueue(outerConversationId, 5);
+        const queue = new PageGenerator_1.PageQueue(outerConversationId, systemPrompt, 5);
         queue.setUiTheme(theme);
         shellsStream.on('data', (data) => {
             //console.log('Processing shell event', data);
@@ -328,7 +346,6 @@ router.post('/:handle/ui', async (req, res) => {
             },
             created: Date.now(),
         });
-        // Get the pages (5 at a time)
         const pagePromises = [];
         onRequestAborted(req, res, () => {
             queue.cancel();
@@ -365,16 +382,18 @@ router.post('/:handle/ui', async (req, res) => {
                 theme,
             }));
         }
-        await queue.wait();
-        await Promise.allSettled(pagePromises);
-        await Promise.allSettled(pageEventPromises);
         if (userJourneysStream.isAborted()) {
             return;
         }
+        await queue.wait();
+        await Promise.allSettled(pagePromises);
+        await Promise.allSettled(pageEventPromises);
         sendDone(res);
     }
     catch (err) {
         sendError(err, res);
+    }
+    finally {
         if (!res.closed) {
             res.end();
         }
@@ -386,7 +405,7 @@ router.post('/ui/edit', async (req, res) => {
             req.headers[stormClient_1.ConversationIdHeader.toLowerCase()]);
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
         const storagePrefix = systemId ? systemId + '_' : 'mock_';
-        const queue = new PageGenerator_1.PageQueue(storagePrefix, 5);
+        const queue = new PageGenerator_1.PageQueue(systemId, '', 5);
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
@@ -401,7 +420,13 @@ router.post('/ui/edit', async (req, res) => {
                 sendEvent(res, data);
             }
         });
-        await Promise.allSettled(aiRequest.prompt.pages.map((page) => {
+        const pages = aiRequest.prompt.pages.filter((page) => page.conversationId);
+        if (pages.length === 0) {
+            console.log('No pages to update', aiRequest.prompt.pages);
+            sendDone(res);
+            return;
+        }
+        await Promise.allSettled(pages.map((page) => {
             if (page.conversationId) {
                 return queue.addPrompt({
                     title: page.title,
@@ -421,6 +446,8 @@ router.post('/ui/edit', async (req, res) => {
     }
     catch (err) {
         sendError(err, res);
+    }
+    finally {
         if (!res.closed) {
             res.end();
         }
@@ -430,13 +457,24 @@ router.post('/ui/vote', async (req, res) => {
     const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()] || '';
     const aiRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, vote, mainConversationId } = aiRequest;
-    return stormClient_1.stormClient.voteUIPage(topic, conversationId, vote, mainConversationId);
+    try {
+        await stormClient_1.stormClient.voteUIPage(topic, conversationId, vote, mainConversationId);
+    }
+    catch (e) {
+        res.status(500).send({ error: e.message });
+    }
 });
 router.post('/ui/get-vote', async (req, res) => {
     const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()] || '';
     const aiRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, mainConversationId } = aiRequest;
-    return stormClient_1.stormClient.getVoteUIPage(topic, conversationId, mainConversationId);
+    try {
+        const vote = await stormClient_1.stormClient.getVoteUIPage(topic, conversationId, mainConversationId);
+        res.send({ vote });
+    }
+    catch (e) {
+        res.status(500).send({ error: e.message });
+    }
 });
 router.post('/:handle/all', async (req, res) => {
     const handle = req.params.handle;
@@ -556,7 +594,6 @@ router.post('/block/create', async (req, res) => {
 });
 router.post('/block/codegen', async (req, res) => {
     const body = JSON.parse(req.stringBody ?? '{}');
-    console.log('Codegen request', body);
     const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
     try {
         const stormCodegen = new codegen_1.StormCodegen(conversationId ?? '', body.prompt, [body.block], body.events || []);
@@ -642,11 +679,13 @@ function onRequestAborted(req, res, onAborted) {
     });
 }
 async function sendPageEvent(mainConversationId, data, res) {
-    try {
-        await (0, page_utils_1.writePageToDisk)(mainConversationId, data);
-    }
-    catch (err) {
-        console.error('Failed to write page to disk', err);
+    if (data.payload.content) {
+        try {
+            await (0, page_utils_1.writePageToDisk)(mainConversationId, data);
+        }
+        catch (err) {
+            console.error('Failed to write page to disk', err);
+        }
     }
     sendEvent(res, convertPageEvent(data, data.payload.conversationId, mainConversationId));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kapeta/local-cluster-service",
-    "version": "0.67.2",
+    "version": "0.67.3",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {