Automated sync from GitHub

.gitattributes

@@ -1,3 +1,4 @@
+*.mp4 filter=lfs diff=lfs merge=lfs -text
 *.mp3 filter=lfs diff=lfs merge=lfs -text
 *.jpg filter=lfs diff=lfs merge=lfs -text
 *.jpeg filter=lfs diff=lfs merge=lfs -text
@@ -5,4 +6,3 @@
 *.ttf filter=lfs diff=lfs merge=lfs -text
 *.otf filter=lfs diff=lfs merge=lfs -text
 *.webp filter=lfs diff=lfs merge=lfs -text
-*.mp4 filter=lfs diff=lfs merge=lfs -text

Dockerfile

@@ -6,11 +6,18 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # Ookla speedtest CLI: /speed needs it. The version is pinned so a rebuild
-# cannot silently change the tool.
-RUN curl -sSL https://s3.amazonaws.com/ookla.speedtest.net/tools/cli/ookla-speedtest-1.2.0-linux-x86_64.tgz -o /tmp/ookla.tgz \
-    && tar -xzf /tmp/ookla.tgz -C /tmp \
-    && install -m 0755 /tmp/ookla-speedtest /usr/local/bin/ookla-speedtest \
-    && rm -rf /tmp/ookla.tgz /tmp/ookla-speedtest
+# cannot silently change the tool. The tarball unpacks to a binary called
+# "speedtest"; it is installed as "ookla-speedtest" to match the bot.
+RUN set -eux; \
+    case "$(uname -m)" in \
+        x86_64) arch=x86_64 ;; \
+        aarch64|arm64) arch=aarch64 ;; \
+        *) echo "unsupported architecture: $(uname -m)" >&2; exit 1 ;; \
+    esac; \
+    curl -fsSL --retry 3 "https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-${arch}.tgz" -o /tmp/ookla.tgz; \
+    tar -xzf /tmp/ookla.tgz -C /tmp; \
+    install -m 0755 /tmp/speedtest /usr/local/bin/ookla-speedtest; \
+    rm -rf /tmp/ookla.tgz /tmp/speedtest
 
 # Hugging Face Spaces run Docker containers as user 1000
 RUN useradd -m -u 1000 user

bot/speedtest.py

@@ -13,8 +13,9 @@ from dataclasses import dataclass
 from .utils import esc
 
 OOKLA_BIN = "ookla-speedtest"
-# --simple skips the server scan, --format=json makes the output readable
-OOKLA_ARGS = ("--accept-license", "--accept-gdpr", "--simple", "--format=json")
+# --accept-license / --accept-gdpr stop the tool waiting for a prompt; the
+# licence notice goes to stderr, so stdout stays pure JSON.
+OOKLA_ARGS = ("--accept-license", "--accept-gdpr", "--format=json")
 
 
 @dataclass
@@ -27,9 +28,17 @@ class SpeedResult:
 
 
 def parse_ookla_json(raw: str) -> SpeedResult:
-    """Read the JSON that ``ookla-speedtest --format=json`` prints."""
+    """Read the JSON that ``ookla-speedtest --format=json`` prints.
+
+    The CLI puts its licence notice on stderr, but be forgiving about anything
+    that ends up in front of the JSON.
+    """
+    text = (raw or "").strip()
+    start = text.find("{")
+    if start > 0:
+        text = text[start:]
     try:
-        data = json.loads(raw)
+        data = json.loads(text)
     except (TypeError, ValueError) as exc:
         raise ValueError("the speedtest output was not valid JSON") from exc
     if not isinstance(data, dict):
@@ -42,14 +51,18 @@ def parse_ookla_json(raw: str) -> SpeedResult:
 
     ping = data.get("ping") or {}
     try:
-        ping_ms = float(ping.get("iqm") or ping.get("latency") or 0)
+        # the CLI reports the round-trip time as "latency"; "iqm" is the
+        # inter-quartile mean it uses for the per-phase numbers
+        ping_ms = float(ping.get("latency") or ping.get("iqm") or 0)
     except (TypeError, ValueError):
         ping_ms = 0.0
 
     server = data.get("server") or {}
     name = str(server.get("name") or "").strip()
+    location = str(server.get("location") or "").strip()
     country = str(server.get("country") or "").strip()
-    label = " — ".join(part for part in (name, country) if part)
+    where = ", ".join(part for part in (location, country) if part)
+    label = " — ".join(part for part in (name, where) if part)
     return SpeedResult(
         download_mbps=download / 1_000_000,
         upload_mbps=upload / 1_000_000,
@@ -75,7 +88,7 @@ def format_speed(result: SpeedResult) -> str:
     return "\n".join(lines)
 
 
-async def run_speedtest(binary: str = OOKLA_BIN, timeout: float = 120.0) -> SpeedResult:
+async def run_speedtest(binary: str = OOKLA_BIN, timeout: float = 180.0) -> SpeedResult:
     """Run the Ookla CLI and return the result.
 
     Raises ``FileNotFoundError`` when the binary is missing and

tests/test_speedtest.py

@@ -2,19 +2,32 @@ import pytest
 
 from bot.speedtest import format_speed, parse_ookla_json
 
-RAW = """{"timestamp":"2024-01-01T00:00:00.000Z",
- "download":{"bandwidth":91234567,"bytes":1000,"elapsed":10000},
- "upload":{"bandwidth":4567890,"bytes":1000,"elapsed":10000},
- "ping":{"jitter":2,"iqm":12,"low":10,"high":15},
- "server":{"id":"1","host":"x","name":"Mumbai","country":"IN","sponsor":"ACME","d":0,"latency":12},
- "isp":"Example ISP","result":{"id":"1","url":"http://x","ok":true}}"""
+# A real `ookla-speedtest --accept-license --accept-gdpr --format=json` run.
+RAW = """{"type":"result","timestamp":"2026-10-20T10:45:15Z",
+ "ping":{"jitter":0.273,"latency":2.998,"low":2.833,"high":3.315},
+ "download":{"bandwidth":11034552,"bytes":39707592,"elapsed":3602,
+   "latency":{"iqm":16.372,"low":6.344,"high":48.044,"jitter":3.565}},
+ "upload":{"bandwidth":11886628,"bytes":162534754,"elapsed":14821,
+   "latency":{"iqm":128.627,"low":5.8,"high":523.355,"jitter":48.431}},
+ "packetLoss":0,"isp":"ACT Fibernet",
+ "interface":{"internalIp":"192.168.32.3","name":"wlan0","externalIp":"49.204.136.88"},
+ "server":{"id":60836,"host":"chn.infonetcomm.com","port":8080,"name":"ACT FIBERNET",
+   "location":"Chennai","country":"India","ip":"2406:7400:b0:1::2"},
+ "result":{"id":"18dc","url":"https://www.speedtest.net/result/c/18dc","persisted":true}}"""
 
 
 def test_parse_ookla_json_reads_the_speeds():
     r = parse_ookla_json(RAW)
-    assert r.download_mbps == pytest.approx(91.234567, rel=1e-4)
-    assert r.upload_mbps == pytest.approx(4.56789, rel=1e-4)
-    assert r.ping_ms == 12 and r.server == "Mumbai — IN" and r.isp == "Example ISP"
+    assert r.download_mbps == pytest.approx(11.034552, rel=1e-4)
+    assert r.upload_mbps == pytest.approx(11.886628, rel=1e-4)
+    assert r.ping_ms == 2.998            # the CLI reports the round trip as "latency"
+    assert r.server == "ACT FIBERNET — Chennai, India"
+    assert r.isp == "ACT Fibernet"
+
+
+def test_parse_ookla_json_survives_a_leading_licence_notice():
+    r = parse_ookla_json("You may only use this Speedtest software...\n" + RAW)
+    assert r.download_mbps == pytest.approx(11.034552, rel=1e-4)
 
 
 def test_parse_ookla_json_rejects_rubbish():
@@ -28,8 +41,8 @@ def test_parse_ookla_json_rejects_rubbish():
 
 def test_format_speed_shows_the_numbers():
     text = format_speed(parse_ookla_json(RAW))
-    assert "91.23" in text and "4.57" in text and "12" in text
-    assert "Mumbai" in text and "Example ISP" in text
+    assert "11.03" in text and "11.89" in text and "3" in text
+    assert "ACT FIBERNET" in text and "Chennai" in text and "ACT Fibernet" in text
 
 
 def test_format_speed_copes_with_missing_details():