@kapeta/local-cluster-service 0.67.0 → 0.67.2

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [0.67.2](https://github.com/kapetacom/local-cluster-service/compare/v0.67.1...v0.67.2) (2024-08-28)
+
+
+### Bug Fixes
+
+* Add stack trace to error event ([ad52d4d](https://github.com/kapetacom/local-cluster-service/commit/ad52d4d22b20c0f4e34f83e0a9bc167599b02a08))
+* Don't check file existence when path is empty ([8d9aa1a](https://github.com/kapetacom/local-cluster-service/commit/8d9aa1a180c38f53a0ae6cd122fedc20c8a78307))
+
+## [0.67.1](https://github.com/kapetacom/local-cluster-service/compare/v0.67.0...v0.67.1) (2024-08-28)
+
+
+### Bug Fixes
+
+* edit bulk pages in parallel using the page agent ([#227](https://github.com/kapetacom/local-cluster-service/issues/227)) ([ac0d5d6](https://github.com/kapetacom/local-cluster-service/commit/ac0d5d611d9a3b84119b3ff5a272c2f2293236a1))
+
 # [0.67.0](https://github.com/kapetacom/local-cluster-service/compare/v0.66.0...v0.67.0) (2024-08-27)
 
 

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

@@ -111,6 +111,7 @@ export interface StormEventError {
     created: number;
     payload: {
         error: string;
+        stack?: string;
     };
 }
 export interface StormEventErrorClassifier {

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

@@ -53,6 +53,9 @@ async function writeImageToDisk(systemId, event, prompt) {
 }
 exports.writeImageToDisk = writeImageToDisk;
 function hasPageOnDisk(systemId, method, path) {
+    if (!systemId || !method || !path) {
+        return false;
+    }
     const baseDir = getSystemBaseDir(systemId);
     const filePath = getFilePath(method);
     const fullPath = path_1.default.join(baseDir, normalizePath(path), filePath);

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

@@ -382,58 +382,40 @@ router.post('/:handle/ui', async (req, res) => {
 });
 router.post('/ui/edit', async (req, res) => {
     try {
-        const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
+        const systemId = (req.headers[page_utils_1.SystemIdHeader.toLowerCase()] ||
+            req.headers[stormClient_1.ConversationIdHeader.toLowerCase()]);
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
-        const pages = aiRequest.prompt.pages
-            .map((page) => {
-            const content = (0, page_utils_1.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,
-            };
-        })
-            .filter((page) => !!page);
-        const editStream = await stormClient_1.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 PageGenerator_1.PageQueue(storagePrefix, 5);
         onRequestAborted(req, res, () => {
-            editStream.abort();
+            queue.cancel();
         });
-        res.set('Content-Type', 'application/x-ndjson');
-        res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
-        res.set(stormClient_1.ConversationIdHeader, editStream.getConversationId());
         const promises = [];
-        editStream.on('data', (data) => {
-            try {
-                if (data.type === 'PAGE') {
-                    promises.push(sendPageEvent(editStream.getConversationId(), data, res));
-                }
-                else {
-                    sendEvent(res, data);
-                }
+        queue.on('page', (data) => {
+            if (systemId) {
+                promises.push(sendPageEvent(systemId, data, res));
             }
-            catch (e) {
-                console.error('Failed to process event', e);
+        });
+        queue.on('event', (data) => {
+            if (data.type === 'FILE_START' || data.type === 'FILE_DONE' || data.type === 'FILE_STATE') {
+                sendEvent(res, data);
             }
         });
-        await waitForStormStream(editStream);
-        if (editStream.isAborted()) {
-            return;
-        }
+        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);
     }
@@ -614,17 +596,21 @@ function sendError(err, res) {
     if (res.closed) {
         return;
     }
+    const errorPayload = {
+        error: err.message,
+        stack: err.stack,
+    };
     console.error('Failed to send prompt', err);
     if (res.headersSent) {
         sendEvent(res, {
             type: 'ERROR_INTERNAL',
             created: Date.now(),
-            payload: { error: err.message },
+            payload: errorPayload,
             reason: 'Failed while sending prompt',
         });
     }
     else {
-        res.status(400).send({ error: err.message });
+        res.status(400).send(errorPayload);
     }
 }
 function waitForStormStream(result) {

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

@@ -24,7 +24,7 @@ export interface UIPagePrompt {
     description: string;
     storage_prefix: string;
     shell_page?: string;
-    theme: string;
+    theme?: string;
 }
 export interface UIPageSamplePrompt extends UIPagePrompt {
     variantId: string;

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

@@ -111,6 +111,7 @@ export interface StormEventError {
     created: number;
     payload: {
         error: string;
+        stack?: string;
     };
 }
 export interface StormEventErrorClassifier {

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

@@ -53,6 +53,9 @@ async function writeImageToDisk(systemId, event, prompt) {
 }
 exports.writeImageToDisk = writeImageToDisk;
 function hasPageOnDisk(systemId, method, path) {
+    if (!systemId || !method || !path) {
+        return false;
+    }
     const baseDir = getSystemBaseDir(systemId);
     const filePath = getFilePath(method);
     const fullPath = path_1.default.join(baseDir, normalizePath(path), filePath);

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

@@ -382,58 +382,40 @@ router.post('/:handle/ui', async (req, res) => {
 });
 router.post('/ui/edit', async (req, res) => {
     try {
-        const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
+        const systemId = (req.headers[page_utils_1.SystemIdHeader.toLowerCase()] ||
+            req.headers[stormClient_1.ConversationIdHeader.toLowerCase()]);
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
-        const pages = aiRequest.prompt.pages
-            .map((page) => {
-            const content = (0, page_utils_1.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,
-            };
-        })
-            .filter((page) => !!page);
-        const editStream = await stormClient_1.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 PageGenerator_1.PageQueue(storagePrefix, 5);
         onRequestAborted(req, res, () => {
-            editStream.abort();
+            queue.cancel();
         });
-        res.set('Content-Type', 'application/x-ndjson');
-        res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
-        res.set(stormClient_1.ConversationIdHeader, editStream.getConversationId());
         const promises = [];
-        editStream.on('data', (data) => {
-            try {
-                if (data.type === 'PAGE') {
-                    promises.push(sendPageEvent(editStream.getConversationId(), data, res));
-                }
-                else {
-                    sendEvent(res, data);
-                }
+        queue.on('page', (data) => {
+            if (systemId) {
+                promises.push(sendPageEvent(systemId, data, res));
             }
-            catch (e) {
-                console.error('Failed to process event', e);
+        });
+        queue.on('event', (data) => {
+            if (data.type === 'FILE_START' || data.type === 'FILE_DONE' || data.type === 'FILE_STATE') {
+                sendEvent(res, data);
             }
         });
-        await waitForStormStream(editStream);
-        if (editStream.isAborted()) {
-            return;
-        }
+        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);
     }
@@ -614,17 +596,21 @@ function sendError(err, res) {
     if (res.closed) {
         return;
     }
+    const errorPayload = {
+        error: err.message,
+        stack: err.stack,
+    };
     console.error('Failed to send prompt', err);
     if (res.headersSent) {
         sendEvent(res, {
             type: 'ERROR_INTERNAL',
             created: Date.now(),
-            payload: { error: err.message },
+            payload: errorPayload,
             reason: 'Failed while sending prompt',
         });
     }
     else {
-        res.status(400).send({ error: err.message });
+        res.status(400).send(errorPayload);
     }
 }
 function waitForStormStream(result) {

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

@@ -24,7 +24,7 @@ export interface UIPagePrompt {
     description: string;
     storage_prefix: string;
     shell_page?: string;
-    theme: string;
+    theme?: string;
 }
 export interface UIPageSamplePrompt extends UIPagePrompt {
     variantId: string;

package/package.json

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

package/src/storm/events.ts

@@ -140,6 +140,7 @@ export interface StormEventError {
     created: number;
     payload: {
         error: string;
+        stack?: string;
     };
 }
 

package/src/storm/page-utils.ts

@@ -69,6 +69,9 @@ export async function writeImageToDisk(systemId: string, event: StormImage, prom
 }
 
 export function hasPageOnDisk(systemId: string, method: string, path: string) {
+    if (!systemId || !method || !path) {
+        return false;
+    }
     const baseDir = getSystemBaseDir(systemId);
     const filePath = getFilePath(method);
     const fullPath = Path.join(baseDir, normalizePath(path), filePath);

package/src/storm/routes.ts

@@ -473,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);
@@ -751,16 +737,23 @@ function sendError(err: Error, res: Response) {
     if (res.closed) {
         return;
     }
+
+    const errorPayload = {
+        error: err.message,
+        stack: err.stack,
+    };
+
     console.error('Failed to send prompt', err);
+
     if (res.headersSent) {
         sendEvent(res, {
             type: 'ERROR_INTERNAL',
             created: Date.now(),
-            payload: { error: err.message },
+            payload: errorPayload,
             reason: 'Failed while sending prompt',
         });
     } else {
-        res.status(400).send({ error: err.message });
+        res.status(400).send(errorPayload);
     }
 }
 

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 {