@kapeta/local-cluster-service 0.66.0 → 0.67.1

package/src/storm/routes.ts

@@ -23,7 +23,7 @@ import {
     UIPageVoteRequest,
     UIPageGetVoteRequest,
 } from './stormClient';
-import { Page, StormEvent, StormEventPage, StormEventPhaseType, UserJourneyScreen } from './events';
+import { Page, StormEvent, StormEventPage, StormEventPhaseType, StormImage, UserJourneyScreen } from './events';
 
 import {
     createPhaseEndEvent,
@@ -40,11 +40,12 @@ import {
     readPageFromDiskAsString,
     SystemIdHeader,
     writeAssetToDisk,
+    writeImageToDisk,
     writePageToDisk,
 } from './page-utils';
 import { UIServer } from './UIServer';
-import { PageQueue } from './PageGenerator';
 import { randomUUID } from 'crypto';
+import { ImagePrompt, PageQueue } from './PageGenerator';
 
 const UI_SERVERS: { [key: string]: UIServer } = {};
 const router = Router();
@@ -114,6 +115,21 @@ router.post('/ui/screen', async (req: KapetaBodyRequest, res: Response) => {
             }
         });
 
+        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();
@@ -211,6 +227,18 @@ router.post('/:handle/ui/iterative', async (req: KapetaBodyRequest, res: Respons
             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: StormEvent) => {
             sendEvent(res, screenData);
         });
@@ -347,7 +375,7 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
         queue.setUiTheme(theme);
 
         shellsStream.on('data', (data: StormEvent) => {
-            console.log('Processing shell event', data);
+            //console.log('Processing shell event', data);
             sendEvent(res, data);
 
             if (data.type !== 'UI_SHELL') {
@@ -394,6 +422,18 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
             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: StormEvent) => {
             sendEvent(res, screenData);
         });
@@ -433,67 +473,53 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
 
 router.post('/ui/edit', async (req: KapetaBodyRequest, res: Response) => {
     try {
-        const conversationId = req.headers[ConversationIdHeader.toLowerCase()] as string | undefined;
+        const systemId = (req.headers[SystemIdHeader.toLowerCase()] ||
+            req.headers[ConversationIdHeader.toLowerCase()]) as string | undefined;
 
         const aiRequest: StormContextRequest<UIPageEditRequest> = JSON.parse(req.stringBody ?? '{}');
-
-        const pages = aiRequest.prompt.pages
-            .map((page) => {
-                const content = readPageFromDiskAsString(conversationId!, page.path, page.method);
-                if (!content) {
-                    console.warn('Page not found', page);
-                    return undefined;
-                }
-
-                return {
-                    filename: page.filename,
-                    path: page.path,
-                    method: page.method,
-                    title: page.title,
-                    conversationId: page.conversationId,
-                    prompt: page.prompt,
-                    name: page.name,
-                    description: page.description,
-                    content,
-                } satisfies Page;
-            })
-            .filter((page: Page | undefined) => !!page) as UIPageEditPrompt['pages'];
-
-        const editStream = await stormClient.editPages(
-            {
-                prompt: aiRequest.prompt.prompt.prompt,
-                blockDescription: aiRequest.prompt.blockDescription,
-                planDescription: aiRequest.prompt.planDescription,
-                pages,
-            },
-            conversationId
-        );
+        const storagePrefix = systemId ? systemId + '_' : 'mock_';
+        const queue = new PageQueue(storagePrefix, 5);
 
         onRequestAborted(req, res, () => {
-            editStream.abort();
+            queue.cancel();
         });
 
-        res.set('Content-Type', 'application/x-ndjson');
-        res.set('Access-Control-Expose-Headers', ConversationIdHeader);
-        res.set(ConversationIdHeader, editStream.getConversationId());
-
         const promises: Promise<void>[] = [];
-        editStream.on('data', (data: StormEvent) => {
-            try {
-                if (data.type === 'PAGE') {
-                    promises.push(sendPageEvent(editStream.getConversationId(), data, res));
-                } else {
-                    sendEvent(res, data);
-                }
-            } catch (e) {
-                console.error('Failed to process event', e);
+
+        queue.on('page', (data) => {
+            if (systemId) {
+                promises.push(sendPageEvent(systemId, data, res));
             }
         });
 
-        await waitForStormStream(editStream);
-        if (editStream.isAborted()) {
-            return;
-        }
+        queue.on('event', (data) => {
+            if (data.type === 'FILE_START' || data.type === 'FILE_DONE' || data.type === 'FILE_STATE') {
+                sendEvent(res, data);
+            }
+        });
+
+        await Promise.allSettled(
+            aiRequest.prompt.pages.map((page) => {
+                if (page.conversationId) {
+                    return queue.addPrompt(
+                        {
+                            title: page.title,
+                            name: page.name,
+                            method: page.method,
+                            path: page.path,
+                            description: page.description ?? '',
+                            filename: page.filename,
+                            prompt: aiRequest.prompt.prompt.prompt,
+                            storage_prefix: storagePrefix,
+                        },
+                        page.conversationId,
+                        true
+                    );
+                }
+            })
+        );
+
+        await queue.wait();
         await Promise.all(promises);
 
         sendDone(res);
@@ -766,4 +792,12 @@ async function sendPageEvent(mainConversationId: string, data: StormEventPage, r
     sendEvent(res, convertPageEvent(data, data.payload.conversationId, mainConversationId));
 }
 
+async function handleImageEvent(mainConversationId: string, data: StormImage, prompt: ImagePrompt) {
+    try {
+        await writeImageToDisk(mainConversationId, data, prompt);
+    } catch (err) {
+        console.error('Failed to write image to disk', err);
+    }
+}
+
 export default router;

package/src/storm/stormClient.ts

@@ -44,7 +44,7 @@ export interface UIPagePrompt {
     storage_prefix: string;
     shell_page?: string;
     // contents of theme.css
-    theme: string;
+    theme?: string;
 }
 
 export interface UIPageSamplePrompt extends UIPagePrompt {
@@ -263,6 +263,13 @@ class StormClient {
         });
     }
 
+    public createImage(prompt: string, conversationId?: string) {
+        return this.send('/v2/ui/image', {
+            prompt,
+            conversationId,
+        });
+    }
+
     public createUIImplementation(prompt: StormUIImplementationPrompt, conversationId?: string) {
         return this.send('/v2/ui/merge', {
             prompt,