Dynamically generate CatalogGameFromContrib subclasses from YAML

Author: edwardchalstrey1

doc/tutorials/01_quickstart.ipynb

@@ -495,7 +495,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 14,
    "id": "6db7a29a",
    "metadata": {},
    "outputs": [
@@ -509,7 +509,7 @@
        "Game(title='Two person Prisoner's Dilemma game')"
       ]
      },
-     "execution_count": 15,
+     "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -535,7 +535,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 15,
    "id": "f58eaa77",
    "metadata": {},
    "outputs": [],
@@ -553,7 +553,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 16,
    "id": "4119a2ac",
    "metadata": {},
    "outputs": [],

src/pygambit/catalog/__init__.py

@@ -1,30 +1,20 @@
+from . import catalog
 from .catalog import games
 
-# Dynamically import all catalog games
+# Ensure catalog module is fully imported including all YAML-generated classes exist
 _all_games = games()
 _game_classes = {}
 
 for game_name in _all_games:
-    # Import each game class from catalog module
-    from . import catalog
-    _game_classes[game_name] = getattr(catalog, game_name)
+    try:
+        _game_classes[game_name] = getattr(catalog, game_name)
+    except AttributeError as e:
+        raise ImportError(
+            f"Catalog game '{game_name}' listed but not found in catalog module"
+        ) from e
 
 # Add to module namespace
 globals().update(_game_classes)
 
 # Build __all__ dynamically
-__all__ = ["games"] + list(_all_games)  # type: ignore[assignment]
-
-# from .catalog import (
-#     OneShotTrust,
-#     PrisonersDilemma,
-#     TwoStageMatchingPennies,
-#     games,
-# )
-
-# __all__ = [
-#     "games",
-#     "PrisonersDilemma",
-#     "TwoStageMatchingPennies",
-#     "OneShotTrust",
-# ]
+__all__ = ["games", *list(_all_games)]