@kapeta/local-cluster-service 0.65.0 → 0.67.0

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

@@ -18,6 +18,7 @@ class PageQueue extends node_events_1.EventEmitter {
     systemId;
     references = new Map();
     uiShells = [];
+    theme = '';
     constructor(systemId, concurrency = 5) {
         super();
         this.systemId = systemId;
@@ -32,18 +33,22 @@ class PageQueue extends node_events_1.EventEmitter {
     addUiShell(uiShell) {
         this.uiShells.push(uiShell);
     }
+    setUiTheme(theme) {
+        this.theme = theme;
+    }
     addPrompt(initialPrompt, conversationId = node_uuid_1.default.v4(), overwrite = false) {
         if (!overwrite && this.references.has(initialPrompt.path)) {
-            console.log('Ignoring duplicate prompt', initialPrompt.path);
+            //console.log('Ignoring duplicate prompt', initialPrompt.path);
             return Promise.resolve();
         }
         if (!overwrite && (0, page_utils_1.hasPageOnDisk)(this.systemId, initialPrompt.method, initialPrompt.path)) {
-            console.log('Ignoring prompt with existing page', initialPrompt.path);
+            //console.log('Ignoring prompt with existing page', initialPrompt.path);
             return Promise.resolve();
         }
         const prompt = {
             ...initialPrompt,
             shell_page: this.uiShells.find((shell) => shell.screens.includes(initialPrompt.name))?.content,
+            theme: this.theme,
         };
         const generator = new PageGenerator(prompt, conversationId);
         this.references.set(prompt.path, generator);
@@ -51,9 +56,8 @@ class PageQueue extends node_events_1.EventEmitter {
     }
     async addPageGenerator(generator) {
         generator.on('event', (event) => this.emit('event', event));
-        generator.on('page_refs', ({ event, references }) => {
-            this.emit('page', event);
-            references.forEach((reference) => {
+        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://') ||
@@ -62,14 +66,17 @@ class PageQueue extends node_events_1.EventEmitter {
                 }
                 switch (reference.type) {
                     case 'image':
-                        console.log('Ignoring image reference', reference);
+                        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);
+                        //console.log('Adding page generator for', reference);
                         const paths = Array.from(this.references.keys());
                         this.addPrompt({
                             name: reference.name,
@@ -84,10 +91,13 @@ class PageQueue extends node_events_1.EventEmitter {
                                     : ''),
                             description: reference.description,
                             filename: '',
+                            theme: this.theme,
                         });
                         break;
                 }
             });
+            await Promise.allSettled(promises);
+            this.emit('page', event);
         });
         return this.queue.add(() => generator.generate());
     }
@@ -97,6 +107,25 @@ class PageQueue extends node_events_1.EventEmitter {
     wait() {
         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());
+        const futures = [];
+        result.on('data', async (event) => {
+            if (event.type === 'IMAGE') {
+                const future = (0, PromiseQueue_1.createFuture)();
+                futures.push(future);
+                this.emit('image', event, prompt, future);
+                setTimeout(() => {
+                    if (!future.isResolved()) {
+                        console.log('Image prompt timed out', prompt);
+                        future.reject(new Error('Image prompt timed out'));
+                    }
+                }, 30000);
+            }
+        });
+        await result.waitForDone();
+        await Promise.allSettled(futures.map((f) => f.promise));
+    }
 }
 exports.PageQueue = PageQueue;
 class PageGenerator extends node_events_1.EventEmitter {

package/dist/esm/src/storm/PromiseQueue.d.ts

@@ -3,6 +3,13 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 export type Future<T> = () => Promise<T>;
+export type FuturePromise<T> = {
+    promise: Promise<T>;
+    resolve: (value: T) => void;
+    reject: (reason: any) => void;
+    isResolved: () => boolean;
+};
+export declare function createFuture<T = void>(): FuturePromise<T>;
 export declare class PromiseQueue {
     private readonly queue;
     private readonly active;

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

@@ -1,6 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PromiseQueue = void 0;
+exports.PromiseQueue = exports.createFuture = void 0;
+function createFuture() {
+    let resolved = false;
+    let resolve = () => {
+        resolved = true;
+    };
+    let reject = () => {
+        resolved = true;
+    };
+    const promise = new Promise((res, rej) => {
+        resolve = (value) => {
+            resolved = true;
+            res(value);
+        };
+        reject = (reason) => {
+            resolved = true;
+            rej(reason);
+        };
+    });
+    return {
+        promise,
+        resolve,
+        reject,
+        isResolved: () => resolved,
+    };
+}
+exports.createFuture = createFuture;
 class PromiseQueue {
     queue = [];
     active = [];

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

@@ -12,6 +12,7 @@ const express_1 = __importDefault(require("express"));
 const page_utils_1 = require("./page-utils");
 const clusterService_1 = require("../clusterService");
 const http_1 = require("http");
+const path_1 = require("path");
 class UIServer {
     systemId;
     port = 50000;
@@ -28,6 +29,8 @@ class UIServer {
                     window.sessionStorage.clear();
                 </script>`);
         });
+        // Make it possible to serve static assets
+        app.use(express_1.default.static((0, path_1.join)((0, page_utils_1.getSystemBaseDir)(this.systemId), 'public'), { fallthrough: true }));
         app.all('/*', (req, res) => {
             (0, page_utils_1.readPageFromDisk)(this.systemId, req.params[0], req.method, res);
         });

package/dist/esm/src/storm/events.d.ts

@@ -255,6 +255,14 @@ export interface StormEventDone {
     type: 'DONE';
     created: number;
 }
+export interface StormImage {
+    type: 'IMAGE';
+    reason: string;
+    created: number;
+    payload: {
+        href: string;
+    };
+}
 export interface StormEventDefinitionChange {
     type: 'DEFINITION_CHANGE';
     reason: string;
@@ -384,5 +392,5 @@ export interface StormEventUIStarted {
         resetUrl: string;
     };
 }
-export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileFailed | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases | StormEventBlockStatus | StormEventCreateDSLRetry | StormEventUserJourney | StormEventUIShell | StormEventPage | StormEventPageUrl | StormEventPromptImprove | StormEventLandingPage | StormEventReferenceClassification | StormEventApiBase | StormEventUIStarted;
+export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileFailed | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases | StormEventBlockStatus | StormEventCreateDSLRetry | StormEventUserJourney | StormEventUIShell | StormEventPage | StormEventPageUrl | StormEventPromptImprove | StormEventLandingPage | StormEventReferenceClassification | StormEventApiBase | StormEventUIStarted | StormImage;
 export {};

package/dist/esm/src/storm/page-utils.d.ts

@@ -2,14 +2,22 @@
  * Copyright 2023 Kapeta Inc.
  * SPDX-License-Identifier: BUSL-1.1
  */
-import { StormEventPage } from './events';
+import { StormEventFileDone, StormEventPage, StormImage } from './events';
 import { Response } from 'express';
 import { ConversationItem } from './stream';
+import { ImagePrompt } from './PageGenerator';
 export declare const SystemIdHeader = "System-Id";
 export declare function writePageToDisk(systemId: string, event: StormEventPage): Promise<{
     path: string;
 }>;
+export declare function writeAssetToDisk(systemId: string, event: StormEventFileDone): Promise<{
+    path: string;
+}>;
+export declare function writeImageToDisk(systemId: string, event: StormImage, prompt: ImagePrompt): Promise<{
+    path: string;
+}>;
 export declare function hasPageOnDisk(systemId: string, method: string, path: string): boolean;
+export declare function getSystemBaseDir(systemId: string): string;
 export declare function resolveReadPath(systemId: string, path: string, method: string): string | null;
 export declare function readPageFromDiskAsString(systemId: string, path: string, method: string): string | null;
 export declare function readPageFromDisk(systemId: string, path: string, method: string, res: Response): void;

package/dist/esm/src/storm/page-utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.hasPageOnDisk = exports.writePageToDisk = exports.SystemIdHeader = void 0;
+exports.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.getSystemBaseDir = exports.hasPageOnDisk = exports.writeImageToDisk = exports.writeAssetToDisk = exports.writePageToDisk = exports.SystemIdHeader = void 0;
 const node_os_1 = __importDefault(require("node:os"));
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -15,7 +15,7 @@ function normalizePath(path) {
         .replace(/\{[a-z]+}/gi, '*');
 }
 async function writePageToDisk(systemId, event) {
-    const baseDir = getBaseDir(systemId);
+    const baseDir = getSystemBaseDir(systemId);
     const filePath = getFilePath(event.payload.method);
     const path = path_1.default.join(baseDir, normalizePath(event.payload.path), filePath);
     await fs_extra_1.default.ensureDir(path_1.default.dirname(path));
@@ -26,24 +26,62 @@ async function writePageToDisk(systemId, event) {
     };
 }
 exports.writePageToDisk = writePageToDisk;
+async function writeAssetToDisk(systemId, event) {
+    const baseDir = getSystemBaseDir(systemId);
+    const path = path_1.default.join(baseDir, 'public', event.payload.filename);
+    await fs_extra_1.default.ensureDir(path_1.default.dirname(path));
+    await fs_extra_1.default.writeFile(path, event.payload.content);
+    return {
+        path,
+    };
+}
+exports.writeAssetToDisk = writeAssetToDisk;
+async function writeImageToDisk(systemId, event, prompt) {
+    const baseDir = getSystemBaseDir(systemId);
+    const path = path_1.default.join(baseDir, normalizePath(prompt.url));
+    const response = await fetch(event.payload.href);
+    if (!response.ok || !response.body) {
+        throw new Error(`Failed to fetch image: ${event.payload.href}`);
+    }
+    await fs_extra_1.default.ensureDir(path_1.default.dirname(path));
+    const buffer = await response.arrayBuffer();
+    await fs_extra_1.default.writeFile(path, Buffer.from(buffer));
+    console.log(`Image written to disk: ${event.payload.href} > ${path}`);
+    return {
+        path,
+    };
+}
+exports.writeImageToDisk = writeImageToDisk;
 function hasPageOnDisk(systemId, method, path) {
-    const baseDir = getBaseDir(systemId);
+    const baseDir = getSystemBaseDir(systemId);
     const filePath = getFilePath(method);
     const fullPath = path_1.default.join(baseDir, normalizePath(path), filePath);
     return fs_extra_1.default.existsSync(fullPath);
 }
 exports.hasPageOnDisk = hasPageOnDisk;
-function getBaseDir(systemId) {
+function getSystemBaseDir(systemId) {
     return path_1.default.join(node_os_1.default.tmpdir(), 'ai-systems', systemId);
 }
+exports.getSystemBaseDir = getSystemBaseDir;
 function getFilePath(method) {
     return path_1.default.join(method.toLowerCase(), 'index.html');
 }
 function resolveReadPath(systemId, path, method) {
-    const baseDir = getBaseDir(systemId);
+    const baseDir = getSystemBaseDir(systemId);
     path = normalizePath(path);
+    let fullPath = path_1.default.join(baseDir, path);
+    //First check if there is a file at the exact path
+    try {
+        const stat = fs_extra_1.default.statSync(fullPath);
+        if (stat && stat.isFile()) {
+            return fullPath;
+        }
+    }
+    catch (e) {
+        // Ignore
+    }
     const filePath = getFilePath(method);
-    const fullPath = path_1.default.join(baseDir, path, filePath);
+    fullPath = path_1.default.join(baseDir, path, filePath);
     if (fs_extra_1.default.existsSync(fullPath)) {
         return fullPath;
     }
@@ -84,7 +122,7 @@ function readPageFromDisk(systemId, path, method, res) {
         return;
     }
     res.type(filePath.split('.').pop());
-    const content = fs_extra_1.default.readFileSync(filePath, 'utf8');
+    const content = fs_extra_1.default.readFileSync(filePath);
     res.write(content);
     res.end();
 }

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

@@ -21,6 +21,7 @@ const assetManager_1 = require("../assetManager");
 const node_uuid_1 = __importDefault(require("node-uuid"));
 const page_utils_1 = require("./page-utils");
 const UIServer_1 = require("./UIServer");
+const crypto_1 = require("crypto");
 const PageGenerator_1 = require("./PageGenerator");
 const UI_SERVERS = {};
 const router = (0, express_promise_router_1.default)();
@@ -77,6 +78,21 @@ router.post('/ui/screen', async (req, res) => {
                 promises.push(sendPageEvent(systemId, data, res));
             }
         });
+        queue.on('image', async (screenData, prompt, future) => {
+            if (!systemId) {
+                return;
+            }
+            try {
+                const promise = handleImageEvent(systemId, screenData, prompt);
+                promises.push(promise);
+                await promise;
+                future.resolve();
+            }
+            catch (e) {
+                console.error('Failed to handle image event', e);
+                future.reject(e);
+            }
+        });
         await queue.addPrompt(aiRequest, conversationId, true);
         await queue.wait();
         await Promise.allSettled(promises);
@@ -142,6 +158,8 @@ router.post('/:handle/ui/iterative', async (req, res) => {
                     title: landingPage.title,
                     filename: landingPage.filename,
                     storage_prefix: systemId + '_',
+                    // TODO: Add themes to this request type
+                    theme: '',
                 });
             }
             catch (e) {
@@ -156,6 +174,18 @@ router.post('/:handle/ui/iterative', async (req, res) => {
         pageQueue.on('page', (screenData) => {
             pageEventPromises.push(sendPageEvent(landingPagesStream.getConversationId(), screenData, res));
         });
+        pageQueue.on('image', async (screenData, prompt, future) => {
+            try {
+                const promise = handleImageEvent(landingPagesStream.getConversationId(), screenData, prompt);
+                pageEventPromises.push(promise);
+                await promise;
+                future.resolve();
+            }
+            catch (e) {
+                console.error('Failed to handle image event', e);
+                future.reject(e);
+            }
+        });
         pageQueue.on('event', (screenData) => {
             sendEvent(res, screenData);
         });
@@ -177,11 +207,10 @@ router.post('/:handle/ui/iterative', async (req, res) => {
 router.post('/:handle/ui', async (req, res) => {
     const handle = req.params.handle;
     try {
-        const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
+        const outerConversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()] || (0, crypto_1.randomUUID)();
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
         // Get user journeys
-        const userJourneysStream = await stormClient_1.stormClient.createUIUserJourneys(aiRequest, conversationId);
-        const outerConversationId = userJourneysStream.getConversationId();
+        const userJourneysStream = await stormClient_1.stormClient.createUIUserJourneys(aiRequest, outerConversationId);
         onRequestAborted(req, res, () => {
             userJourneysStream.abort();
         });
@@ -213,9 +242,50 @@ router.post('/:handle/ui', async (req, res) => {
             userJourneysStream.abort();
             sendError(error, res);
         });
+        let theme = '';
+        try {
+            const themeStream = await stormClient_1.stormClient.createTheme(aiRequest, outerConversationId);
+            onRequestAborted(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) => {
+                        sendEvent(res, {
+                            type: 'ERROR_INTERNAL',
+                            created: new Date().getTime(),
+                            payload: { error: err.message },
+                            reason: 'Failed to save theme',
+                        });
+                    });
+                }
+            });
+            themeStream.on('error', (error) => {
+                console.error(error);
+                sendEvent(res, {
+                    type: 'ERROR_INTERNAL',
+                    created: new Date().getTime(),
+                    payload: { error: error.message },
+                    reason: 'Failed to create theme',
+                });
+            });
+            await waitForStormStream(themeStream);
+        }
+        catch (e) {
+            console.error('Failed to generate theme', e);
+            sendEvent(res, {
+                type: 'ERROR_INTERNAL',
+                created: new Date().getTime(),
+                payload: { error: e.message },
+                reason: 'Failed to create theme',
+            });
+        }
         await waitForStormStream(userJourneysStream);
         // Get the UI shells
         const shellsStream = await stormClient_1.stormClient.createUIShells({
+            theme: theme ? `// filename: theme.css\n${theme}` : undefined,
             pages: Object.values(uniqueUserJourneyScreens).map((screen) => ({
                 name: screen.name,
                 title: screen.title,
@@ -224,13 +294,14 @@ router.post('/:handle/ui', async (req, res) => {
                 method: screen.method,
                 requirements: screen.requirements,
             })),
-        }, conversationId);
+        }, outerConversationId);
         onRequestAborted(req, res, () => {
             shellsStream.abort();
         });
         const queue = new PageGenerator_1.PageQueue(outerConversationId, 5);
+        queue.setUiTheme(theme);
         shellsStream.on('data', (data) => {
-            console.log('Processing shell event', data);
+            //console.log('Processing shell event', data);
             sendEvent(res, data);
             if (data.type !== 'UI_SHELL') {
                 return;
@@ -266,6 +337,18 @@ router.post('/:handle/ui', async (req, res) => {
         queue.on('page', (screenData) => {
             pageEventPromises.push(sendPageEvent(outerConversationId, screenData, res));
         });
+        queue.on('image', async (screenData, prompt, future) => {
+            try {
+                const promise = handleImageEvent(outerConversationId, screenData, prompt);
+                pageEventPromises.push(promise);
+                await promise;
+                future.resolve();
+            }
+            catch (e) {
+                console.error('Failed to handle image event', e);
+                future.reject(e);
+            }
+        });
         queue.on('event', (screenData) => {
             sendEvent(res, screenData);
         });
@@ -279,6 +362,7 @@ router.post('/:handle/ui', async (req, res) => {
                 title: screen.title,
                 filename: screen.filename,
                 storage_prefix: outerConversationId + '_',
+                theme,
             }));
         }
         await queue.wait();
@@ -580,4 +664,12 @@ async function sendPageEvent(mainConversationId, data, res) {
     }
     sendEvent(res, convertPageEvent(data, data.payload.conversationId, mainConversationId));
 }
+async function handleImageEvent(mainConversationId, data, prompt) {
+    try {
+        await (0, page_utils_1.writeImageToDisk)(mainConversationId, data, prompt);
+    }
+    catch (err) {
+        console.error('Failed to write image to disk', err);
+    }
+}
 exports.default = router;

package/dist/esm/src/storm/stormClient.d.ts

@@ -4,6 +4,7 @@ import { Page, StormEventPageUrl } from './events';
 export declare const STORM_ID = "storm";
 export declare const ConversationIdHeader = "Conversation-Id";
 export interface UIShellsPrompt {
+    theme?: string;
     pages: {
         name: string;
         title: string;
@@ -23,6 +24,7 @@ export interface UIPagePrompt {
     description: string;
     storage_prefix: string;
     shell_page?: string;
+    theme: string;
 }
 export interface UIPageSamplePrompt extends UIPagePrompt {
     variantId: string;
@@ -60,6 +62,7 @@ declare class StormClient {
     createMetadata(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;
     createUIPages(prompt: string, conversationId?: string): Promise<StormStream>;
     createUIUserJourneys(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;
+    createTheme(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;
     createUIShells(prompt: UIShellsPrompt, conversationId?: string): Promise<StormStream>;
     createUILandingPages(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;
     createUIPage(prompt: UIPagePrompt, conversationId?: string, history?: ConversationItem[]): Promise<StormStream>;
@@ -70,6 +73,7 @@ declare class StormClient {
     classifyUIReferences(prompt: string, conversationId?: string): Promise<StormStream>;
     editPages(prompt: UIPageEditPrompt, conversationId?: string): Promise<StormStream>;
     listScreens(prompt: StormUIListPrompt, conversationId?: string): Promise<StormStream>;
+    createImage(prompt: string, conversationId?: string): Promise<StormStream>;
     createUIImplementation(prompt: StormUIImplementationPrompt, conversationId?: string): Promise<StormStream>;
     createServiceImplementation(prompt: StormFileImplementationPrompt, conversationId?: string): Promise<StormStream>;
     createErrorClassification(prompt: string, history?: ConversationItem[], conversationId?: string): Promise<StormStream>;

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

@@ -92,6 +92,12 @@ class StormClient {
             conversationId,
         });
     }
+    createTheme(prompt, conversationId) {
+        return this.send('/v2/ui/theme', {
+            prompt: prompt,
+            conversationId,
+        });
+    }
     createUIShells(prompt, conversationId) {
         return this.send('/v2/ui/shells', {
             prompt: JSON.stringify(prompt),
@@ -149,6 +155,12 @@ class StormClient {
             conversationId,
         });
     }
+    createImage(prompt, conversationId) {
+        return this.send('/v2/ui/image', {
+            prompt,
+            conversationId,
+        });
+    }
     createUIImplementation(prompt, conversationId) {
         return this.send('/v2/ui/merge', {
             prompt,

package/package.json

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