@kapeta/local-cluster-service 0.51.1 → 0.51.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.51.2](https://github.com/kapetacom/local-cluster-service/compare/v0.51.1...v0.51.2) (2024-06-06)
+
+
+### Bug Fixes
+
+* collect generated screens & write these ([50fa728](https://github.com/kapetacom/local-cluster-service/commit/50fa728fea26c0baad2c37b821602b3ca3c46679))
+* merge errors ([92fae09](https://github.com/kapetacom/local-cluster-service/commit/92fae09bc226e7c6128a0a7ae4123ffe810ebe04))
+
 ## [0.51.1](https://github.com/kapetacom/local-cluster-service/compare/v0.51.0...v0.51.1) (2024-06-05)
 
 

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

@@ -27,7 +27,6 @@ export declare class StormCodegen {
     private processBlockCode;
     private verifyAndFixCode;
     removePrefix(prefix: string, str: string): string;
-    writeToFile(fileName: string, code: Promise<string>): Promise<void>;
     /**
      * Sends the code to the AI for a fix
      */

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

@@ -42,6 +42,7 @@ const path_1 = __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 SIMULATED_DELAY = 1000;
 class SimulatedFileDelay {
     file;
@@ -181,7 +182,7 @@ class StormCodegen {
                 });
                 break;
             case 'FILE_DONE':
-                this.handleFileDoneOutput(blockUri, blockName, data);
+                return this.handleFileDoneOutput(blockUri, blockName, data);
                 break;
         }
     }
@@ -271,6 +272,7 @@ class StormCodegen {
         }
         const relevantFiles = allFiles.filter((file) => file.type !== codegen_1.AIFileTypes.IGNORE && file.type !== codegen_1.AIFileTypes.WEB_SCREEN);
         const uiTemplates = allFiles.filter((file) => file.type === codegen_1.AIFileTypes.WEB_SCREEN);
+        const screenFiles = [];
         if (uiTemplates.length > 0) {
             const uiStream = await stormClient_1.stormClient.createUIImplementation({
                 events: this.events,
@@ -280,7 +282,10 @@ class StormCodegen {
                 prompt: this.userPrompt,
             });
             uiStream.on('data', (evt) => {
-                this.handleUiOutput((0, nodejs_utils_1.parseKapetaUri)(block.uri), block.aiName, evt);
+                const uiFile = this.handleUiOutput((0, nodejs_utils_1.parseKapetaUri)(block.uri), block.aiName, evt);
+                if (uiFile != undefined) {
+                    screenFiles.push(uiFile);
+                }
             });
             this.out.on('aborted', () => {
                 uiStream.abort();
@@ -309,11 +314,23 @@ class StormCodegen {
             const filePath = (0, path_1.join)(basePath, serviceFile.filename);
             await (0, promises_1.writeFile)(filePath, serviceFile.content);
         }
-        for (const uiFile of uiTemplates) {
-            const filePath = (0, path_1.join)(basePath, uiFile.filename);
-            await (0, promises_1.writeFile)(filePath, uiFile.content);
+        const kapetaYmlPath = (0, path_1.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);
+            await (0, promises_1.writeFile)(filePath, screenFile.payload.content);
         }
-        const filesToBeFixed = serviceFiles.concat(contextFiles);
+        const screenFilesConverted = screenFiles.map(screenFile => {
+            return {
+                filename: screenFile.payload.filename,
+                content: screenFile.payload.content,
+                mode: codegen_1.MODE_CREATE_ONLY,
+                permissions: '0644',
+                type: codegen_1.AIFileTypes.WEB_SCREEN,
+            };
+        });
+        const filesToBeFixed = serviceFiles.concat(contextFiles).concat(screenFilesConverted);
+        allFiles.push(...screenFilesConverted);
         const codeGenerator = new codegen_1.BlockCodeGenerator(block.content);
         await this.verifyAndFixCode(codeGenerator, basePath, filesToBeFixed, allFiles);
         const blockRef = block.uri;
@@ -392,11 +409,6 @@ class StormCodegen {
         }
         return str;
     }
-    async writeToFile(fileName, code) {
-        console.log(`writing the fixed code to ${fileName}`);
-        const resolvedCode = await code;
-        (0, fs_1.writeFileSync)(fileName, resolvedCode);
-    }
     /**
      * Sends the code to the AI for a fix
      */

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

@@ -20,14 +20,15 @@ class StormClient {
     constructor() {
         this._baseUrl = (0, utils_1.getRemoteUrl)('ai-service', 'https://ai.kapeta.com');
     }
-    createOptions(path, method, body) {
+    async createOptions(path, method, body) {
         const url = `${this._baseUrl}${path}`;
         const headers = {
             'Content-Type': 'application/json',
         };
         const api = new nodejs_api_client_1.KapetaAPI();
         if (api.hasToken()) {
-            //headers['Authorization'] = `Bearer ${api.getAccessToken()}`; //TODO: Enable authentication
+            const token = await api.getAccessToken();
+            headers['Authorization'] = `Bearer ${token}`;
         }
         if (body.conversationId) {
             headers[exports.ConversationIdHeader] = body.conversationId;
@@ -42,7 +43,7 @@ class StormClient {
     }
     async send(path, body, method = 'POST') {
         const stringPrompt = typeof body.prompt === 'string' ? body.prompt : JSON.stringify(body.prompt);
-        const options = this.createOptions(path, method, {
+        const options = await this.createOptions(path, method, {
             prompt: stringPrompt,
             conversationId: body.conversationId,
         });

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

@@ -27,7 +27,6 @@ export declare class StormCodegen {
     private processBlockCode;
     private verifyAndFixCode;
     removePrefix(prefix: string, str: string): string;
-    writeToFile(fileName: string, code: Promise<string>): Promise<void>;
     /**
      * Sends the code to the AI for a fix
      */

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

@@ -42,6 +42,7 @@ const path_1 = __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 SIMULATED_DELAY = 1000;
 class SimulatedFileDelay {
     file;
@@ -181,7 +182,7 @@ class StormCodegen {
                 });
                 break;
             case 'FILE_DONE':
-                this.handleFileDoneOutput(blockUri, blockName, data);
+                return this.handleFileDoneOutput(blockUri, blockName, data);
                 break;
         }
     }
@@ -271,6 +272,7 @@ class StormCodegen {
         }
         const relevantFiles = allFiles.filter((file) => file.type !== codegen_1.AIFileTypes.IGNORE && file.type !== codegen_1.AIFileTypes.WEB_SCREEN);
         const uiTemplates = allFiles.filter((file) => file.type === codegen_1.AIFileTypes.WEB_SCREEN);
+        const screenFiles = [];
         if (uiTemplates.length > 0) {
             const uiStream = await stormClient_1.stormClient.createUIImplementation({
                 events: this.events,
@@ -280,7 +282,10 @@ class StormCodegen {
                 prompt: this.userPrompt,
             });
             uiStream.on('data', (evt) => {
-                this.handleUiOutput((0, nodejs_utils_1.parseKapetaUri)(block.uri), block.aiName, evt);
+                const uiFile = this.handleUiOutput((0, nodejs_utils_1.parseKapetaUri)(block.uri), block.aiName, evt);
+                if (uiFile != undefined) {
+                    screenFiles.push(uiFile);
+                }
             });
             this.out.on('aborted', () => {
                 uiStream.abort();
@@ -309,11 +314,23 @@ class StormCodegen {
             const filePath = (0, path_1.join)(basePath, serviceFile.filename);
             await (0, promises_1.writeFile)(filePath, serviceFile.content);
         }
-        for (const uiFile of uiTemplates) {
-            const filePath = (0, path_1.join)(basePath, uiFile.filename);
-            await (0, promises_1.writeFile)(filePath, uiFile.content);
+        const kapetaYmlPath = (0, path_1.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);
+            await (0, promises_1.writeFile)(filePath, screenFile.payload.content);
         }
-        const filesToBeFixed = serviceFiles.concat(contextFiles);
+        const screenFilesConverted = screenFiles.map(screenFile => {
+            return {
+                filename: screenFile.payload.filename,
+                content: screenFile.payload.content,
+                mode: codegen_1.MODE_CREATE_ONLY,
+                permissions: '0644',
+                type: codegen_1.AIFileTypes.WEB_SCREEN,
+            };
+        });
+        const filesToBeFixed = serviceFiles.concat(contextFiles).concat(screenFilesConverted);
+        allFiles.push(...screenFilesConverted);
         const codeGenerator = new codegen_1.BlockCodeGenerator(block.content);
         await this.verifyAndFixCode(codeGenerator, basePath, filesToBeFixed, allFiles);
         const blockRef = block.uri;
@@ -392,11 +409,6 @@ class StormCodegen {
         }
         return str;
     }
-    async writeToFile(fileName, code) {
-        console.log(`writing the fixed code to ${fileName}`);
-        const resolvedCode = await code;
-        (0, fs_1.writeFileSync)(fileName, resolvedCode);
-    }
     /**
      * Sends the code to the AI for a fix
      */

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

@@ -20,14 +20,15 @@ class StormClient {
     constructor() {
         this._baseUrl = (0, utils_1.getRemoteUrl)('ai-service', 'https://ai.kapeta.com');
     }
-    createOptions(path, method, body) {
+    async createOptions(path, method, body) {
         const url = `${this._baseUrl}${path}`;
         const headers = {
             'Content-Type': 'application/json',
         };
         const api = new nodejs_api_client_1.KapetaAPI();
         if (api.hasToken()) {
-            //headers['Authorization'] = `Bearer ${api.getAccessToken()}`; //TODO: Enable authentication
+            const token = await api.getAccessToken();
+            headers['Authorization'] = `Bearer ${token}`;
         }
         if (body.conversationId) {
             headers[exports.ConversationIdHeader] = body.conversationId;
@@ -42,7 +43,7 @@ class StormClient {
     }
     async send(path, body, method = 'POST') {
         const stringPrompt = typeof body.prompt === 'string' ? body.prompt : JSON.stringify(body.prompt);
-        const options = this.createOptions(path, method, {
+        const options = await this.createOptions(path, method, {
             prompt: stringPrompt,
             conversationId: body.conversationId,
         });

package/package.json

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

package/src/storm/codegen.ts

@@ -11,6 +11,7 @@ import {
     CodeWriter,
     GeneratedFile,
     GeneratedResult,
+    MODE_CREATE_ONLY,
 } from '@kapeta/codegen';
 import { BlockDefinition } from '@kapeta/schemas';
 import { codeGeneratorManager } from '../codeGeneratorManager';
@@ -24,6 +25,7 @@ import path, { join } from 'path';
 import os from 'node:os';
 import { readFile, readFileSync, writeFileSync } from 'fs';
 import Path from 'path';
+import YAML from "yaml";
 
 type ImplementationGenerator = (prompt: StormFileImplementationPrompt, conversationId?: string) => Promise<StormStream>;
 
@@ -128,7 +130,7 @@ export class StormCodegen {
         }
     }
 
-    private handleUiOutput(blockUri: KapetaURI, blockName: string, data: StormEvent) {
+    private handleUiOutput(blockUri: KapetaURI, blockName: string, data: StormEvent): StormEventFileDone | undefined {
         const blockRef = blockUri.toNormalizedString();
         const instanceId = StormEventParser.toInstanceIdFromRef(blockRef);
 
@@ -185,7 +187,7 @@ export class StormCodegen {
                 });
                 break;
             case 'FILE_DONE':
-                this.handleFileDoneOutput(blockUri, blockName, data);
+                return this.handleFileDoneOutput(blockUri, blockName, data);
                 break;
         }
     }
@@ -286,6 +288,7 @@ export class StormCodegen {
             (file) => file.type !== AIFileTypes.IGNORE && file.type !== AIFileTypes.WEB_SCREEN
         );
         const uiTemplates: StormFileInfo[] = allFiles.filter((file) => file.type === AIFileTypes.WEB_SCREEN);
+        const screenFiles: StormEventFileDone[] = [];
         if (uiTemplates.length > 0) {
             const uiStream = await stormClient.createUIImplementation({
                 events: this.events,
@@ -296,7 +299,10 @@ export class StormCodegen {
             });
 
             uiStream.on('data', (evt) => {
-                this.handleUiOutput(parseKapetaUri(block.uri), block.aiName, evt);
+                const uiFile = this.handleUiOutput(parseKapetaUri(block.uri), block.aiName, evt);
+                if (uiFile != undefined) {
+                    screenFiles.push(uiFile);
+                }
             });
 
             this.out.on('aborted', () => {
@@ -343,12 +349,25 @@ export class StormCodegen {
             await writeFile(filePath, serviceFile.content);
         }
 
-        for (const uiFile of uiTemplates) {
-            const filePath = join(basePath, uiFile.filename);
-            await writeFile(filePath, uiFile.content);
+        const kapetaYmlPath = join(basePath, 'kapeta.yml');
+        await writeFile(kapetaYmlPath, YAML.stringify(block.content as BlockDefinition));
+
+        for (const screenFile of screenFiles) {
+            const filePath = join(basePath, screenFile.payload.filename);
+            await writeFile(filePath, screenFile.payload.content);
         }
 
-        const filesToBeFixed = serviceFiles.concat(contextFiles);
+        const screenFilesConverted = screenFiles.map(screenFile => {
+            return {
+                filename: screenFile.payload.filename,
+                content: screenFile.payload.content,
+                mode: MODE_CREATE_ONLY,
+                permissions: '0644',
+                type: AIFileTypes.WEB_SCREEN,
+            };
+        });
+        const filesToBeFixed = serviceFiles.concat(contextFiles).concat(screenFilesConverted);
+        allFiles.push(...screenFilesConverted);
         const codeGenerator = new BlockCodeGenerator(block.content as BlockDefinition);
         await this.verifyAndFixCode(codeGenerator, basePath, filesToBeFixed, allFiles);
 
@@ -439,11 +458,7 @@ export class StormCodegen {
         }
         return str;
     }
-    async writeToFile(fileName: string, code: Promise<string>) {
-        console.log(`writing the fixed code to ${fileName}`);
-        const resolvedCode = await code;
-        writeFileSync(fileName, resolvedCode);
-    }
+
     /**
      * Sends the code to the AI for a fix
      */

package/src/storm/stormClient.ts

@@ -26,14 +26,15 @@ class StormClient {
         this._baseUrl = getRemoteUrl('ai-service', 'https://ai.kapeta.com');
     }
 
-    private createOptions(path: string, method: string, body: StormContextRequest): RequestInit & { url: string } {
+    private async createOptions(path: string, method: string, body: StormContextRequest): Promise<RequestInit & { url: string }> {
         const url = `${this._baseUrl}${path}`;
         const headers: { [k: string]: string } = {
             'Content-Type': 'application/json',
         };
         const api = new KapetaAPI();
         if (api.hasToken()) {
-            //headers['Authorization'] = `Bearer ${api.getAccessToken()}`; //TODO: Enable authentication
+            const token = await api.getAccessToken();
+            headers['Authorization'] = `Bearer ${token}`;
         }
 
         if (body.conversationId) {
@@ -56,7 +57,7 @@ class StormClient {
     ): Promise<StormStream> {
         const stringPrompt = typeof body.prompt === 'string' ? body.prompt : JSON.stringify(body.prompt);
 
-        const options = this.createOptions(path, method, {
+        const options = await this.createOptions(path, method, {
             prompt: stringPrompt,
             conversationId: body.conversationId,
         });