@kapeta/local-cluster-service 0.55.2 → 0.56.0

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+# [0.56.0](https://github.com/kapetacom/local-cluster-service/compare/v0.55.3...v0.56.0) (2024-07-15)
+
+
+### Bug Fixes
+
+* better abort handling on reqs ([412c2f9](https://github.com/kapetacom/local-cluster-service/commit/412c2f9ab7e49f5e5d35d6b1ad4d683dafb170b8))
+* guard against \\n in output ([5ae55ed](https://github.com/kapetacom/local-cluster-service/commit/5ae55ed2d6cacedb6867256a4245b413b14e061c))
+
+
+### Features
+
+* add /block/codegen endpoint to (re)run codegen on a block ([0fec94b](https://github.com/kapetacom/local-cluster-service/commit/0fec94b563fd1bbc340c478b937f2848c9a4e644))
+
+## [0.55.3](https://github.com/kapetacom/local-cluster-service/compare/v0.55.2...v0.55.3) (2024-07-12)
+
+
+### Bug Fixes
+
+* ensure versions on predefined blocks are the latest ([0a841bc](https://github.com/kapetacom/local-cluster-service/commit/0a841bc221cfac09cac41992a06385be1da24197))
+
 ## [0.55.2](https://github.com/kapetacom/local-cluster-service/compare/v0.55.1...v0.55.2) (2024-07-12)
 
 

package/definitions.d.ts

@@ -47,4 +47,4 @@ declare module 'download-git-repo' {
     ): void;
 
     export = download;
-}
+}

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

@@ -10,9 +10,10 @@ export declare class StormCodegen {
     private readonly blocks;
     private readonly out;
     private readonly events;
-    private readonly tmpDir;
+    private tmpDir;
     private readonly conversationId;
     constructor(conversationId: string, userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[]);
+    setTmpDir(tmpDir: string): void;
     process(): Promise<void>;
     isAborted(): boolean;
     getStream(): StormStream;

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

@@ -107,6 +107,9 @@ class StormCodegen {
         this.tmpDir = path_2.default.join(node_os_1.default.tmpdir(), conversationId);
         this.conversationId = conversationId;
     }
+    setTmpDir(tmpDir) {
+        this.tmpDir = tmpDir;
+    }
     async process() {
         const promises = this.blocks.map((block) => {
             if (block.archetype) {
@@ -241,7 +244,7 @@ class StormCodegen {
                     payload: {
                         filename: data.payload.filename,
                         path: (0, path_2.join)(this.getBasePath(blockUri.fullName), data.payload.filename),
-                        content: data.payload.content,
+                        content: data.payload.content.replace(/\\n/g, '\n'),
                         blockRef: ref,
                         instanceId: event_parser_1.StormEventParser.toInstanceIdFromRef(ref),
                     },

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

@@ -39,6 +39,7 @@ export interface StormOptions {
     desktopKind: string;
     desktopLanguage: string;
     gatewayKind: string;
+    [key: string]: string;
 }
 export declare function createPhaseStartEvent(type: StormEventPhaseType): StormEventPhases;
 export declare function createPhaseEndEvent(type: StormEventPhaseType): StormEventPhases;
@@ -66,7 +67,7 @@ export declare class StormEventParser {
     getEvents(): StormEvent[];
     isValid(): boolean;
     getError(): string;
-    toResult(handle: string): Promise<StormDefinitions>;
+    toResult(handle: string, warn?: boolean): Promise<StormDefinitions>;
     toBlockDefinitions(handle: string): Promise<{
         [key: string]: BlockDefinitionInfo;
     }>;

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

@@ -244,7 +244,7 @@ class StormEventParser {
     getError() {
         return this.error;
     }
-    async toResult(handle) {
+    async toResult(handle, warn = false) {
         const planRef = StormEventParser.toRef(handle, this.planName || 'undefined');
         const blockDefinitions = await this.toBlockDefinitions(handle);
         const refIdMap = {};
@@ -284,7 +284,9 @@ class StormEventParser {
             }
             const apiResource = apiProviderBlock.content.spec.providers?.find((p) => p.kind === this.options.apiKind && p.metadata.name === apiConnection.fromResource);
             if (!apiResource) {
-                console.warn('API resource not found: %s on %s', apiConnection.fromResource, apiProviderRef.toNormalizedString(), apiConnection);
+                if (warn) {
+                    console.warn('API resource not found: %s on %s', apiConnection.fromResource, apiProviderRef.toNormalizedString(), apiConnection);
+                }
                 return;
             }
             const clientResource = clientConsumerBlock.content.spec.consumers?.find((clientResource) => {
@@ -295,7 +297,9 @@ class StormEventParser {
                 return clientResource.metadata.name === apiConnection.toResource;
             });
             if (!clientResource) {
-                console.warn('Client resource not found: %s on %s', apiConnection.toResource, clientConsumerRef.toNormalizedString(), apiConnection);
+                if (warn) {
+                    console.warn('Client resource not found: %s on %s', apiConnection.toResource, clientConsumerRef.toNormalizedString(), apiConnection);
+                }
                 return;
             }
             if (apiProviderBlock.content.spec.entities?.source?.value) {
@@ -340,7 +344,7 @@ class StormEventParser {
                     blockId: refIdMap[fromRef.toNormalizedString()],
                     resourceName: connection.fromResource,
                 },
-                mapping: this.toConnectionMapping(handle, connection, blockDefinitions),
+                mapping: this.toConnectionMapping(handle, connection, blockDefinitions, warn),
             };
         });
         const plan = {
@@ -368,7 +372,7 @@ class StormEventParser {
             const blockRef = StormEventParser.toRef(handle, blockInfo.name);
             let blockDefinitionInfo;
             if (blockInfo.archetype) {
-                blockDefinitionInfo = await this.resolveArchetypeBlockDefinition(blockRef, blockInfo);
+                blockDefinitionInfo = await this.resolveArchetypeBlockDefinition(blockRef, blockInfo, handle);
             }
             else {
                 blockDefinitionInfo = this.createBlockDefinitionInfo(blockRef, blockInfo, handle);
@@ -533,7 +537,7 @@ class StormEventParser {
                     firstEntry.spec.source.value += api + '\n\n';
                 }
                 else {
-                    console.warn('Unable to find resource for API', api);
+                    // this might be ok as we might receive api and types before resources from the ai-service
                 }
             }
         });
@@ -596,7 +600,7 @@ class StormEventParser {
         }
         return '';
     }
-    toConnectionMapping(handle, connection, blockDefinitions) {
+    toConnectionMapping(handle, connection, blockDefinitions, warn) {
         if (connection.fromResourceType !== 'API') {
             return;
         }
@@ -608,7 +612,9 @@ class StormEventParser {
         }
         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);
+            if (warn) {
+                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 ?? '', {
@@ -681,14 +687,36 @@ class StormEventParser {
         }
         return undefined;
     }
-    async resolveArchetypeBlockDefinition(blockRef, blockInfo) {
+    async resolveArchetypeBlockDefinition(blockRef, blockInfo, handle) {
         const predefinedBlock = predefined_1.PREDEFINED_BLOCKS.get(blockInfo.archetype);
         if (!predefinedBlock) {
             throw new Error('Predefined block not found for archetype [' + blockInfo.archetype + ']');
         }
+        const target = this.toBlockTarget(handle, blockInfo.type);
         const blockDefinition = await predefinedBlock.getBlockDefinition();
         lodash_1.default.set(blockDefinition, ['metadata', 'name'], blockRef.fullName);
         lodash_1.default.set(blockDefinition, ['metadata', 'title'], blockRef.name);
+        lodash_1.default.set(blockDefinition, ['spec', 'target', 'options'], target?.options);
+        const options = this.options;
+        function getKind(kind) {
+            for (const prop in options) {
+                if (options.hasOwnProperty(prop)) {
+                    const value = options[prop];
+                    if (value.startsWith(kind)) {
+                        return value;
+                    }
+                }
+            }
+        }
+        blockDefinition.kind = getKind((0, nodejs_utils_1.parseKapetaUri)(blockDefinition.kind).fullName) ?? blockDefinition.kind;
+        for (const provider of blockDefinition.spec.providers ?? []) {
+            provider.kind = getKind((0, nodejs_utils_1.parseKapetaUri)(provider.kind).fullName) ?? provider.kind;
+        }
+        for (const consumer of blockDefinition.spec.consumers ?? []) {
+            consumer.kind = getKind((0, nodejs_utils_1.parseKapetaUri)(consumer.kind).fullName) ?? consumer.kind;
+        }
+        blockDefinition.spec.target.kind =
+            getKind((0, nodejs_utils_1.parseKapetaUri)(blockDefinition.spec.target.kind).fullName) ?? blockDefinition.spec.target.kind;
         return {
             uri: blockRef.toNormalizedString(),
             aiName: blockInfo.name,

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

@@ -9,6 +9,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_promise_router_1 = __importDefault(require("express-promise-router"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const lodash_1 = __importDefault(require("lodash"));
 const cors_1 = require("../middleware/cors");
 const stringBody_1 = require("../middleware/stringBody");
 const stormClient_1 = require("./stormClient");
@@ -16,8 +18,6 @@ const events_1 = require("./events");
 const event_parser_1 = require("./event-parser");
 const codegen_1 = require("./codegen");
 const assetManager_1 = require("../assetManager");
-const path_1 = __importDefault(require("path"));
-const lodash_1 = __importDefault(require("lodash"));
 const router = (0, express_promise_router_1.default)();
 router.use('/', cors_1.corsHandler);
 router.use('/', stringBody_1.stringBody);
@@ -82,10 +82,12 @@ router.post('/:handle/all', async (req, res) => {
             res.end();
             return;
         }
-        const result = await eventParser.toResult(handle);
+        const result = await eventParser.toResult(handle, true);
         if (metaStream.isAborted()) {
             return;
         }
+        // Cancel debounce, we don't need to send the plan again
+        sendUpdatedPlan.cancel();
         sendDefinitions(res, result);
         if (!req.query.skipCodegen) {
             try {
@@ -134,6 +136,26 @@ router.post('/block/create', async (req, res) => {
         res.status(500).send({ error: err.message });
     }
 });
+router.post('/block/codegen', async (req, res) => {
+    const body = JSON.parse(req.stringBody ?? '{}');
+    console.log('Codegen request', body);
+    const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
+    try {
+        const stormCodegen = new codegen_1.StormCodegen(conversationId ?? '', body.prompt, [body.block], body.events || []);
+        stormCodegen.setTmpDir(body.outDir);
+        onRequestAborted(req, res, () => {
+            stormCodegen.abort();
+        });
+        const codegenPromise = streamStormPartialResponse(stormCodegen.getStream(), res);
+        await stormCodegen.process();
+        await codegenPromise;
+        sendDone(res);
+    }
+    catch (err) {
+        console.error('Failed to generate code', err);
+        res.status(500).send({ error: err.message });
+    }
+});
 function sendDefinitions(res, result) {
     sendEvent(res, {
         type: 'DEFINITION_CHANGE',
@@ -187,10 +209,7 @@ function sendEvent(res, evt) {
     res.write(JSON.stringify(evt) + '\n');
 }
 function onRequestAborted(req, res, onAborted) {
-    req.on('close', () => {
-        onAborted();
-    });
-    res.on('close', () => {
+    req.socket.on('close', () => {
         onAborted();
     });
 }

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

@@ -7,6 +7,7 @@ import { EventEmitter } from 'node:events';
 import { StormEvent } from './events';
 import { AIFileTypes, GeneratedFile } from '@kapeta/codegen';
 import { BlockDefinition } from '@kapeta/schemas';
+import { BlockDefinitionInfo } from './event-parser';
 export declare class StormStream extends EventEmitter {
     private conversationId;
     private lines;
@@ -41,6 +42,12 @@ export interface StormCreateBlockRequest {
     tmpPath: string;
     newPath: string;
 }
+export interface StormCodegenRequest {
+    block: BlockDefinitionInfo;
+    prompt: string;
+    events: StormEvent[];
+    outDir: string;
+}
 export interface StormFileInfo extends GeneratedFile {
     type: AIFileTypes;
 }