graph-games-proto 0.3.2078__py3-none-any.whl → 0.3.2083__py3-none-any.whl

graph_games_proto/fns.py

@@ -2053,7 +2053,9 @@ class BonusStatus(PClass):
 
 class StateKernel(PClass):
     rng = field(type=random.Random)
-    game_config = field(type=GameConfig)
+    fig = field(type=Fig)
+    num_players = field(type=int)
+    started_at = field(type=str)
 
     uuid2edgerecord = field(type=dict)  # Dict[str, BiEdgeRecord]
     uuid2segmentrecord = field(type=dict)  # Dict[str, SegmentRecord]
@@ -2082,7 +2084,9 @@ class StateKernel(PClass):
     def __todict__(self):
         return {
             "rng": rng2json(self.rng),
-            "game_config": self.game_config.__todict__(),
+            "fig": self.fig.__todict__(),
+            "num_players": self.num_players,
+            "started_at": self.started_at,
             "edges": [edge.__todict__() for edge in self.edges],
             "nodes": [node.__todict__() for node in self.nodes],
             "regions": [region.__todict__() for region in self.regions],
@@ -2111,7 +2115,9 @@ class StateKernel(PClass):
     def __fromdict__(d):
         return StateKernel(
             rng=json2rng(d["rng"]),
-            game_config=GameConfig.__fromdict__(d["game_config"]),
+            fig=Fig.__fromdict__(d["fig"]),
+            num_players=d["num_players"],
+            started_at=d["started_at"],
             edges=[BiEdge.__fromdict__(edge) for edge in d["edges"]],
             nodes=[Node.__fromdict__(n) for n in d["nodes"]],
             regions=[Region.__fromdict__(r) for r in d["regions"]],
@@ -2138,13 +2144,16 @@ class StateKernel(PClass):
         )
 
 
-def init_state_kernel(**kwargs):
-    rng = kwargs.get('rng')
-    game_config = kwargs.get('game_config')
-    fig = game_config.fig
+def init_state_kernel(fig, num_players, started_at, **kwargs):
     board_config = fig.board_config
-    nodes = kwargs.get('nodes', [])
-    edges = kwargs.get('edges', [])
+    rng = kwargs.get('rng')
+    nodes = kwargs.get('nodes', get_nodes(board_config))
+    nodeuuid2idx = {node.uuid: idx for idx, node in enumerate(nodes)}
+    edges = get_edges(rng, board_config, nodeuuid2idx)
+    segments = kwargs.get('segments', get_segments(board_config))
+    goals = board_config.goals
+    regions = kwargs.get('regions', [])
+
     idx2pathrecord = []
     edgeuuid2idx = {edge.uuid: idx for idx, edge in enumerate(edges)}
     for edge in edges:
@@ -2153,7 +2162,7 @@ def init_state_kernel(**kwargs):
     pieceuuid2piece = {}
     for piece_template in board_config.piece_templates:
         if piece_template.has_player:
-            for player_idx in range(game_config.num_players):
+            for player_idx in range(num_players):
                 pieces = generate_pieces(piece_template, player_idx)
                 for piece in pieces:
                     pieceuuid2piece[piece.uuid] = piece
@@ -2166,6 +2175,18 @@ def init_state_kernel(**kwargs):
             carduuid2card[card.uuid] = card
             carduuid2deckidx[card.uuid] = dek.idx
 
+    starting_piles = []
+    for piece_template in board_config.piece_templates:
+        if piece_template.has_player:
+            for player_idx in range(num_players):
+                pieces = generate_pieces(piece_template, player_idx)
+                pile = Pile(
+                    player_idx=player_idx,
+                    num_pieces=piece_template.quantity,
+                    pieces=[piece.uuid for piece in pieces],
+                )
+                starting_piles.append(pile)
+
     nodeuuid2idx = {node.uuid: idx for idx, node in enumerate(board_config.points)}
     edges = get_edges(rng, board_config, nodeuuid2idx)
     edgetuple2uuid = {}
@@ -2175,27 +2196,45 @@ def init_state_kernel(**kwargs):
         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
+    bonuses = board_config.bonuses
     bonusuuid2bonusidx = {bonus.uuid: idx for idx, bonus in enumerate(bonuses)}
     
-    player_graphs_3 = calc_player_graphs3(nodes, edges, pieceuuid2piece, game_config)
+    player_graphs_3 = calc_player_graphs3(nodes, edges, pieceuuid2piece, num_players)
 
-    segments = kwargs.get('segments', [])
     
     uuid2segmentrecord = {segment.uuid: init_segment_record(segment) for segment in segments}
     uuid2edgerecord = {edge.uuid: init_biedge_record(edge) for edge in edges}
 
+    starting_decks = []
+    for dek in board_config.deks:
+        cards = generate_cards(dek)
+        deck_obj = Deck(
+            uuid=dek.uuid,
+            idx=dek.idx,
+            units=[],
+            faceup_spots=[],
+            discard=[],
+            facedown_stack=[card.uuid for card in cards],
+        )
+        starting_decks.append(deck_obj)
+
+    default_players = [
+        Player(idx=idx, pieces=[], cards=[], discard_tray=[]) for idx in range(num_players)
+    ]
+
     return StateKernel(
+        decks=kwargs.get('decks', starting_decks),
+        piles=kwargs.get('piles', starting_piles),
+        players=kwargs.get('players', default_players),
+        player_idxs=kwargs.get('player_idxs', list(range(num_players))),
+        history=kwargs.get('history', []),
+        fig=fig,
+        num_players=num_players,
+        started_at=started_at,
         rng=rng,
-        game_config=game_config,
         edges=edges,
-        nodes=kwargs.get('nodes', []),
-        regions=kwargs.get('regions', []),
-        decks=kwargs.get('decks', []),
-        piles=kwargs.get('piles', []),
-        players=kwargs.get('players'),
-        player_idxs=kwargs.get('player_idxs'),
-        history=kwargs.get('history', []),
+        nodes=nodes,
+        regions=regions,
         uuid2edgerecord=uuid2edgerecord,
         uuid2segmentrecord=uuid2segmentrecord,
         idx2pathrecord=idx2pathrecord,
@@ -2206,9 +2245,9 @@ def init_state_kernel(**kwargs):
         nodeuuid2idx=nodeuuid2idx,
         carduuid2deckidx=carduuid2deckidx,
         bonusuuid2bonusidx=bonusuuid2bonusidx,
-        starting_decks=kwargs.get('starting_decks', []),
-        starting_piles=kwargs.get('starting_piles', []),
-        goals=kwargs.get('goals', []),
+        starting_decks=starting_decks,
+        starting_piles=starting_piles,
+        goals=goals,
         player_graphs_3=player_graphs_3,
     )
 
@@ -2702,102 +2741,18 @@ def getsettingvalue(f, setting_name):
 
 @dispatch(State, str)
 def getsettingvalue(s, setting_name):
-    return getsettingvalue(s.kernel.game_config.fig, setting_name)
+    return getsettingvalue(s.kernel.fig, setting_name)
 
 
 @dispatch(GameConfig)
 def getinitialstate(game_config):
-    rng = getrng(game_config.seed)
-    board_config = game_config.fig.board_config
-    nodes = get_nodes(board_config)
-
-    piles = []
-    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)
-                pile = Pile(
-                    player_idx=player_idx,
-                    num_pieces=piece_template.quantity,
-                    pieces=[piece.uuid for piece in pieces],
-                )
-                piles.append(pile)
-
-    decks = []
-    for dek in board_config.deks:
-        cards = generate_cards(dek)
-        deck_obj = Deck(
-            uuid=dek.uuid,
-            idx=dek.idx,
-            units=[],
-            faceup_spots=[],
-            discard=[],
-            facedown_stack=[card.uuid for card in cards],
-        )
-        decks.append(deck_obj)
-
-    # bonuses = game_config.fig.board_config.bonuses
-    # bonus_statuses = [
-    #     BonusStatus(
-    #         bonus_uuid=bonus.uuid, 
-    #         winners=[],
-    #         player_statuses=[
-    #             BonusPlayerStatus(
-    #                 player_idx=player_idx,
-    #                 score=0,
-    #                 longest_trail=None,
-    #             )
-    #             for player_idx in range(game_config.num_players)
-    #         ]
-    #     ) 
-    #     for bonus in bonuses
-    # ]
-
-    # state = State(
-    #     bonus_statuses=bonus_statuses,
-    #     history=[],
-    #     player_scores=[PlayerScore2(public_items=[], private_items=[]) for _ in range(game_config.num_players)],
-    #     player_graphs=[
-    #         PlayerGraph(
-    #             player_idx=player_idx, 
-    #             neighbors=[[] for _ in range(len(nodes))]
-    #         ) for player_idx in range(game_config.num_players)
-    #     ],
-    #     nodes = nodes,
-    #     edges = edges,
-    #     regions = get_regions(board_config),
-    #     legal_actions_3=[],
-    #     piles=piles,
-    #     players=[Player(idx=idx, pieces=[], cards=[], discard_tray=[]) for idx in range(game_config.num_players)],
-    #     player_idxs=list(range(game_config.num_players)),
-    #     decks=decks,
-    #     rng=rng,
-    #     last_to_play=None,
-    #     winners=[],
-    # )
-
-    nodeuuid2idx = {node.uuid: idx for idx, node in enumerate(board_config.points)}
-    edges = get_edges(rng, board_config, nodeuuid2idx)
-    
     kernel = init_state_kernel(
-        rng=rng,
-        game_config=game_config,
-        segments=get_segments(board_config),
-        edges=edges,
-        nodes=nodes,
-        decks=decks,
-        piles=piles,
-        players=[Player(idx=idx, pieces=[], cards=[], discard_tray=[]) for idx in range(game_config.num_players)],
-        player_idxs=list(range(game_config.num_players)),
-        history=[],
-        player_scores=[PlayerScore2(public_items=[], private_items=[]) for _ in range(game_config.num_players)],
-        starting_decks=[Deck.__fromdict__(x.__todict__()) for x in decks],
-        starting_piles=[Pile.__fromdict__(x.__todict__()) for x in piles],
-        goals=board_config.goals,
+        game_config.fig,
+        game_config.num_players,
+        game_config.started_at,
+        rng=getrng(game_config.seed),
     )
-
     kernel = run_kernel_hooks(kernel, INITIALIZATION_HOOKS, True)
-
     return init_memoized_state(kernel)
 
 
@@ -2822,7 +2777,7 @@ def memoize_state(state):
 def calc_bonus_statuses3(kernel):
     bonus_statuses = [
         calc_bonus_status3(kernel, bonus)
-        for bonus in kernel.game_config.fig.board_config.bonuses
+        for bonus in kernel.fig.board_config.bonuses
     ]
     bonus_statuses = [bs for bs in bonus_statuses if bs is not None]
     return bonus_statuses
@@ -2898,7 +2853,7 @@ def score_public_items3(state, player_idx):
                         )
     for bonus_status in state.bonus_statuses_3:
         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
+        bonus = state.kernel.fig.board_config.bonuses[bonus_idx] if bonus_idx is not None else None
         if bonus:
             if player_idx in bonus_status.winners:
                 items.append(
@@ -2934,7 +2889,7 @@ def score_public_items(state, player_idx):
                         )
     for bonus_status in state.bonus_statuses:
         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
+        bonus = state.kernel.fig.board_config.bonuses[bonus_idx] if bonus_idx is not None else None
         if bonus:
             if player_idx in bonus_status.winners:
                 items.append(
@@ -3097,7 +3052,7 @@ def get_bonus_status_longest_trail3(kernel, bonus):
     winners = []
     player_longest_trail_lens = []
 
-    for player_idx in range(kernel.game_config.num_players):
+    for player_idx in range(kernel.num_players):
         trail_length = get_longest_path_length3(kernel, player_idx)
         player_longest_trail_lens.append(trail_length)
         if trail_length > longest_trail:
@@ -3129,7 +3084,7 @@ def get_bonus_status_longest_trail(state, bonus):
     winners = []
     player_longest_trail_lens = []
 
-    for player_idx in range(state.kernel.game_config.num_players):
+    for player_idx in range(state.kernel.num_players):
         trail_length = get_longest_path_length(state, player_idx)
         player_longest_trail_lens.append(trail_length)
         if trail_length > longest_trail:
@@ -3159,7 +3114,7 @@ def get_bonus_status_longest_trail(state, bonus):
 def handle_bonus_statuses(state):
     bonus_statuses = [
         calc_bonus_status(state, bonus)
-        for bonus in state.kernel.game_config.fig.board_config.bonuses
+        for bonus in state.kernel.fig.board_config.bonuses
     ]
     # Remove all None bonus statuses
     bonus_statuses = [bs for bs in bonus_statuses if bs is not None]
@@ -3522,7 +3477,7 @@ def find_player_with_longest_path(kernel):
     longest_path_player_idx = None
     longest_path_length = 0
 
-    for player_idx in range(kernel.game_config.num_players):
+    for player_idx in range(kernel.num_players):
         path_length = get_longest_path_length(kernel, player_idx)
         if path_length > longest_path_length:
             longest_path_length = path_length
@@ -3749,18 +3704,17 @@ def calc_player_graph3(nodes, edges, pieceuuid2piece, player_idx):
 
 
 def calc_player_graphs(state):
-    game_config = state.kernel.game_config
     return [
         calc_player_graph(state, player_idx) 
-        for player_idx in range(game_config.num_players)
+        for player_idx in range(state.kernel.num_players)
     ]
 
 
-@dispatch(list, list, dict, GameConfig)
-def calc_player_graphs3(nodes, edges, pieceuuid2piece, game_config):
+@dispatch(list, list, dict, int)
+def calc_player_graphs3(nodes, edges, pieceuuid2piece, num_players):
     return [
         calc_player_graph3(nodes, edges, pieceuuid2piece, player_idx)
-        for player_idx in range(game_config.num_players)
+        for player_idx in range(num_players)
     ]
 
 
@@ -4096,7 +4050,7 @@ def is_path_open_to_player(state_kernel, path_idx, player_idx):
     player_idxs_on_edge = get_player_idxs_on_edge(state_kernel, edge_record)
 
     # Check if edge is too crowded for the number of players
-    if state_kernel.game_config.num_players <= 3:
+    if state_kernel.num_players <= 3:
         if len(player_idxs_on_edge) > 0:
             return False
         
@@ -4569,7 +4523,7 @@ def getpublictoplay(s):
 def get_max_allotted_times(s):
     return [
         get_player_max_allotted_time(s, player_idx) 
-        for player_idx in range(s.kernel.game_config.num_players)
+        for player_idx in range(s.kernel.num_players)
     ]
 
 
@@ -4595,7 +4549,7 @@ def get_deadline(s, max_allotted_time):
     since_action_idx = max_allotted_time.since_action_idx
     if since_action_idx == -1:
         allotted_since = datetime.strptime(
-            s.kernel.game_config.started_at, 
+            s.kernel.started_at, 
             "%Y-%m-%d %H:%M:%S"
         )
     else:
@@ -4614,7 +4568,7 @@ def get_deadline(s, max_allotted_time):
 @dispatch(State)
 def get_deadlines(s):
     if isterminal(s):
-        return [None for _ in range(s.kernel.game_config.num_players)]
+        return [None for _ in range(s.kernel.num_players)]
     return [
         get_deadline(s, max_allotted_time)
         for max_allotted_time in get_max_allotted_times(s)
@@ -4676,21 +4630,16 @@ def imagine_decks(public_state, private_state):
 
 
 def imagine_state(public_state, private_state):
-    game_config = public_state.game_config
     imagined_kernel = init_state_kernel(
+        fig=public_state.fig,
         rng=random.Random(),
-        game_config=game_config,
         edges=public_state.edges,
         nodes=public_state.nodes,
         piles=public_state.piles,
+        player_idxs=public_state.player_idxs,
         decks=imagine_decks(public_state, private_state),
         players=imagine_players(public_state, private_state),
-        player_idxs=public_state.player_idxs,
         history=imagine_history(public_state, private_state),
-        player_scores=imagine_player_scores(public_state, private_state),
-        starting_decks=[Deck.__fromdict__(x.__todict__()) for x in decks],
-        starting_piles=[Pile.__fromdict__(x.__todict__()) for x in public_state.piles],
-        goals=game_config.fig.board_config.goals,
     )
     return init_memoized_state(imagined_kernel)
 
@@ -4749,7 +4698,7 @@ def getpublicstate(s):
 
     return PublicState(
         deadlines=get_deadlines(s),
-        game_started_at=s.kernel.game_config.started_at,
+        game_started_at=s.kernel.started_at,
         allotted_times=get_max_allotted_times(s),
         all_pieces=list(s.kernel.pieceuuid2piece.values()),
         to_play_2=getpublictoplay(s),
@@ -4787,10 +4736,10 @@ def getpublicdeck(s, d):
 
 @dispatch(State, Player)
 def getpublicplayer(s, p):
-    deck_counts = [0 for _ in s.kernel.game_config.fig.board_config.deks]
+    deck_counts = [0 for _ in s.kernel.fig.board_config.deks]
     for card in p.cards:
         deck_counts[s.kernel.carduuid2card[card].deck_idx] += 1
-    piece_template_counts = [0 for _ in s.kernel.game_config.fig.board_config.piece_templates]
+    piece_template_counts = [0 for _ in s.kernel.fig.board_config.piece_templates]
     for piece_uuid in p.pieces:
         piece_template_counts[s.kernel.pieceuuid2piece[piece_uuid].piece_template_idx] += 1
     return PublicPlayer(
@@ -4834,10 +4783,10 @@ def getpublicscore(s, player_idx):
         path_lens = getplayerpathlens(s, player_idx)
         if not path_lens:
             return 0
-        addends.append(sum(s.kernel.game_config.fig.path_scores[len] for len in path_lens))
+        addends.append(sum(s.kernel.fig.path_scores[len] for len in path_lens))
     
     if getsettingvalue(s, 'cluster_scoring'):
-        clusters = s.kernel.game_config.fig.board_config.clusters
+        clusters = s.kernel.fig.board_config.clusters
         uuid2cluster = {x.uuid: x for x in clusters}
         completed_clusters = s.player_hands[player_idx].completed_clusters
         cluster_scores = [uuid2cluster[cluster_uuid].score for cluster_uuid in completed_clusters]
@@ -4860,7 +4809,7 @@ def getplayerpathlens(s, player_idx):
 # Implementing the following Julia function:
 # getpathlens(s::State) = length.(getfield.(getfield.(s.fig.board_config.board_paths, :path), :segments))
 def getpathlens(s):
-    return [len(p.path.segments) for p in s.kernel.game_config.fig.board_config.board_paths]
+    return [len(p.path.segments) for p in s.kernel.fig.board_config.board_paths]
 
 # Implementing the following Julia function:
 # function getplayerpathidxs(s::State, player_idx::Int)
@@ -4900,7 +4849,7 @@ def getactiontype(action_name):
 
 
 # Function implements the following Julia function:
-# getlastplayeridxplus1(s) = mod1(getlastaction(s).player_idx + 1, s.kernel.game_config.num_players)
+# getlastplayeridxplus1(s) = mod1(getlastaction(s).player_idx + 1, s.kernel.num_players)
 def getlastplayeridxplus1(s):
     pass
 
@@ -5073,7 +5022,7 @@ def combinations(a, n=None):
 def getpotentialpathidxs(s, player_num):
     num_pieces = s.player_hands[player_num-1].num_pieces
     return list(
-        set(getpathidxs(s.kernel.game_config.fig, num_pieces)) - set(getunavailablepathidxs(s, player_num))
+        set(getpathidxs(s.kernel.fig, num_pieces)) - set(getunavailablepathidxs(s, player_num))
     )
     # return list(set(getpathidxs(s.fig, num_pieces)) - set(getunavailablepaths(s, player_num)))
 
@@ -5137,16 +5086,16 @@ def getunavailablepathidxs(s, player_idx):
     link2paths = {}
     path2link = {}
 
-    for board_path in s.kernel.game_config.fig.board_config.board_paths:
+    for board_path in s.kernel.fig.board_config.board_paths:
         link_idx = board_path.link_num - 1
         if link_idx not in link2paths:
             link2paths[link_idx] = []
         link2paths[link_idx].append(board_path.num-1)
         path2link[board_path.num-1] = link_idx
 
-    multipath_links = [(board_link.num-1) for board_link in getmultipathlinks(s.kernel.game_config.fig)]
+    multipath_links = [(board_link.num-1) for board_link in getmultipathlinks(s.kernel.fig)]
 
-    if s.kernel.game_config.num_players < 4:
+    if s.kernel.num_players < 4:
         blocking_hands = s.player_hands
     else:
         blocking_hands = [s.player_hands[player_idx]]
@@ -5652,7 +5601,7 @@ def getqproxy0(ps, a, td):
             return rewards
         v_proxies = [
             getvproxy0(getprivatestate(next_s, i))
-            for i in range(next_s.kernel.game_config.num_players)
+            for i in range(next_s.kernel.num_players)
         ]
         q_proxies = [
             r + v_proxies[i]

{graph_games_proto-0.3.2078.dist-info → graph_games_proto-0.3.2083.dist-info}/METADATA

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

{graph_games_proto-0.3.2078.dist-info → graph_games_proto-0.3.2083.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=_1ih4jhg9LtO2OTx5Bo3Xa5G7o43XWEa1jFty_f1lF0,201156
+graph_games_proto/fns.py,sha256=slh5o58-rqAxEznKOvrkh4L0F6VLlHEnuValIVOXGlA,198791
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.2078.dist-info/METADATA,sha256=45PxNh56O2ygcfAq64cbl5dlm4if0pHZURIMCkBCPfU,188
-graph_games_proto-0.3.2078.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.2078.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.2078.dist-info/RECORD,,
+graph_games_proto-0.3.2083.dist-info/METADATA,sha256=EMIRl_Ci0n9s0m0pVHz4TiJcp4ODBQjCsi3otnaoPms,188
+graph_games_proto-0.3.2083.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.2083.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.2083.dist-info/RECORD,,