ynosis-agent-mcp 0.2.2 → 0.2.3

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "ynosis-agent-mcp",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "scripts": {
     "test": "node --test test/*.test.mjs"
   },
   "description": "MCP stdio server for the Ynosis Agent API (facilities and spring analyses)",
   "type": "module",
   "bin": {
-    "ynosis-agent-mcp": "./src/server.mjs"
+    "ynosis-agent-mcp": "src/server.mjs"
   },
   "files": [
     "src",

package/src/client.mjs

@@ -1,4 +1,7 @@
+import { File } from "node:buffer";
+
 const DEFAULT_BASE = "https://ynosis.jp";
+const DEFAULT_REGISTER_MIN_INTERVAL_MS = 20_000;
 
 function resolveKey() {
   return process.env.YNOSIS_AGENT_API_KEY || process.env.AGENT_API_KEY || "";
@@ -13,6 +16,26 @@ function resolveBase() {
   return raw.replace(/\/$/, "");
 }
 
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+/** @type {number | null} */
+let lastRegisterRelatedAt = null;
+
+export async function paceRegisterRelated(minIntervalMs = DEFAULT_REGISTER_MIN_INTERVAL_MS) {
+  const now = Date.now();
+  if (lastRegisterRelatedAt != null && minIntervalMs > 0) {
+    const wait = minIntervalMs - (now - lastRegisterRelatedAt);
+    if (wait > 0) await sleep(wait);
+  }
+  lastRegisterRelatedAt = Date.now();
+}
+
+function appendUploadFile(form, fieldName, buf, filename, contentType) {
+  form.append(fieldName, new File([buf], filename, { type: contentType }));
+}
+
 function imageContentType(filePath) {
   const suffix = filePath.toLowerCase().split(".").pop();
   if (suffix === "png") return "image/png";
@@ -22,6 +45,14 @@ function imageContentType(filePath) {
   return "image/jpeg";
 }
 
+function preparedImageHeaders(filePath) {
+  const suffix = filePath.toLowerCase().split(".").pop();
+  if (suffix === "jpg" || suffix === "jpeg") {
+    return { "X-Ynosis-Image-Prepared": "1" };
+  }
+  return {};
+}
+
 export class AgentApiError extends Error {
   constructor(statusCode, detail) {
     super(`HTTP ${statusCode}: ${detail}`);
@@ -52,12 +83,17 @@ export class AgentApiClient {
     return headers;
   }
 
-  async request(method, path, { json, form } = {}) {
+  async request(method, path, { json, form, extraHeaders } = {}) {
     const url = `${this.baseUrl}${path}`;
     const ctrl = new AbortController();
     const timer = setTimeout(() => ctrl.abort(), form ? Math.max(this.timeoutMs, 180_000) : this.timeoutMs);
     try {
-      const init = { method, headers: form ? { "X-API-Key": this.apiKey } : this.headers(json != null), signal: ctrl.signal };
+      const formHeaders = { "X-API-Key": this.apiKey, ...(extraHeaders || {}) };
+      const init = {
+        method,
+        headers: form ? formHeaders : this.headers(json != null),
+        signal: ctrl.signal,
+      };
       if (form) init.body = form;
       else if (json != null) init.body = JSON.stringify(json);
       const res = await fetch(url, init);
@@ -191,21 +227,31 @@ export class AgentApiClient {
       const res = await this.request("POST", "/api/agent/register", { json: payload });
       return res.json;
     }
+    await paceRegisterRelated();
     const buf = await readFile(imagePath);
     const form = new FormData();
     form.append("payload", JSON.stringify(payload));
-    form.append("file", new Blob([buf], { type: imageContentType(imagePath) }), basename(imagePath));
-    const res = await this.request("POST", "/api/agent/register", { form });
+    const name = basename(imagePath);
+    appendUploadFile(form, "file", buf, name, imageContentType(imagePath));
+    const res = await this.request("POST", "/api/agent/register", {
+      form,
+      extraHeaders: preparedImageHeaders(imagePath),
+    });
     return res.json;
   }
 
   async analyzeImage(imagePath) {
     const { readFile } = await import("node:fs/promises");
     const { basename } = await import("node:path");
+    await paceRegisterRelated();
     const buf = await readFile(imagePath);
     const form = new FormData();
-    form.append("file", new Blob([buf], { type: imageContentType(imagePath) }), basename(imagePath));
-    const res = await this.request("POST", "/api/agent/analyze", { form });
+    const name = basename(imagePath);
+    appendUploadFile(form, "file", buf, name, imageContentType(imagePath));
+    const res = await this.request("POST", "/api/agent/analyze", {
+      form,
+      extraHeaders: preparedImageHeaders(imagePath),
+    });
     return res.json;
   }
 
@@ -215,6 +261,7 @@ export class AgentApiClient {
   }
 
   async parseTranscript(rawText, llmJson) {
+    await paceRegisterRelated();
     const body = { raw_text: rawText };
     if (llmJson != null) body.llm_json = llmJson;
     const res = await this.request("POST", "/api/agent/parse", { json: body });
@@ -229,9 +276,11 @@ export class AgentApiClient {
   async uploadSourceImage(sourceId, imagePath) {
     const { readFile } = await import("node:fs/promises");
     const { basename } = await import("node:path");
+    await paceRegisterRelated();
     const buf = await readFile(imagePath);
     const form = new FormData();
-    form.append("file", new Blob([buf], { type: imageContentType(imagePath) }), basename(imagePath));
+    const name = basename(imagePath);
+    appendUploadFile(form, "file", buf, name, imageContentType(imagePath));
     const res = await this.request("POST", `/api/sources/${sourceId}/image`, { form });
     return res.json;
   }

package/src/server.mjs

@@ -29,19 +29,20 @@ function textResult(text) {
 
 const server = new McpServer({
   name: "ynosis-agent",
-  version: "0.2.2",
+  version: "0.2.3",
   instructions:
     "Ynosis（温泉データベース）への施設・成分表登録・検索用ツール。" +
     "新規施設登録前: find_existing_facility で重複確認 → 既存なら update_facility、" +
     "新規のみ resolve_place_candidates → LLM が同一候補を選び prepare_facility_for_register → register_facility（推測禁止）。" +
     "検索は search_facilities / get_facility / find_existing_facility。" +
     "施設登録は register_facilities_batch または register_facility。" +
-    "成分表は手元 Vision なら get_parse_prompt → 手元 LLM → parse_transcript、" +
-    "または analyze_source_image（Ynosis OCR）。" +
-    "その後 register_source。新規源泉は image_path 必須。" +
-    "OCR / サーバー抽出の parse は並列禁止。" +
+    "成分表一括は CLI register-batch 推奨（3件ごと60秒休憩）。MCP は1件ずつ。" +
+    "成分表は手元 Vision なら get_parse_prompt → 手元 LLM → parse_transcript（llm_json 推奨）、" +
+    "または analyze_source_image（Ynosis OCR・負荷大）。" +
+    "その後 register_source。新規源泉は image_path 必須。ツール呼び出し間隔20秒以上。" +
+    "並列禁止。本番512MBのため4件以上を休憩なしで連打しない。" +
     "YNOSIS_AGENT_API_KEY と座標候補用 GOOGLE_MAPS_API_KEY が必要。" +
-    "CLI は PyPI の ynosis-agent。CSV ファイル一括は CLI / MCP。",
+    "CLI は PyPI ynosis-agent 0.2.6+。CSV 一括は CLI / MCP。",
 });
 
 const dict = z.record(z.any());
@@ -296,7 +297,7 @@ server.tool(
 
 server.tool(
   "register_source",
-  "成分表付きで施設・源泉を登録する。新規源泉は image_path（成分表画像）必須。",
+  "成分表付きで施設・源泉を登録する。新規源泉は image_path 必須。3件以上は60秒休憩。HEICは事前JPEG化推奨。",
   { payload: dict, image_path: z.string().optional() },
   async ({ payload, image_path }) => {
     try {
@@ -328,13 +329,18 @@ server.tool(
   }
 );
 
-server.tool("analyze_source_image", "成分表画像を Ynosis OCR で解析する（DB 未書込）。並列禁止。", { image_path: z.string() }, async ({ image_path }) => {
-  try {
-    return textResult(dump(await client().analyzeImage(image_path)));
-  } catch (e) {
-    return textResult(errText(e));
+server.tool(
+  "analyze_source_image",
+  "成分表画像を Ynosis OCR で解析する（DB 未書込）。並列禁止。連続呼び出しは20秒以上空ける。一括は CLI register-batch 推奨。",
+  { image_path: z.string() },
+  async ({ image_path }) => {
+    try {
+      return textResult(dump(await client().analyzeImage(image_path)));
+    } catch (e) {
+      return textResult(errText(e));
+    }
   }
-});
+);
 
 server.tool("prepare_parsed", "register_source 用に dissolved_material を mg 換算する。", { parsed: dict }, async ({ parsed }) => {
   try {