graph-games-proto 0.3.1913__py3-none-any.whl → 0.3.1915__py3-none-any.whl

graph_games_proto/fns.py

@@ -1103,7 +1103,6 @@ class PrivateState(PClass):
     my_history = field(type=list)  # List[Action2]
     player_score = field(type=PrivatePlayerScore)
     player = field(type=Player)
-    legal_actions_2 = field(type=list)  # List[LegalAction]
     legal_actions_3 = field(type=list)  # List[LegalAction]
     goal_completions = field(type=list, initial=[])  # List[GoalCompletion]
     def __todict__(self):
@@ -1111,7 +1110,6 @@ class PrivateState(PClass):
             "my_history": [x.__todict__() for x in self.my_history],
             "player_score": self.player_score.__todict__(),
             "player": self.player.__todict__(),
-            "legal_actions_2": [x.__todict__() for x in self.legal_actions_2],
             "legal_actions_3": [x.__todict__() for x in self.legal_actions_3],
             "goal_completions": [x.__todict__() for x in self.goal_completions],
         }
@@ -1121,7 +1119,6 @@ class PrivateState(PClass):
             my_history=[Action2.__fromdict__(x) for x in d["my_history"]],
             player_score=PrivatePlayerScore.__fromdict__(d["player_score"]),
             player=Player.__fromdict__(d["player"]),
-            legal_actions_2=[LegalAction.__fromdict__(x) for x in d["legal_actions_2"]],
             legal_actions_3=[LegalAction.__fromdict__(x) for x in d["legal_actions_3"]],
             goal_completions=[GoalCompletion.__fromdict__(x) for x in d["goal_completions"]],
         )
@@ -1956,7 +1953,6 @@ class State(PClass):
     edgeuuid2idx = field(type=dict)  # Dict[str, int]
     edgetuple2uuid = field(type=dict)  # Dict[Tuple[int, int], str]
     regions = field(type=list)  # List[Region]
-    legal_actions_2 = field(type=list)  # List[LegalAction]
     legal_actions_3 = field(type=list)  # List[LegalAction]
     piles = field(type=list)  # List[Pile]
     players = field(type=list)  # List[Player]
@@ -1988,7 +1984,6 @@ class State(PClass):
             "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_2": [x.__todict__() for x in self.legal_actions_2],
             "legal_actions_3": [x.__todict__() for x in self.legal_actions_3],
             "piles": [pile.__todict__() for pile in self.piles],
             "players": [player.__todict__() for player in self.players],
@@ -2022,7 +2017,6 @@ class State(PClass):
             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_2=[LegalAction.__fromdict__(x) for x in d["legal_actions_2"]],
             legal_actions_3=[LegalAction.__fromdict__(x) for x in d["legal_actions_3"]],
             piles=[Pile.__fromdict__(p) for p in d["piles"]],
             players=[Player.__fromdict__(p) for p in d["players"]],
@@ -2599,7 +2593,6 @@ def getinitialstate(game_config):
         edgeuuid2idx = edgeuuid2idx,
         edgetuple2uuid = edgetuple2uuid,
         regions = get_regions(board_config),
-        legal_actions_2=[],
         legal_actions_3=[],
         piles=piles,
         players=[Player(idx=idx, pieces=[], cards=[], discard_tray=[]) for idx in range(game_config.num_players)],
@@ -2724,7 +2717,7 @@ def handle_last_to_play(game):
             if len(player.pieces) < 3:
                 return game.set(last_to_play=player.idx)
     elif game.last_to_play == game.history[-1].legal_action.player_idx:
-        if not game.legal_actions_2:
+        if not game.legal_actions_3:
             return game.set(terminal=True)
     return game
 
@@ -2848,11 +2841,11 @@ def default_after_accept_action(game, action):
     if player_idx < 0 or player_idx >= len(game.players):
         return game
     new_legal_actions = [
-        la for la in game.legal_actions_2 if la.player_idx != player_idx
+        la for la in game.legal_actions_3 if la.player_idx != player_idx
     ]
     history = game.history + [action]
     return game.set(
-        legal_actions_2=new_legal_actions, 
+        legal_actions_3=new_legal_actions,
         history=history,
     )
 
@@ -3543,19 +3536,19 @@ def append_all_to_legal_actions(game, legal_actions):
 def append_to_legal_actions(game, legal_action):
     if not game:
         return game
-    
-    game.legal_actions_2.append(
+
+    game.legal_actions_3.append(
         legal_action
     )
     
-    return game.set(legal_actions_2=game.legal_actions_2)
+    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_2
+    # Returns true if action.legal_action is found in game.legal_actions_3
     # The comparision is by value, not by reference
-    if action.legal_action not in game.legal_actions_2:
+    if action.legal_action not in game.legal_actions_3:
         return False, "Action not found in legal actions"
     
     # Check if "action.move_pieces_to_path" is not None
@@ -4082,6 +4075,7 @@ def calc_legal_actions3(state_kernal):
     last_action = history[-1] if len(history) > 0 else None
 
     if last_action is None or last_action.legal_action.name == "INITIAL-GOAL-KEEP":
+
         yet_to_make_initial_move = [
             player for player in state_kernal.players if len(player.discard_tray) > 0
         ]
@@ -4108,11 +4102,15 @@ def calc_legal_actions3(state_kernal):
     elif last_action.legal_action.faceup_draw:
         faceup_draw = last_action.legal_action.faceup_draw
         if not state_kernal.carduuid2card[faceup_draw.card_uuid].is_wild:
-            return get_follow_up_draw_legal_actions(state_kernal, last_action)
+            legal_actions = get_follow_up_draw_legal_actions(state_kernal, last_action)
+            if legal_actions:
+                return legal_actions
     
     elif last_action.legal_action.draw:
         if last_action.legal_action.draw.quantity == 1:
-            return get_follow_up_draw_legal_actions(state_kernal, last_action)
+            legal_actions = get_follow_up_draw_legal_actions(state_kernal, last_action)
+            if legal_actions:
+                return legal_actions
     
     elif last_action.legal_action.draw_discard:
         draw_discard = last_action.legal_action.draw_discard
@@ -4214,8 +4212,6 @@ def getnextstate2(s, a, log=False):
     s = run_state_action_hooks(s, a, HANDLE_ACTION_HOOKS, log)
     s = run_state_hooks(s, HANDLE_SCORING_HOOKS, log)
     s = run_state_hooks(s, HANDLE_TERMINAL_HOOKS, log)
-    if not s.legal_actions_2:
-        s = run_state_action_hooks(s, a, EMPTY_LEGAL_ACTIONS_HOOKS, log)
 
     state_kernal = init_state_kernal(
         game_config=s.game_config,
@@ -4256,7 +4252,7 @@ def getprivateplayerscore(s, player_score):
 
 
 def getpublictoplay(s):
-    player_idxs = [legal_action.player_idx for legal_action in s.legal_actions_2]
+    player_idxs = [legal_action.player_idx for legal_action in s.legal_actions_3]
     # filter out duplicates
     return list(set(player_idxs))
 
@@ -4271,7 +4267,7 @@ def get_max_allotted_times(s):
 def get_player_max_allotted_time(s, player_idx):
     max_allotted_seconds = 0
     since_action_idx_of_max = -1
-    for legal_action in s.legal_actions_2:
+    for legal_action in s.legal_actions_3:
         if legal_action.player_idx == player_idx:
             if legal_action.allotted_seconds > max_allotted_seconds:
                 max_allotted_seconds = legal_action.allotted_seconds
@@ -4345,7 +4341,6 @@ def get_public_player_scores(s):
 
 # player_score = field(type=PrivatePlayerScore)
 # player = field(type=Player)
-# legal_actions_2 = field(type=list)  # List[LegalAction]
 # goal_completions = field(type=list, initial=[])  # List[GoalCompletion]
 
 
@@ -4397,7 +4392,6 @@ def imagine_state(public_state, private_state):
         piles = public_state.piles,
         player_idxs = public_state.player_idxs,
         game_config = public_state.game_config,
-        legal_actions_2 = imagine_legal_actions(public_state, private_state),
         players = imagine_players(public_state, private_state),
         decks = imagine_decks(public_state, private_state),
         rng = imagine_rng(public_state, private_state),
@@ -4407,7 +4401,7 @@ def imagine_state(public_state, private_state):
 
 
 def isterminal(s):
-    return len(s.legal_actions_2) == 0
+    return len(s.legal_actions_3) == 0
 
 
 @dispatch(State)
@@ -4598,7 +4592,7 @@ def get_legal_actions3(s, player_idx):
 
 @dispatch(State, int)
 def get_legal_actions(s, player_idx):
-    return [a for a in s.legal_actions_2 if a.player_idx == player_idx]
+    return [a for a in s.legal_actions_3 if a.player_idx == player_idx]
 
 
 def get_goal_completions(s, player_idx):
@@ -5089,7 +5083,6 @@ def getprivatestate(s, player_idx):
         my_history=[a for a in s.history if a.legal_action.player_idx == player_idx],
         player_score=getprivateplayerscore(s, s.player_scores[player_idx]),
         player=s.players[player_idx],
-        legal_actions_2 = get_legal_actions(s, player_idx),
         legal_actions_3 = get_legal_actions3(s, player_idx),
         goal_completions=get_goal_completions(s, player_idx),
     )
@@ -5241,15 +5234,15 @@ def diff(A, dims=None):
 
 
 def get_default_toplay(s):
-    if s.legal_actions_2:
-        return s.legal_actions_2[0].player_idx
+    if s.legal_actions_3:
+        return s.legal_actions_3[0].player_idx
     return None
 
 
 def get_intuited_best_actions(ps):
-    if not ps.legal_actions_2:
+    if not ps.legal_actions_3:
         return None
-    return ps.legal_actions_2[:8]
+    return ps.legal_actions_3[:8]
 
 
 def get_spread(q_values, p_idx):
@@ -5277,7 +5270,7 @@ def dynamics(s, a):
 
 def alpha0(ps):
     td = 3
-    legal_actions = ps.legal_actions_2
+    legal_actions = ps.legal_actions_3
     if not legal_actions:
         return None
     intuited = get_intuited_best_actions(ps)
@@ -5528,24 +5521,6 @@ ACCEPT_ACTION_HOOKS = [
     )
 ]
 
-EMPTY_LEGAL_ACTIONS_HOOK_1 = """
-def handler(game, action):
-    if action.legal_action.name == "INITIAL-GOAL-KEEP":
-        return append_default_legal_actions_for_initial_player(game, action)
-    else:
-        return append_default_legal_actions_for_next_player(game, action)
-    return game
-"""
-
-EMPTY_LEGAL_ACTIONS_HOOKS = [
-    Hook(
-        name="EmptyLegalActionsHook",
-        uuid="f45dabf6-8f46-4af2-9b88-327db8b985eb",
-        when="EMPTY_LEGAL_ACTIONS",
-        code=EMPTY_LEGAL_ACTIONS_HOOK_1,
-    )
-]
-
 HANDLE_SCORING_HOOK_1 = """
 def handler(game):
     return default_handle_scoring(game)

{graph_games_proto-0.3.1913.dist-info → graph_games_proto-0.3.1915.dist-info}/METADATA

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

{graph_games_proto-0.3.1913.dist-info → graph_games_proto-0.3.1915.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=acyAIePOzHrVPkMGQ2fdLdav0hlsdjyBaDzgXaMg_pw,192177
+graph_games_proto/fns.py,sha256=Rj9ALtDUBPp5C0sn7ExUcuXrzOabAw7A1Xsf-LKL7Sg,191027
 graph_games_proto/main.py,sha256=fj2U7KcwrpZtuUhjOX5yVxY18LZvvsxDFYZ_S5mxe04,145
 graph_games_proto/state.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-graph_games_proto-0.3.1913.dist-info/METADATA,sha256=TQrU0Q469uMwO53F4QTXvgQJ8O03FlNQ8BKc51tnWOs,188
-graph_games_proto-0.3.1913.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-graph_games_proto-0.3.1913.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
-graph_games_proto-0.3.1913.dist-info/RECORD,,
+graph_games_proto-0.3.1915.dist-info/METADATA,sha256=8DzNZJm4Rg3_o3wwY0t6DEQIjF8wFibw9dK6jrRntd4,188
+graph_games_proto-0.3.1915.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+graph_games_proto-0.3.1915.dist-info/top_level.txt,sha256=-4QSrBMf_MM4BGsr2QXBpqDx8c8k_OPnzGyFjqjakes,18
+graph_games_proto-0.3.1915.dist-info/RECORD,,