Improve difficalcy error handling

Syriiin · Jun 8, 2024 · cb7d31e · cb7d31e
1 parent 5b0b450
commit cb7d31e
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/common/osu/difficultycalculator.py b/common/osu/difficultycalculator.py
@@ -332,9 +332,13 @@ def calculate_score(self, score: Score) -> Calculation:
             )
             response.raise_for_status()
             data = response.json()
+        except httpx.HTTPStatusError as e:
+            raise CalculationException(
+                f"An error occured in calculating the beatmap {score.beatmap_id}: {e.request.url} [{e.response.status_code}] {e.response.text}"
+            ) from e
         except httpx.HTTPError as e:
             raise CalculationException(
-                f"An error occured in calculating the beatmap {score.beatmap_id}: [{e.response.status_code}] {e.response.text}"
+                f"An error occured in calculating the beatmap {score.beatmap_id}: {e.request.url} - {e}"
             ) from e
 
         return Calculation(
@@ -350,10 +354,14 @@ def calculate_score_batch(self, scores: Iterable[Score]) -> list[Calculation]:
             )
             response.raise_for_status()
             data = response.json()
-        except httpx.HTTPError as e:
+        except httpx.HTTPStatusError as e:
             raise CalculationException(
                 f"An error occured in calculating the beatmaps {set(score.beatmap_id for score in scores)}: [{e.response.status_code}] {e.response.text}"
             ) from e
+        except httpx.HTTPError as e:
+            raise CalculationException(
+                f"An error occured in calculating the beatmaps {set(score.beatmap_id for score in scores)}: {e}"
+            ) from e
 
         return [
             Calculation(