@kapeta/local-cluster-service 0.54.7 → 0.54.9

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.54.9](https://github.com/kapetacom/local-cluster-service/compare/v0.54.8...v0.54.9) (2024-07-02)
+
+
+### Bug Fixes
+
+* filter out INVALID_RESPONSE events ([abc1ca3](https://github.com/kapetacom/local-cluster-service/commit/abc1ca371f3f88e339e4ec6e6204efd333c2c771))
+
+## [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)
 
 

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

@@ -282,7 +282,9 @@ class StormCodegen {
         }
         // TODO: remove this when we have a better way to handle failed events
         // Skip failed events - they are not relevant to the materializer
-        filteredEvents = filteredEvents.filter((event) => !event.type.endsWith('_FAILED') && !event.type.endsWith('ERROR_INTERNAL'));
+        filteredEvents = filteredEvents.filter((event) => !event.type.endsWith('_FAILED') &&
+            !event.type.endsWith('ERROR_INTERNAL') &&
+            !event.type.endsWith('INVALID_RESPONSE'));
         const screenEvents = [];
         const getScreenEventsFile = () => ({
             content: JSON.stringify(screenEvents),
@@ -355,23 +357,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
@@ -395,7 +382,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);

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.js

@@ -282,7 +282,9 @@ class StormCodegen {
         }
         // TODO: remove this when we have a better way to handle failed events
         // Skip failed events - they are not relevant to the materializer
-        filteredEvents = filteredEvents.filter((event) => !event.type.endsWith('_FAILED') && !event.type.endsWith('ERROR_INTERNAL'));
+        filteredEvents = filteredEvents.filter((event) => !event.type.endsWith('_FAILED') &&
+            !event.type.endsWith('ERROR_INTERNAL') &&
+            !event.type.endsWith('INVALID_RESPONSE'));
         const screenEvents = [];
         const getScreenEventsFile = () => ({
             content: JSON.stringify(screenEvents),
@@ -355,23 +357,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
@@ -395,7 +382,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);

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.7",
+    "version": "0.54.9",
     "description": "Manages configuration, ports and service discovery for locally running Kapeta systems",
     "type": "commonjs",
     "exports": {

package/src/storm/codegen.ts

@@ -330,7 +330,10 @@ export class StormCodegen {
         // TODO: remove this when we have a better way to handle failed events
         // Skip failed events - they are not relevant to the materializer
         filteredEvents = filteredEvents.filter(
-            (event) => !event.type.endsWith('_FAILED') && !event.type.endsWith('ERROR_INTERNAL')
+            (event) =>
+                !event.type.endsWith('_FAILED') &&
+                !event.type.endsWith('ERROR_INTERNAL') &&
+                !event.type.endsWith('INVALID_RESPONSE')
         );
 
         const screenEvents: StormEventScreen[] = [];
@@ -419,28 +422,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
@@ -480,7 +468,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);

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,
         });
     }
 }