graph-games-proto 0.3.1916__py3-none-any.whl → 0.3.1918__py3-none-any.whl

graph_games_proto/fns.py

@@ -1932,10 +1932,98 @@ class BonusStatus(PClass):
         )
 
 
+class StateKernal(PClass):
+    rng = field(type=random.Random)
+    game_config = field(type=GameConfig)
+    edges = field(type=list)  # List[BiEdge]
+    decks = field(type=list)  # List[Deck]
+    piles = field(type=list)  # List[Pile]
+    players = field(type=list)  # List[Player]
+    player_idxs = field(type=list)  # List[int]
+    history = field(type=list)  # List[PublicAction]
+    player_scores = field(type=list)  # List[PlayerScore]
+    idx2path = field(type=list)  # List[Path2]
+    pieceuuid2piece = field(type=dict)  # Dict[str, Piece]
+    edgeuuid2idx = field(type=dict)  # Dict[str, int]
+    carduuid2card = field(type=dict)  # Dict[str, Card]
+    def __todict__(self):
+        return {
+            "rng": rng2json(self.rng),
+            "game_config": self.game_config.__todict__(),
+            "edges": [edge.__todict__() for edge in self.edges],
+            "decks": [deck.__todict__() for deck in self.decks],
+            "piles": [pile.__todict__() for pile in self.piles],
+            "players": [player.__todict__() for player in self.players],
+            "player_idxs": self.player_idxs,
+            "history": [action.__todict__() for action in self.history],
+            "player_scores": [score.__todict__() for score in self.player_scores],
+            "idx2path": [v.__todict__() for v in self.idx2path],
+            "pieceuuid2piece": {k: v.__todict__() for k, v in self.pieceuuid2piece.items()},
+            "edgeuuid2idx": self.edgeuuid2idx,
+            "carduuid2card": {k: v.__todict__() for k, v in self.carduuid2card.items()},
+        }
+    @staticmethod
+    def __fromdict__(d):
+        return StateKernal(
+            rng=json2rng(d["rng"]),
+            game_config=GameConfig.__fromdict__(d["game_config"]),
+            edges=[BiEdge.__fromdict__(edge) for edge in d["edges"]],
+            decks=[Deck.__fromdict__(deck) for deck in d["decks"]],
+            piles=[Pile.__fromdict__(pile) for pile in d["piles"]],
+            players=[Player.__fromdict__(player) for player in d["players"]],
+            player_idxs=d["player_idxs"],
+            history=[PublicAction.__fromdict__(action) for action in d["history"]],
+            player_scores=[PlayerScore.__fromdict__(score) for score in d["player_scores"]],
+            idx2path=[Path2.__fromdict(v) for v in d["idx2path"]],
+            pieceuuid2piece={k: Piece.__fromdict(v) for k, v in d["pieceuuid2piece"].items()},
+            edgeuuid2idx=d["edgeuuid2idx"],
+            carduuid2card={k: Card.__fromdict(v) for k, v in d["carduuid2card"].items()},
+        )
+
+
+def init_state_kernal(**kwargs):
+    game_config = kwargs.get('game_config')
+    fig = game_config.fig
+    board_config = fig.board_config
+    edges = kwargs.get('edges', [])
+    idx2path = []
+    edgeuuid2idx = {edge.uuid: idx for idx, edge in enumerate(edges)}
+    for edge in edges:
+        for path in edge.paths:
+            idx2path.append(path)
+    pieceuuid2piece = {}
+    for piece_template in board_config.piece_templates:
+        if piece_template.has_player:
+            for player_idx in range(game_config.num_players):
+                pieces = generate_pieces(piece_template, player_idx)
+                for piece in pieces:
+                    pieceuuid2piece[piece.uuid] = piece
+    carduuid2card = {}
+    for dek in board_config.deks:
+        cards = generate_cards(dek)
+        for card in cards:
+            carduuid2card[card.uuid] = card
+    
+    return StateKernal(
+        rng=kwargs.get('rng'),
+        game_config=game_config,
+        edges=edges,
+        decks=kwargs.get('decks'),
+        piles=kwargs.get('piles'),
+        players=kwargs.get('players'),
+        player_idxs=kwargs.get('player_idxs'),
+        history=kwargs.get('history'),
+        player_scores=kwargs.get('player_scores'),
+        idx2path=idx2path,
+        edgeuuid2idx=edgeuuid2idx,
+        carduuid2card=carduuid2card,
+        pieceuuid2piece=pieceuuid2piece,
+    )
+
+
 class State(PClass):
-    uuid2edge = field(type=dict)  # Dict[str, BiEdge]
+    kernal = field(type=StateKernal)
     idx2path = field(type=list)  # List[Path2]
-    uuid2segment = field(type=dict)  # Dict[str, Segment]
     pieceuuid2piece = field(type=dict)  # Dict[str, Piece]
     carduuid2card = field(type=dict)  # Dict[str, Card]
     bonus_statuses = field(type=list)  # List[BonusStatus]
@@ -1964,9 +2052,8 @@ class State(PClass):
     winners = field(type=list)  # List[int]
     def __todict__(self):
         return {
-            "uuid2edge": {k: v.__todict__() for k, v in self.uuid2edge.items()},
+            "kernal": self.kernal.__todict__(),
             "idx2path": [v.__todict__() for v in self.idx2path],
-            "uuid2segment": {k: v.__todict__() for k, v in self.uuid2segment.items()},
             "pieceuuid2piece": {k: v.__todict__() for k, v in self.pieceuuid2piece.items()},
             "carduuid2card": {k: v.__todict__() for k, v in self.carduuid2card.items()},
             "bonus_statuses": [status.__todict__() for status in self.bonus_statuses],
@@ -1997,9 +2084,8 @@ class State(PClass):
     @staticmethod
     def __fromdict__(d):
         return State(
-            uuid2edge={k: BiEdge.__fromdict__(v) for k, v in d["uuid2edge"].items()},
+            kernal=StateKernal.__fromdict__(d["kernal"]),
             idx2path=[Path2.__fromdict__(v) for v in d["idx2path"]],
-            uuid2segment={k: Segment2.__fromdict__(v) for k, v in d["uuid2segment"].items()},
             pieceuuid2piece={k: Piece.__fromdict__(v) for k, v in d["pieceuuid2piece"].items()},
             carduuid2card={k: Card.__fromdict__(v) for k, v in d["carduuid2card"].items()},
             bonus_statuses=[BonusStatus.__fromdict__(x) for x in d["bonus_statuses"]],
@@ -2533,17 +2619,11 @@ def getinitialstate(game_config):
         edge_tuple = (min(node_1_idx, node_2_idx), max(node_1_idx, node_2_idx))
         edgetuple2uuid[edge_tuple] = edge.uuid
 
-
-    uuid2edge = {}
     idx2path = []
-    uuid2segment = {}
     
     for edge in edges:
-        uuid2edge[edge.uuid] = edge
         for path in edge.paths:
             idx2path.append(path)
-            for segment in path.segments:
-                uuid2segment[segment.uuid] = segment
 
     bonuses = game_config.fig.board_config.bonuses
     bonusuuid2bonusidx = {bonus.uuid: idx for idx, bonus in enumerate(bonuses)}
@@ -2564,9 +2644,7 @@ def getinitialstate(game_config):
     ]
 
     state = State(
-        uuid2edge=uuid2edge,
         idx2path=idx2path,
-        uuid2segment=uuid2segment,
         pieceuuid2piece=pieceuuid2piece,
         carduuid2card=carduuid2card,
         bonus_statuses=bonus_statuses,
@@ -2606,7 +2684,7 @@ def getinitialstate(game_config):
 
     state = run_state_hooks(state, INITIALIZATION_HOOKS, True)
     
-    state_kernal = init_state_kernal(
+    kernal = init_state_kernal(
         rng=rng,
         game_config=state.game_config,
         edges=state.edges,
@@ -2617,7 +2695,9 @@ def getinitialstate(game_config):
         history=state.history,
         player_scores=state.player_scores,
     )
-    state = state.set(legal_actions_3=calc_legal_actions3(state_kernal))
+
+    state = state.set(kernal=kernal)
+    state = state.set(legal_actions_3=calc_legal_actions3(kernal))
 
     return state
 
@@ -4142,69 +4222,26 @@ def get_next_player_shuffled_idx(state_kernal, last_action):
     return next_player_shuffled_idx
 
 
-class StateKernal(PClass):
-    rng = field(type=random.Random)
-    game_config = field(type=GameConfig)
-    edges = field(type=list)  # List[BiEdge]
-    decks = field(type=list)  # List[Deck]
-    piles = field(type=list)  # List[Pile]
-    players = field(type=list)  # List[Player]
-    player_idxs = field(type=list)  # List[int]
-    history = field(type=list)  # List[PublicAction]
-    player_scores = field(type=list)  # List[PlayerScore]
-    uuid2edge = field(type=dict)  # Dict[str, BiEdge]
-    idx2path = field(type=list)  # List[Path2]
-    uuid2segment = field(type=dict)  # Dict[str, Segment]
-    pieceuuid2piece = field(type=dict)  # Dict[str, Piece]
-    edgeuuid2idx = field(type=dict)  # Dict[str, int]
-    carduuid2card = field(type=dict)  # Dict[str, Card]
-
-
-def init_state_kernal(**kwargs):
-    game_config = kwargs.get('game_config')
-    fig = game_config.fig
-    board_config = fig.board_config
-    edges = kwargs.get('edges', [])
-    uuid2edge = {}
-    idx2path = []
-    uuid2segment = {}
-    edgeuuid2idx = {edge.uuid: idx for idx, edge in enumerate(edges)}
-    for edge in edges:
-        uuid2edge[edge.uuid] = edge
-        for path in edge.paths:
-            idx2path.append(path)
-            for segment in path.segments:
-                uuid2segment[segment.uuid] = segment
-    pieceuuid2piece = {}
-    for piece_template in board_config.piece_templates:
-        if piece_template.has_player:
-            for player_idx in range(game_config.num_players):
-                pieces = generate_pieces(piece_template, player_idx)
-                for piece in pieces:
-                    pieceuuid2piece[piece.uuid] = piece
-    carduuid2card = {}
-    for dek in board_config.deks:
-        cards = generate_cards(dek)
-        for card in cards:
-            carduuid2card[card.uuid] = card
-    
-    return StateKernal(
-        rng=kwargs.get('rng'),
-        game_config=game_config,
-        edges=edges,
-        decks=kwargs.get('decks'),
-        piles=kwargs.get('piles'),
-        players=kwargs.get('players'),
-        player_idxs=kwargs.get('player_idxs'),
-        history=kwargs.get('history'),
-        player_scores=kwargs.get('player_scores'),
-        uuid2edge=uuid2edge,
-        idx2path=idx2path,
-        uuid2segment=uuid2segment,
-        edgeuuid2idx=edgeuuid2idx,
-        carduuid2card=carduuid2card,
-        pieceuuid2piece=pieceuuid2piece,
+def init_state(kernal):
+    state = State(
+        rng=kernal.rng,
+        game_config=kernal.game_config,
+        edges=kernal.edges,
+        decks=kernal.decks,
+        piles=kernal.piles,
+        players=kernal.players,
+        player_idxs=kernal.player_idxs,
+        history=kernal.history,
+        player_scores=kernal.player_scores,
+        legal_actions_3=[],
+        is_terminal=False,
+        idx2path=kernal.idx2path,
+        pieceuuid2piece=kernal.pieceuuid2piece,
+        edgeuuid2idx=kernal.edgeuuid2idx,
+        carduuid2card=kernal.carduuid2card,
     )
+    state = state.set(legal_actions_3=calc_legal_actions3(kernal))
+    return state
 
 
 def getnextstate2(s, a, log=False):
@@ -4352,10 +4389,6 @@ def get_public_history(s):
     return [action.get_public(s) for action in s.history]
 
 
-def imagine_rng():
-    return random.Random()
-
-
 def imagine_history(public_state, private_state):
     pass
 
@@ -4374,7 +4407,7 @@ def imagine_decks(public_state, private_state):
 
 def imagine_state(public_state, private_state):
     kernal = init_state_kernal(
-        rng=imagine_rng(),
+        rng=random.Random(),
         game_config=public_state.game_config,
         player_idxs=public_state.player_idxs,
         piles=public_state.piles,

{graph_games_proto-0.3.1916.dist-info → graph_games_proto-0.3.1918.dist-info}/METADATA

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

{graph_games_proto-0.3.1916.dist-info → graph_games_proto-0.3.1918.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=W7tRrFF1jmt6x8BD5HOomrwiRJ6xWjMyhlD5OAw6jUQ,190223
+graph_games_proto/fns.py,sha256=tlnr9TsZohGevs4lUqAPaF7qPknJWnzH_jmEpiEKITc,191851
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1916.dist-info/METADATA,sha256=tx8X1XVD9ogkC-atGxhajgT-xu_FTZPH7-EkYfmTWUI,188
-graph_games_proto-0.3.1916.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1916.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1916.dist-info/RECORD,,
+graph_games_proto-0.3.1918.dist-info/METADATA,sha256=NpjVzxy7lmO0xpfAdfDo4G-bVCE-cbsPXrvvRd9M_cQ,188
+graph_games_proto-0.3.1918.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1918.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1918.dist-info/RECORD,,