Merge pull request #68 from nickpadd/develop

Merge develop
nickpadd · Feb 26, 2024 · 7d7b134 · 7d7b134
2 parents 2c8a767 + 6dfcf5b
commit 7d7b134
Show file tree

Hide file tree

Showing 13 changed files with 194 additions and 336 deletions.
diff --git a/.github/workflows/script_pipeline.yaml b/.github/workflows/script_pipeline.yaml
@@ -67,10 +67,10 @@ jobs:
       #----------------------------------------------
       #              run updates
       #----------------------------------------------
-      - name: Run updates script
-        run: |
-          source $VENV
-          python run_updates.py
+      #- name: Run updates script
+      #  run: |
+      #    source $VENV
+      #    python run_updates.py
 
       #----------------------------------------------
       #              run predictions

diff --git a/Predictions/EPL/InteractiveFigure.html b/Predictions/EPL/InteractiveFigure.html
diff --git a/Predictions/EPL/PredictionTable.html b/Predictions/EPL/PredictionTable.html
diff --git a/europeanfootballleaguepredictor/common/config_parser.py b/europeanfootballleaguepredictor/common/config_parser.py
@@ -81,10 +81,6 @@ def load_configuration_class(self, config_data) -> dataclass:
             module_path = 'sklearn.svm'
             regressor_module = importlib.import_module(module_path)
             regressor = getattr(regressor_module, config_data['model']['regressor'])
-        if config_data['model']['regressor'] == 'XGBRegressor': 
-            module_path = 'xgboost'
-            regressor_module = importlib.import_module(module_path)
-            regressor = getattr(regressor_module, config_data['model']['regressor'])
 
         self.config = Configuration(
                 league= config_data['league'],

diff --git a/europeanfootballleaguepredictor/data/__pycache__/bookmaker_scraper.cpython-39.pyc b/europeanfootballleaguepredictor/data/__pycache__/bookmaker_scraper.cpython-39.pyc
diff --git a/europeanfootballleaguepredictor/data/__pycache__/upcoming_matches.cpython-39.pyc b/europeanfootballleaguepredictor/data/__pycache__/upcoming_matches.cpython-39.pyc
diff --git a/europeanfootballleaguepredictor/data/bookmaker_scraper.py b/europeanfootballleaguepredictor/data/bookmaker_scraper.py
@@ -41,7 +41,7 @@ def __init__(self, url: str, dictionary: dict):
         """
         self.result_url, self.over_under_url, self.btts_url = BookmakerScraper.produce_urls(url)
         self.dictionary = dictionary
-        self.driver = uc.Chrome(version_main = 120)
+        self.driver = uc.Chrome(version_main = 122)
 
     @staticmethod    
     def produce_urls(base_url: str):

diff --git a/europeanfootballleaguepredictor/data/database/EPL_database.db b/europeanfootballleaguepredictor/data/database/EPL_database.db
diff --git a/europeanfootballleaguepredictor/models/probability_estimator.py b/europeanfootballleaguepredictor/models/probability_estimator.py
@@ -6,7 +6,6 @@
 from sklearn.linear_model import PoissonRegressor
 from sklearn.preprocessing import MinMaxScaler
 from loguru import logger
-import xgboost
 import json
 
 class FootballPredictor(BaseModel):

diff --git a/europeanfootballleaguepredictor/visualization/__pycache__/visualize.cpython-39.pyc b/europeanfootballleaguepredictor/visualization/__pycache__/visualize.cpython-39.pyc
diff --git a/predictor_app.py b/predictor_app.py
@@ -9,7 +9,6 @@
 import importlib
 import os
 import argparse
-import xgboost
 from europeanfootballleaguepredictor.data.database_handler import DatabaseHandler 
 
 
@@ -39,10 +38,6 @@ def league_predictions_figure(league_name, regressor_str, matchdays_to_drop, lon
         module_path = 'sklearn.svm'
         regressor_module = importlib.import_module(module_path)
         regressor = getattr(regressor_module, regressor_str)
-    if regressor_str == 'XGBRegressor': 
-        module_path = 'xgboost'
-        regressor_module = importlib.import_module(module_path)
-        regressor = getattr(regressor_module, regressor_str)
 
     parser = argparse.ArgumentParser()
     parser.add_argument("--config", type=str, help="Path to the configuration file (e.g., config.yaml)", default='europeanfootballleaguepredictor/config/config.yaml')
@@ -78,7 +73,7 @@ def main():
     with gr.Blocks() as iface:
         with gr.Row():
             drop1 = gr.Dropdown(['EPL', 'Bundesliga', 'Ligue_1', 'La_Liga', 'Serie_A'], label="Select League")
-            drop3 = gr.Dropdown(['LinearRegression', 'PoissonRegressor', 'SVR', 'XGBRegressor'], label="Select regressor Type")
+            drop3 = gr.Dropdown(['LinearRegression', 'PoissonRegressor', 'SVR'], label="Select regressor Type")
         with gr.Row():
             with gr.Column(scale=1, min_width=600):
                 slide1 = gr.Slider(minimum=0, maximum=10, step=1, value=4, show_label=True, interactive=True, label="Select number of matchdays to drop")

diff --git a/pyproject.toml b/pyproject.toml
@@ -25,7 +25,6 @@ matplotlib = "^3.8.1"
 seaborn = "^0.13.0"
 mlflow = "^2.8.0"
 gradio = "^4.7.1"
-xgboost = "^2.0.3"
 ipykernel = "^6.29.2"
 selenium = "^4.17.2"
 undetected-chromedriver = "^3.5.4"

diff --git a/requirements.txt b/requirements.txt
@@ -122,6 +122,5 @@ websocket-client==1.6.4 ; python_version >= "3.9" and python_version < "4.0"
 websockets==11.0.3 ; python_version >= "3.9" and python_version < "4.0"
 werkzeug==3.0.1 ; python_version >= "3.9" and python_version < "4.0"
 win32-setctime==1.1.0 ; python_version >= "3.9" and python_version < "4.0" and sys_platform == "win32"
-xgboost==2.0.3 ; python_version >= "3.9" and python_version < "4.0"
 yarl==1.9.3 ; python_version >= "3.9" and python_version < "4.0"
 zipp==3.17.0 ; python_version >= "3.9" and python_version < "4.0"