@kapeta/local-cluster-service 0.52.0 → 0.52.2

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

@@ -38,11 +38,13 @@ const event_parser_1 = require("./event-parser");
 const stream_1 = require("./stream");
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const promises_1 = require("fs/promises");
-const path_1 = __importStar(require("path"));
+const path_1 = __importDefault(require("path"));
+const path_2 = __importStar(require("path"));
 const node_os_1 = __importDefault(require("node:os"));
 const fs_1 = require("fs");
-const path_2 = __importDefault(require("path"));
 const yaml_1 = __importDefault(require("yaml"));
+const fs = __importStar(require("node:fs"));
+const uuid_1 = require("uuid");
 const SIMULATED_DELAY = 1000;
 class SimulatedFileDelay {
     file;
@@ -197,7 +199,7 @@ class StormCodegen {
                     ...data,
                     payload: {
                         ...data.payload,
-                        path: (0, path_1.join)(basePath, data.payload.filename),
+                        path: (0, path_2.join)(basePath, data.payload.filename),
                         blockName,
                         blockRef,
                         instanceId,
@@ -209,7 +211,7 @@ class StormCodegen {
                     ...data,
                     payload: {
                         ...data.payload,
-                        path: (0, path_1.join)(basePath, data.payload.filename),
+                        path: (0, path_2.join)(basePath, data.payload.filename),
                         blockName,
                         blockRef,
                         instanceId,
@@ -221,7 +223,7 @@ class StormCodegen {
                     ...data,
                     payload: {
                         ...data.payload,
-                        path: (0, path_1.join)(basePath, data.payload.filename),
+                        path: (0, path_2.join)(basePath, data.payload.filename),
                         blockName,
                         blockRef,
                         instanceId,
@@ -241,7 +243,7 @@ class StormCodegen {
                     created: Date.now(),
                     payload: {
                         filename: data.payload.filename,
-                        path: (0, path_1.join)(this.getBasePath(blockUri.fullName), data.payload.filename),
+                        path: (0, path_2.join)(this.getBasePath(blockUri.fullName), data.payload.filename),
                         content: data.payload.content,
                         blockRef: ref,
                         instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
@@ -297,7 +299,7 @@ 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));
-        // Send the service and UI templates to the AI. These will be send one-by-one in addition to the context files
+        // 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);
@@ -307,17 +309,17 @@ class StormCodegen {
             return;
         }
         for (const serviceFile of serviceFiles) {
-            const filePath = (0, path_1.join)(basePath, serviceFile.filename);
+            const filePath = (0, path_2.join)(basePath, serviceFile.filename);
             await (0, promises_1.writeFile)(filePath, serviceFile.content);
         }
         for (const serviceFile of contextFiles) {
-            const filePath = (0, path_1.join)(basePath, serviceFile.filename);
+            const filePath = (0, path_2.join)(basePath, serviceFile.filename);
             await (0, promises_1.writeFile)(filePath, serviceFile.content);
         }
-        const kapetaYmlPath = (0, path_1.join)(basePath, 'kapeta.yml');
+        const kapetaYmlPath = (0, path_2.join)(basePath, 'kapeta.yml');
         await (0, promises_1.writeFile)(kapetaYmlPath, yaml_1.default.stringify(block.content));
         for (const screenFile of screenFiles) {
-            const filePath = (0, path_1.join)(basePath, screenFile.payload.filename);
+            const filePath = (0, path_2.join)(basePath, screenFile.payload.filename);
             await (0, promises_1.writeFile)(filePath, screenFile.payload.content);
         }
         const screenFilesConverted = screenFiles.map(screenFile => {
@@ -329,8 +331,8 @@ class StormCodegen {
                 type: codegen_1.AIFileTypes.WEB_SCREEN,
             };
         });
-        const filesToBeFixed = serviceFiles.concat(contextFiles).concat(screenFilesConverted);
         allFiles.push(...screenFilesConverted);
+        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;
@@ -346,7 +348,7 @@ class StormCodegen {
             },
         });
     }
-    async verifyAndFixCode(codeGenerator, basePath, filesToBeFixed, knownFiles) {
+    async verifyAndFixCode(codeGenerator, basePath, filesToBeFixed, allFiles) {
         let attempts = 0;
         let validCode = false;
         for (let i = 0; i <= 3; i++) {
@@ -360,35 +362,10 @@ class StormCodegen {
                 }
                 if (result && !result.valid) {
                     console.debug('Validation error:', result);
-                    const errorStream = await stormClient_1.stormClient.createErrorClassification(result.error, []);
-                    const fixes = new Map();
-                    this.out.on('aborted', () => {
-                        errorStream.abort();
-                    });
-                    errorStream.on('data', (evt) => {
-                        if (evt.type === 'ERROR_CLASSIFIER') {
-                            // find the file that caused the error
-                            // strip base path from event file name, if it exists sometimes the AI sends the full path
-                            const eventFileName = this.removePrefix(basePath + '/', evt.payload.filename);
-                            const file = filesToBeFixed.find((f) => f.filename === eventFileName);
-                            if (!file) {
-                                console.log(`Could not find the file ${eventFileName} in the list of files to be fixed, Henrik might wanna create a new file for this fix`);
-                            }
-                            // read the content of the file
-                            const content = (0, fs_1.readFileSync)((0, path_1.join)(basePath, eventFileName), 'utf8');
-                            const fix = `${evt.payload.potentialFix}\n---\n${knownFiles
-                                .map((e) => e.filename)
-                                .join('\n')}\n---\n${content}`;
-                            //console.log(`trying to fix the code in ${eventFileName}`);
-                            //console.debug(`with the fix:\n${fix}`);
-                            const code = this.codeFix(fix);
-                            fixes.set((0, path_1.join)(basePath, eventFileName), code);
-                        }
-                    });
-                    await errorStream.waitForDone();
-                    for (const [filename, codePromise] of fixes) {
-                        const code = await codePromise;
-                        (0, fs_1.writeFileSync)(filename, code);
+                    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);
                     }
                 }
             }
@@ -403,6 +380,127 @@ class StormCodegen {
             console.error(`Validation failed for ${basePath} after ${attempts} attempts`);
         }
     }
+    async tryToFixFile(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);
+        for (let attempts = 1; attempts <= 5; attempts++) {
+            if (fileErrors.length == 0) {
+                console.log(`No more errors for ${filename}`);
+                return;
+            }
+            console.log(`Errors in ${filename} - requesting error details`);
+            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);
+            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 result = await codeGenerator.validateForTarget(basePath);
+            if (result && result.valid) {
+                return;
+            }
+            const errors = await this.classifyErrors(result.error, basePath);
+            fileErrors = errors.get(filename) ?? [];
+        }
+    }
+    async classifyErrors(errors, basePath) {
+        const errorStream = await stormClient_1.stormClient.createErrorClassification(errors, []);
+        const fixes = new Map();
+        this.out.on('aborted', () => {
+            errorStream.abort();
+        });
+        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 };
+                let existingFixes = fixes.get(eventFileName);
+                if (existingFixes) {
+                    existingFixes.push(fix);
+                }
+                else {
+                    fixes.set(eventFileName, [fix]);
+                }
+            }
+        });
+        await errorStream.waitForDone();
+        return fixes;
+    }
+    async getErrorDetailsForFile(basePath, filename, error, allFiles, language) {
+        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')
+                },
+                "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);
+                }
+            });
+            this.out.on('aborted', () => {
+                detailsStream.abort();
+            });
+            detailsStream.on('error', (err) => {
+                console.log("error", err);
+                reject(err);
+            });
+            await detailsStream.waitForDone();
+        });
+    }
+    createFixRequestForFile(basePath, filename, error, filesForContext, allFiles, language) {
+        const files = new Set(filesForContext);
+        files.add(filename);
+        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);
+        });
+        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 => {
+                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);
+    }
+    getErrorLine(errorDetails, sourceCode) {
+        const lines = sourceCode.split('\n');
+        const errorLine = lines[errorDetails.lineNumber - 1];
+        if (!errorLine) {
+            return "Error: Line number out of range.";
+        }
+        return errorLine;
+    }
     removePrefix(prefix, str) {
         if (str.startsWith(prefix)) {
             return str.slice(prefix.length);
@@ -412,18 +510,19 @@ class StormCodegen {
     /**
      * Sends the code to the AI for a fix
      */
-    async codeFix(fix) {
+    async codeFix(fix, history) {
         return new Promise(async (resolve, reject) => {
-            const fixStream = await stormClient_1.stormClient.createCodeFix(fix, []);
+            const fixStream = await stormClient_1.stormClient.createCodeFix(fix, history);
             fixStream.on('data', (evt) => {
                 if (evt.type === 'CODE_FIX') {
-                    resolve(evt.payload.content);
+                    resolve(evt.payload.content.files);
                 }
             });
             this.out.on('aborted', () => {
                 fixStream.abort();
             });
             fixStream.on('error', (err) => {
+                console.log("error", err);
                 reject(err);
             });
             await fixStream.waitForDone();
@@ -455,7 +554,7 @@ class StormCodegen {
                 created: Date.now(),
                 payload: {
                     filename: file.filename,
-                    path: (0, path_1.join)(basePath, file.filename),
+                    path: (0, path_2.join)(basePath, file.filename),
                     content: file.content,
                     blockName: aiName,
                     blockRef: ref,
@@ -475,7 +574,7 @@ class StormCodegen {
             created: Date.now(),
             payload: {
                 filename: filename,
-                path: (0, path_1.join)(basePath, filename),
+                path: (0, path_2.join)(basePath, filename),
                 content: content,
                 blockName,
                 blockRef: ref,

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

@@ -111,14 +111,28 @@ export interface StormEventCodeFix {
     reason: string;
     created: number;
     payload: {
-        filename: string;
-        content: string;
+        content: {
+            files: StormEventErrorDetailsFile[];
+        };
     };
 }
 export interface StormEventErrorClassifierInfo {
     error: string;
     filename: string;
-    potentialFix: string;
+    lineNumber: number;
+    column: number;
+}
+export interface StormEventErrorDetailsFile {
+    filename: string;
+    content: string;
+}
+export interface StormEventErrorDetails {
+    type: 'ERROR_DETAILS';
+    reason: string;
+    created: number;
+    payload: {
+        files: string[];
+    };
 }
 export interface ScreenTemplate {
     name: string;
@@ -218,4 +232,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 | 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;

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

@@ -121,7 +121,6 @@ router.post('/block/create', async (req, res) => {
         res.send(asset);
     }
     catch (err) {
-        console.error('err');
         res.status(500).send({ error: err.message });
     }
 });
@@ -161,26 +160,14 @@ function sendError(err, res) {
     }
 }
 function waitForStormStream(result) {
-    return new Promise((resolve, reject) => {
-        result.on('error', (err) => {
-            reject(err);
-        });
-        result.on('end', () => {
-            resolve();
-        });
-    });
+    return result.waitForDone();
 }
 function streamStormPartialResponse(result, res) {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
         result.on('data', (data) => {
             sendEvent(res, data);
         });
-        result.on('error', (err) => {
-            reject(err);
-        });
-        result.on('end', () => {
-            resolve();
-        });
+        resolve(result.waitForDone());
     });
 }
 function sendEvent(res, evt) {

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

@@ -11,6 +11,7 @@ declare class StormClient {
     createServiceImplementation(prompt: StormFileImplementationPrompt, conversationId?: string): Promise<StormStream>;
     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>;
 }
 export declare const stormClient: StormClient;
 export {};

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

@@ -100,5 +100,11 @@ class StormClient {
             prompt,
         });
     }
+    createErrorDetails(prompt, history, conversationId) {
+        return this.send('/v2/code/errordetails', {
+            conversationId: conversationId,
+            prompt,
+        });
+    }
 }
 exports.stormClient = new StormClient();

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

@@ -44,12 +44,18 @@ class StormStream extends node_events_1.EventEmitter {
     }
     waitForDone() {
         return new Promise((resolve, reject) => {
-            this.on('error', (err) => {
+            const errorHandler = (err) => {
+                this.removeListener('error', errorHandler);
+                this.removeListener('end', endHandler);
                 reject(err);
-            });
-            this.on('end', () => {
+            };
+            const endHandler = () => {
+                this.removeListener('error', errorHandler);
+                this.removeListener('end', endHandler);
                 resolve();
-            });
+            };
+            this.once('error', errorHandler);
+            this.once('end', endHandler);
         });
     }
     abort() {

package/package.json

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