fix: move ID-reset detection before cache-size branch

Codex review: reset check was only in the delta path (>=50 rows),
missing small caches where INSERT OR IGNORE would silently mix data.
Now runs for any non-empty cache before deciding backfill vs delta.

Author: itsDNNS

app/modules/speedtest/collector.py

@@ -52,22 +52,21 @@ def collect(self) -> CollectorResult:
         try:
             last_id = self._storage.get_latest_speedtest_id()
             cached_count = self._storage.get_speedtest_count()
+            # ID-reset detection: compare remote max ID with cache max ID
+            if cached_count > 0 and last_id > 0:
+                remote_latest = self._client.get_latest(1)
+                if remote_latest and remote_latest[0].get("id", 0) < last_id:
+                    log.info(
+                        "Speedtest ID reset detected (cache=%d, remote=%d), rebuilding",
+                        last_id, remote_latest[0]["id"],
+                    )
+                    self._storage.clear_cache()
+                    cached_count = 0
             is_backfill = cached_count < 50
             if is_backfill:
                 new_results = self._client.get_results(per_page=2000)
             else:
                 new_results = self._client.get_newer_than(last_id)
-                # ID-reset detection: remote max ID < cache max ID = server replaced
-                if not new_results and last_id > 0:
-                    remote_latest = self._client.get_latest(1)
-                    if remote_latest and remote_latest[0].get("id", 0) < last_id:
-                        log.info(
-                            "Speedtest ID reset detected (cache=%d, remote=%d), rebuilding",
-                            last_id, remote_latest[0]["id"],
-                        )
-                        self._storage.clear_cache()
-                        new_results = self._client.get_results(per_page=2000)
-                        is_backfill = True
             if new_results:
                 genuinely_new = [r for r in new_results if r.get("id", 0) > last_id]
                 self._storage.save_speedtest_results(new_results)

app/modules/speedtest/routes.py

@@ -118,23 +118,21 @@ def api_speedtest():
             # Detect server switch and clear stale cache
             ss.check_source_url(stt_url)
             cached_count = ss.get_speedtest_count()
+            last_id = ss.get_latest_speedtest_id()
+            # ID-reset detection: compare remote max ID with cache max ID
+            if cached_count > 0 and last_id > 0:
+                remote_latest = client.get_latest(1)
+                if remote_latest and remote_latest[0].get("id", 0) < last_id:
+                    log.info(
+                        "Speedtest ID reset detected (cache max=%d, remote max=%d), rebuilding",
+                        last_id, remote_latest[0]["id"],
+                    )
+                    ss.clear_cache()
+                    cached_count = 0
             if cached_count < 50:
                 new_results = client.get_results(per_page=2000)
             else:
-                last_id = ss.get_latest_speedtest_id()
                 new_results = client.get_newer_than(last_id)
-                # ID-reset detection: if delta returned nothing, check if
-                # the remote's latest ID is lower than our cache's max ID.
-                # This means the server was replaced (IDs reset).
-                if not new_results and last_id > 0:
-                    remote_latest = client.get_latest(1)
-                    if remote_latest and remote_latest[0].get("id", 0) < last_id:
-                        log.info(
-                            "Speedtest ID reset detected (cache max=%d, remote max=%d), rebuilding",
-                            last_id, remote_latest[0]["id"],
-                        )
-                        ss.clear_cache()
-                        new_results = client.get_results(per_page=2000)
             if new_results:
                 ss.save_speedtest_results(new_results)
                 log.info("Cached %d new speedtest results", len(new_results))