berget 1.2.0 → 1.3.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "berget",
-    "version": "1.2.0",
+    "version": "1.3.1",
     "main": "dist/index.js",
     "bin": {
         "berget": "dist/index.js"
@@ -19,6 +19,8 @@
     "license": "MIT",
     "description": "This is a cli command for interacting with the AI infrastructure provider Berget",
     "devDependencies": {
+        "@types/marked": "^5.0.2",
+        "@types/marked-terminal": "^6.1.1",
         "@types/node": "^20.11.20",
         "tsx": "^4.19.3",
         "typescript": "^5.3.3"
@@ -27,6 +29,8 @@
         "chalk": "^4.1.2",
         "commander": "^12.0.0",
         "fs-extra": "^11.3.0",
+        "marked": "^9.1.6",
+        "marked-terminal": "^6.2.0",
         "open": "^9.1.0",
         "openapi-fetch": "^0.9.1",
         "openapi-typescript": "^6.7.4",

package/dist/src/client.js

@@ -12,21 +12,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAuthenticatedClient = exports.clearAuthToken = exports.saveAuthToken = exports.getAuthToken = exports.apiClient = void 0;
+exports.createAuthenticatedClient = exports.clearAuthToken = exports.saveAuthToken = exports.getAuthToken = exports.apiClient = exports.API_BASE_URL = void 0;
 const openapi_fetch_1 = __importDefault(require("openapi-fetch"));
 const chalk_1 = __importDefault(require("chalk"));
 const token_manager_1 = require("./utils/token-manager");
+const logger_1 = require("./utils/logger");
 // API Base URL
 // Use --local flag to test against local API
 const isLocalMode = process.argv.includes('--local');
-const API_BASE_URL = process.env.BERGET_API_URL ||
+exports.API_BASE_URL = process.env.BERGET_API_URL ||
     (isLocalMode ? 'http://localhost:3000' : 'https://api.berget.ai');
-if (isLocalMode && !process.env.BERGET_API_URL && process.argv.includes('--debug')) {
-    console.log(chalk_1.default.yellow('Using local API endpoint: http://localhost:3000'));
+if (isLocalMode && !process.env.BERGET_API_URL) {
+    logger_1.logger.debug('Using local API endpoint: http://localhost:3000');
 }
 // Create a typed client for the Berget API
 exports.apiClient = (0, openapi_fetch_1.default)({
-    baseUrl: API_BASE_URL,
+    baseUrl: exports.API_BASE_URL,
     headers: {
         'Content-Type': 'application/json',
         Accept: 'application/json',
@@ -51,12 +52,12 @@ exports.clearAuthToken = clearAuthToken;
 // Create an authenticated client with refresh token support
 const createAuthenticatedClient = () => {
     const tokenManager = token_manager_1.TokenManager.getInstance();
-    if (!tokenManager.getAccessToken() && process.argv.includes('--debug')) {
-        console.warn(chalk_1.default.yellow('No authentication token found. Please run `berget auth login` first.'));
+    if (!tokenManager.getAccessToken()) {
+        logger_1.logger.debug('No authentication token found. Please run `berget auth login` first.');
     }
     // Create the base client
     const client = (0, openapi_fetch_1.default)({
-        baseUrl: API_BASE_URL,
+        baseUrl: exports.API_BASE_URL,
         headers: tokenManager.getAccessToken()
             ? {
                 Authorization: `Bearer ${tokenManager.getAccessToken()}`,
@@ -75,13 +76,14 @@ const createAuthenticatedClient = () => {
             if (typeof target[prop] === 'function' &&
                 ['GET', 'POST', 'PUT', 'DELETE', 'PATCH'].includes(String(prop))) {
                 return (...args) => __awaiter(this, void 0, void 0, function* () {
-                    var _a, _b;
+                    var _a, _b, _c, _d;
                     // Check if token is expired before making the request
                     if (tokenManager.isTokenExpired() && tokenManager.getRefreshToken()) {
                         yield refreshAccessToken(tokenManager);
                     }
                     // Update the Authorization header with the current token
-                    if (tokenManager.getAccessToken()) {
+                    if (!((_b = (_a = args[1]) === null || _a === void 0 ? void 0 : _a.headers) === null || _b === void 0 ? void 0 : _b.Authorization) &&
+                        tokenManager.getAccessToken()) {
                         if (!args[1])
                             args[1] = {};
                         if (!args[1].headers)
@@ -94,11 +96,9 @@ const createAuthenticatedClient = () => {
                         result = yield target[prop](...args);
                     }
                     catch (requestError) {
-                        if (process.argv.includes('--debug')) {
-                            console.log(chalk_1.default.red(`DEBUG: Request error: ${requestError instanceof Error
-                                ? requestError.message
-                                : String(requestError)}`));
-                        }
+                        logger_1.logger.debug(`Request error: ${requestError instanceof Error
+                            ? requestError.message
+                            : String(requestError)}`);
                         return {
                             error: {
                                 message: `Request failed: ${requestError instanceof Error
@@ -113,7 +113,8 @@ const createAuthenticatedClient = () => {
                         let isAuthError = false;
                         try {
                             // Standard 401 Unauthorized
-                            if (typeof result.error === 'object' && result.error.status === 401) {
+                            if (typeof result.error === 'object' &&
+                                result.error.status === 401) {
                                 isAuthError = true;
                             }
                             // OAuth specific errors
@@ -121,8 +122,8 @@ const createAuthenticatedClient = () => {
                                 (result.error.error.code === 'invalid_token' ||
                                     result.error.error.code === 'token_expired' ||
                                     result.error.error.message === 'Invalid API key' ||
-                                    ((_a = result.error.error.message) === null || _a === void 0 ? void 0 : _a.toLowerCase().includes('token')) ||
-                                    ((_b = result.error.error.message) === null || _b === void 0 ? void 0 : _b.toLowerCase().includes('unauthorized')))) {
+                                    ((_c = result.error.error.message) === null || _c === void 0 ? void 0 : _c.toLowerCase().includes('token')) ||
+                                    ((_d = result.error.error.message) === null || _d === void 0 ? void 0 : _d.toLowerCase().includes('unauthorized')))) {
                                 isAuthError = true;
                             }
                             // Message-based detection as fallback
@@ -143,15 +144,11 @@ const createAuthenticatedClient = () => {
                             }
                         }
                         if (isAuthError && tokenManager.getRefreshToken()) {
-                            if (process.argv.includes('--debug')) {
-                                console.log(chalk_1.default.yellow('DEBUG: Auth error detected, attempting token refresh'));
-                                console.log(chalk_1.default.yellow(`DEBUG: Error details: ${JSON.stringify(result.error, null, 2)}`));
-                            }
+                            logger_1.logger.debug('Auth error detected, attempting token refresh');
+                            logger_1.logger.debug(`Error details: ${JSON.stringify(result.error, null, 2)}`);
                             const refreshed = yield refreshAccessToken(tokenManager);
                             if (refreshed) {
-                                if (process.argv.includes('--debug')) {
-                                    console.log(chalk_1.default.green('DEBUG: Token refreshed successfully, retrying request'));
-                                }
+                                logger_1.logger.debug('Token refreshed successfully, retrying request');
                                 // Update the Authorization header with the new token
                                 if (!args[1])
                                     args[1] = {};
@@ -162,12 +159,11 @@ const createAuthenticatedClient = () => {
                                 return yield target[prop](...args);
                             }
                             else {
-                                if (process.argv.includes('--debug')) {
-                                    console.log(chalk_1.default.red('DEBUG: Token refresh failed'));
-                                }
+                                logger_1.logger.debug('Token refresh failed');
                                 // Add a more helpful error message for users
                                 if (typeof result.error === 'object') {
-                                    result.error.userMessage = 'Your session has expired. Please run `berget auth login` to log in again.';
+                                    result.error.userMessage =
+                                        'Your session has expired. Please run `berget auth login` to log in again.';
                                 }
                             }
                         }
@@ -188,12 +184,10 @@ function refreshAccessToken(tokenManager) {
             const refreshToken = tokenManager.getRefreshToken();
             if (!refreshToken)
                 return false;
-            if (process.argv.includes('--debug')) {
-                console.log(chalk_1.default.yellow('DEBUG: Attempting to refresh access token'));
-            }
+            logger_1.logger.debug('Attempting to refresh access token');
             // Use fetch directly since this endpoint might not be in the OpenAPI spec
             try {
-                const response = yield fetch(`${API_BASE_URL}/v1/auth/refresh`, {
+                const response = yield fetch(`${exports.API_BASE_URL}/v1/auth/refresh`, {
                     method: 'POST',
                     headers: {
                         'Content-Type': 'application/json',
@@ -203,9 +197,7 @@ function refreshAccessToken(tokenManager) {
                 });
                 // Handle HTTP errors
                 if (!response.ok) {
-                    if (process.argv.includes('--debug')) {
-                        console.log(chalk_1.default.yellow(`DEBUG: Token refresh error: HTTP ${response.status} ${response.statusText}`));
-                    }
+                    logger_1.logger.debug(`Token refresh error: HTTP ${response.status} ${response.statusText}`);
                     // Check if the refresh token itself is expired or invalid
                     if (response.status === 401 || response.status === 403) {
                         console.warn(chalk_1.default.yellow('Your refresh token has expired. Please run `berget auth login` again.'));
@@ -229,21 +221,19 @@ function refreshAccessToken(tokenManager) {
                     console.warn(chalk_1.default.yellow('Invalid token response. Please run `berget auth login` again.'));
                     return false;
                 }
-                if (process.argv.includes('--debug')) {
-                    console.log(chalk_1.default.green('DEBUG: Token refreshed successfully'));
-                }
+                logger_1.logger.debug('Token refreshed successfully');
                 // Update the token
                 tokenManager.updateAccessToken(data.token, data.expires_in || 3600);
                 // If a new refresh token was provided, update that too
                 if (data.refresh_token) {
                     tokenManager.setTokens(data.token, data.refresh_token, data.expires_in || 3600);
-                    if (process.argv.includes('--debug')) {
-                        console.log(chalk_1.default.green('DEBUG: Refresh token also updated'));
-                    }
+                    logger_1.logger.debug('Refresh token also updated');
                 }
             }
             catch (fetchError) {
-                console.warn(chalk_1.default.yellow(`Failed to refresh token: ${fetchError instanceof Error ? fetchError.message : String(fetchError)}`));
+                console.warn(chalk_1.default.yellow(`Failed to refresh token: ${fetchError instanceof Error
+                    ? fetchError.message
+                    : String(fetchError)}`));
                 return false;
             }
             return true;

package/dist/src/commands/chat.js

@@ -21,6 +21,7 @@ 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 default_api_key_1 = require("../utils/default-api-key");
+const markdown_renderer_1 = require("../utils/markdown-renderer");
 /**
  * Helper function to get user confirmation
  */
@@ -54,6 +55,7 @@ function registerChatCommands(program) {
         .option('-m, --max-tokens <tokens>', 'Maximum tokens to generate', 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('--stream', 'Stream the response')
         .action((options) => __awaiter(this, void 0, void 0, function* () {
         try {
             const chatService = chat_service_1.ChatService.getInstance();
@@ -65,6 +67,15 @@ function registerChatCommands(program) {
             if (envApiKey) {
                 console.log(chalk_1.default.dim(`Using API key from BERGET_API_KEY environment variable`));
                 apiKey = envApiKey;
+                // 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)}...`));
+                }
+            }
+            // If API key is already provided via command line, use it
+            else if (options.apiKey) {
+                console.log(chalk_1.default.dim(`Using API key from command line argument`));
+                apiKey = options.apiKey;
             }
             // If no API key or API key ID provided and no env var, check for default API key
             else if (!apiKey && !apiKeyId) {
@@ -190,33 +201,41 @@ function registerChatCommands(program) {
                     });
                     try {
                         // Call the API
-                        console.log(chalk_1.default.yellow('DEBUG: Preparing completion options'));
                         const completionOptions = {
                             model: ((_a = options.args) === null || _a === void 0 ? void 0 : _a[0]) || 'google/gemma-3-27b-it',
                             messages: messages,
                             temperature: options.temperature !== undefined ? options.temperature : 0.7,
                             max_tokens: options.maxTokens || 4096,
+                            stream: options.stream || false
                         };
                         // Only add apiKey if it actually exists
                         if (apiKey) {
                             completionOptions.apiKey = apiKey;
-                            console.log(chalk_1.default.yellow('DEBUG: Using API key from command options or default'));
                         }
-                        else {
-                            console.log(chalk_1.default.yellow('DEBUG: No API key available in chat command'));
-                            // If we got this far with defaultApiKeyData but no apiKey, there's a problem
-                            const defaultApiKeyManager = default_api_key_1.DefaultApiKeyManager.getInstance();
-                            if (defaultApiKeyManager.getDefaultApiKeyData()) {
-                                console.log(chalk_1.default.yellow('DEBUG: Default API key data exists but key is missing'));
-                            }
+                        // Add streaming support
+                        if (options.stream) {
+                            let assistantResponse = '';
+                            console.log(chalk_1.default.blue('Assistant: '));
+                            // For streaming, we'll collect the response and render it at the end
+                            // since markdown needs the complete text to render properly
+                            completionOptions.onChunk = (chunk) => {
+                                if (chunk.choices && chunk.choices[0] && chunk.choices[0].delta && chunk.choices[0].delta.content) {
+                                    const content = chunk.choices[0].delta.content;
+                                    process.stdout.write(content);
+                                    assistantResponse += content;
+                                }
+                            };
+                            yield chatService.createCompletion(completionOptions);
+                            console.log('\n');
+                            // Add assistant response to messages
+                            messages.push({
+                                role: 'assistant',
+                                content: assistantResponse
+                            });
+                            // Continue the conversation
+                            askQuestion();
+                            return;
                         }
-                        // Debug output
-                        console.log(chalk_1.default.yellow('DEBUG: Completion options:'));
-                        console.log(chalk_1.default.yellow(JSON.stringify(Object.assign(Object.assign({}, completionOptions), { apiKey: completionOptions.apiKey ? '***' : undefined, messages: completionOptions.messages.map((m) => ({
-                                role: m.role,
-                                content: m.content.length > 50 ? m.content.substring(0, 50) + '...' : m.content
-                            })) }), null, 2)));
-                        console.log(chalk_1.default.yellow('DEBUG: Calling chatService.createCompletion'));
                         const response = yield chatService.createCompletion(completionOptions);
                         // Debug output
                         if (program.opts().debug) {
@@ -240,7 +259,14 @@ function registerChatCommands(program) {
                             content: assistantMessage,
                         });
                         // Display the response
-                        console.log(chalk_1.default.blue('Assistant: ') + assistantMessage);
+                        console.log(chalk_1.default.blue('Assistant: '));
+                        // Check if the response contains markdown and render it if it does
+                        if ((0, markdown_renderer_1.containsMarkdown)(assistantMessage)) {
+                            console.log((0, markdown_renderer_1.renderMarkdown)(assistantMessage));
+                        }
+                        else {
+                            console.log(assistantMessage);
+                        }
                         console.log(); // Empty line for better readability
                         // Continue the conversation
                         askQuestion();
@@ -317,11 +343,12 @@ function registerChatCommands(program) {
             }
             console.log(chalk_1.default.bold('Available Chat Models:'));
             console.log(chalk_1.default.dim('─'.repeat(70)));
-            console.log(chalk_1.default.dim('MODEL ID'.padEnd(30)) +
-                chalk_1.default.dim('OWNER'.padEnd(25)) +
+            console.log(chalk_1.default.dim('MODEL ID'.padEnd(40)) +
                 chalk_1.default.dim('CAPABILITIES'));
             console.log(chalk_1.default.dim('─'.repeat(70)));
-            models.data.forEach((model) => {
+            // Filter to only show active models
+            const activeModels = models.data.filter((model) => model.active === true);
+            activeModels.forEach((model) => {
                 const capabilities = [];
                 if (model.capabilities.vision)
                     capabilities.push('vision');
@@ -329,8 +356,9 @@ function registerChatCommands(program) {
                     capabilities.push('function_calling');
                 if (model.capabilities.json_mode)
                     capabilities.push('json_mode');
-                console.log(model.id.padEnd(30) +
-                    model.owned_by.padEnd(25) +
+                // Format model ID in Huggingface compatible format (owner/model)
+                const modelId = `${model.owned_by.toLowerCase()}/${model.id}`.padEnd(40);
+                console.log(modelId +
                     capabilities.join(', '));
             });
         }

package/dist/src/commands/models.js

@@ -44,7 +44,7 @@ function registerModelCommands(program) {
                     throw new Error(JSON.stringify(error));
                 response = data;
                 console.log('Available Models:');
-                console.log('ID                      OWNED BY                  CAPABILITIES');
+                console.log('ID                                                 OWNED BY                 CAPABILITIES');
                 // Ensure response has the expected structure
                 const modelData = response;
                 if (modelData.data) {
@@ -56,7 +56,7 @@ function registerModelCommands(program) {
                             capabilities.push('function_calling');
                         if (model.capabilities.json_mode)
                             capabilities.push('json_mode');
-                        console.log(`${model.id.padEnd(24)} ${model.owned_by.padEnd(25)} ${capabilities.join(', ')}`);
+                        console.log(`${model.root.padEnd(50)} ${model.owned_by.padEnd(24)} ${capabilities.join(', ')}`);
                     });
                 }
             }