@kapeta/local-cluster-service 0.48.1 → 0.48.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.48.2](https://github.com/kapetacom/local-cluster-service/compare/v0.48.1...v0.48.2) (2024-06-03)
+
+
+### Bug Fixes
+
+* Include resource name for api and model ([#157](https://github.com/kapetacom/local-cluster-service/issues/157)) ([b79a704](https://github.com/kapetacom/local-cluster-service/commit/b79a704b74d11cb0ec0fc8346e29ed754b39fb12))
+
 ## [0.48.1](https://github.com/kapetacom/local-cluster-service/compare/v0.48.0...v0.48.1) (2024-06-03)
 
 

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

@@ -10,12 +10,14 @@ export declare class StormCodegen {
     private readonly blocks;
     private readonly out;
     private readonly events;
+    private readonly tmpDir;
     constructor(userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[]);
     process(): Promise<void>;
     getStream(): StormStream;
     private handleTemplateFileOutput;
     private handleUiOutput;
     private handleFileOutput;
+    private getBasePath;
     /**
      * Generates the code for a block and sends it to the AI
      */

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

@@ -43,10 +43,12 @@ class StormCodegen {
     blocks;
     out = new stream_1.StormStream();
     events;
+    tmpDir;
     constructor(userPrompt, blocks, events) {
         this.userPrompt = userPrompt;
         this.blocks = blocks;
         this.events = events;
+        this.tmpDir = node_os_1.default.tmpdir();
     }
     async process() {
         for (const block of this.blocks) {
@@ -95,6 +97,9 @@ class StormCodegen {
                 };
         }
     }
+    getBasePath(blockName) {
+        return path_1.default.join(this.tmpDir, blockName);
+    }
     /**
      * Generates the code for a block and sends it to the AI
      */
@@ -129,7 +134,7 @@ class StormCodegen {
         if (serviceFiles.length > 0) {
             await this.processTemplates(block.uri, block.aiName, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
         }
-        const basePath = path_1.default.join(node_os_1.default.tmpdir(), block.content.metadata.name);
+        const basePath = this.getBasePath(block.content.metadata.name);
         for (const serviceFile of serviceFiles) {
             const filePath = (0, path_1.join)(basePath, serviceFile.filename);
             await (0, promises_1.writeFile)(filePath, serviceFile.content);
@@ -165,12 +170,14 @@ class StormCodegen {
         });
     }
     emitFile(uri, blockName, filename, content, reason = 'File generated') {
+        const basePath = this.getBasePath(uri.fullName);
         this.out.emit('data', {
             type: 'FILE',
             reason,
             created: Date.now(),
             payload: {
                 filename: filename,
+                path: (0, path_1.join)(basePath, filename),
                 content: content,
                 blockName,
                 blockRef: uri.toNormalizedString(),
@@ -245,7 +252,7 @@ class StormCodegen {
         if (!(await codeGeneratorManager_1.codeGeneratorManager.ensureTarget(yamlContent.spec.target?.kind))) {
             return;
         }
-        const basePath = path_1.default.join(node_os_1.default.tmpdir(), yamlContent.metadata.name);
+        const basePath = this.getBasePath(yamlContent.metadata.name);
         const codeGenerator = new codegen_1.BlockCodeGenerator(yamlContent);
         codeGenerator.withOption('AIContext', stormClient_1.STORM_ID);
         const generatedResult = await codeGenerator.generate();

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

@@ -126,7 +126,9 @@ class StormEventParser {
      * Builds plan and block definitions - and enriches events with relevant refs and ids
      */
     processEvent(handle, evt) {
+        let blockInfo;
         this.events.push(evt);
+        console.log('Processing event: %s', evt.type);
         switch (evt.type) {
             case 'CREATE_PLAN_PROPERTIES':
                 this.planName = evt.payload.name;
@@ -150,17 +152,23 @@ class StormEventParser {
                 this.error = evt.payload.error;
                 break;
             case 'CREATE_API':
-                this.blocks[evt.payload.blockName].apis.push(prettifyKaplang(evt.payload.content));
+                blockInfo = this.blocks[evt.payload.blockName];
+                blockInfo.apis.push(prettifyKaplang(evt.payload.content));
                 evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
                 evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                const api = blockInfo.resources.find((r) => r.type == 'API');
+                evt.payload.resourceName = api?.name;
                 break;
-            case 'CREATE_TYPE':
-                this.blocks[evt.payload.blockName].types.push(prettifyKaplang(evt.payload.content));
+            case 'CREATE_MODEL':
+                blockInfo = this.blocks[evt.payload.blockName];
+                blockInfo.models.push(prettifyKaplang(evt.payload.content));
                 evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
                 evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                const database = blockInfo.resources.find((r) => r.type == 'DATABASE');
+                evt.payload.resourceName = database?.name;
                 break;
-            case 'CREATE_MODEL':
-                this.blocks[evt.payload.blockName].models.push(prettifyKaplang(evt.payload.content));
+            case 'CREATE_TYPE':
+                this.blocks[evt.payload.blockName].types.push(prettifyKaplang(evt.payload.content));
                 evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
                 evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
                 break;

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

@@ -70,7 +70,7 @@ export interface StormEventPlanRetry {
     };
 }
 export interface StormEventCreateDSL {
-    type: 'CREATE_API' | 'CREATE_TYPE' | 'CREATE_MODEL';
+    type: 'CREATE_TYPE';
     reason: string;
     created: number;
     payload: {
@@ -80,6 +80,18 @@ export interface StormEventCreateDSL {
         instanceId?: string;
     };
 }
+export interface StormEventCreateDSLResource extends Omit<StormEventCreateDSL, 'type'> {
+    type: 'CREATE_API' | 'CREATE_MODEL';
+    reason: string;
+    created: number;
+    payload: {
+        blockName: string;
+        content: string;
+        blockRef?: string;
+        instanceId?: string;
+        resourceName?: string;
+    };
+}
 export interface StormEventError {
     type: 'INVALID_RESPONSE' | 'ERROR_INTERNAL';
     reason: string;
@@ -122,6 +134,7 @@ export interface StormEventFile {
     created: number;
     payload: {
         filename: string;
+        path: string;
         content: string;
         blockName: string;
         blockRef: string;
@@ -137,4 +150,4 @@ export interface StormEventDefinitionChange {
     created: number;
     payload: StormDefinitions;
 }
-export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFile | StormEventDone | StormEventDefinitionChange;
+export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFile | StormEventDone | StormEventDefinitionChange;

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

@@ -10,12 +10,14 @@ export declare class StormCodegen {
     private readonly blocks;
     private readonly out;
     private readonly events;
+    private readonly tmpDir;
     constructor(userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[]);
     process(): Promise<void>;
     getStream(): StormStream;
     private handleTemplateFileOutput;
     private handleUiOutput;
     private handleFileOutput;
+    private getBasePath;
     /**
      * Generates the code for a block and sends it to the AI
      */

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

@@ -43,10 +43,12 @@ class StormCodegen {
     blocks;
     out = new stream_1.StormStream();
     events;
+    tmpDir;
     constructor(userPrompt, blocks, events) {
         this.userPrompt = userPrompt;
         this.blocks = blocks;
         this.events = events;
+        this.tmpDir = node_os_1.default.tmpdir();
     }
     async process() {
         for (const block of this.blocks) {
@@ -95,6 +97,9 @@ class StormCodegen {
                 };
         }
     }
+    getBasePath(blockName) {
+        return path_1.default.join(this.tmpDir, blockName);
+    }
     /**
      * Generates the code for a block and sends it to the AI
      */
@@ -129,7 +134,7 @@ class StormCodegen {
         if (serviceFiles.length > 0) {
             await this.processTemplates(block.uri, block.aiName, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
         }
-        const basePath = path_1.default.join(node_os_1.default.tmpdir(), block.content.metadata.name);
+        const basePath = this.getBasePath(block.content.metadata.name);
         for (const serviceFile of serviceFiles) {
             const filePath = (0, path_1.join)(basePath, serviceFile.filename);
             await (0, promises_1.writeFile)(filePath, serviceFile.content);
@@ -165,12 +170,14 @@ class StormCodegen {
         });
     }
     emitFile(uri, blockName, filename, content, reason = 'File generated') {
+        const basePath = this.getBasePath(uri.fullName);
         this.out.emit('data', {
             type: 'FILE',
             reason,
             created: Date.now(),
             payload: {
                 filename: filename,
+                path: (0, path_1.join)(basePath, filename),
                 content: content,
                 blockName,
                 blockRef: uri.toNormalizedString(),
@@ -245,7 +252,7 @@ class StormCodegen {
         if (!(await codeGeneratorManager_1.codeGeneratorManager.ensureTarget(yamlContent.spec.target?.kind))) {
             return;
         }
-        const basePath = path_1.default.join(node_os_1.default.tmpdir(), yamlContent.metadata.name);
+        const basePath = this.getBasePath(yamlContent.metadata.name);
         const codeGenerator = new codegen_1.BlockCodeGenerator(yamlContent);
         codeGenerator.withOption('AIContext', stormClient_1.STORM_ID);
         const generatedResult = await codeGenerator.generate();

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

@@ -126,7 +126,9 @@ class StormEventParser {
      * Builds plan and block definitions - and enriches events with relevant refs and ids
      */
     processEvent(handle, evt) {
+        let blockInfo;
         this.events.push(evt);
+        console.log('Processing event: %s', evt.type);
         switch (evt.type) {
             case 'CREATE_PLAN_PROPERTIES':
                 this.planName = evt.payload.name;
@@ -150,17 +152,23 @@ class StormEventParser {
                 this.error = evt.payload.error;
                 break;
             case 'CREATE_API':
-                this.blocks[evt.payload.blockName].apis.push(prettifyKaplang(evt.payload.content));
+                blockInfo = this.blocks[evt.payload.blockName];
+                blockInfo.apis.push(prettifyKaplang(evt.payload.content));
                 evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
                 evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                const api = blockInfo.resources.find((r) => r.type == 'API');
+                evt.payload.resourceName = api?.name;
                 break;
-            case 'CREATE_TYPE':
-                this.blocks[evt.payload.blockName].types.push(prettifyKaplang(evt.payload.content));
+            case 'CREATE_MODEL':
+                blockInfo = this.blocks[evt.payload.blockName];
+                blockInfo.models.push(prettifyKaplang(evt.payload.content));
                 evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
                 evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+                const database = blockInfo.resources.find((r) => r.type == 'DATABASE');
+                evt.payload.resourceName = database?.name;
                 break;
-            case 'CREATE_MODEL':
-                this.blocks[evt.payload.blockName].models.push(prettifyKaplang(evt.payload.content));
+            case 'CREATE_TYPE':
+                this.blocks[evt.payload.blockName].types.push(prettifyKaplang(evt.payload.content));
                 evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
                 evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
                 break;

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

@@ -70,7 +70,7 @@ export interface StormEventPlanRetry {
     };
 }
 export interface StormEventCreateDSL {
-    type: 'CREATE_API' | 'CREATE_TYPE' | 'CREATE_MODEL';
+    type: 'CREATE_TYPE';
     reason: string;
     created: number;
     payload: {
@@ -80,6 +80,18 @@ export interface StormEventCreateDSL {
         instanceId?: string;
     };
 }
+export interface StormEventCreateDSLResource extends Omit<StormEventCreateDSL, 'type'> {
+    type: 'CREATE_API' | 'CREATE_MODEL';
+    reason: string;
+    created: number;
+    payload: {
+        blockName: string;
+        content: string;
+        blockRef?: string;
+        instanceId?: string;
+        resourceName?: string;
+    };
+}
 export interface StormEventError {
     type: 'INVALID_RESPONSE' | 'ERROR_INTERNAL';
     reason: string;
@@ -122,6 +134,7 @@ export interface StormEventFile {
     created: number;
     payload: {
         filename: string;
+        path: string;
         content: string;
         blockName: string;
         blockRef: string;
@@ -137,4 +150,4 @@ export interface StormEventDefinitionChange {
     created: number;
     payload: StormDefinitions;
 }
-export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFile | StormEventDone | StormEventDefinitionChange;
+export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFile | StormEventDone | StormEventDefinitionChange;

package/package.json

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

package/src/storm/codegen.ts

@@ -23,11 +23,13 @@ export class StormCodegen {
     private readonly blocks: BlockDefinitionInfo[];
     private readonly out = new StormStream();
     private readonly events: StormEvent[];
+    private readonly tmpDir: string;
 
     constructor(userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[]) {
         this.userPrompt = userPrompt;
         this.blocks = blocks;
         this.events = events;
+        this.tmpDir = os.tmpdir();
     }
 
     public async process() {
@@ -83,6 +85,10 @@ export class StormCodegen {
         }
     }
 
+    private getBasePath(blockName: string) {
+        return path.join(this.tmpDir, blockName);
+    }
+
     /**
      * Generates the code for a block and sends it to the AI
      */
@@ -135,7 +141,7 @@ export class StormCodegen {
             );
         }
 
-        const basePath = path.join(os.tmpdir(), block.content.metadata.name);
+        const basePath = this.getBasePath(block.content.metadata.name);
 
         for (const serviceFile of serviceFiles) {
             const filePath = join(basePath, serviceFile.filename);
@@ -185,12 +191,15 @@ export class StormCodegen {
         content: string,
         reason: string = 'File generated'
     ) {
+        const basePath = this.getBasePath(uri.fullName);
+
         this.out.emit('data', {
             type: 'FILE',
             reason,
             created: Date.now(),
             payload: {
                 filename: filename,
+                path: join(basePath, filename),
                 content: content,
                 blockName,
                 blockRef: uri.toNormalizedString(),
@@ -283,7 +292,7 @@ export class StormCodegen {
         if (!(await codeGeneratorManager.ensureTarget(yamlContent.spec.target?.kind))) {
             return;
         }
-        const basePath = path.join(os.tmpdir(), yamlContent.metadata.name);
+        const basePath = this.getBasePath(yamlContent.metadata.name);
 
         const codeGenerator = new BlockCodeGenerator(yamlContent as BlockDefinition);
         codeGenerator.withOption('AIContext', STORM_ID);

package/src/storm/event-parser.ts

@@ -225,7 +225,9 @@ export class StormEventParser {
      * Builds plan and block definitions - and enriches events with relevant refs and ids
      */
     public processEvent(handle: string, evt: StormEvent): StormDefinitions {
+        let blockInfo;
         this.events.push(evt);
+        console.log('Processing event: %s', evt.type);
         switch (evt.type) {
             case 'CREATE_PLAN_PROPERTIES':
                 this.planName = evt.payload.name;
@@ -249,17 +251,26 @@ export class StormEventParser {
                 this.error = evt.payload.error;
                 break;
             case 'CREATE_API':
-                this.blocks[evt.payload.blockName].apis.push(prettifyKaplang(evt.payload.content));
+                blockInfo = this.blocks[evt.payload.blockName];
+                blockInfo.apis.push(prettifyKaplang(evt.payload.content));
                 evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
                 evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+
+                const api = blockInfo.resources.find((r) => r.type == 'API');
+                evt.payload.resourceName = api?.name;
                 break;
-            case 'CREATE_TYPE':
-                this.blocks[evt.payload.blockName].types.push(prettifyKaplang(evt.payload.content));
+            case 'CREATE_MODEL':
+                blockInfo = this.blocks[evt.payload.blockName];
+                blockInfo.models.push(prettifyKaplang(evt.payload.content));
                 evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
                 evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
+
+                const database = blockInfo.resources.find((r) => r.type == 'DATABASE');
+                evt.payload.resourceName = database?.name;
                 break;
-            case 'CREATE_MODEL':
-                this.blocks[evt.payload.blockName].models.push(prettifyKaplang(evt.payload.content));
+
+            case 'CREATE_TYPE':
+                this.blocks[evt.payload.blockName].types.push(prettifyKaplang(evt.payload.content));
                 evt.payload.blockRef = this.toRef(handle, evt.payload.blockName).toNormalizedString();
                 evt.payload.instanceId = this.toInstanceIdFromRef(evt.payload.blockRef);
                 break;

package/src/storm/events.ts

@@ -94,7 +94,7 @@ export interface StormEventPlanRetry {
 }
 
 export interface StormEventCreateDSL {
-    type: 'CREATE_API' | 'CREATE_TYPE' | 'CREATE_MODEL';
+    type: 'CREATE_TYPE';
     reason: string;
     created: number;
     payload: {
@@ -105,6 +105,19 @@ export interface StormEventCreateDSL {
     };
 }
 
+export interface StormEventCreateDSLResource extends Omit<StormEventCreateDSL, 'type'> {
+    type: 'CREATE_API' | 'CREATE_MODEL';
+    reason: string;
+    created: number;
+    payload: {
+        blockName: string;
+        content: string;
+        blockRef?: string;
+        instanceId?: string;
+        resourceName?: string;
+    };
+}
+
 export interface StormEventError {
     type: 'INVALID_RESPONSE' | 'ERROR_INTERNAL';
     reason: string;
@@ -151,6 +164,7 @@ export interface StormEventFile {
     created: number;
     payload: {
         filename: string;
+        path: string;
         content: string;
         blockName: string;
         blockRef: string;
@@ -176,6 +190,7 @@ export type StormEvent =
     | StormEventInvalidResponse
     | StormEventPlanRetry
     | StormEventCreateDSL
+    | StormEventCreateDSLResource
     | StormEventError
     | StormEventScreen
     | StormEventScreenCandidate