datafc 1.0.0__tar.gz → 1.1.0__tar.gz

{datafc-1.0.0 → datafc-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datafc
-Version: 1.0.0
+Version: 1.1.0
 Summary: A scalable Python library for fetching, processing, and exporting structured football match data.
 Home-page: https://github.com/urazakgul/datafc
 Author: Uraz Akgül
@@ -14,7 +14,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-# datafc v1.0.0
+# datafc v1.1.0
 
 ## Overview
 
@@ -53,7 +53,13 @@ pip install git+https://github.com/urazakgul/datafc.git
 To install a specific version of `datafc`, use:
 
 ```bash
-pip install datafc==1.0.0
+pip install datafc==1.1.0
+```
+
+If you already have `datafc` installed and want to upgrade to the latest version, run:
+
+```bash
+pip install --upgrade datafc
 ```
 
 ## Why Selenium?
@@ -142,7 +148,7 @@ Unlike the other functions, `standings_data` does not require `match_data` or `l
 
 #### `match_data`
 
-The `match_data` function fetches match data for a specified tournament, season, and matchweek. It returns a DataFrame containing details such as country, tournament name, season, week number, game ID, home team, away team, start timestamp, and match status.
+The `match_data` function fetches match data for a specified tournament, season, and matchweek. It returns a DataFrame containing details such as country, tournament name, season, week number, game ID, home team, home team ID, away team, away team ID, added injury times for both halves, start timestamp, and match status.
 
 Example Usage:
 
@@ -180,7 +186,11 @@ The returned DataFrame includes the following columns:
 * `week`: The matchweek number.
 * `game_id`: The unique identifier for the match.
 * `home_team`: The name of the home team.
+* `home_team_id`: The unique identifier for the home team.
 * `away_team`: The name of the away team.
+* `away_team_id`: The unique identifier for the away team.
+* `injury_time_1`: Added injury time in the first half.
+* `injury_time_2`: Added injury time in the second half.
 * `start_timestamp`: The start time of the match.
 * `status`: The current status of the match.
 
@@ -638,14 +648,16 @@ Dependencies:
 
 ## Changelog
 
-* v0.1.0
+* v1.1.0
+  * Added 4 new columns to `match_data`
+  * Added `data_source` parameter to `save_json` and `save_excel` for including the source in file names
+
+* v1.0.0
   * Initial release of `datafc`
   * Fetching match data using Selenium WebDriver
   * Supports Sofascore as a data source
   * Exports data in JSON and Excel formats
 
-Future releases will include additional features and bug fixes.
-
 ## License
 
 This project is open-source and licensed under the MIT License.

{datafc-1.0.0 → datafc-1.1.0}/README.md

@@ -1,4 +1,4 @@
-# datafc v1.0.0
+# datafc v1.1.0
 
 ## Overview
 
@@ -37,7 +37,13 @@ pip install git+https://github.com/urazakgul/datafc.git
 To install a specific version of `datafc`, use:
 
 ```bash
-pip install datafc==1.0.0
+pip install datafc==1.1.0
+```
+
+If you already have `datafc` installed and want to upgrade to the latest version, run:
+
+```bash
+pip install --upgrade datafc
 ```
 
 ## Why Selenium?
@@ -126,7 +132,7 @@ Unlike the other functions, `standings_data` does not require `match_data` or `l
 
 #### `match_data`
 
-The `match_data` function fetches match data for a specified tournament, season, and matchweek. It returns a DataFrame containing details such as country, tournament name, season, week number, game ID, home team, away team, start timestamp, and match status.
+The `match_data` function fetches match data for a specified tournament, season, and matchweek. It returns a DataFrame containing details such as country, tournament name, season, week number, game ID, home team, home team ID, away team, away team ID, added injury times for both halves, start timestamp, and match status.
 
 Example Usage:
 
@@ -164,7 +170,11 @@ The returned DataFrame includes the following columns:
 * `week`: The matchweek number.
 * `game_id`: The unique identifier for the match.
 * `home_team`: The name of the home team.
+* `home_team_id`: The unique identifier for the home team.
 * `away_team`: The name of the away team.
+* `away_team_id`: The unique identifier for the away team.
+* `injury_time_1`: Added injury time in the first half.
+* `injury_time_2`: Added injury time in the second half.
 * `start_timestamp`: The start time of the match.
 * `status`: The current status of the match.
 
@@ -622,14 +632,16 @@ Dependencies:
 
 ## Changelog
 
-* v0.1.0
+* v1.1.0
+  * Added 4 new columns to `match_data`
+  * Added `data_source` parameter to `save_json` and `save_excel` for including the source in file names
+
+* v1.0.0
   * Initial release of `datafc`
   * Fetching match data using Selenium WebDriver
   * Supports Sofascore as a data source
   * Exports data in JSON and Excel formats
 
-Future releases will include additional features and bug fixes.
-
 ## License
 
 This project is open-source and licensed under the MIT License.

{datafc-1.0.0 → datafc-1.1.0}/datafc/sofascore/fetch_coordinates_data.py

@@ -89,6 +89,7 @@ def coordinates_data(
             if enable_json_export:
                 save_json(
                     data=heatmap_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
@@ -98,6 +99,7 @@ def coordinates_data(
             if enable_excel_export:
                 save_excel(
                     data=heatmap_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],

{datafc-1.0.0 → datafc-1.1.0}/datafc/sofascore/fetch_goal_networks_data.py

@@ -124,6 +124,7 @@ def goal_networks_data(
             if enable_json_export:
                 save_json(
                     data=actions_list_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
@@ -133,6 +134,7 @@ def goal_networks_data(
             if enable_excel_export:
                 save_excel(
                     data=actions_list_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],

{datafc-1.0.0 → datafc-1.1.0}/datafc/sofascore/fetch_lineups_data.py

@@ -119,6 +119,7 @@ def lineups_data(
             if enable_json_export:
                 save_json(
                     data=extracted_lineups_data_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
@@ -128,6 +129,7 @@ def lineups_data(
             if enable_excel_export:
                 save_excel(
                     data=extracted_lineups_data_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],

{datafc-1.0.0 → datafc-1.1.0}/datafc/sofascore/fetch_match_data.py

@@ -60,7 +60,11 @@ def match_data(
             "week": events_df["roundInfo"].apply(lambda x: x.get("round", "")),
             "game_id": events_df["id"],
             "home_team": events_df["homeTeam"].apply(lambda x: x.get("name", "")),
+            "home_team_id": events_df["homeTeam"].apply(lambda x: x.get("id", "")),
             "away_team": events_df["awayTeam"].apply(lambda x: x.get("name", "")),
+            "away_team_id": events_df["awayTeam"].apply(lambda x: x.get("id", "")),
+            "injury_time_1": events_df["time"].apply(lambda x: x.get("injuryTime1", "")),
+            "injury_time_2": events_df["time"].apply(lambda x: x.get("injuryTime2", "")),
             "start_timestamp": events_df["startTimestamp"],
             "status": events_df["status"].apply(lambda x: x.get("description", ""))
         })
@@ -71,6 +75,7 @@ def match_data(
             if enable_json_export:
                 save_json(
                     data=match_data_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
@@ -80,6 +85,7 @@ def match_data(
             if enable_excel_export:
                 save_excel(
                     data=match_data_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],

{datafc-1.0.0 → datafc-1.1.0}/datafc/sofascore/fetch_match_odds_data.py

@@ -73,17 +73,18 @@ def match_odds_data(
             except json.JSONDecodeError:
                 raise RuntimeError(f"Failed to decode odds data for game {game_id}.")
 
-        game_odds_dataframe = pd.DataFrame(odds_list)
+        game_odds_df = pd.DataFrame(odds_list)
 
-        if game_odds_dataframe.empty:
+        if game_odds_df.empty:
             raise ValueError("No match odds data found for the specified parameters.")
 
         if enable_json_export or enable_excel_export:
-            first_row = game_odds_dataframe.iloc[0]
+            first_row = game_odds_df.iloc[0]
 
             if enable_json_export:
                 save_json(
-                    data=game_odds_dataframe,
+                    data=game_odds_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
@@ -92,14 +93,15 @@ def match_odds_data(
 
             if enable_excel_export:
                 save_excel(
-                    data=game_odds_dataframe,
+                    data=game_odds_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
                     week_number=first_row["week"]
                 )
 
-        return game_odds_dataframe
+        return game_odds_df
 
     except WebDriverException as e:
         raise RuntimeError(f"Selenium WebDriver error: {str(e)}")

{datafc-1.0.0 → datafc-1.1.0}/datafc/sofascore/fetch_match_stats_data.py

@@ -71,17 +71,18 @@ def match_stats_data(
             except json.JSONDecodeError:
                 raise RuntimeError(f"Failed to decode match statistics for game {game_id}.")
 
-        game_statistics_dataframe = pd.DataFrame(statistics_list)
+        game_statistics_df = pd.DataFrame(statistics_list)
 
-        if game_statistics_dataframe.empty:
+        if game_statistics_df.empty:
             raise ValueError("No match statistics data found for the specified parameters.")
 
         if enable_json_export or enable_excel_export:
-            first_row = game_statistics_dataframe.iloc[0]
+            first_row = game_statistics_df.iloc[0]
 
             if enable_json_export:
                 save_json(
-                    data=game_statistics_dataframe,
+                    data=game_statistics_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
@@ -90,14 +91,15 @@ def match_stats_data(
 
             if enable_excel_export:
                 save_excel(
-                    data=game_statistics_dataframe,
+                    data=game_statistics_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
                     week_number=first_row["week"]
                 )
 
-        return game_statistics_dataframe
+        return game_statistics_df
 
     except WebDriverException as e:
         raise RuntimeError(f"Selenium WebDriver error: {str(e)}")

{datafc-1.0.0 → datafc-1.1.0}/datafc/sofascore/fetch_momentum_data.py

@@ -66,17 +66,18 @@ def momentum_data(
             except json.JSONDecodeError:
                 raise RuntimeError(f"Failed to decode momentum data for game {game_id}.")
 
-        momentum_dataframe = pd.DataFrame(momentum_list)
+        momentum_df = pd.DataFrame(momentum_list)
 
-        if momentum_dataframe.empty:
+        if momentum_df.empty:
             raise ValueError("No momentum data found for the specified parameters.")
 
         if enable_json_export or enable_excel_export:
-            first_row = momentum_dataframe.iloc[0]
+            first_row = momentum_df.iloc[0]
 
             if enable_json_export:
                 save_json(
-                    data=momentum_dataframe,
+                    data=momentum_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
@@ -85,14 +86,15 @@ def momentum_data(
 
             if enable_excel_export:
                 save_excel(
-                    data=momentum_dataframe,
+                    data=momentum_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
                     week_number=first_row["week"]
                 )
 
-        return momentum_dataframe
+        return momentum_df
 
     except WebDriverException as e:
         raise RuntimeError(f"Selenium WebDriver error: {str(e)}")

{datafc-1.0.0 → datafc-1.1.0}/datafc/sofascore/fetch_shots_data.py

@@ -102,17 +102,18 @@ def shots_data(
             except json.JSONDecodeError:
                 raise RuntimeError(f"Failed to decode shot data for game {game_id}.")
 
-        shotmap_dataframe = pd.DataFrame(shotmap_list)
+        shotmap_df = pd.DataFrame(shotmap_list)
 
-        if shotmap_dataframe.empty:
+        if shotmap_df.empty:
             raise ValueError("No shot data found for the specified parameters.")
 
         if enable_json_export or enable_excel_export:
-            first_row = shotmap_dataframe.iloc[0]
+            first_row = shotmap_df.iloc[0]
 
             if enable_json_export:
                 save_json(
-                    data=shotmap_dataframe,
+                    data=shotmap_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
@@ -121,14 +122,15 @@ def shots_data(
 
             if enable_excel_export:
                 save_excel(
-                    data=shotmap_dataframe,
+                    data=shotmap_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
                     week_number=first_row["week"]
                 )
 
-        return shotmap_dataframe
+        return shotmap_df
 
     except WebDriverException as e:
         raise RuntimeError(f"Selenium WebDriver error: {str(e)}")

{datafc-1.0.0 → datafc-1.1.0}/datafc/sofascore/fetch_standings_data.py

@@ -70,17 +70,18 @@ def standings_data(
             except json.JSONDecodeError:
                 raise RuntimeError(f"Failed to decode standings data for category {category}.")
 
-        points_table_dataframe = pd.DataFrame(points_table_list)
+        points_table_df = pd.DataFrame(points_table_list)
 
-        if points_table_dataframe.empty:
+        if points_table_df.empty:
             raise ValueError("No standings data found for the specified parameters.")
 
         if enable_json_export or enable_excel_export:
-            first_row = points_table_dataframe.iloc[0]
+            first_row = points_table_df.iloc[0]
 
             if enable_json_export:
                 save_json(
-                    data=points_table_dataframe,
+                    data=points_table_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=None,
@@ -89,14 +90,15 @@ def standings_data(
 
             if enable_excel_export:
                 save_excel(
-                    data=points_table_dataframe,
+                    data=points_table_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=None,
                     week_number=None
                 )
 
-        return points_table_dataframe
+        return points_table_df
 
     except WebDriverException as e:
         raise RuntimeError(f"Selenium WebDriver error: {str(e)}")

{datafc-1.0.0 → datafc-1.1.0}/datafc/sofascore/fetch_substitutions_data.py

@@ -70,17 +70,18 @@ def substitutions_data(
             except json.JSONDecodeError:
                 raise RuntimeError(f"Failed to decode substitution data for game {game_id}.")
 
-        substitutions_dataframe = pd.DataFrame(substitutions_list)
+        substitutions_df = pd.DataFrame(substitutions_list)
 
-        if substitutions_dataframe.empty:
+        if substitutions_df.empty:
             raise ValueError("No substitution data found for the specified parameters.")
 
         if enable_json_export or enable_excel_export:
-            first_row = substitutions_dataframe.iloc[0]
+            first_row = substitutions_df.iloc[0]
 
             if enable_json_export:
                 save_json(
-                    data=substitutions_dataframe,
+                    data=substitutions_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
@@ -89,14 +90,15 @@ def substitutions_data(
 
             if enable_excel_export:
                 save_excel(
-                    data=substitutions_dataframe,
+                    data=substitutions_df,
+                    data_source=data_source,
                     country=first_row["country"],
                     tournament=first_row["tournament"],
                     season=first_row["season"],
                     week_number=first_row["week"]
                 )
 
-        return substitutions_dataframe
+        return substitutions_df
 
     except WebDriverException as e:
         raise RuntimeError(f"Selenium WebDriver error: {str(e)}")

{datafc-1.0.0 → datafc-1.1.0}/datafc/utils/_save_files.py

@@ -2,7 +2,7 @@ import json
 import pandas as pd
 import inspect
 
-def save_json(data: pd.DataFrame, country: str, tournament: int, season: int = None, week_number: int = None) -> None:
+def save_json(data: pd.DataFrame, data_source: str,  country: str, tournament: int, season: int = None, week_number: int = None) -> None:
     calling_function = inspect.stack()[1].function
 
     country = country.lower().replace(" ", "_")
@@ -13,11 +13,11 @@ def save_json(data: pd.DataFrame, country: str, tournament: int, season: int = N
             season = season.replace("/", "")
 
     if season is not None and week_number is not None:
-        file_name = f"{country}_{tournament}_{season}_{week_number}_{calling_function}.json"
+        file_name = f"{data_source}_{country}_{tournament}_{season}_{week_number}_{calling_function}.json"
     elif season is not None:
-        file_name = f"{country}_{tournament}_{season}_{calling_function}.json"
+        file_name = f"{data_source}_{country}_{tournament}_{season}_{calling_function}.json"
     else:
-        file_name = f"{country}_{tournament}_{calling_function}.json"
+        file_name = f"{data_source}_{country}_{tournament}_{calling_function}.json"
 
     try:
         with open(file_name, "w", encoding="utf-8") as json_file:
@@ -26,7 +26,7 @@ def save_json(data: pd.DataFrame, country: str, tournament: int, season: int = N
     except Exception as e:
         print(f"Error saving JSON: {e}")
 
-def save_excel(data: pd.DataFrame, country: str, tournament: int, season: int = None, week_number: int = None) -> None:
+def save_excel(data: pd.DataFrame, data_source: str, country: str, tournament: int, season: int = None, week_number: int = None) -> None:
     calling_function = inspect.stack()[1].function
 
     country = country.lower().replace(" ", "_")
@@ -37,11 +37,11 @@ def save_excel(data: pd.DataFrame, country: str, tournament: int, season: int =
             season = season.replace("/", "")
 
     if season is not None and week_number is not None:
-        file_name = f"{country}_{tournament}_{season}_{week_number}_{calling_function}.xlsx"
+        file_name = f"{data_source}_{country}_{tournament}_{season}_{week_number}_{calling_function}.xlsx"
     elif season is not None:
-        file_name = f"{country}_{tournament}_{season}_{calling_function}.xlsx"
+        file_name = f"{data_source}_{country}_{tournament}_{season}_{calling_function}.xlsx"
     else:
-        file_name = f"{country}_{tournament}_{calling_function}.xlsx"
+        file_name = f"{data_source}_{country}_{tournament}_{calling_function}.xlsx"
 
     try:
         data.to_excel(file_name, index=False)

{datafc-1.0.0 → datafc-1.1.0}/datafc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datafc
-Version: 1.0.0
+Version: 1.1.0
 Summary: A scalable Python library for fetching, processing, and exporting structured football match data.
 Home-page: https://github.com/urazakgul/datafc
 Author: Uraz Akgül
@@ -14,7 +14,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 
-# datafc v1.0.0
+# datafc v1.1.0
 
 ## Overview
 
@@ -53,7 +53,13 @@ pip install git+https://github.com/urazakgul/datafc.git
 To install a specific version of `datafc`, use:
 
 ```bash
-pip install datafc==1.0.0
+pip install datafc==1.1.0
+```
+
+If you already have `datafc` installed and want to upgrade to the latest version, run:
+
+```bash
+pip install --upgrade datafc
 ```
 
 ## Why Selenium?
@@ -142,7 +148,7 @@ Unlike the other functions, `standings_data` does not require `match_data` or `l
 
 #### `match_data`
 
-The `match_data` function fetches match data for a specified tournament, season, and matchweek. It returns a DataFrame containing details such as country, tournament name, season, week number, game ID, home team, away team, start timestamp, and match status.
+The `match_data` function fetches match data for a specified tournament, season, and matchweek. It returns a DataFrame containing details such as country, tournament name, season, week number, game ID, home team, home team ID, away team, away team ID, added injury times for both halves, start timestamp, and match status.
 
 Example Usage:
 
@@ -180,7 +186,11 @@ The returned DataFrame includes the following columns:
 * `week`: The matchweek number.
 * `game_id`: The unique identifier for the match.
 * `home_team`: The name of the home team.
+* `home_team_id`: The unique identifier for the home team.
 * `away_team`: The name of the away team.
+* `away_team_id`: The unique identifier for the away team.
+* `injury_time_1`: Added injury time in the first half.
+* `injury_time_2`: Added injury time in the second half.
 * `start_timestamp`: The start time of the match.
 * `status`: The current status of the match.
 
@@ -638,14 +648,16 @@ Dependencies:
 
 ## Changelog
 
-* v0.1.0
+* v1.1.0
+  * Added 4 new columns to `match_data`
+  * Added `data_source` parameter to `save_json` and `save_excel` for including the source in file names
+
+* v1.0.0
   * Initial release of `datafc`
   * Fetching match data using Selenium WebDriver
   * Supports Sofascore as a data source
   * Exports data in JSON and Excel formats
 
-Future releases will include additional features and bug fixes.
-
 ## License
 
 This project is open-source and licensed under the MIT License.

{datafc-1.0.0 → datafc-1.1.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="datafc",
-    version="1.0.0",
+    version="1.1.0",
     author="Uraz Akgül",
     author_email="urazdev@gmail.com",
     description="A scalable Python library for fetching, processing, and exporting structured football match data.",