@kapeta/local-cluster-service 0.62.1 → 0.62.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.62.2](https://github.com/kapetacom/local-cluster-service/compare/v0.62.1...v0.62.2) (2024-08-14)
+
+
+### Bug Fixes
+
+* Single page adjustments ([#217](https://github.com/kapetacom/local-cluster-service/issues/217)) ([8d0f7e6](https://github.com/kapetacom/local-cluster-service/commit/8d0f7e6b9a3fdd971559a4c9b06b78db38145b4d))
+
 ## [0.62.1](https://github.com/kapetacom/local-cluster-service/compare/v0.62.0...v0.62.1) (2024-08-14)
 
 

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

@@ -4,18 +4,20 @@
  */
 /// <reference types="node" />
 import { UIPagePrompt } from './stormClient';
-import { ReferenceClassification, StormEvent, StormEventPage } from './events';
+import { ReferenceClassification, StormEvent, StormEventPage, UIShell } from './events';
 import { EventEmitter } from 'node:events';
 export declare class PageQueue extends EventEmitter {
     private readonly queue;
     private readonly systemId;
     private readonly references;
+    private uiShells;
     constructor(systemId: string, concurrency?: number);
     on(event: 'event', listener: (data: StormEvent) => void): this;
     on(event: 'page', listener: (data: StormEventPage) => void): this;
     emit(type: 'event', event: StormEvent): boolean;
     emit(type: 'page', event: StormEventPage): boolean;
-    addPrompt(initialPrompt: UIPagePrompt): Promise<void>;
+    addUiShell(uiShell: UIShell): void;
+    addPrompt(initialPrompt: Omit<UIPagePrompt, 'shell_page'>, conversationId?: string, overwrite?: boolean): Promise<void>;
     private addPageGenerator;
     cancel(): void;
     wait(): Promise<void>;

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

@@ -12,10 +12,12 @@ const node_uuid_1 = __importDefault(require("node-uuid"));
 const stormClient_1 = require("./stormClient");
 const node_events_1 = require("node:events");
 const PromiseQueue_1 = require("./PromiseQueue");
+const page_utils_1 = require("./page-utils");
 class PageQueue extends node_events_1.EventEmitter {
     queue;
     systemId;
     references = new Map();
+    uiShells = [];
     constructor(systemId, concurrency = 5) {
         super();
         this.systemId = systemId;
@@ -27,14 +29,24 @@ class PageQueue extends node_events_1.EventEmitter {
     emit(eventName, ...args) {
         return super.emit(eventName, ...args);
     }
-    addPrompt(initialPrompt) {
-        if (this.references.has(initialPrompt.path)) {
+    addUiShell(uiShell) {
+        this.uiShells.push(uiShell);
+    }
+    addPrompt(initialPrompt, conversationId = node_uuid_1.default.v4(), overwrite = false) {
+        if (!overwrite && this.references.has(initialPrompt.path)) {
             console.log('Ignoring duplicate prompt', initialPrompt.path);
             return Promise.resolve();
         }
-        console.log('processing prompt', initialPrompt.path);
-        const generator = new PageGenerator(initialPrompt);
-        this.references.set(initialPrompt.path, generator);
+        if (!overwrite && (0, page_utils_1.hasPageOnDisk)(this.systemId, initialPrompt.method, 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,
+        };
+        const generator = new PageGenerator(prompt, conversationId);
+        this.references.set(prompt.path, generator);
         return this.addPageGenerator(generator);
     }
     async addPageGenerator(generator) {

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

@@ -9,6 +9,7 @@ export declare const SystemIdHeader = "System-Id";
 export declare function writePageToDisk(systemId: string, event: StormEventPage): Promise<{
     path: string;
 }>;
+export declare function hasPageOnDisk(systemId: string, method: string, path: string): boolean;
 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/cjs/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.writePageToDisk = exports.SystemIdHeader = void 0;
+exports.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.hasPageOnDisk = 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"));
@@ -26,6 +26,13 @@ async function writePageToDisk(systemId, event) {
     };
 }
 exports.writePageToDisk = writePageToDisk;
+function hasPageOnDisk(systemId, method, path) {
+    const baseDir = getBaseDir(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) {
     return path_1.default.join(node_os_1.default.tmpdir(), 'ai-systems', systemId);
 }

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

@@ -71,19 +71,13 @@ router.post('/ui/screen', async (req, res) => {
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
-        await queue.addPrompt(aiRequest);
         const promises = [];
         queue.on('page', (data) => {
-            switch (data.type) {
-                case 'PAGE':
-                    console.log('Processing page event', data);
-                    if (systemId) {
-                        promises.push(sendPageEvent(systemId, data, res));
-                    }
-                    break;
+            if (systemId) {
+                promises.push(sendPageEvent(systemId, data, res));
             }
-            sendEvent(res, data);
         });
+        await queue.addPrompt(aiRequest, conversationId, true);
         await queue.wait();
         await Promise.allSettled(promises);
         sendDone(res);
@@ -233,7 +227,7 @@ router.post('/:handle/ui', async (req, res) => {
         onRequestAborted(req, res, () => {
             shellsStream.abort();
         });
-        const uiShells = [];
+        const queue = new PageGenerator_1.PageQueue(outerConversationId, 5);
         shellsStream.on('data', (data) => {
             console.log('Processing shell event', data);
             sendEvent(res, data);
@@ -243,7 +237,7 @@ router.post('/:handle/ui', async (req, res) => {
             if (shellsStream.isAborted()) {
                 return;
             }
-            uiShells.push(data.payload);
+            queue.addUiShell(data.payload);
         });
         shellsStream.on('error', (error) => {
             console.error('Error on shellsStream', error);
@@ -254,7 +248,6 @@ router.post('/:handle/ui', async (req, res) => {
         UI_SERVERS[outerConversationId] = new UIServer_1.UIServer(outerConversationId);
         await UI_SERVERS[outerConversationId].start();
         // Get the pages (5 at a time)
-        const queue = new PageGenerator_1.PageQueue(outerConversationId, 5);
         const pagePromises = [];
         onRequestAborted(req, res, () => {
             queue.cancel();
@@ -276,7 +269,6 @@ router.post('/:handle/ui', async (req, res) => {
                 title: screen.title,
                 filename: screen.filename,
                 storage_prefix: outerConversationId + '_',
-                shell_page: uiShells.find((shell) => shell.screens.includes(screen.name))?.content,
             }));
         }
         await queue.wait();
@@ -536,7 +528,7 @@ function streamStormPartialResponse(result, res) {
             switch (data.type) {
                 // todo: temporarily (for demo purposes) disable error messages when codegen fails
                 case 'ERROR_INTERNAL':
-                    console.log("Error internal", data);
+                    console.log('Error internal', data);
                     return;
             }
             sendEvent(res, data);
@@ -555,13 +547,13 @@ function onRequestAborted(req, res, onAborted) {
         onAborted();
     });
 }
-function sendPageEvent(mainConversationId, data, res) {
-    return (0, page_utils_1.writePageToDisk)(mainConversationId, data)
-        .catch((err) => {
+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);
-    })
-        .then(() => {
-        sendEvent(res, convertPageEvent(data, data.payload.conversationId, mainConversationId));
-    });
+    }
+    sendEvent(res, convertPageEvent(data, data.payload.conversationId, mainConversationId));
 }
 exports.default = router;

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

@@ -4,18 +4,20 @@
  */
 /// <reference types="node" />
 import { UIPagePrompt } from './stormClient';
-import { ReferenceClassification, StormEvent, StormEventPage } from './events';
+import { ReferenceClassification, StormEvent, StormEventPage, UIShell } from './events';
 import { EventEmitter } from 'node:events';
 export declare class PageQueue extends EventEmitter {
     private readonly queue;
     private readonly systemId;
     private readonly references;
+    private uiShells;
     constructor(systemId: string, concurrency?: number);
     on(event: 'event', listener: (data: StormEvent) => void): this;
     on(event: 'page', listener: (data: StormEventPage) => void): this;
     emit(type: 'event', event: StormEvent): boolean;
     emit(type: 'page', event: StormEventPage): boolean;
-    addPrompt(initialPrompt: UIPagePrompt): Promise<void>;
+    addUiShell(uiShell: UIShell): void;
+    addPrompt(initialPrompt: Omit<UIPagePrompt, 'shell_page'>, conversationId?: string, overwrite?: boolean): Promise<void>;
     private addPageGenerator;
     cancel(): void;
     wait(): Promise<void>;

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

@@ -12,10 +12,12 @@ const node_uuid_1 = __importDefault(require("node-uuid"));
 const stormClient_1 = require("./stormClient");
 const node_events_1 = require("node:events");
 const PromiseQueue_1 = require("./PromiseQueue");
+const page_utils_1 = require("./page-utils");
 class PageQueue extends node_events_1.EventEmitter {
     queue;
     systemId;
     references = new Map();
+    uiShells = [];
     constructor(systemId, concurrency = 5) {
         super();
         this.systemId = systemId;
@@ -27,14 +29,24 @@ class PageQueue extends node_events_1.EventEmitter {
     emit(eventName, ...args) {
         return super.emit(eventName, ...args);
     }
-    addPrompt(initialPrompt) {
-        if (this.references.has(initialPrompt.path)) {
+    addUiShell(uiShell) {
+        this.uiShells.push(uiShell);
+    }
+    addPrompt(initialPrompt, conversationId = node_uuid_1.default.v4(), overwrite = false) {
+        if (!overwrite && this.references.has(initialPrompt.path)) {
             console.log('Ignoring duplicate prompt', initialPrompt.path);
             return Promise.resolve();
         }
-        console.log('processing prompt', initialPrompt.path);
-        const generator = new PageGenerator(initialPrompt);
-        this.references.set(initialPrompt.path, generator);
+        if (!overwrite && (0, page_utils_1.hasPageOnDisk)(this.systemId, initialPrompt.method, 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,
+        };
+        const generator = new PageGenerator(prompt, conversationId);
+        this.references.set(prompt.path, generator);
         return this.addPageGenerator(generator);
     }
     async addPageGenerator(generator) {

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

@@ -9,6 +9,7 @@ export declare const SystemIdHeader = "System-Id";
 export declare function writePageToDisk(systemId: string, event: StormEventPage): Promise<{
     path: string;
 }>;
+export declare function hasPageOnDisk(systemId: string, method: string, path: string): boolean;
 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.writePageToDisk = exports.SystemIdHeader = void 0;
+exports.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.hasPageOnDisk = 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"));
@@ -26,6 +26,13 @@ async function writePageToDisk(systemId, event) {
     };
 }
 exports.writePageToDisk = writePageToDisk;
+function hasPageOnDisk(systemId, method, path) {
+    const baseDir = getBaseDir(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) {
     return path_1.default.join(node_os_1.default.tmpdir(), 'ai-systems', systemId);
 }

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

@@ -71,19 +71,13 @@ router.post('/ui/screen', async (req, res) => {
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
-        await queue.addPrompt(aiRequest);
         const promises = [];
         queue.on('page', (data) => {
-            switch (data.type) {
-                case 'PAGE':
-                    console.log('Processing page event', data);
-                    if (systemId) {
-                        promises.push(sendPageEvent(systemId, data, res));
-                    }
-                    break;
+            if (systemId) {
+                promises.push(sendPageEvent(systemId, data, res));
             }
-            sendEvent(res, data);
         });
+        await queue.addPrompt(aiRequest, conversationId, true);
         await queue.wait();
         await Promise.allSettled(promises);
         sendDone(res);
@@ -233,7 +227,7 @@ router.post('/:handle/ui', async (req, res) => {
         onRequestAborted(req, res, () => {
             shellsStream.abort();
         });
-        const uiShells = [];
+        const queue = new PageGenerator_1.PageQueue(outerConversationId, 5);
         shellsStream.on('data', (data) => {
             console.log('Processing shell event', data);
             sendEvent(res, data);
@@ -243,7 +237,7 @@ router.post('/:handle/ui', async (req, res) => {
             if (shellsStream.isAborted()) {
                 return;
             }
-            uiShells.push(data.payload);
+            queue.addUiShell(data.payload);
         });
         shellsStream.on('error', (error) => {
             console.error('Error on shellsStream', error);
@@ -254,7 +248,6 @@ router.post('/:handle/ui', async (req, res) => {
         UI_SERVERS[outerConversationId] = new UIServer_1.UIServer(outerConversationId);
         await UI_SERVERS[outerConversationId].start();
         // Get the pages (5 at a time)
-        const queue = new PageGenerator_1.PageQueue(outerConversationId, 5);
         const pagePromises = [];
         onRequestAborted(req, res, () => {
             queue.cancel();
@@ -276,7 +269,6 @@ router.post('/:handle/ui', async (req, res) => {
                 title: screen.title,
                 filename: screen.filename,
                 storage_prefix: outerConversationId + '_',
-                shell_page: uiShells.find((shell) => shell.screens.includes(screen.name))?.content,
             }));
         }
         await queue.wait();
@@ -536,7 +528,7 @@ function streamStormPartialResponse(result, res) {
             switch (data.type) {
                 // todo: temporarily (for demo purposes) disable error messages when codegen fails
                 case 'ERROR_INTERNAL':
-                    console.log("Error internal", data);
+                    console.log('Error internal', data);
                     return;
             }
             sendEvent(res, data);
@@ -555,13 +547,13 @@ function onRequestAborted(req, res, onAborted) {
         onAborted();
     });
 }
-function sendPageEvent(mainConversationId, data, res) {
-    return (0, page_utils_1.writePageToDisk)(mainConversationId, data)
-        .catch((err) => {
+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);
-    })
-        .then(() => {
-        sendEvent(res, convertPageEvent(data, data.payload.conversationId, mainConversationId));
-    });
+    }
+    sendEvent(res, convertPageEvent(data, data.payload.conversationId, mainConversationId));
 }
 exports.default = router;

package/package.json

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

package/src/storm/PageGenerator.ts

@@ -5,14 +5,22 @@
 
 import uuid from 'node-uuid';
 import { stormClient, UIPagePrompt } from './stormClient';
-import { ReferenceClassification, StormEvent, StormEventPage, StormEventReferenceClassification } from './events';
+import {
+    ReferenceClassification,
+    StormEvent,
+    StormEventPage,
+    StormEventReferenceClassification,
+    UIShell,
+} from './events';
 import { EventEmitter } from 'node:events';
 import { PromiseQueue } from './PromiseQueue';
+import { hasPageOnDisk } from './page-utils';
 
 export class PageQueue extends EventEmitter {
     private readonly queue: PromiseQueue;
     private readonly systemId: string;
     private readonly references: Map<string, PageGenerator> = new Map();
+    private uiShells: UIShell[] = [];
 
     constructor(systemId: string, concurrency: number = 5) {
         super();
@@ -33,14 +41,33 @@ export class PageQueue extends EventEmitter {
         return super.emit(eventName, ...args);
     }
 
-    public addPrompt(initialPrompt: UIPagePrompt) {
-        if (this.references.has(initialPrompt.path)) {
+    public addUiShell(uiShell: UIShell) {
+        this.uiShells.push(uiShell);
+    }
+
+    public addPrompt(
+        initialPrompt: Omit<UIPagePrompt, 'shell_page'>,
+        conversationId: string = uuid.v4(),
+        overwrite: boolean = false
+    ) {
+        if (!overwrite && this.references.has(initialPrompt.path)) {
             console.log('Ignoring duplicate prompt', initialPrompt.path);
             return Promise.resolve();
         }
-        console.log('processing prompt', initialPrompt.path);
-        const generator = new PageGenerator(initialPrompt);
-        this.references.set(initialPrompt.path, generator);
+
+        if (!overwrite && hasPageOnDisk(this.systemId, initialPrompt.method, initialPrompt.path)) {
+            console.log('Ignoring prompt with existing page', initialPrompt.path);
+            return Promise.resolve();
+        }
+
+        const prompt: UIPagePrompt = {
+            ...initialPrompt,
+            shell_page: this.uiShells.find((shell) => shell.screens.includes(initialPrompt.name))?.content,
+        };
+
+        const generator = new PageGenerator(prompt, conversationId);
+        this.references.set(prompt.path, generator);
+
         return this.addPageGenerator(generator);
     }
 

package/src/storm/page-utils.ts

@@ -34,6 +34,13 @@ export async function writePageToDisk(systemId: string, event: StormEventPage) {
     };
 }
 
+export function hasPageOnDisk(systemId: string, method: string, path: string) {
+    const baseDir = getBaseDir(systemId);
+    const filePath = getFilePath(method);
+    const fullPath = Path.join(baseDir, normalizePath(path), filePath);
+    return FS.existsSync(fullPath);
+}
+
 function getBaseDir(systemId: string) {
     return Path.join(os.tmpdir(), 'ai-systems', systemId);
 }

package/src/storm/routes.ts

@@ -106,22 +106,16 @@ router.post('/ui/screen', async (req: KapetaBodyRequest, res: Response) => {
             queue.cancel();
         });
 
-        await queue.addPrompt(aiRequest);
-
         const promises: Promise<void>[] = [];
-        queue.on('page', (data) => {
-            switch (data.type) {
-                case 'PAGE':
-                    console.log('Processing page event', data);
 
-                    if (systemId) {
-                        promises.push(sendPageEvent(systemId, data, res));
-                    }
-                    break;
+        queue.on('page', (data) => {
+            if (systemId) {
+                promises.push(sendPageEvent(systemId, data, res));
             }
-            sendEvent(res, data);
         });
 
+        await queue.addPrompt(aiRequest, conversationId, true);
+
         await queue.wait();
         await Promise.allSettled(promises);
 
@@ -304,8 +298,7 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
             shellsStream.abort();
         });
 
-        const uiShells: UIShell[] = [];
-
+        const queue = new PageQueue(outerConversationId, 5);
         shellsStream.on('data', (data: StormEvent) => {
             console.log('Processing shell event', data);
             sendEvent(res, data);
@@ -318,7 +311,7 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
                 return;
             }
 
-            uiShells.push(data.payload);
+            queue.addUiShell(data.payload);
         });
 
         shellsStream.on('error', (error) => {
@@ -333,7 +326,7 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
         await UI_SERVERS[outerConversationId].start();
 
         // Get the pages (5 at a time)
-        const queue = new PageQueue(outerConversationId, 5);
+
         const pagePromises: Promise<void>[] = [];
         onRequestAborted(req, res, () => {
             queue.cancel();
@@ -359,7 +352,6 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
                     title: screen.title,
                     filename: screen.filename,
                     storage_prefix: outerConversationId + '_',
-                    shell_page: uiShells.find((shell) => shell.screens.includes(screen.name))?.content,
                 })
             );
         }
@@ -668,7 +660,7 @@ function streamStormPartialResponse(result: StormStream, res: Response) {
             switch (data.type) {
                 // todo: temporarily (for demo purposes) disable error messages when codegen fails
                 case 'ERROR_INTERNAL':
-                    console.log("Error internal", data);
+                    console.log('Error internal', data);
                     return;
             }
             sendEvent(res, data);
@@ -691,14 +683,13 @@ function onRequestAborted(req: KapetaBodyRequest, res: Response, onAborted: () =
     });
 }
 
-function sendPageEvent(mainConversationId: string, data: StormEventPage, res: Response) {
-    return writePageToDisk(mainConversationId, data)
-        .catch((err) => {
-            console.error('Failed to write page to disk', err);
-        })
-        .then(() => {
-            sendEvent(res, convertPageEvent(data, data.payload.conversationId, mainConversationId));
-        });
+async function sendPageEvent(mainConversationId: string, data: StormEventPage, res: Response) {
+    try {
+        await writePageToDisk(mainConversationId, data);
+    } catch (err) {
+        console.error('Failed to write page to disk', err);
+    }
+    sendEvent(res, convertPageEvent(data, data.payload.conversationId, mainConversationId));
 }
 
 export default router;