rustat-python-api 0.3.2__tar.gz → 0.3.4__tar.gz

{rustat-python-api-0.3.2/rustat_python_api.egg-info → rustat-python-api-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rustat-python-api
-Version: 0.3.2
+Version: 0.3.4
 Summary: A Python wrapper for RuStat API
 Home-page: https://github.com/dailydaniel/rustat-python-api
 Author: Daniel Zholkovsky
@@ -38,7 +38,7 @@ schedule = parser.get_schedule(team_id, season_id)
 keys = list(schedule.keys())
 match_id = keys[-1]
 
-events = parser.get_events(match_id, process=True)
+events, subs = parser.get_events(match_id, process=True, return_subs=True)
 
 stats = parser.get_match_stats(match_id)
 

{rustat-python-api-0.3.2 → rustat-python-api-0.3.4}/README.md

@@ -23,7 +23,7 @@ schedule = parser.get_schedule(team_id, season_id)
 keys = list(schedule.keys())
 match_id = keys[-1]
 
-events = parser.get_events(match_id, process=True)
+events, subs = parser.get_events(match_id, process=True, return_subs=True)
 
 stats = parser.get_match_stats(match_id)
 

{rustat-python-api-0.3.2 → rustat-python-api-0.3.4}/rustat_python_api/parser.py

@@ -90,7 +90,12 @@ class RuStatParser:
             for row in data["data"]["row"]
         }
 
-    def get_events(self, match_id: int, process: bool = True) -> pd.DataFrame | None:
+    def get_events(
+        self,
+        match_id: int,
+        process: bool = True,
+        return_subs: bool = False
+    ) -> pd.DataFrame | None | tuple[pd.DataFrame, pd.DataFrame]:
         data = self.resp2data(
             self.urls["events"].format(
                 user=self.user,
@@ -109,9 +114,23 @@ class RuStatParser:
 
         if process:
             df['match_id'] = match_id
+
+            if return_subs:
+                subs = df[df['action_id'] == '14000'][[
+                    'match_id', 'half', 'second',
+                    'team_id', 'team_name',
+                    'opponent_id', 'opponent_name',
+                    'player_id', 'player_name'
+                ]].rename(columns={
+                    'player_id': 'player_id_out',
+                    'opponent_id': 'player_id_in',
+                    'player_name': 'player_name_out',
+                    'opponent_name': 'player_name_in'
+                })
+
             df = processing(df)
 
-        return df
+        return df, subs if return_subs else df
 
     def get_tracking(self, match_id: int) -> pd.DataFrame | None:
         data = self.resp2data(

{rustat-python-api-0.3.2 → rustat-python-api-0.3.4}/rustat_python_api/processing.py

@@ -32,11 +32,11 @@ def add_reciever(glued_df: pd.DataFrame) -> pd.DataFrame:
 
     mask = (
             (df['action_name'] == 'Ball receiving')
-            & (df['pos_x'] == df['pos_dest_x'].shift(-1))
-            & (df['pos_y'] == df['pos_dest_y'].shift(-1))
-            & (df['team_id'] == df['team_id'].shift(-1))
-            & (df['player_id'] != df['player_id'].shift(-1))
-            & (df['possession_number'] == df['possession_number'].shift(-1))
+            & (df['pos_x'] == df['pos_dest_x'].shift(1))
+            & (df['pos_y'] == df['pos_dest_y'].shift(1))
+            & (df['team_id'] == df['team_id'].shift(1))
+            & (df['player_id'] != df['player_id'].shift(1))
+            & (df['possession_number'] == df['possession_number'].shift(1))
     )
 
     idx = df[mask].index

{rustat-python-api-0.3.2 → rustat-python-api-0.3.4/rustat_python_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rustat-python-api
-Version: 0.3.2
+Version: 0.3.4
 Summary: A Python wrapper for RuStat API
 Home-page: https://github.com/dailydaniel/rustat-python-api
 Author: Daniel Zholkovsky
@@ -38,7 +38,7 @@ schedule = parser.get_schedule(team_id, season_id)
 keys = list(schedule.keys())
 match_id = keys[-1]
 
-events = parser.get_events(match_id, process=True)
+events, subs = parser.get_events(match_id, process=True, return_subs=True)
 
 stats = parser.get_match_stats(match_id)
 

{rustat-python-api-0.3.2 → rustat-python-api-0.3.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='rustat-python-api',
-    version='0.3.2',
+    version='0.3.4',
     description='A Python wrapper for RuStat API',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',