@kapeta/local-cluster-service 0.73.0 → 0.74.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.74.0](https://github.com/kapetacom/local-cluster-service/compare/v0.73.0...v0.74.0) (2024-09-26)
+
+
+### Features
+
+* add URL extraction to conversations endpoint ([#259](https://github.com/kapetacom/local-cluster-service/issues/259)) ([b4a38cd](https://github.com/kapetacom/local-cluster-service/commit/b4a38cdd97d94e3c69091f87bd10487c000ba631))
+
 # [0.73.0](https://github.com/kapetacom/local-cluster-service/compare/v0.72.0...v0.73.0) (2024-09-25)
 
 

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

@@ -404,5 +404,13 @@ export interface StormEventSystemReady {
         systemUrl: string;
     };
 }
-export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileFailed | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases | StormEventBlockStatus | StormEventCreateDSLRetry | StormEventUserJourney | StormEventUIShell | StormEventPage | StormEventPageUrl | StormEventPromptImprove | StormEventLandingPage | StormEventReferenceClassification | StormEventApiBase | StormEventUIStarted | StormImage | StormEventSystemReady;
+export interface StormEventModelResponse {
+    type: 'MODEL_RESPONSE';
+    reason: string;
+    created: number;
+    payload: {
+        text: string;
+    };
+}
+export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileFailed | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases | StormEventBlockStatus | StormEventCreateDSLRetry | StormEventUserJourney | StormEventUIShell | StormEventPage | StormEventPageUrl | StormEventPromptImprove | StormEventLandingPage | StormEventReferenceClassification | StormEventApiBase | StormEventUIStarted | StormImage | StormEventSystemReady | StormEventModelResponse;
 export {};

package/dist/cjs/src/stormService.d.ts

@@ -7,6 +7,7 @@ export declare class StormService {
         id: string;
         description: string;
         title: string;
+        url?: string | undefined;
     }[]>;
     getConversation(conversationId: string): Promise<string>;
     saveConversation(conversationId: string, events: StormEvent[]): Promise<void>;

package/dist/cjs/src/stormService.js

@@ -54,22 +54,43 @@ class StormService {
         // Returns list of UUIDs - probably want to make it more useful than that
         const conversations = [];
         for (const file of eventFiles) {
-            const nldContents = await promises_1.default.readFile(file, 'utf8');
-            const events = nldContents.split('\n').map((e) => JSON.parse(e));
-            // find the shell and get the title tag
-            const shellEvent = events.find((e) => e.type === 'AI' && e.event.type === 'UI_SHELL')?.event;
-            const html = shellEvent?.payload.content;
-            const title = html?.match(/<title>(.*?)<\/title>/)?.[1];
-            const id = events.find((e) => e.type === 'AI')?.systemId;
-            const initialPrompt = events.find((e) => e.type === 'AI' && e.event.type === 'PROMPT_IMPROVE')?.event?.payload?.prompt || events[0].text;
-            if (!id) {
-                continue;
+            try {
+                const nldContents = await promises_1.default.readFile(file, 'utf8');
+                const events = nldContents.split('\n').map((e) => JSON.parse(e));
+                // find the shell and get the title tag
+                const shellEvent = events.find((e) => e.type === 'AI' && e.event.type === 'UI_SHELL')?.event;
+                const html = shellEvent?.payload.content;
+                const title = html?.match(/<title>(.*?)<\/title>/)?.[1];
+                const id = events.find((e) => e.type === 'AI')?.systemId;
+                const initialPrompt = events.find((e) => e.type === 'AI' && e.event.type === 'PROMPT_IMPROVE')?.event?.payload?.prompt || events[0].text;
+                if (!id) {
+                    continue;
+                }
+                let url = undefined;
+                // Find the last model response event that has a URL in the payload (in case it changed over time)
+                for (const evt of [...events].reverse()) {
+                    const event = evt.event;
+                    if (evt.type === 'AI' && event.type === 'MODEL_RESPONSE') {
+                        // Look for a URL in the model response markdown
+                        const regex = /\[(.*?)\]\((.*?)\)/g;
+                        const match = regex.exec(event.payload.text);
+                        const [, _linkText, linkUrl] = match || [];
+                        if (linkUrl?.startsWith('http')) {
+                            url = linkUrl;
+                            break;
+                        }
+                    }
+                }
+                conversations.push({
+                    id,
+                    description: initialPrompt,
+                    title: title || 'New system',
+                    url,
+                });
+            }
+            catch (e) {
+                console.error('Failed to load conversation at %s', file, e);
             }
-            conversations.push({
-                id,
-                description: initialPrompt,
-                title: title || 'New system',
-            });
         }
         return conversations;
     }

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

@@ -404,5 +404,13 @@ export interface StormEventSystemReady {
         systemUrl: string;
     };
 }
-export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileFailed | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases | StormEventBlockStatus | StormEventCreateDSLRetry | StormEventUserJourney | StormEventUIShell | StormEventPage | StormEventPageUrl | StormEventPromptImprove | StormEventLandingPage | StormEventReferenceClassification | StormEventApiBase | StormEventUIStarted | StormImage | StormEventSystemReady;
+export interface StormEventModelResponse {
+    type: 'MODEL_RESPONSE';
+    reason: string;
+    created: number;
+    payload: {
+        text: string;
+    };
+}
+export type StormEvent = StormEventCreateBlock | StormEventCreateConnection | StormEventCreatePlanProperties | StormEventInvalidResponse | StormEventPlanRetry | StormEventCreateDSL | StormEventCreateDSLResource | StormEventError | StormEventScreen | StormEventScreenCandidate | StormEventFileLogical | StormEventFileState | StormEventFileDone | StormEventFileFailed | StormEventFileChunk | StormEventDone | StormEventDefinitionChange | StormEventErrorClassifier | StormEventCodeFix | StormEventErrorDetails | StormEventBlockReady | StormEventPhases | StormEventBlockStatus | StormEventCreateDSLRetry | StormEventUserJourney | StormEventUIShell | StormEventPage | StormEventPageUrl | StormEventPromptImprove | StormEventLandingPage | StormEventReferenceClassification | StormEventApiBase | StormEventUIStarted | StormImage | StormEventSystemReady | StormEventModelResponse;
 export {};

package/dist/esm/src/stormService.d.ts

@@ -7,6 +7,7 @@ export declare class StormService {
         id: string;
         description: string;
         title: string;
+        url?: string | undefined;
     }[]>;
     getConversation(conversationId: string): Promise<string>;
     saveConversation(conversationId: string, events: StormEvent[]): Promise<void>;

package/dist/esm/src/stormService.js

@@ -54,22 +54,43 @@ class StormService {
         // Returns list of UUIDs - probably want to make it more useful than that
         const conversations = [];
         for (const file of eventFiles) {
-            const nldContents = await promises_1.default.readFile(file, 'utf8');
-            const events = nldContents.split('\n').map((e) => JSON.parse(e));
-            // find the shell and get the title tag
-            const shellEvent = events.find((e) => e.type === 'AI' && e.event.type === 'UI_SHELL')?.event;
-            const html = shellEvent?.payload.content;
-            const title = html?.match(/<title>(.*?)<\/title>/)?.[1];
-            const id = events.find((e) => e.type === 'AI')?.systemId;
-            const initialPrompt = events.find((e) => e.type === 'AI' && e.event.type === 'PROMPT_IMPROVE')?.event?.payload?.prompt || events[0].text;
-            if (!id) {
-                continue;
+            try {
+                const nldContents = await promises_1.default.readFile(file, 'utf8');
+                const events = nldContents.split('\n').map((e) => JSON.parse(e));
+                // find the shell and get the title tag
+                const shellEvent = events.find((e) => e.type === 'AI' && e.event.type === 'UI_SHELL')?.event;
+                const html = shellEvent?.payload.content;
+                const title = html?.match(/<title>(.*?)<\/title>/)?.[1];
+                const id = events.find((e) => e.type === 'AI')?.systemId;
+                const initialPrompt = events.find((e) => e.type === 'AI' && e.event.type === 'PROMPT_IMPROVE')?.event?.payload?.prompt || events[0].text;
+                if (!id) {
+                    continue;
+                }
+                let url = undefined;
+                // Find the last model response event that has a URL in the payload (in case it changed over time)
+                for (const evt of [...events].reverse()) {
+                    const event = evt.event;
+                    if (evt.type === 'AI' && event.type === 'MODEL_RESPONSE') {
+                        // Look for a URL in the model response markdown
+                        const regex = /\[(.*?)\]\((.*?)\)/g;
+                        const match = regex.exec(event.payload.text);
+                        const [, _linkText, linkUrl] = match || [];
+                        if (linkUrl?.startsWith('http')) {
+                            url = linkUrl;
+                            break;
+                        }
+                    }
+                }
+                conversations.push({
+                    id,
+                    description: initialPrompt,
+                    title: title || 'New system',
+                    url,
+                });
+            }
+            catch (e) {
+                console.error('Failed to load conversation at %s', file, e);
             }
-            conversations.push({
-                id,
-                description: initialPrompt,
-                title: title || 'New system',
-            });
         }
         return conversations;
     }

package/package.json

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

package/src/storm/events.ts

@@ -480,7 +480,16 @@ export interface StormEventSystemReady {
     created: number;
     payload: {
         systemUrl: string;
-    }
+    };
+}
+
+export interface StormEventModelResponse {
+    type: 'MODEL_RESPONSE';
+    reason: string;
+    created: number;
+    payload: {
+        text: string;
+    };
 }
 
 export type StormEvent =
@@ -518,4 +527,5 @@ export type StormEvent =
     | StormEventApiBase
     | StormEventUIStarted
     | StormImage
-    | StormEventSystemReady;
+    | StormEventSystemReady
+    | StormEventModelResponse;

package/src/storm/routes.ts

@@ -165,6 +165,7 @@ router.post('/ui/create-system/:handle/:systemId', async (req: KapetaBodyRequest
     const pagesWithImplementation = await stormClient.replaceMockWithAPICall({
         pages: pagesFromDisk,
     });
+
     await copyDirectory(srcDir, destDir, (fileName, content) => {
         // find the page from result1 and write the content to the file
         const page = pagesWithImplementation.find((p) => p.fileName === fileName);

package/src/stormService.ts

@@ -3,7 +3,7 @@ import { glob } from 'glob';
 import { filesystemManager } from './filesystemManager';
 import path from 'path';
 import { existsSync } from 'fs';
-import { StormEvent, StormEventPromptImprove, StormEventUIShell } from './storm/events';
+import { StormEvent, StormEventModelResponse, StormEventPromptImprove, StormEventUIShell } from './storm/events';
 import * as tar from 'tar';
 import { stormClient } from './storm/stormClient';
 
@@ -28,39 +28,61 @@ export class StormService {
             absolute: true,
         });
         // Returns list of UUIDs - probably want to make it more useful than that
-        const conversations: { id: string; description: string; title: string }[] = [];
+        const conversations: { id: string; description: string; title: string; url?: string }[] = [];
         for (const file of eventFiles) {
-            const nldContents = await fs.readFile(file as string, 'utf8');
-            const events = nldContents.split('\n').map((e) => JSON.parse(e)) as {
-                // | { type: 'USER'; event: any } // IS stupid!
-                type: 'AI';
-                systemId: string;
-                event: StormEvent;
-            }[];
-            // find the shell and get the title tag
-            const shellEvent = events.find((e) => e.type === 'AI' && e.event.type === 'UI_SHELL')?.event as
-                | StormEventUIShell
-                | undefined;
-            const html = shellEvent?.payload.content;
-            const title = html?.match(/<title>(.*?)<\/title>/)?.[1];
-            const id = events.find((e) => e.type === 'AI')?.systemId;
-
-            const initialPrompt =
-                (
-                    events.find((e) => e.type === 'AI' && e.event.type === 'PROMPT_IMPROVE')?.event as
-                        | StormEventPromptImprove
-                        | undefined
-                )?.payload?.prompt || (events[0] as any).text;
-
-            if (!id) {
-                continue;
+            try {
+                const nldContents = await fs.readFile(file as string, 'utf8');
+                const events = nldContents.split('\n').map((e) => JSON.parse(e)) as {
+                    // | { type: 'USER'; event: any } // IS stupid!
+                    type: 'AI';
+                    systemId: string;
+                    event: StormEvent;
+                    reason: string;
+                }[];
+                // find the shell and get the title tag
+                const shellEvent = events.find((e) => e.type === 'AI' && e.event.type === 'UI_SHELL')?.event as
+                    | StormEventUIShell
+                    | undefined;
+                const html = shellEvent?.payload.content;
+                const title = html?.match(/<title>(.*?)<\/title>/)?.[1];
+                const id = events.find((e) => e.type === 'AI')?.systemId;
+
+                const initialPrompt =
+                    (
+                        events.find((e) => e.type === 'AI' && e.event.type === 'PROMPT_IMPROVE')?.event as
+                            | StormEventPromptImprove
+                            | undefined
+                    )?.payload?.prompt || (events[0] as any).text;
+
+                if (!id) {
+                    continue;
+                }
+
+                let url = undefined;
+                // Find the last model response event that has a URL in the payload (in case it changed over time)
+                for (const evt of [...events].reverse()) {
+                    const event = evt.event;
+                    if (evt.type === 'AI' && event.type === 'MODEL_RESPONSE') {
+                        // Look for a URL in the model response markdown
+                        const regex = /\[(.*?)\]\((.*?)\)/g;
+                        const match = regex.exec(event.payload.text);
+                        const [, _linkText, linkUrl] = match || [];
+                        if (linkUrl?.startsWith('http')) {
+                            url = linkUrl;
+                            break;
+                        }
+                    }
+                }
+
+                conversations.push({
+                    id,
+                    description: initialPrompt,
+                    title: title || 'New system',
+                    url,
+                });
+            } catch (e) {
+                console.error('Failed to load conversation at %s', file, e);
             }
-
-            conversations.push({
-                id,
-                description: initialPrompt,
-                title: title || 'New system',
-            });
         }
 
         return conversations;