2ec45b9138
Restructures the install so users run ONE command. The fork's newinstaller.sh clones this repo (instead of upstream Nachtzuster) and runs BirdNET-Pi's installer. install_services.sh symlinks the avian/ overlay into the Caddy site root, so http://birdnet.local/avian/ comes up after reboot with no Caddy config needed. Reviewer-flagged fixes: Frontend (avian/frontend/apt.js) - Switch all API paths from /api/*.json (which didn't route) to relative action-based URLs (./api/birdnet-api.php?action=recent etc.). - Fetch ./masks.json + ./dims.json relatively (were /avian/*.json). - Replace every innerHTML user-content sink with createElement + textContent + setAttribute — species labels are user-editable in BirdNET-Pi, so untrusted. - Add esc() helper for the few remaining innerHTML attribute contexts. - fetchJson throws on non-200 (was silently parsing 404 HTML as JSON). - Defensive null-check in loadMask if MASKS hasn't loaded. Backend (avian/api/*.php) - birdnet-api.php now derives DB_PATH from dirname(__DIR__, 3) so any BirdNET-Pi install user works (no hardcoded /home/birdnet). - recording/spectrogram/cutout use getenv('HOME') for the same reason. - cutout.php reworked as the canonical image resolver: bundled illustration → bundled cutout → cached rembg → fresh Wikipedia+rembg, with the binomial regex guard and atomic rename on cache write. Wikipedia URL host pinned to wikimedia.org / wikipedia.org to block SSRF. - Stale 'X-BirdNET-Proxy-Token' auth claims removed everywhere. Pregen (avian/scripts/pregen.py) - Gemini key moved from URL query to x-goog-api-key header. - Model bumped to gemini-2.5-flash-image-preview. - Bounded retry on 429 + 5xx with Retry-After honoured. - Default --sleep raised from 1s to 4s (under free-tier RPM). - Unified parser handles |/_/comma in all three input modes. - responseModalities now [TEXT, IMAGE] (was IMAGE-only). - --poses validated against POSES keys. - ASCII [ok]/[fail] markers (was ✓/✗ — Windows console crash). - Surfaces finishReason + blockReason on safety blocks. Prompt template - 'Two placeholders' typo → three. - 'warm paper' / 'transparent background' contradiction resolved. Forwarding - mqtt-bridge.py: paho-mqtt 2.x CallbackAPIVersion compat shim. - avian-mqtt.service: dropped broken %i, set User=birdnet + %h path. - forwarding/README.md uses the actual action-based URLs. README - One-line install via curl … newinstaller.sh. - No more 'install BirdNET-Pi separately' step (our fork does it). - License section uses absolute github.com links. - bird.onethreenine.net replaces the not-yet-existent project writeup. - docs/thumb.png replaced with the 24-bird Twitter capture. Removed - avian/caddy/ and avian/scripts/install.sh — no longer needed; the overlay symlink in install_services.sh handles everything.
254 lines
10 KiB
Python
Executable File
254 lines
10 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
"""AvianVisitors — pre-generate kachō-e illustrations for a region.
|
|
|
|
Reads a species list (BirdNET-Pi's labels.txt, eBird, or stdin),
|
|
generates an illustration for each via the Gemini 2.5 Flash Image API,
|
|
and saves PNGs into avian/assets/illustrations/.
|
|
|
|
Each species gets two poses: <slug>.png (perched) and <slug>-2.png
|
|
(flight). Edit avian/scripts/prompt.template.md to change the visual
|
|
style — the prompt body is re-sent verbatim per request with
|
|
{sci_name}, {com_name}, and {pose} substituted.
|
|
|
|
Usage:
|
|
# Every species BirdNET-Pi knows:
|
|
python3 pregen.py --labels ~/BirdNET-Pi/model/labels.txt
|
|
|
|
# Only species observed in an eBird region:
|
|
python3 pregen.py --labels ~/BirdNET-Pi/model/labels.txt \\
|
|
--ebird-region US-CA --ebird-key YOUR_KEY
|
|
|
|
# Re-render a single species (useful after editing the prompt):
|
|
python3 pregen.py --species "Calypte anna|Anna's Hummingbird" --force
|
|
|
|
# Re-render everything after a prompt change:
|
|
python3 pregen.py --labels ~/BirdNET-Pi/model/labels.txt --force
|
|
|
|
Set GEMINI_API_KEY in the environment (preferred) or pass --gemini-key.
|
|
"""
|
|
from __future__ import annotations
|
|
import argparse
|
|
import base64
|
|
import json
|
|
import os
|
|
import re
|
|
import sys
|
|
import time
|
|
import urllib.error
|
|
import urllib.parse
|
|
import urllib.request
|
|
from pathlib import Path
|
|
|
|
# Gemini's image-out model. The endpoint changes occasionally; if you
|
|
# get a 404 here, check Google's model catalog and bump this.
|
|
GEMINI_URL = (
|
|
"https://generativelanguage.googleapis.com/v1beta/models/"
|
|
"gemini-2.5-flash-image-preview:generateContent"
|
|
)
|
|
POSES = {1: "perched", 2: "in flight with wings spread"}
|
|
|
|
|
|
def slugify(sci: str) -> str:
|
|
"""Match avian/frontend/apt.js slugify() exactly."""
|
|
return re.sub(r"[^a-z0-9]+", "-", sci.lower()).strip("-")
|
|
|
|
|
|
def parse_species_line(line: str) -> tuple[str, str] | None:
|
|
"""Accept any of: 'Sci|Com', 'Sci_Com', 'Sci,Com'. Skip blanks + #."""
|
|
line = line.strip()
|
|
if not line or line.startswith("#"):
|
|
return None
|
|
for sep in ("|", "_", ","):
|
|
if sep in line:
|
|
sci, com = line.split(sep, 1)
|
|
sci, com = sci.strip(), com.strip()
|
|
if sci and com:
|
|
return (sci, com)
|
|
return None
|
|
|
|
|
|
def parse_species_list(lines: list[str]) -> tuple[list[tuple[str, str]], int]:
|
|
"""Returns (parsed, skipped_count)."""
|
|
out, skipped = [], 0
|
|
for line in lines:
|
|
parsed = parse_species_line(line)
|
|
if parsed:
|
|
out.append(parsed)
|
|
elif line.strip() and not line.lstrip().startswith("#"):
|
|
skipped += 1
|
|
return out, skipped
|
|
|
|
|
|
def load_prompt(path: Path) -> str:
|
|
"""Return everything after the `## Prompt` heading, stripped to the
|
|
next `##` heading (so doc preamble or trailing sections don't bleed
|
|
into the API call)."""
|
|
text = path.read_text()
|
|
m = re.search(r"##\s*Prompt\s*\n(.+?)(?=\n##\s|\Z)", text, flags=re.DOTALL)
|
|
return (m.group(1) if m else text).strip()
|
|
|
|
|
|
def ebird_filter(species, region: str, key: str):
|
|
"""Intersect a label set with the eBird species list for a region.
|
|
Region codes: US-CA (state), US-CA-085 (county)."""
|
|
url = f"https://api.ebird.org/v2/product/spplist/{region}"
|
|
req = urllib.request.Request(url, headers={"X-eBirdApiToken": key})
|
|
with urllib.request.urlopen(req, timeout=30) as r:
|
|
ebird_codes = set(json.loads(r.read()))
|
|
tax_url = "https://api.ebird.org/v2/ref/taxonomy/ebird?fmt=json"
|
|
req2 = urllib.request.Request(tax_url, headers={"X-eBirdApiToken": key})
|
|
with urllib.request.urlopen(req2, timeout=60) as r:
|
|
taxonomy = json.loads(r.read())
|
|
code_to_sci = {t["speciesCode"]: t["sciName"] for t in taxonomy}
|
|
allowed = {code_to_sci[c] for c in ebird_codes if c in code_to_sci}
|
|
return [(s, c) for s, c in species if s in allowed]
|
|
|
|
|
|
def gen_one(api_key: str, prompt: str, sci: str, com: str, pose: int) -> bytes:
|
|
"""Single Gemini call with bounded retry on 429 + transient 5xx.
|
|
Returns raw PNG bytes."""
|
|
body = (prompt
|
|
.replace("{sci_name}", sci)
|
|
.replace("{com_name}", com)
|
|
.replace("{pose}", POSES[pose]))
|
|
payload = {
|
|
"contents": [{"parts": [{"text": body}]}],
|
|
# TEXT included so Gemini can surface safety messaging without
|
|
# rejecting the request shape (image-only sometimes errors).
|
|
"generationConfig": {"responseModalities": ["TEXT", "IMAGE"]},
|
|
}
|
|
# API key as header, NOT URL — keeps the key out of Google's
|
|
# request logs, proxy logs, and shell history.
|
|
req = urllib.request.Request(
|
|
GEMINI_URL,
|
|
data=json.dumps(payload).encode(),
|
|
headers={"Content-Type": "application/json", "x-goog-api-key": api_key},
|
|
method="POST",
|
|
)
|
|
|
|
backoff = 4.0
|
|
for attempt in range(4):
|
|
try:
|
|
with urllib.request.urlopen(req, timeout=120) as r:
|
|
resp = json.loads(r.read())
|
|
break
|
|
except urllib.error.HTTPError as e:
|
|
if e.code in (429, 500, 502, 503, 504) and attempt < 3:
|
|
retry_after = float(e.headers.get("Retry-After") or backoff)
|
|
time.sleep(retry_after)
|
|
backoff *= 2
|
|
continue
|
|
raise
|
|
except urllib.error.URLError:
|
|
if attempt < 3:
|
|
time.sleep(backoff)
|
|
backoff *= 2
|
|
continue
|
|
raise
|
|
|
|
for cand in resp.get("candidates", []):
|
|
for part in cand.get("content", {}).get("parts", []):
|
|
inline = part.get("inlineData") or part.get("inline_data")
|
|
if inline and inline.get("data"):
|
|
return base64.b64decode(inline["data"])
|
|
# No image — surface the blocking reason so users know what to fix.
|
|
finish = (resp.get("candidates", [{}])[0]).get("finishReason", "?")
|
|
block = resp.get("promptFeedback", {}).get("blockReason", "")
|
|
raise RuntimeError(f"no image (finish={finish} block={block})")
|
|
|
|
|
|
def main() -> int:
|
|
ap = argparse.ArgumentParser(
|
|
description=__doc__,
|
|
formatter_class=argparse.RawDescriptionHelpFormatter,
|
|
)
|
|
src = ap.add_mutually_exclusive_group(required=True)
|
|
src.add_argument("--labels", type=Path, help="Path to BirdNET-Pi labels.txt (or any file of Sci|Com lines)")
|
|
src.add_argument("--species", action="append", default=[],
|
|
help="Manual 'Sci|Com' (repeatable)")
|
|
src.add_argument("--stdin", action="store_true", help="Read Sci|Com lines from stdin")
|
|
ap.add_argument("--ebird-region", help="eBird region code (e.g. US-CA, US-CA-085) to filter labels")
|
|
ap.add_argument("--ebird-key", help="eBird API key (or EBIRD_API_KEY env)")
|
|
ap.add_argument("--gemini-key", help="Gemini API key (or GEMINI_API_KEY env)")
|
|
ap.add_argument("--out", type=Path,
|
|
default=Path(__file__).resolve().parents[1] / "assets" / "illustrations",
|
|
help="Output directory (default: avian/assets/illustrations/)")
|
|
ap.add_argument("--prompt", type=Path,
|
|
default=Path(__file__).resolve().parent / "prompt.template.md",
|
|
help="Prompt template path")
|
|
ap.add_argument("--poses", nargs="+", type=int, default=[1, 2],
|
|
choices=list(POSES.keys()),
|
|
help="Which poses to render. 1=perched, 2=flight. Default: both.")
|
|
ap.add_argument("--force", action="store_true", help="Re-render even if file exists")
|
|
ap.add_argument("--sleep", type=float, default=4.0,
|
|
help="Seconds between API calls (default 4 = under free-tier RPM cap)")
|
|
ap.add_argument("--limit", type=int, default=0, help="Cap species count for testing")
|
|
args = ap.parse_args()
|
|
|
|
gemini_key = args.gemini_key or os.environ.get("GEMINI_API_KEY", "")
|
|
if not gemini_key:
|
|
print("error: GEMINI_API_KEY required (--gemini-key or env)", file=sys.stderr)
|
|
return 2
|
|
|
|
# Build species list
|
|
if args.labels:
|
|
species, skipped = parse_species_list(args.labels.read_text().splitlines())
|
|
elif args.stdin:
|
|
species, skipped = parse_species_list(sys.stdin.read().splitlines())
|
|
else:
|
|
species, skipped = parse_species_list(args.species)
|
|
if skipped:
|
|
print(f"[parse] skipped {skipped} malformed line(s)", file=sys.stderr)
|
|
if not species:
|
|
print("error: no species resolved", file=sys.stderr)
|
|
return 2
|
|
|
|
if args.ebird_region:
|
|
ek = args.ebird_key or os.environ.get("EBIRD_API_KEY", "")
|
|
if not ek:
|
|
print("error: --ebird-region requires --ebird-key or EBIRD_API_KEY", file=sys.stderr)
|
|
return 2
|
|
print(f"[ebird] filtering {len(species)} species against {args.ebird_region}…")
|
|
species = ebird_filter(species, args.ebird_region, ek)
|
|
|
|
if args.limit:
|
|
species = species[:args.limit]
|
|
|
|
prompt = load_prompt(args.prompt)
|
|
args.out.mkdir(parents=True, exist_ok=True)
|
|
|
|
total = len(species) * len(args.poses)
|
|
print(f"generating up to {total} illustrations into {args.out}/")
|
|
|
|
done = skipped_existing = failed = 0
|
|
first_fail = None
|
|
for idx, (sci, com) in enumerate(species):
|
|
slug = slugify(sci)
|
|
for pose in args.poses:
|
|
fname = f"{slug}.png" if pose == 1 else f"{slug}-{pose}.png"
|
|
path = args.out / fname
|
|
if path.exists() and not args.force:
|
|
skipped_existing += 1
|
|
continue
|
|
try:
|
|
data = gen_one(gemini_key, prompt, sci, com, pose)
|
|
path.write_bytes(data)
|
|
done += 1
|
|
print(f" [ok] {fname} ({len(data)//1024} KB)")
|
|
except (urllib.error.HTTPError, urllib.error.URLError, RuntimeError) as e:
|
|
failed += 1
|
|
first_fail = first_fail or fname
|
|
print(f" [fail] {fname}: {e}", file=sys.stderr)
|
|
# Don't sleep after the last species' last pose.
|
|
if not (idx == len(species) - 1 and pose == args.poses[-1]):
|
|
time.sleep(args.sleep)
|
|
|
|
print(f"\ngenerated {done} · skipped {skipped_existing} · failed {failed}")
|
|
if first_fail:
|
|
print(f"first failure: {first_fail} (re-run without --force to retry only the misses)", file=sys.stderr)
|
|
return 0 if failed == 0 else 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|