Round 3 fixes: cancelled polling, aggregator invalid_count, filter state, scheduler atomicity, HTTP exception handler, tests

app/api/routes/plugins.py

@@ -7,7 +7,7 @@ from app.services.plugin_runner import PluginRunner
 from app.core.execution import JobExecutor, CrawlJob
 from app.core.exceptions import PluginNotFoundException
 from app.api.deps import get_plugin_service, get_plugin_runner, get_executor
-from app.api.common import success_response
+from app.api.common import success_response, format_plugin
 
 router = APIRouter(prefix="/api/plugins", tags=["plugins"])
 
@@ -114,8 +114,11 @@ def _create_crawl_all_aggregator(job_ids, executor):
 
     class CrawlAllAggregator(Job):
         async def run(self):
+            self._set_running()
             # 等待所有子 job 完成（最多等 30 秒）
             for _ in range(300):
+                if self.is_cancelled:
+                    break
                 all_done = all(
                     executor.get_job(jid) and executor.get_job(jid).status.value in ("completed", "failed", "cancelled")
                     for jid in job_ids
@@ -125,24 +128,18 @@ def _create_crawl_all_aggregator(job_ids, executor):
                 await asyncio.sleep(0.1)
             total = 0
             valid = 0
+            invalid = 0
             for jid in job_ids:
                 job = executor.get_job(jid)
                 if job and job.result:
                     total += job.result.get("proxy_count", 0)
                     valid += job.result.get("success_count", 0)
-            return {"total_crawled": total, "valid_count": valid, "invalid_count": 0}
+                    invalid += job.result.get("failure_count", 0)
+            result = {"total_crawled": total, "valid_count": valid, "invalid_count": invalid}
+            if self.is_cancelled:
+                result["cancelled"] = True
+            return result
 
     return CrawlAllAggregator()
 
 
-def format_plugin(plugin) -> dict:
-    return {
-        "id": plugin.id,
-        "name": plugin.display_name,
-        "display_name": plugin.display_name,
-        "description": plugin.description,
-        "enabled": plugin.enabled,
-        "last_run": plugin.last_run.isoformat() if plugin.last_run else None,
-        "success_count": plugin.success_count,
-        "failure_count": plugin.failure_count,
-    }