rustat-python-api 0.5.2__tar.gz → 0.5.4__tar.gz

{rustat-python-api-0.5.2/rustat_python_api.egg-info → rustat-python-api-0.5.4}/PKG-INFO

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

{rustat-python-api-0.5.2 → rustat-python-api-0.5.4}/rustat_python_api/parser.py

@@ -173,6 +173,80 @@ class RuStatParser:
 
         return df
 
+    def get_tracking_30fps(
+        self,
+        match_id: int, half: int, lang_id: int = 0,
+        referee_data: int = 0, ball_data: int = 1
+    ) -> pd.DataFrame | tuple | None:
+        data = self.resp2data(
+            self.urls["tracking_30fps"].format(
+                user=self.user,
+                password=self.password,
+                match_id=match_id,
+                half=half,
+                lang_id=lang_id,
+                referee_data=referee_data,
+                ball_data=ball_data
+            )
+        )
+
+        if not data:
+            return None
+
+        teams_data = data['data']['teams']
+        if 'ball' in data['data']:
+            ball_data = data['data']['ball']
+        if 'referee' in data['data']:
+            referee_data = data['data']['referee']
+        del data
+
+        tracking = pd.DataFrame(columns=[
+            "half", "second", "pos_x", "pos_y", "team_id", "player_id", "player_name", "distance", "speed"
+        ])
+
+        for team_data in tqdm(teams_data):
+            team_id = team_data["id"]
+            side_1h = team_data["gate_position_half_1"]
+
+            for player_data in team_data["players"]:
+                player_id = player_data["id"]
+                player_name = player_data["name"]
+
+                cur_df = pd.json_normalize(player_data["rows"])
+                cur_df = cur_df.apply(pd.to_numeric, errors='coerce')
+                cur_df["team_id"] = team_id
+                cur_df["player_id"] = player_id
+                cur_df["player_name"] = player_name
+                cur_df["side_1h"] = side_1h
+
+                tracking = pd.concat([tracking, cur_df], ignore_index=True)
+
+        tracking['second'] = tracking['second'].astype(float)
+        tracking = tracking.sort_values(by=['half', 'second', 'team_id', 'player_id']).reset_index(drop=True)
+        tracking['pos_x'] = tracking['pos_x'] + 105/2
+        tracking['team_id'] = tracking['team_id'].astype(str)
+
+        if referee_data:
+            referee = pd.json_normalize(referee_data['rows'])
+            referee['second'] = referee['second'].astype(float)
+            referee = referee.sort_values(by=['half', 'second']).reset_index(drop=True)
+            referee['pos_x'] = referee['pos_x'] + 105/2
+
+        if ball_data:
+            ball = pd.json_normalize(ball_data['rows'])
+            ball['second'] = ball['second'].astype(float)
+            ball = ball.sort_values(by=['half', 'second']).reset_index(drop=True)
+            ball['pos_x'] = ball['pos_x'] + 105/2
+
+        if referee_data and ball_data:
+            return tracking, referee, ball
+        elif referee_data:
+            return tracking, referee
+        elif ball_data:
+            return tracking, ball
+        else:
+            return tracking
+
     def get_match_stats(self, match_id: int) -> dict:
         data = self.resp2data(
             self.urls["match_stats"].format(

{rustat-python-api-0.5.2 → rustat-python-api-0.5.4}/rustat_python_api/pitch_control.py

@@ -7,7 +7,7 @@ import matplotsoccer as mpl
 
 
 class PitchControl:
-    def __init__(self, tracking: pd.DataFrame, events: pd.DataFrame):
+    def __init__(self, tracking: pd.DataFrame, events: pd.DataFrame, ball_data: pd.DataFrame = None):
         self.team_ids = tracking['team_id'].unique()
         sides = tracking.groupby('team_id')['side_1h'].unique()
         side_by_team = dict(zip(self.team_ids, sides[self.team_ids].apply(lambda x: x[0])))
@@ -22,10 +22,11 @@ class PitchControl:
 
         self.locs_home, self.locs_away, self.locs_ball, self.t = self.get_locs(
             tracking,
-            events
+            events,
+            ball_data
         )
 
-    def get_locs(self, tracking: pd.DataFrame, events: pd.DataFrame) -> tuple:
+    def get_locs(self, tracking: pd.DataFrame, events: pd.DataFrame, ball_data: pd.DataFrame | None) -> tuple:
         events = events[[
             'possession_number', 'team_id', 'possession_team_id',
             'half', 'second', 'pos_x', 'pos_y'
@@ -38,10 +39,11 @@ class PitchControl:
             lambda x: self.swap_coords(x, 'y'), axis=1
         )
 
-        ball_data = self.interpolate_ball_data(
-            events[['half', 'second', 'pos_x', 'pos_y']],
-            tracking
-        )
+        if ball_data is None:
+            ball_data = self.interpolate_ball_data(
+                events[['half', 'second', 'pos_x', 'pos_y']],
+                tracking
+            )
 
         locs_home = {
             half: {
@@ -124,10 +126,21 @@ class PitchControl:
 
     @staticmethod
     def get_player_data(player_id, half, tracking):
-        return tracking[
+        timestamps = tracking[tracking['half'] == half]['second'].unique()
+        player_data = tracking[
             (tracking['player_id'] == player_id)
             & (tracking['half'] == half)
-            ][['pos_x', 'pos_y']].values
+        ][['second', 'pos_x', 'pos_y']]
+
+        player_data_full = pd.DataFrame({'second': timestamps})
+        player_data_full = player_data_full.merge(player_data, on='second', how='left')
+
+        return player_data_full[['pos_x', 'pos_y']].values
+
+        # return tracking[
+        #     (tracking['player_id'] == player_id)
+        #     & (tracking['half'] == half)
+        #     ][['pos_x', 'pos_y']].values
 
     def influence_function(
         self,
@@ -195,11 +208,11 @@ class PitchControl:
         locations = np.c_[xx.flatten(),yy.flatten()]
 
         for k in self.locs_home[half].keys():
-            if len(self.locs_home[half][k]) >= tp:
-                Zh += self.influence_function(k, locations, tp, 'h', half)
+            # if len(self.locs_home[half][k]) >= tp:
+            Zh += self.influence_function(k, locations, tp, 'h', half)
         for k in self.locs_away[half].keys():
-            if len(self.locs_away[half][k]) >= tp:
-                Za += self.influence_function(k, locations, tp, 'a', half)
+            # if len(self.locs_away[half][k]) >= tp:
+            Za += self.influence_function(k, locations, tp, 'a', half)
 
         Zh = Zh.reshape((dt, dt))
         Za = Za.reshape((dt, dt))
@@ -225,7 +238,8 @@ class PitchControl:
         plt.contourf(xx, yy, pitch_control)
 
         for k in self.locs_home[half].keys():
-            if len(self.locs_home[half][k]) >= tp:
+            # if len(self.locs_home[half][k]) >= tp:
+            if np.isfinite(self.locs_home[half][k][tp, :]).all():
                 plt.scatter(
                     self.locs_home[half][k][tp, 0],
                     self.locs_home[half][k][tp, 1],
@@ -233,7 +247,8 @@ class PitchControl:
                 )
 
         for k in self.locs_away[half].keys():
-            if len(self.locs_away[half][k]) >= tp:
+            # if len(self.locs_away[half][k]) >= tp:
+            if np.isfinite(self.locs_away[half][k][tp, :]).all():
                 plt.scatter(
                     self.locs_away[half][k][tp, 0],
                     self.locs_away[half][k][tp, 1], color='black'
@@ -274,14 +289,16 @@ class PitchControl:
             plt.contourf(xx, yy, pitch_control)
 
             for k in self.locs_home[half].keys():
-                if len(self.locs_home[half][k]) >= fr:
+                # if len(self.locs_home[half][k]) >= fr:
+                if np.isfinite(self.locs_home[half][k][fr, :]).all():
                     plt.scatter(
                         self.locs_home[half][k][fr, 0],
                         self.locs_home[half][k][fr, 1],
                         color='darkgrey'
                     )
             for k in self.locs_away[half].keys():
-                if len(self.locs_away[half][k]) >= fr:
+                # if len(self.locs_away[half][k]) >= fr:
+                if np.isfinite(self.locs_away[half][k][fr, :]).all():
                     plt.scatter(
                         self.locs_away[half][k][fr, 0],
                         self.locs_away[half][k][fr, 1],

{rustat-python-api-0.5.2 → rustat-python-api-0.5.4}/rustat_python_api/urls.py

@@ -4,5 +4,6 @@ URLs = {
     "match_stats": "http://feeds.rustatsport.ru/?tpl=207&user={user}&key={password}&match_id={match_id}&lang_id=1&format=json",
     "tournament_teams": "http://feeds.rustatsport.ru/?tpl=32&user={user}&key={password}&tournament_id=2&season_id={season_id}&date_start=&date_end=&lang_id=1&format=json",
     "tracking": "https://feeds.rustatsport.ru/?tpl=274&user={user}&key={password}&match_id={match_id}&lang_id=0&format=json",
+    "tracking_30fps": "https://feeds.rustatsport.ru/?tpl=1013&user={user}&key={password}&match_id={match_id}&referee_data={referee_data}&ball_data={ball_data}&half={half}&lang_id={lang_id}&format=json",
     "player_match_stats": "http://feeds.rustatsport.ru/?tpl=227&user={user}&key={password}&match_id={match_id}&lang_id=1&format=json"
 }

{rustat-python-api-0.5.2 → rustat-python-api-0.5.4/rustat_python_api.egg-info}/PKG-INFO

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

{rustat-python-api-0.5.2 → rustat-python-api-0.5.4}/setup.py

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