aiconductor-cli 1.3.2 → 1.3.3

package/README.md

@@ -115,18 +115,23 @@ aiconductor-cli search web <关键词> [选项]
 
 | 选项 | 说明 | 默认值 |
 |------|------|--------|
-| `-n, --count` | 返回条数（最多50） | 5 |
+| `-n, --count` | 返回条数（最多50） | 10 |
 | `--time-range` | 时间范围：预设 `OneDay`/`OneWeek`/`OneMonth`/`OneYear`，或自定义 `YYYY-MM-DD..YYYY-MM-DD` | 无 |
-| `--no-summary` | 不返回内容摘要 | 默认返回 |
-| `--content-format` | 内容格式：`Text` 或 `Markdown` | Text |
-| `--auth-level` | 权威过滤：0=不过滤，1=优先权威来源 | 0 |
+| `--need-content` | 仅返回包含正文的结果 | 关闭 |
+| `--need-url` | 仅返回带原文链接的结果 | 关闭 |
+| `--sites` | 限定搜索站点，完整域名以 `\|` 分隔，最多20个 | 无 |
+| `--block-hosts` | 屏蔽站点，完整域名以 `\|` 分隔，最多5个 | 无 |
+| `--auth-info-level` | 权威度过滤：0=不限制，1=仅非常权威内容 | 0 |
+| `--auth-level` | `--auth-info-level` 的兼容别名 | 无 |
+| `--content-format` | 正文格式：`text` 或 `markdown` | text |
+| `--industry` | 行业搜索：`finance`、`game` 或 `gov` | 无 |
 | `--query-rewrite` | 开启 Query 改写 | 关闭 |
 | `-f, --format` | 输出格式：`json` 或 `text` | json |
 
 示例：
 ```bash
-aiconductor-cli search web "北京今日天气" -n 3 --auth-level 1
-aiconductor-cli search web "AI 最新进展" --time-range OneWeek --content-format Markdown
+aiconductor-cli search web "北京今日天气" -n 3 --auth-info-level 1 --need-url
+aiconductor-cli search web "AI 最新进展" --time-range OneWeek --content-format markdown --need-content
 aiconductor-cli search web "技术文章" --time-range 2025-01-01..2025-06-30 -n 10
 ```
 
@@ -139,12 +144,17 @@ aiconductor-cli search image <关键词> [选项]
 | 选项 | 说明 | 默认值 |
 |------|------|--------|
 | `-n, --count` | 返回条数（最多5） | 5 |
-| `--time-range` | 时间范围：预设或自定义日期范围 | 无 |
+| `--image-width-min` | 图片最小宽度 | 无 |
+| `--image-width-max` | 图片最大宽度 | 无 |
+| `--image-height-min` | 图片最小高度 | 无 |
+| `--image-height-max` | 图片最大高度 | 无 |
+| `--image-shapes` | 图片形状，以 `\|` 分隔：`横长方形`、`竖长方形`、`方形` | 无 |
+| `--query-rewrite` | 开启 Query 改写 | 关闭 |
 | `-f, --format` | 输出格式：`json` 或 `text` | json |
 
 示例：
 ```bash
-aiconductor-cli search image "长城风景" -n 3 -f text
+aiconductor-cli search image "长城风景" -n 3 --image-width-min 1200 --image-shapes "横长方形|方形" -f text
 ```
 
 ### 抖音数据工具箱
@@ -309,7 +319,7 @@ aiconductor-cli xhs note-publish video \
 |------|------|
 | HTML 发布 | 0.01 元/次 |
 | Markdown/HTML 网页发布 | 0.01 元/次 |
-| 网页/图片搜索 | 0.03 元/次 |
+| 豆包网页/图片搜索 | 0.02 元/次 |
 | 抖音作品详情 | 0.01 元/次 |
 | 抖音作品评论 | 0.01 元/次 |
 | 抖音用户视频列表 | 0.03 元/页 |

package/bin/aiconductor-cli.js

@@ -95,12 +95,17 @@ searchCmd
   .description("网页搜索")
   .argument("<query>", "搜索关键词（1~100字符）")
   .option("-k, --api-key <key>", "AIConductor API Key（也可通过 AICONDUCTOR_API_KEY 环境变量或 .env 文件提供）")
-  .option("-n, --count <n>", "返回条数（最多50）")
-  .option("--time-range <range>", "时间范围：OneDay/OneWeek/OneMonth/OneYear 或 YYYY-MM-DD..YYYY-MM-DD")
-  .option("--no-summary", "不返回摘要")
-  .option("--content-format <format>", "内容格式：Text 或 Markdown", "Text")
-  .option("--auth-level <level>", "权威来源过滤：0=不过滤，1=优先权威来源", "0")
-  .option("--query-rewrite", "开启 Query 改写")
+  .option("-n, --count <n>", "返回条数（最多50）")
+  .option("--time-range <range>", "时间范围：OneDay/OneWeek/OneMonth/OneYear 或 YYYY-MM-DD..YYYY-MM-DD")
+  .option("--need-content", "仅返回包含正文的结果")
+  .option("--need-url", "仅返回带原文链接的结果")
+  .option("--sites <domains>", "限定搜索站点，完整域名以 | 分隔，最多20个")
+  .option("--block-hosts <domains>", "屏蔽站点，完整域名以 | 分隔，最多5个")
+  .option("--auth-info-level <level>", "权威度过滤：0=不限制，1=仅非常权威内容")
+  .option("--auth-level <level>", "兼容别名，等同 --auth-info-level")
+  .option("--content-format <format>", "正文格式：text 或 markdown", "text")
+  .option("--industry <type>", "行业搜索：finance、game 或 gov")
+  .option("--query-rewrite", "开启 Query 改写")
   .option("-f, --format <format>", "输出格式：json 或 text", "json")
   .action((query, options) => {
     searchCommand(query, "web", options);
@@ -110,9 +115,14 @@ searchCmd
   .command("image")
   .description("图片搜索")
   .argument("<query>", "搜索关键词（1~100字符）")
-  .option("-k, --api-key <key>", "AIConductor API Key（也可通过 AICONDUCTOR_API_KEY 环境变量或 .env 文件提供）")
-  .option("-n, --count <n>", "返回条数（最多5）")
-  .option("--time-range <range>", "时间范围：OneDay/OneWeek/OneMonth/OneYear 或 YYYY-MM-DD..YYYY-MM-DD")
+  .option("-k, --api-key <key>", "AIConductor API Key（也可通过 AICONDUCTOR_API_KEY 环境变量或 .env 文件提供）")
+  .option("-n, --count <n>", "返回条数（最多5）")
+  .option("--image-width-min <px>", "图片最小宽度")
+  .option("--image-width-max <px>", "图片最大宽度")
+  .option("--image-height-min <px>", "图片最小高度")
+  .option("--image-height-max <px>", "图片最大高度")
+  .option("--image-shapes <shapes>", "图片形状，以 | 分隔：横长方形、竖长方形、方形")
+  .option("--query-rewrite", "开启 Query 改写")
   .option("-f, --format <format>", "输出格式：json 或 text", "json")
   .action((query, options) => {
     searchCommand(query, "image", options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiconductor-cli",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "AIConductor CLI 工具箱",
   "keywords": [
     "aiconductor",
@@ -21,7 +21,9 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "scripts": {},
+  "scripts": {
+    "test": "node --test"
+  },
   "dependencies": {
     "commander": "^12.1.0"
   }

package/src/api.js

@@ -7,7 +7,7 @@ const API_PATH = "/api/html_publish";
 const MD_TO_HTML_API_PATH = "/api/md_to_html";
 const PUBLISHED_WEBPAGES_API_PATH = "/api/published_webpages";
 const DELETE_PUBLISHED_WEBPAGE_API_PATH = "/api/delete_published_webpage";
-const SEARCH_API_PATH = "/api/aic_web_search";
+const SEARCH_API_PATH = "/api/doubao_search";
 const DOUYIN_VIDEO_INFO_PATH = "/api/douyin_video_info";
 const DOUYIN_VIDEO_COMMENTS_PATH = "/api/douyin_video_comments";
 const DOUYIN_USER_VIDEOS_PATH = "/api/douyin_user_videos";
@@ -273,26 +273,62 @@ async function publishHtml(apiKey, htmlCode, title) {
 }
 
 /**
- * 网页/图片搜索
- * @param {string} apiKey
- * @param {{ query: string, searchType: string, count?: number, timeRange?: string, needSummary?: boolean, contentFormats?: string, authLevel?: number, queryRewrite?: boolean }} params
- * @returns {Promise<object>}
- */
-async function webSearch(apiKey, params) {
-  // 输入校验
-  validateInt(params.count, "count");
-  validateInt(params.authLevel, "authLevel");
-
-  const reqBody = {
-    query: params.query,
-    search_type: params.searchType,
-  };
-  if (params.count !== undefined) reqBody.count = params.count;
-  if (params.timeRange) reqBody.time_range = params.timeRange;
-  if (params.needSummary !== undefined) reqBody.need_summary = params.needSummary;
-  if (params.contentFormats) reqBody.content_formats = params.contentFormats;
-  if (params.authLevel !== undefined) reqBody.auth_level = params.authLevel;
-  if (params.queryRewrite !== undefined) reqBody.query_rewrite = params.queryRewrite;
+ * 豆包网页/图片搜索
+ * @param {string} apiKey
+ * @param {{ query: string, searchType: "web"|"image", count?: number, queryRewrite?: boolean, needContent?: boolean, needUrl?: boolean, sites?: string, blockHosts?: string, authInfoLevel?: number, timeRange?: string, contentFormats?: string, industry?: string, imageWidthMin?: number, imageWidthMax?: number, imageHeightMin?: number, imageHeightMax?: number, imageShapes?: string[]|string }} params
+ * @returns {Promise<object>}
+ */
+async function webSearch(apiKey, params) {
+  const maxCount = params.searchType === "web" ? 50 : 5;
+  if (params.searchType !== "web" && params.searchType !== "image") {
+    throw Object.assign(new Error("searchType 只能是 web 或 image"), { type: "validation_error" });
+  }
+  const count = params.count === undefined ? undefined : validatePositiveInt(params.count, "count", maxCount);
+  validateInt(params.authInfoLevel, "authInfoLevel");
+  validateInt(params.imageWidthMin, "imageWidthMin");
+  validateInt(params.imageWidthMax, "imageWidthMax");
+  validateInt(params.imageHeightMin, "imageHeightMin");
+  validateInt(params.imageHeightMax, "imageHeightMax");
+
+  const authInfoLevel = params.authInfoLevel === undefined ? undefined : Number(params.authInfoLevel);
+  const imageWidthMin = params.imageWidthMin === undefined ? undefined : Number(params.imageWidthMin);
+  const imageWidthMax = params.imageWidthMax === undefined ? undefined : Number(params.imageWidthMax);
+  const imageHeightMin = params.imageHeightMin === undefined ? undefined : Number(params.imageHeightMin);
+  const imageHeightMax = params.imageHeightMax === undefined ? undefined : Number(params.imageHeightMax);
+
+  if (authInfoLevel !== undefined && ![0, 1].includes(authInfoLevel)) {
+    throw Object.assign(new Error("authInfoLevel 只能是 0 或 1"), { type: "validation_error" });
+  }
+  if (imageWidthMin !== undefined && imageWidthMax !== undefined && imageWidthMin > imageWidthMax) {
+    throw Object.assign(new Error("imageWidthMin 不能大于 imageWidthMax"), { type: "validation_error" });
+  }
+  if (imageHeightMin !== undefined && imageHeightMax !== undefined && imageHeightMin > imageHeightMax) {
+    throw Object.assign(new Error("imageHeightMin 不能大于 imageHeightMax"), { type: "validation_error" });
+  }
+
+  const reqBody = {
+    query: params.query,
+    search_type: params.searchType,
+  };
+  if (count !== undefined) reqBody.count = count;
+  if (params.queryRewrite !== undefined) reqBody.query_rewrite = params.queryRewrite;
+
+  if (params.searchType === "web") {
+    if (params.needContent !== undefined) reqBody.need_content = params.needContent;
+    if (params.needUrl !== undefined) reqBody.need_url = params.needUrl;
+    if (params.sites) reqBody.sites = params.sites;
+    if (params.blockHosts) reqBody.block_hosts = params.blockHosts;
+    if (authInfoLevel !== undefined) reqBody.auth_info_level = authInfoLevel;
+    if (params.timeRange) reqBody.time_range = params.timeRange;
+    if (params.contentFormats) reqBody.content_formats = params.contentFormats;
+    if (params.industry) reqBody.industry = params.industry;
+  } else {
+    if (imageWidthMin !== undefined) reqBody.image_width_min = imageWidthMin;
+    if (imageWidthMax !== undefined) reqBody.image_width_max = imageWidthMax;
+    if (imageHeightMin !== undefined) reqBody.image_height_min = imageHeightMin;
+    if (imageHeightMax !== undefined) reqBody.image_height_max = imageHeightMax;
+    if (params.imageShapes !== undefined) reqBody.image_shapes = params.imageShapes;
+  }
 
   const resp = await httpPost(API_HOST, SEARCH_API_PATH, reqBody, {
     Authorization: `Bearer ${apiKey}`,

package/src/api.test.js

@@ -0,0 +1,98 @@
+const assert = require("node:assert/strict");
+const { EventEmitter } = require("node:events");
+const https = require("node:https");
+const test = require("node:test");
+
+const { webSearch } = require("./api");
+
+function captureRequest(callback) {
+  const originalRequest = https.request;
+  let captured;
+  https.request = (options, responseCallback) => {
+    const request = new EventEmitter();
+    const chunks = [];
+    request.write = (chunk) => chunks.push(Buffer.from(chunk));
+    request.end = () => {
+      captured = { options, body: JSON.parse(Buffer.concat(chunks).toString("utf-8")) };
+      const response = new EventEmitter();
+      response.statusCode = 200;
+      responseCallback(response);
+      response.emit("data", Buffer.from(JSON.stringify({ success: true, billing: {} })));
+      response.emit("end");
+    };
+    return request;
+  };
+
+  return callback().then(() => captured).finally(() => {
+    https.request = originalRequest;
+  });
+}
+
+test("webSearch maps current web search options to the Doubao endpoint", async () => {
+  const request = await captureRequest(() => webSearch("test-key", {
+    query: "最新的北京游玩攻略",
+    searchType: "web",
+    count: 10,
+    queryRewrite: true,
+    needContent: true,
+    needUrl: true,
+    sites: "example.com|volcengine.com",
+    blockHosts: "spam.example",
+    authInfoLevel: 1,
+    timeRange: "OneYear",
+    contentFormats: "markdown",
+    industry: "finance",
+  }));
+
+  assert.equal(request.options.path, "/api/doubao_search");
+  assert.equal(request.options.headers.Authorization, "Bearer test-key");
+  assert.deepEqual(request.body, {
+    query: "最新的北京游玩攻略",
+    search_type: "web",
+    count: 10,
+    query_rewrite: true,
+    need_content: true,
+    need_url: true,
+    sites: "example.com|volcengine.com",
+    block_hosts: "spam.example",
+    auth_info_level: 1,
+    time_range: "OneYear",
+    content_formats: "markdown",
+    industry: "finance",
+  });
+});
+
+test("webSearch maps current image filters and rejects invalid count", async () => {
+  const request = await captureRequest(() => webSearch("test-key", {
+    query: "长城风景",
+    searchType: "image",
+    count: 5,
+    queryRewrite: true,
+    imageWidthMin: 1200,
+    imageWidthMax: 1920,
+    imageHeightMin: 800,
+    imageHeightMax: 1080,
+    imageShapes: "横长方形|方形",
+  }));
+
+  assert.deepEqual(request.body, {
+    query: "长城风景",
+    search_type: "image",
+    count: 5,
+    query_rewrite: true,
+    image_width_min: 1200,
+    image_width_max: 1920,
+    image_height_min: 800,
+    image_height_max: 1080,
+    image_shapes: "横长方形|方形",
+  });
+
+  await assert.rejects(
+    webSearch("test-key", { query: "长城", searchType: "image", count: 6 }),
+    { type: "validation_error" }
+  );
+  await assert.rejects(
+    webSearch("test-key", { query: "长城", searchType: "image", imageWidthMin: "invalid" }),
+    { type: "validation_error" }
+  );
+});

package/src/commands/web_search.js

@@ -1,5 +1,5 @@
 const { webSearch } = require("../api");
-const { outputResult, outputError, resolveKeyOrExit, handleApiError, safeParseInt } = require("../lib/cli-utils");
+const { outputResult, outputError, resolveKeyOrExit, handleApiError } = require("../lib/cli-utils");
 
 /** text 模式的自定义格式化 */
 function formatSearchText(data) {
@@ -49,19 +49,34 @@ async function searchCommand(query, searchType, options = {}) {
   const params = { query, searchType };
 
   if (options.count !== undefined) {
-    params.count = safeParseInt(options.count, undefined);
+    params.count = options.count;
   }
   if (options.timeRange) {
     params.timeRange = options.timeRange;
   }
   if (searchType === "web") {
-    params.needSummary = options.summary !== false;
-  }
-  if (options.contentFormat) {
-    params.contentFormats = options.contentFormat;
-  }
-  if (options.authLevel !== undefined) {
-    params.authLevel = safeParseInt(options.authLevel, undefined);
+    if (options.needContent) params.needContent = true;
+    if (options.needUrl) params.needUrl = true;
+    if (options.sites) params.sites = options.sites;
+    if (options.blockHosts) params.blockHosts = options.blockHosts;
+    const authInfoLevel = options.authInfoLevel ?? options.authLevel;
+    if (authInfoLevel !== undefined) {
+      params.authInfoLevel = authInfoLevel;
+    }
+    if (options.contentFormat) params.contentFormats = options.contentFormat;
+    if (options.industry) params.industry = options.industry;
+  } else {
+    for (const [optionName, paramName] of [
+      ["imageWidthMin", "imageWidthMin"],
+      ["imageWidthMax", "imageWidthMax"],
+      ["imageHeightMin", "imageHeightMin"],
+      ["imageHeightMax", "imageHeightMax"],
+    ]) {
+      if (options[optionName] !== undefined) {
+        params[paramName] = options[optionName];
+      }
+    }
+    if (options.imageShapes) params.imageShapes = options.imageShapes;
   }
   if (options.queryRewrite) {
     params.queryRewrite = true;