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

app/core/execution/executor.py

@@ -26,6 +26,7 @@ class JobExecutor:
         self.worker_pool = worker_pool
         self.max_concurrent_jobs = max_concurrent_jobs
         self._jobs: Dict[str, Job] = {}
+        self._tasks: Dict[str, asyncio.Task] = {}
         self._running = False
         self._semaphore = asyncio.Semaphore(max_concurrent_jobs)
         self._cleanup_interval = cleanup_interval_seconds
@@ -61,27 +62,31 @@ class JobExecutor:
     def submit_job(self, job: Job) -> str:
         """提交一个 Job 到后台执行"""
         self._jobs[job.id] = job
-        asyncio.create_task(self._run_job(job))
+        task = asyncio.create_task(self._run_job(job))
+        self._tasks[job.id] = task
         return job.id
 
     async def _run_job(self, job: Job) -> None:
-        async with self._semaphore:
-            try:
-                if job.is_cancelled:
-                    logger.info(f"Job {job.id} was cancelled before running")
-                    return
-                result = await job.run()
-                # 如果子类没有显式设置完成状态，自动设为 completed
-                if job.status not in (JobStatus.COMPLETED, JobStatus.FAILED, JobStatus.CANCELLED):
-                    job._set_completed(result)
-                logger.info(f"Job {job.id} completed: {result}")
-            except asyncio.CancelledError:
-                job.status = JobStatus.CANCELLED
-                job._touch()
-                logger.info(f"Job {job.id} cancelled during execution")
-            except Exception as e:
-                job._set_failed(str(e))
-                logger.error(f"Job {job.id} failed: {e}", exc_info=True)
+        try:
+            async with self._semaphore:
+                try:
+                    if job.is_cancelled:
+                        logger.info(f"Job {job.id} was cancelled before running")
+                        return
+                    result = await job.run()
+                    # 如果子类没有显式设置完成状态，自动设为 completed
+                    if job.status not in (JobStatus.COMPLETED, JobStatus.FAILED, JobStatus.CANCELLED):
+                        job._set_completed(result)
+                    logger.info(f"Job {job.id} completed: {result}")
+                except asyncio.CancelledError:
+                    job.status = JobStatus.CANCELLED
+                    job._touch()
+                    logger.info(f"Job {job.id} cancelled during execution")
+                except Exception as e:
+                    job._set_failed(str(e))
+                    logger.error(f"Job {job.id} failed: {e}", exc_info=True)
+        finally:
+            self._tasks.pop(job.id, None)
 
     def get_job(self, job_id: str) -> Optional[Job]:
         return self._jobs.get(job_id)
@@ -101,6 +106,9 @@ class JobExecutor:
         job = self._jobs.get(job_id)
         if not job:
             return False
+        task = self._tasks.get(job_id)
+        if task and not task.done():
+            task.cancel()
         job.cancel()
         return True
 
@@ -108,6 +116,9 @@ class JobExecutor:
         cancelled = 0
         for job in list(self._jobs.values()):
             if job.status in (JobStatus.PENDING, JobStatus.RUNNING):
+                task = self._tasks.get(job.id)
+                if task and not task.done():
+                    task.cancel()
                 job.cancel()
                 cancelled += 1
         return cancelled