@git-ai/cli 1.0.2 → 1.0.4

package/src/actions/MaxTokenAction.mjs

@@ -1,38 +1,34 @@
-import { config } from "../utils/Storage.mjs";
-import { OPENAI_MAX_TOKEN_DEFAULT } from "../const.mjs";
-import Logger from "../utils/Logger.mjs";
-import BaseAction from "./BaseAction.mjs";
-
-class SetMaxTokenAction extends BaseAction {
-  constructor(maxToken) {
-    super(maxToken);
-    this.maxToken = maxToken;
-  }
-
-  async execute() {
-    const newValue =
-      typeof this.maxToken === "string" && this.maxToken.trim()
-        ? this.maxToken.trim()
-        : "";
-    const numberReg = /^[1-9]\d*$/;
-
-    if (!numberReg.test(newValue)) {
-      Logger.error(`请输入正确的数字，当前值: "${this.maxToken}"`);
-      throw new Error("无效的数字格式");
-    }
-
-    if (parseInt(newValue) > OPENAI_MAX_TOKEN_DEFAULT) {
-      Logger.warn(`不建议 max-token 设置太大`);
-    }
-
-    config.set("maxToken", newValue);
-    Logger.success(
-      `最大 token 数已设置: ${newValue} (${Math.round(newValue / 1000)}k)`
-    );
-  }
-}
-
-export default async function (maxToken) {
-  const action = new SetMaxTokenAction(maxToken);
-  await action.run();
-}
+import { config } from '../utils/Storage.mjs';
+import { OPENAI_MAX_TOKEN_DEFAULT } from '../const.mjs';
+import Logger from '../utils/Logger.mjs';
+import BaseAction from './BaseAction.mjs';
+
+class SetMaxTokenAction extends BaseAction {
+  constructor(maxToken) {
+    super(maxToken);
+    this.maxToken = maxToken;
+  }
+
+  async execute() {
+    const newValue =
+      typeof this.maxToken === 'string' && this.maxToken.trim() ? this.maxToken.trim() : '';
+    const numberReg = /^[1-9]\d*$/;
+
+    if (!numberReg.test(newValue)) {
+      Logger.error(`请输入正确的数字，当前值: "${this.maxToken}"`);
+      throw new Error('无效的数字格式');
+    }
+
+    if (parseInt(newValue) > OPENAI_MAX_TOKEN_DEFAULT) {
+      Logger.warn(`不建议 max-token 设置太大`);
+    }
+
+    config.set('maxToken', newValue);
+    Logger.success(`最大 token 数已设置: ${newValue} (${Math.round(newValue / 1000)}k)`);
+  }
+}
+
+export default async function (maxToken) {
+  const action = new SetMaxTokenAction(maxToken);
+  await action.run();
+}

package/src/actions/ModelAction.mjs

@@ -1,131 +1,122 @@
-import { chat, getModelList } from "../utils/OpenAI.mjs";
-import { config } from "../utils/Storage.mjs";
-import inquirer from "inquirer";
-import { BIN } from "../const.mjs";
-import Logger from "../utils/Logger.mjs";
-import Spinner from "../utils/Spinner.mjs";
-import BaseAction from "./BaseAction.mjs";
-class SetModelAction extends BaseAction {
-  constructor(modelId) {
-    super(modelId);
-    this.modelId = typeof modelId === "string" ? modelId.trim() : "";
-    this.defaultModel = config.get("model") || "";
-    this.key = config.get("key");
-    this.baseURL = config.get("baseURL");
-  }
-
-  async selectModels() {
-    const list = [];
-    Logger.info(`Base URL：${this.baseURL}`);
-    const spinner = new Spinner("正在加载模型列表...");
-    spinner.start();
-
-    try {
-      list.push(...(await getModelList()));
-
-      if (!list.length) {
-        throw "未找到可用的模型";
-      }
-      spinner.success(`可用模型:${list.length}个`);
-    } catch (error) {
-      spinner.error("加载模型列表失败");
-      throw error && error.message ? error.message : error;
-    }
-    try {
-      const answers = await inquirer.prompt([
-        {
-          type: "checkbox",
-          name: "models",
-          message: `请选择模型`,
-          choices: list,
-          loop: false,
-          validate(input) {
-            if (!input || input.length === 0) {
-              return "请至少选择 1 个模型";
-            }
-            return true;
-          },
-          default: [],
-        },
-      ]);
-      if (!answers.models.length) {
-        throw "最少选择 1 个模型";
-      }
-      this.modelId = answers.models.join(",");
-      config.set("model", this.modelId);
-    } catch (error) {
-      throw error && error.message ? error.message : error;
-    }
-  }
-  // 验证模型是否可用
-  async validateModel() {
-    const spinner = new Spinner("正在验证模型是否可用...");
-    spinner.start();
-
-    const startTimestamp = Date.now();
-    const configModel = config.get("model")
-      ? config.get("model").split(",")
-      : [];
-    if (!this.baseURL || !configModel.length) return;
-    const total = configModel.length;
-    const errTotal = [];
-    while (configModel.length) {
-      const model = configModel.shift();
-      try {
-        const result = await chat({
-          model: model,
-          messages: [
-            {
-              role: "user",
-              content: "1+1=?",
-            },
-          ],
-        });
-        formatCompletions(result);
-      } catch {
-        errTotal.push(model);
-      }
-    }
-    spinner.stop();
-    if (total - errTotal.length > 0) {
-      Logger.success(`模型验证通过 ${total - errTotal.length} 个`);
-    }
-    if (errTotal.length) {
-      Logger.error(
-        `模型验证失败 ${errTotal.length} 个，分别是：\n${errTotal.join(
-          "\n   - "
-        )}`
-      );
-    }
-
-    const endTimestamp = Date.now();
-    const duration = endTimestamp - startTimestamp;
-
-    Logger.success(`本次检查模型用时: ${(duration / 1000).toFixed(3)} 秒`);
-  }
-  async execute() {
-    config.set("model", this.modelId);
-    if (!this.modelId && this.defaultModel) {
-      Logger.warn("已清空设置的模型");
-    }
-    if (!this.modelId) {
-      if (this.baseURL && !this.key) {
-        Logger.warn(
-          `检测到 api key 为空，可能获取列表失败。设置 \`${BIN} set-key <your key>\``
-        );
-      }
-      await this.selectModels();
-    }
-    if (this.modelId) {
-      Logger.success(
-        `已设置模型: \n   - ${this.modelId.split(`,`).join("\n   - ")}`
-      );
-    }
-    await this.validateModel();
-  }
-}
-
-export default async function (event) {
-  const action = new SetModelAction(event);
-  await action.run();
-}
+import { chat, getModelList } from '../utils/OpenAI.mjs';
+import { config } from '../utils/Storage.mjs';
+import inquirer from 'inquirer';
+import { BIN } from '../const.mjs';
+import Logger from '../utils/Logger.mjs';
+import Spinner from '../utils/Spinner.mjs';
+import BaseAction from './BaseAction.mjs';
+import { formatMessage } from '../utils/MessageUtils.mjs';
+class SetModelAction extends BaseAction {
+  constructor(modelId) {
+    super(modelId);
+    this.modelId = typeof modelId === 'string' ? modelId.trim() : '';
+    this.defaultModel = config.get('model') || '';
+    this.key = config.get('key');
+    this.baseURL = config.get('baseURL');
+  }
+
+  async selectModels() {
+    const list = [];
+    Logger.info(`Base URL：${this.baseURL}`);
+    const spinner = new Spinner('正在加载模型列表...');
+    spinner.start();
+
+    try {
+      list.push(...(await getModelList()));
+
+      if (!list.length) {
+        throw '未找到可用的模型';
+      }
+      spinner.success(`可用模型:${list.length}个`);
+    } catch (error) {
+      spinner.error('加载模型列表失败');
+      throw error && error.message ? error.message : error;
+    }
+    try {
+      const answers = await inquirer.prompt([
+        {
+          type: 'checkbox',
+          name: 'models',
+          message: `请选择模型`,
+          choices: list,
+          loop: false,
+          validate(input) {
+            if (!input || input.length === 0) {
+              return '请至少选择 1 个模型';
+            }
+            return true;
+          },
+          default: [],
+        },
+      ]);
+      if (!answers.models.length) {
+        throw '最少选择 1 个模型';
+      }
+      this.modelId = answers.models.join(',');
+      config.set('model', this.modelId);
+    } catch (error) {
+      throw error && error.message ? error.message : error;
+    }
+  }
+  // 验证模型是否可用
+  async validateModel() {
+    const spinner = new Spinner('正在验证模型是否可用...');
+    spinner.start();
+
+    const startTimestamp = Date.now();
+    const configModel = config.get('model') ? config.get('model').split(',') : [];
+    if (!this.baseURL || !configModel.length) return;
+    const total = configModel.length;
+    const errTotal = [];
+    while (configModel.length) {
+      const model = configModel.shift();
+      try {
+        const result = await chat({
+          model: model,
+          messages: [
+            {
+              role: 'user',
+              content: '1+1=?',
+            },
+          ],
+        });
+        formatMessage(result);
+      } catch {
+        errTotal.push(model);
+      }
+    }
+    spinner.stop();
+    if (total - errTotal.length > 0) {
+      Logger.success(`模型验证通过 ${total - errTotal.length} 个`);
+    }
+    if (errTotal.length) {
+      Logger.error(`模型验证失败 ${errTotal.length} 个，分别是：\n${errTotal.join('\n   - ')}`);
+    }
+
+    const endTimestamp = Date.now();
+    const duration = endTimestamp - startTimestamp;
+
+    Logger.success(`本次检查模型用时: ${(duration / 1000).toFixed(3)} 秒`);
+  }
+  async execute() {
+    config.set('model', this.modelId);
+    if (!this.modelId && this.defaultModel) {
+      Logger.warn('已清空设置的模型');
+    }
+    if (!this.modelId) {
+      if (this.baseURL && !this.key) {
+        Logger.warn(`检测到 api key 为空，可能获取列表失败。设置 \`${BIN} set-key <your key>\``);
+      }
+      await this.selectModels();
+    }
+    if (this.modelId) {
+      Logger.success(`已设置模型: \n   - ${this.modelId.split(`,`).join('\n   - ')}`);
+    }
+    await this.validateModel();
+  }
+}
+
+export default async function (event) {
+  const action = new SetModelAction(event);
+  await action.run();
+}

package/src/actions/SelectModelAction.mjs

@@ -1,161 +1,151 @@
-import axios from "axios";
-import { promises as fs } from "fs";
-import { isAbsolute, resolve } from "path";
-import { chat } from "../utils/OpenAI.mjs";
-import { config } from "../utils/Storage.mjs";
-import inquirer from "inquirer";
-import { formatCompletions } from "../utils/MessageUtils.mjs";
-import { OPENAI_MODEL_LIST_URL } from "../const.mjs";
-import Logger from "../utils/Logger.mjs";
-import Spinner from "../utils/Spinner.mjs";
-import BaseAction from "./BaseAction.mjs";
-
-class SelectModelAction extends BaseAction {
-  async execute() {
-    await this.setModel();
-  }
-
-  async getModelList() {
-    if (!OPENAI_MODEL_LIST_URL) {
-      Logger.notice(`需要配置环境变量 \`OPENAI_MODEL_LIST_URL\` 。
-此变量指定 OpenAI 模型列表的来源，支持 HTTP(S) URL 或本地文件路径。
-
-** OPENAI_MODEL_LIST_URL 示例：**
-*   URL: \`https://raw.githubusercontent.com/xx025/carrot/main/model_list.json\`
-*   Linux/macOS 路径: \`/path/to/your/local/model_list.json\`
-*   Windows 路径: \`C:\\Path\\To\\Your\\Local\\model_list.json\`
-
-** JSON 配置示例：**
-模型id、baseURL、key 配置多个会随机取，必填(id、baseURL)、非必填(keys)
-\`\`\`json
-{
-  "data": [
-    {
-      "id": "modelId,modelId,modelId",
-      "baseURL": "baseURL,baseURL,baseURL",
-      "keys": "key,key,key"
-    }
-  ]
-}
-\`\`\`
-      `);
-      throw "未配置环境变量 `OPENAI_MODEL_LIST_URL`";
-    }
-    const source = OPENAI_MODEL_LIST_URL;
-    const isHttpSource = /^https?:\/\//i.test(source);
-    const spinner = new Spinner("正在加载模型列表...");
-    spinner.start();
-    try {
-      if (isHttpSource) {
-        const { data } = await axios.get(source);
-        spinner.stop();
-        return data;
-      }
-      const filePath = isAbsolute(source)
-        ? source
-        : resolve(process.cwd(), source);
-      const content = await fs.readFile(filePath, "utf8");
-      spinner.stop();
-      return JSON.parse(content);
-    } catch (error) {
-      spinner.stop();
-      throw error && error.message ? error.message : error;
-    }
-  }
-
-  async selectModels() {
-    const modelConfig = {
-      list: [],
-      origin: [],
-    };
-
-    try {
-      modelConfig.origin = (await this.getModelList()).data || [];
-      modelConfig.list = modelConfig.origin.map((item) => item.id);
-      if (!modelConfig.list.length) {
-        throw "未找到可用的模型";
-      }
-    } catch (error) {
-      throw error && error.message ? error.message : error;
-    }
-    try {
-      const answers = await inquirer.prompt([
-        {
-          type: "rawlist",
-          name: "model",
-          message: `请选择模型`,
-          choices: modelConfig.list,
-          default: "",
-          loop: false,
-        },
-      ]);
-      const item = modelConfig.origin.find((item) => item.id === answers.model);
-      if (!item.baseURL || !item.id) {
-        throw `模型信息不完整: 请检查 \`baseURL\` 和 \`id\``;
-      }
-      config.set("baseURL", item.baseURL);
-      config.set("model", item.id);
-      config.set("key", item.keys);
-      Logger.success(
-        `已设置模型: \n   - ${item.id.split(`,`).join("\n   - ")}`
-      );
-    } catch (error) {
-      throw `设置模型失败: ${error && error.message ? error.message : error}`;
-    }
-  }
-  // 验证模型是否可用
-  async validateModel() {
-    const spinner = new Spinner("正在验证模型是否可用...");
-    spinner.start();
-
-    const startTimestamp = Date.now();
-    const configModel = config.get("model")
-      ? config.get("model").split(",")
-      : [];
-    const total = configModel.length;
-    const errTotal = [];
-    while (configModel.length) {
-      const model = configModel.shift();
-      try {
-        const result = await chat({
-          model: model,
-          messages: [
-            {
-              role: "user",
-              content: "1+1=?",
-            },
-          ],
-        });
-        formatCompletions(result);
-      } catch {
-        errTotal.push(model);
-      }
-    }
-    spinner.stop();
-    if (total - errTotal.length > 0) {
-      Logger.success(`模型验证通过 ${total - errTotal.length} 个`);
-    }
-    if (errTotal.length) {
-      Logger.error(
-        `模型验证失败 ${errTotal.length} 个，分别是：\n${errTotal.join(
-          "\n   - "
-        )}`
-      );
-    }
-
-    const endTimestamp = Date.now();
-    const duration = endTimestamp - startTimestamp;
-
-    Logger.success(`本次检查模型用时: ${(duration / 1000).toFixed(3)} 秒`);
-  }
-
-  async setModel() {
-    await this.selectModels();
-    await this.validateModel();
-  }
-}
-
-export default async function () {
-  const action = new SelectModelAction();
-  await action.run();
-}
+import axios from 'axios';
+import { promises as fs } from 'fs';
+import { isAbsolute, resolve } from 'path';
+import { chat } from '../utils/OpenAI.mjs';
+import { config } from '../utils/Storage.mjs';
+import inquirer from 'inquirer';
+import { formatCompletions } from '../utils/MessageUtils.mjs';
+import { OPENAI_MODEL_LIST_URL } from '../const.mjs';
+import Logger from '../utils/Logger.mjs';
+import Spinner from '../utils/Spinner.mjs';
+import BaseAction from './BaseAction.mjs';
+
+class SelectModelAction extends BaseAction {
+  async execute() {
+    await this.setModel();
+  }
+
+  async getModelList() {
+    if (!OPENAI_MODEL_LIST_URL) {
+      Logger.notice(`需要配置环境变量 \`OPENAI_MODEL_LIST_URL\` 。
+此变量指定 OpenAI 模型列表的来源，支持 HTTP(S) URL 或本地文件路径。
+
+** OPENAI_MODEL_LIST_URL 示例：**
+*   URL: \`https://raw.githubusercontent.com/xx025/carrot/main/model_list.json\`
+*   Linux/macOS 路径: \`/path/to/your/local/model_list.json\`
+*   Windows 路径: \`C:\\Path\\To\\Your\\Local\\model_list.json\`
+
+** JSON 配置示例：**
+模型id、baseURL、key 配置多个会随机取，必填(id、baseURL)、非必填(keys)
+\`\`\`json
+{
+  "data": [
+    {
+      "id": "modelId,modelId,modelId",
+      "baseURL": "baseURL,baseURL,baseURL",
+      "keys": "key,key,key"
+    }
+  ]
+}
+\`\`\`
+      `);
+      throw '未配置环境变量 `OPENAI_MODEL_LIST_URL`';
+    }
+    const source = OPENAI_MODEL_LIST_URL;
+    const isHttpSource = /^https?:\/\//i.test(source);
+    const spinner = new Spinner('正在加载模型列表...');
+    spinner.start();
+    try {
+      if (isHttpSource) {
+        const { data } = await axios.get(source);
+        spinner.stop();
+        return data;
+      }
+      const filePath = isAbsolute(source) ? source : resolve(process.cwd(), source);
+      const content = await fs.readFile(filePath, 'utf8');
+      spinner.stop();
+      return JSON.parse(content);
+    } catch (error) {
+      spinner.stop();
+      throw error && error.message ? error.message : error;
+    }
+  }
+
+  async selectModels() {
+    const modelConfig = {
+      list: [],
+      origin: [],
+    };
+
+    try {
+      modelConfig.origin = (await this.getModelList()).data || [];
+      modelConfig.list = modelConfig.origin.map((item) => item.id);
+      if (!modelConfig.list.length) {
+        throw '未找到可用的模型';
+      }
+    } catch (error) {
+      throw error && error.message ? error.message : error;
+    }
+    try {
+      const answers = await inquirer.prompt([
+        {
+          type: 'rawlist',
+          name: 'model',
+          message: `请选择模型`,
+          choices: modelConfig.list,
+          default: '',
+          loop: false,
+        },
+      ]);
+      const item = modelConfig.origin.find((item) => item.id === answers.model);
+      if (!item.baseURL || !item.id) {
+        throw `模型信息不完整: 请检查 \`baseURL\` 和 \`id\``;
+      }
+      config.set('baseURL', item.baseURL);
+      config.set('model', item.id);
+      config.set('key', item.keys);
+      Logger.success(`已设置模型: \n   - ${item.id.split(`,`).join('\n   - ')}`);
+    } catch (error) {
+      throw `设置模型失败: ${error && error.message ? error.message : error}`;
+    }
+  }
+  // 验证模型是否可用
+  async validateModel() {
+    const spinner = new Spinner('正在验证模型是否可用...');
+    spinner.start();
+
+    const startTimestamp = Date.now();
+    const configModel = config.get('model') ? config.get('model').split(',') : [];
+    const total = configModel.length;
+    const errTotal = [];
+    while (configModel.length) {
+      const model = configModel.shift();
+      try {
+        const result = await chat({
+          model: model,
+          messages: [
+            {
+              role: 'user',
+              content: '1+1=?',
+            },
+          ],
+        });
+        formatCompletions(result);
+      } catch {
+        errTotal.push(model);
+      }
+    }
+    spinner.stop();
+    if (total - errTotal.length > 0) {
+      Logger.success(`模型验证通过 ${total - errTotal.length} 个`);
+    }
+    if (errTotal.length) {
+      Logger.error(`模型验证失败 ${errTotal.length} 个，分别是：\n${errTotal.join('\n   - ')}`);
+    }
+
+    const endTimestamp = Date.now();
+    const duration = endTimestamp - startTimestamp;
+
+    Logger.success(`本次检查模型用时: ${(duration / 1000).toFixed(3)} 秒`);
+  }
+
+  async setModel() {
+    await this.selectModels();
+    await this.validateModel();
+  }
+}
+
+export default async function () {
+  const action = new SelectModelAction();
+  await action.run();
+}