rustat-python-api 0.3.3__tar.gz → 0.4.1__tar.gz

{rustat-python-api-0.3.3/rustat_python_api.egg-info → rustat-python-api-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rustat-python-api
-Version: 0.3.3
+Version: 0.4.1
 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.3 → rustat-python-api-0.4.1}/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.4.1/rustat_python_api/__init__.py

@@ -0,0 +1,4 @@
+from .parser import RuStatParser
+from .models_api import DynamoLab
+
+__all__ = ['RuStatParser', 'DynamoLab']

rustat-python-api-0.4.1/rustat_python_api/models_api.py

@@ -0,0 +1,58 @@
+import requests
+import numpy as np
+import pandas as pd
+
+
+class DynamoLab:
+    def __init__(self, host: str = "http://localhost:8000/"):
+        self.host = host
+
+    def get_active_models(self):
+        url = self.host + "models"
+        response = requests.get(url)
+        return response.json()
+
+    def run_model(
+        self,
+        model: str,
+        data: pd.DataFrame,
+        return_type: str = "json",
+        inplace: bool = False,
+        return_df: bool = False,
+        inplace_column: str = None
+    ):
+        """
+        model: str
+            The name of the model to run
+        return_type: str
+            One of: "json", "list", "numpy"
+        """
+
+        url = self.host + "predict"
+        csv_string = data.to_csv(index=False)
+
+        body = {
+            "model": model,
+            "data": csv_string,
+        }
+
+        response = requests.post(url, json=body)
+
+        if return_df or inplace:
+            if inplace_column is None:
+                raise ValueError("inplace_column must be specified if inplace is True")
+            if inplace:
+                data[inplace_column] = response.json()["prediction"]
+            if df:
+                df = data.copy()
+                df[inplace_column] = response.json()["prediction"]
+                return df
+
+        if return_type == "json":
+            return response.json()
+        elif return_type == "list":
+            return response.json()["prediction"]
+        elif return_type == "numpy":
+            return np.array(response.json()["prediction"])
+        else:
+            raise ValueError("return_type must be one of: json, list, numpy")

{rustat-python-api-0.3.3 → rustat-python-api-0.4.1}/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.3 → rustat-python-api-0.4.1/rustat_python_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rustat-python-api
-Version: 0.3.3
+Version: 0.4.1
 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.3 → rustat-python-api-0.4.1}/rustat_python_api.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 setup.py
 rustat_python_api/__init__.py
 rustat_python_api/config.py
+rustat_python_api/models_api.py
 rustat_python_api/parser.py
 rustat_python_api/processing.py
 rustat_python_api/urls.py

{rustat-python-api-0.3.3 → rustat-python-api-0.4.1}/setup.py

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

rustat-python-api-0.3.3/rustat_python_api/__init__.py

@@ -1,3 +0,0 @@
-from .parser import RuStatParser
-
-__all__ = ['RuStatParser']