@kapeta/local-cluster-service 0.71.5 → 0.72.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [0.72.0](https://github.com/kapetacom/local-cluster-service/compare/v0.71.6...v0.72.0) (2024-09-24)
+
+
+### Features
+
+* Add redirect endpoint for opening conversation ([#258](https://github.com/kapetacom/local-cluster-service/issues/258)) ([2b400ac](https://github.com/kapetacom/local-cluster-service/commit/2b400ac0066813a9e18c105628743650646c83c6))
+
+## [0.71.6](https://github.com/kapetacom/local-cluster-service/compare/v0.71.5...v0.71.6) (2024-09-19)
+
+
+### Bug Fixes
+
+* Change to simple json response for now ([#256](https://github.com/kapetacom/local-cluster-service/issues/256)) ([7d8ae48](https://github.com/kapetacom/local-cluster-service/commit/7d8ae4813b78f478a0f719195ea33dc2890f1d2a))
+
 ## [0.71.5](https://github.com/kapetacom/local-cluster-service/compare/v0.71.4...v0.71.5) (2024-09-19)
 
 

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

@@ -25,6 +25,7 @@ const UIServer_1 = require("./UIServer");
 const crypto_1 = require("crypto");
 const PageGenerator_1 = require("./PageGenerator");
 const utils_1 = require("./utils");
+const utils_2 = require("../utils/utils");
 const UI_SERVERS = {};
 const router = (0, express_promise_router_1.default)();
 router.use('/', cors_1.corsHandler);
@@ -106,17 +107,17 @@ router.post('/ui/create-system-simple/:handle/:systemId', async (req, res) => {
     const handle = req.params.handle;
     const systemId = req.params.systemId;
     const srcDir = (0, page_utils_1.getSystemBaseDir)(systemId);
-    res.set('Content-Type', 'application/x-ndjson');
-    res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
-    res.set(stormClient_1.ConversationIdHeader, systemId);
-    sendEvent(res, (0, event_parser_1.createPhaseStartEvent)(events_1.StormEventPhaseType.IMPLEMENT_APIS));
+    //res.set('Content-Type', 'application/x-ndjson');
+    //res.set('Access-Control-Expose-Headers', ConversationIdHeader);
+    //res.set(ConversationIdHeader, systemId);
+    //sendEvent(res, createPhaseStartEvent(StormEventPhaseType.IMPLEMENT_APIS));
     try {
         const pagesFromDisk = (0, utils_1.readFilesAndContent)(srcDir);
         const pagesWithImplementation = await stormClient_1.stormClient.replaceMockWithAPICall({
             pages: pagesFromDisk,
         });
-        sendEvent(res, (0, event_parser_1.createPhaseEndEvent)(events_1.StormEventPhaseType.IMPLEMENT_APIS));
-        sendEvent(res, (0, event_parser_1.createPhaseStartEvent)(events_1.StormEventPhaseType.COMPOSE_SYSTEM));
+        //sendEvent(res, createPhaseEndEvent(StormEventPhaseType.IMPLEMENT_APIS));
+        //sendEvent(res, createPhaseStartEvent(StormEventPhaseType.COMPOSE_SYSTEM));
         const allFiles = (0, utils_1.readFilesAndContent)(srcDir, false).map((page) => {
             if (page.encoding == stream_1.HTMLPageEncoding.TEXT) {
                 const matchingFile = pagesWithImplementation.find((pageWithImpl) => pageWithImpl.fileName === page.fileName);
@@ -127,12 +128,13 @@ router.post('/ui/create-system-simple/:handle/:systemId', async (req, res) => {
             return page;
         });
         const systemUrl = await stormClient_1.stormClient.createSimpleBackend(handle, systemId, { pages: allFiles });
-        sendEvent(res, { type: 'SYSTEM_READY', created: Math.floor(Date.now() / 1000), reason: 'System Ready', payload: { systemUrl: systemUrl } });
-        sendEvent(res, (0, event_parser_1.createPhaseEndEvent)(events_1.StormEventPhaseType.COMPOSE_SYSTEM));
-        sendDone(res);
+        //sendEvent(res, {type: 'SYSTEM_READY', created: Math.floor(Date.now() / 1000), reason: 'System Ready', payload: { systemUrl: systemUrl }});
+        //sendEvent(res, createPhaseEndEvent(StormEventPhaseType.COMPOSE_SYSTEM));
+        //sendDone(res);
+        res.json({ url: systemUrl });
     }
     catch (err) {
-        sendError(err, res);
+        res.status(500).json({ error: err.message });
     }
     finally {
         if (!res.closed) {
@@ -543,6 +545,12 @@ router.post('/ui/get-vote', async (req, res) => {
 router.post('/:handle/all', async (req, res) => {
     await handleAll(req, res);
 });
+router.get('/conversations/:agentName/:systemId/redirect', async (req, res) => {
+    const aiService = (0, utils_2.getRemoteUrl)('ai-service', 'https://ai.kapeta.com');
+    const agentName = req.params.agentName;
+    const systemId = req.params.systemId;
+    res.redirect(aiService + `/v2/conversations/${encodeURIComponent(agentName)}/${encodeURIComponent(systemId)}`);
+});
 async function handleAll(req, res) {
     const handle = req.params.handle;
     const systemId = req.query.systemId ?? undefined;

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

@@ -25,6 +25,7 @@ const UIServer_1 = require("./UIServer");
 const crypto_1 = require("crypto");
 const PageGenerator_1 = require("./PageGenerator");
 const utils_1 = require("./utils");
+const utils_2 = require("../utils/utils");
 const UI_SERVERS = {};
 const router = (0, express_promise_router_1.default)();
 router.use('/', cors_1.corsHandler);
@@ -106,17 +107,17 @@ router.post('/ui/create-system-simple/:handle/:systemId', async (req, res) => {
     const handle = req.params.handle;
     const systemId = req.params.systemId;
     const srcDir = (0, page_utils_1.getSystemBaseDir)(systemId);
-    res.set('Content-Type', 'application/x-ndjson');
-    res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
-    res.set(stormClient_1.ConversationIdHeader, systemId);
-    sendEvent(res, (0, event_parser_1.createPhaseStartEvent)(events_1.StormEventPhaseType.IMPLEMENT_APIS));
+    //res.set('Content-Type', 'application/x-ndjson');
+    //res.set('Access-Control-Expose-Headers', ConversationIdHeader);
+    //res.set(ConversationIdHeader, systemId);
+    //sendEvent(res, createPhaseStartEvent(StormEventPhaseType.IMPLEMENT_APIS));
     try {
         const pagesFromDisk = (0, utils_1.readFilesAndContent)(srcDir);
         const pagesWithImplementation = await stormClient_1.stormClient.replaceMockWithAPICall({
             pages: pagesFromDisk,
         });
-        sendEvent(res, (0, event_parser_1.createPhaseEndEvent)(events_1.StormEventPhaseType.IMPLEMENT_APIS));
-        sendEvent(res, (0, event_parser_1.createPhaseStartEvent)(events_1.StormEventPhaseType.COMPOSE_SYSTEM));
+        //sendEvent(res, createPhaseEndEvent(StormEventPhaseType.IMPLEMENT_APIS));
+        //sendEvent(res, createPhaseStartEvent(StormEventPhaseType.COMPOSE_SYSTEM));
         const allFiles = (0, utils_1.readFilesAndContent)(srcDir, false).map((page) => {
             if (page.encoding == stream_1.HTMLPageEncoding.TEXT) {
                 const matchingFile = pagesWithImplementation.find((pageWithImpl) => pageWithImpl.fileName === page.fileName);
@@ -127,12 +128,13 @@ router.post('/ui/create-system-simple/:handle/:systemId', async (req, res) => {
             return page;
         });
         const systemUrl = await stormClient_1.stormClient.createSimpleBackend(handle, systemId, { pages: allFiles });
-        sendEvent(res, { type: 'SYSTEM_READY', created: Math.floor(Date.now() / 1000), reason: 'System Ready', payload: { systemUrl: systemUrl } });
-        sendEvent(res, (0, event_parser_1.createPhaseEndEvent)(events_1.StormEventPhaseType.COMPOSE_SYSTEM));
-        sendDone(res);
+        //sendEvent(res, {type: 'SYSTEM_READY', created: Math.floor(Date.now() / 1000), reason: 'System Ready', payload: { systemUrl: systemUrl }});
+        //sendEvent(res, createPhaseEndEvent(StormEventPhaseType.COMPOSE_SYSTEM));
+        //sendDone(res);
+        res.json({ url: systemUrl });
     }
     catch (err) {
-        sendError(err, res);
+        res.status(500).json({ error: err.message });
     }
     finally {
         if (!res.closed) {
@@ -543,6 +545,12 @@ router.post('/ui/get-vote', async (req, res) => {
 router.post('/:handle/all', async (req, res) => {
     await handleAll(req, res);
 });
+router.get('/conversations/:agentName/:systemId/redirect', async (req, res) => {
+    const aiService = (0, utils_2.getRemoteUrl)('ai-service', 'https://ai.kapeta.com');
+    const agentName = req.params.agentName;
+    const systemId = req.params.systemId;
+    res.redirect(aiService + `/v2/conversations/${encodeURIComponent(agentName)}/${encodeURIComponent(systemId)}`);
+});
 async function handleAll(req, res) {
     const handle = req.params.handle;
     const systemId = req.query.systemId ?? undefined;

package/package.json

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

package/src/storm/routes.ts

@@ -11,7 +11,13 @@ import _ from 'lodash';
 import { corsHandler } from '../middleware/cors';
 import { stringBody } from '../middleware/stringBody';
 import { KapetaBodyRequest } from '../types';
-import {HTMLPageEncoding, StormCodegenRequest, StormContextRequest, StormCreateBlockRequest, StormStream} from './stream';
+import {
+    HTMLPageEncoding,
+    StormCodegenRequest,
+    StormContextRequest,
+    StormCreateBlockRequest,
+    StormStream,
+} from './stream';
 
 import {
     ConversationIdHeader,
@@ -45,6 +51,7 @@ import { UIServer } from './UIServer';
 import { randomUUID } from 'crypto';
 import { PageQueue } from './PageGenerator';
 import { copyDirectory, createFuture, readFilesAndContent } from './utils';
+import { getRemoteUrl } from '../utils/utils';
 
 const UI_SERVERS: { [key: string]: UIServer } = {};
 const router = Router();
@@ -109,26 +116,24 @@ router.post('/ui/create-system/:handle/:systemId', async (req: KapetaBodyRequest
 
     sendEvent(res, createPhaseStartEvent(StormEventPhaseType.IMPLEMENT_APIS));
 
-    const pagesFromDisk =  readFilesAndContent(srcDir);
+    const pagesFromDisk = readFilesAndContent(srcDir);
     const pagesWithImplementation = await stormClient.replaceMockWithAPICall({
-            pages: pagesFromDisk,
-        },
-    );
+        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);
         return page ? page.content : content;
     });
 
-
     sendEvent(res, createPhaseEndEvent(StormEventPhaseType.IMPLEMENT_APIS));
 
     sendEvent(res, createPhaseStartEvent(StormEventPhaseType.COMPOSE_SYSTEM_PROMPT));
 
     // get the content of the pages
     const pageContents = pagesWithImplementation.map((page) => {
-        return page.content
-    })
+        return page.content;
+    });
 
     const prompt = await stormClient.generatePrompt(pageContents);
 
@@ -148,26 +153,27 @@ router.post('/ui/create-system-simple/:handle/:systemId', async (req: KapetaBody
     const systemId = req.params.systemId as string;
     const srcDir = getSystemBaseDir(systemId);
 
-    res.set('Content-Type', 'application/x-ndjson');
-    res.set('Access-Control-Expose-Headers', ConversationIdHeader);
-    res.set(ConversationIdHeader, systemId);
+    //res.set('Content-Type', 'application/x-ndjson');
+    //res.set('Access-Control-Expose-Headers', ConversationIdHeader);
+    //res.set(ConversationIdHeader, systemId);
 
-    sendEvent(res, createPhaseStartEvent(StormEventPhaseType.IMPLEMENT_APIS));
+    //sendEvent(res, createPhaseStartEvent(StormEventPhaseType.IMPLEMENT_APIS));
 
     try {
         const pagesFromDisk = readFilesAndContent(srcDir);
         const pagesWithImplementation = await stormClient.replaceMockWithAPICall({
-                pages: pagesFromDisk,
-            },
-        );
+            pages: pagesFromDisk,
+        });
 
-        sendEvent(res, createPhaseEndEvent(StormEventPhaseType.IMPLEMENT_APIS));
+        //sendEvent(res, createPhaseEndEvent(StormEventPhaseType.IMPLEMENT_APIS));
 
-        sendEvent(res, createPhaseStartEvent(StormEventPhaseType.COMPOSE_SYSTEM));
+        //sendEvent(res, createPhaseStartEvent(StormEventPhaseType.COMPOSE_SYSTEM));
 
         const allFiles = readFilesAndContent(srcDir, false).map((page) => {
             if (page.encoding == HTMLPageEncoding.TEXT) {
-                const matchingFile = pagesWithImplementation.find((pageWithImpl) => pageWithImpl.fileName === page.fileName);
+                const matchingFile = pagesWithImplementation.find(
+                    (pageWithImpl) => pageWithImpl.fileName === page.fileName
+                );
                 if (matchingFile) {
                     return matchingFile;
                 }
@@ -175,14 +181,15 @@ router.post('/ui/create-system-simple/:handle/:systemId', async (req: KapetaBody
             return page;
         });
 
-        const systemUrl = await stormClient.createSimpleBackend(handle, systemId, {pages: allFiles});
-        sendEvent(res, {type: 'SYSTEM_READY', created: Math.floor(Date.now() / 1000), reason: 'System Ready', payload: { systemUrl: systemUrl }});
+        const systemUrl = await stormClient.createSimpleBackend(handle, systemId, { pages: allFiles });
+        //sendEvent(res, {type: 'SYSTEM_READY', created: Math.floor(Date.now() / 1000), reason: 'System Ready', payload: { systemUrl: systemUrl }});
 
-        sendEvent(res, createPhaseEndEvent(StormEventPhaseType.COMPOSE_SYSTEM));
+        //sendEvent(res, createPhaseEndEvent(StormEventPhaseType.COMPOSE_SYSTEM));
 
-        sendDone(res);
+        //sendDone(res);
+        res.json({ url: systemUrl });
     } catch (err: any) {
-        sendError(err, res);
+        res.status(500).json({ error: err.message });
     } finally {
         if (!res.closed) {
             res.end();
@@ -673,6 +680,14 @@ router.post('/:handle/all', async (req: KapetaBodyRequest, res: Response) => {
     await handleAll(req, res);
 });
 
+router.get('/conversations/:agentName/:systemId/redirect', async (req: KapetaBodyRequest, res: Response) => {
+    const aiService = getRemoteUrl('ai-service', 'https://ai.kapeta.com');
+    const agentName = req.params.agentName as string;
+    const systemId = req.params.systemId as string;
+
+    res.redirect(aiService + `/v2/conversations/${encodeURIComponent(agentName)}/${encodeURIComponent(systemId)}`);
+});
+
 async function handleAll(req: KapetaBodyRequest, res: Response) {
     const handle = req.params.handle as string;
     const systemId = (req.query.systemId as string) ?? undefined;