Add results

Source/Build/update.py

@@ -1,3 +1,4 @@
+from operator import index
 import nfl_data_py.nfl_data_py as nfl
 import build
 import datetime as dt
@@ -6,10 +7,20 @@ import pandas as pd
 pd.set_option('chained_assignment',None)
 pd.set_option('display.max_columns',None)
 import os
+import pickle as pkl
 
 current_directory = os.path.dirname(os.path.abspath(__file__))
 parent_directory = os.path.dirname(current_directory)
 data_directory = os.path.join(parent_directory, 'Data')
+pickle_directory = os.path.join(parent_directory, 'Pickles')
+
+# get team abbreviations
+file_path = os.path.join(pickle_directory, 'team_name_to_abbreviation.pkl')
+with open(file_path, 'rb') as f:
+    team_name_to_abbreviation = pkl.load(f)
+file_path = os.path.join(pickle_directory, 'team_abbreviation_to_name.pkl')
+with open(file_path, 'rb') as f:
+    team_abbreviation_to_name = pkl.load(f)
 
 # get current season
 year = dt.datetime.now().year
@@ -20,3 +31,20 @@ current_season = year if month in [8,9,10,11,12] else year-1
 build.build_gbg_data(get_seasons=[current_season])
 build.add_odds_data()
 
+# get winners
+pbp = build.get_pbp_data([2023])
+pbp = pbp.drop_duplicates(subset='game_id')
+pbp[['season','week','away','home']] = pbp['game_id'].str.split('_', expand=True)
+games = pbp[['game_id','away_score','home_score','season','week','away','home']]
+games[['away_score','home_score','season','week']] = games[['away_score','home_score','season','week']].astype(int)
+
+games['away_team'] = games['away'].map(team_abbreviation_to_name)
+games['home_team'] = games['home'].map(team_abbreviation_to_name)
+
+games['total'] = games['away_score'] + games['home_score']
+games['winner'] = [a if a_s>h_s else h if h_s>a_s else 'Tie' for a,h,a_s,h_s in games[['away_team','home_team','away_score','home_score']].values]
+
+file_path = os.path.join(data_directory, 'results.csv')
+games[['game_id','total','winner']].to_csv(file_path, index=False)
+
+

Source/Data/results.csv

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cba191ba24d4a23d9ebd2720203deb51546e3a121a335320bb50db8bcb6084b9
+size 584

Source/Predict/predict.py

@@ -16,6 +16,9 @@ pickle_directory = os.path.join(parent_directory, 'Pickles')
 file_path = os.path.join(data_directory, 'gbg_this_year.csv')
 gbg = pd.read_csv(file_path, low_memory=False)
 
+file_path = os.path.join(data_directory, 'results.csv')
+results = pd.read_csv(file_path, low_memory=False)
+
 # get team abbreviations
 file_path = os.path.join(pickle_directory, 'team_name_to_abbreviation.pkl')
 with open(file_path, 'rb') as f:
@@ -77,41 +80,68 @@ def get_one_week(home,away,season,week):
 
 def predict(home,away,season,week,total):
     # finish preparing data
-    home_abbrev = team_name_to_abbreviation[home]
-    away_abbrev = team_name_to_abbreviation[away]
+    if len(home)>4:
+        home_abbrev = team_name_to_abbreviation[home]
+    else:
+        home_abbrev = home
+
+    if len(away)>4:
+        away_abbrev = team_name_to_abbreviation[away]
+    else:
+        away_abbrev = away
+
     data = get_one_week(home_abbrev,away_abbrev,season,week)
     data['Total Score Close'] = total
     matrix = xgb.DMatrix(data.astype(float).values)
 
+    # create game id 
+    game_id = str(season) + '_0' + str(week) + '_' + away_abbrev + '_' + home_abbrev
+
     # moneyline
-    model = 'xgboost_ML_no_odds_69.8%'
+    model = 'xgboost_ML_no_odds_71.4%'
     file_path = os.path.join(model_directory, f'{model}.json')
     xgb_ml = xgb.Booster()
     xgb_ml.load_model(file_path)
+
+    try:
+        moneyline_result = results.loc[results['game_id']==game_id, 'winner'].item()
+    except:
+        moneyline_result = 'N/A'
+
     try:
         ml_predicted_proba = xgb_ml.predict(matrix)[0][1]
-        print(xgb_ml.predict(matrix))
         winner_proba = max([ml_predicted_proba, 1-ml_predicted_proba]).item()
-        moneyline = {'Winner': [home if ml_predicted_proba>0.6 else away if ml_predicted_proba<0.4 else 'Toss-Up'],
-                     'Probabilities':[winner_proba]}
+        moneyline = {'Winner': [home if ml_predicted_proba>0.5 else away if ml_predicted_proba<0.5 else 'Toss-Up'],
+                     'Probabilities':[winner_proba],
+                     'Result': moneyline_result}
     except:
         moneyline = {'Winner': 'NA',
-                     'Probabilities':['N/A']}
+                     'Probabilities':['N/A'],
+                     'Result': moneyline_result}
 
     # over/under
     model = 'xgboost_OU_no_odds_60.8%'
     file_path = os.path.join(model_directory, f'{model}.json')
     xgb_ou = xgb.Booster()
     xgb_ou.load_model(file_path)
+    
+    try:
+        result = results.loc[results['game_id']==game_id, 'total'].item()
+        over_under_result = 'Over' if float(result)>float(total) else 'Under'
+    except:
+        over_under_result = 'N/A'
+    
     try:
         ou_predicted_proba = xgb_ou.predict(matrix)[0][1]
         ou_proba = max([ou_predicted_proba, 1-ou_predicted_proba]).item()
+
         over_under = {'Over/Under': ['Over' if ou_predicted_proba>0.5 else 'Under'],
-                      'Probability': [ou_proba]}
+                      'Probability': [ou_proba],
+                      'Result': over_under_result}
     except:
         over_under = {'Over/Under': 'N/A',
-                      'Probability': ['N/A']}
+                      'Probability': ['N/A'],
+                      'Result': over_under_result}
     
-    # create game id to save predictions
-    game_id = str(season) + '_' + str(week) + '_' + away_abbrev + '_' + home_abbrev
+    print(moneyline)
     return game_id, moneyline, over_under

Templates/index.html

@@ -82,11 +82,13 @@
         position: relative;
         width: 100%;  
         text-align: center; 
+        display: flex;
+        justify-content: center;
+        align-items: center;
     }
     .winner-image {
-        width: 50px;
         height: auto;
-        margin: auto;  
+        margin: 0;
         transition: opacity 0.3s ease;
     }
     .overlay {
@@ -95,7 +97,7 @@
         left: 0;
         width: 100%;
         height: 100%;
-        background-color: rgba(0, 0, 0, 0.7);
+        background-color: rgba(0, 0, 0, 0.9);
         color: white;
         display: flex;
         justify-content: center;
@@ -117,23 +119,25 @@
     }
     .over-under-text {
         display: inline-block;
-        margin: auto;
+        margin: 0;
+        margin-right: 2px;
+        font-weight: bold;
     }
     .over {
-        background-color: green;
+        color: green;
     }
     .under {
-        background-color: red;
+        color: red;
     }
     .na {
-        background-color: grey;
+        color: white;
     }
     .over-under-wrapper .overlay {
         position: absolute;
         top: 0;
         left: 0;
         width: 100%;
-        background-color: rgba(0, 0, 0, 0.7);
+        background-color: rgba(0, 0, 0, 0.9);
         color: white;
         display: flex;
         justify-content: center;
@@ -259,36 +263,36 @@
 
     <script>
     async function fetchGames() {
-    const response = await fetch('/get_games');
-    const games = await response.json();
-    const table = document.getElementById('gameTable');
-    const columns = ['Date','Away Team', 'Home Team']; 
-
-    games.forEach((game) => {
-        const row = table.insertRow(-1);
-        
-        columns.forEach((column) => {
-            const cell = row.insertCell(-1);
-            if (column === 'Away Team' || column === 'Home Team') {
-                const img = document.createElement('img');
-                img.src = `/Static/${game[column]}.webp`;
-                img.alt = game[column];
-                img.width = 50; 
-                cell.appendChild(img);
-            } else {
-                cell.textContent = game[column];
-            }
-        });
+        const response = await fetch('/get_games');
+        const pulled_games = await response.json();
+        const table = document.getElementById('gameTable');
+        const columns = ['Date','Away Team', 'Home Team']; 
+
+        pulled_games.forEach((game) => {
+            const row = table.insertRow(-1);
+            
+            columns.forEach((column) => {
+                const cell = row.insertCell(-1);
+                if (column === 'Away Team' || column === 'Home Team') {
+                    const img = document.createElement('img');
+                    img.src = `/Static/${game[column]}.webp`;
+                    img.alt = game[column];
+                    img.width = 50; 
+                    cell.appendChild(img);
+                } else {
+                    cell.textContent = game[column];
+                }
+            });
 
-        for (let i = 0; i < 3; i++) {
-            const cell = row.insertCell(-1);
-            if (i<1) {
-                const input = document.createElement('input');
-                input.type = 'text';
-                cell.appendChild(input);
+            for (let i = 0; i < 3; i++) {
+                const cell = row.insertCell(-1);
+                if (i<1) {
+                    const input = document.createElement('input');
+                    input.type = 'text';
+                    cell.appendChild(input);
+                }
             }
-        }
-        });
+            });
     }
 
     fetchGames();
@@ -341,6 +345,18 @@
                 winnerImg.className = 'winner-image hidden';
                 wrapperDiv.appendChild(winnerImg);
 
+                const winnerEmojiDiv = document.createElement('div');
+                winnerEmojiDiv.className = 'emoji';
+                if (moneyline.Winner === moneyline.Result) {
+                    winnerEmojiDiv.textContent = '✅';
+                } else {
+                    winnerEmojiDiv.textContent = '❌';
+                }
+                if (moneyline.Result === 'N/A') {
+                    winnerEmojiDiv.textContent = '';
+                }
+                wrapperDiv.appendChild(winnerEmojiDiv);
+
                 setTimeout(() => {
                     winnerImg.classList.remove('hidden');
                 }, 10);
@@ -370,6 +386,18 @@
 
                 overUnderDiv.appendChild(textDiv);
 
+                const overEmojiDiv = document.createElement('div');
+                overEmojiDiv.className = 'emoji';
+                if (data.over_unders[index]['Over/Under'] === data.over_unders[index]['Result']) {
+                    overEmojiDiv.textContent = '✅';
+                } else {
+                    overEmojiDiv.textContent = '❌';
+                }
+                if (data.over_unders[index]['Result'] === 'N/A') {
+                    overEmojiDiv.textContent = '';
+                }
+                overUnderDiv.appendChild(overEmojiDiv);
+
                 setTimeout(() => {
                     overUnderDiv.classList.remove('hidden');
                 }, 10);
@@ -380,6 +408,7 @@
                 overUnderDiv.appendChild(overUnderOverlayDiv);
 
                 overUnderCell.appendChild(overUnderDiv);
+            
             });
         }
         });