viho 0.0.5 → 0.0.7

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="./logo.png" alt="viho logo" width="200"/>
+  <img src="https://static-small.vincentqiao.com/viho/logo.png" alt="viho logo" width="200"/>
 </p>
 
 <h1 align="center">viho</h1>
@@ -156,13 +156,15 @@ Configuration is stored in `~/viho.json`. You can manage all settings through th
 
 ```json
 {
-  "mymodel": {
-    "modelName": "mymodel",
-    "apiKey": "your-api-key",
-    "baseURL": "https://api.openai.com/v1",
-    "modelID": "gpt-4",
-    "modelThinking": "auto"
-  },
+  "models": [
+    {
+      "modelName": "mymodel",
+      "apiKey": "your-api-key",
+      "baseURL": "https://api.openai.com/v1",
+      "modelID": "gpt-4",
+      "modelThinking": "auto"
+    }
+  ],
   "default": "mymodel"
 }
 ```

package/bin/viho-ask.js

@@ -5,7 +5,9 @@ const cli = require('qiao-cli');
 const LLM = require('qiao-llm');
 
 // util
-const { getDB, ask, printLogo } = require('./util.js');
+const { ask } = require('../src/llm.js');
+const { getModelByName } = require('../src/model.js');
+const { getDB, printLogo } = require('../src/util.js');
 const db = getDB();
 
 // cmd
@@ -13,24 +15,11 @@ cli.cmd
   .command('ask [modelName]')
   .description('Ask a question to an AI model')
   .action(async (modelName) => {
-    if (!modelName) {
-      const defaultModel = await db.config('default');
-      if (!defaultModel) {
-        console.log(cli.colors.red('No default model set. Use: viho model default'));
-        return;
-      }
+    // model
+    const model = await getModelByName(db, modelName);
+    if (!model) return;
 
-      modelName = defaultModel;
-    }
-
-    // check
-    const model = await db.config(modelName);
-    if (!model) {
-      console.log(cli.colors.red(`Model not found: ${modelName}`));
-      return;
-    }
-
-    // init
+    // llm
     const llm = LLM({
       apiKey: model.apiKey,
       baseURL: model.baseURL,
@@ -39,5 +28,6 @@ cli.cmd
     // logo
     printLogo();
 
+    // ask
     await ask(llm, model);
   });

package/bin/viho-chat.js

@@ -5,7 +5,9 @@ const cli = require('qiao-cli');
 const LLM = require('qiao-llm');
 
 // util
-const { getDB, ask, printLogo } = require('./util.js');
+const { ask } = require('../src/llm.js');
+const { getModelByName } = require('../src/model.js');
+const { getDB, printLogo } = require('../src/util.js');
 const db = getDB();
 
 // cmd
@@ -13,22 +15,9 @@ cli.cmd
   .command('chat [modelName]')
   .description('Start a continuous chat session with an AI model')
   .action(async (modelName) => {
-    if (!modelName) {
-      const defaultModel = await db.config('default');
-      if (!defaultModel) {
-        console.log(cli.colors.red('No default model set. Use: viho model default'));
-        return;
-      }
-
-      modelName = defaultModel;
-    }
-
-    // check
-    const model = await db.config(modelName);
-    if (!model) {
-      console.log(cli.colors.red(`Model not found: ${modelName}`));
-      return;
-    }
+    // model
+    const model = await getModelByName(db, modelName);
+    if (!model) return;
 
     // init
     const llm = LLM({
@@ -38,7 +27,7 @@ cli.cmd
 
     // logo
     printLogo();
-    console.log(cli.colors.cyan(`Welcome to viho chat! Using model: ${modelName}`));
+    console.log(cli.colors.cyan(`Welcome to viho chat! Using model: ${model.modelName}`));
     console.log(cli.colors.gray('Press Ctrl+C to exit\n'));
 
     // chat

package/bin/viho-model.js

@@ -2,7 +2,8 @@
 const cli = require('qiao-cli');
 
 // util
-const { getDB, printLogo } = require('./util.js');
+const { getModels, setModels } = require('../src/model.js');
+const { getDB, printLogo } = require('../src/util.js');
 const db = getDB();
 
 // actions
@@ -64,21 +65,23 @@ async function modelAdd() {
     console.log();
 
     // check
-    const dbKey = answers.modelName;
-    const dbValue = await db.config(dbKey);
-    if (dbValue) {
+    const modelName = answers.modelName;
+    const models = await getModels(db);
+    const isModelExists = models.some((model) => model.modelName === modelName);
+    if (isModelExists) {
       console.log(cli.colors.red('Model name already exists'));
       return;
     }
 
     // set
-    await db.config(dbKey, answers);
+    models.push(answers);
+    await setModels(db, models);
     console.log(cli.colors.green('Model added'));
     console.log();
 
     // list
-    const all = await db.all();
-    console.log(all);
+    const allModels = await getModels(db);
+    console.log(allModels);
   } catch (e) {
     console.log(cli.colors.red('Error: Failed to add model'));
     console.log();
@@ -95,10 +98,10 @@ async function modelList() {
     printLogo();
 
     // list
-    const all = await db.all();
+    const models = await getModels(db);
     console.log(cli.colors.cyan('Configured models:'));
     console.log();
-    console.log(all);
+    console.log(models);
   } catch (e) {
     console.log(cli.colors.red('Error: Failed to list models'));
     console.log();
@@ -124,14 +127,34 @@ async function modelRemove() {
     console.log();
 
     // del
-    const dbKey = answers.modelName;
-    await db.config(dbKey, null);
+    const models = await getModels(db);
+    const modelNameToRemove = answers.modelName;
+
+    // check if model exists
+    const modelExists = models.some((model) => model.modelName === modelNameToRemove);
+    if (!modelExists) {
+      console.log(cli.colors.red(`Model not found: ${modelNameToRemove}`));
+      console.log();
+      return;
+    }
+
+    const newModels = models.filter((model) => model.modelName !== modelNameToRemove);
+    await setModels(db, newModels);
+
+    // clear default if removed model was default
+    const defaultModel = await db.config('default');
+    if (defaultModel === modelNameToRemove) {
+      await db.config('default', null);
+      console.log(cli.colors.yellow('Removed model was set as default. Please set a new default.'));
+      console.log();
+    }
+
     console.log(cli.colors.green('Model removed'));
     console.log();
 
     // list
-    const all = await db.all();
-    console.log(all);
+    const allModels = await getModels(db);
+    console.log(allModels);
   } catch (e) {
     console.log(cli.colors.red('Error: Failed to remove model'));
     console.log();
@@ -158,8 +181,8 @@ async function modelDefault() {
     console.log();
 
     // get keys
-    const all = await db.all();
-    const keys = Object.keys(all);
+    const models = await getModels(db);
+    const keys = models.map((model) => model.modelName);
 
     // check keys
     if (!keys || !keys.length) {
@@ -172,7 +195,7 @@ async function modelDefault() {
     if (!keys.includes(answers.modelName)) {
       console.log(cli.colors.red('Model not found. Available models:'));
       console.log();
-      console.log(all);
+      console.log(models);
       return;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "viho",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "A lightweight CLI tool for managing and interacting with AI models",
   "keywords": [
     "ai",
@@ -31,9 +31,9 @@
   },
   "files": [
     "bin",
+    "src",
     "LICENSE",
-    "README.md",
-    "logo.png"
+    "README.md"
   ],
   "engines": {
     "node": ">=18.0.0"
@@ -43,5 +43,5 @@
     "qiao-config": "^5.0.1",
     "qiao-llm": "^0.2.5"
   },
-  "gitHead": "4536783e6823add1a9556e0fb2f569e8d1f5bac0"
+  "gitHead": "b4d22881578a4da9c83d057f08b044bdd44c692a"
 }

package/{bin/util.js → src/llm.js}

@@ -1,40 +1,6 @@
-// os
-const os = require('os');
-
-// path
-const path = require('path');
-
 // qiao
 const cli = require('qiao-cli');
 
-// db
-const DB = require('qiao-config');
-
-/**
- * getDB
- * @returns
- */
-exports.getDB = () => {
-  const dbPath = path.resolve(os.homedir(), './viho.json');
-  return DB(dbPath);
-};
-
-/**
- * printLogo
- */
-exports.printLogo = () => {
-  console.log(
-    cli.colors.green(`
-██╗   ██╗██╗██╗  ██╗ ██████╗
-██║   ██║██║██║  ██║██╔═══██╗
-██║   ██║██║███████║██║   ██║
-╚██╗ ██╔╝██║██╔══██║██║   ██║
- ╚████╔╝ ██║██║  ██║╚██████╔╝
-  ╚═══╝  ╚═╝╚═╝  ╚═╝ ╚═════╝
-    `),
-  );
-};
-
 /**
  * ask
  * @param {*} llm

package/src/model.js

@@ -0,0 +1,51 @@
+// qiao
+const cli = require('qiao-cli');
+
+// models
+const modelsKey = 'models';
+
+/**
+ * getModels
+ * @param {*} db
+ * @returns
+ */
+exports.getModels = async (db) => {
+  return (await db.config(modelsKey)) || [];
+};
+
+/**
+ * setModels
+ * @param {*} db
+ * @returns
+ */
+exports.setModels = async (db, models) => {
+  await db.config(modelsKey, models);
+};
+
+/**
+ * getModelByName
+ * @param {*} db
+ * @returns
+ */
+exports.getModelByName = async (db, modelName) => {
+  if (!modelName) {
+    const defaultModel = await db.config('default');
+    if (!defaultModel) {
+      console.log(cli.colors.red('No default model set. Use: viho model default'));
+      return;
+    }
+
+    modelName = defaultModel;
+  }
+
+  // check
+  const models = await exports.getModels(db);
+  const model = models.find((m) => m.modelName === modelName);
+  if (!model) {
+    console.log(cli.colors.red(`Model not found: ${modelName}`));
+    return;
+  }
+
+  // r
+  return model;
+};

package/src/util.js

@@ -0,0 +1,36 @@
+// os
+const os = require('os');
+
+// path
+const path = require('path');
+
+// qiao
+const cli = require('qiao-cli');
+
+// db
+const DB = require('qiao-config');
+
+/**
+ * getDB
+ * @returns
+ */
+exports.getDB = () => {
+  const dbPath = path.resolve(os.homedir(), './viho.json');
+  return DB(dbPath);
+};
+
+/**
+ * printLogo
+ */
+exports.printLogo = () => {
+  console.log(
+    cli.colors.green(`
+██╗   ██╗██╗██╗  ██╗ ██████╗
+██║   ██║██║██║  ██║██╔═══██╗
+██║   ██║██║███████║██║   ██║
+╚██╗ ██╔╝██║██╔══██║██║   ██║
+ ╚████╔╝ ██║██║  ██║╚██████╔╝
+  ╚═══╝  ╚═╝╚═╝  ╚═╝ ╚═════╝
+    `),
+  );
+};