refactor: Improve future handling in AI rating and best shot workers

Author: duartebarbosadev

src/core/ai/best_shot_pipeline.py

@@ -300,37 +300,6 @@ def _call_llm(
         content = getattr(message, "content", None) or ""
         return message, content
 
-    def _extract_rating(self, analysis: str) -> Optional[int]:
-        if not analysis:
-            return None
-
-        # Try JSON parsing first, as the prompt requests structured output
-        try:
-            parsed = json.loads(analysis)
-            if isinstance(parsed, dict) and "rating" in parsed:
-                return int(round(float(parsed["rating"])))
-        except (ValueError, TypeError, json.JSONDecodeError):
-            # Fall back to unstructured parsing if the model returned plain text.
-            pass
-
-        patterns = [
-            r"\brating\b[^0-9]*([1-5](?:\.[0-9]+)?)",
-            r"\boverall rating\b[^0-9]*([1-5](?:\.[0-9]+)?)",
-            r"\bscore\b[^0-9]*([1-5](?:\.[0-9]+)?)",
-            r"([1-5])\s*/\s*5",
-            r"([1-5])\s*out of\s*5",
-            r"([1-5])\s*stars",
-        ]
-        for pattern in patterns:
-            match = re.search(pattern, analysis, re.IGNORECASE)
-            if match:
-                try:
-                    return int(round(float(match.group(1))))
-                except (ValueError, TypeError):
-                    continue
-
-        return None
-
     def validate_connection(self) -> None:
         probe_timeout = min(max(5, int(self._timeout * 0.25)), max(self._timeout, 5))
         client = self._with_timeout(probe_timeout)

src/workers/ai_rating_worker.py

@@ -154,7 +154,9 @@ def run(self) -> None:
             start_time = time.perf_counter()
             try:
                 for path in self.image_paths:
-                    futures[executor.submit(self._rate_single, path)] = path
+                    future = executor.submit(self._rate_single, path)
+                    with self._executor_lock:
+                        futures[future] = path
 
                 processed = 0
                 for future in as_completed(futures):

workers/best_shot_worker.py

@@ -374,9 +374,9 @@ def run(self):
                         break
                     if not paths:
                         continue
-                    futures[
-                        executor.submit(self._analyze_cluster, cluster_id, paths)
-                    ] = cluster_id
+                    future = executor.submit(self._analyze_cluster, cluster_id, paths)
+                    with self._executor_lock:
+                        futures[future] = cluster_id
 
                 total_jobs = len(futures)
                 if total_jobs == 0: