ynosis-agent 0.1.0__tar.gz

ynosis_agent-0.1.0/PKG-INFO

@@ -0,0 +1,79 @@
+Metadata-Version: 2.4
+Name: ynosis-agent
+Version: 0.1.0
+Summary: CLI and MCP client for the Ynosis Agent API (facilities and spring analyses)
+Author: Ynosis
+License: Proprietary
+Project-URL: Homepage, https://ynosis.jp
+Project-URL: Documentation, https://ynosis.jp/notes/usage-037
+Keywords: ynosis,onsen,agent,mcp
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+Requires-Dist: httpx>=0.27
+Provides-Extra: mcp
+Requires-Dist: mcp<2,>=1.0; extra == "mcp"
+
+# ynosis-agent
+
+Ynosis Agent API 用の **公開クライアント**（CLI / MCP）。
+
+リポジトリは非公開です。ソース clone は不要です。
+
+## CLI
+
+```bash
+pip install ynosis-agent
+export YNOSIS_AGENT_API_KEY='yna_...'   # マイページ → … → Agent API
+ynosis-agent search --q 草津 --limit 5
+```
+
+接続先の既定は `https://ynosis.jp`。
+
+## MCP（アプリに設定を貼る・推奨）
+
+事前 pip 不要。[`uv`](https://docs.astral.sh/uv/)（`uvx`）があるマシンで、アプリの MCP 設定に次を追加します。
+
+**起動コマンド:**
+
+```text
+uvx --from ynosis-agent[mcp] ynosis-agent-mcp
+```
+
+**環境変数:** `YNOSIS_AGENT_API_KEY=yna_…`（必須）
+
+### Cursor（mcp.json）
+
+```json
+{
+  "mcpServers": {
+    "ynosis-agent": {
+      "command": "uvx",
+      "args": ["--from", "ynosis-agent[mcp]", "ynosis-agent-mcp"],
+      "env": {
+        "YNOSIS_AGENT_API_KEY": "yna_REPLACE_ME",
+        "YNOSIS_AGENT_API_BASE": "https://ynosis.jp"
+      }
+    }
+  }
+}
+```
+
+### Claude Code
+
+```bash
+claude mcp add --transport stdio ynosis-agent \
+  --env YNOSIS_AGENT_API_KEY=yna_REPLACE_ME \
+  -- uvx --from 'ynosis-agent[mcp]' ynosis-agent-mcp
+```
+
+`uv` が無い場合のフォールバック: `pip install 'ynosis-agent[mcp]'` のあと `command` を `ynosis-agent-mcp` にする。
+
+## 運営向け: PyPI 公開
+
+```bash
+cd packages/ynosis-agent
+python -m build
+twine upload dist/*
+```
+
+バージョンは `pyproject.toml` の `version` を上げてからビルドする。

ynosis_agent-0.1.0/README.md

@@ -0,0 +1,64 @@
+# ynosis-agent
+
+Ynosis Agent API 用の **公開クライアント**（CLI / MCP）。
+
+リポジトリは非公開です。ソース clone は不要です。
+
+## CLI
+
+```bash
+pip install ynosis-agent
+export YNOSIS_AGENT_API_KEY='yna_...'   # マイページ → … → Agent API
+ynosis-agent search --q 草津 --limit 5
+```
+
+接続先の既定は `https://ynosis.jp`。
+
+## MCP（アプリに設定を貼る・推奨）
+
+事前 pip 不要。[`uv`](https://docs.astral.sh/uv/)（`uvx`）があるマシンで、アプリの MCP 設定に次を追加します。
+
+**起動コマンド:**
+
+```text
+uvx --from ynosis-agent[mcp] ynosis-agent-mcp
+```
+
+**環境変数:** `YNOSIS_AGENT_API_KEY=yna_…`（必須）
+
+### Cursor（mcp.json）
+
+```json
+{
+  "mcpServers": {
+    "ynosis-agent": {
+      "command": "uvx",
+      "args": ["--from", "ynosis-agent[mcp]", "ynosis-agent-mcp"],
+      "env": {
+        "YNOSIS_AGENT_API_KEY": "yna_REPLACE_ME",
+        "YNOSIS_AGENT_API_BASE": "https://ynosis.jp"
+      }
+    }
+  }
+}
+```
+
+### Claude Code
+
+```bash
+claude mcp add --transport stdio ynosis-agent \
+  --env YNOSIS_AGENT_API_KEY=yna_REPLACE_ME \
+  -- uvx --from 'ynosis-agent[mcp]' ynosis-agent-mcp
+```
+
+`uv` が無い場合のフォールバック: `pip install 'ynosis-agent[mcp]'` のあと `command` を `ynosis-agent-mcp` にする。
+
+## 運営向け: PyPI 公開
+
+```bash
+cd packages/ynosis-agent
+python -m build
+twine upload dist/*
+```
+
+バージョンは `pyproject.toml` の `version` を上げてからビルドする。

ynosis_agent-0.1.0/pyproject.toml

@@ -0,0 +1,29 @@
+[build-system]
+requires = ["setuptools>=68", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "ynosis-agent"
+version = "0.1.0"
+description = "CLI and MCP client for the Ynosis Agent API (facilities and spring analyses)"
+readme = "README.md"
+requires-python = ">=3.11"
+license = { text = "Proprietary" }
+authors = [{ name = "Ynosis" }]
+keywords = ["ynosis", "onsen", "agent", "mcp"]
+dependencies = [
+  "httpx>=0.27",
+]
+[project.optional-dependencies]
+mcp = ["mcp>=1.0,<2"]
+
+[project.scripts]
+ynosis-agent = "ynosis_agent.cli:main"
+ynosis-agent-mcp = "ynosis_agent.mcp_server:main"
+
+[project.urls]
+Homepage = "https://ynosis.jp"
+Documentation = "https://ynosis.jp/notes/usage-037"
+
+[tool.setuptools.packages.find]
+where = ["src"]

ynosis_agent-0.1.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

ynosis_agent-0.1.0/src/ynosis_agent/__init__.py

@@ -0,0 +1,30 @@
+"""Ynosis Agent API クライアント（CLI / MCP）。
+
+インストール:
+  pip install ynosis-agent
+  pip install 'ynosis-agent[mcp]'   # MCP 利用時
+
+環境変数:
+  YNOSIS_AGENT_API_KEY または AGENT_API_KEY
+  YNOSIS_AGENT_API_BASE または AGENT_API_BASE（既定 https://ynosis.jp）
+"""
+
+from ynosis_agent.client import (
+    DEFAULT_AGENT_API_BASE,
+    AgentApiClient,
+    AgentApiError,
+    resolve_agent_api_base,
+    resolve_agent_api_key,
+)
+from ynosis_agent.tags import FACILITY_TAG_OPTIONS
+
+__all__ = [
+    "DEFAULT_AGENT_API_BASE",
+    "AgentApiClient",
+    "AgentApiError",
+    "FACILITY_TAG_OPTIONS",
+    "resolve_agent_api_base",
+    "resolve_agent_api_key",
+]
+
+__version__ = "0.1.0"

ynosis_agent-0.1.0/src/ynosis_agent/cli.py

@@ -0,0 +1,291 @@
+"""Ynosis Agent CLI（PyPI: `ynosis-agent`）。
+
+環境変数:
+  YNOSIS_AGENT_API_KEY または AGENT_API_KEY
+  YNOSIS_AGENT_API_BASE または AGENT_API_BASE（既定 https://ynosis.jp）
+"""
+
+from __future__ import annotations
+
+import argparse
+import json
+import sys
+import time
+from pathlib import Path
+
+from ynosis_agent.client import AgentApiClient, AgentApiError
+from ynosis_agent.csv_import import facilities_from_csv
+from ynosis_agent.prepare import prepare_parsed_for_save
+
+DEFAULT_OCR_MIN_INTERVAL_SECONDS = 6.0
+_IMAGE_SUFFIXES = {
+    ".jpg",
+    ".jpeg",
+    ".png",
+    ".webp",
+    ".bmp",
+    ".tif",
+    ".tiff",
+    ".heic",
+    ".heif",
+    ".pdf",
+}
+
+
+def _pace(last_start: float | None, min_interval: float) -> float:
+    now = time.monotonic()
+    if last_start is not None and min_interval > 0:
+        wait = min_interval - (now - last_start)
+        if wait > 0:
+            time.sleep(wait)
+            now = time.monotonic()
+    return now
+
+
+def _cmd_facilities_csv(args: argparse.Namespace) -> int:
+    payloads = facilities_from_csv(args.csv_path)
+    if args.dry_run:
+        print(json.dumps({"count": len(payloads), "facilities": payloads}, ensure_ascii=False, indent=2))
+        return 0
+    try:
+        result = AgentApiClient().register_facilities_batch(
+            payloads,
+            continue_on_error=not args.stop_on_error,
+        )
+    except (AgentApiError, ValueError) as e:
+        print(str(e), file=sys.stderr)
+        return 1
+    print(json.dumps(result, ensure_ascii=False, indent=2))
+    print(
+        f"created={result['created']} updated={result['updated']} failed={result['failed']}",
+        file=sys.stderr,
+    )
+    return 1 if result["failed"] else 0
+
+
+def _cmd_facility_json(args: argparse.Namespace) -> int:
+    payload = json.loads(Path(args.json_path).read_text(encoding="utf-8"))
+    try:
+        result = AgentApiClient().register_facility(payload)
+    except (AgentApiError, ValueError) as e:
+        print(str(e), file=sys.stderr)
+        return 1
+    print(json.dumps(result, ensure_ascii=False, indent=2))
+    return 0
+
+
+def _cmd_register(args: argparse.Namespace) -> int:
+    payload = json.loads(Path(args.json_path).read_text(encoding="utf-8"))
+    try:
+        result = AgentApiClient().register_source(payload)
+    except (AgentApiError, ValueError) as e:
+        print(str(e), file=sys.stderr)
+        return 1
+    print(json.dumps(result, ensure_ascii=False, indent=2))
+    return 0
+
+
+def _cmd_search(args: argparse.Namespace) -> int:
+    params = {
+        "q": args.q,
+        "prefecture": args.prefecture,
+        "area": args.area,
+        "onsen_name": args.onsen_name,
+        "spring_type": args.spring_type,
+        "tags": args.tags,
+        "limit": args.limit,
+        "skip": args.skip,
+        "sort": args.sort,
+    }
+    try:
+        result = AgentApiClient().search_facilities(params)
+    except (AgentApiError, ValueError) as e:
+        print(str(e), file=sys.stderr)
+        return 1
+    print(json.dumps(result, ensure_ascii=False, indent=2))
+    return 0
+
+
+def _cmd_facility_get(args: argparse.Namespace) -> int:
+    try:
+        result = AgentApiClient().get_facility(args.facility_id)
+    except (AgentApiError, ValueError) as e:
+        print(str(e), file=sys.stderr)
+        return 1
+    print(json.dumps(result, ensure_ascii=False, indent=2))
+    return 0
+
+
+def _cmd_analyze(args: argparse.Namespace) -> int:
+    try:
+        result = AgentApiClient().analyze_image(args.image_path)
+    except (AgentApiError, ValueError, FileNotFoundError) as e:
+        print(str(e), file=sys.stderr)
+        return 1
+    text = json.dumps(result, ensure_ascii=False, indent=2)
+    if args.out:
+        args.out.write_text(text + "\n", encoding="utf-8")
+        print(f"wrote {args.out}", file=sys.stderr)
+    else:
+        print(text)
+    return 0
+
+
+def _build_register_payload_from_analyze(
+    analyzed: dict,
+    *,
+    name: str,
+    prefecture: str,
+    facility_id: int | None,
+    extra: dict | None,
+) -> dict:
+    parsed = prepare_parsed_for_save(dict(analyzed.get("parsed") or {}))
+    payload: dict = {
+        "name": name,
+        "prefecture": prefecture,
+        "raw_text": analyzed.get("raw_text") or "",
+        "parsed": parsed,
+    }
+    if facility_id is not None:
+        payload["facility_id"] = facility_id
+    if extra:
+        payload.update(extra)
+    return payload
+
+
+def _cmd_register_from_image(args: argparse.Namespace) -> int:
+    extra = None
+    if args.extra_json:
+        extra = json.loads(Path(args.extra_json).read_text(encoding="utf-8"))
+    try:
+        analyzed = AgentApiClient().analyze_image(args.image_path)
+        payload = _build_register_payload_from_analyze(
+            analyzed,
+            name=args.name,
+            prefecture=args.prefecture,
+            facility_id=args.facility_id,
+            extra=extra,
+        )
+        if args.dry_run:
+            print(json.dumps(payload, ensure_ascii=False, indent=2))
+            return 0
+        result = AgentApiClient().register_source(payload)
+    except (AgentApiError, ValueError, FileNotFoundError) as e:
+        print(str(e), file=sys.stderr)
+        return 1
+    print(json.dumps(result, ensure_ascii=False, indent=2))
+    return 0
+
+
+def _cmd_analyze_batch(args: argparse.Namespace) -> int:
+    root = Path(args.images_dir)
+    if not root.is_dir():
+        print(f"ディレクトリがありません: {root}", file=sys.stderr)
+        return 1
+    paths = sorted(
+        p for p in root.iterdir() if p.is_file() and p.suffix.lower() in _IMAGE_SUFFIXES
+    )
+    if not paths:
+        print("対象画像がありません", file=sys.stderr)
+        return 1
+    out_dir = args.out_dir
+    if out_dir:
+        out_dir.mkdir(parents=True, exist_ok=True)
+    client = AgentApiClient()
+    results: list[dict] = []
+    last_start: float | None = None
+    failed = 0
+    for path in paths:
+        last_start = _pace(last_start, args.min_interval_seconds)
+        try:
+            analyzed = client.analyze_image(path)
+            entry: dict = {"ok": True, "path": str(path), "result": analyzed}
+            if out_dir:
+                out_path = out_dir / f"{path.stem}.json"
+                out_path.write_text(
+                    json.dumps(analyzed, ensure_ascii=False, indent=2) + "\n",
+                    encoding="utf-8",
+                )
+                entry["out"] = str(out_path)
+        except (AgentApiError, ValueError, FileNotFoundError) as e:
+            failed += 1
+            entry = {"ok": False, "path": str(path), "error": str(e)}
+            if args.stop_on_error:
+                results.append(entry)
+                break
+        results.append(entry)
+        print(f"{'ok' if entry['ok'] else 'fail'}: {path.name}", file=sys.stderr)
+    print(json.dumps({"failed": failed, "results": results}, ensure_ascii=False, indent=2))
+    return 1 if failed else 0
+
+
+def main(argv: list[str] | None = None) -> None:
+    parser = argparse.ArgumentParser(
+        prog="ynosis-agent",
+        description="Ynosis Agent API CLI（施設・成分表の登録）",
+    )
+    sub = parser.add_subparsers(dest="command", required=True)
+
+    p_csv = sub.add_parser("facilities", help="施設登録")
+    p_csv_sub = p_csv.add_subparsers(dest="facilities_cmd", required=True)
+    p_csv_file = p_csv_sub.add_parser("csv", help="調査 CSV を一括登録")
+    p_csv_file.add_argument("csv_path", type=Path)
+    p_csv_file.add_argument("--dry-run", action="store_true")
+    p_csv_file.add_argument("--stop-on-error", action="store_true")
+    p_csv_file.set_defaults(func=_cmd_facilities_csv)
+
+    p_fac = sub.add_parser("facility", help="施設 JSON 1件")
+    p_fac.add_argument("json_path", type=Path)
+    p_fac.set_defaults(func=_cmd_facility_json)
+
+    p_reg = sub.add_parser("register", help="成分表 + 施設を登録")
+    p_reg.add_argument("json_path", type=Path)
+    p_reg.set_defaults(func=_cmd_register)
+
+    p_an = sub.add_parser("analyze", help="成分表画像を Ynosis OCR で解析（DB 未書込）")
+    p_an.add_argument("image_path", type=Path)
+    p_an.add_argument("--out", type=Path, help="結果 JSON の出力先")
+    p_an.set_defaults(func=_cmd_analyze)
+
+    p_anb = sub.add_parser("analyze-batch", help="ディレクトリ内の画像を逐次 OCR")
+    p_anb.add_argument("images_dir", type=Path)
+    p_anb.add_argument("--out-dir", type=Path, default=None)
+    p_anb.add_argument(
+        "--min-interval-seconds",
+        type=float,
+        default=DEFAULT_OCR_MIN_INTERVAL_SECONDS,
+    )
+    p_anb.add_argument("--stop-on-error", action="store_true")
+    p_anb.set_defaults(func=_cmd_analyze_batch)
+
+    p_rfi = sub.add_parser("register-from-image", help="Ynosis OCR → register")
+    p_rfi.add_argument("image_path", type=Path)
+    p_rfi.add_argument("--name", required=True)
+    p_rfi.add_argument("--prefecture", required=True)
+    p_rfi.add_argument("--facility-id", type=int, default=None)
+    p_rfi.add_argument("--extra-json", type=Path, default=None)
+    p_rfi.add_argument("--dry-run", action="store_true")
+    p_rfi.set_defaults(func=_cmd_register_from_image)
+
+    p_search = sub.add_parser("search", help="施設検索")
+    p_search.add_argument("--q", default=None)
+    p_search.add_argument("--prefecture", default=None)
+    p_search.add_argument("--area", default=None)
+    p_search.add_argument("--onsen-name", default=None, dest="onsen_name")
+    p_search.add_argument("--spring-type", default=None, dest="spring_type")
+    p_search.add_argument("--tags", default=None)
+    p_search.add_argument("--limit", type=int, default=20)
+    p_search.add_argument("--skip", type=int, default=0)
+    p_search.add_argument("--sort", default="default")
+    p_search.set_defaults(func=_cmd_search)
+
+    p_get = sub.add_parser("facility-get", help="施設詳細")
+    p_get.add_argument("facility_id", type=int)
+    p_get.set_defaults(func=_cmd_facility_get)
+
+    args = parser.parse_args(argv)
+    raise SystemExit(args.func(args))
+
+
+if __name__ == "__main__":
+    main()

ynosis_agent-0.1.0/src/ynosis_agent/client.py

@@ -0,0 +1,262 @@
+"""Ynosis エージェント API の HTTP クライアント（スクリプト・MCP 共通）。
+
+サーバーは薄い `/api/agent/*` のみ。一括はクライアントループ、更新・画像・similar は通常 API。
+"""
+
+from __future__ import annotations
+
+import os
+from pathlib import Path
+from typing import Any
+
+import httpx
+
+from ynosis_agent.tags import FACILITY_TAG_OPTIONS
+
+DEFAULT_TIMEOUT = 120.0
+DEFAULT_AGENT_API_BASE = "https://ynosis.jp"
+
+
+def resolve_agent_api_key(explicit: str | None = None) -> str:
+    """AGENT_API_KEY / YNOSIS_AGENT_API_KEY（yna_ または運営キー）。"""
+    if explicit:
+        return explicit
+    return (
+        os.environ.get("AGENT_API_KEY")
+        or os.environ.get("YNOSIS_AGENT_API_KEY")
+        or ""
+    )
+
+
+def resolve_agent_api_base(explicit: str | None = None) -> str:
+    """AGENT_API_BASE / YNOSIS_AGENT_API_BASE。未設定時は本番。"""
+    if explicit:
+        return explicit.rstrip("/")
+    return (
+        os.environ.get("AGENT_API_BASE")
+        or os.environ.get("YNOSIS_AGENT_API_BASE")
+        or os.environ.get("API_BASE")
+        or DEFAULT_AGENT_API_BASE
+    ).rstrip("/")
+
+
+class AgentApiError(Exception):
+    """エージェント API の HTTP エラー。"""
+
+    def __init__(self, status_code: int, detail: str):
+        self.status_code = status_code
+        self.detail = detail
+        super().__init__(f"HTTP {status_code}: {detail}")
+
+
+class AgentApiClient:
+    """`X-API-Key` 認証で Agent / 通常 API を呼ぶ。"""
+
+    def __init__(
+        self,
+        base_url: str | None = None,
+        api_key: str | None = None,
+        *,
+        timeout: float = DEFAULT_TIMEOUT,
+    ):
+        self.base_url = resolve_agent_api_base(base_url)
+        self.api_key = resolve_agent_api_key(api_key)
+        self.timeout = timeout
+
+    def _require_key(self) -> None:
+        if not self.api_key:
+            raise ValueError(
+                "API キーが未設定です。"
+                "AGENT_API_KEY または YNOSIS_AGENT_API_KEY に yna_…（または運営キー）を設定してください"
+            )
+
+    def _headers(self, *, json_body: bool = True) -> dict[str, str]:
+        self._require_key()
+        headers = {"X-API-Key": self.api_key}
+        if json_body:
+            headers["Content-Type"] = "application/json"
+        return headers
+
+    def _request(
+        self,
+        method: str,
+        path: str,
+        *,
+        json: dict | list | None = None,
+        files: dict | None = None,
+    ) -> httpx.Response:
+        url = f"{self.base_url}{path}"
+        headers = self._headers(json_body=json is not None and files is None)
+        with httpx.Client(timeout=self.timeout) as client:
+            res = client.request(
+                method,
+                url,
+                headers=headers,
+                json=json,
+                files=files,
+            )
+        if res.is_error:
+            detail = res.text
+            try:
+                body = res.json()
+                if isinstance(body, dict) and "detail" in body:
+                    detail = str(body["detail"])
+            except Exception:
+                pass
+            raise AgentApiError(res.status_code, detail)
+        return res
+
+    def register_facility(self, payload: dict[str, Any]) -> dict[str, Any]:
+        res = self._request("POST", "/api/agent/facilities", json=payload)
+        return {"status_code": res.status_code, "facility": res.json()}
+
+    def search_facilities(self, params: dict[str, Any] | None = None) -> dict[str, Any]:
+        """施設検索。戻り値は `{ items, total_count }`（`X-Total-Count` ヘッダ含む）。"""
+        url = f"{self.base_url}/api/agent/facilities/search"
+        headers = self._headers(json_body=False)
+        clean = {
+            k: v
+            for k, v in (params or {}).items()
+            if v is not None and v != ""
+        }
+        with httpx.Client(timeout=self.timeout) as client:
+            res = client.get(url, headers=headers, params=clean)
+        if res.is_error:
+            detail = res.text
+            try:
+                body = res.json()
+                if isinstance(body, dict) and "detail" in body:
+                    detail = str(body["detail"])
+            except Exception:
+                pass
+            raise AgentApiError(res.status_code, detail)
+        total = res.headers.get("X-Total-Count")
+        return {
+            "items": res.json(),
+            "total_count": int(total) if total is not None else len(res.json()),
+        }
+
+    def get_facility(self, facility_id: int) -> dict[str, Any]:
+        res = self._request("GET", f"/api/agent/facilities/{facility_id}")
+        return res.json()
+
+    def register_facilities_batch(
+        self,
+        facilities: list[dict[str, Any]],
+        *,
+        continue_on_error: bool = True,
+    ) -> dict[str, Any]:
+        """サーバー batch は持たず、クライアント側で 1 件ずつ登録する。"""
+        results: list[dict[str, Any]] = []
+        created = updated = failed = 0
+        for i, payload in enumerate(facilities):
+            try:
+                one = self.register_facility(payload)
+                status_code = int(one["status_code"])
+                facility = one["facility"]
+                if status_code == 201:
+                    created += 1
+                    action = "created"
+                else:
+                    updated += 1
+                    action = "updated"
+                results.append(
+                    {
+                        "index": i,
+                        "ok": True,
+                        "action": action,
+                        "status_code": status_code,
+                        "facility_id": facility.get("id"),
+                        "name": facility.get("name"),
+                    }
+                )
+            except AgentApiError as e:
+                failed += 1
+                results.append(
+                    {
+                        "index": i,
+                        "ok": False,
+                        "error": e.detail,
+                        "status_code": e.status_code,
+                        "name": payload.get("name"),
+                    }
+                )
+                if not continue_on_error:
+                    break
+        return {
+            "created": created,
+            "updated": updated,
+            "failed": failed,
+            "results": results,
+        }
+
+    def update_facility(self, facility_id: int, payload: dict[str, Any]) -> dict[str, Any]:
+        res = self._request("PUT", f"/api/facilities/{facility_id}", json=payload)
+        return res.json()
+
+    def register_source(self, payload: dict[str, Any]) -> dict[str, Any]:
+        res = self._request("POST", "/api/agent/register", json=payload)
+        return res.json()
+
+    def analyze_image(self, image_path: str | Path) -> dict[str, Any]:
+        """Ynosis 本番 OCR + LLM パース（`POST /api/agent/analyze`）。DB 未書込。"""
+        path = Path(image_path)
+        if not path.is_file():
+            raise FileNotFoundError(f"画像が見つかりません: {path}")
+        suffix = path.suffix.lower()
+        content_type = "image/jpeg"
+        if suffix == ".png":
+            content_type = "image/png"
+        elif suffix in (".webp", ".bmp", ".tif", ".tiff"):
+            content_type = f"image/{suffix.lstrip('.')}"
+        elif suffix in (".heic", ".heif"):
+            content_type = "image/heic"
+        elif suffix == ".pdf":
+            content_type = "application/pdf"
+        # OCR+LLM は時間がかかるため、証憑アップロードより長め
+        timeout = max(self.timeout, 180.0)
+        url = f"{self.base_url}/api/agent/analyze"
+        headers = {"X-API-Key": self.api_key}
+        self._require_key()
+        with path.open("rb") as f:
+            with httpx.Client(timeout=timeout) as client:
+                res = client.post(
+                    url,
+                    headers=headers,
+                    files={"file": (path.name, f, content_type)},
+                )
+        if res.is_error:
+            detail = res.text
+            try:
+                body = res.json()
+                if isinstance(body, dict) and "detail" in body:
+                    detail = str(body["detail"])
+            except Exception:
+                pass
+            raise AgentApiError(res.status_code, detail)
+        return res.json()
+
+    def find_similar_sources(self, payload: dict[str, Any]) -> list[dict[str, Any]]:
+        res = self._request("POST", "/api/sources/similar", json=payload)
+        return res.json()
+
+    def get_tag_options(self) -> list[str]:
+        return list(FACILITY_TAG_OPTIONS)
+
+    def upload_source_image(self, source_id: int, image_path: str | Path) -> dict[str, Any]:
+        path = Path(image_path)
+        if not path.is_file():
+            raise FileNotFoundError(f"画像が見つかりません: {path}")
+        suffix = path.suffix.lower()
+        content_type = "image/jpeg"
+        if suffix == ".png":
+            content_type = "image/png"
+        elif suffix == ".pdf":
+            content_type = "application/pdf"
+        with path.open("rb") as f:
+            res = self._request(
+                "POST",
+                f"/api/sources/{source_id}/image",
+                files={"file": (path.name, f, content_type)},
+            )
+        return res.json()

ynosis_agent-0.1.0/src/ynosis_agent/csv_import.py

@@ -0,0 +1,78 @@
+"""調査 CSV → FacilityCreate 形式へのマッピング。"""
+
+from __future__ import annotations
+
+import csv
+from pathlib import Path
+from typing import Any
+
+_STATUS_MAP = {
+    "営業中": "active",
+    "休業": "dormant",
+    "閉業": "closed",
+    "不明": "unknown",
+}
+
+
+def _split_tags(raw: str | None) -> list[str]:
+    if not raw or not raw.strip():
+        return []
+    return [t.strip() for t in raw.replace("，", ",").split(";") if t.strip()]
+
+
+def _build_notes(row: dict[str, str]) -> str | None:
+    parts: list[str] = []
+    for key in ("湧出タイプ", "利用形態", "備考", "情報源"):
+        val = (row.get(key) or "").strip()
+        if val:
+            parts.append(f"{key}: {val}" if key != "備考" else val)
+    return "\n".join(parts) if parts else None
+
+
+def _facility_name(row: dict[str, str]) -> str:
+    base = (row.get("施設名") or "").strip()
+    bath = (row.get("浴場名") or "").strip()
+    if base and bath:
+        return f"{base} {bath}"
+    return base or bath
+
+
+def row_to_facility_payload(row: dict[str, str]) -> dict[str, Any]:
+    """1行を `FacilityCreate` 相当の dict に変換する。"""
+    name = _facility_name(row)
+    if not name:
+        raise ValueError("施設名・浴場名のいずれかが必要です")
+
+    prefecture = (row.get("都道府県") or "").strip() or None
+    onsen_name = (row.get("温泉地名") or "").strip() or None
+    status_raw = (row.get("営業状況(営業中/休業/閉業/不明)") or row.get("営業状況") or "").strip()
+    status = _STATUS_MAP.get(status_raw, "unknown" if status_raw else "active")
+
+    payload: dict[str, Any] = {
+        "name": name,
+        "prefecture": prefecture,
+        "onsen_name": onsen_name,
+        "status_operational": status,
+        "tags": _split_tags(row.get("タグ(;区切り)") or row.get("タグ")),
+    }
+    notes = _build_notes(row)
+    if notes:
+        payload["notes"] = notes
+    return payload
+
+
+def facilities_from_csv(path: str | Path) -> list[dict[str, Any]]:
+    """UTF-8 CSV を読み、施設 payload のリストを返す。"""
+    csv_path = Path(path)
+    if not csv_path.is_file():
+        raise FileNotFoundError(f"CSV が見つかりません: {csv_path}")
+
+    payloads: list[dict[str, Any]] = []
+    with csv_path.open(encoding="utf-8-sig", newline="") as f:
+        reader = csv.DictReader(f)
+        for i, row in enumerate(reader, start=2):
+            try:
+                payloads.append(row_to_facility_payload(row))
+            except ValueError as e:
+                raise ValueError(f"CSV {csv_path.name} 行 {i}: {e}") from e
+    return payloads

ynosis_agent-0.1.0/src/ynosis_agent/mcp_server.py

@@ -0,0 +1,196 @@
+"""Ynosis エージェント MCP サーバー（stdio）。`pip install 'ynosis-agent[mcp]'` 後に `ynosis-agent-mcp`。"""
+
+from __future__ import annotations
+
+import json
+from typing import Any
+
+from ynosis_agent.client import AgentApiClient, AgentApiError
+from ynosis_agent.csv_import import facilities_from_csv, row_to_facility_payload
+from ynosis_agent.prepare import prepare_parsed_for_save
+
+try:
+    from mcp.server.fastmcp import FastMCP
+except ImportError as e:  # pragma: no cover
+    raise SystemExit(
+        "MCP 依存がありません。次を実行してください: pip install 'ynosis-agent[mcp]'"
+    ) from e
+
+mcp = FastMCP(
+    "ynosis-agent",
+    instructions=(
+        "Ynosis（温泉データベース）への施設・成分表登録・検索用ツール。"
+        "検索は search_facilities / get_facility。"
+        "施設登録は register_facilities_batch または register_facility。"
+        "成分表は analyze_source_image → register_source（Ynosis OCR）。"
+        "OCR は並列禁止・間隔を空ける。"
+        "YNOSIS_AGENT_API_KEY（または AGENT_API_KEY）が必要。"
+        "CLI は ynosis-agent コマンド。"
+    ),
+)
+
+
+def _client() -> AgentApiClient:
+    return AgentApiClient()
+
+
+def _json(data: Any) -> str:
+    return json.dumps(data, ensure_ascii=False, indent=2)
+
+
+@mcp.tool()
+def register_facility(facility: dict[str, Any]) -> str:
+    """施設を1件登録する（FacilityCreate 形式）。"""
+    try:
+        return _json(_client().register_facility(facility))
+    except (AgentApiError, ValueError) as e:
+        return _json({"error": str(e)})
+
+
+@mcp.tool()
+def search_facilities(
+    q: str | None = None,
+    prefecture: str | None = None,
+    area: str | None = None,
+    onsen_name: str | None = None,
+    spring_type: str | None = None,
+    tags: str | None = None,
+    has_analysis: str | None = None,
+    status: str | None = None,
+    limit: int = 20,
+    skip: int = 0,
+    sort: str = "default",
+) -> str:
+    """施設を検索する。"""
+    try:
+        result = _client().search_facilities(
+            {
+                "q": q,
+                "prefecture": prefecture,
+                "area": area,
+                "onsen_name": onsen_name,
+                "spring_type": spring_type,
+                "tags": tags,
+                "has_analysis": has_analysis,
+                "status": status,
+                "limit": limit,
+                "skip": skip,
+                "sort": sort,
+            }
+        )
+        return _json(result)
+    except (AgentApiError, ValueError) as e:
+        return _json({"error": str(e)})
+
+
+@mcp.tool()
+def get_facility(facility_id: int) -> str:
+    """施設詳細を取得する。"""
+    try:
+        return _json(_client().get_facility(facility_id))
+    except (AgentApiError, ValueError) as e:
+        return _json({"error": str(e)})
+
+
+@mcp.tool()
+def register_facilities_batch(
+    facilities: list[dict[str, Any]] | None = None,
+    csv_path: str | None = None,
+    continue_on_error: bool = True,
+    dry_run: bool = False,
+) -> str:
+    """施設を一括登録する。JSON 配列または調査 CSV から。"""
+    try:
+        if csv_path:
+            payloads = facilities_from_csv(csv_path)
+        elif facilities:
+            payloads = facilities
+        else:
+            return _json({"error": "facilities または csv_path のいずれかを指定してください"})
+        if dry_run:
+            return _json({"dry_run": True, "count": len(payloads), "facilities": payloads})
+        return _json(
+            _client().register_facilities_batch(payloads, continue_on_error=continue_on_error)
+        )
+    except (AgentApiError, ValueError, FileNotFoundError) as e:
+        return _json({"error": str(e)})
+
+
+@mcp.tool()
+def update_facility(facility_id: int, updates: dict[str, Any]) -> str:
+    """既存施設を部分更新する（Agent キー時は編集依頼）。"""
+    try:
+        return _json(_client().update_facility(facility_id, updates))
+    except (AgentApiError, ValueError) as e:
+        return _json({"error": str(e)})
+
+
+@mcp.tool()
+def register_source(payload: dict[str, Any]) -> str:
+    """成分表付きで施設・源泉を登録する。"""
+    try:
+        return _json(_client().register_source(payload))
+    except (AgentApiError, ValueError) as e:
+        return _json({"error": str(e)})
+
+
+@mcp.tool()
+def analyze_source_image(image_path: str) -> str:
+    """成分表画像を Ynosis OCR で解析する（DB 未書込）。並列禁止。"""
+    try:
+        return _json(_client().analyze_image(image_path))
+    except (AgentApiError, ValueError, FileNotFoundError) as e:
+        return _json({"error": str(e)})
+
+
+@mcp.tool()
+def prepare_parsed(parsed: dict[str, Any]) -> str:
+    """register_source 用に dissolved_material を mg 換算する。"""
+    try:
+        return _json(prepare_parsed_for_save(parsed))
+    except Exception as e:
+        return _json({"error": str(e)})
+
+
+@mcp.tool()
+def find_similar_sources(source: dict[str, Any]) -> str:
+    """登録前に成分が近い既存源泉を検索する。"""
+    try:
+        return _json(_client().find_similar_sources(source))
+    except (AgentApiError, ValueError) as e:
+        return _json({"error": str(e)})
+
+
+@mcp.tool()
+def get_tag_options() -> str:
+    """登録可能な施設タグ一覧を返す。"""
+    try:
+        return _json({"tags": _client().get_tag_options()})
+    except (AgentApiError, ValueError) as e:
+        return _json({"error": str(e)})
+
+
+@mcp.tool()
+def preview_csv_row(row: dict[str, str]) -> str:
+    """調査 CSV の1行を FacilityCreate にマッピングした結果をプレビューする。"""
+    try:
+        return _json(row_to_facility_payload(row))
+    except ValueError as e:
+        return _json({"error": str(e)})
+
+
+@mcp.tool()
+def upload_source_image(source_id: int, image_path: str) -> str:
+    """成分表の証憑画像をアップロードする。"""
+    try:
+        return _json(_client().upload_source_image(source_id, image_path))
+    except (AgentApiError, ValueError, FileNotFoundError) as e:
+        return _json({"error": str(e)})
+
+
+def main() -> None:
+    mcp.run(transport="stdio")
+
+
+if __name__ == "__main__":
+    main()

ynosis_agent-0.1.0/src/ynosis_agent/prepare.py

@@ -0,0 +1,28 @@
+"""登録直前の parsed 整形（Web UI の mg 換算に相当）。"""
+
+from __future__ import annotations
+
+
+def prepare_parsed_for_save(parsed: dict) -> dict:
+    """dissolved_material の mg 換算と、登録に不要なキーの除去。"""
+    out = dict(parsed)
+    unit = out.get("dissolved_material_unit") or "mg"
+    dm = out.get("dissolved_material")
+    if isinstance(dm, (int, float)):
+        if unit == "g":
+            out["dissolved_material"] = round(float(dm) * 1000, 1)
+        else:
+            out["dissolved_material"] = round(float(dm), 1)
+    out.pop("dissolved_material_unit", None)
+    for key in (
+        "is_composition_table",
+        "ion_total_warnings",
+        "bisulfate_keyword_detected",
+        "metasilicate_ion_keyword_detected",
+        "metaborate_ion_keyword_detected",
+        "name",
+        "address",
+        "prefecture",
+    ):
+        out.pop(key, None)
+    return out

ynosis_agent-0.1.0/src/ynosis_agent/tags.py

@@ -0,0 +1,17 @@
+"""施設タグ選択肢（フロント / 本番 API と一致させること）。"""
+
+FACILITY_TAG_OPTIONS = [
+    "足元湧出",
+    "掛け流し",
+    "秘湯",
+    "野湯",
+    "露天あり",
+    "貸切湯あり",
+    "日帰り入浴可",
+    "共同浴場",
+    "造成泉",
+    "モール泉",
+    "混浴",
+    "ぬる湯",
+    "冷鉱泉",
+]

ynosis_agent-0.1.0/src/ynosis_agent.egg-info/PKG-INFO

@@ -0,0 +1,79 @@
+Metadata-Version: 2.4
+Name: ynosis-agent
+Version: 0.1.0
+Summary: CLI and MCP client for the Ynosis Agent API (facilities and spring analyses)
+Author: Ynosis
+License: Proprietary
+Project-URL: Homepage, https://ynosis.jp
+Project-URL: Documentation, https://ynosis.jp/notes/usage-037
+Keywords: ynosis,onsen,agent,mcp
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+Requires-Dist: httpx>=0.27
+Provides-Extra: mcp
+Requires-Dist: mcp<2,>=1.0; extra == "mcp"
+
+# ynosis-agent
+
+Ynosis Agent API 用の **公開クライアント**（CLI / MCP）。
+
+リポジトリは非公開です。ソース clone は不要です。
+
+## CLI
+
+```bash
+pip install ynosis-agent
+export YNOSIS_AGENT_API_KEY='yna_...'   # マイページ → … → Agent API
+ynosis-agent search --q 草津 --limit 5
+```
+
+接続先の既定は `https://ynosis.jp`。
+
+## MCP（アプリに設定を貼る・推奨）
+
+事前 pip 不要。[`uv`](https://docs.astral.sh/uv/)（`uvx`）があるマシンで、アプリの MCP 設定に次を追加します。
+
+**起動コマンド:**
+
+```text
+uvx --from ynosis-agent[mcp] ynosis-agent-mcp
+```
+
+**環境変数:** `YNOSIS_AGENT_API_KEY=yna_…`（必須）
+
+### Cursor（mcp.json）
+
+```json
+{
+  "mcpServers": {
+    "ynosis-agent": {
+      "command": "uvx",
+      "args": ["--from", "ynosis-agent[mcp]", "ynosis-agent-mcp"],
+      "env": {
+        "YNOSIS_AGENT_API_KEY": "yna_REPLACE_ME",
+        "YNOSIS_AGENT_API_BASE": "https://ynosis.jp"
+      }
+    }
+  }
+}
+```
+
+### Claude Code
+
+```bash
+claude mcp add --transport stdio ynosis-agent \
+  --env YNOSIS_AGENT_API_KEY=yna_REPLACE_ME \
+  -- uvx --from 'ynosis-agent[mcp]' ynosis-agent-mcp
+```
+
+`uv` が無い場合のフォールバック: `pip install 'ynosis-agent[mcp]'` のあと `command` を `ynosis-agent-mcp` にする。
+
+## 運営向け: PyPI 公開
+
+```bash
+cd packages/ynosis-agent
+python -m build
+twine upload dist/*
+```
+
+バージョンは `pyproject.toml` の `version` を上げてからビルドする。

ynosis_agent-0.1.0/src/ynosis_agent.egg-info/SOURCES.txt

@@ -0,0 +1,15 @@
+README.md
+pyproject.toml
+src/ynosis_agent/__init__.py
+src/ynosis_agent/cli.py
+src/ynosis_agent/client.py
+src/ynosis_agent/csv_import.py
+src/ynosis_agent/mcp_server.py
+src/ynosis_agent/prepare.py
+src/ynosis_agent/tags.py
+src/ynosis_agent.egg-info/PKG-INFO
+src/ynosis_agent.egg-info/SOURCES.txt
+src/ynosis_agent.egg-info/dependency_links.txt
+src/ynosis_agent.egg-info/entry_points.txt
+src/ynosis_agent.egg-info/requires.txt
+src/ynosis_agent.egg-info/top_level.txt

ynosis_agent-0.1.0/src/ynosis_agent.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+

ynosis_agent-0.1.0/src/ynosis_agent.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+ynosis-agent = ynosis_agent.cli:main
+ynosis-agent-mcp = ynosis_agent.mcp_server:main

ynosis_agent-0.1.0/src/ynosis_agent.egg-info/requires.txt

@@ -0,0 +1,4 @@
+httpx>=0.27
+
+[mcp]
+mcp<2,>=1.0

ynosis_agent-0.1.0/src/ynosis_agent.egg-info/top_level.txt

@@ -0,0 +1 @@
+ynosis_agent