pkpython 0.7.0__tar.gz → 0.8.0__tar.gz

{pkpython-0.7.0 → pkpython-0.8.0}/Cargo.lock

@@ -224,7 +224,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.4",
 ]
 
 [[package]]
@@ -352,7 +352,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.4",
 ]
 
 [[package]]
@@ -828,9 +828,9 @@ checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "pkcore"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c03fe516554011cc3c9a78e618a9f0ec9f7a7e30b644f83725c4d4ce4bf2f84"
+checksum = "1d905a1b2518e89ff31fad5a4eb2d44ffc5c32fd6b1edea6fb1164249f1af994"
 dependencies = [
  "bint",
  "bitvec",
@@ -869,7 +869,7 @@ checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548"
 
 [[package]]
 name = "pkpy"
-version = "0.7.0"
+version = "0.8.0"
 dependencies = [
  "pkcore",
  "pyo3",
@@ -1016,9 +1016,9 @@ checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
 [[package]]
 name = "rand"
-version = "0.8.7"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a"
+checksum = "e058c7de0b26af77780c769414d6257830bb240f3c38477dbc2c16e5f54d6d4c"
 dependencies = [
  "libc",
  "rand_chacha 0.3.1",
@@ -1084,7 +1084,7 @@ dependencies = [
  "clap",
  "lazy_static",
  "log",
- "rand 0.8.7",
+ "rand 0.8.8",
  "regex",
  "rust-embed",
  "titlecase",
@@ -1254,7 +1254,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.4",
 ]
 
 [[package]]
@@ -1384,9 +1384,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.3"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e9bae58849f64dfa4f5d5ae372c8341f7305f82a3868709269343628b659a3"
+checksum = "e6275cddf4610d1775e6d1fe9469b2e77d0f39fd98fb7450901b821e0c53649f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1432,7 +1432,7 @@ checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.3",
+ "syn 3.0.4",
 ]
 
 [[package]]

{pkpython-0.7.0 → pkpython-0.8.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pkpy"
-version = "0.7.0"
+version = "0.8.0"
 edition = "2021"
 description = "Python bindings for pkcore, a high-performance poker analysis library"
 license = "GPL-3.0-or-later"
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 pyo3 = { version = "0.28", features = ["extension-module"] }
-pkcore = { version = "0.7.0", features = ["store"] }
+pkcore = { version = "0.8.0", features = ["store"] }
 
 [profile.release]
 lto = true

{pkpython-0.7.0 → pkpython-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pkpython
-Version: 0.7.0
+Version: 0.8.0
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{pkpython-0.7.0 → pkpython-0.8.0}/src/lib.rs

@@ -31,9 +31,8 @@ use pkcore::casino::dealer::{Dealer as PkDealer, DealerError as PkDealerError};
 use pkcore::casino::equity::seat_equity::SeatEquity as PkSeatEquity;
 use pkcore::casino::equity::seatbit::Seatbit as PkSeatbit;
 use pkcore::casino::game::ForcedBets as PkForcedBets;
-use pkcore::casino::player::Player as PkPlayer;
 use pkcore::casino::state::PlayerState as PkPlayerState;
-use pkcore::casino::table_celled::event::TableLog as PkTableLog;
+use pkcore::casino::table::Player as PkPlayer;
 use pkcore::casino::winnings::{PotWin as PkPotWin, Winnings as PkWinnings};
 use pkcore::deck::Deck as PkDeck;
 use pkcore::games::kuhn::{
@@ -2473,7 +2472,7 @@ impl Player {
 
     /// Current chip count (stack only, not including active bet).
     fn chips(&self) -> usize {
-        self.0.chips.count()
+        self.0.chips
     }
 
     /// Total chips (stack + any active bet).
@@ -2483,12 +2482,12 @@ impl Player {
 
     /// Chips committed to the current hand.
     fn chips_in_play(&self) -> usize {
-        self.0.get_chips_in_play()
+        self.0.chips_in_play
     }
 
     /// Current action state.
     fn state(&self) -> PlayerState {
-        PlayerState(self.0.state.get())
+        PlayerState(self.0.state)
     }
 
     fn is_active(&self) -> bool {
@@ -2501,7 +2500,7 @@ impl Player {
         self.0.is_in_hand()
     }
     fn is_ready(&self) -> bool {
-        self.0.is_ready()
+        self.0.state.is_ready()
     }
     fn is_out(&self) -> bool {
         self.0.is_out()
@@ -2514,10 +2513,10 @@ impl Player {
     }
 
     fn __str__(&self) -> String {
-        format!("{} ({})", self.0.handle, self.0.chips.count())
+        format!("{} ({})", self.0.handle, self.0.chips)
     }
     fn __repr__(&self) -> String {
-        format!("Player('{}', {})", self.0.handle, self.0.chips.count())
+        format!("Player('{}', {})", self.0.handle, self.0.chips)
     }
 }
 
@@ -2760,28 +2759,41 @@ impl TableAction {
 
 /// The event log for a poker table — an ordered list of TableAction records.
 #[pyclass(unsendable, name = "TableLog")]
-pub struct TableLog(PkTableLog);
+pub struct TableLog(Vec<PkTableAction>);
 
 #[pymethods]
 impl TableLog {
     /// All events as a Python list of TableAction objects.
     fn entries(&self) -> Vec<TableAction> {
-        self.0.entries().into_iter().map(TableAction).collect()
+        self.0.iter().copied().map(TableAction).collect()
     }
 
     /// The most recent event, or None.
     fn last(&self) -> Option<TableAction> {
-        self.0.last().map(TableAction)
+        self.0.last().copied().map(TableAction)
     }
 
     /// The most recent player action (bet/fold/call/raise/check), or None.
     fn last_player_action(&self) -> Option<TableAction> {
-        self.0.last_player_action().map(TableAction)
+        self.0
+            .iter()
+            .rev()
+            .find(|action| action.is_player_action())
+            .copied()
+            .map(TableAction)
     }
 
     /// True if the blinds have been posted this hand.
     fn have_posted_blinds(&self) -> bool {
-        self.0.have_posted_blinds()
+        let has_small_blind = self
+            .0
+            .iter()
+            .any(|action| matches!(action, PkTableAction::ForcedBetSmallBlind(_, _)));
+        let has_big_blind = self
+            .0
+            .iter()
+            .any(|action| matches!(action, PkTableAction::ForcedBetBigBlind(_, _)));
+        has_small_blind && has_big_blind
     }
 
     /// Number of events in the log.
@@ -2829,7 +2841,7 @@ impl Dealer {
     // ---- Seating ----
 
     /// Seat a player at the next available seat. Returns the seat number.
-    fn seat_player(&self, player: &mut Player) -> PyResult<u8> {
+    fn seat_player(&mut self, player: &mut Player) -> PyResult<u8> {
         // Take the player out of the Python wrapper to give ownership to the table
         let p = std::mem::replace(
             &mut player.0,
@@ -2839,7 +2851,7 @@ impl Dealer {
     }
 
     /// Seat a player at a specific seat number (0-indexed).
-    fn seat_player_at(&self, player: &mut Player, seat: u8) -> PyResult<()> {
+    fn seat_player_at(&mut self, player: &mut Player, seat: u8) -> PyResult<()> {
         let p = std::mem::replace(
             &mut player.0,
             PkPlayer::new_with_chips("__taken__".into(), 0),
@@ -2848,7 +2860,7 @@ impl Dealer {
     }
 
     /// Remove the player from the given seat. Returns the removed Player.
-    fn remove_player(&self, seat: u8) -> PyResult<Player> {
+    fn remove_player(&mut self, seat: u8) -> PyResult<Player> {
         self.0.remove_player(seat).map(Player).map_err(dealer_err)
     }
 
@@ -2872,7 +2884,7 @@ impl Dealer {
     // ---- Player actions ----
 
     /// Player at `seat` bets `amount` chips.
-    fn bet(&self, seat: u8, amount: usize) -> PyResult<()> {
+    fn bet(&mut self, seat: u8, amount: usize) -> PyResult<()> {
         use pkcore::casino::dealer::DealerAction;
         self.0
             .act(DealerAction::Bet { seat, amount })
@@ -2880,19 +2892,19 @@ impl Dealer {
     }
 
     /// Player at `seat` calls the current bet.
-    fn call(&self, seat: u8) -> PyResult<()> {
+    fn call(&mut self, seat: u8) -> PyResult<()> {
         use pkcore::casino::dealer::DealerAction;
         self.0.act(DealerAction::Call { seat }).map_err(dealer_err)
     }
 
     /// Player at `seat` checks.
-    fn check(&self, seat: u8) -> PyResult<()> {
+    fn check(&mut self, seat: u8) -> PyResult<()> {
         use pkcore::casino::dealer::DealerAction;
         self.0.act(DealerAction::Check { seat }).map_err(dealer_err)
     }
 
     /// Player at `seat` raises to `amount` chips.
-    fn raise_to(&self, seat: u8, amount: usize) -> PyResult<()> {
+    fn raise_to(&mut self, seat: u8, amount: usize) -> PyResult<()> {
         use pkcore::casino::dealer::DealerAction;
         self.0
             .act(DealerAction::Raise { seat, amount })
@@ -2900,19 +2912,19 @@ impl Dealer {
     }
 
     /// Player at `seat` goes all-in.
-    fn all_in(&self, seat: u8) -> PyResult<()> {
+    fn all_in(&mut self, seat: u8) -> PyResult<()> {
         use pkcore::casino::dealer::DealerAction;
         self.0.act(DealerAction::AllIn { seat }).map_err(dealer_err)
     }
 
     /// Player at `seat` folds.
-    fn fold(&self, seat: u8) -> PyResult<()> {
+    fn fold(&mut self, seat: u8) -> PyResult<()> {
         use pkcore::casino::dealer::DealerAction;
         self.0.act(DealerAction::Fold { seat }).map_err(dealer_err)
     }
 
     /// Mark player at `seat` as ready to play.
-    fn ready(&self, seat: u8) -> PyResult<()> {
+    fn ready(&mut self, seat: u8) -> PyResult<()> {
         use pkcore::casino::dealer::DealerAction;
         self.0.act(DealerAction::Ready { seat }).map_err(dealer_err)
     }
@@ -2946,7 +2958,7 @@ impl Dealer {
 
     /// A copy of the full event log.
     fn event_log(&self) -> TableLog {
-        TableLog(self.0.event_log().clone())
+        TableLog(self.0.event_log().to_vec())
     }
 
     fn __repr__(&self) -> String {

{pkpython-0.7.0 → pkpython-0.8.0}/src/table_no_cell.rs

@@ -170,9 +170,8 @@ impl SeatsNoCell {
     }
 }
 
-/// A no-Cell poker table — same semantics as `TableCelled` but without
-/// the interior mutability indirection. Wrapped by `PokerSession` for
-/// multi-hand session management.
+/// A poker table using plain `&mut self` mutability. Wrapped by
+/// `PokerSession` for multi-hand session management.
 #[pyclass(from_py_object, name = "TableNoCell")]
 #[derive(Clone)]
 pub struct TableNoCell(pub(crate) PkTableNoCell);