berget 1.2.0 → 1.3.1

package/src/commands/chat.ts

@@ -7,6 +7,7 @@ import { ApiKeyService } from '../services/api-key-service'
 import { AuthService } from '../services/auth-service'
 import { handleError } from '../utils/error-handler'
 import { DefaultApiKeyManager } from '../utils/default-api-key'
+import { renderMarkdown, containsMarkdown } from '../utils/markdown-renderer'
 
 /**
  * Helper function to get user confirmation
@@ -45,6 +46,7 @@ export function registerChatCommands(program: Command): void {
       '--api-key-id <id>',
       'ID of the API key to use from your saved keys'
     )
+    .option('--stream', 'Stream the response')
     .action(async (options) => {
       try {
         const chatService = ChatService.getInstance()
@@ -60,6 +62,20 @@ export function registerChatCommands(program: Command): void {
             chalk.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.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.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) {
@@ -240,41 +256,48 @@ export function registerChatCommands(program: Command): void {
 
             try {
               // Call the API
-              console.log(chalk.yellow('DEBUG: Preparing completion options'))
-              
               const completionOptions: ChatCompletionOptions = {
                 model: options.args?.[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.yellow('DEBUG: Using API key from command options or default'))
-              } else {
-                console.log(chalk.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 = DefaultApiKeyManager.getInstance();
-                if (defaultApiKeyManager.getDefaultApiKeyData()) {
-                  console.log(chalk.yellow('DEBUG: Default API key data exists but key is missing'))
+              }
+              
+              // Add streaming support
+              if (options.stream) {
+                let assistantResponse = ''
+                console.log(chalk.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: any) => {
+                  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
+                  }
                 }
+                
+                await 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.yellow('DEBUG: Completion options:'))
-              console.log(chalk.yellow(JSON.stringify({
-                ...completionOptions,
-                apiKey: completionOptions.apiKey ? '***' : undefined,
-                messages: completionOptions.messages.map((m: any) => ({
-                  role: m.role,
-                  content: m.content.length > 50 ? m.content.substring(0, 50) + '...' : m.content
-                }))
-              }, null, 2)))
-
-              console.log(chalk.yellow('DEBUG: Calling chatService.createCompletion'))
               
               const response = await chatService.createCompletion(
                 completionOptions
@@ -312,7 +335,15 @@ export function registerChatCommands(program: Command): void {
               })
 
               // Display the response
-              console.log(chalk.blue('Assistant: ') + assistantMessage)
+              console.log(chalk.blue('Assistant: '))
+              
+              // Check if the response contains markdown and render it if it does
+              if (containsMarkdown(assistantMessage)) {
+                console.log(renderMarkdown(assistantMessage))
+              } else {
+                console.log(assistantMessage)
+              }
+              
               console.log() // Empty line for better readability
 
               // Continue the conversation
@@ -419,23 +450,27 @@ export function registerChatCommands(program: Command): void {
         console.log(chalk.bold('Available Chat Models:'))
         console.log(chalk.dim('─'.repeat(70)))
         console.log(
-          chalk.dim('MODEL ID'.padEnd(30)) +
-            chalk.dim('OWNER'.padEnd(25)) +
+          chalk.dim('MODEL ID'.padEnd(40)) +
             chalk.dim('CAPABILITIES')
         )
         console.log(chalk.dim('─'.repeat(70)))
 
-        models.data.forEach((model: any) => {
+        // Filter to only show active models
+        const activeModels = models.data.filter((model: any) => model.active === true);
+        
+        activeModels.forEach((model: any) => {
           const capabilities = []
           if (model.capabilities.vision) capabilities.push('vision')
           if (model.capabilities.function_calling)
             capabilities.push('function_calling')
           if (model.capabilities.json_mode) capabilities.push('json_mode')
 
+          // Format model ID in Huggingface compatible format (owner/model)
+          const modelId = `${model.owned_by.toLowerCase()}/${model.id}`.padEnd(40)
+          
           console.log(
-            model.id.padEnd(30) +
-              model.owned_by.padEnd(25) +
-              capabilities.join(', ')
+            modelId +
+            capabilities.join(', ')
           )
         })
       } catch (error) {

package/src/commands/models.ts

@@ -36,10 +36,10 @@ export function registerModelCommands(program: Command): void {
 
           console.log('Available Models:')
           console.log(
-            'ID                      OWNED BY                  CAPABILITIES'
+            'ID                                                 OWNED BY                 CAPABILITIES'
           )
           // Ensure response has the expected structure
-          const modelData = response as { data?: any[] };
+          const modelData = response as { data?: any[] }
           if (modelData.data) {
             modelData.data.forEach((model: any) => {
               const capabilities = []
@@ -49,8 +49,8 @@ export function registerModelCommands(program: Command): void {
               if (model.capabilities.json_mode) capabilities.push('json_mode')
 
               console.log(
-                `${model.id.padEnd(24)} ${model.owned_by.padEnd(
-                  25
+                `${model.root.padEnd(50)} ${model.owned_by.padEnd(
+                  24
                 )} ${capabilities.join(', ')}`
               )
             })