@kapeta/local-cluster-service 0.47.2 → 0.47.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.47.4](https://github.com/kapetacom/local-cluster-service/compare/v0.47.3...v0.47.4) (2024-05-31)
+
+
+### Bug Fixes
+
+* end request on prompt error ([#153](https://github.com/kapetacom/local-cluster-service/issues/153)) ([1edc6eb](https://github.com/kapetacom/local-cluster-service/commit/1edc6eb436a92583c0c03836c56d12bf0dc64dce))
+
+## [0.47.3](https://github.com/kapetacom/local-cluster-service/compare/v0.47.2...v0.47.3) (2024-05-31)
+
+
+### Bug Fixes
+
+* Correctly handle conversation id ([#152](https://github.com/kapetacom/local-cluster-service/issues/152)) ([54a4722](https://github.com/kapetacom/local-cluster-service/commit/54a4722af823699afc37059561fb9e862ea6fa84))
+
 ## [0.47.2](https://github.com/kapetacom/local-cluster-service/compare/v0.47.1...v0.47.2) (2024-05-30)
 
 

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

@@ -21,9 +21,13 @@ router.post('/:handle/all', async (req, res) => {
     try {
         const stormOptions = await (0, event_parser_1.resolveOptions)();
         const eventParser = new event_parser_1.StormEventParser(stormOptions);
+        const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
-        const metaStream = await stormClient_1.stormClient.createMetadata(aiRequest.prompt, aiRequest.history);
+        const metaStream = await stormClient_1.stormClient.createMetadata(aiRequest.prompt, conversationId);
         res.set('Content-Type', 'application/x-ndjson');
+        res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
+        res.set(stormClient_1.ConversationIdHeader, metaStream.getConversationId());
+        console.log('metaStream.getConversationId()', metaStream.getConversationId());
         metaStream.on('data', (data) => {
             const result = eventParser.addEvent(req.params.handle, data);
             sendDefinitions(res, result);
@@ -42,14 +46,17 @@ router.post('/:handle/all', async (req, res) => {
         }
         const result = eventParser.toResult(handle);
         sendDefinitions(res, result);
-        const stormCodegen = new codegen_1.StormCodegen(aiRequest.prompt, result.blocks, eventParser.getEvents());
-        const codegenStream = streamStormPartialResponse(stormCodegen.getStream(), res);
-        await stormCodegen.process();
-        await codegenStream;
+        if (!req.query.skipCodegen) {
+            const stormCodegen = new codegen_1.StormCodegen(aiRequest.prompt, result.blocks, eventParser.getEvents());
+            const codegenPromise = streamStormPartialResponse(stormCodegen.getStream(), res);
+            await stormCodegen.process();
+            await codegenPromise;
+        }
         sendDone(res);
     }
     catch (err) {
         sendError(err, res);
+        res.end();
     }
 });
 function sendDefinitions(res, result) {

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

@@ -1,13 +1,14 @@
-import { ConversationItem, StormFileImplementationPrompt, StormStream, StormUIImplementationPrompt } from './stream';
+import { StormFileImplementationPrompt, StormStream, StormUIImplementationPrompt } from './stream';
 export declare const STORM_ID = "storm";
+export declare const ConversationIdHeader = "Conversation-Id";
 declare class StormClient {
     private readonly _baseUrl;
     constructor();
     private createOptions;
     private send;
-    createMetadata(prompt: string, history?: ConversationItem[]): Promise<StormStream>;
-    createUIImplementation(prompt: StormUIImplementationPrompt, history?: ConversationItem[]): Promise<StormStream>;
-    createServiceImplementation(prompt: StormFileImplementationPrompt, history?: ConversationItem[]): Promise<StormStream>;
+    createMetadata(prompt: string, conversationId?: string): Promise<StormStream>;
+    createUIImplementation(prompt: StormUIImplementationPrompt, conversationId?: string): Promise<StormStream>;
+    createServiceImplementation(prompt: StormFileImplementationPrompt, conversationId?: string): Promise<StormStream>;
 }
 export declare const stormClient: StormClient;
 export {};

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stormClient = exports.STORM_ID = void 0;
+exports.stormClient = exports.ConversationIdHeader = exports.STORM_ID = void 0;
 /**
  * Copyright 2023 Kapeta Inc.
  * SPDX-License-Identifier: BUSL-1.1
@@ -14,6 +14,7 @@ const promises_1 = __importDefault(require("node:readline/promises"));
 const node_stream_1 = require("node:stream");
 const stream_1 = require("./stream");
 exports.STORM_ID = 'storm';
+exports.ConversationIdHeader = 'Conversation-Id';
 class StormClient {
     _baseUrl;
     constructor() {
@@ -29,7 +30,8 @@ class StormClient {
             //headers['Authorization'] = `Bearer ${api.getAccessToken()}`; //TODO: Enable authentication
         }
         if (body.conversationId) {
-            headers['conversationId'] = body.conversationId;
+            headers[exports.ConversationIdHeader] = body.conversationId;
+            console.log('Setting ConversationIdHeader', headers[exports.ConversationIdHeader]);
         }
         return {
             url,
@@ -42,13 +44,15 @@ class StormClient {
         const stringPrompt = typeof body.prompt === 'string' ? body.prompt : JSON.stringify(body.prompt);
         const options = this.createOptions(path, method, {
             prompt: stringPrompt,
-            history: body.history,
+            conversationId: body.conversationId,
         });
-        const out = new stream_1.StormStream(stringPrompt, body.history);
         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) => {
             out.addJSONLine(line);
@@ -61,22 +65,22 @@ class StormClient {
         });
         return out;
     }
-    createMetadata(prompt, history) {
+    createMetadata(prompt, conversationId) {
         return this.send('/v2/all', {
-            history: history ?? [],
             prompt: prompt,
+            conversationId,
         });
     }
-    createUIImplementation(prompt, history) {
+    createUIImplementation(prompt, conversationId) {
         return this.send('/v2/ui/merge', {
-            history: history ?? [],
             prompt,
+            conversationId,
         });
     }
-    createServiceImplementation(prompt, history) {
+    createServiceImplementation(prompt, conversationId) {
         return this.send('/v2/services/merge', {
-            history: history ?? [],
             prompt,
+            conversationId,
         });
     }
 }

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

@@ -7,9 +7,10 @@ import { EventEmitter } from 'node:events';
 import { StormEvent } from './events';
 import { AIFileTypes, GeneratedFile } from '@kapeta/codegen';
 export declare class StormStream extends EventEmitter {
-    private history;
+    private conversationId;
     private lines;
-    constructor(prompt?: string, history?: ConversationItem[]);
+    constructor(prompt?: string, conversationId?: string | null);
+    getConversationId(): string;
     addJSONLine(line: string): void;
     end(): void;
     on(event: 'end', listener: () => void): this;
@@ -25,7 +26,6 @@ export interface ConversationItem {
     content: string;
 }
 export interface StormContextRequest<T = string> {
-    history?: ConversationItem[];
     conversationId?: string;
     prompt: T;
 }

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

@@ -7,15 +7,14 @@ exports.StormStream = void 0;
  */
 const node_events_1 = require("node:events");
 class StormStream extends node_events_1.EventEmitter {
-    history;
+    conversationId = '';
     lines = [];
-    constructor(prompt = '', history) {
+    constructor(prompt = '', conversationId) {
         super();
-        this.history = history ?? [];
-        this.history.push({
-            role: 'user',
-            content: prompt,
-        });
+        this.conversationId = conversationId || '';
+    }
+    getConversationId() {
+        return this.conversationId;
     }
     addJSONLine(line) {
         try {
@@ -31,10 +30,6 @@ class StormStream extends node_events_1.EventEmitter {
         }
     }
     end() {
-        this.history.push({
-            role: 'model',
-            content: this.lines.join('\n'),
-        });
         this.emit('end');
     }
     on(event, listener) {

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

@@ -21,9 +21,13 @@ router.post('/:handle/all', async (req, res) => {
     try {
         const stormOptions = await (0, event_parser_1.resolveOptions)();
         const eventParser = new event_parser_1.StormEventParser(stormOptions);
+        const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
-        const metaStream = await stormClient_1.stormClient.createMetadata(aiRequest.prompt, aiRequest.history);
+        const metaStream = await stormClient_1.stormClient.createMetadata(aiRequest.prompt, conversationId);
         res.set('Content-Type', 'application/x-ndjson');
+        res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
+        res.set(stormClient_1.ConversationIdHeader, metaStream.getConversationId());
+        console.log('metaStream.getConversationId()', metaStream.getConversationId());
         metaStream.on('data', (data) => {
             const result = eventParser.addEvent(req.params.handle, data);
             sendDefinitions(res, result);
@@ -42,14 +46,17 @@ router.post('/:handle/all', async (req, res) => {
         }
         const result = eventParser.toResult(handle);
         sendDefinitions(res, result);
-        const stormCodegen = new codegen_1.StormCodegen(aiRequest.prompt, result.blocks, eventParser.getEvents());
-        const codegenStream = streamStormPartialResponse(stormCodegen.getStream(), res);
-        await stormCodegen.process();
-        await codegenStream;
+        if (!req.query.skipCodegen) {
+            const stormCodegen = new codegen_1.StormCodegen(aiRequest.prompt, result.blocks, eventParser.getEvents());
+            const codegenPromise = streamStormPartialResponse(stormCodegen.getStream(), res);
+            await stormCodegen.process();
+            await codegenPromise;
+        }
         sendDone(res);
     }
     catch (err) {
         sendError(err, res);
+        res.end();
     }
 });
 function sendDefinitions(res, result) {

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

@@ -1,13 +1,14 @@
-import { ConversationItem, StormFileImplementationPrompt, StormStream, StormUIImplementationPrompt } from './stream';
+import { StormFileImplementationPrompt, StormStream, StormUIImplementationPrompt } from './stream';
 export declare const STORM_ID = "storm";
+export declare const ConversationIdHeader = "Conversation-Id";
 declare class StormClient {
     private readonly _baseUrl;
     constructor();
     private createOptions;
     private send;
-    createMetadata(prompt: string, history?: ConversationItem[]): Promise<StormStream>;
-    createUIImplementation(prompt: StormUIImplementationPrompt, history?: ConversationItem[]): Promise<StormStream>;
-    createServiceImplementation(prompt: StormFileImplementationPrompt, history?: ConversationItem[]): Promise<StormStream>;
+    createMetadata(prompt: string, conversationId?: string): Promise<StormStream>;
+    createUIImplementation(prompt: StormUIImplementationPrompt, conversationId?: string): Promise<StormStream>;
+    createServiceImplementation(prompt: StormFileImplementationPrompt, conversationId?: string): Promise<StormStream>;
 }
 export declare const stormClient: StormClient;
 export {};

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stormClient = exports.STORM_ID = void 0;
+exports.stormClient = exports.ConversationIdHeader = exports.STORM_ID = void 0;
 /**
  * Copyright 2023 Kapeta Inc.
  * SPDX-License-Identifier: BUSL-1.1
@@ -14,6 +14,7 @@ const promises_1 = __importDefault(require("node:readline/promises"));
 const node_stream_1 = require("node:stream");
 const stream_1 = require("./stream");
 exports.STORM_ID = 'storm';
+exports.ConversationIdHeader = 'Conversation-Id';
 class StormClient {
     _baseUrl;
     constructor() {
@@ -29,7 +30,8 @@ class StormClient {
             //headers['Authorization'] = `Bearer ${api.getAccessToken()}`; //TODO: Enable authentication
         }
         if (body.conversationId) {
-            headers['conversationId'] = body.conversationId;
+            headers[exports.ConversationIdHeader] = body.conversationId;
+            console.log('Setting ConversationIdHeader', headers[exports.ConversationIdHeader]);
         }
         return {
             url,
@@ -42,13 +44,15 @@ class StormClient {
         const stringPrompt = typeof body.prompt === 'string' ? body.prompt : JSON.stringify(body.prompt);
         const options = this.createOptions(path, method, {
             prompt: stringPrompt,
-            history: body.history,
+            conversationId: body.conversationId,
         });
-        const out = new stream_1.StormStream(stringPrompt, body.history);
         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) => {
             out.addJSONLine(line);
@@ -61,22 +65,22 @@ class StormClient {
         });
         return out;
     }
-    createMetadata(prompt, history) {
+    createMetadata(prompt, conversationId) {
         return this.send('/v2/all', {
-            history: history ?? [],
             prompt: prompt,
+            conversationId,
         });
     }
-    createUIImplementation(prompt, history) {
+    createUIImplementation(prompt, conversationId) {
         return this.send('/v2/ui/merge', {
-            history: history ?? [],
             prompt,
+            conversationId,
         });
     }
-    createServiceImplementation(prompt, history) {
+    createServiceImplementation(prompt, conversationId) {
         return this.send('/v2/services/merge', {
-            history: history ?? [],
             prompt,
+            conversationId,
         });
     }
 }

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

@@ -7,9 +7,10 @@ import { EventEmitter } from 'node:events';
 import { StormEvent } from './events';
 import { AIFileTypes, GeneratedFile } from '@kapeta/codegen';
 export declare class StormStream extends EventEmitter {
-    private history;
+    private conversationId;
     private lines;
-    constructor(prompt?: string, history?: ConversationItem[]);
+    constructor(prompt?: string, conversationId?: string | null);
+    getConversationId(): string;
     addJSONLine(line: string): void;
     end(): void;
     on(event: 'end', listener: () => void): this;
@@ -25,7 +26,6 @@ export interface ConversationItem {
     content: string;
 }
 export interface StormContextRequest<T = string> {
-    history?: ConversationItem[];
     conversationId?: string;
     prompt: T;
 }

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

@@ -7,15 +7,14 @@ exports.StormStream = void 0;
  */
 const node_events_1 = require("node:events");
 class StormStream extends node_events_1.EventEmitter {
-    history;
+    conversationId = '';
     lines = [];
-    constructor(prompt = '', history) {
+    constructor(prompt = '', conversationId) {
         super();
-        this.history = history ?? [];
-        this.history.push({
-            role: 'user',
-            content: prompt,
-        });
+        this.conversationId = conversationId || '';
+    }
+    getConversationId() {
+        return this.conversationId;
     }
     addJSONLine(line) {
         try {
@@ -31,10 +30,6 @@ class StormStream extends node_events_1.EventEmitter {
         }
     }
     end() {
-        this.history.push({
-            role: 'model',
-            content: this.lines.join('\n'),
-        });
         this.emit('end');
     }
     on(event, listener) {

package/package.json

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

package/src/storm/codegen.ts

@@ -13,10 +13,7 @@ import { BlockDefinitionInfo } from './event-parser';
 import { ConversationItem, StormFileImplementationPrompt, StormFileInfo, StormStream } from './stream';
 import { KapetaURI } from '@kapeta/nodejs-utils';
 
-type ImplementationGenerator = (
-    prompt: StormFileImplementationPrompt,
-    history?: ConversationItem[]
-) => Promise<StormStream>;
+type ImplementationGenerator = (prompt: StormFileImplementationPrompt, conversationId?: string) => Promise<StormStream>;
 
 export class StormCodegen {
     private readonly userPrompt: string;

package/src/storm/routes.ts

@@ -9,7 +9,7 @@ import { corsHandler } from '../middleware/cors';
 import { stringBody } from '../middleware/stringBody';
 import { KapetaBodyRequest } from '../types';
 import { StormContextRequest, StormFileImplementationPrompt, StormFileInfo, StormStream } from './stream';
-import { stormClient } from './stormClient';
+import { ConversationIdHeader, stormClient } from './stormClient';
 import { StormEvent } from './events';
 import { resolveOptions, StormDefinitions, StormEventParser } from './event-parser';
 import { StormCodegen } from './codegen';
@@ -27,10 +27,15 @@ router.post('/:handle/all', async (req: KapetaBodyRequest, res: Response) => {
 
         const eventParser = new StormEventParser(stormOptions);
 
+        const conversationId = req.headers[ConversationIdHeader.toLowerCase()] as string | undefined;
+
         const aiRequest: StormContextRequest = JSON.parse(req.stringBody ?? '{}');
-        const metaStream = await stormClient.createMetadata(aiRequest.prompt, aiRequest.history);
+        const metaStream = await stormClient.createMetadata(aiRequest.prompt, conversationId);
 
         res.set('Content-Type', 'application/x-ndjson');
+        res.set('Access-Control-Expose-Headers', ConversationIdHeader);
+        res.set(ConversationIdHeader, metaStream.getConversationId());
+        console.log('metaStream.getConversationId()', metaStream.getConversationId());
 
         metaStream.on('data', (data: StormEvent) => {
             const result = eventParser.addEvent(req.params.handle, data);
@@ -56,17 +61,20 @@ router.post('/:handle/all', async (req: KapetaBodyRequest, res: Response) => {
 
         sendDefinitions(res, result);
 
-        const stormCodegen = new StormCodegen(aiRequest.prompt, result.blocks, eventParser.getEvents());
+        if (!req.query.skipCodegen) {
+            const stormCodegen = new StormCodegen(aiRequest.prompt, result.blocks, eventParser.getEvents());
 
-        const codegenStream = streamStormPartialResponse(stormCodegen.getStream(), res);
+            const codegenPromise = streamStormPartialResponse(stormCodegen.getStream(), res);
 
-        await stormCodegen.process();
+            await stormCodegen.process();
 
-        await codegenStream;
+            await codegenPromise;
+        }
 
         sendDone(res);
     } catch (err: any) {
         sendError(err, res);
+        res.end();
     }
 });
 

package/src/storm/stormClient.ts

@@ -17,6 +17,8 @@ import {
 
 export const STORM_ID = 'storm';
 
+export const ConversationIdHeader = 'Conversation-Id';
+
 class StormClient {
     private readonly _baseUrl: string;
 
@@ -35,7 +37,8 @@ class StormClient {
         }
 
         if (body.conversationId) {
-            headers['conversationId'] = body.conversationId;
+            headers[ConversationIdHeader] = body.conversationId;
+            console.log('Setting ConversationIdHeader', headers[ConversationIdHeader]);
         }
 
         return {
@@ -55,11 +58,9 @@ class StormClient {
 
         const options = this.createOptions(path, method, {
             prompt: stringPrompt,
-            history: body.history,
+            conversationId: body.conversationId,
         });
 
-        const out = new StormStream(stringPrompt, body.history);
-
         const response = await fetch(options.url, options);
 
         if (response.status !== 200) {
@@ -68,6 +69,11 @@ class StormClient {
             );
         }
 
+        const conversationId = response.headers.get(ConversationIdHeader);
+        console.log('Received conversationId', conversationId);
+
+        const out = new StormStream(stringPrompt, conversationId);
+
         const jsonLStream = readLine.createInterface(Readable.fromWeb(response.body!));
 
         jsonLStream.on('line', (line) => {
@@ -85,24 +91,24 @@ class StormClient {
         return out;
     }
 
-    public createMetadata(prompt: string, history?: ConversationItem[]) {
+    public createMetadata(prompt: string, conversationId?: string) {
         return this.send('/v2/all', {
-            history: history ?? [],
             prompt: prompt,
+            conversationId,
         });
     }
 
-    public createUIImplementation(prompt: StormUIImplementationPrompt, history?: ConversationItem[]) {
+    public createUIImplementation(prompt: StormUIImplementationPrompt, conversationId?: string) {
         return this.send<StormUIImplementationPrompt>('/v2/ui/merge', {
-            history: history ?? [],
             prompt,
+            conversationId,
         });
     }
 
-    public createServiceImplementation(prompt: StormFileImplementationPrompt, history?: ConversationItem[]) {
+    public createServiceImplementation(prompt: StormFileImplementationPrompt, conversationId?: string) {
         return this.send<StormFileImplementationPrompt>('/v2/services/merge', {
-            history: history ?? [],
             prompt,
+            conversationId,
         });
     }
 }

package/src/storm/stream.ts

@@ -7,16 +7,16 @@ import { StormEvent } from './events';
 import { AIFileTypes, GeneratedFile } from '@kapeta/codegen';
 
 export class StormStream extends EventEmitter {
-    private history: ConversationItem[];
+    private conversationId: string = '';
     private lines: string[] = [];
 
-    constructor(prompt: string = '', history?: ConversationItem[]) {
+    constructor(prompt: string = '', conversationId?: string | null) {
         super();
-        this.history = history ?? [];
-        this.history.push({
-            role: 'user',
-            content: prompt,
-        });
+        this.conversationId = conversationId || '';
+    }
+
+    getConversationId() {
+        return this.conversationId;
     }
 
     addJSONLine(line: string) {
@@ -33,10 +33,6 @@ export class StormStream extends EventEmitter {
     }
 
     end() {
-        this.history.push({
-            role: 'model',
-            content: this.lines.join('\n'),
-        });
         this.emit('end');
     }
 
@@ -73,7 +69,6 @@ export interface ConversationItem {
 }
 
 export interface StormContextRequest<T = string> {
-    history?: ConversationItem[];
     conversationId?: string;
     prompt: T;
 }