@kapeta/local-cluster-service 0.54.6 → 0.54.8

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.54.8](https://github.com/kapetacom/local-cluster-service/compare/v0.54.7...v0.54.8) (2024-06-24)
+
+
+### Bug Fixes
+
+* update webrouter handling after template change ([#187](https://github.com/kapetacom/local-cluster-service/issues/187)) ([1c3dffa](https://github.com/kapetacom/local-cluster-service/commit/1c3dffa0f8e44680e9dbdee0acd97bde9a3e42b8))
+
+## [0.54.7](https://github.com/kapetacom/local-cluster-service/compare/v0.54.6...v0.54.7) (2024-06-21)
+
+
+### Bug Fixes
+
+* Forward errors to the UI ([#185](https://github.com/kapetacom/local-cluster-service/issues/185)) ([482a767](https://github.com/kapetacom/local-cluster-service/commit/482a76741315916ed696aea668a6061069eb3404))
+
 ## [0.54.6](https://github.com/kapetacom/local-cluster-service/compare/v0.54.5...v0.54.6) (2024-06-21)
 
 

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

@@ -17,6 +17,7 @@ export declare class StormCodegen {
     isAborted(): boolean;
     getStream(): StormStream;
     private handleTemplateFileOutput;
+    private handleError;
     private handleUiOutput;
     private handleFileEvents;
     private handleFileDoneOutput;

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

@@ -118,6 +118,9 @@ class StormCodegen {
         return this.out;
     }
     handleTemplateFileOutput(blockUri, aiName, data) {
+        if (this.handleError(data)) {
+            return;
+        }
         if (this.handleFileEvents(blockUri, aiName, data)) {
             return;
         }
@@ -126,9 +129,19 @@ class StormCodegen {
                 return this.handleFileDoneOutput(blockUri, aiName, data);
         }
     }
+    handleError(data) {
+        if (data.type === 'ERROR_INTERNAL') {
+            this.out.emit('data', data);
+            return true;
+        }
+        return false;
+    }
     handleUiOutput(blockUri, blockName, data) {
         const blockRef = blockUri.toNormalizedString();
         const instanceId = event_parser_1.StormEventParser.toInstanceIdFromRef(blockRef);
+        if (this.handleError(data)) {
+            return;
+        }
         if (this.handleFileEvents(blockUri, blockName, data)) {
             return;
         }
@@ -149,7 +162,7 @@ class StormCodegen {
             case 'FILE_DONE':
                 return this.handleFileDoneOutput(blockUri, blockName, data);
             default:
-                console.warn('Unknown event type', data);
+                console.warn('Unknown UI event type', data);
                 break;
         }
     }
@@ -342,23 +355,8 @@ class StormCodegen {
             };
         });
         allFiles.push(...screenFilesConverted);
-        const webRouters = allFiles.filter((file) => file.type === codegen_1.AIFileTypes.WEB_ROUTER);
-        await Promise.all(webRouters.map(async (webRouter) => {
-            const payload = {
-                filename: webRouter.filename,
-                template: webRouter,
-                context: screenFilesConverted.concat([getScreenEventsFile()]),
-                prompt: this.userPrompt,
-            };
-            const stream = await stormClient_1.stormClient.generateCode(payload);
-            stream.on('data', (evt) => {
-                this.handleTemplateFileOutput(blockUri, block.aiName, evt);
-            });
-            this.out.on('aborted', () => {
-                stream.abort();
-            });
-            await stream.waitForDone();
-        }));
+        let webRouters = allFiles.filter((file) => file.type === codegen_1.AIFileTypes.WEB_ROUTER);
+        webRouters = await this.processTemplates(blockUri, block.aiName, stormClient_1.stormClient.generateCode.bind(stormClient_1.stormClient), webRouters, screenFilesConverted.concat([getScreenEventsFile()]));
         // Gather the context files for implementation. These will be all be passed to the AI
         const contextFiles = relevantFiles.filter((file) => ![codegen_1.AIFileTypes.SERVICE, codegen_1.AIFileTypes.WEB_SCREEN, codegen_1.AIFileTypes.WEB_ROUTER].includes(file.type));
         // Send the service and UI templates to the AI. These will be sent one-by-one in addition to the context files
@@ -382,7 +380,6 @@ class StormCodegen {
             const filePath = (0, path_2.join)(basePath, serviceFile.filename);
             await (0, promises_1.writeFile)(filePath, serviceFile.content);
         }
-        // Write again after modifications
         for (const webRouterFile of webRouters) {
             const filePath = (0, path_2.join)(basePath, webRouterFile.filename);
             await (0, promises_1.writeFile)(filePath, webRouterFile.content);
@@ -712,11 +709,18 @@ class StormCodegen {
         for (const changedFile of changedFiles.flat()) {
             const find = allFiles.find((file) => file.filename === changedFile.payload.filename);
             if (find) {
-                result.push({ type: find.type, filename: find.filename, mode: find.mode, permissions: find.permissions,
-                    content: changedFile.payload.content });
+                result.push({
+                    type: find.type,
+                    filename: find.filename,
+                    mode: find.mode,
+                    permissions: find.permissions,
+                    content: changedFile.payload.content,
+                });
             }
             else {
-                console.warn("processTemplates: AI changed a file that wasn't in the input [" + changedFile.payload.filename + "]");
+                console.warn("processTemplates: AI changed a file that wasn't in the input [" +
+                    changedFile.payload.filename +
+                    ']');
             }
         }
         return result;

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

@@ -13,7 +13,7 @@ declare class StormClient {
     createErrorClassification(prompt: string, history?: ConversationItem[], conversationId?: string): Promise<StormStream>;
     createCodeFix(prompt: string, history?: ConversationItem[], conversationId?: string): Promise<StormStream>;
     createErrorDetails(prompt: string, history?: ConversationItem[], conversationId?: string): Promise<StormStream>;
-    generateCode(prompt: StormFileImplementationPrompt, history?: ConversationItem[], conversationId?: string): Promise<StormStream>;
+    generateCode(prompt: StormFileImplementationPrompt, conversationId?: string): Promise<StormStream>;
 }
 export declare const stormClient: StormClient;
 export {};

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

@@ -116,10 +116,10 @@ class StormClient {
             prompt,
         });
     }
-    generateCode(prompt, history, conversationId) {
+    generateCode(prompt, conversationId) {
         return this.send('/v2/code/generate', {
-            conversationId: conversationId,
             prompt,
+            conversationId: conversationId,
         });
     }
 }

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

@@ -17,6 +17,7 @@ export declare class StormCodegen {
     isAborted(): boolean;
     getStream(): StormStream;
     private handleTemplateFileOutput;
+    private handleError;
     private handleUiOutput;
     private handleFileEvents;
     private handleFileDoneOutput;

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

@@ -118,6 +118,9 @@ class StormCodegen {
         return this.out;
     }
     handleTemplateFileOutput(blockUri, aiName, data) {
+        if (this.handleError(data)) {
+            return;
+        }
         if (this.handleFileEvents(blockUri, aiName, data)) {
             return;
         }
@@ -126,9 +129,19 @@ class StormCodegen {
                 return this.handleFileDoneOutput(blockUri, aiName, data);
         }
     }
+    handleError(data) {
+        if (data.type === 'ERROR_INTERNAL') {
+            this.out.emit('data', data);
+            return true;
+        }
+        return false;
+    }
     handleUiOutput(blockUri, blockName, data) {
         const blockRef = blockUri.toNormalizedString();
         const instanceId = event_parser_1.StormEventParser.toInstanceIdFromRef(blockRef);
+        if (this.handleError(data)) {
+            return;
+        }
         if (this.handleFileEvents(blockUri, blockName, data)) {
             return;
         }
@@ -149,7 +162,7 @@ class StormCodegen {
             case 'FILE_DONE':
                 return this.handleFileDoneOutput(blockUri, blockName, data);
             default:
-                console.warn('Unknown event type', data);
+                console.warn('Unknown UI event type', data);
                 break;
         }
     }
@@ -342,23 +355,8 @@ class StormCodegen {
             };
         });
         allFiles.push(...screenFilesConverted);
-        const webRouters = allFiles.filter((file) => file.type === codegen_1.AIFileTypes.WEB_ROUTER);
-        await Promise.all(webRouters.map(async (webRouter) => {
-            const payload = {
-                filename: webRouter.filename,
-                template: webRouter,
-                context: screenFilesConverted.concat([getScreenEventsFile()]),
-                prompt: this.userPrompt,
-            };
-            const stream = await stormClient_1.stormClient.generateCode(payload);
-            stream.on('data', (evt) => {
-                this.handleTemplateFileOutput(blockUri, block.aiName, evt);
-            });
-            this.out.on('aborted', () => {
-                stream.abort();
-            });
-            await stream.waitForDone();
-        }));
+        let webRouters = allFiles.filter((file) => file.type === codegen_1.AIFileTypes.WEB_ROUTER);
+        webRouters = await this.processTemplates(blockUri, block.aiName, stormClient_1.stormClient.generateCode.bind(stormClient_1.stormClient), webRouters, screenFilesConverted.concat([getScreenEventsFile()]));
         // Gather the context files for implementation. These will be all be passed to the AI
         const contextFiles = relevantFiles.filter((file) => ![codegen_1.AIFileTypes.SERVICE, codegen_1.AIFileTypes.WEB_SCREEN, codegen_1.AIFileTypes.WEB_ROUTER].includes(file.type));
         // Send the service and UI templates to the AI. These will be sent one-by-one in addition to the context files
@@ -382,7 +380,6 @@ class StormCodegen {
             const filePath = (0, path_2.join)(basePath, serviceFile.filename);
             await (0, promises_1.writeFile)(filePath, serviceFile.content);
         }
-        // Write again after modifications
         for (const webRouterFile of webRouters) {
             const filePath = (0, path_2.join)(basePath, webRouterFile.filename);
             await (0, promises_1.writeFile)(filePath, webRouterFile.content);
@@ -712,11 +709,18 @@ class StormCodegen {
         for (const changedFile of changedFiles.flat()) {
             const find = allFiles.find((file) => file.filename === changedFile.payload.filename);
             if (find) {
-                result.push({ type: find.type, filename: find.filename, mode: find.mode, permissions: find.permissions,
-                    content: changedFile.payload.content });
+                result.push({
+                    type: find.type,
+                    filename: find.filename,
+                    mode: find.mode,
+                    permissions: find.permissions,
+                    content: changedFile.payload.content,
+                });
             }
             else {
-                console.warn("processTemplates: AI changed a file that wasn't in the input [" + changedFile.payload.filename + "]");
+                console.warn("processTemplates: AI changed a file that wasn't in the input [" +
+                    changedFile.payload.filename +
+                    ']');
             }
         }
         return result;

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

@@ -13,7 +13,7 @@ declare class StormClient {
     createErrorClassification(prompt: string, history?: ConversationItem[], conversationId?: string): Promise<StormStream>;
     createCodeFix(prompt: string, history?: ConversationItem[], conversationId?: string): Promise<StormStream>;
     createErrorDetails(prompt: string, history?: ConversationItem[], conversationId?: string): Promise<StormStream>;
-    generateCode(prompt: StormFileImplementationPrompt, history?: ConversationItem[], conversationId?: string): Promise<StormStream>;
+    generateCode(prompt: StormFileImplementationPrompt, conversationId?: string): Promise<StormStream>;
 }
 export declare const stormClient: StormClient;
 export {};

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

@@ -116,10 +116,10 @@ class StormClient {
             prompt,
         });
     }
-    generateCode(prompt, history, conversationId) {
+    generateCode(prompt, conversationId) {
         return this.send('/v2/code/generate', {
-            conversationId: conversationId,
             prompt,
+            conversationId: conversationId,
         });
     }
 }

package/package.json

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

package/src/storm/codegen.ts

@@ -135,6 +135,10 @@ export class StormCodegen {
         aiName: string,
         data: StormEvent
     ): StormEventFileDone | undefined {
+        if (this.handleError(data)) {
+            return;
+        }
+
         if (this.handleFileEvents(blockUri, aiName, data)) {
             return;
         }
@@ -145,10 +149,23 @@ export class StormCodegen {
         }
     }
 
+    private handleError(data: StormEvent): boolean {
+        if (data.type === 'ERROR_INTERNAL') {
+            this.out.emit('data', data);
+            return true;
+        }
+
+        return false;
+    }
+
     private handleUiOutput(blockUri: KapetaURI, blockName: string, data: StormEvent): StormEventFileDone | undefined {
         const blockRef = blockUri.toNormalizedString();
         const instanceId = StormEventParser.toInstanceIdFromRef(blockRef);
 
+        if (this.handleError(data)) {
+            return;
+        }
+
         if (this.handleFileEvents(blockUri, blockName, data)) {
             return;
         }
@@ -169,8 +186,9 @@ export class StormCodegen {
                 break;
             case 'FILE_DONE':
                 return this.handleFileDoneOutput(blockUri, blockName, data);
+
             default:
-                console.warn('Unknown event type', data);
+                console.warn('Unknown UI event type', data);
                 break;
         }
     }
@@ -233,7 +251,11 @@ export class StormCodegen {
         return false;
     }
 
-    private handleFileDoneOutput(blockUri: KapetaURI, aiName: string, data: StormEvent): StormEventFileDone | undefined {
+    private handleFileDoneOutput(
+        blockUri: KapetaURI,
+        aiName: string,
+        data: StormEvent
+    ): StormEventFileDone | undefined {
         switch (data.type) {
             case 'FILE_DONE':
                 const ref = blockUri.toNormalizedString();
@@ -397,28 +419,13 @@ export class StormCodegen {
         });
         allFiles.push(...screenFilesConverted);
 
-        const webRouters = allFiles.filter((file) => file.type === AIFileTypes.WEB_ROUTER);
-        await Promise.all(
-            webRouters.map(async (webRouter) => {
-                const payload = {
-                    filename: webRouter.filename,
-                    template: webRouter,
-                    context: screenFilesConverted.concat([getScreenEventsFile()]),
-                    prompt: this.userPrompt,
-                };
-
-                const stream = await stormClient.generateCode(payload);
-
-                stream.on('data', (evt) => {
-                    this.handleTemplateFileOutput(blockUri, block.aiName, evt);
-                });
-
-                this.out.on('aborted', () => {
-                    stream.abort();
-                });
-
-                await stream.waitForDone();
-            })
+        let webRouters = allFiles.filter((file) => file.type === AIFileTypes.WEB_ROUTER);
+        webRouters = await this.processTemplates(
+            blockUri,
+            block.aiName,
+            stormClient.generateCode.bind(stormClient),
+            webRouters,
+            screenFilesConverted.concat([getScreenEventsFile()])
         );
 
         // Gather the context files for implementation. These will be all be passed to the AI
@@ -458,7 +465,6 @@ export class StormCodegen {
             await writeFile(filePath, serviceFile.content);
         }
 
-        // Write again after modifications
         for (const webRouterFile of webRouters) {
             const filePath = join(basePath, webRouterFile.filename);
             await writeFile(filePath, webRouterFile.content);
@@ -906,10 +912,19 @@ export class StormCodegen {
         for (const changedFile of changedFiles.flat()) {
             const find = allFiles.find((file) => file.filename === changedFile.payload.filename);
             if (find) {
-                result.push({ type: find.type, filename: find.filename, mode: find.mode, permissions: find.permissions,
-                    content: changedFile.payload.content });
+                result.push({
+                    type: find.type,
+                    filename: find.filename,
+                    mode: find.mode,
+                    permissions: find.permissions,
+                    content: changedFile.payload.content,
+                });
             } else {
-                console.warn("processTemplates: AI changed a file that wasn't in the input [" + changedFile.payload.filename + "]");
+                console.warn(
+                    "processTemplates: AI changed a file that wasn't in the input [" +
+                        changedFile.payload.filename +
+                        ']'
+                );
             }
         }
         return result;

package/src/storm/stormClient.ts

@@ -155,10 +155,10 @@ class StormClient {
         });
     }
 
-    public generateCode(prompt: StormFileImplementationPrompt, history?: ConversationItem[], conversationId?: string) {
+    public generateCode(prompt: StormFileImplementationPrompt, conversationId?: string) {
         return this.send('/v2/code/generate', {
-            conversationId: conversationId,
             prompt,
+            conversationId: conversationId,
         });
     }
 }