graph-games-proto 0.3.1930__py3-none-any.whl → 0.3.1934__py3-none-any.whl

graph_games_proto/fns.py

@@ -2037,7 +2037,6 @@ class State(PClass):
     nodes = field(type=list)  # List[Node]
     nodeuuid2idx = field(type=dict)  # Dict[str, int]
     edges = field(type=list)  # List[BiEdge]
-    edgeuuid2idx = field(type=dict)  # Dict[str, int]
     edgetuple2uuid = field(type=dict)  # Dict[Tuple[int, int], str]
     regions = field(type=list)  # List[Region]
     legal_actions_3 = field(type=list)  # List[LegalAction]
@@ -2066,7 +2065,6 @@ class State(PClass):
             "nodes": [node.__todict__() for node in self.nodes],
             "nodeuuid2idx": self.nodeuuid2idx,
             "edges": [edge.__todict__() for edge in self.edges],
-            "edgeuuid2idx": self.edgeuuid2idx,
             "edgetuple2uuid": [{"k": list(k), "v": v} for k, v in self.edgetuple2uuid.items()],
             "regions": [region.__todict__() for region in self.regions],
             "legal_actions_3": [x.__todict__() for x in self.legal_actions_3],
@@ -2097,7 +2095,6 @@ class State(PClass):
             nodes=[Node.__fromdict__(n) for n in d["nodes"]],
             nodeuuid2idx=d["nodeuuid2idx"],
             edges=[BiEdge.__fromdict__(e) for e in d["edges"]],
-            edgeuuid2idx=d["edgeuuid2idx"],
             edgetuple2uuid={tuple(item["k"]): item["v"] for item in d["edgetuple2uuid"]},
             regions=[Region.__fromdict__(r) for r in d["regions"]],
             legal_actions_3=[LegalAction.__fromdict__(x) for x in d["legal_actions_3"]],
@@ -2606,7 +2603,6 @@ def getinitialstate(game_config):
 
     nodeuuid2idx = {node.uuid: idx for idx, node in enumerate(board_config.points)}
     edges = get_edges(rng, board_config, nodeuuid2idx)
-    edgeuuid2idx = {edge.uuid: idx for idx, edge in enumerate(edges)}
     edgetuple2uuid = {}
     for edge in edges:
         node_1_idx = nodeuuid2idx[edge.node_1_uuid]
@@ -2662,7 +2658,6 @@ def getinitialstate(game_config):
         nodes = nodes,
         nodeuuid2idx = nodeuuid2idx,
         edges = edges,
-        edgeuuid2idx = edgeuuid2idx,
         edgetuple2uuid = edgetuple2uuid,
         regions = get_regions(board_config),
         legal_actions_3=[],
@@ -2997,8 +2992,8 @@ def handle_draw_action(game, action):
     )
 
     # TODO: extract this out to user-defined function/hook
-    if draw.quantity == 1:
-        game = append_follow_up_draw_legal_actions(game, action)
+    # if draw.quantity == 1:
+    #     game = append_follow_up_draw_legal_actions(game, action)
 
     return game
 
@@ -3017,22 +3012,6 @@ def handle_draw_discard_action(game, action):
     for _ in range(draw_discard.quantity):
         drawn_card = deck.facedown_stack.pop()
         player.discard_tray.append(drawn_card)
-    
-    game = append_to_legal_actions(
-        game,
-        LegalAction(
-            player_idx=player.idx,
-            name="GOAL-KEEP",
-            instruction="Your move. Please select the routes you want to keep.",
-            allotted_seconds=INITIAL_ALLOTTED_SECONDS,
-            allotted_since_action_idx=(len(game.history) - 1),
-            keep=LegalActionKeep(
-                deck_idx=draw_discard.deck_idx,
-                min=draw_discard.min,
-                max=draw_discard.max,
-            )
-        )
-    )
 
     return game.set(
         players=game.players,
@@ -3083,50 +3062,6 @@ def get_follow_up_draw_legal_actions(game, action):
     return to_return
 
 
-def append_follow_up_draw_legal_actions(game, action):
-    legal_action = action.legal_action
-    if len(game.history) >= 2:
-        last_action = game.history[-2]
-        if (last_action.legal_action.player_idx != legal_action.player_idx) or last_action.legal_action.name == "INITIAL-GOAL-KEEP":
-            
-            if len(game.decks[0].facedown_stack) >= 1:
-                game = append_to_legal_actions(
-                    game,
-                    LegalAction(
-                        auto_preferred=True,
-                        player_idx=legal_action.player_idx,
-                        name="DRAW",
-                        instruction="draw a unit",
-                        allotted_seconds=DEFAULT_ALLOTTED_SECONDS,
-                        allotted_since_action_idx=(len(game.history) - 1),
-                        draw=LegalActionDraw(
-                            deck_idx=0,
-                            quantity=1,
-                        )
-                    )
-                )
-            
-            for card_uuid in game.decks[0].faceup_spots:
-                if card_uuid:
-                    if not game.kernel.carduuid2card[card_uuid].is_wild:
-                        game = append_to_legal_actions(
-                            game,
-                            LegalAction(
-                                player_idx=legal_action.player_idx,
-                                name="FACEUP-DRAW",
-                                instruction="draw a faceup unit",
-                                allotted_seconds=DEFAULT_ALLOTTED_SECONDS,
-                                allotted_since_action_idx=(len(game.history) - 1),
-                                faceup_draw=LegalActionFaceupDraw(
-                                    deck_idx=0,
-                                    card_uuid=card_uuid,
-                                )
-                            )
-                        )
-    
-    return game
-
-
 def get_num_faceup_wilds(game, deck_idx):
     deck = game.decks[deck_idx]
     non_empty_spots = [spot for spot in deck.faceup_spots if spot]
@@ -3178,9 +3113,9 @@ def handle_faceup_draw_action(game, action):
     game = replenish_faceup_spot_if_needed(game, faceup_draw.deck_idx, spot_idx)
 
     # Prevent an extra draw if last draw was a face-wild-draw
-    if not game.kernel.carduuid2card[drawn_card].is_wild:
-        # TODO: extract this out to user-defined function/hook
-        game = append_follow_up_draw_legal_actions(game, action)
+    # if not game.kernel.carduuid2card[drawn_card].is_wild:
+    #     # TODO: extract this out to user-defined function/hook
+    #     game = append_follow_up_draw_legal_actions(game, action)
 
     return game.set(
         players=game.players,
@@ -3598,27 +3533,6 @@ def deal_cards_to_each_player(game, deck_idx, num_cards):
     return game.set(players=game.players, decks=game.decks)
 
 
-def append_all_to_legal_actions(game, legal_actions):
-    if not game or not legal_actions:
-        return game
-
-    for legal_action in legal_actions:
-        game = append_to_legal_actions(game, legal_action)
-
-    return game
-
-
-def append_to_legal_actions(game, legal_action):
-    if not game:
-        return game
-
-    game.legal_actions_3.append(
-        legal_action
-    )
-    
-    return game.set(legal_actions_3=game.legal_actions_3)
-
-
 def default_accept_action(game, action):
 
     # Returns true if action.legal_action is found in game.legal_actions_3
@@ -3672,76 +3586,6 @@ def is_move_pieces_to_path_action_legal(game, action):
     )
 
 
-def append_default_legal_actions_for_initial_player(game, action, log=False):
-    # print("****************************************** Inside append_default_legal_actions_for_initial_player")
-
-    # Clone HOOK_NAMESPACE
-    namespace = HOOK_NAMESPACE.copy()
-
-    try:
-        # Execute the code string
-        exec(DEFAULT_LEGAL_ACTIONS_HOOK, namespace)
-
-        # Retrieve the handler function
-        handler_func = namespace.get('handler')
-        
-        if handler_func is None or not callable(handler_func):
-            raise ValueError("No callable function named 'handler' found in the code")
-        
-        # Call the handler function
-        result = handler_func(game, game.player_idxs[0])
-        if log:
-            pass
-            # print(f"****************************** Running initialization hook 3: {hook.uuid} {result.player_idxs}")
-            # print(f"****************************** Result of handler(5, 3): {result}")
-        return result
-
-    except SyntaxError as e:
-        msg = f"Syntax error in initialization hook: {str(e)}"
-        logging.error(msg, exc_info=True)
-        raise SyntaxError(msg) from e
-    except Exception as e:
-        msg = f"Error in initialization hook: {str(e)}"
-        logging.error(msg, exc_info=True)
-        raise Exception(msg) from e
-
-
-def append_default_legal_actions_for_next_player(game, action, log=False):
-
-    # Clone HOOK_NAMESPACE
-    namespace = HOOK_NAMESPACE.copy()
-
-    try:
-        # Execute the code string
-        exec(DEFAULT_LEGAL_ACTIONS_HOOK, namespace)
-
-        # Retrieve the handler function
-        handler_func = namespace.get('handler')
-        
-        if handler_func is None or not callable(handler_func):
-            raise ValueError("No callable function named 'handler' found in the code")
-        
-        # Call the handler function
-        last_player_idx = action.legal_action.player_idx
-        last_player_shuffled_idx = game.player_idxs.index(last_player_idx)
-        next_player_shuffled_idx = (last_player_shuffled_idx + 1) % len(game.player_idxs)
-        result = handler_func(game, game.player_idxs[next_player_shuffled_idx])
-        if log:
-            pass
-            # print(f"****************************** Running initialization hook 3: {hook.uuid} {result.player_idxs}")
-            # print(f"****************************** Result of handler(5, 3): {result}")
-        return result
-
-    except SyntaxError as e:
-        msg = f"Syntax error in initialization hook: {str(e)}"
-        logging.error(msg, exc_info=True)
-        raise SyntaxError(msg) from e
-    except Exception as e:
-        msg = f"Error in initialization hook: {str(e)}"
-        logging.error(msg, exc_info=True)
-        raise Exception(msg) from e
-
-
 def get_total_path_count(game):
     return len(game.idx2path)
 
@@ -3859,11 +3703,7 @@ HOOK_NAMESPACE = {
     'find_player_with_longest_path_card': find_player_with_longest_path_card,
     'default_after_accept_action': default_after_accept_action,
     'default_accept_action': default_accept_action,
-    'append_default_legal_actions_for_initial_player': append_default_legal_actions_for_initial_player,
-    'append_default_legal_actions_for_next_player': append_default_legal_actions_for_next_player,
     'LegalAction': LegalAction,
-    'append_to_legal_actions': append_to_legal_actions,
-    'append_all_to_legal_actions': append_all_to_legal_actions,
     'LegalActionDraw': LegalActionDraw,
     'LegalActionDrawDiscard': LegalActionDrawDiscard,
     'LegalActionFaceupDraw': LegalActionFaceupDraw,
@@ -4231,7 +4071,6 @@ def init_state(kernel):
         is_terminal=False,
         idx2path=kernel.idx2path,
         pieceuuid2piece=kernel.pieceuuid2piece,
-        edgeuuid2idx=kernel.edgeuuid2idx,
         carduuid2card=kernel.carduuid2card,
     )
     state = state.set(legal_actions_3=calc_legal_actions3(kernel))
@@ -5348,107 +5187,10 @@ INIT_HOOK_4 = """def handler(game):
 INIT_HOOK_5 = """def handler(game):
     return flip_cards(game, 0, 5)
 """
-INIT_HOOK_6 = """def handler(game):
-    for player in game.players:
-        game = append_to_legal_actions(
-            game,
-            LegalAction(
-                player_idx=player.idx,
-                name="INITIAL-GOAL-KEEP",
-                instruction="Your move. Please select the routes you want to keep.",
-                allotted_seconds=INITIAL_ALLOTTED_SECONDS,
-                allotted_since_action_idx=(len(game.history) - 1),
-                keep=LegalActionKeep(
-                    deck_idx=1,
-                    min=2,
-                )
-            )
-        )
-    return game
-"""
 INIT_HOOK_7 = """def handler(game):
     return shuffle_player_order(game)
 """
 
-DEFAULT_LEGAL_ACTIONS_HOOK = """def handler(game, player_idx):
-    allotted_seconds = DEFAULT_ALLOTTED_SECONDS
-    allotted_since_action_idx = len(game.history) - 1
-
-    if len(game.decks[1].facedown_stack) >= 1:
-        game = append_to_legal_actions(
-            game,
-            LegalAction(
-                player_idx=player_idx,
-                name="DRAW-GOAL",
-                instruction="draw a route",
-                allotted_seconds=allotted_seconds,
-                allotted_since_action_idx=allotted_since_action_idx,
-                draw_discard=LegalActionDrawDiscard(
-                    deck_idx=1,
-                    quantity=3,
-                    min=1,
-                )
-            )
-        )
-
-    if len(game.decks[0].facedown_stack) >= 1:
-        game = append_to_legal_actions(
-            game,
-            LegalAction(
-                auto_preferred=True,
-                player_idx=player_idx,
-                name="DRAW",
-                instruction="draw a unit",
-                allotted_seconds=allotted_seconds,
-                allotted_since_action_idx=allotted_since_action_idx,
-                draw=LegalActionDraw(
-                    deck_idx=0,
-                    quantity=1,
-                )
-            )
-        )
-
-    if len(game.decks[0].facedown_stack) >= 2:
-        game = append_to_legal_actions(
-            game,
-            LegalAction(
-                player_idx=player_idx,
-                name="DRAW-DOUBLE",
-                instruction="draw 2 units",
-                allotted_seconds=allotted_seconds,
-                allotted_since_action_idx=allotted_since_action_idx,
-                draw=LegalActionDraw(
-                    deck_idx=0,
-                    quantity=2,
-                )
-            )
-        )
-
-    for card_uuid in game.decks[0].faceup_spots:
-        if card_uuid:
-            game = append_to_legal_actions(
-                game,
-                LegalAction(
-                    player_idx=player_idx,
-                    name="FACEUP-DRAW",
-                    instruction="draw a faceup unit",
-                    allotted_seconds=allotted_seconds,
-                    allotted_since_action_idx=allotted_since_action_idx,
-                    faceup_draw=LegalActionFaceupDraw(
-                        deck_idx=0,
-                        card_uuid=card_uuid,
-                    )
-                )
-            )
-
-    game = append_all_to_legal_actions(
-        game,
-        get_legal_actions_for_paths(game, player_idx),
-    )
-    
-    return game
-"""
-
 INITIALIZATION_HOOKS = [
     Hook(
         name="SampleHook1",
@@ -5480,12 +5222,6 @@ INITIALIZATION_HOOKS = [
         when="AFTER_GAME_STARTS",
         code=INIT_HOOK_5,
     ),
-    Hook(
-        name="SampleHook6",
-        uuid="e3079338-7eac-4180-979c-69dedbe1eabd",
-        when="AFTER_GAME_STARTS",
-        code=INIT_HOOK_6,
-    ),
     Hook(
         name="SampleHook7",
         uuid="240b8706-7fcf-4d35-9894-276aa10f799f",

{graph_games_proto-0.3.1930.dist-info → graph_games_proto-0.3.1934.dist-info}/METADATA

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

{graph_games_proto-0.3.1930.dist-info → graph_games_proto-0.3.1934.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=dJD9mA5g0d6ezz7kpmsUieCpojoIG2ONy7ErkSQDEb0,191573
+graph_games_proto/fns.py,sha256=VGAFpUF4NHnQqnuLNYIc9EfNumKx49IKvg7a-8eQEDo,182032
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1930.dist-info/METADATA,sha256=O_0khgbnmsofmhU9ktKlePGn-hvcK1PRh5dtrqNMrOs,188
-graph_games_proto-0.3.1930.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1930.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1930.dist-info/RECORD,,
+graph_games_proto-0.3.1934.dist-info/METADATA,sha256=06szQT5VQPzcO7sGenz5Ozo0sd32urAf2ydz9mBsNhU,188
+graph_games_proto-0.3.1934.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1934.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1934.dist-info/RECORD,,