viho 0.0.5 → 0.0.6

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 { getModels } = require('../src/model.js');
+const { getDB, printLogo } = require('../src/util.js');
 const db = getDB();
 
 // cmd
@@ -24,7 +26,8 @@ cli.cmd
     }
 
     // check
-    const model = await db.config(modelName);
+    const models = await getModels(db);
+    const model = models.find((m) => m.modelName === modelName);
     if (!model) {
       console.log(cli.colors.red(`Model not found: ${modelName}`));
       return;
@@ -39,5 +42,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 { getModels } = require('../src/model.js');
+const { getDB, printLogo } = require('../src/util.js');
 const db = getDB();
 
 // cmd
@@ -24,7 +26,8 @@ cli.cmd
     }
 
     // check
-    const model = await db.config(modelName);
+    const models = await getModels(db);
+    const model = models.find((m) => m.modelName === modelName);
     if (!model) {
       console.log(cli.colors.red(`Model not found: ${modelName}`));
       return;

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.6",
   "description": "A lightweight CLI tool for managing and interacting with AI models",
   "keywords": [
     "ai",
@@ -43,5 +43,5 @@
     "qiao-config": "^5.0.1",
     "qiao-llm": "^0.2.5"
   },
-  "gitHead": "4536783e6823add1a9556e0fb2f569e8d1f5bac0"
+  "gitHead": "2a10a0acfc92501a023e93f7f268e6f8ad57f9fc"
 }

package/bin/util.js

@@ -1,103 +0,0 @@
-// 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
- * @param {*} model
- */
-exports.ask = async (llm, model) => {
-  // ask
-  const questions = [
-    {
-      type: 'editor',
-      name: 'content',
-      message: 'Your question:',
-    },
-  ];
-  const answers = await cli.ask(questions);
-
-  // answers
-  console.log();
-  console.log(cli.colors.gray('Question:'));
-  console.log(cli.colors.gray(answers.content));
-  console.log();
-
-  // chat
-  const chatOptions = {
-    model: model.modelID,
-    messages: [
-      { role: 'system', content: 'You are a helpful AI assistant' },
-      { role: 'user', content: answers.content },
-    ],
-    thinking: {
-      type: model.modelThinking,
-    },
-  };
-
-  // callback options
-  const callbackOptions = {
-    firstThinkingCallback: () => {
-      console.log();
-      console.log(cli.colors.gray('[Thinking...]'));
-      console.log();
-    },
-    thinkingCallback: (msg) => {
-      process.stdout.write(cli.colors.gray(msg));
-    },
-    firstContentCallback: () => {
-      console.log();
-      console.log(cli.colors.cyan('[Response]'));
-      console.log();
-    },
-    contentCallback: (msg) => {
-      process.stdout.write(msg);
-    },
-    endCallback: () => {
-      console.log();
-      console.log();
-    },
-    errorCallback: (error) => {
-      console.log();
-      console.log(cli.colors.red('Error:'));
-      console.log(error);
-    },
-  };
-
-  // go
-  await llm.chatWithStreaming(chatOptions, callbackOptions);
-};