@kapeta/local-cluster-service 0.70.8 → 0.70.9

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.70.9](https://github.com/kapetacom/local-cluster-service/compare/v0.70.8...v0.70.9) (2024-09-12)
+
+
+### Bug Fixes
+
+* converted pages are turned into a prompt and this is feed into bottoms up ([85e3c44](https://github.com/kapetacom/local-cluster-service/commit/85e3c448f3bab1b78ec4972572219b8f334d7345))
+
 ## [0.70.8](https://github.com/kapetacom/local-cluster-service/compare/v0.70.7...v0.70.8) (2024-09-12)
 
 

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

@@ -798,7 +798,7 @@ class StormCodegen {
         const codeGenerator = new codegen_1.BlockCodeGenerator(yamlContent);
         codeGenerator.withOption('AIContext', stormClient_1.STORM_ID);
         if (this.uiSystemId) {
-            codeGenerator.withOption('AIStaticFiles', (0, page_utils_1.getSystemBaseDir)(this.uiSystemId));
+            codeGenerator.withOption('AIStaticFiles', (0, page_utils_1.getSystemBaseImplDir)(this.uiSystemId));
         }
         const generatedResult = await codeGenerator.generate();
         new codegen_1.CodeWriter(basePath).write(generatedResult);

package/dist/cjs/src/storm/page-utils.d.ts

@@ -19,6 +19,7 @@ export declare function writeImageToDisk(systemId: string, event: StormImage, pr
 }>;
 export declare function hasPageOnDisk(systemId: string, method: string, path: string): boolean;
 export declare function getSystemBaseDir(systemId: string): string;
+export declare function getSystemBaseImplDir(systemId: string): string;
 export declare function resolveReadPath(systemId: string, path: string, method: string): string | null;
 export declare function readPageFromDiskAsString(systemId: string, path: string, method: string): string | null;
 export declare function readPageFromDisk(systemId: string, path: string, method: string, res: Response): void;

package/dist/cjs/src/storm/page-utils.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.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.getSystemBaseDir = exports.hasPageOnDisk = exports.writeImageToDisk = exports.writeAssetToDisk = exports.writePageToDisk = exports.normalizePath = exports.SystemIdHeader = void 0;
+exports.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.getSystemBaseImplDir = exports.getSystemBaseDir = exports.hasPageOnDisk = exports.writeImageToDisk = exports.writeAssetToDisk = exports.writePageToDisk = exports.normalizePath = exports.SystemIdHeader = void 0;
 const node_os_1 = __importDefault(require("node:os"));
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -63,6 +63,10 @@ function getSystemBaseDir(systemId) {
     return path_1.default.join(node_os_1.default.tmpdir(), 'ai-systems', systemId);
 }
 exports.getSystemBaseDir = getSystemBaseDir;
+function getSystemBaseImplDir(systemId) {
+    return path_1.default.join(node_os_1.default.tmpdir(), 'ai-systems-impl', systemId);
+}
+exports.getSystemBaseImplDir = getSystemBaseImplDir;
 function getFilePath(method) {
     // For HEAD requests, we assume we're serving looking for a GET resource
     return path_1.default.join(method === 'HEAD' ? 'get' : method.toLowerCase(), 'index.html');

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

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const express_promise_router_1 = __importDefault(require("express-promise-router"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
-const node_os_1 = __importDefault(require("node:os"));
 const lodash_1 = __importDefault(require("lodash"));
 const cors_1 = require("../middleware/cors");
 const stringBody_1 = require("../middleware/stringBody");
@@ -69,10 +68,10 @@ router.post('/ui/serve/:systemId', async (req, res) => {
     }
     res.status(200).send({ status: 'running', url: svr.getUrl() });
 });
-router.post('/ui/create-system/:systemId', async (req, res) => {
+router.post('/ui/create-system/:handle/:systemId', async (req, res) => {
     const systemId = req.params.systemId;
     const srcDir = (0, page_utils_1.getSystemBaseDir)(systemId);
-    const destDir = path_1.default.join(node_os_1.default.tmpdir(), 'ai-systems-impl', systemId);
+    const destDir = (0, page_utils_1.getSystemBaseImplDir)(systemId);
     await (0, utils_1.copyDirectory)(srcDir, destDir, async (fileName, content) => {
         const result = await stormClient_1.stormClient.implementAPIClients({
             content: content,
@@ -80,8 +79,15 @@ router.post('/ui/create-system/:systemId', async (req, res) => {
         });
         return result;
     });
-    res.end();
-    return;
+    const pages = (0, utils_1.readPages)(destDir);
+    const prompt = await stormClient_1.stormClient.generatePrompt(pages);
+    req.query.systemId = systemId;
+    const promptRequest = {
+        prompt: prompt,
+        skipImprovement: true,
+    };
+    req.stringBody = JSON.stringify(promptRequest);
+    await handleAll(req, res);
 });
 router.delete('/ui/serve/:systemId', async (req, res) => {
     const systemId = req.params.systemId;
@@ -500,6 +506,9 @@ router.post('/ui/get-vote', async (req, res) => {
     }
 });
 router.post('/:handle/all', async (req, res) => {
+    await handleAll(req, res);
+});
+async function handleAll(req, res) {
     const handle = req.params.handle;
     const systemId = req.query.systemId ?? undefined;
     try {
@@ -594,7 +603,7 @@ router.post('/:handle/all', async (req, res) => {
             res.end();
         }
     }
-});
+}
 router.post('/block/create', async (req, res) => {
     const createRequest = JSON.parse(req.stringBody ?? '{}');
     try {

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

@@ -70,6 +70,7 @@ declare class StormClient {
         vote: -1 | 0 | 1;
     }>;
     implementAPIClients(prompt: ImplementAPIClientsRequest): Promise<string>;
+    generatePrompt(pages: string[]): Promise<string>;
     classifyUIReferences(prompt: string, conversationId?: string): Promise<StormStream>;
     editPages(prompt: UIPageEditPrompt, conversationId?: string): Promise<StormStream>;
     listScreens(prompt: StormUIListPrompt, conversationId?: string): Promise<StormStream>;

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

@@ -160,6 +160,16 @@ class StormClient {
         const data = await response.text();
         return data;
     }
+    async generatePrompt(pages) {
+        const u = `${this._baseUrl}/v2/ui/prompt`;
+        const response = await (0, undici_1.fetch)(u, {
+            method: 'POST',
+            body: JSON.stringify({
+                pages: pages,
+            }),
+        });
+        return await response.text();
+    }
     classifyUIReferences(prompt, conversationId) {
         return this.send('/v2/ui/references', {
             prompt: prompt,

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

@@ -1,4 +1,5 @@
 export declare function copyDirectory(src: string, dest: string, modifyHtml: (fileName: string, content: string) => Promise<string>): Promise<void>;
+export declare function readPages(directoryPath: string): string[];
 export declare function createFuture<T = void>(): {
     promise: Promise<T>;
     resolve: (value: T | PromiseLike<T>) => void;

package/dist/cjs/src/storm/utils.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.createFuture = exports.copyDirectory = void 0;
+exports.createFuture = exports.readPages = exports.copyDirectory = void 0;
 /**
  * Copyright 2023 Kapeta Inc.
  * SPDX-License-Identifier: BUSL-1.1
@@ -29,6 +29,26 @@ async function copyDirectory(src, dest, modifyHtml) {
     }
 }
 exports.copyDirectory = copyDirectory;
+function readPages(directoryPath) {
+    const htmlFiles = [];
+    function traverseDirectory(currentPath) {
+        const files = fs_extra_1.default.readdirSync(currentPath);
+        for (const file of files) {
+            const filePath = path_1.default.join(currentPath, file);
+            const stats = fs_extra_1.default.statSync(filePath);
+            if (stats.isDirectory()) {
+                traverseDirectory(filePath);
+            }
+            else if (stats.isFile() && path_1.default.extname(filePath) === '.html') {
+                const content = fs_extra_1.default.readFileSync(filePath, 'utf8');
+                htmlFiles.push(content);
+            }
+        }
+    }
+    traverseDirectory(directoryPath);
+    return htmlFiles;
+}
+exports.readPages = readPages;
 function createFuture() {
     let resolve = () => { };
     let reject = () => { };

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

@@ -798,7 +798,7 @@ class StormCodegen {
         const codeGenerator = new codegen_1.BlockCodeGenerator(yamlContent);
         codeGenerator.withOption('AIContext', stormClient_1.STORM_ID);
         if (this.uiSystemId) {
-            codeGenerator.withOption('AIStaticFiles', (0, page_utils_1.getSystemBaseDir)(this.uiSystemId));
+            codeGenerator.withOption('AIStaticFiles', (0, page_utils_1.getSystemBaseImplDir)(this.uiSystemId));
         }
         const generatedResult = await codeGenerator.generate();
         new codegen_1.CodeWriter(basePath).write(generatedResult);

package/dist/esm/src/storm/page-utils.d.ts

@@ -19,6 +19,7 @@ export declare function writeImageToDisk(systemId: string, event: StormImage, pr
 }>;
 export declare function hasPageOnDisk(systemId: string, method: string, path: string): boolean;
 export declare function getSystemBaseDir(systemId: string): string;
+export declare function getSystemBaseImplDir(systemId: string): string;
 export declare function resolveReadPath(systemId: string, path: string, method: string): string | null;
 export declare function readPageFromDiskAsString(systemId: string, path: string, method: string): string | null;
 export declare function readPageFromDisk(systemId: string, path: string, method: string, res: Response): void;

package/dist/esm/src/storm/page-utils.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.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.getSystemBaseDir = exports.hasPageOnDisk = exports.writeImageToDisk = exports.writeAssetToDisk = exports.writePageToDisk = exports.normalizePath = exports.SystemIdHeader = void 0;
+exports.writeConversationToFile = exports.readConversationFromFile = exports.readPageFromDisk = exports.readPageFromDiskAsString = exports.resolveReadPath = exports.getSystemBaseImplDir = exports.getSystemBaseDir = exports.hasPageOnDisk = exports.writeImageToDisk = exports.writeAssetToDisk = exports.writePageToDisk = exports.normalizePath = exports.SystemIdHeader = void 0;
 const node_os_1 = __importDefault(require("node:os"));
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -63,6 +63,10 @@ function getSystemBaseDir(systemId) {
     return path_1.default.join(node_os_1.default.tmpdir(), 'ai-systems', systemId);
 }
 exports.getSystemBaseDir = getSystemBaseDir;
+function getSystemBaseImplDir(systemId) {
+    return path_1.default.join(node_os_1.default.tmpdir(), 'ai-systems-impl', systemId);
+}
+exports.getSystemBaseImplDir = getSystemBaseImplDir;
 function getFilePath(method) {
     // For HEAD requests, we assume we're serving looking for a GET resource
     return path_1.default.join(method === 'HEAD' ? 'get' : method.toLowerCase(), 'index.html');

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

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const express_promise_router_1 = __importDefault(require("express-promise-router"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
-const node_os_1 = __importDefault(require("node:os"));
 const lodash_1 = __importDefault(require("lodash"));
 const cors_1 = require("../middleware/cors");
 const stringBody_1 = require("../middleware/stringBody");
@@ -69,10 +68,10 @@ router.post('/ui/serve/:systemId', async (req, res) => {
     }
     res.status(200).send({ status: 'running', url: svr.getUrl() });
 });
-router.post('/ui/create-system/:systemId', async (req, res) => {
+router.post('/ui/create-system/:handle/:systemId', async (req, res) => {
     const systemId = req.params.systemId;
     const srcDir = (0, page_utils_1.getSystemBaseDir)(systemId);
-    const destDir = path_1.default.join(node_os_1.default.tmpdir(), 'ai-systems-impl', systemId);
+    const destDir = (0, page_utils_1.getSystemBaseImplDir)(systemId);
     await (0, utils_1.copyDirectory)(srcDir, destDir, async (fileName, content) => {
         const result = await stormClient_1.stormClient.implementAPIClients({
             content: content,
@@ -80,8 +79,15 @@ router.post('/ui/create-system/:systemId', async (req, res) => {
         });
         return result;
     });
-    res.end();
-    return;
+    const pages = (0, utils_1.readPages)(destDir);
+    const prompt = await stormClient_1.stormClient.generatePrompt(pages);
+    req.query.systemId = systemId;
+    const promptRequest = {
+        prompt: prompt,
+        skipImprovement: true,
+    };
+    req.stringBody = JSON.stringify(promptRequest);
+    await handleAll(req, res);
 });
 router.delete('/ui/serve/:systemId', async (req, res) => {
     const systemId = req.params.systemId;
@@ -500,6 +506,9 @@ router.post('/ui/get-vote', async (req, res) => {
     }
 });
 router.post('/:handle/all', async (req, res) => {
+    await handleAll(req, res);
+});
+async function handleAll(req, res) {
     const handle = req.params.handle;
     const systemId = req.query.systemId ?? undefined;
     try {
@@ -594,7 +603,7 @@ router.post('/:handle/all', async (req, res) => {
             res.end();
         }
     }
-});
+}
 router.post('/block/create', async (req, res) => {
     const createRequest = JSON.parse(req.stringBody ?? '{}');
     try {

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

@@ -70,6 +70,7 @@ declare class StormClient {
         vote: -1 | 0 | 1;
     }>;
     implementAPIClients(prompt: ImplementAPIClientsRequest): Promise<string>;
+    generatePrompt(pages: string[]): Promise<string>;
     classifyUIReferences(prompt: string, conversationId?: string): Promise<StormStream>;
     editPages(prompt: UIPageEditPrompt, conversationId?: string): Promise<StormStream>;
     listScreens(prompt: StormUIListPrompt, conversationId?: string): Promise<StormStream>;

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

@@ -160,6 +160,16 @@ class StormClient {
         const data = await response.text();
         return data;
     }
+    async generatePrompt(pages) {
+        const u = `${this._baseUrl}/v2/ui/prompt`;
+        const response = await (0, undici_1.fetch)(u, {
+            method: 'POST',
+            body: JSON.stringify({
+                pages: pages,
+            }),
+        });
+        return await response.text();
+    }
     classifyUIReferences(prompt, conversationId) {
         return this.send('/v2/ui/references', {
             prompt: prompt,

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

@@ -1,4 +1,5 @@
 export declare function copyDirectory(src: string, dest: string, modifyHtml: (fileName: string, content: string) => Promise<string>): Promise<void>;
+export declare function readPages(directoryPath: string): string[];
 export declare function createFuture<T = void>(): {
     promise: Promise<T>;
     resolve: (value: T | PromiseLike<T>) => void;

package/dist/esm/src/storm/utils.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.createFuture = exports.copyDirectory = void 0;
+exports.createFuture = exports.readPages = exports.copyDirectory = void 0;
 /**
  * Copyright 2023 Kapeta Inc.
  * SPDX-License-Identifier: BUSL-1.1
@@ -29,6 +29,26 @@ async function copyDirectory(src, dest, modifyHtml) {
     }
 }
 exports.copyDirectory = copyDirectory;
+function readPages(directoryPath) {
+    const htmlFiles = [];
+    function traverseDirectory(currentPath) {
+        const files = fs_extra_1.default.readdirSync(currentPath);
+        for (const file of files) {
+            const filePath = path_1.default.join(currentPath, file);
+            const stats = fs_extra_1.default.statSync(filePath);
+            if (stats.isDirectory()) {
+                traverseDirectory(filePath);
+            }
+            else if (stats.isFile() && path_1.default.extname(filePath) === '.html') {
+                const content = fs_extra_1.default.readFileSync(filePath, 'utf8');
+                htmlFiles.push(content);
+            }
+        }
+    }
+    traverseDirectory(directoryPath);
+    return htmlFiles;
+}
+exports.readPages = readPages;
 function createFuture() {
     let resolve = () => { };
     let reject = () => { };

package/package.json

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

package/src/storm/codegen.ts

@@ -39,7 +39,7 @@ import YAML from 'yaml';
 import { PREDEFINED_BLOCKS } from './predefined';
 import { Archetype } from './archetype';
 import _ from 'lodash';
-import { getSystemBaseDir } from './page-utils';
+import { getSystemBaseImplDir } from './page-utils';
 
 type ImplementationGenerator<T = StormFileImplementationPrompt> = (
     prompt: T,
@@ -1019,7 +1019,7 @@ export class StormCodegen {
         codeGenerator.withOption('AIContext', STORM_ID);
 
         if (this.uiSystemId) {
-            codeGenerator.withOption('AIStaticFiles', getSystemBaseDir(this.uiSystemId));
+            codeGenerator.withOption('AIStaticFiles', getSystemBaseImplDir(this.uiSystemId));
         }
 
         const generatedResult = await codeGenerator.generate();

package/src/storm/page-utils.ts

@@ -78,6 +78,10 @@ export function getSystemBaseDir(systemId: string) {
     return Path.join(os.tmpdir(), 'ai-systems', systemId);
 }
 
+export function getSystemBaseImplDir(systemId: string) {
+    return Path.join(os.tmpdir(), 'ai-systems-impl', systemId);
+}
+
 function getFilePath(method: string) {
     // For HEAD requests, we assume we're serving looking for a GET resource
     return Path.join(method === 'HEAD' ? 'get' : method.toLowerCase(), 'index.html');

package/src/storm/routes.ts

@@ -7,7 +7,6 @@ import Router from 'express-promise-router';
 import FS from 'fs-extra';
 import { Response } from 'express';
 import Path from 'path';
-import os from 'node:os';
 import _ from 'lodash';
 import { corsHandler } from '../middleware/cors';
 import { stringBody } from '../middleware/stringBody';
@@ -37,6 +36,7 @@ import { assetManager } from '../assetManager';
 import uuid from 'node-uuid';
 import {
     getSystemBaseDir,
+    getSystemBaseImplDir,
     readPageFromDisk,
     resolveReadPath,
     SystemIdHeader,
@@ -47,7 +47,7 @@ import {
 import { UIServer } from './UIServer';
 import { randomUUID } from 'crypto';
 import { ImagePrompt, PageQueue } from './PageGenerator';
-import { copyDirectory, createFuture } from './utils';
+import { copyDirectory, createFuture, readPages } from './utils';
 
 const UI_SERVERS: { [key: string]: UIServer } = {};
 const router = Router();
@@ -101,10 +101,10 @@ router.post('/ui/serve/:systemId', async (req: KapetaBodyRequest, res: Response)
     res.status(200).send({ status: 'running', url: svr.getUrl() });
 });
 
-router.post('/ui/create-system/:systemId', async (req: KapetaBodyRequest, res: Response) => {
+router.post('/ui/create-system/:handle/:systemId', async (req: KapetaBodyRequest, res: Response) => {
     const systemId = req.params.systemId as string;
     const srcDir = getSystemBaseDir(systemId);
-    const destDir = Path.join(os.tmpdir(), 'ai-systems-impl', systemId);
+    const destDir = getSystemBaseImplDir(systemId);
 
     await copyDirectory(srcDir, destDir, async (fileName, content) => {
         const result = await stormClient.implementAPIClients({
@@ -114,8 +114,17 @@ router.post('/ui/create-system/:systemId', async (req: KapetaBodyRequest, res: R
         return result;
     });
 
-    res.end();
-    return;
+    const pages = readPages(destDir);
+    const prompt = await stormClient.generatePrompt(pages);
+
+    req.query.systemId = systemId;
+    const promptRequest: BasePromptRequest = {
+        prompt: prompt,
+        skipImprovement: true,
+    };
+    req.stringBody = JSON.stringify(promptRequest);
+
+    await handleAll(req, res);
 });
 
 router.delete('/ui/serve/:systemId', async (req: KapetaBodyRequest, res: Response) => {
@@ -613,6 +622,10 @@ router.post('/ui/get-vote', async (req: KapetaBodyRequest, res: Response) => {
 });
 
 router.post('/:handle/all', async (req: KapetaBodyRequest, res: Response) => {
+    await handleAll(req, res);
+});
+
+async function handleAll(req: KapetaBodyRequest, res: Response) {
     const handle = req.params.handle as string;
     const systemId = (req.query.systemId as string) ?? undefined;
 
@@ -731,7 +744,7 @@ router.post('/:handle/all', async (req: KapetaBodyRequest, res: Response) => {
             res.end();
         }
     }
-});
+}
 
 router.post('/block/create', async (req: KapetaBodyRequest, res: Response) => {
     const createRequest: StormCreateBlockRequest = JSON.parse(req.stringBody ?? '{}');

package/src/storm/stormClient.ts

@@ -267,6 +267,17 @@ class StormClient {
         return data;
     }
 
+    public async generatePrompt(pages: string[]): Promise<string> {
+        const u = `${this._baseUrl}/v2/ui/prompt`;
+        const response = await fetch(u, {
+            method: 'POST',
+            body: JSON.stringify({
+                pages: pages,
+            }),
+        });
+        return await response.text();
+    }
+
     public classifyUIReferences(prompt: string, conversationId?: string) {
         return this.send('/v2/ui/references', {
             prompt: prompt,

package/src/storm/utils.ts

@@ -31,6 +31,29 @@ export async function copyDirectory(
     }
 }
 
+export function readPages(directoryPath: string): string[] {
+    const htmlFiles: string[] = [];
+
+    function traverseDirectory(currentPath: string) {
+        const files = FS.readdirSync(currentPath);
+
+        for (const file of files) {
+            const filePath = Path.join(currentPath, file);
+            const stats = FS.statSync(filePath);
+
+            if (stats.isDirectory()) {
+                traverseDirectory(filePath);
+            } else if (stats.isFile() && Path.extname(filePath) === '.html') {
+                const content = FS.readFileSync(filePath, 'utf8');
+                htmlFiles.push(content);
+            }
+        }
+    }
+
+    traverseDirectory(directoryPath);
+    return htmlFiles;
+}
+
 export function createFuture<T = void>() {
     let resolve: (value: T | PromiseLike<T>) => void = () => {};
     let reject: (reason?: any) => void = () => {};