birdrecord-cli 0.1.2__tar.gz → 0.1.3__tar.gz

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: birdrecord-cli
-Version: 0.1.2
+Version: 0.1.3
 Summary: CLI for China Bird Record (birdreport.cn); default API host weixin.birdrecord.cn.
 Author: yoshino-s
 License-Expression: MIT
@@ -69,8 +69,8 @@ Package index: [pypi.org/project/birdrecord-cli](https://pypi.org/project/birdre
 [uv](https://docs.astral.sh/uv/) downloads the package into an ephemeral environment. Pin the version for reproducible behavior:
 
 ```bash
-uvx --from 'birdrecord-cli==0.1.2' birdrecord-cli --help
-uvx --from 'birdrecord-cli==0.1.2' birdrecord-cli provinces --pretty
+uvx --from 'birdrecord-cli==0.1.3' birdrecord-cli --help
+uvx --from 'birdrecord-cli==0.1.3' birdrecord-cli provinces --pretty
 ```
 
 Use the latest release version from PyPI if it differs from the example above.

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/README.md

@@ -39,8 +39,8 @@ Package index: [pypi.org/project/birdrecord-cli](https://pypi.org/project/birdre
 [uv](https://docs.astral.sh/uv/) downloads the package into an ephemeral environment. Pin the version for reproducible behavior:
 
 ```bash
-uvx --from 'birdrecord-cli==0.1.2' birdrecord-cli --help
-uvx --from 'birdrecord-cli==0.1.2' birdrecord-cli provinces --pretty
+uvx --from 'birdrecord-cli==0.1.3' birdrecord-cli --help
+uvx --from 'birdrecord-cli==0.1.3' birdrecord-cli provinces --pretty
 ```
 
 Use the latest release version from PyPI if it differs from the example above.

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli/cli/adcode/__init__.py

@@ -68,7 +68,9 @@ def register_adcode_commands(group: click.Group) -> None:
             filtered = filter_region_rows_by_query(
                 list(raw.payload), query, label_attr="province_name"
             )
-            emit_call(cfg, _standard_list_call_after_query_filter(raw, filtered, query=query))
+            emit_call(
+                cfg, _standard_list_call_after_query_filter(raw, filtered, query=query)
+            )
 
     @group.command(
         "cities",
@@ -127,4 +129,6 @@ def register_adcode_commands(group: click.Group) -> None:
             filtered = filter_region_rows_by_query(
                 list(raw.payload), query, label_attr="city_name"
             )
-            emit_call(cfg, _standard_list_call_after_query_filter(raw, filtered, query=query))
+            emit_call(
+                cfg, _standard_list_call_after_query_filter(raw, filtered, query=query)
+            )

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli/cli/report/__init__.py

@@ -4,7 +4,13 @@ from __future__ import annotations
 
 import click
 
-from birdrecord_cli.cli.core import CliConfig, client_from_cfg, emit_enveloped_model, json_schema_text, with_client_config
+from birdrecord_cli.cli.core import (
+    CliConfig,
+    client_from_cfg,
+    emit_enveloped_model,
+    json_schema_text,
+    with_client_config,
+)
 from birdrecord_cli.i18n import _cli_txt
 from birdrecord_cli.models.client import ReportBundleResult
 

birdrecord_cli-0.1.3/birdrecord_cli/cli/search/__init__.py

@@ -0,0 +1,282 @@
+"""CLI: chart search statistic and optional activity drill-down."""
+
+from __future__ import annotations
+
+from typing import Any, Callable
+
+import click
+import requests
+from click._utils import FLAG_NEEDS_VALUE
+
+from birdrecord_cli.cli.core import (
+    CliConfig,
+    client_from_cfg,
+    emit_json,
+    json_schema_text_object,
+    parse_cli_body_json,
+    with_client_config,
+)
+from birdrecord_cli.i18n import _cli_txt
+from birdrecord_cli.models.client import (
+    ChartActivityReportRow,
+    ChartActivityTaxonRow,
+    build_common_list_taxon_request,
+    build_common_page_activity_request,
+)
+from birdrecord_cli.models.cli import (
+    UnifiedSearchRequest,
+    UnifiedSearchResult,
+    coerce_unified_search_request,
+    unified_search_to_common_activity,
+    unified_search_to_region_chart,
+)
+from birdrecord_cli.cli.search.report_map import (
+    render_report_map_html,
+    upload_report_map_html,
+    write_report_map_html,
+)
+
+
+class OptionalValueFlagOption(click.Option):
+    """Flag option that optionally consumes a following value token."""
+
+    _previous_parser_process: Callable[[Any, Any], None]
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        self.optional_value = kwargs.pop("optional_value", None)
+        super().__init__(*args, **kwargs)
+
+    def add_to_parser(self, parser: Any, ctx: click.Context) -> None:
+        super().add_to_parser(parser, ctx)
+
+        def parser_process(value: Any, state: Any) -> None:
+            if value is FLAG_NEEDS_VALUE:
+                value = self.optional_value
+            self._previous_parser_process(value, state)
+
+        for opt in self.opts:
+            option = parser._long_opt.get(opt) or parser._short_opt.get(opt)
+            if option is not None:
+                self._previous_parser_process = option.process
+                option.process = parser_process
+                break
+
+
+def register_search_commands(group: click.Group) -> None:
+    @group.command(
+        "search",
+        short_help=_cli_txt(
+            "Chart search statistic; optional activity --taxon / --report.",
+            "图表检索统计；可选活动下钻 --taxon / --report。",
+        ),
+        help=_cli_txt(
+            (
+                "Chart search: per-month breakdown and rolled-up totals (--body-json). "
+                "Add --taxon for species ranking and/or --report for paged cards; omit both to skip those calls."
+            ),
+            (
+                "图表检索：按月拆分与汇总（--body-json）。"
+                "需要活动下钻时加 --taxon（鸟种排行）和/或 --report（分页记录）；两者都不传则不请求这两项。"
+            ),
+        ),
+    )
+    @click.option(
+        "--taxon",
+        "want_taxon",
+        is_flag=True,
+        help=_cli_txt(
+            "Include per-species record counts for the chart month (common/list).",
+            "包含图表月份内各鸟种记录数（common/list）。",
+        ),
+    )
+    @click.option(
+        "--report",
+        "want_report",
+        is_flag=True,
+        help=_cli_txt(
+            "Include paged observation report cards (common/page).",
+            "包含分页观鸟记录卡片（common/page）。",
+        ),
+    )
+    @click.option(
+        "--report-map",
+        "report_map",
+        cls=OptionalValueFlagOption,
+        is_flag=False,
+        required=False,
+        type=str,
+        optional_value="output/report_map.html",
+        metavar="[OUTPUT_HTML]",
+        help=_cli_txt(
+            "Generate REPORT MAP: local HTML path (default output/report_map.html) or ONLINE to upload and return URL.",
+            "生成 REPORT MAP：本地 HTML 路径（默认 output/report_map.html）或 ONLINE（上传并返回 URL）。",
+        ),
+    )
+    @click.option(
+        "--report-limit",
+        "report_limit",
+        default=None,
+        type=int,
+        help=_cli_txt(
+            "Max total report rows to fetch across pages (stops paging once reached); default = fetch all pages.",
+            "跨分页最多获取的记录条数上限（达到后停止翻页）；默认获取全部分页。",
+        ),
+    )
+    @click.option(
+        "--body-json",
+        default=None,
+        help=_cli_txt(
+            "Unified filter JSON (UnifiedSearchRequest): chart fields plus optional taxon_month, report_month, outside_type for drill-down.",
+            "统一筛选 JSON（UnifiedSearchRequest）：图表字段 + 下钻可选 taxon_month、report_month、outside_type。",
+        ),
+    )
+    @click.option(
+        "--schema",
+        is_flag=True,
+        help=_cli_txt(
+            "Print JSON Schemas for request (UnifiedSearchRequest) and response (UnifiedSearchResult) only (no HTTP).",
+            "仅打印请求（UnifiedSearchRequest）与响应（UnifiedSearchResult）的 JSON Schema（不发起 HTTP）。",
+        ),
+    )
+    @click.pass_context
+    @with_client_config
+    def cmd_search(
+        ctx: click.Context,
+        want_taxon: bool,
+        want_report: bool,
+        report_map: str | None,
+        report_limit: int | None,
+        body_json: str | None,
+        schema: bool,
+    ) -> None:
+        if report_map and not want_report:
+            raise click.UsageError(
+                _cli_txt(
+                    "--report-map requires --report.",
+                    "--report-map 需要与 --report 一起使用。",
+                )
+            )
+        if schema:
+            click.echo(
+                json_schema_text_object(
+                    {
+                        "request": UnifiedSearchRequest,
+                        "response": UnifiedSearchResult,
+                    }
+                )
+            )
+            return
+        cfg = ctx.obj
+        assert isinstance(cfg, CliConfig)
+        raw_body = parse_cli_body_json(body_json)
+        unified = coerce_unified_search_request(raw_body)
+        with client_from_cfg(cfg) as client:
+            stat_fetch = client.fetch_search_statistic(
+                unified_search_to_region_chart(unified),
+                collect_envelopes=cfg.envelope,
+            )
+            taxon_rows: list[ChartActivityTaxonRow] | None = None
+            report_rows: list[ChartActivityReportRow] | None = None
+            envelopes = dict(stat_fetch.envelopes)
+            if want_taxon or want_report:
+                base = unified_search_to_common_activity(unified)
+                if want_taxon:
+                    tcall = client.common_list_activity_taxon(
+                        build_common_list_taxon_request(base)
+                    )
+                    taxon_rows = tcall.payload
+                    if cfg.envelope:
+                        envelopes["taxon"] = tcall.envelope.model_dump()
+                if want_report:
+                    report_rows = []
+                    page = 1
+                    while True:
+                        rcall = client.common_page_activity(
+                            build_common_page_activity_request(
+                                base,
+                                report_month=unified.report_month,
+                                start=page,
+                            )
+                        )
+                        batch = rcall.payload or []
+                        report_rows.extend(batch)
+                        if cfg.envelope:
+                            envelopes[f"report_page_{page}"] = (
+                                rcall.envelope.model_dump()
+                            )
+                        # Stop if no rows returned
+                        if not batch:
+                            break
+                        # Stop if reached the limit
+                        if (
+                            report_limit is not None
+                            and len(report_rows) >= report_limit
+                        ):
+                            report_rows = report_rows[:report_limit]
+                            break
+                        # Stop if we've consumed all available pages
+                        env = rcall.envelope
+                        total = getattr(env, "total", None)
+                        size = getattr(env, "size", None) or len(batch)
+                        if total is not None and len(report_rows) >= total:
+                            break
+                        if len(batch) < size:
+                            break
+                        page += 1
+        report_map_ref: str | None = None
+        if report_map and report_rows is not None:
+            if report_map.strip().casefold() == "online":
+                html = render_report_map_html(
+                    report_rows,
+                    province=unified.province,
+                    city=unified.city,
+                    district=unified.district,
+                )
+                try:
+                    report_map_ref = upload_report_map_html(
+                        html,
+                        timeout=cfg.timeout,
+                    )
+                except (requests.RequestException, ValueError) as exc:
+                    raise click.ClickException(
+                        _cli_txt(
+                            f"Failed to upload REPORT MAP ONLINE: {exc}",
+                            f"REPORT MAP ONLINE 上传失败：{exc}",
+                        )
+                    ) from exc
+                click.echo(
+                    _cli_txt(
+                        f"Generated REPORT MAP URL: {report_map_ref}",
+                        f"已生成 REPORT MAP URL：{report_map_ref}",
+                    ),
+                    err=True,
+                )
+            else:
+                out_path = write_report_map_html(
+                    report_rows,
+                    output_path=report_map,
+                    province=unified.province,
+                    city=unified.city,
+                    district=unified.district,
+                )
+                report_map_ref = str(out_path)
+                click.echo(
+                    _cli_txt(
+                        f"Generated REPORT MAP HTML: {out_path}",
+                        f"已生成 REPORT MAP HTML：{out_path}",
+                    ),
+                    err=True,
+                )
+        out = UnifiedSearchResult(
+            statistic=stat_fetch.result,
+            taxon=taxon_rows,
+            report=report_rows,
+            report_map=report_map_ref,
+        )
+        if cfg.envelope:
+            emit_json(
+                {"envelope": envelopes, "payload": out.model_dump(mode="json")},
+                pretty=cfg.pretty,
+            )
+        else:
+            emit_json(out.model_dump(mode="json"), pretty=cfg.pretty)

birdrecord_cli-0.1.3/birdrecord_cli/cli/search/report_map.py

@@ -0,0 +1,433 @@
+"""Generate Baidu report-map HTML from common/page activity rows."""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from typing import Any
+
+import requests
+
+from birdrecord_cli.models.client import ChartActivityReportRow
+
+BAIDU_AK = "rN63jsl7xBONLrQFzzqjCx0kdds5BJa7"
+UPLOAD_URL = "https://htmlbin.yoshino-s.workers.dev/create"
+
+
+def _parse_location(location: str) -> tuple[float, float] | None:
+    raw = (location or "").strip()
+    if not raw:
+        return None
+    parts = [p.strip() for p in raw.split(",")]
+    if len(parts) != 2:
+        return None
+    try:
+        lng = float(parts[0])
+        lat = float(parts[1])
+    except ValueError:
+        return None
+    if not (-180.0 <= lng <= 180.0 and -90.0 <= lat <= 90.0):
+        return None
+    return lng, lat
+
+
+def build_report_map_points(rows: list[ChartActivityReportRow]) -> list[dict[str, Any]]:
+    out: list[dict[str, Any]] = []
+    for row in rows:
+        loc = _parse_location(row.location)
+        if loc is None:
+            continue
+        lng, lat = loc
+        out.append(
+            {
+                "id": row.id,
+                "title": row.name or row.serial_id or f"report-{row.id}",
+                "username": row.username,
+                "province_name": row.province_name,
+                "city_name": row.city_name,
+                "district_name": row.district_name,
+                "point_name": row.point_name,
+                "address": row.address,
+                "start_time": row.start_time,
+                "end_time": row.end_time,
+                "taxoncount": row.taxoncount,
+                "family_count": row.family_count,
+                "order_count": row.order_count,
+                "lng": lng,
+                "lat": lat,
+            }
+        )
+    return out
+
+
+def _html_template(region_label: str, reports: list[dict[str, Any]]) -> str:
+    region_json = json.dumps(region_label, ensure_ascii=False)
+    report_json = json.dumps(reports, ensure_ascii=False)
+    return f"""<!doctype html>
+<html lang=\"en\">
+<head>
+  <meta charset=\"utf-8\" />
+  <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" />
+  <title>REPORT MAP</title>
+  <style>
+    :root {{
+      --bg: #f4f6f9;
+      --card: rgba(255, 255, 255, 0.92);
+      --line: #d6dde8;
+      --text: #102339;
+      --muted: #5f7085;
+      --accent: #0c79f2;
+      --accent-strong: #0058ba;
+    }}
+
+    * {{ box-sizing: border-box; }}
+    html, body {{ margin: 0; padding: 0; height: 100%; font-family: "SF Mono", "Menlo", monospace; background: radial-gradient(circle at 20% 10%, #e7efff 0%, #f4f6f9 40%, #eef3f8 100%); color: var(--text); }}
+
+    .layout {{
+      display: grid;
+      grid-template-columns: 360px minmax(0, 1fr);
+      height: 100vh;
+      gap: 10px;
+      padding: 10px;
+    }}
+
+    .panel {{
+      background: var(--card);
+      border: 1px solid var(--line);
+      border-radius: 14px;
+      overflow: hidden;
+      backdrop-filter: blur(6px);
+      box-shadow: 0 10px 28px rgba(16, 35, 57, 0.12);
+      display: flex;
+      flex-direction: column;
+    }}
+
+    .panel-header {{ padding: 14px 14px 10px; border-bottom: 1px solid var(--line); }}
+    .title {{ margin: 0; font-size: 14px; letter-spacing: 0.08em; text-transform: uppercase; }}
+    .meta {{ margin-top: 8px; color: var(--muted); font-size: 12px; line-height: 1.4; }}
+
+    .summary {{ display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 8px; padding: 12px 14px; border-bottom: 1px solid var(--line); }}
+    .stat {{ border: 1px solid var(--line); border-radius: 10px; padding: 8px; background: #fff; }}
+    .stat .k {{ color: var(--muted); font-size: 11px; }}
+    .stat .v {{ margin-top: 4px; font-size: 18px; font-weight: 600; }}
+
+    .filter-wrap {{ padding: 10px 14px; border-bottom: 1px solid var(--line); }}
+    .filter-wrap input {{ width: 100%; border: 1px solid var(--line); border-radius: 10px; padding: 8px 10px; font-family: inherit; font-size: 12px; outline: none; }}
+    .filter-wrap input:focus {{ border-color: var(--accent); box-shadow: 0 0 0 2px rgba(12, 121, 242, 0.15); }}
+
+    .list {{ overflow: auto; padding: 8px; display: grid; gap: 8px; }}
+    .item {{ border: 1px solid var(--line); border-radius: 10px; padding: 8px; background: #fff; cursor: pointer; transition: transform 120ms ease, border-color 120ms ease; }}
+    .item:hover {{ transform: translateY(-1px); border-color: var(--accent); }}
+    .item.active {{ border-color: var(--accent-strong); box-shadow: 0 0 0 2px rgba(0, 88, 186, 0.16); }}
+    .item-title {{ font-size: 12px; font-weight: 700; line-height: 1.4; }}
+    .item-sub {{ margin-top: 4px; font-size: 11px; color: var(--muted); line-height: 1.35; }}
+
+    .map-wrap {{
+      border: 1px solid var(--line);
+      border-radius: 14px;
+      overflow: hidden;
+      box-shadow: 0 10px 28px rgba(16, 35, 57, 0.12);
+      background: #dfe7f2;
+      position: relative;
+      min-height: 420px;
+    }}
+    #map {{ width: 100%; height: 100%; min-height: 420px; }}
+
+    .hint {{
+      position: absolute;
+      right: 10px;
+      bottom: 10px;
+      z-index: 2;
+      border: 1px solid var(--line);
+      border-radius: 10px;
+      background: rgba(255, 255, 255, 0.92);
+      padding: 8px 10px;
+      font-size: 11px;
+      color: var(--muted);
+      backdrop-filter: blur(4px);
+    }}
+
+    @media (max-width: 980px) {{
+      .layout {{
+        grid-template-columns: 1fr;
+        grid-template-rows: minmax(320px, 48vh) minmax(0, 1fr);
+      }}
+      .panel {{ order: 2; }}
+      .map-wrap {{ order: 1; min-height: 320px; }}
+      #map {{ min-height: 320px; }}
+    }}
+  </style>
+</head>
+<body>
+  <div class=\"layout\">
+    <aside class=\"panel\">
+      <div class=\"panel-header\">
+        <h1 class=\"title\">REPORT MAP</h1>
+        <div class=\"meta\" id=\"regionMeta\"></div>
+      </div>
+      <div class=\"summary\">
+        <div class=\"stat\"><div class=\"k\">Total Reports</div><div class=\"v\" id=\"totalReports\">0</div></div>
+        <div class=\"stat\"><div class=\"k\">Plotted Points</div><div class=\"v\" id=\"plottedReports\">0</div></div>
+      </div>
+      <div class=\"filter-wrap\">
+        <input id=\"filterInput\" type=\"text\" placeholder=\"filter by title / point / district\" />
+      </div>
+      <div class=\"list\" id=\"reportList\"></div>
+    </aside>
+
+    <section class=\"map-wrap\">
+      <div id=\"map\"></div>
+      <div class=\"hint\">click list item to locate marker</div>
+    </section>
+  </div>
+
+  <script src=\"https://api.map.baidu.com/api?v=3.0&ak={BAIDU_AK}\"></script>
+  <script>
+    const REGION_LABEL = {region_json};
+    const REPORTS = {report_json};
+
+    const totalReportsEl = document.getElementById("totalReports");
+    const plottedReportsEl = document.getElementById("plottedReports");
+    const regionMetaEl = document.getElementById("regionMeta");
+    const reportListEl = document.getElementById("reportList");
+    const filterInputEl = document.getElementById("filterInput");
+
+    const map = new BMap.Map("map");
+    map.enableScrollWheelZoom(true);
+    map.enableKeyboard();
+    map.addControl(new BMap.NavigationControl());
+    map.addControl(new BMap.ScaleControl());
+
+    const markerById = new Map();
+    const reportById = new Map(REPORTS.map((r) => [r.id, r]));
+    let activeId = null;
+
+    function escapeHtml(text) {{
+      return String(text || "")
+        .replaceAll("&", "&amp;")
+        .replaceAll("<", "&lt;")
+        .replaceAll(">", "&gt;")
+        .replaceAll('"', "&quot;")
+        .replaceAll("'", "&#39;");
+    }}
+
+    function itemSearchText(item) {{
+      return [item.title, item.point_name, item.district_name, item.address].join(" ").toLowerCase();
+    }}
+
+    function markerPageUrl(item) {{
+      const title = item.title || `report-${{item.id}}`;
+      const content = [
+        item.point_name || "",
+        item.address || "",
+        [item.province_name, item.city_name, item.district_name].filter(Boolean).join("/"),
+      ].filter(Boolean).join("|");
+      const params = new URLSearchParams({{
+        location: `${{item.lat}},${{item.lng}}`,
+        title,
+        content,
+        output: "html",
+        src: "webapp.baidu.openAPIdemo",
+      }});
+      return `http://api.map.baidu.com/marker?${{params.toString()}}`;
+    }}
+
+    function openMarkerPageById(id) {{
+      const item = reportById.get(id);
+      if (!item) return;
+      window.open(markerPageUrl(item), "_blank", "noopener,noreferrer");
+    }}
+
+    function popupHtml(item) {{
+      return `
+        <div style=\"font-family: Menlo, Monaco, monospace; font-size: 12px; line-height: 1.4; max-width: 280px;\">
+          <div style=\"font-weight: 700; margin-bottom: 6px;\">${{escapeHtml(item.title)}}</div>
+          <div><b>ID</b>: ${{item.id}}</div>
+          <div><b>User</b>: ${{escapeHtml(item.username)}}</div>
+          <div><b>Region</b>: ${{escapeHtml([item.province_name, item.city_name, item.district_name].filter(Boolean).join("/"))}}</div>
+          <div><b>Point</b>: ${{escapeHtml(item.point_name)}}</div>
+          <div><b>Address</b>: ${{escapeHtml(item.address)}}</div>
+          <div><b>Time</b>: ${{escapeHtml(item.start_time)}} ~ ${{escapeHtml(item.end_time)}}</div>
+          <div><b>Taxon</b>: ${{item.taxoncount}} | <b>Family</b>: ${{item.family_count}} | <b>Order</b>: ${{item.order_count}}</div>
+          <div style=\"margin-top: 8px;\">
+            <button type=\"button\" onclick=\"openMarkerPageById(${{item.id}})\" style=\"border: 1px solid #d6dde8; background: #0c79f2; color: #fff; border-radius: 6px; padding: 4px 8px; font-family: Menlo, Monaco, monospace; font-size: 12px; cursor: pointer;\">Open Baidu Marker</button>
+          </div>
+        </div>
+      `;
+    }}
+
+    function setActiveItem(id) {{
+      activeId = id;
+      for (const el of reportListEl.querySelectorAll(".item")) {{
+        if (Number(el.dataset.id) === id) {{
+          el.classList.add("active");
+          el.scrollIntoView({{ block: "nearest" }});
+        }} else {{
+          el.classList.remove("active");
+        }}
+      }}
+    }}
+
+    function focusReport(item) {{
+      const marker = markerById.get(item.id);
+      if (!marker) return;
+      setActiveItem(item.id);
+      map.panTo(new BMap.Point(item.lng, item.lat));
+      map.openInfoWindow(new BMap.InfoWindow(popupHtml(item), {{ width: 320, title: escapeHtml(item.title) }}), marker.getPosition());
+    }}
+
+    function renderList(filtered) {{
+      reportListEl.innerHTML = "";
+      if (!filtered.length) {{
+        const empty = document.createElement("div");
+        empty.className = "item";
+        empty.style.cursor = "default";
+        empty.textContent = "No rows match current filter";
+        reportListEl.appendChild(empty);
+        return;
+      }}
+
+      for (const item of filtered) {{
+        const row = document.createElement("div");
+        row.className = "item";
+        row.dataset.id = String(item.id);
+        row.innerHTML = `
+          <div class=\"item-title\">${{escapeHtml(item.title)}}</div>
+          <div class=\"item-sub\">${{escapeHtml(item.point_name || item.address || "(no place)")}}</div>
+          <div class=\"item-sub\">${{escapeHtml(item.start_time)}} | taxon=${{item.taxoncount}}</div>
+        `;
+        row.addEventListener("click", () => focusReport(item));
+        reportListEl.appendChild(row);
+      }}
+      if (activeId !== null) {{
+        setActiveItem(activeId);
+      }}
+    }}
+
+    function init() {{
+      totalReportsEl.textContent = String(REPORTS.length);
+      plottedReportsEl.textContent = String(REPORTS.length);
+      regionMetaEl.textContent = REGION_LABEL || "region metadata not provided";
+
+      const points = [];
+      for (const item of REPORTS) {{
+        const point = new BMap.Point(item.lng, item.lat);
+        points.push(point);
+
+        const marker = new BMap.Marker(point);
+        markerById.set(item.id, marker);
+        map.addOverlay(marker);
+
+        marker.addEventListener("click", () => {{
+          setActiveItem(item.id);
+          map.openInfoWindow(new BMap.InfoWindow(popupHtml(item), {{ width: 320, title: escapeHtml(item.title) }}), point);
+        }});
+      }}
+
+      if (points.length) {{
+        const viewport = map.getViewport(points);
+        map.centerAndZoom(viewport.center, Math.max(viewport.zoom - 1, 6));
+      }} else if (REGION_LABEL) {{
+        const geocoder = new BMap.Geocoder();
+        geocoder.getPoint(REGION_LABEL, (pt) => {{
+          if (pt) {{
+            map.centerAndZoom(pt, 10);
+          }} else {{
+            map.centerAndZoom(new BMap.Point(116.404, 39.915), 5);
+          }}
+        }});
+      }} else {{
+        map.centerAndZoom(new BMap.Point(116.404, 39.915), 5);
+      }}
+
+      renderList(REPORTS);
+
+      filterInputEl.addEventListener("input", () => {{
+        const q = filterInputEl.value.trim().toLowerCase();
+        if (!q) {{
+          renderList(REPORTS);
+          return;
+        }}
+        const filtered = REPORTS.filter((r) => itemSearchText(r).includes(q));
+        renderList(filtered);
+      }});
+    }}
+
+    init();
+  </script>
+</body>
+</html>
+"""
+
+
+def _region_label_from_rows_or_filters(
+    rows: list[ChartActivityReportRow],
+    *,
+    province: str,
+    city: str,
+    district: str,
+) -> str:
+    from_filters = "/".join(v for v in (province, city, district) if v)
+    if from_filters:
+        return from_filters
+    if rows:
+        first = rows[0]
+        return "/".join(
+            v for v in (first.province_name, first.city_name, first.district_name) if v
+        )
+    return ""
+
+
+def render_report_map_html(
+    rows: list[ChartActivityReportRow],
+    *,
+    province: str = "",
+    city: str = "",
+    district: str = "",
+) -> str:
+    points = build_report_map_points(rows)
+    region_label = _region_label_from_rows_or_filters(
+        rows,
+        province=province,
+        city=city,
+        district=district,
+    )
+    return _html_template(region_label=region_label, reports=points)
+
+
+def write_report_map_html(
+    rows: list[ChartActivityReportRow],
+    *,
+    output_path: str,
+    province: str = "",
+    city: str = "",
+    district: str = "",
+) -> Path:
+    html = render_report_map_html(
+        rows,
+        province=province,
+        city=city,
+        district=district,
+    )
+    out = Path(output_path)
+    out.parent.mkdir(parents=True, exist_ok=True)
+    out.write_text(html, encoding="utf-8")
+    return out
+
+
+def upload_report_map_html(
+    html: str,
+    *,
+    timeout: float = 60.0,
+) -> str:
+    resp = requests.post(
+        UPLOAD_URL,
+        json={"html": html},
+        timeout=timeout,
+    )
+    resp.raise_for_status()
+    data = resp.json()
+    view_url = data.get("viewUrl")
+    if not isinstance(view_url, str):
+        raise ValueError("online upload response missing viewUrl")
+    return view_url

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli/cli/taxon/__init__.py

@@ -7,7 +7,13 @@ from typing import Any
 import click
 
 from birdrecord_cli.client import BirdrecordClient, _taxon_call_for_emit
-from birdrecord_cli.cli.core import CliConfig, client_from_cfg, emit_call, json_schema_text, with_client_config
+from birdrecord_cli.cli.core import (
+    CliConfig,
+    client_from_cfg,
+    emit_call,
+    json_schema_text,
+    with_client_config,
+)
 from birdrecord_cli.constants import DEFAULT_TAXON_VERSION
 from birdrecord_cli.i18n import _cli_txt
 from birdrecord_cli.models.client import (

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli/i18n.py

@@ -2,6 +2,7 @@
 
 import os
 
+
 def _cli_use_zh_cn() -> bool:
     """True when BIRDRECORD_CLI_CN is set to a truthy value (0/false/no/off disable)."""
     raw = os.environ.get("BIRDRECORD_CLI_CN")

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli/models/cli/stdout.py

@@ -46,3 +46,10 @@ class UnifiedSearchResult(BaseModel):
             "传了 --report 时为分页记录；未传该标志时为 null。",
         ),
     )
+    report_map: str | None = Field(
+        default=None,
+        description=_schema_txt(
+            "REPORT MAP reference when --report-map is used: local output path or online URL.",
+            "传 --report-map 时的 REPORT MAP 引用：本地输出路径或在线 URL。",
+        ),
+    )

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli/models/cli/unified_search.py

@@ -81,7 +81,9 @@ def unified_search_to_region_chart(body: UnifiedSearchRequest) -> RegionChartReq
     return RegionChartRequest.model_validate(data)
 
 
-def unified_search_to_common_activity(body: UnifiedSearchRequest) -> CommonActivityRequest:
+def unified_search_to_common_activity(
+    body: UnifiedSearchRequest,
+) -> CommonActivityRequest:
     """Map chart taxonid (int) to activity string taxonid; drop report_month (page request adds it)."""
     data = body.model_dump(exclude={"report_month"}, mode="python")
     tid = data.get("taxonid", 0)

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli/models/client/activity_payloads.py

@@ -21,12 +21,8 @@ class ChartActivityTaxonRow(BaseModel):
     )
 
     taxon_id: int = Field(..., description=_schema_txt("Taxon id.", "鸟种 ID。"))
-    taxonname: str = Field(
-        ..., description=_schema_txt("Chinese name.", "中文名。")
-    )
-    latinname: str = Field(
-        ..., description=_schema_txt("Latin name.", "拉丁名。")
-    )
+    taxonname: str = Field(..., description=_schema_txt("Chinese name.", "中文名。"))
+    latinname: str = Field(..., description=_schema_txt("Latin name.", "拉丁名。"))
     englishname: str = Field(
         default="",
         description=_schema_txt("English name.", "英文名。"),

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli/models/client/activity_requests.py

@@ -143,7 +143,7 @@ class CommonPageActivityRequest(CommonActivityRequest):
         description=_schema_txt("1-based page.", "从 1 开始的页码。"),
     )
     limit: int = Field(
-        default=15,
+        default=50,
         ge=1,
         description=_schema_txt("Page size.", "每页条数。"),
     )
@@ -186,9 +186,11 @@ def build_common_page_activity_request(
     base: CommonActivityRequest,
     *,
     report_month: str | None = None,
+    start: int = 1,
 ) -> CommonPageActivityRequest:
     """Attach ``searchChartActivity`` sqlid and page defaults to shared activity filters."""
     d = base.model_dump()
     if report_month is not None:
         d["report_month"] = report_month
+    d["start"] = start
     return CommonPageActivityRequest.model_validate(d)

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli/models/client/taxon.py

@@ -79,9 +79,7 @@ class TaxonRow(BaseModel):
         default=None,
         description=_schema_txt("Family (Chinese).", "科名（中文）。"),
     )
-    uuid: Any | None = Field(
-        default=None, description=_schema_txt("Uuid.", "UUID。")
-    )
+    uuid: Any | None = Field(default=None, description=_schema_txt("Uuid.", "UUID。"))
     serial_id: Any | None = Field(
         default=None, description=_schema_txt("Serial.", "流水号。")
     )
@@ -145,7 +143,9 @@ def _taxon_search_cache_path(version: str) -> Path:
     return _taxon_search_cache_dir() / f"{h}.json"
 
 
-def _load_taxon_search_disk(version: str) -> tuple[dict[str, Any], list[TaxonRow]] | None:
+def _load_taxon_search_disk(
+    version: str,
+) -> tuple[dict[str, Any], list[TaxonRow]] | None:
     path = _taxon_search_cache_path(version)
     try:
         doc = json.loads(path.read_text(encoding="utf-8"))

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: birdrecord-cli
-Version: 0.1.2
+Version: 0.1.3
 Summary: CLI for China Bird Record (birdreport.cn); default API host weixin.birdrecord.cn.
 Author: yoshino-s
 License-Expression: MIT
@@ -69,8 +69,8 @@ Package index: [pypi.org/project/birdrecord-cli](https://pypi.org/project/birdre
 [uv](https://docs.astral.sh/uv/) downloads the package into an ephemeral environment. Pin the version for reproducible behavior:
 
 ```bash
-uvx --from 'birdrecord-cli==0.1.2' birdrecord-cli --help
-uvx --from 'birdrecord-cli==0.1.2' birdrecord-cli provinces --pretty
+uvx --from 'birdrecord-cli==0.1.3' birdrecord-cli --help
+uvx --from 'birdrecord-cli==0.1.3' birdrecord-cli provinces --pretty
 ```
 
 Use the latest release version from PyPI if it differs from the example above.

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ birdrecord_cli/cli/core.py
 birdrecord_cli/cli/adcode/__init__.py
 birdrecord_cli/cli/report/__init__.py
 birdrecord_cli/cli/search/__init__.py
+birdrecord_cli/cli/search/report_map.py
 birdrecord_cli/cli/taxon/__init__.py
 birdrecord_cli/models/__init__.py
 birdrecord_cli/models/cli/__init__.py

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "birdrecord-cli"
-version = "0.1.2"
+version = "0.1.3"
 description = "CLI for China Bird Record (birdreport.cn); default API host weixin.birdrecord.cn."
 readme = "README.md"
 license = "MIT"

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/tests/test_birdrecord_client.py

@@ -69,7 +69,7 @@ def test_common_activity_body_builds_sqlid_requests():
     pg = build_common_page_activity_request(base)
     assert pg.sqlid == "searchChartActivity"
     assert pg.start == 1
-    assert pg.limit == 15
+    assert pg.limit == 50
     assert pg.report_month == ""
     pg2 = build_common_page_activity_request(base, report_month="03")
     assert pg2.report_month == "03"
@@ -98,7 +98,9 @@ def test_unified_search_request_month_fields() -> None:
 
 def test_request_models_serialize():
     assert AdcodeProvinceRequest().model_dump() == {}
-    assert AdcodeCityRequest(province_code="130000").model_dump() == {"province_code": "130000"}
+    assert AdcodeCityRequest(province_code="130000").model_dump() == {
+        "province_code": "130000"
+    }
     assert TaxonSearchRequest().version == DEFAULT_TAXON_VERSION
     assert "version" in TaxonSearchRequest().model_dump()
 
@@ -176,28 +178,53 @@ def test_filter_region_rows_by_query() -> None:
         ProvinceRow(province_code="110000", province_name="北京市"),
         ProvinceRow(province_code="130000", province_name="河北省"),
     ]
-    assert len(filter_region_rows_by_query(provinces, None, label_attr="province_name")) == 2
-    assert len(filter_region_rows_by_query(provinces, "", label_attr="province_name")) == 2
-    assert len(filter_region_rows_by_query(provinces, "  ", label_attr="province_name")) == 2
-    assert {r.province_code for r in filter_region_rows_by_query(provinces, "河北", label_attr="province_name")} == {
-        "130000"
-    }
-    assert {r.province_code for r in filter_region_rows_by_query(provinces, "hebei", label_attr="province_name")} == {
-        "130000"
-    }
-    assert {r.province_code for r in filter_region_rows_by_query(provinces, "HEBEI", label_attr="province_name")} == {
-        "130000"
-    }
-    assert {r.province_code for r in filter_region_rows_by_query(provinces, "hb", label_attr="province_name")} == {
-        "130000"
-    }
+    assert (
+        len(filter_region_rows_by_query(provinces, None, label_attr="province_name"))
+        == 2
+    )
+    assert (
+        len(filter_region_rows_by_query(provinces, "", label_attr="province_name")) == 2
+    )
+    assert (
+        len(filter_region_rows_by_query(provinces, "  ", label_attr="province_name"))
+        == 2
+    )
+    assert {
+        r.province_code
+        for r in filter_region_rows_by_query(
+            provinces, "河北", label_attr="province_name"
+        )
+    } == {"130000"}
+    assert {
+        r.province_code
+        for r in filter_region_rows_by_query(
+            provinces, "hebei", label_attr="province_name"
+        )
+    } == {"130000"}
+    assert {
+        r.province_code
+        for r in filter_region_rows_by_query(
+            provinces, "HEBEI", label_attr="province_name"
+        )
+    } == {"130000"}
+    assert {
+        r.province_code
+        for r in filter_region_rows_by_query(
+            provinces, "hb", label_attr="province_name"
+        )
+    } == {"130000"}
     cities = [
         CityRow(city_code="110100", city_name="市辖区"),
         CityRow(city_code="110200", city_name="县"),
     ]
     assert len(filter_region_rows_by_query(cities, "辖区", label_attr="city_name")) == 1
-    assert len(filter_region_rows_by_query(cities, "xiaqu", label_attr="city_name")) == 1
-    assert len(filter_region_rows_by_query(provinces, "zzz", label_attr="province_name")) == 0
+    assert (
+        len(filter_region_rows_by_query(cities, "xiaqu", label_attr="city_name")) == 1
+    )
+    assert (
+        len(filter_region_rows_by_query(provinces, "zzz", label_attr="province_name"))
+        == 0
+    )
 
 
 def test_taxon_search_uses_default_version(client: BirdrecordClient) -> None:

birdrecord_cli-0.1.2/birdrecord_cli/cli/search/__init__.py

@@ -1,143 +0,0 @@
-"""CLI: chart search statistic and optional activity drill-down."""
-
-from __future__ import annotations
-
-import click
-
-from birdrecord_cli.cli.core import (
-    CliConfig,
-    client_from_cfg,
-    emit_json,
-    json_schema_text_object,
-    parse_cli_body_json,
-    with_client_config,
-)
-from birdrecord_cli.i18n import _cli_txt
-from birdrecord_cli.models.client import (
-    ChartActivityReportRow,
-    ChartActivityTaxonRow,
-    build_common_list_taxon_request,
-    build_common_page_activity_request,
-)
-from birdrecord_cli.models.cli import (
-    UnifiedSearchRequest,
-    UnifiedSearchResult,
-    coerce_unified_search_request,
-    unified_search_to_common_activity,
-    unified_search_to_region_chart,
-)
-
-
-def register_search_commands(group: click.Group) -> None:
-    @group.command(
-        "search",
-        short_help=_cli_txt(
-            "Chart search statistic; optional activity --taxon / --report.",
-            "图表检索统计；可选活动下钻 --taxon / --report。",
-        ),
-        help=_cli_txt(
-            (
-                "Chart search: per-month breakdown and rolled-up totals (--body-json). "
-                "Add --taxon for species ranking and/or --report for paged cards; omit both to skip those calls."
-            ),
-            (
-                "图表检索：按月拆分与汇总（--body-json）。"
-                "需要活动下钻时加 --taxon（鸟种排行）和/或 --report（分页记录）；两者都不传则不请求这两项。"
-            ),
-        ),
-    )
-    @click.option(
-        "--taxon",
-        "want_taxon",
-        is_flag=True,
-        help=_cli_txt(
-            "Include per-species record counts for the chart month (common/list).",
-            "包含图表月份内各鸟种记录数（common/list）。",
-        ),
-    )
-    @click.option(
-        "--report",
-        "want_report",
-        is_flag=True,
-        help=_cli_txt(
-            "Include paged observation report cards (common/page).",
-            "包含分页观鸟记录卡片（common/page）。",
-        ),
-    )
-    @click.option(
-        "--body-json",
-        default=None,
-        help=_cli_txt(
-            "Unified filter JSON (UnifiedSearchRequest): chart fields plus optional taxon_month, report_month, outside_type for drill-down.",
-            "统一筛选 JSON（UnifiedSearchRequest）：图表字段 + 下钻可选 taxon_month、report_month、outside_type。",
-        ),
-    )
-    @click.option(
-        "--schema",
-        is_flag=True,
-        help=_cli_txt(
-            "Print JSON Schemas for request (UnifiedSearchRequest) and response (UnifiedSearchResult) only (no HTTP).",
-            "仅打印请求（UnifiedSearchRequest）与响应（UnifiedSearchResult）的 JSON Schema（不发起 HTTP）。",
-        ),
-    )
-    @click.pass_context
-    @with_client_config
-    def cmd_search(
-        ctx: click.Context,
-        want_taxon: bool,
-        want_report: bool,
-        body_json: str | None,
-        schema: bool,
-    ) -> None:
-        if schema:
-            click.echo(
-                json_schema_text_object(
-                    {
-                        "request": UnifiedSearchRequest,
-                        "response": UnifiedSearchResult,
-                    }
-                )
-            )
-            return
-        cfg = ctx.obj
-        assert isinstance(cfg, CliConfig)
-        raw_body = parse_cli_body_json(body_json)
-        unified = coerce_unified_search_request(raw_body)
-        with client_from_cfg(cfg) as client:
-            stat_fetch = client.fetch_search_statistic(
-                unified_search_to_region_chart(unified),
-                collect_envelopes=cfg.envelope,
-            )
-            taxon_rows: list[ChartActivityTaxonRow] | None = None
-            report_rows: list[ChartActivityReportRow] | None = None
-            envelopes = dict(stat_fetch.envelopes)
-            if want_taxon or want_report:
-                base = unified_search_to_common_activity(unified)
-                if want_taxon:
-                    tcall = client.common_list_activity_taxon(
-                        build_common_list_taxon_request(base)
-                    )
-                    taxon_rows = tcall.payload
-                    if cfg.envelope:
-                        envelopes["taxon"] = tcall.envelope.model_dump()
-                if want_report:
-                    rcall = client.common_page_activity(
-                        build_common_page_activity_request(
-                            base, report_month=unified.report_month
-                        )
-                    )
-                    report_rows = rcall.payload
-                    if cfg.envelope:
-                        envelopes["report"] = rcall.envelope.model_dump()
-        out = UnifiedSearchResult(
-            statistic=stat_fetch.result,
-            taxon=taxon_rows,
-            report=report_rows,
-        )
-        if cfg.envelope:
-            emit_json(
-                {"envelope": envelopes, "payload": out.model_dump(mode="json")},
-                pretty=cfg.pretty,
-            )
-        else:
-            emit_json(out.model_dump(mode="json"), pretty=cfg.pretty)

{birdrecord_cli-0.1.2 → birdrecord_cli-0.1.3}/birdrecord_cli/crypto.py

@@ -9,6 +9,7 @@ from Crypto.Util.Padding import unpad
 
 from birdrecord_cli.constants import AES_IV, AES_KEY
 
+
 def decrypt_aes_cbc_b64(ciphertext_b64: str) -> bytes:
     raw = base64.b64decode(ciphertext_b64)
     cipher = AES.new(AES_KEY, AES.MODE_CBC, AES_IV)
@@ -28,4 +29,3 @@ def parse_encrypted_envelope(envelope: Mapping[str, Any]) -> Any:
     if envelope.get("result") is not None:
         return envelope["result"]
     return None
-