@kapeta/local-cluster-service 0.63.0 → 0.64.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [0.64.0](https://github.com/kapetacom/local-cluster-service/compare/v0.63.1...v0.64.0) (2024-08-21)
+
+
+### Features
+
+* Allow skip prompt improvement ([#220](https://github.com/kapetacom/local-cluster-service/issues/220)) ([f75847c](https://github.com/kapetacom/local-cluster-service/commit/f75847cd10549e730d2ea7efb1caa59ea0610865))
+
+## [0.63.1](https://github.com/kapetacom/local-cluster-service/compare/v0.63.0...v0.63.1) (2024-08-20)
+
+
+### Bug Fixes
+
+* handle port conflict and hanging response on close ([#219](https://github.com/kapetacom/local-cluster-service/issues/219)) ([e4f3b26](https://github.com/kapetacom/local-cluster-service/commit/e4f3b268fec9958aa315a186a306d2350354452b))
+
 # [0.63.0](https://github.com/kapetacom/local-cluster-service/compare/v0.62.2...v0.63.0) (2024-08-15)
 
 

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

@@ -1,4 +1,11 @@
+/// <reference types="node" />
+import { Server } from 'http';
 import { StormEventPage } from './events';
+declare module 'express-serve-static-core' {
+    interface Application {
+        listen(port: number, callback?: (err?: Error) => void): Server;
+    }
+}
 export declare class UIServer {
     private readonly express;
     private readonly systemId;

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

@@ -29,11 +29,16 @@ class UIServer {
                     window.sessionStorage.clear();
                 </script>`);
         });
-        this.express.all('/*', async (req, res) => {
+        this.express.all('/*', (req, res) => {
             (0, page_utils_1.readPageFromDisk)(this.systemId, req.params[0], req.method, res);
         });
-        return new Promise((resolve) => {
-            this.server = this.express.listen(this.port, () => {
+        return new Promise((resolve, reject) => {
+            this.server = this.express.listen(this.port, (err) => {
+                if (err) {
+                    console.error('Failed to start UI server', err);
+                    reject(err);
+                    return;
+                }
                 console.log(`UI Server started on port ${this.port}`);
                 resolve();
             });

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

@@ -100,13 +100,14 @@ router.delete('/:handle/ui', async (req, res) => {
         server.close();
         delete UI_SERVERS[conversationId];
     }
+    res.status(200).json({ status: 'ok' });
 });
 router.post('/:handle/ui/iterative', async (req, res) => {
     const handle = req.params.handle;
     try {
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
-        const landingPagesStream = await stormClient_1.stormClient.createUILandingPages(aiRequest.prompt, conversationId);
+        const landingPagesStream = await stormClient_1.stormClient.createUILandingPages(aiRequest, conversationId);
         onRequestAborted(req, res, () => {
             landingPagesStream.abort();
         });
@@ -179,7 +180,7 @@ router.post('/:handle/ui', async (req, res) => {
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
         // Get user journeys
-        const userJourneysStream = await stormClient_1.stormClient.createUIUserJourneys(aiRequest.prompt, conversationId);
+        const userJourneysStream = await stormClient_1.stormClient.createUIUserJourneys(aiRequest, conversationId);
         const outerConversationId = userJourneysStream.getConversationId();
         onRequestAborted(req, res, () => {
             userJourneysStream.abort();
@@ -364,7 +365,7 @@ router.post('/:handle/all', async (req, res) => {
         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, conversationId);
+        const metaStream = await stormClient_1.stormClient.createMetadata(aiRequest, conversationId);
         onRequestAborted(req, res, () => {
             metaStream.abort();
         });

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

@@ -38,16 +38,20 @@ export interface UIPageEditRequest {
     pages: StormEventPageUrl['payload'][];
     prompt: string;
 }
+export interface BasePromptRequest {
+    prompt: string;
+    skipImprovement?: boolean;
+}
 declare class StormClient {
     private readonly _baseUrl;
     constructor();
     private createOptions;
     private send;
-    createMetadata(prompt: string, conversationId?: string): Promise<StormStream>;
+    createMetadata(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;
     createUIPages(prompt: string, conversationId?: string): Promise<StormStream>;
-    createUIUserJourneys(prompt: string, conversationId?: string): Promise<StormStream>;
+    createUIUserJourneys(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;
     createUIShells(prompt: UIShellsPrompt, conversationId?: string): Promise<StormStream>;
-    createUILandingPages(prompt: string, conversationId?: string): Promise<StormStream>;
+    createUILandingPages(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;
     createUIPage(prompt: UIPagePrompt, conversationId?: string, history?: ConversationItem[]): Promise<StormStream>;
     classifyUIReferences(prompt: string, conversationId?: string): Promise<StormStream>;
     editPages(prompt: UIPageEditPrompt, conversationId?: string): Promise<StormStream>;

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

@@ -1,4 +1,11 @@
+/// <reference types="node" />
+import { Server } from 'http';
 import { StormEventPage } from './events';
+declare module 'express-serve-static-core' {
+    interface Application {
+        listen(port: number, callback?: (err?: Error) => void): Server;
+    }
+}
 export declare class UIServer {
     private readonly express;
     private readonly systemId;

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

@@ -29,11 +29,16 @@ class UIServer {
                     window.sessionStorage.clear();
                 </script>`);
         });
-        this.express.all('/*', async (req, res) => {
+        this.express.all('/*', (req, res) => {
             (0, page_utils_1.readPageFromDisk)(this.systemId, req.params[0], req.method, res);
         });
-        return new Promise((resolve) => {
-            this.server = this.express.listen(this.port, () => {
+        return new Promise((resolve, reject) => {
+            this.server = this.express.listen(this.port, (err) => {
+                if (err) {
+                    console.error('Failed to start UI server', err);
+                    reject(err);
+                    return;
+                }
                 console.log(`UI Server started on port ${this.port}`);
                 resolve();
             });

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

@@ -100,13 +100,14 @@ router.delete('/:handle/ui', async (req, res) => {
         server.close();
         delete UI_SERVERS[conversationId];
     }
+    res.status(200).json({ status: 'ok' });
 });
 router.post('/:handle/ui/iterative', async (req, res) => {
     const handle = req.params.handle;
     try {
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
-        const landingPagesStream = await stormClient_1.stormClient.createUILandingPages(aiRequest.prompt, conversationId);
+        const landingPagesStream = await stormClient_1.stormClient.createUILandingPages(aiRequest, conversationId);
         onRequestAborted(req, res, () => {
             landingPagesStream.abort();
         });
@@ -179,7 +180,7 @@ router.post('/:handle/ui', async (req, res) => {
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
         // Get user journeys
-        const userJourneysStream = await stormClient_1.stormClient.createUIUserJourneys(aiRequest.prompt, conversationId);
+        const userJourneysStream = await stormClient_1.stormClient.createUIUserJourneys(aiRequest, conversationId);
         const outerConversationId = userJourneysStream.getConversationId();
         onRequestAborted(req, res, () => {
             userJourneysStream.abort();
@@ -364,7 +365,7 @@ router.post('/:handle/all', async (req, res) => {
         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, conversationId);
+        const metaStream = await stormClient_1.stormClient.createMetadata(aiRequest, conversationId);
         onRequestAborted(req, res, () => {
             metaStream.abort();
         });

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

@@ -38,16 +38,20 @@ export interface UIPageEditRequest {
     pages: StormEventPageUrl['payload'][];
     prompt: string;
 }
+export interface BasePromptRequest {
+    prompt: string;
+    skipImprovement?: boolean;
+}
 declare class StormClient {
     private readonly _baseUrl;
     constructor();
     private createOptions;
     private send;
-    createMetadata(prompt: string, conversationId?: string): Promise<StormStream>;
+    createMetadata(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;
     createUIPages(prompt: string, conversationId?: string): Promise<StormStream>;
-    createUIUserJourneys(prompt: string, conversationId?: string): Promise<StormStream>;
+    createUIUserJourneys(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;
     createUIShells(prompt: UIShellsPrompt, conversationId?: string): Promise<StormStream>;
-    createUILandingPages(prompt: string, conversationId?: string): Promise<StormStream>;
+    createUILandingPages(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;
     createUIPage(prompt: UIPagePrompt, conversationId?: string, history?: ConversationItem[]): Promise<StormStream>;
     classifyUIReferences(prompt: string, conversationId?: string): Promise<StormStream>;
     editPages(prompt: UIPageEditPrompt, conversationId?: string): Promise<StormStream>;

package/package.json

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

package/src/storm/UIServer.ts

@@ -8,6 +8,15 @@ import { clusterService } from '../clusterService';
 import { Server } from 'http';
 import { StormEventPage } from './events';
 
+declare module 'express-serve-static-core' {
+    interface Application {
+        // Adds error callback support
+        // From the docs:
+        // All the forms of Node’s http.Server.listen() method are in fact actually supported.
+        listen(port: number, callback?: (err?: Error) => void): Server;
+    }
+}
+
 export class UIServer {
     private readonly express: Express;
     private readonly systemId: string;
@@ -33,12 +42,17 @@ export class UIServer {
             );
         });
 
-        this.express.all('/*', async (req: Request, res: Response) => {
+        this.express.all('/*', (req: Request, res: Response) => {
             readPageFromDisk(this.systemId, req.params[0], req.method, res);
         });
 
-        return new Promise<void>((resolve) => {
-            this.server = this.express.listen(this.port, () => {
+        return new Promise<void>((resolve, reject) => {
+            this.server = this.express.listen(this.port, (err) => {
+                if (err) {
+                    console.error('Failed to start UI server', err);
+                    reject(err);
+                    return;
+                }
                 console.log(`UI Server started on port ${this.port}`);
                 resolve();
             });

package/src/storm/routes.ts

@@ -19,9 +19,9 @@ import {
     UIPagePrompt,
     UIPageEditPrompt,
     UIPageEditRequest,
-    UIPageSamplePrompt,
+    BasePromptRequest,
 } from './stormClient';
-import { Page, StormEvent, StormEventPage, StormEventPhaseType, UIShell, UserJourneyScreen } from './events';
+import { Page, StormEvent, StormEventPage, StormEventPhaseType, UserJourneyScreen } from './events';
 
 import {
     createPhaseEndEvent,
@@ -33,18 +33,9 @@ import {
 import { StormCodegen } from './codegen';
 import { assetManager } from '../assetManager';
 import uuid from 'node-uuid';
-import { PromiseQueue } from './PromiseQueue';
-import {
-    readConversationFromFile,
-    readPageFromDisk,
-    readPageFromDiskAsString,
-    SystemIdHeader,
-    writeConversationToFile,
-    writePageToDisk,
-} from './page-utils';
+import { readPageFromDisk, readPageFromDiskAsString, SystemIdHeader, writePageToDisk } from './page-utils';
 import { UIServer } from './UIServer';
 import { PageQueue } from './PageGenerator';
-import FSExtra from 'fs-extra';
 
 const UI_SERVERS: { [key: string]: UIServer } = {};
 const router = Router();
@@ -140,6 +131,7 @@ router.delete('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
         server.close();
         delete UI_SERVERS[conversationId];
     }
+    res.status(200).json({ status: 'ok' });
 });
 
 router.post('/:handle/ui/iterative', async (req: KapetaBodyRequest, res: Response) => {
@@ -147,9 +139,9 @@ router.post('/:handle/ui/iterative', async (req: KapetaBodyRequest, res: Respons
     try {
         const conversationId = req.headers[ConversationIdHeader.toLowerCase()] as string | undefined;
 
-        const aiRequest: StormContextRequest = JSON.parse(req.stringBody ?? '{}');
+        const aiRequest: BasePromptRequest = JSON.parse(req.stringBody ?? '{}');
 
-        const landingPagesStream = await stormClient.createUILandingPages(aiRequest.prompt, conversationId);
+        const landingPagesStream = await stormClient.createUILandingPages(aiRequest, conversationId);
 
         onRequestAborted(req, res, () => {
             landingPagesStream.abort();
@@ -234,10 +226,10 @@ router.post('/:handle/ui', async (req: KapetaBodyRequest, res: Response) => {
     try {
         const conversationId = req.headers[ConversationIdHeader.toLowerCase()] as string | undefined;
 
-        const aiRequest: StormContextRequest = JSON.parse(req.stringBody ?? '{}');
+        const aiRequest: BasePromptRequest = JSON.parse(req.stringBody ?? '{}');
 
         // Get user journeys
-        const userJourneysStream = await stormClient.createUIUserJourneys(aiRequest.prompt, conversationId);
+        const userJourneysStream = await stormClient.createUIUserJourneys(aiRequest, conversationId);
         const outerConversationId = userJourneysStream.getConversationId();
 
         onRequestAborted(req, res, () => {
@@ -465,8 +457,8 @@ router.post('/:handle/all', async (req: KapetaBodyRequest, res: Response) => {
 
         const conversationId = req.headers[ConversationIdHeader.toLowerCase()] as string | undefined;
 
-        const aiRequest: StormContextRequest = JSON.parse(req.stringBody ?? '{}');
-        const metaStream = await stormClient.createMetadata(aiRequest.prompt, conversationId);
+        const aiRequest: BasePromptRequest = JSON.parse(req.stringBody ?? '{}');
+        const metaStream = await stormClient.createMetadata(aiRequest, conversationId);
 
         onRequestAborted(req, res, () => {
             metaStream.abort();

package/src/storm/stormClient.ts

@@ -62,6 +62,11 @@ export interface UIPageEditRequest {
     prompt: string;
 }
 
+export interface BasePromptRequest {
+    prompt: string;
+    skipImprovement?: boolean;
+}
+
 class StormClient {
     private readonly _baseUrl: string;
 
@@ -148,7 +153,7 @@ class StormClient {
         return out;
     }
 
-    public createMetadata(prompt: string, conversationId?: string) {
+    public createMetadata(prompt: BasePromptRequest, conversationId?: string) {
         return this.send('/v2/all', {
             prompt: prompt,
             conversationId,
@@ -162,7 +167,7 @@ class StormClient {
         });
     }
 
-    public createUIUserJourneys(prompt: string, conversationId?: string) {
+    public createUIUserJourneys(prompt: BasePromptRequest, conversationId?: string) {
         return this.send('/v2/ui/user-journeys', {
             prompt: prompt,
             conversationId,
@@ -175,7 +180,7 @@ class StormClient {
         });
     }
 
-    public createUILandingPages(prompt: string, conversationId?: string) {
+    public createUILandingPages(prompt: BasePromptRequest, conversationId?: string) {
         return this.send('/v2/ui/landing-pages', {
             prompt: prompt,
             conversationId,