graph-games-proto 0.3.1981__py3-none-any.whl → 0.3.1986__py3-none-any.whl

graph_games_proto/fns.py

@@ -1949,6 +1949,9 @@ class StateKernel(PClass):
     edgetuple2uuid = field(type=dict)  # Dict[Tuple[int, int], str]
     nodeuuid2idx = field(type=dict)  # Dict[str, int]
     carduuid2deckidx = field(type=dict)  # Dict[str, int]
+    bonusuuid2bonusidx = field(type=dict)  # Dict[str, int]
+    starting_decks = field(type=list)  # List[Deck]
+    starting_piles = field(type=list) # List[Pile]
     def __todict__(self):
         return {
             "rng": rng2json(self.rng),
@@ -1967,6 +1970,9 @@ class StateKernel(PClass):
             "edgetuple2uuid": [{"k": list(k), "v": v} for k, v in self.edgetuple2uuid.items()],
             "nodeuuid2idx": self.nodeuuid2idx,
             "carduuid2deckidx": self.carduuid2deckidx,
+            "bonusuuid2bonusidx": self.bonusuuid2bonusidx,
+            "starting_decks": [deck.__todict__() for deck in self.starting_decks],
+            "starting_piles": [pile.__todict__() for pile in self.starting_piles],
         }
     @staticmethod
     def __fromdict__(d):
@@ -1987,6 +1993,9 @@ class StateKernel(PClass):
             edgetuple2uuid={tuple(item["k"]): item["v"] for item in d["edgetuple2uuid"]},
             nodeuuid2idx=d["nodeuuid2idx"],
             carduuid2deckidx=d["carduuid2deckidx"],
+            bonusuuid2bonusidx=d["bonusuuid2bonusidx"],
+            starting_decks=[Deck.__fromdict__(x) for x in d["starting_decks"]],
+            starting_piles=[Pile.__fromdict__(x) for x in d["starting_piles"]],
         )
 
 
@@ -2025,6 +2034,9 @@ def init_state_kernel(**kwargs):
         node_2_idx = nodeuuid2idx[edge.node_2_uuid]
         edge_tuple = (min(node_1_idx, node_2_idx), max(node_1_idx, node_2_idx))
         edgetuple2uuid[edge_tuple] = edge.uuid
+
+    bonuses = game_config.fig.board_config.bonuses
+    bonusuuid2bonusidx = {bonus.uuid: idx for idx, bonus in enumerate(bonuses)}
     
     return StateKernel(
         rng=rng,
@@ -2043,6 +2055,9 @@ def init_state_kernel(**kwargs):
         edgetuple2uuid=edgetuple2uuid,
         nodeuuid2idx=nodeuuid2idx,
         carduuid2deckidx=carduuid2deckidx,
+        bonusuuid2bonusidx=bonusuuid2bonusidx,
+        starting_decks=kwargs.get('starting_decks'),
+        starting_piles=kwargs.get('starting_piles'),
     )
 
 
@@ -2050,9 +2065,6 @@ class State(PClass):
     kernel = field(type=StateKernel)
     idx2path = field(type=list)  # List[Path2]
     bonus_statuses = field(type=list)  # List[BonusStatus]
-    bonusuuid2bonusidx = field(type=dict)  # Dict[str, int]
-    starting_decks = field(type=list)  # List[Deck]
-    starting_piles = field(type=list)
     history = field(type=list)  # List[Action2]
     player_scores = field(type=list)  # List[PlayerScore2]
     player_graphs = field(type=list)  # List[PlayerGraph]
@@ -2073,9 +2085,6 @@ class State(PClass):
             "kernel": self.kernel.__todict__(),
             "idx2path": [v.__todict__() for v in self.idx2path],
             "bonus_statuses": [status.__todict__() for status in self.bonus_statuses],
-            "bonusuuid2bonusidx": self.bonusuuid2bonusidx,
-            "starting_decks": [deck.__todict__() for deck in self.starting_decks],
-            "starting_piles": [pile.__todict__() for pile in self.starting_piles],
             "history": [x.__todict__() for x in self.history],
             "player_scores": [x.__todict__() for x in self.player_scores],
             "player_graphs": [x.__todict__() for x in self.player_graphs],
@@ -2098,9 +2107,6 @@ class State(PClass):
             kernel=StateKernel.__fromdict__(d["kernel"]),
             idx2path=[Path2.__fromdict__(v) for v in d["idx2path"]],
             bonus_statuses=[BonusStatus.__fromdict__(x) for x in d["bonus_statuses"]],
-            bonusuuid2bonusidx=d["bonusuuid2bonusidx"],
-            starting_decks=[Deck.__fromdict__(x) for x in d["starting_decks"]],
-            starting_piles=[Pile.__fromdict__(x) for x in d["starting_piles"]],
             history=[Action2.__fromdict__(x) for x in d["history"]],
             player_scores=[PlayerScore2.__fromdict__(x) for x in d["player_scores"]],
             player_graphs=[PlayerGraph.__fromdict__(x) for x in d["player_graphs"]],
@@ -2618,7 +2624,6 @@ def getinitialstate(game_config):
             idx2path.append(path)
 
     bonuses = game_config.fig.board_config.bonuses
-    bonusuuid2bonusidx = {bonus.uuid: idx for idx, bonus in enumerate(bonuses)}
     bonus_statuses = [
         BonusStatus(
             bonus_uuid=bonus.uuid, 
@@ -2634,17 +2639,13 @@ def getinitialstate(game_config):
         ) 
         for bonus in bonuses
     ]
+    
+    starting_decks=[Deck.__fromdict__(x.__todict__()) for x in decks]
+    starting_piles=[Pile.__fromdict__(x.__todict__()) for x in piles]
 
     state = State(
         idx2path=idx2path,
         bonus_statuses=bonus_statuses,
-        bonusuuid2bonusidx=bonusuuid2bonusidx,
-        starting_decks=[
-            Deck.__fromdict__(x.__todict__()) for x in decks
-        ],
-        starting_piles=[
-            Pile.__fromdict__(x.__todict__()) for x in piles
-        ],
         history=[],
         player_scores=[PlayerScore2(public_items=[], private_items=[]) for _ in range(game_config.num_players)],
         player_graphs=[
@@ -2679,6 +2680,8 @@ def getinitialstate(game_config):
         player_idxs=state.player_idxs,
         history=state.history,
         player_scores=state.player_scores,
+        starting_decks=starting_decks,
+        starting_piles=starting_piles,
     )
 
     state = state.set(kernel=kernel)
@@ -2736,7 +2739,7 @@ def score_public_items(state, player_idx):
                             )
                         )
     for bonus_status in state.bonus_statuses:
-        bonus_idx = state.bonusuuid2bonusidx.get(bonus_status.bonus_uuid)
+        bonus_idx = state.kernel.bonusuuid2bonusidx.get(bonus_status.bonus_uuid)
         bonus = state.kernel.game_config.fig.board_config.bonuses[bonus_idx] if bonus_idx is not None else None
         if bonus:
             if player_idx in bonus_status.winners:
@@ -4099,6 +4102,8 @@ def getnextstate2(s, a, log=False):
         player_idxs=s.player_idxs,
         history=s.history,
         player_scores=s.player_scores,
+        starting_decks=s.kernel.starting_decks,
+        starting_piles=s.kernel.starting_piles,
     )
     s = s.set(legal_actions_3=calc_legal_actions3(state_kernel))
 
@@ -4270,8 +4275,8 @@ def getpublicstate(s):
         all_pieces=list(s.kernel.pieceuuid2piece.values()),
         to_play_2=getpublictoplay(s),
         bonus_statuses=s.bonus_statuses,
-        starting_decks=s.starting_decks,
-        starting_piles=s.starting_piles,
+        starting_decks=s.kernel.starting_decks,
+        starting_piles=s.kernel.starting_piles,
         history=get_public_history(s),
         player_scores=get_public_player_scores(s),
         player_graphs=s.player_graphs,

{graph_games_proto-0.3.1981.dist-info → graph_games_proto-0.3.1986.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graph_games_proto
-Version: 0.3.1981
+Version: 0.3.1986
 Requires-Dist: multipledispatch==1.0.0
 Requires-Dist: pyrsistent==0.20.0
 Requires-Dist: numpy==2.2.4

{graph_games_proto-0.3.1981.dist-info → graph_games_proto-0.3.1986.dist-info}/RECORD

@@ -1,9 +1,9 @@
 graph_games_proto/__init__.py,sha256=_EVQR-51XehfH45XZlba1WPdx3omS3Gm1nTwrgGyn2Q,667
 graph_games_proto/all_types.py,sha256=IpbwftEcHS5Ewz-saFNk0lO9FvcbuHG36odRTayCXUk,54911
-graph_games_proto/fns.py,sha256=jK1eZUO8OtrzJUpRs2uNOtelhaZZwGphkw59CpbTSUE,182177
+graph_games_proto/fns.py,sha256=CfVDjz6q53feWv71XmCFGOGFI40s8Op0jiq6BzEuVLI,182494
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1981.dist-info/METADATA,sha256=CD2Hb9yHEm9IyX0_vrROdZ9iqn6TSZuBJeaDqo3HZ18,188
-graph_games_proto-0.3.1981.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1981.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1981.dist-info/RECORD,,
+graph_games_proto-0.3.1986.dist-info/METADATA,sha256=idZgHPywS8D8vXzhRPJefE30f5kr5NrL1MeSjcbDtgI,188
+graph_games_proto-0.3.1986.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1986.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1986.dist-info/RECORD,,