berget 1.3.0 → 1.3.1

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "berget",
-    "version": "1.3.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/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
  */
@@ -214,7 +215,9 @@ function registerChatCommands(program) {
                         // Add streaming support
                         if (options.stream) {
                             let assistantResponse = '';
-                            process.stdout.write(chalk_1.default.blue('Assistant: '));
+                            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;
@@ -256,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();
@@ -333,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');
@@ -345,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(', ')}`);
                     });
                 }
             }

package/dist/src/utils/markdown-renderer.js

@@ -0,0 +1,73 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.containsMarkdown = exports.renderMarkdown = void 0;
+const marked_1 = require("marked");
+const marked_terminal_1 = __importDefault(require("marked-terminal"));
+const chalk_1 = __importDefault(require("chalk"));
+// Configure marked to use the terminal renderer
+marked_1.marked.setOptions({
+    renderer: new marked_terminal_1.default({
+        // Customize the rendering options
+        code: chalk_1.default.cyan,
+        blockquote: chalk_1.default.gray.italic,
+        table: chalk_1.default.white,
+        listitem: chalk_1.default.yellow,
+        strong: chalk_1.default.bold,
+        em: chalk_1.default.italic,
+        heading: chalk_1.default.bold.blueBright,
+        hr: chalk_1.default.gray,
+        link: chalk_1.default.blue.underline,
+        // Adjust the width to fit the terminal
+        width: process.stdout.columns || 80,
+        // Customize code block rendering
+        codespan: chalk_1.default.cyan
+    })
+});
+/**
+ * Render markdown text to terminal-friendly formatted text
+ * @param markdown The markdown text to render
+ * @returns Formatted text for terminal display
+ */
+function renderMarkdown(markdown) {
+    if (!markdown)
+        return '';
+    try {
+        // Convert markdown to terminal-friendly text
+        return (0, marked_1.marked)(markdown);
+    }
+    catch (error) {
+        // If rendering fails, return the original text
+        console.error(`Error rendering markdown: ${error}`);
+        return markdown;
+    }
+}
+exports.renderMarkdown = renderMarkdown;
+/**
+ * Check if a string contains markdown formatting
+ * @param text The text to check
+ * @returns True if the text contains markdown formatting
+ */
+function containsMarkdown(text) {
+    if (!text)
+        return false;
+    // Check for common markdown patterns
+    const markdownPatterns = [
+        /^#+\s+/m, // Headers
+        /\*\*.*?\*\*/, // Bold
+        /\*.*?\*/, // Italic
+        /`.*?`/, // Inline code
+        /```[\s\S]*?```/, // Code blocks
+        /\[.*?\]\(.*?\)/, // Links
+        /^\s*[-*+]\s+/m, // Lists
+        /^\s*\d+\.\s+/m, // Numbered lists
+        /^\s*>\s+/m, // Blockquotes
+        /\|.*\|.*\|/, // Tables
+        /^---+$/m, // Horizontal rules
+        /^===+$/m // Alternative headers
+    ];
+    return markdownPatterns.some(pattern => pattern.test(text));
+}
+exports.containsMarkdown = containsMarkdown;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "berget",
-  "version": "1.3.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/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
@@ -272,8 +273,10 @@ export function registerChatCommands(program: Command): void {
               // Add streaming support
               if (options.stream) {
                 let assistantResponse = ''
-                process.stdout.write(chalk.blue('Assistant: '))
+                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
@@ -332,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
@@ -439,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(', ')}`
               )
             })

package/src/utils/markdown-renderer.ts

@@ -0,0 +1,68 @@
+import { marked } from 'marked'
+import TerminalRenderer from 'marked-terminal'
+import chalk from 'chalk'
+
+// Configure marked to use the terminal renderer
+marked.setOptions({
+  renderer: new TerminalRenderer({
+    // Customize the rendering options
+    code: chalk.cyan,
+    blockquote: chalk.gray.italic,
+    table: chalk.white,
+    listitem: chalk.yellow,
+    strong: chalk.bold,
+    em: chalk.italic,
+    heading: chalk.bold.blueBright,
+    hr: chalk.gray,
+    link: chalk.blue.underline,
+    // Adjust the width to fit the terminal
+    width: process.stdout.columns || 80,
+    // Customize code block rendering
+    codespan: chalk.cyan
+  })
+})
+
+/**
+ * Render markdown text to terminal-friendly formatted text
+ * @param markdown The markdown text to render
+ * @returns Formatted text for terminal display
+ */
+export function renderMarkdown(markdown: string): string {
+  if (!markdown) return ''
+  
+  try {
+    // Convert markdown to terminal-friendly text
+    return marked(markdown)
+  } catch (error) {
+    // If rendering fails, return the original text
+    console.error(`Error rendering markdown: ${error}`)
+    return markdown
+  }
+}
+
+/**
+ * Check if a string contains markdown formatting
+ * @param text The text to check
+ * @returns True if the text contains markdown formatting
+ */
+export function containsMarkdown(text: string): boolean {
+  if (!text) return false
+  
+  // Check for common markdown patterns
+  const markdownPatterns = [
+    /^#+\s+/m,                // Headers
+    /\*\*.*?\*\*/,            // Bold
+    /\*.*?\*/,                // Italic
+    /`.*?`/,                  // Inline code
+    /```[\s\S]*?```/,         // Code blocks
+    /\[.*?\]\(.*?\)/,         // Links
+    /^\s*[-*+]\s+/m,          // Lists
+    /^\s*\d+\.\s+/m,          // Numbered lists
+    /^\s*>\s+/m,              // Blockquotes
+    /\|.*\|.*\|/,             // Tables
+    /^---+$/m,                // Horizontal rules
+    /^===+$/m                 // Alternative headers
+  ]
+  
+  return markdownPatterns.some(pattern => pattern.test(text))
+}