@kapeta/local-cluster-service 0.52.3 → 0.53.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.53.0](https://github.com/kapetacom/local-cluster-service/compare/v0.52.3...v0.53.0) (2024-06-12)
+
+
+### Features
+
+* Emit code fixing events to UI ([#172](https://github.com/kapetacom/local-cluster-service/issues/172)) ([c10f5d0](https://github.com/kapetacom/local-cluster-service/commit/c10f5d03fdcf696085b2114aae45510a46ee6ec3))
+
 ## [0.52.3](https://github.com/kapetacom/local-cluster-service/compare/v0.52.2...v0.52.3) (2024-06-12)
 
 

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

@@ -25,6 +25,7 @@ export declare class StormCodegen {
      * Generates the code for a block and sends it to the AI
      */
     private processBlockCode;
+    private emitBlockStatus;
     private verifyAndFixCode;
     private tryToFixFile;
     private classifyErrors;

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

@@ -34,6 +34,7 @@ exports.StormCodegen = void 0;
 const codegen_1 = require("@kapeta/codegen");
 const codeGeneratorManager_1 = require("../codeGeneratorManager");
 const stormClient_1 = require("./stormClient");
+const events_1 = require("./events");
 const event_parser_1 = require("./event-parser");
 const stream_1 = require("./stream");
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
@@ -44,8 +45,8 @@ const node_os_1 = __importDefault(require("node:os"));
 const fs_1 = require("fs");
 const yaml_1 = __importDefault(require("yaml"));
 const fs = __importStar(require("node:fs"));
-const uuid_1 = require("uuid");
 const SIMULATED_DELAY = 1000;
+const ENABLE_SIMULATED_DELAY = false;
 class SimulatedFileDelay {
     file;
     stream;
@@ -149,43 +150,8 @@ class StormCodegen {
                     },
                 });
                 break;
-            case 'FILE_START':
-            case 'FILE_CHUNK_RESET':
-                this.out.emit('data', {
-                    ...data,
-                    payload: {
-                        ...data.payload,
-                        blockName,
-                        blockRef,
-                        instanceId,
-                    },
-                });
-                break;
-            case 'FILE_CHUNK':
-                this.out.emit('data', {
-                    ...data,
-                    payload: {
-                        ...data.payload,
-                        blockName,
-                        blockRef,
-                        instanceId,
-                    },
-                });
-                break;
-            case 'FILE_STATE':
-                this.out.emit('data', {
-                    ...data,
-                    payload: {
-                        ...data.payload,
-                        blockName,
-                        blockRef,
-                        instanceId,
-                    },
-                });
-                break;
             case 'FILE_DONE':
                 return this.handleFileDoneOutput(blockUri, blockName, data);
-                break;
         }
     }
     handleFileEvents(blockUri, blockName, data) {
@@ -299,10 +265,11 @@ class StormCodegen {
         }
         // 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].includes(file.type));
+        const blockUri = (0, nodejs_utils_1.parseKapetaUri)(block.uri);
         // Send the service and UI templates to the AI. These will be sent one-by-one in addition to the context files
         const serviceFiles = allFiles.filter((file) => file.type === codegen_1.AIFileTypes.SERVICE);
         if (serviceFiles.length > 0) {
-            await this.processTemplates((0, nodejs_utils_1.parseKapetaUri)(block.uri), block.aiName, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
+            await this.processTemplates(blockUri, block.aiName, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
         }
         const basePath = this.getBasePath(block.content.metadata.name);
         if (this.isAborted()) {
@@ -322,7 +289,7 @@ class StormCodegen {
             const filePath = (0, path_2.join)(basePath, screenFile.payload.filename);
             await (0, promises_1.writeFile)(filePath, screenFile.payload.content);
         }
-        const screenFilesConverted = screenFiles.map(screenFile => {
+        const screenFilesConverted = screenFiles.map((screenFile) => {
             return {
                 filename: screenFile.payload.filename,
                 content: screenFile.payload.content,
@@ -332,10 +299,12 @@ class StormCodegen {
             };
         });
         allFiles.push(...screenFilesConverted);
+        const blockRef = block.uri;
+        this.emitBlockStatus(blockUri, block.aiName, events_1.StormEventBlockStatusType.QA);
         const filesToBeFixed = serviceFiles.concat(contextFiles).concat(screenFilesConverted);
         const codeGenerator = new codegen_1.BlockCodeGenerator(block.content);
-        await this.verifyAndFixCode(codeGenerator, basePath, filesToBeFixed, allFiles);
-        const blockRef = block.uri;
+        this.emitBlockStatus(blockUri, block.aiName, events_1.StormEventBlockStatusType.BUILDING);
+        await this.verifyAndFixCode(blockUri, block.aiName, codeGenerator, basePath, filesToBeFixed, allFiles);
         this.out.emit('data', {
             type: 'BLOCK_READY',
             reason: 'Block ready',
@@ -348,7 +317,20 @@ class StormCodegen {
             },
         });
     }
-    async verifyAndFixCode(codeGenerator, basePath, filesToBeFixed, allFiles) {
+    emitBlockStatus(blockUri, blockName, status) {
+        this.out.emit('data', {
+            type: 'BLOCK_STATUS',
+            reason: status,
+            created: Date.now(),
+            payload: {
+                status,
+                blockName,
+                blockRef: blockUri.toNormalizedString(),
+                instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(blockUri.toNormalizedString()),
+            },
+        });
+    }
+    async verifyAndFixCode(blockUri, blockName, codeGenerator, basePath, filesToBeFixed, allFiles) {
         let attempts = 0;
         let validCode = false;
         for (let i = 0; i <= 3; i++) {
@@ -362,11 +344,17 @@ class StormCodegen {
                 }
                 if (result && !result.valid) {
                     console.debug('Validation error:', result);
+                    this.emitBlockStatus(blockUri, blockName, events_1.StormEventBlockStatusType.PLANNING_FIX);
                     const errors = await this.classifyErrors(result.error, basePath);
-                    for (const [filename, fileErrors] of errors.entries()) {
-                        // todo: only try to fix file if it is part of filesToBeFixed
-                        await this.tryToFixFile(basePath, filename, fileErrors, allFiles, codeGenerator);
+                    if (errors.size > 0) {
+                        this.emitBlockStatus(blockUri, blockName, events_1.StormEventBlockStatusType.FIXING);
+                        const promises = Array.from(errors.entries()).map(([filename, fileErrors]) => {
+                            // todo: only try to fix file if it is part of filesToBeFixed
+                            return this.tryToFixFile(blockUri, blockName, basePath, filename, fileErrors, allFiles, codeGenerator);
+                        });
+                        await Promise.all(promises);
                     }
+                    this.emitBlockStatus(blockUri, blockName, events_1.StormEventBlockStatusType.FIX_DONE);
                 }
             }
             catch (e) {
@@ -380,10 +368,10 @@ class StormCodegen {
             console.error(`Validation failed for ${basePath} after ${attempts} attempts`);
         }
     }
-    async tryToFixFile(basePath, filename, fileErrors, allFiles, codeGenerator) {
+    async tryToFixFile(blockUri, blockName, basePath, filename, fileErrors, allFiles, codeGenerator) {
         console.log(`Processing ${filename}`);
         const language = await codeGenerator.language();
-        const relevantFiles = allFiles.filter(file => file.type != codegen_1.AIFileTypes.IGNORE);
+        const relevantFiles = allFiles.filter((file) => file.type != codegen_1.AIFileTypes.IGNORE);
         for (let attempts = 1; attempts <= 5; attempts++) {
             if (fileErrors.length == 0) {
                 console.log(`No more errors for ${filename}`);
@@ -393,17 +381,17 @@ class StormCodegen {
             const filesForContext = await this.getErrorDetailsForFile(basePath, filename, fileErrors[0], relevantFiles, language);
             console.log(`Get error details for ${filename} requesting code fixes`);
             const fix = this.createFixRequestForFile(basePath, filename, fileErrors[0], filesForContext, relevantFiles, language);
-            const codeFixFiles = await this.codeFix(fix);
+            const codeFixFile = await this.codeFix(blockUri, blockName, fix);
             console.log(`Got fixed code for ${filename}`);
-            for (const codeFixFile of codeFixFiles) {
-                const filePath = codeFixFile.filename.indexOf(basePath) > -1 ? codeFixFile.filename : (0, path_2.join)(basePath, codeFixFile.filename);
-                const existing = (0, fs_1.readFileSync)(filePath);
-                if (existing.toString().replace(/(\r\n|\r|\n)+$/, '') == codeFixFile.content.replace(/(\r\n|\r|\n)+$/, '')) {
-                    console.log(`${filename} not changed by gemini`);
-                    continue;
-                }
-                (0, fs_1.writeFileSync)(filePath, codeFixFile.content);
+            const filePath = codeFixFile.filename.indexOf(basePath) > -1
+                ? codeFixFile.filename
+                : (0, path_2.join)(basePath, codeFixFile.filename);
+            const existing = (0, fs_1.readFileSync)(filePath);
+            if (existing.toString().replace(/(\r\n|\r|\n)+$/, '') == codeFixFile.content.replace(/(\r\n|\r|\n)+$/, '')) {
+                console.log(`${filename} not changed by gemini`);
+                continue;
             }
+            (0, fs_1.writeFileSync)(filePath, codeFixFile.content);
             const result = await codeGenerator.validateForTarget(basePath);
             if (result && result.valid) {
                 return;
@@ -421,7 +409,11 @@ class StormCodegen {
         errorStream.on('data', (evt) => {
             if (evt.type === 'ERROR_CLASSIFIER') {
                 const eventFileName = this.removePrefix(basePath + '/', evt.payload.filename);
-                const fix = { error: evt.payload.error, lineNumber: evt.payload.lineNumber, column: evt.payload.column };
+                const fix = {
+                    error: evt.payload.error,
+                    lineNumber: evt.payload.lineNumber,
+                    column: evt.payload.column,
+                };
                 let existingFixes = fixes.get(eventFileName);
                 if (existingFixes) {
                     existingFixes.push(fix);
@@ -438,24 +430,24 @@ class StormCodegen {
         const filePath = filename.indexOf(basePath) > -1 ? filename : (0, path_2.join)(basePath, filename); // to compensate when compiler returns absolute path
         return new Promise(async (resolve, reject) => {
             const request = {
-                "language": language,
-                "sourceFile": {
-                    "filename": filename,
-                    "content": (0, fs_1.readFileSync)(filePath, 'utf8')
+                language: language,
+                sourceFile: {
+                    filename: filename,
+                    content: (0, fs_1.readFileSync)(filePath, 'utf8'),
                 },
-                "error": error,
-                "projectFiles": allFiles.map(f => f.filename)
+                error: error,
+                projectFiles: allFiles.map((f) => f.filename),
             };
             const detailsStream = await stormClient_1.stormClient.createErrorDetails(JSON.stringify(request), []);
             detailsStream.on('data', (evt) => {
                 if (evt.type === 'ERROR_DETAILS') {
                     resolve(evt.payload.files);
                 }
-                reject(new Error("Error details: Unexpected event [" + evt.type + "]"));
+                reject(new Error('Error details: Unexpected event [' + evt.type + ']'));
             });
             this.out.on('aborted', () => {
                 detailsStream.abort();
-                reject("aborted");
+                reject(new Error('aborted'));
             });
             detailsStream.on('error', (err) => {
                 reject(err);
@@ -466,31 +458,27 @@ class StormCodegen {
     createFixRequestForFile(basePath, filename, error, filesForContext, allFiles, language) {
         const files = new Set(filesForContext);
         files.add(filename);
-        const requestedFiles = Array.from(files).flatMap(file => {
+        const requestedFiles = Array.from(files).flatMap((file) => {
             if (fs.existsSync(file)) {
                 return file;
             }
             // file does not exist - look for similar
             const candidateName = file.split('/').pop();
-            return allFiles
-                .filter(file => file.filename.split('/').pop() === candidateName)
-                .map(f => f.filename);
+            return allFiles.filter((file) => file.filename.split('/').pop() === candidateName).map((f) => f.filename);
         });
         const filePath = filename.indexOf(basePath) > -1 ? filename : (0, path_2.join)(basePath, filename);
         const content = (0, fs_1.readFileSync)(filePath, 'utf8');
         const affectedLine = this.getErrorLine(error, content);
         const fixRequest = {
-            "language": language,
-            "filename": filename,
-            "errors": error.error,
-            "affectedLine": affectedLine,
-            "projectFiles": requestedFiles.map(filename => {
+            language: language,
+            filename: filename,
+            error: error.error,
+            affectedLine: affectedLine,
+            projectFiles: requestedFiles.map((filename) => {
                 const filePath = filename.indexOf(basePath) > -1 ? filename : (0, path_2.join)(basePath, filename);
                 const content = (0, fs_1.readFileSync)(filePath, 'utf8');
                 return { filename: filename, content: content };
             }),
-            "conversationId": this.conversationId,
-            "sessionId": (0, uuid_1.v4)()
         };
         return JSON.stringify(fixRequest);
     }
@@ -498,7 +486,7 @@ class StormCodegen {
         const lines = sourceCode.split('\n');
         const errorLine = lines[errorDetails.lineNumber - 1];
         if (!errorLine) {
-            return "Error: Line number out of range.";
+            return 'Error: Line number out of range.';
         }
         return errorLine;
     }
@@ -511,24 +499,36 @@ class StormCodegen {
     /**
      * Sends the code to the AI for a fix
      */
-    async codeFix(fix, history) {
+    async codeFix(blockUri, blockName, fix, history) {
         return new Promise(async (resolve, reject) => {
-            const fixStream = await stormClient_1.stormClient.createCodeFix(fix, history);
-            fixStream.on('data', (evt) => {
-                if (evt.type === 'CODE_FIX') {
-                    resolve(evt.payload.content.files);
-                }
-                reject(new Error("Error details: Unexpected event [" + evt.type + "]"));
-            });
-            this.out.on('aborted', () => {
-                fixStream.abort();
-                reject("aborted");
-            });
-            fixStream.on('error', (err) => {
-                console.log("error", err);
-                reject(err);
-            });
-            await fixStream.waitForDone();
+            try {
+                const fixStream = await stormClient_1.stormClient.createCodeFix(fix, history, this.conversationId);
+                let resolved = false;
+                fixStream.on('data', (evt) => {
+                    if (this.handleFileEvents(blockUri, blockName, evt)) {
+                        return;
+                    }
+                    if (evt.type === 'CODE_FIX') {
+                        resolved = true;
+                        resolve(evt.payload);
+                    }
+                });
+                this.out.on('aborted', () => {
+                    fixStream.abort();
+                    reject(new Error('aborted'));
+                });
+                fixStream.on('error', (err) => {
+                    reject(err);
+                });
+                fixStream.on('end', () => {
+                    if (!resolved) {
+                        reject(new Error('Code fix never returned a valid event'));
+                    }
+                });
+            }
+            catch (e) {
+                reject(e);
+            }
         });
     }
     /**
@@ -564,7 +564,13 @@ class StormCodegen {
                     instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
                 },
             };
-            return new SimulatedFileDelay(fileEvent, this.out).start();
+            if (ENABLE_SIMULATED_DELAY) {
+                // Simulate a delay when sending the file
+                return new SimulatedFileDelay(fileEvent, this.out).start();
+            }
+            else {
+                this.out.emit('data', fileEvent);
+            }
         });
         return Promise.all(promises);
     }

package/dist/cjs/src/storm/event-parser.js

@@ -292,7 +292,9 @@ class StormEventParser {
                     };
                 }
                 const clientTypes = kaplang_core_1.DSLDataTypeParser.parse(clientConsumerBlock.content.spec.entities.source.value, { ignoreSemantics: true });
-                const apiTypes = kaplang_core_1.DSLDataTypeParser.parse(apiProviderBlock.content.spec.entities?.source?.value, { ignoreSemantics: true });
+                const apiTypes = kaplang_core_1.DSLDataTypeParser.parse(apiProviderBlock.content.spec.entities?.source?.value, {
+                    ignoreSemantics: true,
+                });
                 apiTypes.forEach((apiType) => {
                     if (clientTypes.some((clientType) => clientType.name === apiType.name)) {
                         // Already exists

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

@@ -111,9 +111,8 @@ export interface StormEventCodeFix {
     reason: string;
     created: number;
     payload: {
-        content: {
-            files: StormEventErrorDetailsFile[];
-        };
+        filename: string;
+        content: string;
     };
 }
 export interface StormEventErrorClassifierInfo {
@@ -210,6 +209,24 @@ export interface StormEventBlockReady {
         instanceId: string;
     };
 }
+export declare enum StormEventBlockStatusType {
+    QA = "QA",
+    FIXING = "FIXING",
+    PLANNING_FIX = "PLANNING_FIX",
+    FIX_DONE = "FIX_DONE",
+    BUILDING = "BUILDING"
+}
+export interface StormEventBlockStatus {
+    type: 'BLOCK_STATUS';
+    reason: string;
+    created: number;
+    payload: {
+        status: StormEventBlockStatusType;
+        blockName: string;
+        blockRef: string;
+        instanceId: string;
+    };
+}
 export interface StormEventDone {
     type: 'DONE';
     created: number;
@@ -223,7 +240,8 @@ export interface StormEventDefinitionChange {
 export declare enum StormEventPhaseType {
     META = "META",
     DEFINITIONS = "DEFINITIONS",
-    IMPLEMENTATION = "IMPLEMENTATION"
+    IMPLEMENTATION = "IMPLEMENTATION",
+    QA = "QA"
 }
 export interface StormEventPhases {
     type: 'PHASE_START' | 'PHASE_END';
@@ -232,4 +250,4 @@ export interface StormEventPhases {
         phaseType: StormEventPhaseType;
     };
 }
-export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases;
+export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases | StormEventBlockStatus;

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

@@ -1,9 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StormEventPhaseType = void 0;
+exports.StormEventPhaseType = exports.StormEventBlockStatusType = void 0;
+var StormEventBlockStatusType;
+(function (StormEventBlockStatusType) {
+    StormEventBlockStatusType["QA"] = "QA";
+    StormEventBlockStatusType["FIXING"] = "FIXING";
+    StormEventBlockStatusType["PLANNING_FIX"] = "PLANNING_FIX";
+    StormEventBlockStatusType["FIX_DONE"] = "FIX_DONE";
+    StormEventBlockStatusType["BUILDING"] = "BUILDING";
+})(StormEventBlockStatusType || (exports.StormEventBlockStatusType = StormEventBlockStatusType = {}));
 var StormEventPhaseType;
 (function (StormEventPhaseType) {
     StormEventPhaseType["META"] = "META";
     StormEventPhaseType["DEFINITIONS"] = "DEFINITIONS";
     StormEventPhaseType["IMPLEMENTATION"] = "IMPLEMENTATION";
+    StormEventPhaseType["QA"] = "QA";
 })(StormEventPhaseType || (exports.StormEventPhaseType = StormEventPhaseType = {}));

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

@@ -174,6 +174,7 @@ function sendEvent(res, evt) {
     if (res.closed) {
         return;
     }
+    console.log('Sending event', evt.type);
     res.write(JSON.stringify(evt) + '\n');
 }
 function onRequestAborted(req, res, onAborted) {

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

@@ -66,7 +66,12 @@ class StormClient {
             out.end();
         });
         out.on('aborted', () => {
-            abort.abort();
+            try {
+                abort.abort();
+            }
+            catch (e) {
+                console.warn('Error aborting stream', e);
+            }
         });
         return out;
     }

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

@@ -11,6 +11,7 @@ export declare class StormStream extends EventEmitter {
     private conversationId;
     private lines;
     private aborted;
+    private done;
     constructor(prompt?: string, conversationId?: string | null);
     getConversationId(): string;
     isAborted(): boolean;

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

@@ -10,6 +10,7 @@ class StormStream extends node_events_1.EventEmitter {
     conversationId = '';
     lines = [];
     aborted = false;
+    done = false;
     constructor(prompt = '', conversationId) {
         super();
         this.conversationId = conversationId || '';
@@ -34,6 +35,7 @@ class StormStream extends node_events_1.EventEmitter {
         }
     }
     end() {
+        this.done = true;
         this.emit('end');
     }
     on(event, listener) {
@@ -43,6 +45,9 @@ class StormStream extends node_events_1.EventEmitter {
         return super.emit(eventName, ...args);
     }
     waitForDone() {
+        if (this.done) {
+            return Promise.resolve();
+        }
         return new Promise((resolve, reject) => {
             const errorHandler = (err) => {
                 this.removeListener('error', errorHandler);
@@ -54,8 +59,8 @@ class StormStream extends node_events_1.EventEmitter {
                 this.removeListener('end', endHandler);
                 resolve();
             };
-            this.once('error', errorHandler);
-            this.once('end', endHandler);
+            this.on('error', errorHandler);
+            this.on('end', endHandler);
         });
     }
     abort() {
@@ -63,6 +68,7 @@ class StormStream extends node_events_1.EventEmitter {
             return;
         }
         this.aborted = true;
+        this.done = true;
         this.emit('aborted');
     }
 }

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

@@ -25,6 +25,7 @@ export declare class StormCodegen {
      * Generates the code for a block and sends it to the AI
      */
     private processBlockCode;
+    private emitBlockStatus;
     private verifyAndFixCode;
     private tryToFixFile;
     private classifyErrors;