berget 2.2.6 → 2.2.8

package/dist/src/commands/chat.js

@@ -1,83 +1,47 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerChatCommands = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const readline_1 = __importDefault(require("readline"));
+const node_readline_1 = __importDefault(require("node:readline"));
 const command_structure_1 = require("../constants/command-structure");
-const chat_service_1 = require("../services/chat-service");
 const api_key_service_1 = require("../services/api-key-service");
 const auth_service_1 = require("../services/auth-service");
-const error_handler_1 = require("../utils/error-handler");
+const chat_service_1 = require("../services/chat-service");
 const default_api_key_1 = require("../utils/default-api-key");
+const error_handler_1 = require("../utils/error-handler");
 const markdown_renderer_1 = require("../utils/markdown-renderer");
-/**
- * Helper function to get user confirmation
- */
-function confirm(question) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const rl = readline_1.default.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-        });
-        return new Promise((resolve) => {
-            rl.question(question, (answer) => {
-                rl.close();
-                resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
-            });
-        });
-    });
-}
 /**
  * Register chat commands
  */
 function registerChatCommands(program) {
-    const chat = program
-        .command(command_structure_1.COMMAND_GROUPS.CHAT)
-        .description('Interact with AI chat models');
+    const chat = program.command(command_structure_1.COMMAND_GROUPS.CHAT).description('Interact with AI chat models');
     chat
         .command(command_structure_1.SUBCOMMANDS.CHAT.RUN)
         .description('Run a chat session with a specified model')
         .argument('[message]', 'Message to send directly (skips interactive mode)')
         .option('-m, --model <model>', 'Model to use (default: glm-4.7)')
-        .option('-t, --temperature <temp>', 'Temperature (0-1)', parseFloat)
-        .option('--max-tokens <tokens>', 'Maximum tokens to generate', parseInt)
+        .option('-t, --temperature <temp>', 'Temperature (0-1)', Number.parseFloat)
+        .option('--max-tokens <tokens>', 'Maximum tokens to generate', Number.parseInt)
         .option('-k, --api-key <key>', 'API key to use for this chat session')
         .option('--api-key-id <id>', 'ID of the API key to use from your saved keys')
         .option('--no-stream', 'Disable streaming (streaming is enabled by default)')
-        .action((message, options) => __awaiter(this, void 0, void 0, function* () {
-        var _a, e_1, _b, _c;
+        .action(async (message, options) => {
         try {
             const chatService = chat_service_1.ChatService.getInstance();
             // Check if we have an API key or need to get one
             let apiKey = options.apiKey;
             let apiKeyId = options.apiKeyId;
             // Check for environment variable first
-            const envApiKey = process.env.BERGET_API_KEY;
-            if (envApiKey) {
+            const environmentApiKey = process.env.BERGET_API_KEY;
+            if (environmentApiKey) {
                 console.log(chalk_1.default.dim(`Using API key from BERGET_API_KEY environment variable`));
-                apiKey = envApiKey;
+                apiKey = environmentApiKey;
                 // Debug the API key (first few characters only)
                 if (process.argv.includes('--debug')) {
-                    console.log(chalk_1.default.yellow(`DEBUG: API key from env starts with: ${envApiKey.substring(0, 4)}...`));
+                    console.log(chalk_1.default.yellow(`DEBUG: API key from env starts with: ${environmentApiKey.slice(0, 4)}...`));
                 }
             }
             // If API key is already provided via command line, use it
@@ -105,7 +69,7 @@ function registerChatCommands(program) {
                         // No default API key, prompt the user to create one
                         console.log(chalk_1.default.yellow('No default API key set.'));
                         // Try to prompt for a default API key
-                        apiKey = yield defaultApiKeyManager.promptForDefaultApiKey();
+                        apiKey = await defaultApiKeyManager.promptForDefaultApiKey();
                         if (!apiKey) {
                             console.log(chalk_1.default.red('Error: An API key is required to use the chat command.'));
                             console.log(chalk_1.default.yellow('You can:'));
@@ -127,16 +91,13 @@ function registerChatCommands(program) {
             if (!apiKey && apiKeyId) {
                 try {
                     const apiKeyService = api_key_service_1.ApiKeyService.getInstance();
-                    const keys = yield apiKeyService.list();
+                    const keys = await apiKeyService.list();
                     const selectedKey = keys.find((key) => key.id.toString() === options.apiKeyId);
-                    if (!selectedKey) {
-                        console.log(chalk_1.default.yellow(`API key with ID ${options.apiKeyId} not found. Using default authentication.`));
-                    }
-                    else {
+                    if (selectedKey) {
                         console.log(chalk_1.default.dim(`Using API key: ${selectedKey.name}`));
                         // We need to rotate the key to get the actual key value
-                        if (yield confirm(chalk_1.default.yellow(`To use API key "${selectedKey.name}", it needs to be rotated. This will invalidate the current key. Continue? (y/n)`))) {
-                            const rotatedKey = yield apiKeyService.rotate(options.apiKeyId);
+                        if (await confirm(chalk_1.default.yellow(`To use API key "${selectedKey.name}", it needs to be rotated. This will invalidate the current key. Continue? (y/n)`))) {
+                            const rotatedKey = await apiKeyService.rotate(options.apiKeyId);
                             apiKey = rotatedKey.key;
                             console.log(chalk_1.default.green(`API key "${selectedKey.name}" rotated successfully.`));
                         }
@@ -144,6 +105,9 @@ function registerChatCommands(program) {
                             console.log(chalk_1.default.yellow('Using default authentication instead.'));
                         }
                     }
+                    else {
+                        console.log(chalk_1.default.yellow(`API key with ID ${options.apiKeyId} not found. Using default authentication.`));
+                    }
                 }
                 catch (error) {
                     // Check if this is an authentication error
@@ -166,7 +130,7 @@ function registerChatCommands(program) {
                 try {
                     auth_service_1.AuthService.getInstance();
                 }
-                catch (error) {
+                catch {
                     console.log(chalk_1.default.red('Error: Authentication required for chat'));
                     console.log(chalk_1.default.yellow('Please either:'));
                     console.log(chalk_1.default.yellow('1. Log in with `berget auth login`'));
@@ -181,8 +145,8 @@ function registerChatCommands(program) {
             // Add system message if provided
             if (options.system) {
                 messages.push({
-                    role: 'system',
                     content: options.system,
+                    role: 'system',
                 });
             }
             // Check if input is being piped in
@@ -191,20 +155,8 @@ function registerChatCommands(program) {
             if (!process.stdin.isTTY) {
                 // Read from stdin (piped input)
                 const chunks = [];
-                try {
-                    for (var _d = true, _e = __asyncValues(process.stdin), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
-                        _c = _f.value;
-                        _d = false;
-                        const chunk = _c;
-                        chunks.push(chunk);
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
-                    }
-                    finally { if (e_1) throw e_1.error; }
+                for await (const chunk of process.stdin) {
+                    chunks.push(chunk);
                 }
                 stdinContent = Buffer.concat(chunks).toString('utf8').trim();
             }
@@ -219,17 +171,17 @@ function registerChatCommands(program) {
             if (inputMessage) {
                 // Add user message
                 messages.push({
-                    role: 'user',
                     content: inputMessage,
+                    role: 'user',
                 });
                 try {
                     // Call the API
                     const completionOptions = {
-                        model: options.model || 'openai/gpt-oss',
-                        messages: messages,
-                        temperature: options.temperature !== undefined ? options.temperature : 0.7,
                         max_tokens: options.maxTokens || 4096,
+                        messages: messages,
+                        model: options.model || 'openai/gpt-oss',
                         stream: options.stream !== false,
+                        temperature: options.temperature === undefined ? 0.7 : options.temperature,
                     };
                     // Only add apiKey if it actually exists
                     if (apiKey) {
@@ -260,7 +212,7 @@ function registerChatCommands(program) {
                             }
                         };
                         try {
-                            yield chatService.createCompletion(completionOptions);
+                            await chatService.createCompletion(completionOptions);
                         }
                         catch (streamError) {
                             console.error(chalk_1.default.red('\nStreaming error:'), streamError);
@@ -268,7 +220,7 @@ function registerChatCommands(program) {
                             console.log(chalk_1.default.yellow('Falling back to non-streaming mode...'));
                             completionOptions.stream = false;
                             delete completionOptions.onChunk;
-                            const response = yield chatService.createCompletion(completionOptions);
+                            const response = await chatService.createCompletion(completionOptions);
                             if (response &&
                                 response.choices &&
                                 response.choices[0] &&
@@ -280,7 +232,7 @@ function registerChatCommands(program) {
                         console.log(); // Add newline at the end
                         return;
                     }
-                    const response = yield chatService.createCompletion(completionOptions);
+                    const response = await chatService.createCompletion(completionOptions);
                     // Check if response has the expected structure
                     if (!response ||
                         !response.choices ||
@@ -310,7 +262,7 @@ function registerChatCommands(program) {
                 }
             }
             // Set up readline interface for user input (only for interactive mode)
-            const rl = readline_1.default.createInterface({
+            const rl = node_readline_1.default.createInterface({
                 input: process.stdin,
                 output: process.stdout,
             });
@@ -318,7 +270,7 @@ function registerChatCommands(program) {
             console.log(chalk_1.default.cyan('----------------------------------------'));
             // Start the conversation loop
             const askQuestion = () => {
-                rl.question(chalk_1.default.green('You: '), (input) => __awaiter(this, void 0, void 0, function* () {
+                rl.question(chalk_1.default.green('You: '), async (input) => {
                     // Check if user wants to exit
                     if (input.toLowerCase() === 'exit') {
                         console.log(chalk_1.default.cyan('Goodbye!'));
@@ -327,17 +279,17 @@ function registerChatCommands(program) {
                     }
                     // Add user message
                     messages.push({
-                        role: 'user',
                         content: input,
+                        role: 'user',
                     });
                     try {
                         // Call the API
                         const completionOptions = {
-                            model: options.model || 'openai/gpt-oss',
-                            messages: messages,
-                            temperature: options.temperature !== undefined ? options.temperature : 0.7,
                             max_tokens: options.maxTokens || 4096,
+                            messages: messages,
+                            model: options.model || 'openai/gpt-oss',
                             stream: options.stream !== false,
+                            temperature: options.temperature === undefined ? 0.7 : options.temperature,
                         };
                         // Only add apiKey if it actually exists
                         if (apiKey) {
@@ -369,7 +321,7 @@ function registerChatCommands(program) {
                                 }
                             };
                             try {
-                                yield chatService.createCompletion(completionOptions);
+                                await chatService.createCompletion(completionOptions);
                             }
                             catch (streamError) {
                                 console.error(chalk_1.default.red('\nStreaming error:'), streamError);
@@ -377,7 +329,7 @@ function registerChatCommands(program) {
                                 console.log(chalk_1.default.yellow('Falling back to non-streaming mode...'));
                                 completionOptions.stream = false;
                                 delete completionOptions.onChunk;
-                                const response = yield chatService.createCompletion(completionOptions);
+                                const response = await chatService.createCompletion(completionOptions);
                                 if (response &&
                                     response.choices &&
                                     response.choices[0] &&
@@ -389,14 +341,14 @@ function registerChatCommands(program) {
                             console.log('\n');
                             // Add assistant response to messages
                             messages.push({
-                                role: 'assistant',
                                 content: assistantResponse,
+                                role: 'assistant',
                             });
                             // Continue the conversation
                             askQuestion();
                             return;
                         }
-                        const response = yield chatService.createCompletion(completionOptions);
+                        const response = await chatService.createCompletion(completionOptions);
                         // Debug output
                         if (program.opts().debug) {
                             console.log(chalk_1.default.yellow('DEBUG: Full response:'));
@@ -415,8 +367,8 @@ function registerChatCommands(program) {
                         const assistantMessage = response.choices[0].message.content;
                         // Add to messages array
                         messages.push({
-                            role: 'assistant',
                             content: assistantMessage,
+                            role: 'assistant',
                         });
                         // Display the response
                         console.log(chalk_1.default.blue('Assistant: '));
@@ -439,7 +391,7 @@ function registerChatCommands(program) {
                         // Continue despite error
                         askQuestion();
                     }
-                }));
+                });
             };
             // Start the conversation
             askQuestion();
@@ -447,13 +399,13 @@ function registerChatCommands(program) {
         catch (error) {
             (0, error_handler_1.handleError)('Failed to create chat completion', error);
         }
-    }));
+    });
     chat
         .command(command_structure_1.SUBCOMMANDS.CHAT.LIST)
         .description('List available chat models')
         .option('-k, --api-key <key>', 'API key to use for this request')
         .option('--api-key-id <id>', 'ID of the API key to use from your saved keys')
-        .action((options) => __awaiter(this, void 0, void 0, function* () {
+        .action(async (options) => {
         try {
             // If API key ID is provided, fetch the actual key
             let apiKey = options.apiKey;
@@ -470,16 +422,13 @@ function registerChatCommands(program) {
             if (apiKeyId && !apiKey) {
                 try {
                     const apiKeyService = api_key_service_1.ApiKeyService.getInstance();
-                    const keys = yield apiKeyService.list();
+                    const keys = await apiKeyService.list();
                     const selectedKey = keys.find((key) => key.id.toString() === options.apiKeyId);
-                    if (!selectedKey) {
-                        console.log(chalk_1.default.yellow(`API key with ID ${options.apiKeyId} not found. Using default authentication.`));
-                    }
-                    else {
+                    if (selectedKey) {
                         console.log(chalk_1.default.dim(`Using API key: ${selectedKey.name}`));
                         // We need to rotate the key to get the actual key value
-                        if (yield confirm(chalk_1.default.yellow(`To use API key "${selectedKey.name}", it needs to be rotated. This will invalidate the current key. Continue? (y/n)`))) {
-                            const rotatedKey = yield apiKeyService.rotate(options.apiKeyId);
+                        if (await confirm(chalk_1.default.yellow(`To use API key "${selectedKey.name}", it needs to be rotated. This will invalidate the current key. Continue? (y/n)`))) {
+                            const rotatedKey = await apiKeyService.rotate(options.apiKeyId);
                             apiKey = rotatedKey.key;
                             console.log(chalk_1.default.green(`API key "${selectedKey.name}" rotated successfully.`));
                         }
@@ -487,6 +436,9 @@ function registerChatCommands(program) {
                             console.log(chalk_1.default.yellow('Using default authentication instead.'));
                         }
                     }
+                    else {
+                        console.log(chalk_1.default.yellow(`API key with ID ${options.apiKeyId} not found. Using default authentication.`));
+                    }
                 }
                 catch (error) {
                     console.error(chalk_1.default.red('Error fetching API key:'));
@@ -495,7 +447,7 @@ function registerChatCommands(program) {
                 }
             }
             const chatService = chat_service_1.ChatService.getInstance();
-            const models = yield chatService.listModels(apiKey);
+            const models = await chatService.listModels(apiKey);
             // Debug output
             if (program.opts().debug) {
                 console.log(chalk_1.default.yellow('DEBUG: Models response:'));
@@ -523,6 +475,21 @@ function registerChatCommands(program) {
         catch (error) {
             (0, error_handler_1.handleError)('Failed to list chat models', error);
         }
-    }));
+    });
 }
 exports.registerChatCommands = registerChatCommands;
+/**
+ * Helper function to get user confirmation
+ */
+async function confirm(question) {
+    const rl = node_readline_1.default.createInterface({
+        input: process.stdin,
+        output: process.stdout,
+    });
+    return new Promise((resolve) => {
+        rl.question(question, (answer) => {
+            rl.close();
+            resolve(answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes');
+        });
+    });
+}

package/dist/src/commands/clusters.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerClusterCommands = void 0;
 const cluster_service_1 = require("../services/cluster-service");
@@ -22,10 +13,10 @@ function registerClusterCommands(program) {
     cluster
         .command(cluster_service_1.ClusterService.COMMANDS.LIST)
         .description('List all Berget clusters')
-        .action(() => __awaiter(this, void 0, void 0, function* () {
+        .action(async () => {
         try {
             const clusterService = cluster_service_1.ClusterService.getInstance();
-            const clusters = yield clusterService.list();
+            const clusters = await clusterService.list();
             console.log('NAME                   STATUS    NODES    CREATED');
             clusters.forEach((cluster) => {
                 console.log(`${cluster.name.padEnd(22)} ${cluster.status.padEnd(9)} ${String(cluster.nodes).padEnd(8)} ${cluster.created}`);
@@ -34,36 +25,36 @@ function registerClusterCommands(program) {
         catch (error) {
             (0, error_handler_1.handleError)('Failed to list clusters', error);
         }
-    }));
+    });
     cluster
         .command(cluster_service_1.ClusterService.COMMANDS.GET_USAGE)
         .description('Get usage metrics for a specific cluster')
         .argument('<clusterId>', 'Cluster ID')
-        .action((clusterId) => __awaiter(this, void 0, void 0, function* () {
+        .action(async (clusterId) => {
         try {
             const clusterService = cluster_service_1.ClusterService.getInstance();
-            const usage = yield clusterService.getUsage(clusterId);
+            const usage = await clusterService.getUsage(clusterId);
             console.log('Cluster Usage:');
             console.log(JSON.stringify(usage, null, 2));
         }
         catch (error) {
             (0, error_handler_1.handleError)('Failed to get cluster usage', error);
         }
-    }));
+    });
     cluster
         .command(cluster_service_1.ClusterService.COMMANDS.DESCRIBE)
         .description('Get detailed information about a cluster')
         .argument('<clusterId>', 'Cluster ID')
-        .action((clusterId) => __awaiter(this, void 0, void 0, function* () {
+        .action(async (clusterId) => {
         try {
             const clusterService = cluster_service_1.ClusterService.getInstance();
-            const clusterInfo = yield clusterService.describe(clusterId);
+            const clusterInfo = await clusterService.describe(clusterId);
             console.log('Cluster Details:');
             console.log(JSON.stringify(clusterInfo, null, 2));
         }
         catch (error) {
             (0, error_handler_1.handleError)('Failed to describe cluster', error);
         }
-    }));
+    });
 }
 exports.registerClusterCommands = registerClusterCommands;