fix(typing): Convert to Python <3.9 types 🥲

- Because package `youtokentome` only works on 3.8

README.md

@@ -4,7 +4,7 @@ emoji: 🧬
 colorFrom: gray
 colorTo: green
 sdk: gradio
-python_version: 3.8.9
+python_version: 3.8.12
 app_file: start.py
 models: [minimaxir/ai-generated-pokemon-rudalle]
 pinned: true

app.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Dict, List, Union
 from time import gmtime, strftime
 
 from fastapi import FastAPI
@@ -22,7 +22,7 @@ def index() -> FileResponse:
 
 
 @app.get('/new_card')
-def new_card() -> dict[str, Union[Details, str]]:
+def new_card() -> Dict[str, Union[Details, str]]:
     card_logs.append(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime()))
 
     details: Details = rand_details()
@@ -34,10 +34,10 @@ def new_card() -> dict[str, Union[Details, str]]:
 
 
 @app.get('/stats')
-def stats() -> dict[str, Union[int, object]]:
+def stats() -> Dict[str, Union[int, object]]:
     return get_stats() | {"cards_served": len(card_logs)}
 
 
 @app.get('/logs')
-def logs() -> list[str]:
+def logs() -> List[str]:
     return card_logs

modules/dataset.py

@@ -1,6 +1,6 @@
 import os
 from random import choices, randint
-from typing import cast, Optional, TypedDict
+from typing import cast, Dict, List, Optional, TypedDict
 import h5py
 
 
@@ -12,7 +12,7 @@ h5_file: str = os.path.join(datasets_dir, datasets_file)
 class Stats(TypedDict):
     size_total: int
     size_mb: float
-    size_counts: dict[str, int]
+    size_counts: Dict[str, int]
 
 
 def get_stats(h5_file: str = h5_file) -> Stats:
@@ -24,7 +24,7 @@ def get_stats(h5_file: str = h5_file) -> Stats:
         }
 
 
-energy_types: list[str] = ['colorless', 'darkness', 'dragon', 'fairy', 'fighting',
+energy_types: List[str] = ['colorless', 'darkness', 'dragon', 'fairy', 'fighting',
                            'fire', 'grass', 'lightning', 'metal', 'psychic', 'water']
 
 

modules/details.py

@@ -1,20 +1,20 @@
 import random
 import json
-from typing import cast, Optional, TypedDict, Union
+from typing import cast, Dict, List, Optional, TypedDict, Union
 
 
 class Attack(TypedDict):
     name: str
-    cost: list[str]
+    cost: List[str]
     convertedEnergyCost: int
     damage: str
     text: str
 
 
-ListCollection = dict[str, Union[list[str], list[Attack]]]
+ListCollection = Dict[str, Union[List[str], List[Attack]]]
 
 
-def load_lists(list_names: list[str], base_dir: str = "lists") -> ListCollection:
+def load_lists(list_names: List[str], base_dir: str = "lists") -> ListCollection:
     lists = {}
 
     for name in list_names:
@@ -27,16 +27,16 @@ def load_lists(list_names: list[str], base_dir: str = "lists") -> ListCollection
 def rand_hp() -> int:
     # Weights from https://bulbapedia.bulbagarden.net/wiki/HP_(TCG)
 
-    hp_range: list[int] = list(range(30, 340 + 1, 10))
+    hp_range: List[int] = list(range(30, 340 + 1, 10))
 
-    weights: list[int] = [156, 542, 1264, 1727, 1477, 1232, 1008, 640, 436, 515, 469, 279, 188,
+    weights: List[int] = [156, 542, 1264, 1727, 1477, 1232, 1008, 640, 436, 515, 469, 279, 188,
                           131, 132, 132, 56, 66, 97, 74, 23, 24, 25, 7, 15, 6, 0, 12, 18, 35, 18, 3]
 
     return random.choices(hp_range, weights)[0]
 
 
 def rand_energy(can_be_none: bool = False) -> Union[str, None]:
-    types: list[str] = ['colorless', 'darkness', 'dragon', 'fairy', 'fighting',
+    types: List[str] = ['colorless', 'darkness', 'dragon', 'fairy', 'fighting',
                         'fire', 'grass', 'lightning', 'metal', 'psychic', 'water']
 
     if can_be_none:
@@ -51,19 +51,19 @@ def rand_name(energy_type: str = cast(str, rand_energy())) -> str:
     return cast(str, random.choices(lists[energy_type])[0])
 
 
-def rand_species(species: list[str]) -> str:
+def rand_species(species: List[str]) -> str:
     random_species: str = random.choices(species)[0]
 
     return f'{random_species.capitalize()}'
 
 
-def rand_length() -> dict[str, int]:
+def rand_length() -> Dict[str, int]:
     # Weights from https://bulbapedia.bulbagarden.net/wiki/List_of_Pok%C3%A9mon_by_height
 
-    feet_ranges: list[int] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16,
+    feet_ranges: List[int] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16,
                               17, 18, 19, 20, 21, 22, 23, 24, 26, 28, 30, 32, 34, 35, 47, 65, 328]
 
-    weights: list[int] = [30, 220, 230, 176, 130, 109, 63, 27, 17, 17, 5, 5, 6,
+    weights: List[int] = [30, 220, 230, 176, 130, 109, 63, 27, 17, 17, 5, 5, 6,
                           4, 3, 2, 2, 2, 1, 2, 3, 1, 2, 1, 1, 1, 2, 1, 1, 2, 1, 1, 1]
 
     return {
@@ -75,7 +75,7 @@ def rand_length() -> dict[str, int]:
 def rand_weight() -> str:
     # Weights from https://bulbapedia.bulbagarden.net/wiki/List_of_Pok%C3%A9mon_by_weight
 
-    weight_ranges: list[dict[str, int]] = [
+    weight_ranges: List[Dict[str, int]] = [
         {"start": 1, "end": 22},
         {"start": 22, "end": 44},
         {"start": 44, "end": 55},
@@ -94,7 +94,7 @@ def rand_weight() -> str:
         {"start": 903, "end": 2204}]
 
     # 'weights' as in statistical weightings, not physical mass
-    weights: list[int] = [271, 145, 53, 204, 57, 122, 1, 11, 57, 28, 7, 34, 4, 17, 5, 31]
+    weights: List[int] = [271, 145, 53, 204, 57, 122, 1, 11, 57, 28, 7, 34, 4, 17, 5, 31]
 
     start: int
     end: int
@@ -106,7 +106,7 @@ def rand_weight() -> str:
 
 
 def rand_attack(
-        attacks: list[Attack],
+        attacks: List[Attack],
         name: str, energy_type: Optional[str],
         colorless_only_allowed: bool = False) -> Attack:
     random_attack: Attack = random.choices(attacks)[0]
@@ -126,7 +126,7 @@ def rand_attack(
     return random_attack
 
 
-def rand_attacks(attacks: list[Attack], name: str, energy_type: Optional[str], n: int = 2) -> list[Attack]:
+def rand_attacks(attacks: List[Attack], name: str, energy_type: Optional[str], n: int = 2) -> List[Attack]:
     attack1: Attack = rand_attack(attacks, name, energy_type)
 
     if n > 1:
@@ -158,9 +158,9 @@ class Details(TypedDict):
     hp: int
     energy_type: str
     species: str
-    length: dict[str, int]
+    length: Dict[str, int]
     weight: str
-    attacks: list[Attack]
+    attacks: List[Attack]
     weakness: Union[str, None]
     resistance: Union[str, None]
     retreat: int
@@ -176,10 +176,10 @@ def rand_details() -> Details:
         "name": name,
         "hp": rand_hp(),
         "energy_type": energy_type,
-        "species": rand_species(cast(list[str], lists["species"])),
+        "species": rand_species(cast(List[str], lists["species"])),
         "length": rand_length(),
         "weight": rand_weight(),
-        "attacks": cast(list[Attack], rand_attacks(cast(list[Attack], lists["attacks"]), name, energy_type=energy_type)),
+        "attacks": cast(List[Attack], rand_attacks(cast(List[Attack], lists["attacks"]), name, energy_type=energy_type)),
         "weakness": rand_energy(can_be_none=True),
         "resistance": rand_energy(can_be_none=True),
         "retreat": rand_retreat(),