pokerdf 1.0.1__py3-none-any.whl → 1.0.3__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.1.dist-info → pokerdf-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pokerdf
-Version: 1.0.1
+Version: 1.0.3
 Summary: Converts poker hand history files to pandas DataFrames.
 Author: Murilo Amaral
 Author-email: murilogmamaral@gmail.com
@@ -14,8 +14,7 @@ Requires-Dist: pandas (>=2.0.0)
 Requires-Dist: pyarrow (>=16.1.0)
 Requires-Dist: pydantic (>=2.8.0)
 Requires-Dist: ruff (>=0.0.0)
-Project-URL: homepage, https://gitlab.com/murilogmamaral/pokerdf
-Project-URL: repository, https://gitlab.com/murilogmamaral/pokerdf
+Project-URL: repository, https://github.com/murilogmamaral/pokerdf
 Description-Content-Type: text/markdown
 
 # PokerDF

pokerdf-1.0.3.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.3.dist-info/LICENSE,sha256=cwU1q-Z805EbGDpnov1ZMvOm_1FN9GHLUymwEy7poHM,1070
+pokerdf-1.0.3.dist-info/METADATA,sha256=xJNvQbVliqc6JtkcPoMMMIPID1rzgRUhtvudWNvHWcU,12997
+pokerdf-1.0.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pokerdf-1.0.3.dist-info/entry_points.txt,sha256=Ut_cKkG47Nvu8xyWDuDLPo7qry4Wye_te9Y3LqWNwA8,45
+pokerdf-1.0.3.dist-info/RECORD,,

pokerdf-1.0.1.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.1.dist-info/LICENSE,sha256=cwU1q-Z805EbGDpnov1ZMvOm_1FN9GHLUymwEy7poHM,1070
-pokerdf-1.0.1.dist-info/METADATA,sha256=j49HeDSDZhvdf4nz1nOgl1mFFzv8EPAL9mvRGEUa8j4,13062
-pokerdf-1.0.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pokerdf-1.0.1.dist-info/entry_points.txt,sha256=Ut_cKkG47Nvu8xyWDuDLPo7qry4Wye_te9Y3LqWNwA8,45
-pokerdf-1.0.1.dist-info/RECORD,,