@kapeta/local-cluster-service 0.75.0 → 0.76.1

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

@@ -42,7 +42,6 @@ const promises_1 = require("fs/promises");
 const path_1 = __importDefault(require("path"));
 const path_2 = __importStar(require("path"));
 const node_os_1 = __importDefault(require("node:os"));
-const fs_1 = require("fs");
 const yaml_1 = __importDefault(require("yaml"));
 const predefined_1 = require("./predefined");
 const archetype_1 = require("./archetype");
@@ -311,7 +310,7 @@ class StormCodegen {
             permissions: '0644',
         });
         const uiEvents = [];
-        const stormClient = new stormClient_1.StormClient(this.uiSystemId);
+        const stormClient = new stormClient_1.StormClient(blockUri.handle, this.uiSystemId);
         // generate screens
         if (uiTemplates.length) {
             const screenStream = await stormClient.listScreens({
@@ -439,212 +438,12 @@ class StormCodegen {
             },
         });
     }
-    async verifyAndFixCode(blockUri, blockName, codeGenerator, basePath, filesToBeFixed, allFiles) {
-        let attempts = 0;
-        let validCode = false;
-        for (let i = 0; i <= 3; i++) {
-            attempts++;
-            try {
-                console.log(`Validating the code in ${basePath} attempt #${attempts}`);
-                const result = await codeGenerator.validateForTarget(basePath);
-                if (result && result.valid) {
-                    validCode = true;
-                    break;
-                }
-                if (result && !result.valid) {
-                    console.debug('Validation error:', result);
-                    this.emitBlockStatus(blockUri, blockName, events_1.StormEventBlockStatusType.PLANNING_FIX);
-                    const errors = await this.classifyErrors(result.error, basePath);
-                    if (errors.size > 0) {
-                        this.emitBlockStatus(blockUri, blockName, events_1.StormEventBlockStatusType.FIXING);
-                        const promises = Array.from(errors.entries()).map(([filename, fileErrors]) => {
-                            if (filesToBeFixed.some((file) => file.filename === filename)) {
-                                return this.tryToFixFile(blockUri, blockName, basePath, filename, fileErrors, allFiles, codeGenerator);
-                            }
-                        });
-                        await Promise.all(promises);
-                    }
-                    this.emitBlockStatus(blockUri, blockName, events_1.StormEventBlockStatusType.FIX_DONE);
-                }
-            }
-            catch (e) {
-                console.error('Error:', e);
-            }
-        }
-        if (validCode) {
-            console.log(`Validation successful after ${attempts} attempts`);
-        }
-        else {
-            console.error(`Validation failed for ${basePath} after ${attempts} attempts`);
-        }
-    }
-    async tryToFixFile(blockUri, blockName, basePath, filename, fileErrors, allFiles, codeGenerator) {
-        console.log(`Processing ${filename}`);
-        const language = await codeGenerator.language();
-        const relevantFiles = allFiles.filter((file) => file.type != codegen_1.AIFileTypes.IGNORE);
-        for (let attempts = 1; attempts <= 5; attempts++) {
-            if (fileErrors.length == 0) {
-                console.log(`No more errors for ${filename}`);
-                return;
-            }
-            console.log(`Errors in ${filename} - requesting error details`);
-            const filesForContext = await this.getErrorDetailsForFile(basePath, filename, fileErrors[0], relevantFiles, language);
-            console.log(`Get error details for ${filename} requesting code fixes`);
-            const fix = this.createFixRequestForFile(basePath, filename, fileErrors[0], filesForContext, relevantFiles, language);
-            const codeFixFile = await this.codeFix(blockUri, blockName, fix);
-            console.log(`Got fixed code for ${filename}`);
-            const filePath = codeFixFile.filename.indexOf(basePath) > -1
-                ? codeFixFile.filename
-                : (0, path_2.join)(basePath, codeFixFile.filename);
-            const existing = (0, fs_1.readFileSync)(filePath);
-            if (existing.toString().replace(/(\r\n|\r|\n)+$/, '') == codeFixFile.content.replace(/(\r\n|\r|\n)+$/, '')) {
-                console.log(`${filename} not changed by gemini`);
-                continue;
-            }
-            (0, fs_1.writeFileSync)(filePath, codeFixFile.content);
-            const result = await codeGenerator.validateForTarget(basePath);
-            if (result && result.valid) {
-                return;
-            }
-            const errors = await this.classifyErrors(result.error, basePath);
-            fileErrors = errors.get(filename) ?? [];
-        }
-    }
-    async classifyErrors(errors, basePath) {
-        const stormClient = new stormClient_1.StormClient(this.uiSystemId);
-        const errorStream = await stormClient.createErrorClassification(errors, []);
-        const fixes = new Map();
-        this.out.on('aborted', () => {
-            errorStream.abort();
-        });
-        errorStream.on('data', (evt) => {
-            if (evt.type === 'ERROR_CLASSIFIER') {
-                const eventFileName = this.removePrefix(basePath + '/', evt.payload.filename);
-                const fix = {
-                    error: evt.payload.error,
-                    lineNumber: evt.payload.lineNumber,
-                    column: evt.payload.column,
-                };
-                let existingFixes = fixes.get(eventFileName);
-                if (existingFixes) {
-                    existingFixes.push(fix);
-                }
-                else {
-                    fixes.set(eventFileName, [fix]);
-                }
-            }
-        });
-        await errorStream.waitForDone();
-        return fixes;
-    }
-    async getErrorDetailsForFile(basePath, filename, error, allFiles, language) {
-        const filePath = filename.indexOf(basePath) > -1 ? filename : (0, path_2.join)(basePath, filename); // to compensate when compiler returns absolute path
-        return new Promise(async (resolve, reject) => {
-            const request = {
-                language: language,
-                sourceFile: {
-                    filename: filename,
-                    content: (0, fs_1.readFileSync)(filePath, 'utf8'),
-                },
-                error: error,
-                projectFiles: allFiles.map((f) => f.filename),
-            };
-            const stormClient = new stormClient_1.StormClient(this.uiSystemId);
-            const detailsStream = await stormClient.createErrorDetails(JSON.stringify(request), []);
-            detailsStream.on('data', (evt) => {
-                if (evt.type === 'ERROR_DETAILS') {
-                    resolve(evt.payload.files);
-                }
-                reject(new Error('Error details: Unexpected event [' + evt.type + ']'));
-            });
-            this.out.on('aborted', () => {
-                detailsStream.abort();
-                reject(new Error('aborted'));
-            });
-            detailsStream.on('error', (err) => {
-                reject(err);
-            });
-            await detailsStream.waitForDone();
-        });
-    }
-    createFixRequestForFile(basePath, filename, error, filesForContext, allFiles, language) {
-        const files = new Set(filesForContext);
-        files.add(filename);
-        const requestedFiles = Array.from(files).flatMap((file) => {
-            if ((0, fs_1.existsSync)(file)) {
-                return file;
-            }
-            // file does not exist - look for similar
-            const candidateName = file.split('/').pop();
-            return allFiles.filter((file) => file.filename.split('/').pop() === candidateName).map((f) => f.filename);
-        });
-        const filePath = filename.indexOf(basePath) > -1 ? filename : (0, path_2.join)(basePath, filename);
-        const content = (0, fs_1.readFileSync)(filePath, 'utf8');
-        const affectedLine = this.getErrorLine(error, content);
-        const fixRequest = {
-            language: language,
-            filename: filename,
-            error: error.error,
-            affectedLine: affectedLine,
-            projectFiles: requestedFiles.map((filename) => {
-                const filePath = filename.indexOf(basePath) > -1 ? filename : (0, path_2.join)(basePath, filename);
-                const content = (0, fs_1.readFileSync)(filePath, 'utf8');
-                return { filename: filename, content: content };
-            }),
-        };
-        return JSON.stringify(fixRequest);
-    }
-    getErrorLine(errorDetails, sourceCode) {
-        const lines = sourceCode.split('\n');
-        const errorLine = lines[errorDetails.lineNumber - 1];
-        if (!errorLine) {
-            return 'Error: Line number out of range.';
-        }
-        return errorLine;
-    }
     removePrefix(prefix, str) {
         if (str.startsWith(prefix)) {
             return str.slice(prefix.length);
         }
         return str;
     }
-    /**
-     * Sends the code to the AI for a fix
-     */
-    async codeFix(blockUri, blockName, fix, history) {
-        return new Promise(async (resolve, reject) => {
-            try {
-                const stormClient = new stormClient_1.StormClient(this.uiSystemId);
-                const fixStream = await stormClient.createCodeFix(fix, history, this.conversationId);
-                let resolved = false;
-                fixStream.on('data', (evt) => {
-                    if (this.handleFileEvents(blockUri, blockName, evt)) {
-                        return;
-                    }
-                    this.handleFileDoneOutput(blockUri, blockName, evt);
-                    if (evt.type === 'CODE_FIX') {
-                        resolved = true;
-                        resolve(evt.payload);
-                    }
-                });
-                this.out.on('aborted', () => {
-                    fixStream.abort();
-                    reject(new Error('aborted'));
-                });
-                fixStream.on('error', (err) => {
-                    reject(err);
-                });
-                fixStream.on('end', () => {
-                    if (!resolved) {
-                        reject(new Error('Code fix never returned a valid event'));
-                    }
-                });
-            }
-            catch (e) {
-                reject(e);
-            }
-        });
-    }
     /**
      * Emits the text-based files to the stream
      */

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

@@ -110,6 +110,7 @@ router.post('/ui/conversations/:systemId/append', async (req, res) => {
 });
 router.post('/ui/create-system/:handle/:systemId', async (req, res) => {
     const systemId = req.params.systemId;
+    const handle = req.params.handle;
     const srcDir = (0, page_utils_1.getSystemBaseDir)(systemId);
     const destDir = (0, page_utils_1.getSystemBaseImplDir)(systemId);
     res.set('Content-Type', 'application/x-ndjson');
@@ -117,7 +118,7 @@ router.post('/ui/create-system/:handle/:systemId', async (req, res) => {
     res.set(stormClient_1.ConversationIdHeader, systemId);
     sendEvent(res, (0, event_parser_1.createPhaseStartEvent)(events_1.StormEventPhaseType.IMPLEMENT_APIS));
     const pagesFromDisk = (0, utils_1.readFilesAndContent)(srcDir);
-    const client = new stormClient_1.StormClient(systemId);
+    const client = new stormClient_1.StormClient(handle, systemId);
     const pagesWithImplementation = await client.replaceMockWithAPICall({
         pages: pagesFromDisk,
         systemId: systemId,
@@ -151,7 +152,7 @@ router.post('/ui/create-system-simple/:handle/:systemId', async (req, res) => {
     //res.set('Access-Control-Expose-Headers', ConversationIdHeader);
     //res.set(ConversationIdHeader, systemId);
     //sendEvent(res, createPhaseStartEvent(StormEventPhaseType.IMPLEMENT_APIS));
-    const client = new stormClient_1.StormClient(systemId);
+    const client = new stormClient_1.StormClient(handle, systemId);
     try {
         const pagesFromDisk = (0, utils_1.readFilesAndContent)(srcDir);
         const pagesWithImplementation = await client.replaceMockWithAPICall({
@@ -225,8 +226,9 @@ router.delete('/ui/serve/:systemId', async (req, res) => {
     }
     res.status(200).json({ status: 'ok' });
 });
-router.post('/ui/screen', async (req, res) => {
+router.post('/:handle/ui/screen', async (req, res) => {
     try {
+        const handle = req.params.handle;
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const systemId = req.headers[page_utils_1.SystemIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
@@ -235,7 +237,7 @@ router.post('/ui/screen', async (req, res) => {
         res.set('Access-Control-Expose-Headers', stormClient_1.ConversationIdHeader);
         res.set(stormClient_1.ConversationIdHeader, conversationId);
         const parentConversationId = systemId ?? '';
-        const queue = new PageGenerator_1.PageQueue(parentConversationId, '', 5);
+        const queue = new PageGenerator_1.PageQueue(handle, parentConversationId, '', 5);
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
@@ -270,7 +272,7 @@ router.post('/:handle/ui/iterative', async (req, res) => {
     try {
         const conversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()];
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
-        const client = new stormClient_1.StormClient(conversationId); //todo is this correct we are using the landing page getConversationId down below as well
+        const client = new stormClient_1.StormClient(handle, conversationId); //todo is this correct we are using the landing page getConversationId down below as well
         const landingPagesStream = await client.createUILandingPages(aiRequest, conversationId);
         onRequestAborted(req, res, () => {
             landingPagesStream.abort();
@@ -325,7 +327,7 @@ router.post('/:handle/ui/iterative', async (req, res) => {
         waitForStormStream(landingPagesStream).then(() => {
             systemPrompt.resolve(aiRequest.prompt);
         });
-        const pageQueue = new PageGenerator_1.PageQueue(systemId, await systemPrompt.promise, 5);
+        const pageQueue = new PageGenerator_1.PageQueue(handle, systemId, await systemPrompt.promise, 5);
         onRequestAborted(req, res, () => {
             pageQueue.cancel();
         });
@@ -360,7 +362,7 @@ router.post('/:handle/ui', async (req, res) => {
     try {
         const outerConversationId = req.headers[stormClient_1.ConversationIdHeader.toLowerCase()] || (0, crypto_1.randomUUID)();
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
-        const stormClient = new stormClient_1.StormClient(outerConversationId);
+        const stormClient = new stormClient_1.StormClient(handle, outerConversationId);
         // Get user journeys
         const userJourneysStream = await stormClient.createUIUserJourneys(aiRequest, outerConversationId);
         onRequestAborted(req, res, () => {
@@ -458,7 +460,7 @@ router.post('/:handle/ui', async (req, res) => {
         onRequestAborted(req, res, () => {
             shellsStream.abort();
         });
-        const queue = new PageGenerator_1.PageQueue(outerConversationId, systemPrompt, 5);
+        const queue = new PageGenerator_1.PageQueue(handle, outerConversationId, systemPrompt, 5);
         queue.setUiTheme(theme);
         shellsStream.on('data', (data) => {
             //console.log('Processing shell event', data);
@@ -538,13 +540,14 @@ router.post('/:handle/ui', async (req, res) => {
         }
     }
 });
-router.post('/ui/edit', async (req, res) => {
+router.post('/:handle/ui/edit', async (req, res) => {
     try {
+        const handle = req.params.handle;
         const systemId = (req.headers[page_utils_1.SystemIdHeader.toLowerCase()] ||
             req.headers[stormClient_1.ConversationIdHeader.toLowerCase()]);
         const aiRequest = JSON.parse(req.stringBody ?? '{}');
         const storagePrefix = systemId ? systemId + '_' : 'mock_';
-        const queue = new PageGenerator_1.PageQueue(systemId, '', 5);
+        const queue = new PageGenerator_1.PageQueue(handle, systemId, '', 5);
         onRequestAborted(req, res, () => {
             queue.cancel();
         });
@@ -604,7 +607,7 @@ router.post('/ui/vote', async (req, res) => {
     const aiRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, vote, mainConversationId } = aiRequest;
     try {
-        const stormClient = new stormClient_1.StormClient(mainConversationId);
+        const stormClient = new stormClient_1.StormClient("", mainConversationId);
         await stormClient.voteUIPage(topic, conversationId, vote, mainConversationId);
     }
     catch (e) {
@@ -616,7 +619,7 @@ router.post('/ui/get-vote', async (req, res) => {
     const aiRequest = JSON.parse(req.stringBody ?? '{}');
     const { topic, mainConversationId } = aiRequest;
     try {
-        const stormClient = new stormClient_1.StormClient(mainConversationId);
+        const stormClient = new stormClient_1.StormClient("", mainConversationId);
         const vote = await stormClient.getVoteUIPage(topic, conversationId, mainConversationId);
         res.send({ vote });
     }
@@ -641,7 +644,7 @@ async function handleAll(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 stormClient = new stormClient_1.StormClient(systemId);
+        const stormClient = new stormClient_1.StormClient(handle, systemId);
         const metaStream = await stormClient.createMetadata(aiRequest, conversationId);
         onRequestAborted(req, res, () => {
             metaStream.abort();

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

@@ -5,6 +5,7 @@ import { Page, StormEventPageUrl } from './events';
 export declare const STORM_ID = "storm";
 export declare const ConversationIdHeader = "Conversation-Id";
 export declare const SystemIdHeader = "System-Id";
+export declare const HandleHeader = "Handle";
 export interface UIShellsPrompt {
     theme?: string;
     pages: {
@@ -59,7 +60,8 @@ export interface BasePromptRequest {
 export declare class StormClient {
     private readonly _baseUrl;
     private readonly _systemId;
-    constructor(systemId?: string);
+    private readonly _handle;
+    constructor(handle: string, systemId?: string);
     private createOptions;
     private send;
     createMetadata(prompt: BasePromptRequest, conversationId?: string): Promise<StormStream>;

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.SystemIdHeader = exports.ConversationIdHeader = exports.STORM_ID = void 0;
+exports.StormClient = exports.HandleHeader = exports.SystemIdHeader = exports.ConversationIdHeader = exports.STORM_ID = void 0;
 /**
  * Copyright 2023 Kapeta Inc.
  * SPDX-License-Identifier: BUSL-1.1
@@ -18,12 +18,15 @@ const fetchWithRetries = (0, fetch_retry_1.default)(global.fetch, { retries: 5,
 exports.STORM_ID = 'storm';
 exports.ConversationIdHeader = 'Conversation-Id';
 exports.SystemIdHeader = 'System-Id';
+exports.HandleHeader = 'Handle';
 class StormClient {
     _baseUrl;
     _systemId;
-    constructor(systemId) {
+    _handle;
+    constructor(handle, systemId) {
         this._baseUrl = (0, utils_1.getRemoteUrl)('ai-service', 'https://ai.kapeta.com');
         this._systemId = systemId || "";
+        this._handle = handle;
     }
     async createOptions(path, method, body) {
         const url = `${this._baseUrl}${path}`;
@@ -41,6 +44,9 @@ class StormClient {
         if (this._systemId) {
             headers[exports.SystemIdHeader] = this._systemId;
         }
+        if (this._handle) {
+            headers[exports.HandleHeader] = this._handle;
+        }
         return {
             url,
             method: method,
@@ -147,6 +153,7 @@ class StormClient {
             body: JSON.stringify(prompt.pages),
             headers: {
                 'systemId': prompt.systemId,
+                'conversationId': prompt.systemId,
             },
         });
         return (await response.json());

package/dist/esm/src/stormService.js

@@ -138,13 +138,13 @@ class StormService {
             gzip: true,
             filter: (entry) => !entry.includes(tarballName),
         }, ['.']);
-        const stormClient = new stormClient_1.StormClient(systemId);
+        const stormClient = new stormClient_1.StormClient(handle, systemId);
         await stormClient.uploadSystem(handle, systemId, await promises_1.default.readFile(tarballFile));
     }
     async installProjectById(handle, systemId) {
         const tarballFile = this.getConversationTarball(systemId);
         const destDir = path_1.default.dirname(tarballFile);
-        const stormClient = new stormClient_1.StormClient(systemId);
+        const stormClient = new stormClient_1.StormClient(handle, systemId);
         const buffer = await stormClient.downloadSystem(handle, systemId);
         await promises_1.default.mkdir(destDir, { recursive: true });
         await promises_1.default.writeFile(tarballFile, buffer);

package/package.json

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

package/src/storm/PageGenerator.ts

@@ -31,6 +31,7 @@ type PagePrompt = InitialPrompt & { conversationId: string; id: string };
 export class PageQueue extends EventEmitter {
     private readonly queue: PQueue;
     private readonly eventQueue: PQueue;
+    private readonly handle: string;
     private readonly systemId: string;
     private readonly systemPrompt: string;
     private readonly references: Map<string, boolean> = new Map();
@@ -39,8 +40,9 @@ export class PageQueue extends EventEmitter {
     private uiShells: UIShell[] = [];
     private theme = '';
 
-    constructor(systemId: string, systemPrompt: string, concurrency: number = 5) {
+    constructor(handle: string, systemId: string, systemPrompt: string, concurrency: number = 5) {
         super();
+        this.handle = handle;
         this.systemId = systemId;
         this.systemPrompt = systemPrompt;
         this.queue = new PQueue({ concurrency });
@@ -272,7 +274,7 @@ export class PageQueue extends EventEmitter {
             return;
         }
 
-        const client = new StormClient(this.systemId);
+        const client = new StormClient(this.handle, this.systemId);
         this.images.set(prompt.url, prompt.description);
         const result = await client.createImage(
             `Create an image for the url "${prompt.url}" with this description: ${prompt.description}`.trim()
@@ -295,7 +297,7 @@ export class PageQueue extends EventEmitter {
     }
 
     public async generate(prompt: UIPagePrompt, conversationId: string) {
-        const client = new StormClient(this.systemId);
+        const client = new StormClient(this.handle, this.systemId);
         const screenStream = await client.createUIPage(prompt, conversationId);
         let pageEvent: StormEventPage | null = null;
         screenStream.on('data', (event: StormEvent) => {
@@ -315,7 +317,7 @@ export class PageQueue extends EventEmitter {
     }
 
     private async resolveReferences(content: string): Promise<ReferenceClassification[]> {
-        const client = new StormClient(this.systemId);
+        const client = new StormClient(this.handle, this.systemId);
         const referenceStream = await client.classifyUIReferences(content);
 
         const references: ReferenceClassification[] = [];