fix(lint): resolve errors from merged PR #14 (see issue #8)

Author: sreyassabbani

qbreader/_api_utils.py

@@ -106,7 +106,7 @@ def normalize_subcat(unnormalized_subcats: UnnormalizedCategory):
 
 def category_correspondence(
     typed_alt_subcat: AlternateSubcategory,
-) -> Tuple[Category, Subcategory]:
+) -> Tuple[Category | None, Subcategory | None]:
     if typed_alt_subcat in [
         AlternateSubcategory.ASTRONOMY,
         AlternateSubcategory.COMPUTER_SCIENCE,
@@ -146,13 +146,16 @@ def category_correspondence(
         AlternateSubcategory.MISC_LITERATURE,
     ]:
         return (Category.LITERATURE, None)
+    
+    # Accounts for AlternateSubcategory.PRACTICES and AlternateSubcategory.BELIEFS
+    return (None, None)
 
 
 def normalize_cats(
     unnormalized_cats: UnnormalizedCategory,
     unnormalized_subcats: UnnormalizedSubcategory,
     unnormalized_alt_subcats: UnnormalizedAlternateSubcategory,
-) -> Tuple[Category, Subcategory, AlternateSubcategory]:
+) -> Tuple[str, str, str]:
     """
     Normalize a single or list of categories, subcategories, and alternate_subcategories
     to their corresponding comma-separated strings, taking into account categories and
@@ -183,8 +186,8 @@ def normalize_cats(
     elif isinstance(unnormalized_cats, str):
         final_cats = [Category(unnormalized_cats), *to_be_pushed_cats]
     elif isinstance(unnormalized_cats, Iterable):
-        for subcat in unnormalized_cats:
-            final_cats.append(Subcategory(subcat))
+        for cat in unnormalized_cats:
+            final_cats.append(Category(cat))
         final_cats.append(*to_be_pushed_cats)
 
     final_subcats = []

qbreader/synchronous.py

@@ -283,19 +283,20 @@ def random_bonus(
         Parameters
         ----------
         difficulties : qbreader.types.UnnormalizedDifficulty, optional
-            The difficulties to search for. Can be a single or an array of `Difficulty`
-            enums, strings, or integers.
+            The difficulties to search for. Can be a single or an array of
+            `Difficulty` enums, strings, or integers.
         categories : qbreader.types.UnnormalizedCategory, optional
-            The categories to search for. Can be a single or an array of `Category`
-            enums or strings.
+            The categories to search for. Can be a single or an array of
+            `Category` enums or strings.
         subcategories : qbreader.types.UnnormalizedSubcategory, optional
             The subcategories to search for. Can be a single or an array of
             `Subcategory` enums or strings. The API does not check for consistency
             between categories and subcategories.
-        alternate_subcategories: qbreaader.types.UnnormalizedAlternateSubcategory, optional
+        alternate_subcategories : qbreaader.types.UnnormalizedAlternateSubcategory,
+            optional
             The alternates subcategories to search for. Can be a single or an array of
-            `AlternateSubcategory` enum variants or strings. The API does not check for consistency
-            between categories, subcategories, and alternate subcategories.
+            `AlternateSubcategory` enum variants or strings. The API does not check for
+            consistency between categories, subcategories, and alternate subcategories.
         number : int, default = 1
             The number of bonuses to return.
         min_year : int, default = Year.MIN_YEAR

qbreader/types.py

@@ -290,7 +290,7 @@ def __init__(
         self.packet: PacketMetadata = packet
         self.set: SetMetadata = set
         self.number: int = number
-        self.alternate_subcategory: AlternateSubcategory = alternate_subcategory
+        self.alternate_subcategory: AlternateSubcategory | None = alternate_subcategory
 
     @classmethod
     def from_json(cls: Type[Self], json: dict[str, Any]) -> Self:
@@ -384,7 +384,7 @@ def __init__(
         self.set: SetMetadata = set
         self.packet: PacketMetadata = packet
         self.number: int = number
-        self.alternate_subcategory: AlternateSubcategory = alternate_subcategory
+        self.alternate_subcategory: AlternateSubcategory | None = alternate_subcategory
         self.values: Optional[tuple[int, ...]] = tuple(values) if values else None
         self.difficultyModifiers: Optional[tuple[DifficultyModifier, ...]] = (
             tuple(difficultyModifiers) if difficultyModifiers else None
@@ -687,8 +687,8 @@ def __str__(self) -> str:
 UnnormalizedAlternateSubcategory: TypeAlias = Optional[
     Union[AlternateSubcategory, str, Iterable[Union[AlternateSubcategory, str]]]
 ]
-"""Type alias for unnormalized alternate subcategories. Union of `AlternateSubcategory`, `str`, and
-`collections.abc.Iterable` containing either."""
+"""Type alias for unnormalized alternate subcategories. Union of `AlternateSubcategory`, 
+`str`, and `collections.abc.Iterable` containing either."""
 
 
 __all__ = (