pokerdf 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

pokerdf/core/read_and_convert.py

@@ -53,46 +53,45 @@ def compose_dataframe() -> pd.DataFrame:
     """
     # Compose default dataframe
     df = pd.DataFrame(
-        columns=[
-            "Modality",
-            "TableSize",
-            "BuyIn",
-            "TournID",
-            "TableID",
-            "HandID",
-            "LocalTime",
-            "Level",
-            "Ante",
-            "Blinds",
-            "Owner",
-            "OwnersHand",
-            "Playing",
-            "Player",
-            "Seat",
-            "PostedAnte",
-            "Position",
-            "PostedBlind",
-            "Stack",
-            "PreflopAction",
-            "FlopAction",
-            "TurnAction",
-            "RiverAction",
-            "AnteAllIn",
-            "PreflopAllIn",
-            "FlopAllIn",
-            "TurnAllIn",
-            "RiverAllIn",
-            "BoardFlop",
-            "BoardTurn",
-            "BoardRiver",
-            "ShowDown",
-            "CardCombination",
-            "Result",
-            "Balance",
-            "FinalRank",
-            "Prize",
-        ],
-        data=None,
+        {
+            "Modality": pd.Series(dtype="object"),
+            "TableSize": pd.Series(dtype="int64"),
+            "BuyIn": pd.Series(dtype="object"),
+            "TournID": pd.Series(dtype="object"),
+            "TableID": pd.Series(dtype="object"),
+            "HandID": pd.Series(dtype="object"),
+            "LocalTime": pd.Series(dtype="datetime64[ns]"),
+            "Level": pd.Series(dtype="object"),
+            "Ante": pd.Series(dtype="float64"),
+            "Blinds": pd.Series(dtype="object"),
+            "Owner": pd.Series(dtype="object"),
+            "OwnersHand": pd.Series(dtype="object"),
+            "Playing": pd.Series(dtype="int64"),
+            "Player": pd.Series(dtype="object"),
+            "Seat": pd.Series(dtype="int64"),
+            "PostedAnte": pd.Series(dtype="float64"),
+            "Position": pd.Series(dtype="object"),
+            "PostedBlind": pd.Series(dtype="float64"),
+            "Stack": pd.Series(dtype="float64"),
+            "PreflopAction": pd.Series(dtype="object"),
+            "FlopAction": pd.Series(dtype="object"),
+            "TurnAction": pd.Series(dtype="object"),
+            "RiverAction": pd.Series(dtype="object"),
+            "AnteAllIn": pd.Series(dtype="bool"),
+            "PreflopAllIn": pd.Series(dtype="bool"),
+            "FlopAllIn": pd.Series(dtype="bool"),
+            "TurnAllIn": pd.Series(dtype="bool"),
+            "RiverAllIn": pd.Series(dtype="bool"),
+            "BoardFlop": pd.Series(dtype="object"),
+            "BoardTurn": pd.Series(dtype="object"),
+            "BoardRiver": pd.Series(dtype="object"),
+            "ShowDown": pd.Series(dtype="object"),
+            "CardCombination": pd.Series(dtype="object"),
+            "Result": pd.Series(dtype="object"),
+            "Balance": pd.Series(dtype="float64"),
+            "FinalRank": pd.Series(dtype="int64"),
+            "Prize": pd.Series(dtype="float64"),
+        }
     )
     return df
 

pokerdf/regex/regex_execution.py

@@ -4,7 +4,7 @@ from pokerdf.regex.regex_patterns import RegexPatterns
 r = RegexPatterns()
 
 
-def capture_common_data(hand: list[str]) -> dict[str, Any]:
+def capture_common_data(splitted_hand: list[str]) -> dict[str, Any]:
     """
     Captures the common data of the tournament
 
@@ -15,11 +15,11 @@ def capture_common_data(hand: list[str]) -> dict[str, Any]:
         dict: Dictionary of captured values.
     """
     row: dict[str, Any] = {}
-    row["Modality"] = r.get_modality(hand)
-    row["TableSize"] = r.get_table_size(hand)
-    row["BuyIn"] = r.get_buyin(hand)
-    row["TournID"] = r.get_tourn_id(hand)
-    row["Owner"] = r.get_owner(hand)
+    row["Modality"] = r.get_modality(splitted_hand)
+    row["TableSize"] = r.get_table_size(splitted_hand)
+    row["BuyIn"] = r.get_buyin(splitted_hand)
+    row["TournID"] = r.get_tourn_id(splitted_hand)
+    row["Owner"] = r.get_owner(splitted_hand)
 
     return row
 

pokerdf/regex/regex_patterns.py

@@ -793,16 +793,13 @@ class RegexPatterns:
         if hand != []:
 
             # Pattern to extract
-            regex = rf"{player} .* (?:and receives|and received) (\S+)"
+            regex = rf"{player} .* (?:and receives|and received) (?:[$€£]?)\s*(\d+(?:\.\d+)?)"
 
             # Get the first SHOW_DOWN content of a played hand
             target = hand[0]
 
             # Apply regex
-            result_of_regex = re.findall(regex, target)
-
-            # Normalize
-            final_result = [float(x) for x in result_of_regex if str(x).isdigit()]
+            final_result = re.findall(regex, target)[:1]
 
             # Normalize output
             if final_result == []:

{pokerdf-1.0.2.dist-info → pokerdf-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pokerdf
-Version: 1.0.2
+Version: 1.0.4
 Summary: Converts poker hand history files to pandas DataFrames.
 Author: Murilo Amaral
 Author-email: murilogmamaral@gmail.com
@@ -72,8 +72,13 @@ Seat 3: VillainB (big blind) collected (40)
 |  1 | USD Hold'em No Limit |           3 | $1.84+$0.16 | 3026510091 |         1 | 219372022626 | 2020-10-14 10:33:59 | I       | None   | [10.0, 20.0] | garciamurilo | ['6h', 'Ks'] |         3 | garciamurilo |      2 | None         | small blind |            10 |     500 | ['calls', '10']      | ['checks', '']    | ['checks', ''], ['folds', ''] | ['', '']         | False       | False          | False       | False       | False        | ['4d', 'Qs', 'Qd']   | ['4d', 'Qs', 'Qd', '3s'] | []           | [None, None] | None              | folded     |       nan |          -1 | None    |
 |  2 | USD Hold'em No Limit |           3 | $1.84+$0.16 | 3026510091 |         1 | 219372022626 | 2020-10-14 10:33:59 | I       | None   | [10.0, 20.0] | garciamurilo | ['6h', 'Ks'] |         3 | VillainB     |      3 | None         | big blind   |            20 |     500 | ['checks', '']       | ['checks', '']    | ['bets', '20']             | ['', '']         | False       | False          | False       | False       | False        | ['4d', 'Qs', 'Qd']   | ['4d', 'Qs', 'Qd', '3s'] | []           | [None, None] | None              | non-sd win |        40 |          -1 | None    |
 
+<br>
+
 #### Data Modeling
-For advanced analytics, you will need to transform the data and explore different data models. The final structure of your data may vary depending on the specific goals of your project.
+For advanced analytics, you will need to transform the data generated with the package and explore different data models. The final structure of your data may vary depending on the specific goals of your project. You will find below a suggestion of relational data model split into five tables that may be useful for most cases.  
+<br>
+
+![pokerdm](https://github.com/user-attachments/assets/8936f540-51c7-4a1d-a5b1-bc9fc73c4313)
 
 
 ## Installation

pokerdf-1.0.4.dist-info/RECORD

@@ -0,0 +1,12 @@
+pokerdf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pokerdf/core/read_and_convert.py,sha256=52bfqszQ2STXBh4EFLyw8spieYm7Zus5iTdraHdVVC8,8029
+pokerdf/main.py,sha256=wZNxv8Os29FErPSqwtW4EL6W9g7Hrs-3YrLNOUBfwUU,2609
+pokerdf/regex/regex_execution.py,sha256=I5nbCiC-ulnf6ehh55hiSwdGwKGdmOwVEj5b348hzs0,3387
+pokerdf/regex/regex_patterns.py,sha256=mYtLVx6IholDeygTeaIf8FEGwLgzOnBB8hCLhGvD1zY,22722
+pokerdf/utils/strings.py,sha256=M67LK8HDsCRJbMosSpldAhkh7dJbvFm3P_cwCJJwABo,24
+pokerdf/validation/pydantic_modules.py,sha256=sta6I4kOSpVVp1ztMds-6um6GKzHjmKJMdWWjVgi2vs,1302
+pokerdf-1.0.4.dist-info/LICENSE,sha256=cwU1q-Z805EbGDpnov1ZMvOm_1FN9GHLUymwEy7poHM,1070
+pokerdf-1.0.4.dist-info/METADATA,sha256=N_IxhMkLStEamVpIglUJj6io9-tpMUO95Tbblyjq-R0,13246
+pokerdf-1.0.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pokerdf-1.0.4.dist-info/entry_points.txt,sha256=Ut_cKkG47Nvu8xyWDuDLPo7qry4Wye_te9Y3LqWNwA8,45
+pokerdf-1.0.4.dist-info/RECORD,,

pokerdf-1.0.2.dist-info/RECORD

@@ -1,12 +0,0 @@
-pokerdf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pokerdf/core/read_and_convert.py,sha256=RKrc4T2wdqOnsu_A1FkZsVQj4sQ_A3T3nbmksdYqexY,7058
-pokerdf/main.py,sha256=wZNxv8Os29FErPSqwtW4EL6W9g7Hrs-3YrLNOUBfwUU,2609
-pokerdf/regex/regex_execution.py,sha256=Z7rAJAk_VaeamJ6O-i_WqqSN7E2Bvds6zNKDqf9PWgk,3333
-pokerdf/regex/regex_patterns.py,sha256=9UV7K-ojFgUkmbdfBTmfYi_-qKT6OsSO4W5Btcy4gTc,22803
-pokerdf/utils/strings.py,sha256=M67LK8HDsCRJbMosSpldAhkh7dJbvFm3P_cwCJJwABo,24
-pokerdf/validation/pydantic_modules.py,sha256=sta6I4kOSpVVp1ztMds-6um6GKzHjmKJMdWWjVgi2vs,1302
-pokerdf-1.0.2.dist-info/LICENSE,sha256=cwU1q-Z805EbGDpnov1ZMvOm_1FN9GHLUymwEy7poHM,1070
-pokerdf-1.0.2.dist-info/METADATA,sha256=7BgzE7Jw3kNhOUyCH26cl1YO4UlWcKTM-19zWFYboGo,12997
-pokerdf-1.0.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pokerdf-1.0.2.dist-info/entry_points.txt,sha256=Ut_cKkG47Nvu8xyWDuDLPo7qry4Wye_te9Y3LqWNwA8,45
-pokerdf-1.0.2.dist-info/RECORD,,