@kapeta/local-cluster-service 0.47.0 → 0.47.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.47.2](https://github.com/kapetacom/local-cluster-service/compare/v0.47.1...v0.47.2) (2024-05-30)
+
+
+### Bug Fixes
+
+* Prettify kaplang from AI ([#151](https://github.com/kapetacom/local-cluster-service/issues/151)) ([c5afeac](https://github.com/kapetacom/local-cluster-service/commit/c5afeac7dbacdc689e53f5156a612d883f0662b1))
+
+## [0.47.1](https://github.com/kapetacom/local-cluster-service/compare/v0.47.0...v0.47.1) (2024-05-30)
+
+
+### Bug Fixes
+
+* Make UUIDs deterministic to allow cleaner updates ([#150](https://github.com/kapetacom/local-cluster-service/issues/150)) ([0e3bbec](https://github.com/kapetacom/local-cluster-service/commit/0e3bbecb00d52e2cc0f5e0d8adb9953f40e6e253))
+
 # [0.47.0](https://github.com/kapetacom/local-cluster-service/compare/v0.46.0...v0.47.0) (2024-05-29)
 
 

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

@@ -28,15 +28,15 @@ class StormCodegen {
     getStream() {
         return this.out;
     }
-    handleTemplateFileOutput(blockUri, template, data) {
+    handleTemplateFileOutput(blockUri, aiName, template, data) {
         switch (data.type) {
             case 'FILE':
                 template.filename = data.payload.filename;
                 template.content = data.payload.content;
-                return this.handleFileOutput(blockUri, data);
+                return this.handleFileOutput(blockUri, aiName, data);
         }
     }
-    handleUiOutput(blockUri, data) {
+    handleUiOutput(blockUri, aiName, data) {
         switch (data.type) {
             case 'SCREEN':
                 this.out.emit('data', {
@@ -45,17 +45,17 @@ class StormCodegen {
                     created: Date.now(),
                     payload: {
                         ...data.payload,
-                        blockName: blockUri.toNormalizedString(),
+                        blockName: aiName,
                     },
                 });
             case 'FILE':
-                return this.handleFileOutput(blockUri, data);
+                return this.handleFileOutput(blockUri, aiName, data);
         }
     }
-    handleFileOutput(blockUri, data) {
+    handleFileOutput(blockUri, aiName, data) {
         switch (data.type) {
             case 'FILE':
-                this.emitFile(blockUri, data.payload.filename, data.payload.content, data.reason);
+                this.emitFile(blockUri, aiName, data.payload.filename, data.payload.content, data.reason);
                 return {
                     type: 'FILE',
                     created: Date.now(),
@@ -77,7 +77,7 @@ class StormCodegen {
         }
         const allFiles = this.toStormFiles(generatedResult);
         // Send all the non-ai files to the stream
-        this.emitFiles(block.uri, allFiles);
+        this.emitFiles(block.uri, block.aiName, allFiles);
         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);
         if (uiTemplates.length > 0) {
@@ -89,7 +89,7 @@ class StormCodegen {
                 prompt: this.userPrompt,
             });
             uiStream.on('data', (evt) => {
-                this.handleUiOutput(block.uri, evt);
+                this.handleUiOutput(block.uri, block.aiName, evt);
             });
             await uiStream.waitForDone();
         }
@@ -98,13 +98,13 @@ class StormCodegen {
         // Send the service and UI templates to the AI. These will be send 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(block.uri, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
+            await this.processTemplates(block.uri, block.aiName, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
         }
     }
     /**
      * Emits the text-based files to the stream
      */
-    emitFiles(uri, files) {
+    emitFiles(uri, aiName, files) {
         files.forEach((file) => {
             if (!file.content || typeof file.content !== 'string') {
                 return;
@@ -119,10 +119,10 @@ class StormCodegen {
                 // They will need to be implemented by the AI
                 return;
             }
-            this.emitFile(uri, file.filename, file.content);
+            this.emitFile(uri, aiName, file.filename, file.content);
         });
     }
-    emitFile(uri, filename, content, reason = 'File generated') {
+    emitFile(uri, blockName, filename, content, reason = 'File generated') {
         this.out.emit('data', {
             type: 'FILE',
             reason,
@@ -130,6 +130,7 @@ class StormCodegen {
             payload: {
                 filename: filename,
                 content: content,
+                blockName,
                 blockRef: uri.toNormalizedString(),
             },
         });
@@ -137,7 +138,7 @@ class StormCodegen {
     /**
      * Sends the template to the AI and processes the response
      */
-    async processTemplates(blockUri, generator, templates, contextFiles) {
+    async processTemplates(blockUri, aiName, generator, templates, contextFiles) {
         const promises = templates.map(async (templateFile) => {
             const stream = await generator({
                 context: contextFiles,
@@ -146,7 +147,7 @@ class StormCodegen {
             });
             const files = [];
             stream.on('data', (evt) => {
-                const file = this.handleTemplateFileOutput(blockUri, templateFile, evt);
+                const file = this.handleTemplateFileOutput(blockUri, aiName, templateFile, evt);
                 if (file) {
                     files.push(file);
                 }

package/dist/cjs/src/storm/event-parser.d.ts

@@ -55,7 +55,6 @@ export declare class StormEventParser {
     getEvents(): StormEvent[];
     isValid(): boolean;
     getError(): string;
-    private applyLayoutToBlocks;
     toResult(handle: string): StormDefinitions;
     private toSafeName;
     private toRef;
@@ -64,6 +63,7 @@ export declare class StormEventParser {
     };
     private toResourceKind;
     private toBlockKind;
+    private toConnectionMapping;
     private toPortType;
     private toBlockTarget;
     private toBlockTargetKind;

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

@@ -3,17 +3,32 @@
  * Copyright 2023 Kapeta Inc.
  * SPDX-License-Identifier: BUSL-1.1
  */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StormEventParser = exports.resolveOptions = void 0;
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const kaplang_core_1 = require("@kapeta/kaplang-core");
-const node_uuid_1 = __importDefault(require("node-uuid"));
+const uuid_1 = require("uuid");
 const definitionsManager_1 = require("../definitionsManager");
-const ngraph_graph_1 = __importDefault(require("ngraph.graph"));
-const ngraph_forcelayout_1 = __importDefault(require("ngraph.forcelayout"));
+function prettifyKaplang(source) {
+    if (!source || !source.trim()) {
+        return '';
+    }
+    try {
+        const ast = kaplang_core_1.DSLParser.parse(source, {
+            ignoreSemantics: true,
+            types: true,
+            methods: true,
+            rest: true,
+            extends: true,
+            generics: true,
+        });
+        return kaplang_core_1.KaplangWriter.write(ast.entities ?? []);
+    }
+    catch (e) {
+        console.warn('Failed to prettify source:\n%s', source);
+        return source;
+    }
+}
 async function resolveOptions() {
     // Predefined types for now - TODO: Allow user to select / change
     const blockTypeService = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/block-type-service');
@@ -89,7 +104,6 @@ async function resolveOptions() {
     };
 }
 exports.resolveOptions = resolveOptions;
-const LAYOUT_MARGIN = 50;
 class StormEventParser {
     events = [];
     planName = '';
@@ -110,6 +124,7 @@ class StormEventParser {
     }
     addEvent(handle, evt) {
         this.events.push(evt);
+        console.log('evt', evt);
         switch (evt.type) {
             case 'CREATE_PLAN_PROPERTIES':
                 this.planName = evt.payload.name;
@@ -131,13 +146,13 @@ class StormEventParser {
                 this.error = evt.payload.error;
                 break;
             case 'CREATE_API':
-                this.blocks[evt.payload.blockName].apis.push(evt.payload.content);
+                this.blocks[evt.payload.blockName].apis.push(prettifyKaplang(evt.payload.content));
                 break;
             case 'CREATE_TYPE':
-                this.blocks[evt.payload.blockName].types.push(evt.payload.content);
+                this.blocks[evt.payload.blockName].types.push(prettifyKaplang(evt.payload.content));
                 break;
             case 'CREATE_MODEL':
-                this.blocks[evt.payload.blockName].models.push(evt.payload.content);
+                this.blocks[evt.payload.blockName].models.push(prettifyKaplang(evt.payload.content));
                 break;
             case 'CREATE_CONNECTION':
                 this.connections.push(evt.payload);
@@ -153,55 +168,21 @@ class StormEventParser {
         return this.events;
     }
     isValid() {
+        if (!this.planName) {
+            return false;
+        }
         return !this.failed;
     }
     getError() {
         return this.error;
     }
-    applyLayoutToBlocks(result) {
-        const graph = (0, ngraph_graph_1.default)();
-        const blockInstances = {};
-        result.plan.spec.blocks.forEach((block, index) => {
-            graph.addNode(block.id, block);
-            blockInstances[block.id] = block;
-        });
-        result.plan.spec.connections.forEach((connection) => {
-            graph.addLink(connection.provider.blockId, connection.consumer.blockId);
-        });
-        const layout = (0, ngraph_forcelayout_1.default)(graph, {
-            springLength: 150,
-            debug: true,
-            dimensions: 2,
-            gravity: 2,
-            springCoefficient: 0.0008,
-        });
-        for (let i = 0; i < 100; ++i) {
-            layout.step();
-        }
-        // Layout might place things in negative space. We move everything to positive space
-        const graphBox = layout.getGraphRect();
-        let yAdjust = 0;
-        let xAdjust = 0;
-        if (graphBox.y1 < 0) {
-            yAdjust = -graphBox.y1;
-        }
-        if (graphBox.x1 < 0) {
-            xAdjust = -graphBox.x1;
-        }
-        graph.forEachNode((node) => {
-            const position = layout.getNodePosition(node.id);
-            blockInstances[node.id].dimensions.left = LAYOUT_MARGIN + Math.round(position.x + xAdjust);
-            blockInstances[node.id].dimensions.top = LAYOUT_MARGIN + Math.round(position.y + yAdjust);
-        });
-        layout.dispose();
-        return result;
-    }
     toResult(handle) {
-        const planRef = this.toRef(handle, this.planName);
+        const planRef = this.toRef(handle, this.planName ?? 'undefined');
         const blockDefinitions = this.toBlockDefinitions(handle);
         const refIdMap = {};
         const blocks = Object.entries(blockDefinitions).map(([ref, block]) => {
-            const id = node_uuid_1.default.v4();
+            // Create a deterministic uuid
+            const id = (0, uuid_1.v5)(ref, uuid_1.v5.URL);
             refIdMap[ref] = id;
             return {
                 id,
@@ -249,6 +230,28 @@ class StormEventParser {
                 console.warn('Client resource not found: %s on %s', apiConnection.toResource, clientConsumerRef.toNormalizedString(), apiConnection);
                 return;
             }
+            if (apiProviderBlock.content.spec.entities?.source?.value) {
+                if (!clientConsumerBlock.content.spec.entities) {
+                    clientConsumerBlock.content.spec.entities = {
+                        types: [],
+                        source: {
+                            type: kaplang_core_1.KAPLANG_ID,
+                            version: kaplang_core_1.KAPLANG_VERSION,
+                            value: '',
+                        },
+                    };
+                }
+                const clientTypes = kaplang_core_1.DSLDataTypeParser.parse(clientConsumerBlock.content.spec.entities.source.value);
+                const apiTypes = kaplang_core_1.DSLDataTypeParser.parse(apiProviderBlock.content.spec.entities?.source?.value);
+                apiTypes.forEach((apiType) => {
+                    if (clientTypes.some((clientType) => clientType.name === apiType.name)) {
+                        // Already exists
+                        return;
+                    }
+                    clientTypes.push(apiType);
+                });
+                clientConsumerBlock.content.spec.entities.source.value = kaplang_core_1.KaplangWriter.write(clientTypes);
+            }
             clientResource.spec.methods = apiResource.spec.methods;
             clientResource.spec.source = apiResource.spec.source;
         });
@@ -267,9 +270,7 @@ class StormEventParser {
                     blockId: refIdMap[fromRef.toNormalizedString()],
                     resourceName: connection.fromResource,
                 },
-                mapping: {
-                //TODO: Add mapping
-                },
+                mapping: this.toConnectionMapping(handle, connection, blockDefinitions),
             };
         });
         const plan = {
@@ -284,10 +285,10 @@ class StormEventParser {
                 connections,
             },
         };
-        return this.applyLayoutToBlocks({
+        return {
             plan,
             blocks: Object.values(blockDefinitions),
-        });
+        };
     }
     toSafeName(name) {
         return name.toLowerCase().replace(/[^0-9a-z-]/gi, '');
@@ -498,6 +499,33 @@ class StormEventParser {
         }
         return '';
     }
+    toConnectionMapping(handle, connection, blockDefinitions) {
+        if (connection.fromResourceType !== 'API') {
+            return;
+        }
+        const fromRef = this.toRef(handle, connection.fromComponent);
+        const apiProviderBlock = blockDefinitions[fromRef.toNormalizedString()];
+        if (!apiProviderBlock) {
+            console.warn('Provider block not found: %s', connection.fromComponent, connection);
+            return;
+        }
+        const apiResource = apiProviderBlock.content.spec.providers?.find((p) => p.kind === this.options.apiKind && p.metadata.name === connection.fromResource);
+        if (!apiResource) {
+            console.warn('API resource not found: %s on %s', connection.fromResource, fromRef.toNormalizedString(), connection);
+            return;
+        }
+        const apiMethods = kaplang_core_1.DSLConverters.toSchemaMethods(kaplang_core_1.DSLAPIParser.parse(apiResource.spec?.source?.value ?? '', {
+            ignoreSemantics: true,
+        }));
+        const mapping = {};
+        Object.entries(apiMethods).forEach(([methodId, method]) => {
+            mapping[methodId] = {
+                targetId: methodId,
+                type: 'EXACT',
+            };
+        });
+        return mapping;
+    }
     toPortType(type) {
         switch (type) {
             case 'API':

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

@@ -2,7 +2,7 @@
  * Copyright 2023 Kapeta Inc.
  * SPDX-License-Identifier: BUSL-1.1
  */
-import { StormDefinitions } from "./event-parser";
+import { StormDefinitions } from './event-parser';
 export type StormResourceType = 'API' | 'DATABASE' | 'CLIENT' | 'JWTPROVIDER' | 'JWTCONSUMER' | 'WEBFRAGMENT' | 'WEBPAGE' | 'SMTPCLIENT' | 'EXTERNAL_API' | 'SUBSCRIBER' | 'PUBLISHER' | 'QUEUE' | 'EXCHANGE';
 export type StormBlockType = 'BACKEND' | 'FRONTEND' | 'GATEWAY' | 'MQ' | 'CLI' | 'DESKTOP';
 export interface StormBlockInfo {
@@ -117,6 +117,7 @@ export interface StormEventFile {
     payload: {
         filename: string;
         content: string;
+        blockName: string;
         blockRef: string;
     };
 }

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

@@ -28,6 +28,9 @@ class StormClient {
         if (api.hasToken()) {
             //headers['Authorization'] = `Bearer ${api.getAccessToken()}`; //TODO: Enable authentication
         }
+        if (body.conversationId) {
+            headers['conversationId'] = body.conversationId;
+        }
         return {
             url,
             method: method,

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

@@ -26,6 +26,7 @@ export interface ConversationItem {
 }
 export interface StormContextRequest<T = string> {
     history?: ConversationItem[];
+    conversationId?: string;
     prompt: T;
 }
 export interface StormFileInfo extends GeneratedFile {

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

@@ -150,16 +150,8 @@ describe('event-parser', () => {
         expect(dbResource?.spec.source.value).toContain('type Entity');
         const serviceBlockInstance = result.plan.spec.blocks[0];
         expect(serviceBlockInstance.name).toBe('service');
-        expect(serviceBlockInstance.dimensions.width).toBe(150);
-        expect(serviceBlockInstance.dimensions.height).toBe(200);
-        expect(serviceBlockInstance.dimensions.top).toBe(3);
-        expect(serviceBlockInstance.dimensions.left).toBe(6);
         const uiBlockInstance = result.plan.spec.blocks[1];
         expect(uiBlockInstance.name).toBe('ui');
-        expect(uiBlockInstance.dimensions.width).toBe(150);
-        expect(uiBlockInstance.dimensions.height).toBe(200);
-        expect(uiBlockInstance.dimensions.top).toBe(107);
-        expect(uiBlockInstance.dimensions.left).toBe(112);
         expect(result.plan.spec.connections.length).toBe(1);
         expect(result.plan.spec.connections[0].consumer.blockId).toBe(uiBlockInstance.id);
         expect(result.plan.spec.connections[0].consumer.resourceName).toBe(clientResource?.metadata.name);

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

@@ -28,15 +28,15 @@ class StormCodegen {
     getStream() {
         return this.out;
     }
-    handleTemplateFileOutput(blockUri, template, data) {
+    handleTemplateFileOutput(blockUri, aiName, template, data) {
         switch (data.type) {
             case 'FILE':
                 template.filename = data.payload.filename;
                 template.content = data.payload.content;
-                return this.handleFileOutput(blockUri, data);
+                return this.handleFileOutput(blockUri, aiName, data);
         }
     }
-    handleUiOutput(blockUri, data) {
+    handleUiOutput(blockUri, aiName, data) {
         switch (data.type) {
             case 'SCREEN':
                 this.out.emit('data', {
@@ -45,17 +45,17 @@ class StormCodegen {
                     created: Date.now(),
                     payload: {
                         ...data.payload,
-                        blockName: blockUri.toNormalizedString(),
+                        blockName: aiName,
                     },
                 });
             case 'FILE':
-                return this.handleFileOutput(blockUri, data);
+                return this.handleFileOutput(blockUri, aiName, data);
         }
     }
-    handleFileOutput(blockUri, data) {
+    handleFileOutput(blockUri, aiName, data) {
         switch (data.type) {
             case 'FILE':
-                this.emitFile(blockUri, data.payload.filename, data.payload.content, data.reason);
+                this.emitFile(blockUri, aiName, data.payload.filename, data.payload.content, data.reason);
                 return {
                     type: 'FILE',
                     created: Date.now(),
@@ -77,7 +77,7 @@ class StormCodegen {
         }
         const allFiles = this.toStormFiles(generatedResult);
         // Send all the non-ai files to the stream
-        this.emitFiles(block.uri, allFiles);
+        this.emitFiles(block.uri, block.aiName, allFiles);
         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);
         if (uiTemplates.length > 0) {
@@ -89,7 +89,7 @@ class StormCodegen {
                 prompt: this.userPrompt,
             });
             uiStream.on('data', (evt) => {
-                this.handleUiOutput(block.uri, evt);
+                this.handleUiOutput(block.uri, block.aiName, evt);
             });
             await uiStream.waitForDone();
         }
@@ -98,13 +98,13 @@ class StormCodegen {
         // Send the service and UI templates to the AI. These will be send 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(block.uri, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
+            await this.processTemplates(block.uri, block.aiName, stormClient_1.stormClient.createServiceImplementation.bind(stormClient_1.stormClient), serviceFiles, contextFiles);
         }
     }
     /**
      * Emits the text-based files to the stream
      */
-    emitFiles(uri, files) {
+    emitFiles(uri, aiName, files) {
         files.forEach((file) => {
             if (!file.content || typeof file.content !== 'string') {
                 return;
@@ -119,10 +119,10 @@ class StormCodegen {
                 // They will need to be implemented by the AI
                 return;
             }
-            this.emitFile(uri, file.filename, file.content);
+            this.emitFile(uri, aiName, file.filename, file.content);
         });
     }
-    emitFile(uri, filename, content, reason = 'File generated') {
+    emitFile(uri, blockName, filename, content, reason = 'File generated') {
         this.out.emit('data', {
             type: 'FILE',
             reason,
@@ -130,6 +130,7 @@ class StormCodegen {
             payload: {
                 filename: filename,
                 content: content,
+                blockName,
                 blockRef: uri.toNormalizedString(),
             },
         });
@@ -137,7 +138,7 @@ class StormCodegen {
     /**
      * Sends the template to the AI and processes the response
      */
-    async processTemplates(blockUri, generator, templates, contextFiles) {
+    async processTemplates(blockUri, aiName, generator, templates, contextFiles) {
         const promises = templates.map(async (templateFile) => {
             const stream = await generator({
                 context: contextFiles,
@@ -146,7 +147,7 @@ class StormCodegen {
             });
             const files = [];
             stream.on('data', (evt) => {
-                const file = this.handleTemplateFileOutput(blockUri, templateFile, evt);
+                const file = this.handleTemplateFileOutput(blockUri, aiName, templateFile, evt);
                 if (file) {
                     files.push(file);
                 }

package/dist/esm/src/storm/event-parser.d.ts

@@ -55,7 +55,6 @@ export declare class StormEventParser {
     getEvents(): StormEvent[];
     isValid(): boolean;
     getError(): string;
-    private applyLayoutToBlocks;
     toResult(handle: string): StormDefinitions;
     private toSafeName;
     private toRef;
@@ -64,6 +63,7 @@ export declare class StormEventParser {
     };
     private toResourceKind;
     private toBlockKind;
+    private toConnectionMapping;
     private toPortType;
     private toBlockTarget;
     private toBlockTargetKind;