diff --git a/.gitignore b/.gitignore index 0a082a8..f41a3b1 100644 --- a/.gitignore +++ b/.gitignore @@ -61,5 +61,8 @@ playwright-report/ instance/ # Rust build artifacts -target/ -automap_rs/target/ +/target/ +**/target/ +*.so +*.dylib +*.pyd diff --git a/cli.py b/cli.py index 73ba708..0b0da7b 100644 --- a/cli.py +++ b/cli.py @@ -76,10 +76,10 @@ def main(): help="Global font size modifier (default 15).") @click.option("-eop", "--extra-option", "optional_feature", - type=click.Choice(["none", "show_most_least", "short_form"], case_sensitive=False), + type=click.Choice(["none", "show_most_least", "short_form", "show_most_least,short_form", "short_form,show_most_least"], case_sensitive=False), default="none", show_default=True, - help="One extra option: none (default), show_most_least or short_form.") + help="Extra options: none, show_most_least, short_form, or both separated by a comma.") @click.option("--model", type=click.Choice(AVAILABLE_MODELS, case_sensitive=False), default=AVAILABLE_MODELS[0], @@ -106,7 +106,8 @@ def main(): help="API key for the selected model provider (overrides its environment key).") @click.option("--temperature", type=click.FloatRange(0, 2), default=None, help="AI sampling randomness, from 0 to 2. Omit to use the model default.") -def make(prompt, mode, map_type, size_mod, optional_feature, model, font_name, show_result, verbose, api_key, temperature): +@click.option("--legend", "show_legend", is_flag=True, help="Draw a color legend on the map.") +def make(prompt, mode, map_type, size_mod, optional_feature, model, font_name, show_result, verbose, api_key, temperature, show_legend): """Generate a map from PROMPT and save it as result.png. Example: @@ -119,6 +120,8 @@ def make(prompt, mode, map_type, size_mod, optional_feature, model, font_name, s from map.auto_map import auto_map ai_options = {} + if show_legend: + ai_options["show_legend"] = True if temperature is not None: from map.functions import validate_temperature try: diff --git a/main.py b/main.py index c973160..1205907 100644 --- a/main.py +++ b/main.py @@ -24,6 +24,7 @@ import io import os import re +import threading import time from pathlib import Path @@ -280,7 +281,7 @@ def _auto_map_with_ai_cache(*, refresh: bool, provider: str, api_key, **kwargs): identity = str(session.get('web_identity', '') or '') except RuntimeError: identity = '' - short_form = kwargs.get('optional_feature') == 'short_form' + short_form = 'short_form' in str(kwargs.get('optional_feature') or '') scope = ai_cache.scope(identity, api_key) base_fields = dict( prompt=str(kwargs.get('prompt') or ''), @@ -296,17 +297,16 @@ def _auto_map_with_ai_cache(*, refresh: bool, provider: str, api_key, **kwargs): if cached is None and not refresh and short_form: raw_cached = ai_cache.get(ai_cache.make_key(scope, short_form=False, **base_fields)) if raw_cached and any(_parse_short_number(v) is not None for v in raw_cached.values()): - cached = {k: _format_short_number(v) for k, v in raw_cached.items()} + cached = raw_cached if cached is not None: kwargs['ai_answer_override'] = cached buffer = auto_map(api_key=api_key, **kwargs) if buffer is not None: meta = getattr(buffer, 'map_meta', None) - answer = meta.get('ai_answer') if isinstance(meta, dict) else None + answer = meta.get('raw_ai_answer', meta.get('ai_answer')) if isinstance(meta, dict) else None if isinstance(answer, dict): if short_form: - answer = {k: _format_short_number(v) for k, v in answer.items()} - meta['ai_answer'] = answer + meta['ai_answer'] = {k: _format_short_number(v) for k, v in answer.items()} if not refresh: ai_cache.put(cache_key, answer) return buffer, cached is not None @@ -541,6 +541,37 @@ def _parse_render_params(data: dict[str, object]) -> tuple[str, str | None, int] return str(font_name), extra_option, gsm +_MAP_PROGRESS_LOCK = threading.Lock() +_MAP_PROGRESS: dict[str, dict[str, object]] = {} + + +def _set_map_progress(progress_id: str, stage: int, label: str, status: str = "running") -> None: + """Record the active map generation stage for ``progress_id``.""" + if not progress_id: + return + now = time.time() + with _MAP_PROGRESS_LOCK: + stale = [k for k, v in _MAP_PROGRESS.items() if now - float(v.get("updated_at", 0)) > 300] + for k in stale: + _MAP_PROGRESS.pop(k, None) + _MAP_PROGRESS[progress_id] = { + "stage": stage, + "label": label, + "status": status, + "updated_at": now, + } + + +@app.get('/api/generate_progress/') +def api_generate_progress(progress_id: str): + """Return current map generation progress for ``progress_id``.""" + with _MAP_PROGRESS_LOCK: + entry = dict(_MAP_PROGRESS.get(progress_id) or {"stage": 1, "label": "Querying AI model...", "status": "running"}) + resp = jsonify(entry) + resp.headers["Cache-Control"] = "no-store" + return resp + + @app.route('/api/generate/', methods=['POST']) @app.route('/api/generate', methods=['POST']) def generate(): @@ -591,7 +622,17 @@ def generate(): if temperature_options: command += f" --temperature {temperature_options['temperature']:g}" - style_kwargs: dict[str, object] = {} + show_legend = bool(data.get("show_legend", False)) + if show_legend: + command += " --legend" + + progress_id = str(data.get("progress_id") or "").strip()[:64] + if progress_id: + _set_map_progress(progress_id, 1, "Querying AI model...") + + style_kwargs: dict[str, object] = {"show_legend": show_legend} + if progress_id: + style_kwargs["progress_callback"] = lambda stage, label: _set_map_progress(progress_id, stage, label) for style_key, kw_name in ( ("filling_txt", "filling_txt_override"), ("filling_num", "filling_num_override"), @@ -621,19 +662,30 @@ def generate(): **style_kwargs, ) except AIServiceError as error: + if progress_id: + _set_map_progress(progress_id, 1, str(error), status="error") return jsonify(status='error', command=command, error=str(error)), error.status_code except KeyError as e: + if progress_id: + _set_map_progress(progress_id, 1, f"Missing field: {e}", status="error") return jsonify({"status": "error", "command": command, "error": f"Missing field: {e}"}), 400 except Exception as e: # noqa: BLE001 - surface failures to the UI + if progress_id: + _set_map_progress(progress_id, 1, str(e), status="error") return jsonify({"status": "error", "command": command, "error": str(e)}), 500 # auto_map returns None on AI failure / unknown map type. if buffer is None: + if progress_id: + _set_map_progress(progress_id, 1, "Map generation failed.", status="error") return jsonify({"status": "error", "command": command, "error": "Map generation failed. Check the server logs."}), 500 + if progress_id: + _set_map_progress(progress_id, 4, "Finalizing map...", status="done") + # Encode the PNG buffer as a data URL the browser can load directly. encoded = base64.b64encode(buffer.getvalue()).decode('ascii') @@ -646,7 +698,7 @@ def generate(): render_meta = getattr(buffer, "map_meta", None) ai_vals = render_meta.get("ai_answer") if isinstance(render_meta, dict) else None if isinstance(ai_vals, dict) and ai_vals: - resp_payload["map_values"] = ai_vals + resp_payload["map_values"] = render_meta.get("raw_ai_answer", ai_vals) resp_payload["analysis"] = _build_analysis_from_ai( ai_vals, mode=str(data.get("mode") or "auto"), @@ -942,7 +994,7 @@ def generate_batch(): render_meta = getattr(buffer, "map_meta", None) ai_vals = render_meta.get("ai_answer") if isinstance(render_meta, dict) else None if isinstance(ai_vals, dict) and ai_vals: - item_payload["map_values"] = ai_vals + item_payload["map_values"] = render_meta.get("raw_ai_answer", ai_vals) item_payload["analysis"] = _build_analysis_from_ai( ai_vals, mode=item_mode, @@ -1003,6 +1055,7 @@ def api_restyle_map(): auto_style=auto_style, palette_theme=palette_theme, ai_answer_override=map_values, + show_legend=bool(data.get("show_legend", False)), ) except Exception as e: # noqa: BLE001 return jsonify({"status": "error", "error": str(e)}), 500 diff --git a/map/auto_map.py b/map/auto_map.py index 3a3c4b8..39222fd 100644 --- a/map/auto_map.py +++ b/map/auto_map.py @@ -674,6 +674,115 @@ def _numeric_extrema(values): return max(numeric, key=numeric.get), min(numeric, key=numeric.get) +def _format_legend_bound(val: float) -> str: + """Format a numeric legend bound compactly so ranges fit in open sea space.""" + abs_val = abs(val) + if abs_val >= 1_000_000_000: + scaled, suffix = val / 1_000_000_000, "B" + elif abs_val >= 1_000_000: + scaled, suffix = val / 1_000_000, "M" + elif abs_val >= 10_000: + scaled, suffix = val / 1_000, "k" + elif float(val).is_integer(): + return str(int(val)) + else: + return f"{val:g}" + rounded = round(scaled, 1) + if float(rounded).is_integer(): + return f"{int(rounded)}{suffix}" + return f"{rounded:g}{suffix}" + + +def _format_legend_range(lo: float, hi: float) -> str: + """Format a ``(lo, hi)`` numeric interval for the floating map legend.""" + if lo <= -1e12 and hi >= 1e12: + return "All" + if lo <= -1e12: + return f"< {_format_legend_bound(hi)}" + if hi >= 1e12: + return f"{_format_legend_bound(lo)}+" + return f"{_format_legend_bound(lo)} - {_format_legend_bound(hi)}" + + +def _draw_legend_overlay( + size: tuple[int, int], + entries: list[tuple[tuple[int, int, int, int], str]], + get_font, + label_fill: tuple[int, int, int, int], + label_stroke_fill: tuple[int, int, int, int], + label_stroke_width: int, + map_type: str, + has_most_least: bool, +) -> Image.Image | None: + """Render a floating color legend in the open sea on the left side of the map.""" + if not entries: + return None + w, h = size + is_world = map_type in ("world", "world_countries") + if is_world: + x = int(w * 0.025) + start_y = int(h * (0.44 if has_most_least else 0.56)) + max_h = int(h * (0.34 if has_most_least else 0.40)) + max_w = int(w * 0.22) + base_size = max(20, int(h * 0.032)) + min_size = 14 + else: + x = 80 + start_y = 1640 if has_most_least else 1240 + max_h = max(300, 2750 - start_y) + max_w = 560 + base_size = 86 + min_size = 32 + + measure = ImageDraw.Draw(Image.new("RGBA", (1, 1))) + count = len(entries) + font_size = base_size + while font_size > min_size: + fits_height = count * int(font_size * 1.32) <= max_h + swatch_try = max(14, int(font_size * 0.76)) + gap_try = max(10, int(font_size * 0.30)) + font_try = get_font(font_size) + widest = max(measure.textlength(text, font=font_try) for _, text in entries) + fits_width = swatch_try + gap_try + widest <= max_w + if fits_height and fits_width: + break + font_size -= 4 + + row_step = int(font_size * 1.28) + swatch = max(14, int(font_size * 0.76)) + gap = max(10, int(font_size * 0.30)) + radius = max(4, swatch // 5) + stroke_w = min(label_stroke_width, max(2, font_size // 5)) if label_stroke_width > 0 else 0 + outline_w = max(2, min(6, font_size // 14)) + + layer = Image.new("RGBA", size, (255, 255, 255, 0)) + draw = ImageDraw.Draw(layer) + font = get_font(font_size) + + for idx, (color, text) in enumerate(entries): + row_y = start_y + idx * row_step + if row_y + swatch > h - 10: + break + swatch_y = row_y + max(0, (font_size - swatch) // 2) + rgba = (int(color[0]), int(color[1]), int(color[2]), 255) + draw.rounded_rectangle( + (x, swatch_y, x + swatch, swatch_y + swatch), + radius=radius, + fill=rgba, + outline=label_stroke_fill, + width=outline_w, + ) + draw.text( + (x + swatch + gap, row_y), + text, + font=font, + fill=label_fill, + stroke_width=stroke_w, + stroke_fill=label_stroke_fill, + ) + return layer + + def auto_map(prompt: str, mode: str, map_type: str, size_mod: int, optional_feature: str, model: str, font_name: str, show_result: bool = True, io_res = False, api_key: str | None = None, @@ -686,14 +795,16 @@ def auto_map(prompt: str, mode: str, map_type: str, size_mod: int, ai_answer_override: dict[str, object] | None = None, temperature: float | None = None, web_search: bool = False, - max_search_requests: int = 5): + max_search_requests: int = 5, + show_legend: bool = False, + progress_callback=None): """Create a map from an AI query and save it as ``result.png``. CLI options: mode -- "text" or "number" map_type -- "default", "flag", "world" or "world_countries" size_mod -- global font size modifier (default 15) - optional_feature -- None, "show_most_least" or "short_form" + optional_feature -- None, "show_most_least", "short_form", or comma-separated flags model -- Gemini model id font_name -- font file name from resources/fonts show_result -- open the result in the OS image viewer (GUI only) @@ -742,18 +853,33 @@ def get_font(size): except (TypeError, ValueError, OverflowError): label_offset_x = 0 - # Most least and short form conflict solution - # @TODO Make most/least and short form compatible - - if optional_feature == "show_most_least" and mode == "text": + def _parse_optional_features(value: object) -> set[str]: + """Normalize ``optional_feature`` (string or collection) into a set of active flags.""" + if not value: + return set() + if isinstance(value, (list, tuple, set, frozenset)): + tokens = {str(item).strip().lower() for item in value} + else: + raw = str(value).strip().lower() + if raw == "both": + return {"show_most_least", "short_form"} + tokens = {part.strip() for part in re.split(r"[,+\s]+", raw) if part.strip()} + tokens.discard("none") + return tokens + + features = _parse_optional_features(optional_feature) + has_most_least = "show_most_least" in features + has_short_form = "short_form" in features + + if has_most_least and mode == "text": showwarning("Warning", "Most/least feature may be incompatible with text mode. Turning off...") - optional_feature = None + has_most_least = False - if optional_feature == "show_most_least" and map_type == "world": + if has_most_least and map_type == "world": showwarning("Warning", "Most/Least feature is not available for world map. It will be disabled.") - optional_feature = None + has_most_least = False - if optional_feature == "short_form" and ai_answer_override is None: + if has_short_form and ai_answer_override is None: prompt += " Write in English short form only (k, M, B, T), for example 1000=1k, 1000000=1M, 1000000000=1B, 1000000000000=1T etc." random_colors = {} @@ -793,6 +919,11 @@ def get_font(size): text_layer = Image.new("RGBA", img.size, (255, 255, 255, 0)) draw = ImageDraw.Draw(text_layer) + def _report(stage: int, label: str) -> None: + if progress_callback is not None: + progress_callback(stage, label) + + _report(1, "Querying AI model...") if ai_answer_override is not None: ai_answer = dict(ai_answer_override) else: @@ -809,7 +940,7 @@ def get_font(size): return raw_ai_answer = dict(ai_answer) - if optional_feature == "short_form": + if has_short_form: ai_answer = {k: _format_short_number(v) for k, v in ai_answer.items()} log.success(f"Got information from AI ({len(ai_answer)} entries)") @@ -830,7 +961,7 @@ def get_font(size): if req_txt and (not theme_requested or req_keys_low != _DEFAULT_UI_TXT_KEYS): ci_to_orig = {k.strip().lower(): k for k in merged_txt} for rk, rv in req_txt.items(): - short_rk = str(_format_short_number(rk)).strip() if optional_feature == "short_form" else rk + short_rk = str(_format_short_number(rk)).strip() if has_short_form else rk target_k = ci_to_orig.get(short_rk.lower(), ci_to_orig.get(rk.strip().lower(), short_rk)) merged_txt[target_k] = rv filling_txt = merged_txt @@ -850,15 +981,15 @@ def get_font(size): if not filling_num and auto_num: filling_num = auto_num - if optional_feature == "short_form": + if has_short_form: for k, v in list(filling_txt.items()): short_k = str(_format_short_number(k)).strip().lower() if short_k: filling_txt_ci.setdefault(short_k, v) most_least = None - extrema = _numeric_extrema(ai_answer) if optional_feature == "show_most_least" else None - if optional_feature == "show_most_least" and extrema is None: + extrema = _numeric_extrema(raw_ai_answer) if has_most_least else None + if has_most_least and extrema is None: log.warning("No numeric values available; skipping most / least overlay") if extrema is not None: log.step("Computing most / least values") @@ -890,6 +1021,7 @@ def get_font(size): stroke_fill=label_stroke_fill) total = len(dict_) + _report(2, "Painting regions & labels...") log.step(f"Painting {total} regions") used_txt_rules: dict[str, tuple[int, int, int, int]] = {} used_num_rules: dict[tuple[float, float], tuple[int, int, int, int]] = {} @@ -1077,6 +1209,7 @@ def get_font(size): render_meta = { "ai_answer": dict(ai_answer), + "raw_ai_answer": raw_ai_answer, "mode": mode, "resolved_theme": resolved_theme, "filling_txt": {str(k): list(v) for k, v in effective_txt.items()}, @@ -1099,6 +1232,7 @@ def get_font(size): img = _paint_regions(img, flat, ids, region_colors) # adding relief map + _report(3, "Adding relief, borders & overlays...") log.step("Compositing layers") _layer_assets = { "default": ("map_relief.png", "default_map_blured.png"), @@ -1119,12 +1253,41 @@ def get_font(size): result = Image.alpha_composite(result, borders) result = Image.alpha_composite(result, text_layer) - if optional_feature == "show_most_least" and map_type != "world" and most_least is not None: + if has_most_least and map_type != "world" and most_least is not None: result = Image.alpha_composite(result, most_least) else: result = Image.alpha_composite(img, text_layer) + if show_legend: + if mode == "number": + legend_src = used_num_rules or effective_num + legend_entries = [ + (tuple(c), _format_legend_range(lo, hi)) + for (lo, hi), c in sorted(legend_src.items(), key=lambda item: (item[0][0], item[0][1])) + ] + else: + legend_src = used_txt_rules or effective_txt + legend_entries = [ + (tuple(c), str(label).strip()) + for label, c in legend_src.items() + if str(label).strip() + ] + has_ml = has_most_least and map_type != "world" and most_least is not None + legend_layer = _draw_legend_overlay( + img.size, + legend_entries, + get_font, + label_fill, + label_stroke_fill, + label_stroke_width, + map_type, + has_ml, + ) + if legend_layer is not None: + result = Image.alpha_composite(result, legend_layer) + + _report(4, "Encoding final PNG...") if io_res: # Return an in-memory PNG for the web API instead of writing result.png. diff --git a/map/functions.py b/map/functions.py index d99d5d3..f765f77 100644 --- a/map/functions.py +++ b/map/functions.py @@ -454,7 +454,7 @@ def load_filling(): BATCH_CSV_ALL_COLUMNS: tuple[str, ...] = BATCH_CSV_REQUIRED_COLUMNS + BATCH_CSV_OPTIONAL_COLUMNS _ALLOWED_MODES = frozenset({"text", "number"}) _ALLOWED_MAP_TYPES = frozenset({"default", "flag", "world", "world_countries"}) -_ALLOWED_EXTRA_OPTIONS = frozenset({"none", "show_most_least", "short_form"}) +_ALLOWED_EXTRA_OPTIONS = frozenset({"none", "show_most_least", "short_form", "show_most_least,short_form", "short_form,show_most_least"}) def slugify_prompt(prompt: str, max_len: int = 48) -> str: diff --git a/readme.md b/readme.md index 850b529..2effc8e 100644 --- a/readme.md +++ b/readme.md @@ -213,7 +213,8 @@ python cli.py make "GDP per capita by country" -m number -eop show_most_least -- | `-m`, `--mode` | `text`, `number` | `text` | | `-mp`, `--map-type` | `default`, `flag`, `world` | `default` | | `-gsm`, `--global-size-modifier` | Integer font-size adjustment | `15` | -| `-eop`, `--extra-option` | `none`, `show_most_least`, `short_form` | `none` | +| `-eop`, `--extra-option` | `none`, `show_most_least`, `short_form`, `show_most_least,short_form` (either order) | `none` | +| `--legend` | Draw a color legend | off | | `--model` | Supported model ID; see command help | `gemini-3.8-flash` | | `--font` | Bundled `.ttf` or `.otf` filename | `Bips.ttf` | | `--key` | Key for the selected model's provider | Provider environment/file key | @@ -221,7 +222,7 @@ python cli.py make "GDP per capita by country" -m number -eop show_most_least -- | `--show` / `--no-show` | Open the generated image; `make` only | `--no-show` | | `-v`, `--verbose` | Detailed progress output | Off | -`show_most_least` is supported in **numeric mode on Europe maps** (`default` or `flag`). `short_form` asks the model for shortened values such as `1k` or `2M` and is supported in **text mode**. These are mutually exclusive extra options. +`show_most_least` is supported in **numeric mode** on `default`, `flag`, and `world_countries` maps. `short_form` displays shortened values such as `1k` or `2M` in either mode. Combine them with `-eop show_most_least,short_form`; extrema use the original values before display rounding. Add `--legend` to show the color key. ### Batch generation diff --git a/templates/index.html b/templates/index.html index 47e024f..014db8c 100644 --- a/templates/index.html +++ b/templates/index.html @@ -88,6 +88,25 @@ background: rgba(99, 102, 241, 0.85); } + @keyframes checkPop { + 0% { + opacity: 0; + transform: scale(0.35) rotate(-18deg); + } + 65% { + opacity: 1; + transform: scale(1.25) rotate(4deg); + } + 100% { + opacity: 1; + transform: scale(1) rotate(0deg); + } + } + .check-pop { + display: inline-block; + animation: checkPop 0.34s cubic-bezier(0.22, 1, 0.36, 1) forwards; + } + /* Ambient Aurora Backdrop Animations */ @keyframes auroraFloat { 0%, 100% { @@ -383,7 +402,6 @@

Map Topic or AI Query - PROMPT
Data Mode - -m, --mode
@@ -572,8 +588,8 @@

-
world_countries
-
World Countries
+
World Countries
+
All Nations
@@ -586,7 +602,6 @@

Global Size Modifier - -gsm, --global-size-modifier
Extra Display Options - -eop, --extra-option
-
- +
+
@@ -643,7 +661,6 @@

- --model
@@ -686,7 +703,6 @@

- --font

@@ -907,14 +923,18 @@

Cartograp
1. AI Geospatial Query - Active + Running
- 2. Region Flood-Fill & Palette + 2. Painting Regions & Labels Pending
- 3. Relief & Typography Composite + 3. Adding Relief, Borders & Overlays + Pending +
+
+ 4. Encoding Final PNG Pending
@@ -1573,8 +1593,7 @@

const mapRadio = document.querySelector(`input[name="map_type"][value="${mapType}"]`); if (mapRadio) mapRadio.checked = true; - const eopRadio = document.querySelector(`input[name="extra_option"][value="${extraOption}"]`); - if (eopRadio) eopRadio.checked = true; + setSelectedExtraOption(extraOption); updateCommandPreview(); showToast(`Preset loaded: "${promptText}"`, 'info'); @@ -1698,11 +1717,12 @@

function restoreBatchResultParameters(item) { changeAiProvider(item.provider || modelProvider(item.model), item.model); - for (const name of ['mode', 'map_type', 'extra_option']) { + for (const name of ['mode', 'map_type']) { const input = Array.from(document.getElementsByName(name)) .find(input => input.value === item[name]); if (input) input.checked = true; } + if (item.extra_option !== undefined) setSelectedExtraOption(item.extra_option); document.getElementById('topicInput').value = item.prompt || ''; if (item.gsm !== undefined) syncGsm(item.gsm); for (const [field, id] of [['model', 'modelSelect'], ['font', 'fontSelect']]) { @@ -2059,11 +2079,28 @@

return { filling_txt, filling_num }; } + function getSelectedExtraOption() { + const parts = []; + if (document.getElementById('showMostLeastToggle')?.checked) parts.push('show_most_least'); + if (document.getElementById('shortFormToggle')?.checked) parts.push('short_form'); + return parts.length ? parts.join(',') : 'none'; + } + + function setSelectedExtraOption(value) { + const raw = String(value || 'none').toLowerCase(); + const showMostLeast = raw.includes('show_most_least') || raw === 'both'; + const shortForm = raw.includes('short_form') || raw === 'both'; + const mlEl = document.getElementById('showMostLeastToggle'); + const sfEl = document.getElementById('shortFormToggle'); + if (mlEl) mlEl.checked = showMostLeast; + if (sfEl) sfEl.checked = shortForm; + } + function getFormState() { const mode = document.querySelector('input[name="mode"]:checked')?.value || 'text'; const mapType = document.querySelector('input[name="map_type"]:checked')?.value || 'default'; const gsm = parseInt(document.getElementById('gsmNumber').value, 10) || 15; - const extraOption = document.querySelector('input[name="extra_option"]:checked')?.value || 'none'; + const extraOption = getSelectedExtraOption(); const model = document.getElementById('modelSelect').value; const font = document.getElementById('fontSelect').value; const topic = document.getElementById('topicInput').value.trim(); @@ -2081,6 +2118,7 @@

map_type: mapType, gsm, extra_option: extraOption, + show_legend: !!document.getElementById('showLegendToggle')?.checked, model, font, topic, @@ -2150,6 +2188,7 @@

// Match cli.py's signature: `cli.py make "" -m ... -mp ... -gsm ... -eop ... --model ... --font ...` const escapedTopic = (state.topic || '').replace(/"/g, '\\"'); let cmd = `python cli.py make "${escapedTopic}" -m ${state.mode} -mp ${state.map_type} -gsm ${state.gsm} -eop ${state.extra_option} --model ${state.model} --font "${state.font}" --temperature ${state.temperature}`; + if (state.show_legend) cmd += ' --legend'; document.getElementById('cliCommandDisplay').textContent = cmd; updateActiveBadges(state); @@ -2160,10 +2199,11 @@

function updateCompatibilityHint(state) { const hint = document.getElementById('extraOptionHint'); if (!hint) return; - if (state.extra_option === 'show_most_least' && state.mode === 'text') { + const hasMostLeast = String(state.extra_option || '').includes('show_most_least'); + if (hasMostLeast && state.mode === 'text') { hint.textContent = 'Note: show_most_least is designed for numeric mode (-m number).'; hint.className = 'text-[11px] text-amber-400/90 mt-1.5 block'; - } else if (state.extra_option === 'show_most_least' && state.map_type === 'world') { + } else if (hasMostLeast && state.map_type === 'world') { hint.textContent = 'Note: show_most_least overlay is supported on default, flag, and world_countries maps.'; hint.className = 'text-[11px] text-amber-400/90 mt-1.5 block'; } else { @@ -2192,6 +2232,7 @@

{ label: `map: ${state.map_type}`, color: 'bg-purple-500/20 text-purple-300 border-purple-500/30' }, { label: `gsm: ${state.gsm}`, color: 'bg-emerald-500/20 text-emerald-300 border-emerald-500/30' }, { label: `eop: ${state.extra_option}`, color: 'bg-amber-500/20 text-amber-300 border-amber-500/30' }, + ...(state.show_legend ? [{ label: 'legend', color: 'bg-cyan-500/20 text-cyan-300 border-cyan-500/30' }] : []), { label: state.model, color: 'bg-sky-500/20 text-sky-300 border-sky-500/30' }, { label: state.font, color: 'bg-slate-900/90 text-slate-300 border-slate-700' } ]; @@ -2268,34 +2309,93 @@

} } + let loadingProgressPollInterval = null; + let lastRenderedLoadingStage = 0; + + function renderLoadingStages(activeStage, labelText) { + const stepText = document.getElementById('loadingStepText'); + if (stepText && labelText) stepText.textContent = labelText; + if (activeStage === lastRenderedLoadingStage) return; + lastRenderedLoadingStage = activeStage; + + const stageNames = [ + '1. AI Geospatial Query', + '2. Painting Regions & Labels', + '3. Adding Relief, Borders & Overlays', + '4. Encoding Final PNG' + ]; + + for (let i = 1; i <= 4; i++) { + const el = document.getElementById(`loadStage${i}`); + if (!el) continue; + const title = stageNames[i - 1]; + const nextState = i < activeStage ? 'done' : (i === activeStage ? 'running' : 'pending'); + if (el.dataset.state === nextState) continue; + el.dataset.state = nextState; + if (nextState === 'done') { + el.className = 'flex items-center justify-between text-emerald-400'; + el.innerHTML = ` ${title}Done`; + } else if (nextState === 'running') { + el.className = 'flex items-center justify-between text-indigo-300'; + el.innerHTML = ` ${title}Running`; + } else { + el.className = 'flex items-center justify-between text-slate-500'; + el.innerHTML = ` ${title}Pending`; + } + } + } + // --- Multi-Stage Loading Animation Helper --- - function startLoadingStages() { + function startLoadingStages(progressId = '') { const stepText = document.getElementById('loadingStepText'); const timerEl = document.getElementById('loadingElapsedTimer'); - const s1 = document.getElementById('loadStage1'); - const s2 = document.getElementById('loadStage2'); - const s3 = document.getElementById('loadStage3'); - const startTime = performance.now(); clearInterval(loadingTimerInterval); - stepText.textContent = 'Waiting for the AI response and map rendering...'; - if (s1 && s2 && s3) { - s1.className = 'flex items-center justify-between text-indigo-300'; - s1.innerHTML = ' AI query & map renderingRunning'; - s2.className = 'hidden'; - s3.className = 'hidden'; + clearInterval(loadingProgressPollInterval); + lastRenderedLoadingStage = 0; + for (let i = 1; i <= 4; i++) { + const el = document.getElementById(`loadStage${i}`); + if (el) delete el.dataset.state; } + + renderLoadingStages(1, 'Querying AI model...'); + loadingTimerInterval = setInterval(() => { const elapsed = (performance.now() - startTime) / 1000; if (timerEl) timerEl.textContent = `${elapsed.toFixed(1)}s`; - if (elapsed >= 15) { - stepText.textContent = 'Still waiting for the server. The selected AI model may be busy.'; + if (elapsed >= 15 && stepText && stepText.textContent === 'Querying AI model...') { + stepText.textContent = 'Still waiting for the AI model response...'; } }, 150); + + if (progressId) { + let polling = false; + loadingProgressPollInterval = setInterval(async () => { + if (polling) return; + polling = true; + try { + const resp = await fetch(`/api/generate_progress/${encodeURIComponent(progressId)}`, { cache: 'no-store' }); + if (resp.ok) { + const prog = await resp.json(); + if (prog && typeof prog.stage === 'number') { + renderLoadingStages(prog.stage, prog.label); + } + if (prog && (prog.status === 'done' || prog.status === 'error')) { + clearInterval(loadingProgressPollInterval); + } + } + } catch { + // Ignore transient polling errors while map is generating. + } finally { + polling = false; + } + }, 250); + } } function stopLoadingStages() { clearInterval(loadingTimerInterval); + clearInterval(loadingProgressPollInterval); } // --- Handle Map Generation (Form Submit) --- @@ -2317,12 +2417,16 @@

return; } + const progressId = (window.crypto && typeof crypto.randomUUID === 'function') + ? crypto.randomUUID() + : `map_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`; + document.getElementById('generationError').classList.add('hidden'); overlay.classList.remove('hidden'); btn.disabled = true; btn.classList.add('opacity-70'); metaBadge.textContent = "Synthesizing..."; - startLoadingStages(); + startLoadingStages(progressId); logToConsole(`$ ${cmd}`, 'cmd'); @@ -2330,7 +2434,7 @@

const response = await fetch('/api/generate', { method: 'POST', headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify(state) + body: JSON.stringify({ ...state, progress_id: progressId }) }); // The backend may return JSON on error; guard against non-JSON bodies. @@ -3139,8 +3243,9 @@

const mapRadio = document.querySelector(`input[name="map_type"][value="${s.map_type}"]`); if (mapRadio) mapRadio.checked = true; syncGsm(s.gsm); - const eopRadio = document.querySelector(`input[name="extra_option"][value="${s.extra_option}"]`); - if (eopRadio) eopRadio.checked = true; + setSelectedExtraOption(s.extra_option); + const legendToggle = document.getElementById('showLegendToggle'); + if (legendToggle) legendToggle.checked = !!s.show_legend; document.getElementById('modelSelect').value = s.model; document.getElementById('fontSelect').value = s.font; document.getElementById('topicInput').value = s.topic || ''; @@ -3201,7 +3306,9 @@

document.querySelector('input[name="mode"][value="text"]').checked = true; document.querySelector('input[name="map_type"][value="default"]').checked = true; syncGsm(15); - document.querySelector('input[name="extra_option"][value="none"]').checked = true; + setSelectedExtraOption('none'); + const legendToggle = document.getElementById('showLegendToggle'); + if (legendToggle) legendToggle.checked = false; changeAiProvider('gemini', fallbackModels.find(model => modelProvider(model) === 'gemini')); document.getElementById('fontSelect').selectedIndex = 0; document.getElementById('topicInput').value = ''; diff --git a/tests/test_auto_map.py b/tests/test_auto_map.py index 7222522..fce880b 100644 --- a/tests/test_auto_map.py +++ b/tests/test_auto_map.py @@ -442,3 +442,55 @@ def test_global_label_shift_moves_all_labels_but_not_country_fill_seeds(scene, m assert [call.args[0] for call in draw.call_args_list] == [(x + offset, y) for x, y in baseline] assert [call.kwargs['xy'] for call in fill.call_args_list] == seeds assert output.map_meta['label_style']['offset_x'] == offset + + +@pytest.mark.parametrize('feature', ['show_most_least,short_form', 'short_form,show_most_least', 'both', ['short_form', 'show_most_least']]) +def test_combined_features_compare_unrounded_values(scene, monkeypatch, feature): + scene[0].return_value = {'one': 1001, 'two': 1049} + text = Mock() + monkeypatch.setattr(ImageDraw.ImageDraw, 'text', text) + result = render(mode='number', optional_feature=feature) + labels = [call.args[1] for call in text.call_args_list] + assert 'Most: Two\nLeast: One' in labels + assert result.map_meta['raw_ai_answer'] == {'one': 1001, 'two': 1049} + assert result.map_meta['ai_answer'] == {'one': '1k', 'two': '1k'} + + +@pytest.mark.parametrize('mode', ['text', 'number']) +def test_legend_and_progress_are_rendered(scene, monkeypatch, mode): + scene[0].return_value = {'one': 5, 'two': 15} if mode == 'number' else {'one': 'Yes', 'two': 'No'} + overlay = Mock(wraps=renderer._draw_legend_overlay) + monkeypatch.setattr(renderer, '_draw_legend_overlay', overlay) + progress = Mock() + result = render(mode=mode, show_legend=True, progress_callback=progress) + assert result.getvalue().startswith(b'\x89PNG') + assert overlay.call_args.args[1] + assert [call.args[0] for call in progress.call_args_list] == [1, 2, 3, 4] + + +@pytest.mark.parametrize('value,expected', [(0, '0'), (1.25, '1.25'), (10000, '10k'), (12500, '12.5k'), (1000000, '1M'), (1500000000, '1.5B'), (-15000, '-15k')]) +def test_legend_formats_bounds(value, expected): + assert renderer._format_legend_bound(value) == expected + + +@pytest.mark.parametrize('lo,hi,expected', [(-1e12, 1e12, 'All'), (-1e12, 20, '< 20'), (20, 1e12, '20+'), (10, 20, '10 - 20')]) +def test_legend_formats_ranges(lo, hi, expected): + assert renderer._format_legend_range(lo, hi) == expected + + +@pytest.mark.parametrize('map_type', ['default', 'world', 'world_countries']) +@pytest.mark.parametrize('has_ml', [False, True]) +def test_legend_draws_visible_swatches(map_type, has_ml): + font_path = renderer.FONTS_DIR / 'Bips.ttf' + font = lambda size: renderer.ImageFont.truetype(str(font_path), size) + layer = renderer._draw_legend_overlay((2000, 3000), [((255, 0, 0, 255), 'Yes'), ((0, 0, 255, 255), 'No')], font, (255,255,255,255), (0,0,0,255), 5, map_type, has_ml) + assert layer.getbbox() is not None + assert layer.mode == 'RGBA' + + +def test_legend_empty_long_and_overflow_entries(): + font = lambda size: renderer.ImageFont.truetype(str(renderer.FONTS_DIR / 'Bips.ttf'), size) + args = (font, (255,255,255,255), (0,0,0,255), 0, 'world', False) + assert renderer._draw_legend_overlay((100,100), [], *args) is None + layer = renderer._draw_legend_overlay((100,100), [((255,0,0,255), 'Long category ' * 20)] * 100, *args) + assert layer.size == (100,100) diff --git a/tests/test_cli.py b/tests/test_cli.py index ed4a78a..0c4a53f 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -143,3 +143,11 @@ def test_deepseek_cli_key_does_not_replace_gemini_key(generate, monkeypatch): assert os.environ['GEMINI_API_KEY'] == 'keep-gemini' assert os.environ['DEEPSEEK_API_KEY'] == 'deepseek-cli-key' assert generate.call_args.kwargs['model'] == 'deepseek-flash' + + +@pytest.mark.parametrize('feature', ['show_most_least,short_form', 'short_form,show_most_least']) +def test_make_accepts_web_legend_and_combined_options(generate, feature): + result = CliRunner().invoke(cli.main, ['make', 'GDP', '-m', 'number', '-eop', feature, '--legend']) + assert result.exit_code == 0, result.output + assert generate.call_args.kwargs['optional_feature'] == feature + assert generate.call_args.kwargs['show_legend'] is True diff --git a/tests/test_web.py b/tests/test_web.py index 8f523a2..9b45e6f 100644 --- a/tests/test_web.py +++ b/tests/test_web.py @@ -47,7 +47,7 @@ def test_generate_forwards_options_and_encodes_png(web, monkeypatch, generation_ assert base64.b64decode(response.json['image_url'].split(',')[1]) == b'png-data' generate.assert_called_once_with(prompt='Population', mode='number', map_type='default', size_mod=22, optional_feature='show_most_least', model='mock-model', - font_name='DIN Condensed.ttf', show_result=False, io_res=True, api_key='form-key') + font_name='DIN Condensed.ttf', show_result=False, io_res=True, api_key='form-key', show_legend=False) assert 'form-key' not in response.json['command'] @@ -481,3 +481,34 @@ def test_model_discovery_excludes_non_text_models_and_keeps_new_versions(web, mo assert result.status_code == 200 assert set(result.json['models']) == {'gemini-4-hydrogen', 'gemini-3.8-flash', 'gemma-4-31b-it'} assert client.call_args.kwargs['http_options'].timeout == 15000 + + +def test_map_progress_tracks_stages_and_expires_old_entries(web, monkeypatch, generation_request): + def generate(**kwargs): + kwargs['progress_callback'](2, 'Painting') + assert web._MAP_PROGRESS['render-id']['stage'] == 2 + buf = io.BytesIO(b'png') + buf.map_meta = {'ai_answer': {'a': '1k'}, 'raw_ai_answer': {'a': 1049}} + return buf + monkeypatch.setattr(web, 'auto_map', generate) + web._MAP_PROGRESS['old'] = {'updated_at': 0} + web._set_map_progress('', 1, 'ignored') + client = web.app.test_client() + response = client.post('/api/generate', json={**generation_request, 'progress_id': 'render-id', 'show_legend': True}) + assert response.status_code == 200 + assert response.json['map_values'] == {'a': 1049} + assert '--legend' in response.json['command'] + assert 'old' not in web._MAP_PROGRESS + progress = client.get('/api/generate_progress/render-id') + assert progress.json['status'] == 'done' and progress.json['stage'] == 4 + assert progress.headers['Cache-Control'] == 'no-store' + assert client.get('/api/generate_progress/unknown').json['stage'] == 1 + + +@pytest.mark.parametrize('error,status', [(KeyError('x'), 400), (RuntimeError('failed'), 500), (None, 500)]) +def test_map_progress_records_generation_failure(web, monkeypatch, generation_request, error, status): + monkeypatch.setattr(web, 'auto_map', Mock(side_effect=error, return_value=None)) + client = web.app.test_client() + response = client.post('/api/generate', json={**generation_request, 'progress_id': 'failed'}) + assert response.status_code == status + assert client.get('/api/generate_progress/failed').json['status'] == 'error' diff --git a/tests/test_web_ai_cache.py b/tests/test_web_ai_cache.py index 915a4f2..9d7c9c2 100644 --- a/tests/test_web_ai_cache.py +++ b/tests/test_web_ai_cache.py @@ -112,7 +112,7 @@ def render(**kwargs): assert first['map_values'] == {'ukraine': 38_000_000, 'germany': 84_500_000} assert second['ai_cached'] is True assert second['map_values'] == {'ukraine': '38M', 'germany': '84.5M'} - assert calls[1]['ai_answer_override'] == {'ukraine': '38M', 'germany': '84.5M'} + assert calls[1]['ai_answer_override'] == {'ukraine': 38_000_000, 'germany': 84_500_000} def test_render_video_accepts_binary_multipart(monkeypatch): @@ -131,3 +131,27 @@ def test_render_video_accepts_binary_multipart(monkeypatch): assert sent['map_file'] == 'data:image/png;base64,iVBORw==' assert sent['background_video'].startswith('data:video/mp4;base64,') assert sent['video_title'] == 'T' and sent['duration'] == 8 + + +def test_combined_features_keep_precision_across_cached_requests_and_repaint(monkeypatch): + calls = [] + raw = {'france': 1001, 'germany': 1049} + + def render(**kwargs): + calls.append(kwargs) + values = kwargs.get('ai_answer_override', raw) + buf = _buffer({k: web._format_short_number(v) for k, v in values.items()}) + buf.map_meta['raw_ai_answer'] = dict(values) + return buf + + monkeypatch.setattr(web, 'auto_map', render) + client = web.app.test_client() + body = _body(mode='number', extra_option='show_most_least,short_form') + for _ in range(2): + response = client.post('/api/generate', json=body) + assert response.status_code == 200 + assert response.json['map_values'] == raw + assert calls[1]['ai_answer_override'] == raw + response = client.post('/api/restyle_map', json={**body, 'map_values': response.json['map_values']}) + assert response.status_code == 200 + assert calls[2]['ai_answer_override'] == raw