@kapeta/local-cluster-service 0.55.3 → 0.56.0

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+# [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)
 
 

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/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);
@@ -86,6 +86,8 @@ router.post('/:handle/all', async (req, res) => {
         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;
 }

package/dist/esm/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/esm/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/esm/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);
@@ -86,6 +86,8 @@ router.post('/:handle/all', async (req, res) => {
         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/esm/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;
 }

package/package.json

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

package/src/storm/codegen.ts

@@ -106,7 +106,7 @@ export class StormCodegen {
     private readonly blocks: BlockDefinitionInfo[];
     private readonly out = new StormStream();
     private readonly events: StormEvent[];
-    private readonly tmpDir: string;
+    private tmpDir: string;
     private readonly conversationId: string;
 
     constructor(conversationId: string, userPrompt: string, blocks: BlockDefinitionInfo[], events: StormEvent[]) {
@@ -117,6 +117,10 @@ export class StormCodegen {
         this.conversationId = conversationId;
     }
 
+    public setTmpDir(tmpDir: string) {
+        this.tmpDir = tmpDir;
+    }
+
     public async process() {
         const promises = this.blocks.map((block) => {
             if (block.archetype) {
@@ -273,7 +277,7 @@ export class StormCodegen {
                     payload: {
                         filename: data.payload.filename,
                         path: join(this.getBasePath(blockUri.fullName), data.payload.filename),
-                        content: data.payload.content,
+                        content: data.payload.content.replace(/\\n/g, '\n'),
                         blockRef: ref,
                         instanceId: StormEventParser.toInstanceIdFromRef(ref),
                     },
@@ -320,6 +324,7 @@ export class StormCodegen {
                 file.type !== AIFileTypes.WEB_ROUTER
         );
         const uiTemplates = allFiles.filter((file) => file.type === AIFileTypes.WEB_SCREEN);
+
         const screenFiles: StormEventFileDone[] = [];
 
         let filteredEvents = [] as StormEvent[];

package/src/storm/routes.ts

@@ -6,10 +6,12 @@
 import Router from 'express-promise-router';
 import FS from 'fs-extra';
 import { Response } from 'express';
+import Path from 'path';
+import _ from 'lodash';
 import { corsHandler } from '../middleware/cors';
 import { stringBody } from '../middleware/stringBody';
 import { KapetaBodyRequest } from '../types';
-import { StormContextRequest, StormCreateBlockRequest, StormStream } from './stream';
+import { StormCodegenRequest, StormContextRequest, StormCreateBlockRequest, StormStream } from './stream';
 import { ConversationIdHeader, stormClient } from './stormClient';
 import { StormEvent, StormEventPhaseType } from './events';
 import {
@@ -21,8 +23,6 @@ import {
 } from './event-parser';
 import { StormCodegen } from './codegen';
 import { assetManager } from '../assetManager';
-import Path from 'path';
-import _ from 'lodash';
 
 const router = Router();
 
@@ -108,7 +108,8 @@ router.post('/:handle/all', async (req: KapetaBodyRequest, res: Response) => {
         if (metaStream.isAborted()) {
             return;
         }
-
+        // Cancel debounce, we don't need to send the plan again
+        sendUpdatedPlan.cancel();
         sendDefinitions(res, result);
 
         if (!req.query.skipCodegen) {
@@ -169,6 +170,31 @@ router.post('/block/create', async (req: KapetaBodyRequest, res: Response) => {
     }
 });
 
+router.post('/block/codegen', async (req: KapetaBodyRequest, res: Response) => {
+    const body: StormCodegenRequest = JSON.parse(req.stringBody ?? '{}');
+    console.log('Codegen request', body);
+    const conversationId = req.headers[ConversationIdHeader.toLowerCase()] as string | undefined;
+    try {
+        const stormCodegen = new 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: any) {
+        console.error('Failed to generate code', err);
+        res.status(500).send({ error: err.message });
+    }
+});
+
 function sendDefinitions(res: Response, result: StormDefinitions) {
     sendEvent(res, {
         type: 'DEFINITION_CHANGE',
@@ -228,10 +254,7 @@ function sendEvent(res: Response, evt: StormEvent) {
 }
 
 function onRequestAborted(req: KapetaBodyRequest, res: Response, onAborted: () => void) {
-    req.on('close', () => {
-        onAborted();
-    });
-    res.on('close', () => {
+    req.socket.on('close', () => {
         onAborted();
     });
 }

package/src/storm/stream.ts

@@ -6,6 +6,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 class StormStream extends EventEmitter {
     private conversationId: string = '';
@@ -106,6 +107,13 @@ export interface StormCreateBlockRequest {
     newPath: string;
 }
 
+export interface StormCodegenRequest {
+    block: BlockDefinitionInfo;
+    prompt: string;
+    events: StormEvent[];
+    outDir: string;
+}
+
 export interface StormFileInfo extends GeneratedFile {
     type: AIFileTypes;
 }