@kapeta/local-cluster-service 0.49.0 → 0.51.0

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StormEventParser = exports.resolveOptions = void 0;
+exports.StormEventParser = exports.resolveOptions = exports.createPhaseEvent = exports.createPhaseEndEvent = exports.createPhaseStartEvent = void 0;
 const nodejs_utils_1 = require("@kapeta/nodejs-utils");
 const kaplang_core_1 = require("@kapeta/kaplang-core");
 const uuid_1 = require("uuid");
@@ -29,6 +29,24 @@ function prettifyKaplang(source) {
         return source;
     }
 }
+function createPhaseStartEvent(type) {
+    return createPhaseEvent(true, type);
+}
+exports.createPhaseStartEvent = createPhaseStartEvent;
+function createPhaseEndEvent(type) {
+    return createPhaseEvent(false, type);
+}
+exports.createPhaseEndEvent = createPhaseEndEvent;
+function createPhaseEvent(start, type) {
+    return {
+        type: start ? 'PHASE_START' : 'PHASE_END',
+        created: Date.now(),
+        payload: {
+            phaseType: type,
+        },
+    };
+}
+exports.createPhaseEvent = createPhaseEvent;
 async function resolveOptions() {
     // Predefined types for now - TODO: Allow user to select / change
     const blockTypeService = await definitionsManager_1.definitionsManager.getLatestDefinition('kapeta/block-type-service');
@@ -193,10 +211,6 @@ class StormEventParser {
                 evt.payload.toBlockId = StormEventParser.toInstanceId(handle, evt.payload.toComponent);
                 this.connections.push(evt.payload);
                 break;
-            default:
-            case 'SCREEN_CANDIDATE':
-            case 'FILE':
-                break;
         }
         return this.toResult(handle);
     }
@@ -213,7 +227,7 @@ class StormEventParser {
         return this.error;
     }
     toResult(handle) {
-        const planRef = StormEventParser.toRef(handle, this.planName ?? 'undefined');
+        const planRef = StormEventParser.toRef(handle, this.planName || 'undefined');
         const blockDefinitions = this.toBlockDefinitions(handle);
         const refIdMap = {};
         const blocks = Object.entries(blockDefinitions).map(([ref, block]) => {
@@ -225,7 +239,7 @@ class StormEventParser {
                 block: {
                     ref,
                 },
-                name: block.content.metadata.title ?? block.content.metadata.name,
+                name: block.content.metadata.title || block.content.metadata.name,
                 dimensions: {
                     left: 0,
                     top: 0,

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

@@ -150,19 +150,35 @@ export interface StormEventScreenCandidate {
         url: string;
     };
 }
-export interface StormEventFile {
-    type: 'FILE';
+export interface StormEventFileBasePayload {
+    filename: string;
+    path: string;
+    blockName: string;
+    blockRef: string;
+    instanceId: string;
+}
+export interface StormEventFileBase {
+    type: string;
     reason: string;
     created: number;
-    payload: {
-        filename: string;
-        path: string;
+    payload: StormEventFileBasePayload;
+}
+export interface StormEventFileLogical extends StormEventFileBase {
+    type: 'FILE_START' | 'FILE_CHUNK_RESET';
+}
+export interface StormEventFileState extends StormEventFileBase {
+    type: 'FILE_STATE';
+    payload: StormEventFileBasePayload & {
+        state: string;
+    };
+}
+export interface StormEventFileContent extends StormEventFileBase {
+    type: 'FILE_DONE' | 'FILE_CHUNK';
+    payload: StormEventFileBasePayload & {
         content: string;
-        blockName: string;
-        blockRef: string;
-        instanceId: string;
     };
 }
+export type StormEventFile = StormEventFileLogical | StormEventFileState | StormEventFileContent;
 export interface StormEventBlockReady {
     type: 'BLOCK_READY';
     reason: string;
@@ -184,4 +200,16 @@ export interface StormEventDefinitionChange {
     created: number;
     payload: StormDefinitions;
 }
-export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFile | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventBlockReady;
+export declare enum StormEventPhaseType {
+    META = "META",
+    DEFINITIONS = "DEFINITIONS",
+    IMPLEMENTATION = "IMPLEMENTATION"
+}
+export interface StormEventPhases {
+    type: 'PHASE_START' | 'PHASE_END';
+    created: number;
+    payload: {
+        phaseType: StormEventPhaseType;
+    };
+}
+export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileContent | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventBlockReady | StormEventPhases;

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

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.StormEventPhaseType = void 0;
+var StormEventPhaseType;
+(function (StormEventPhaseType) {
+    StormEventPhaseType["META"] = "META";
+    StormEventPhaseType["DEFINITIONS"] = "DEFINITIONS";
+    StormEventPhaseType["IMPLEMENTATION"] = "IMPLEMENTATION";
+})(StormEventPhaseType || (exports.StormEventPhaseType = StormEventPhaseType = {}));

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

@@ -12,6 +12,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const cors_1 = require("../middleware/cors");
 const stringBody_1 = require("../middleware/stringBody");
 const stormClient_1 = require("./stormClient");
+const events_1 = require("./events");
 const event_parser_1 = require("./event-parser");
 const codegen_1 = require("./codegen");
 const assetManager_1 = require("../assetManager");
@@ -27,15 +28,41 @@ router.post('/:handle/all', async (req, res) => {
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
         const metaStream = await stormClient_1.stormClient.createMetadata(aiRequest.prompt, conversationId);
+        onRequestAborted(req, res, () => {
+            metaStream.abort();
+        });
         res.set('Content-Type', 'application/x-ndjson');
         res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
         res.set(stormClient_1.ConversationIdHeader, metaStream.getConversationId());
+        let currentPhase = events_1.StormEventPhaseType.META;
         metaStream.on('data', (data) => {
             const result = eventParser.processEvent(req.params.handle, data);
+            switch (data.type) {
+                case 'CREATE_API':
+                case 'CREATE_MODEL':
+                case 'CREATE_TYPE':
+                    if (currentPhase !== events_1.StormEventPhaseType.DEFINITIONS) {
+                        sendEvent(res, (0, event_parser_1.createPhaseEndEvent)(events_1.StormEventPhaseType.META));
+                        currentPhase = events_1.StormEventPhaseType.DEFINITIONS;
+                        sendEvent(res, (0, event_parser_1.createPhaseStartEvent)(events_1.StormEventPhaseType.DEFINITIONS));
+                    }
+                    break;
+            }
             sendEvent(res, data);
             sendDefinitions(res, result);
         });
-        await waitForStormStream(metaStream);
+        try {
+            sendEvent(res, (0, event_parser_1.createPhaseStartEvent)(events_1.StormEventPhaseType.META));
+            await waitForStormStream(metaStream);
+        }
+        finally {
+            if (!metaStream.isAborted()) {
+                sendEvent(res, (0, event_parser_1.createPhaseEndEvent)(currentPhase));
+            }
+        }
+        if (metaStream.isAborted()) {
+            return;
+        }
         if (!eventParser.isValid()) {
             // We can't continue if the meta stream is invalid
             sendEvent(res, {
@@ -48,32 +75,45 @@ router.post('/:handle/all', async (req, res) => {
             return;
         }
         const result = eventParser.toResult(handle);
+        if (metaStream.isAborted()) {
+            return;
+        }
         sendDefinitions(res, result);
         if (!req.query.skipCodegen) {
-            const stormCodegen = new codegen_1.StormCodegen(metaStream.getConversationId(), aiRequest.prompt, result.blocks, eventParser.getEvents());
-            const codegenPromise = streamStormPartialResponse(stormCodegen.getStream(), res);
-            await stormCodegen.process();
-            await codegenPromise;
+            try {
+                sendEvent(res, (0, event_parser_1.createPhaseStartEvent)(events_1.StormEventPhaseType.IMPLEMENTATION));
+                const stormCodegen = new codegen_1.StormCodegen(metaStream.getConversationId(), aiRequest.prompt, result.blocks, eventParser.getEvents());
+                onRequestAborted(req, res, () => {
+                    stormCodegen.abort();
+                });
+                const codegenPromise = streamStormPartialResponse(stormCodegen.getStream(), res);
+                await stormCodegen.process();
+                await codegenPromise;
+            }
+            finally {
+                if (!metaStream.isAborted()) {
+                    sendEvent(res, (0, event_parser_1.createPhaseEndEvent)(events_1.StormEventPhaseType.IMPLEMENTATION));
+                }
+            }
         }
         sendDone(res);
     }
     catch (err) {
         sendError(err, res);
-        res.end();
+        if (!res.closed) {
+            res.end();
+        }
     }
 });
 router.post('/block/create', async (req, res) => {
     const createRequest = JSON.parse(req.stringBody ?? '{}');
     try {
         const ymlPath = path_1.default.join(createRequest.newPath, 'kapeta.yml');
-        console.log('Creating block at', ymlPath);
         const [asset] = await assetManager_1.assetManager.createAsset(ymlPath, createRequest.definition);
         if (await fs_extra_1.default.pathExists(createRequest.tmpPath)) {
-            console.log('Moving block from', createRequest.tmpPath, 'to', createRequest.newPath);
             await fs_extra_1.default.move(createRequest.tmpPath, createRequest.newPath, {
                 overwrite: true,
             });
-            console.log('Updating asset', asset.ref);
             res.send(await assetManager_1.assetManager.updateAsset(asset.ref, createRequest.definition));
         }
         else {
@@ -93,6 +133,9 @@ function sendDefinitions(res, result) {
     });
 }
 function sendDone(res) {
+    if (res.closed) {
+        return;
+    }
     sendEvent(res, {
         type: 'DONE',
         created: Date.now(),
@@ -100,6 +143,9 @@ function sendDone(res) {
     res.end();
 }
 function sendError(err, res) {
+    if (res.closed) {
+        return;
+    }
     console.error('Failed to send prompt', err);
     if (res.headersSent) {
         sendEvent(res, {
@@ -137,6 +183,17 @@ function streamStormPartialResponse(result, res) {
     });
 }
 function sendEvent(res, evt) {
+    if (res.closed) {
+        return;
+    }
     res.write(JSON.stringify(evt) + '\n');
 }
+function onRequestAborted(req, res, onAborted) {
+    req.on('close', () => {
+        onAborted();
+    });
+    res.on('close', () => {
+        onAborted();
+    });
+}
 exports.default = router;

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

@@ -46,12 +46,13 @@ class StormClient {
             prompt: stringPrompt,
             conversationId: body.conversationId,
         });
+        const abort = new AbortController();
+        options.signal = abort.signal;
         const response = await fetch(options.url, options);
         if (response.status !== 200) {
             throw new Error(`Got error response from ${options.url}: ${response.status}\nContent: ${await response.text()}`);
         }
         const conversationId = response.headers.get(exports.ConversationIdHeader);
-        console.log('Received conversationId', conversationId);
         const out = new stream_1.StormStream(stringPrompt, conversationId);
         const jsonLStream = promises_1.default.createInterface(node_stream_1.Readable.fromWeb(response.body));
         jsonLStream.on('line', (line) => {
@@ -63,6 +64,9 @@ class StormClient {
         jsonLStream.on('close', () => {
             out.end();
         });
+        out.on('aborted', () => {
+            abort.abort();
+        });
         return out;
     }
     createMetadata(prompt, conversationId) {

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

@@ -10,17 +10,22 @@ import { BlockDefinition } from '@kapeta/schemas';
 export declare class StormStream extends EventEmitter {
     private conversationId;
     private lines;
+    private aborted;
     constructor(prompt?: string, conversationId?: string | null);
     getConversationId(): string;
+    isAborted(): boolean;
     addJSONLine(line: string): void;
     end(): void;
     on(event: 'end', listener: () => void): this;
+    on(event: 'aborted', listener: () => void): this;
     on(event: 'error', listener: (e: Error) => void): this;
     on(event: 'data', listener: (data: StormEvent) => void): this;
     emit(event: 'end'): boolean;
+    emit(event: 'aborted'): void;
     emit(event: 'error', e: Error): boolean;
     emit(event: 'data', data: StormEvent): boolean;
     waitForDone(): Promise<void>;
+    abort(): void;
 }
 export interface ConversationItem {
     role: 'user' | 'model';

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

@@ -9,6 +9,7 @@ const node_events_1 = require("node:events");
 class StormStream extends node_events_1.EventEmitter {
     conversationId = '';
     lines = [];
+    aborted = false;
     constructor(prompt = '', conversationId) {
         super();
         this.conversationId = conversationId || '';
@@ -16,6 +17,9 @@ class StormStream extends node_events_1.EventEmitter {
     getConversationId() {
         return this.conversationId;
     }
+    isAborted() {
+        return this.aborted;
+    }
     addJSONLine(line) {
         try {
             this.lines.push(line);
@@ -48,5 +52,12 @@ class StormStream extends node_events_1.EventEmitter {
             });
         });
     }
+    abort() {
+        if (this.aborted) {
+            return;
+        }
+        this.aborted = true;
+        this.emit('aborted');
+    }
 }
 exports.StormStream = StormStream;

package/package.json

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