Merge pull request #19 from Seven-of-Di/develop

chore: Develop
Seven-of-Di · Jan 4, 2024 · 275ccf0 · 275ccf0
2 parents d19f6e6 + 073545b
commit 275ccf0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/src/FullBoardCardPlayer.py b/src/FullBoardCardPlayer.py
@@ -22,7 +22,12 @@ def __init__(self, play_full_board_request) -> None:
         self.vuln = VULNERABILITIES[play_full_board_request["vuln"]]
         self.dealer = Direction.from_str(play_full_board_request["dealer"])
         self.hands = Diag.init_from_pbn(play_full_board_request["hands"])
-        self.auction = play_full_board_request["auction"]
+
+        auction = []
+        for bid in play_full_board_request['auction']:
+            auction.append(bid['bid'])
+
+        self.auction = auction
         self.playing_mode = PlayingMode.from_str(play_full_board_request[
             "playing_mode"]) if "playing_mode" in play_full_board_request else PlayingMode.MATCHPOINTS
 
@@ -45,17 +50,19 @@ async def start():
             continue
 
         for message in resp["Messages"]:
-            req = PlayFullCardPlay(json.loads(message["Body"]))
+            msg_body_json = json.loads(message["Body"])
+
+            req = PlayFullCardPlay(msg_body_json)
             bot = FullBoardPlayer(req.hands, req.vuln, req.dealer, req.playing_mode, MODELS)
 
-            play = await bot.get_card_play(req.auction)
-            message_body = {"auction": req.auction, "play": play}
+            play = await bot.get_card_play(req.auction, msg_body_json['lead'])
+            response_msg_body = {"auction": msg_body_json['auction'], "play": play}
 
             sqs_client.send_message(
                 QueueUrl=response_queue_url,
                 MessageAttributes={
                     "BoardID": message["MessageAttributes"]["BoardID"]},
-                MessageBody=json.dumps(message_body),
+                MessageBody=json.dumps(response_msg_body),
             )
 
             # Mark the message as processed via deleating

diff --git a/src/FullBoardPlayer.py b/src/FullBoardPlayer.py
@@ -45,7 +45,7 @@ def get_auction(self):
             pass
         return [bid for bid in auction if bid != "PAD_START"]
 
-    async def get_card_play(self, auction):
+    async def get_card_play(self, auction, raw_lead):
         padded_auction = ["PAD_START"] * Direction.from_str(
             self.dealer.abbreviation()
         ).value + auction
@@ -57,14 +57,18 @@ async def get_card_play(self, auction):
         declarer = Direction.from_str(contract[-1])
         dummy = declarer.offset(2)
         leader = declarer.offset(1)
-        raw_lead = (
-            bots.BotLead(self.vuls, self.diag.hands[leader].to_pbn(), self.models)
-            .lead(auction)
-            .to_dict()["candidates"][0]["card"]
-        )
+
+        if raw_lead == None:
+            raw_lead = (
+                bots.BotLead(self.vuls, self.diag.hands[leader].to_pbn(), self.models)
+                .lead(auction)
+                .to_dict()["candidates"][0]["card"]
+            )
+
         lead = lead_real_card(
             self.diag.hands[leader], raw_lead, BiddingSuit.from_str(contract[1])
         )
+
         self.diag.hands[leader].remove(lead)
 
         tricks = [[str(lead)]]