@

refactor: simplify female sprite fallback per review

The sprites model field is a JSONField, so it is always decoded to a
python dict on read: drop the string/json.loads/json.dumps branch which
would have returned an escaped JSON string in the response.

Simplify get_pokemon_sprites to a positive guard and narrow its return
type to dict[str, Any]. In _fill_female_sprites, type the parameter as
dict[str, Any] and move the isinstance check into the recursion loop
instead of guarding at the function entry, which also removes a cast.

Align the test fixture with data/v2/build.py: it double-encoded the
sprites dict with json.dumps before storing it in the JSONField.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@

Author: programgames

pokemon_v2/serializers.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import itertools
-import json
 from typing import TYPE_CHECKING, Any, ClassVar, Protocol, cast
 
 from django.db.models import Q
@@ -2942,29 +2941,22 @@ class Meta:
     }
 
     @extend_schema_field(PokemonSpritesSerializer)
-    def get_pokemon_sprites(self, obj: Pokemon) -> dict[str, str | None] | str:
+    def get_pokemon_sprites(self, obj: Pokemon) -> dict[str, Any]:
         sprites_list = list(cast("PokemonWithRelations", obj).pokemonsprites.all())
         if not sprites_list:
             return {}
-        sprites: Any = sprites_list[0].sprites
-        if obj.pokemon_species is None or obj.pokemon_species.gender_rate != 8:
-            return sprites
-        if isinstance(sprites, str):
-            parsed = json.loads(sprites)
-            self._fill_female_sprites(parsed)
-            return json.dumps(parsed)
-        self._fill_female_sprites(sprites)
+        sprites = sprites_list[0].sprites
+        if obj.pokemon_species and obj.pokemon_species.gender_rate == 8:
+            self._fill_female_sprites(sprites)
         return sprites
 
-    def _fill_female_sprites(self, node: object) -> None:
-        if not isinstance(node, dict):
-            return
-        sprites = cast("dict[str, Any]", node)
+    def _fill_female_sprites(self, sprites: dict[str, Any]) -> None:
         for female_key, default_key in self._FEMALE_FALLBACKS.items():
             if female_key in sprites and sprites[female_key] is None and sprites.get(default_key) is not None:
                 sprites[female_key] = sprites[default_key]
         for value in sprites.values():
-            self._fill_female_sprites(value)
+            if isinstance(value, dict):
+                self._fill_female_sprites(value)
 
     @extend_schema_field(PokemonCriesSerializer)
     def get_pokemon_cries(self, obj: Pokemon) -> dict[str, str | None]:

pokemon_v2/tests.py

@@ -1631,7 +1631,7 @@ def setup_pokemon_sprites_data(
 
         pokemon_sprites = PokemonSprites.objects.create(
             pokemon=pokemon,
-            sprites=json.dumps(sprites | {"other": {"showdown": showdown}}),
+            sprites=sprites | {"other": {"showdown": showdown}},
         )
         pokemon_sprites.save()
 
@@ -4523,9 +4523,9 @@ def test_pokemon_api(self):
             "{}{}/pokemon-form/{}/".format(TEST_HOST, API_V2, pokemon_form.pk),
         )
 
-        sprites_data = json.loads(pokemon_sprites.sprites)
+        sprites_data = pokemon_sprites.sprites
         cries_data = json.loads(pokemon_cries.cries)
-        response_sprites_data = json.loads(response.data["sprites"])
+        response_sprites_data = response.data["sprites"]
         json.loads(response.data["cries"])
 
         # sprite params
@@ -4660,7 +4660,7 @@ def test_pokemon_api_female_only_sprites_fallback(self):
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-        response_sprites = json.loads(response.data["sprites"])
+        response_sprites = response.data["sprites"]
 
         self.assertIsNotNone(response_sprites["front_default"])
         self.assertEqual(response_sprites["front_female"], response_sprites["front_default"])