rustat-python-api 0.5.8__py3-none-any.whl → 0.5.9__py3-none-any.whl

rustat_python_api/processing.py

@@ -13,20 +13,27 @@ def process_list(x: pd.Series):
     else:
         return lst
 
+def take_last(x: pd.Series):
+    lst = x.dropna().tolist()
+    if lst:
+        return lst[-1]
+    return np.nan
+
 
 def gluing(df: pd.DataFrame) -> pd.DataFrame:
     cols = ['player_id', 'half', 'second', 'pos_x', 'pos_y']
 
-    df_gb = df.groupby(cols).agg(process_list).reset_index()
-    df_gb['possession_number'] = df_gb['possession_number'].apply(
-        lambda x: max(x) if isinstance(x, list) else x
-    )
-    df_gb['pos_dest_x'] = df_gb['pos_dest_x'].apply(
-        lambda x: x[0] if isinstance(x, list) else x
-    )
-    df_gb['pos_dest_y'] = df_gb['pos_dest_y'].apply(
-        lambda x: x[0] if isinstance(x, list) else x
-    )
+    agg_rules = {}
+
+    for col_name in df.columns:
+        if col_name not in cols:
+            if col_name in ['action_name', 'action_id']:
+                agg_rules[col_name] = process_list
+            else:
+                agg_rules[col_name] = take_last
+
+    df_gb = df.groupby(cols).agg(agg_rules).reset_index()
+
     df_gb['pos_dest_nan'] = (df_gb['pos_dest_x'].isna() & df_gb['pos_dest_y'].isna()).astype(int)
     df_gb = df_gb.sort_values(by=['half', 'second', 'possession_number', 'pos_dest_nan']).reset_index(drop=True)
     return df_gb

{rustat_python_api-0.5.8.dist-info → rustat_python_api-0.5.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rustat-python-api
-Version: 0.5.8
+Version: 0.5.9
 Summary: A Python wrapper for RuStat API
 Home-page: https://github.com/dailydaniel/rustat-python-api
 Author: Daniel Zholkovsky

{rustat_python_api-0.5.8.dist-info → rustat_python_api-0.5.9.dist-info}/RECORD

@@ -3,10 +3,10 @@ rustat_python_api/config.py,sha256=eMvi1p8Cfvnbp6Cd4bBOwgehVN7thKnaQV5uzWyGZXM,1
 rustat_python_api/models_api.py,sha256=oHXEqeCupvZwjVEdoxf7W9LP7ELFKA8-9DuRXpQHLno,1701
 rustat_python_api/parser.py,sha256=PrGvN3vY0oczMsJxyUxBO0Yb1P03Moc74AgGYHYr_X8,10216
 rustat_python_api/pitch_control.py,sha256=c2uX7B3IMjdKFIb3QulO3188RfzgPwT4BdR8N1XYf_w,11643
-rustat_python_api/processing.py,sha256=46O7wUGv5boWf4A38zYinbtqEC7ke-BwTdEg589XQaw,2816
+rustat_python_api/processing.py,sha256=WES2D77uu3ScpjN0nW8ozatHteCZJQmmF9WpHPgGfJo,2835
 rustat_python_api/urls.py,sha256=iJTD31T6OyXPAhmhViwFXVehrzwsOjBDONA1SIVc_40,1068
-rustat_python_api-0.5.8.dist-info/LICENSE,sha256=4Cohqg5p6Mq1xyrzdEX8AvFSA62GSVvapEOr2xK_tgY,57
-rustat_python_api-0.5.8.dist-info/METADATA,sha256=w8nXtOwc4t5YT8MIdbYE7Zt3YScKS9fneZBYPK74Iu0,1730
-rustat_python_api-0.5.8.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-rustat_python_api-0.5.8.dist-info/top_level.txt,sha256=VK0hmkKZE9YThxolUcoE6JtGI67NFeKJMBLuet8kI4w,18
-rustat_python_api-0.5.8.dist-info/RECORD,,
+rustat_python_api-0.5.9.dist-info/LICENSE,sha256=4Cohqg5p6Mq1xyrzdEX8AvFSA62GSVvapEOr2xK_tgY,57
+rustat_python_api-0.5.9.dist-info/METADATA,sha256=Xwu5Q-R1tsAZ6r49Mii-LiCOtgWcirykl_EI_-0Oghw,1730
+rustat_python_api-0.5.9.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+rustat_python_api-0.5.9.dist-info/top_level.txt,sha256=VK0hmkKZE9YThxolUcoE6JtGI67NFeKJMBLuet8kI4w,18
+rustat_python_api-0.5.9.dist-info/RECORD,,