Spaces:

BraydenMoore
/

marci

Running

+{
+    "2":[
+        49,
+        40.5,
+        47,
+        45.5,
+        47,
+        39.5,
+        51.5,
+        41,
+        45,
+        40,
+        44.5,
+        39,
+        37.5,
+        47,
+        39.5,
+        39
+    ],
+    "3":[
+        44.5,
+        43,
+        38,
+        47,
+        41.5,
+        43.5,
+        47.5,
+        54.5,
+        35,
+        43,
+        42.5,
+        44,
+        48.8,
+        43.5,
+        45,
+        43.5
+    ],
+    "4":[
+        45.5,
+        43,
+        53.5,
+        45.5,
+        46,
+        41,
+        42.5,
+        46.5,
+        40.5,
+        43.5,
+        41,
+        48,
+        43,
+        44.5,
+        41.5,
+        47
+    ]
+}

Source/Predict/__pycache__/predict.cpython-311.pyc CHANGED Viewed

Binary files a/Source/Predict/__pycache__/predict.cpython-311.pyc and b/Source/Predict/__pycache__/predict.cpython-311.pyc differ

Source/Predict/predict.py CHANGED Viewed

@@ -7,6 +7,7 @@ import requests
 from bs4 import BeautifulSoup
 import warnings
 warnings.filterwarnings("ignore")
 # set dirs for other files
 current_directory = os.path.dirname(os.path.abspath(__file__))
@@ -30,6 +31,20 @@ 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)
 def get_week():
     headers = {
     'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
@@ -47,7 +62,6 @@ def get_week():
     h2_tags = soup.find_all('h2')
     year = h2_tags[0].getText().split(' ')[0]
     week = h2_tags[0].getText().split(' ')[-1]
-    print(week)
     return int(week), int(year)
@@ -103,13 +117,8 @@ def predict(home,away,season,week,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_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()
@@ -126,12 +135,6 @@ def predict(home,away,season,week,total):
         moneyline = {'Winner': 'NA',
                      'Probabilities':['N/A'],
                      'Result': moneyline_result}
-    # over/under
-    model = 'xgboost_OU_no_odds_59.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()

 from bs4 import BeautifulSoup
 import warnings
 warnings.filterwarnings("ignore")
+from datetime import datetime
 # set dirs for other files
 current_directory = os.path.dirname(os.path.abspath(__file__))
 with open(file_path, 'rb') as f:
     team_abbreviation_to_name = pkl.load(f)
+# load models
+# moneyline
+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)
+# over/under
+model = 'xgboost_OU_no_odds_59.8%'
+file_path = os.path.join(model_directory, f'{model}.json')
+xgb_ou = xgb.Booster()
+xgb_ou.load_model(file_path)
 def get_week():
     headers = {
     'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
     h2_tags = soup.find_all('h2')
     year = h2_tags[0].getText().split(' ')[0]
     week = h2_tags[0].getText().split(' ')[-1]
     return int(week), int(year)
     matrix = xgb.DMatrix(data.astype(float).values)
     # create game id
+    game_id = str(season) + '_0' + str(int(week)) + '_' + away_abbrev + '_' + home_abbrev
+    print(game_id)
     try:
         moneyline_result = results.loc[results['game_id']==game_id, 'winner'].item()
         moneyline = {'Winner': 'NA',
                      'Probabilities':['N/A'],
                      'Result': moneyline_result}
     try:
         result = results.loc[results['game_id']==game_id, 'total'].item()

Templates/index.html CHANGED Viewed

@@ -3,7 +3,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <head>
     <link rel="shortcut icon" type="image/x-icon" href="https://images.squarespace-cdn.com/content/v1/64790f5777b5d772678cce83/6d71eaee-f825-4324-be9b-2def32469eac/favicon.ico?format=100w">
-    <title>MARCI</title>
 </head>
 <style>
     body {
@@ -35,6 +35,7 @@
     }
     table {
         margin-top: 20px;
         width: 80%;
         border-collapse: collapse;
@@ -95,12 +96,14 @@
         cursor: pointer;
     }
     .winner-wrapper {
         position: relative;
         width: 100%;
         text-align: center;
         display: flex;
         justify-content: center;
         align-items: center;
     }
     .winner-image {
         height: auto;
@@ -108,31 +111,15 @@
         transition: 0.3s ease;
     }
-    .overlay {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        background-color: rgba(0, 0, 0, 0.8);
-        color: white;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        opacity: 0;
-        transition: opacity 0.3s ease;
-    }
-    .winner-wrapper:hover .overlay {
-        opacity: 1;
-    }
     .over-under-wrapper {
         position: relative;
         width: 100%;
         height: 50px;
         display: flex;
         align-items: center;
         justify-content: center;
-        transition: opacity 0.3s ease;
     }
     .over-under-text {
         display: inline-block;
@@ -239,11 +226,6 @@
     .emoji {
         margin-left: 5px;
         color: rgb(255, 255, 255);
-    }
-    .emoji:hover{
-        color:#ffffff;
-        font-weight: bold;
         transition: 0.3s ease;
     }
@@ -275,6 +257,15 @@
         display: inline-block;
     }
     @keyframes spin {
         0% {
             transform: rotate(0deg);
@@ -328,6 +319,10 @@
         <span class="label">Winners:</span> {{ winners_correct }}-{{winners_incorrect}}{{winners_tie}}<span class="label"> ({{ winners_return }})</span><br>
         <span class="label">Over/Unders:</span> {{over_unders_correct}}-{{over_unders_incorrect}}{{over_unders_push}}<span class="label"> ({{over_unders_return}})</span><br><br>
     </div>
     <div class="table-div">
         <table id="gameTable">
             <tr>
@@ -386,10 +381,15 @@
     <script>
-    async function fetchGames() {
-        const response = await fetch('/get_games');
         const pulled_games = await response.json();
         const table = document.getElementById('gameTable');
         const columns = ['Date','Away Team', 'Home Team'];
         const lines_response = await fetch('/get_lines');
         const lines = await lines_response.json()
@@ -494,13 +494,14 @@
                     const winnerEmojiDiv = document.createElement('div');
                     winnerEmojiDiv.className = 'emoji';
                     if (moneyline.Winner[0] === moneyline.Result) {
                         winnerEmojiDiv.textContent = '✅';
                     } else {
                         winnerEmojiDiv.textContent = '❌';
                     }
                     if (moneyline.Result === 'N/A') {
-                        winnerEmojiDiv.textContent = `(${(moneyline.Probabilities[0] * 100).toFixed(0)}%)`;
                     }
                     wrapperDiv.appendChild(winnerEmojiDiv);
@@ -539,13 +540,14 @@
                     const overEmojiDiv = document.createElement('div');
                     overEmojiDiv.className = 'emoji';
                     if (data.over_unders[index]['Over/Under'][0] === data.over_unders[index]['Result']) {
                         overEmojiDiv.textContent = '✅';
                     } else {
                         overEmojiDiv.textContent = '❌';
                     }
                     if (data.over_unders[index]['Result'] === 'N/A') {
-                        overEmojiDiv.textContent = `(${(data.over_unders[index]['Probability'][0] * 100).toFixed(0)}%)`;
                     }
                     overUnderDiv.appendChild(overEmojiDiv);
@@ -554,24 +556,115 @@
                     }, 10);
                     overUnderCell.appendChild(overUnderDiv);
                 });
             }
             });
     }
-    document.getElementById('submitButton').addEventListener('click', submitData);
-    fetchGames().then(() => {
-        submitData();
     });
-    document.addEventListener('keydown', function(event) {
-    if (event.keyCode === 13) {
-        submitData();
     }
-});
 </script>

 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <head>
     <link rel="shortcut icon" type="image/x-icon" href="https://images.squarespace-cdn.com/content/v1/64790f5777b5d772678cce83/6d71eaee-f825-4324-be9b-2def32469eac/favicon.ico?format=100w">
+    <title>MARCI - NFL Betting</title>
 </head>
 <style>
     body {
     }
     table {
+        transition: 0.3s ease;
         margin-top: 20px;
         width: 80%;
         border-collapse: collapse;
         cursor: pointer;
     }
     .winner-wrapper {
+        cursor: default;
         position: relative;
         width: 100%;
         text-align: center;
         display: flex;
         justify-content: center;
         align-items: center;
+        transition: 0.3s ease;
     }
     .winner-image {
         height: auto;
         transition: 0.3s ease;
     }
     .over-under-wrapper {
+        cursor: default;
         position: relative;
         width: 100%;
         height: 50px;
         display: flex;
         align-items: center;
         justify-content: center;
+        transition: 0.3s ease;
     }
     .over-under-text {
         display: inline-block;
     .emoji {
         margin-left: 5px;
         color: rgb(255, 255, 255);
         transition: 0.3s ease;
     }
         display: inline-block;
     }
+    #weekSelector {
+        transition: 0.3s ease;
+        border-radius: 10px;
+        padding: 5px;
+        color: white;
+        background: rgb(30, 30, 30) !important;
+        font-family: Arial, Helvetica, sans-serif;
+    }
     @keyframes spin {
         0% {
             transform: rotate(0deg);
         <span class="label">Winners:</span> {{ winners_correct }}-{{winners_incorrect}}{{winners_tie}}<span class="label"> ({{ winners_return }})</span><br>
         <span class="label">Over/Unders:</span> {{over_unders_correct}}-{{over_unders_incorrect}}{{over_unders_push}}<span class="label"> ({{over_unders_return}})</span><br><br>
     </div>
+    <select id="weekSelector">
+    </select>
     <div class="table-div">
         <table id="gameTable">
             <tr>
     <script>
+    async function fetchGames(selectedWeek) {
+        const response = await fetch(`/get_games?week=${selectedWeek}`);
         const pulled_games = await response.json();
         const table = document.getElementById('gameTable');
+        for(let i = table.rows.length - 1; i > 0; i--) {
+            table.deleteRow(i);
+        }
         const columns = ['Date','Away Team', 'Home Team'];
         const lines_response = await fetch('/get_lines');
         const lines = await lines_response.json()
                     const winnerEmojiDiv = document.createElement('div');
                     winnerEmojiDiv.className = 'emoji';
+                    wrapperDiv.dataset.proba = (moneyline.Probabilities[0] * 100).toFixed(0);
                     if (moneyline.Winner[0] === moneyline.Result) {
                         winnerEmojiDiv.textContent = '✅';
                     } else {
                         winnerEmojiDiv.textContent = '❌';
                     }
                     if (moneyline.Result === 'N/A') {
+                        winnerEmojiDiv.textContent = `(${wrapperDiv.dataset.proba}%)`;
                     }
                     wrapperDiv.appendChild(winnerEmojiDiv);
                     const overEmojiDiv = document.createElement('div');
                     overEmojiDiv.className = 'emoji';
+                    overUnderDiv.dataset.proba = (data.over_unders[index]['Probability'][0] * 100).toFixed(0);
                     if (data.over_unders[index]['Over/Under'][0] === data.over_unders[index]['Result']) {
                         overEmojiDiv.textContent = '✅';
                     } else {
                         overEmojiDiv.textContent = '❌';
                     }
                     if (data.over_unders[index]['Result'] === 'N/A') {
+                        overEmojiDiv.textContent = `(${overUnderDiv.dataset.proba}%)`;
                     }
                     overUnderDiv.appendChild(overEmojiDiv);
                     }, 10);
                     overUnderCell.appendChild(overUnderDiv);
+                    showProbabilityOnHover(wrapperDiv);
+                    showProbabilityOnHover(overUnderDiv);
                 });
             }
             });
     }
+    //Hover listener
+    function showProbabilityOnHover(div) {
+        let previousValue;
+        let divText = div.children[1];
+        let eventProcessed = false;
+        function handleEnter() {
+            if (eventProcessed) return;  // Skip if an event has already been processed
+            eventProcessed = true;
+            if (divText.textContent !== `(${div.dataset.proba}%)`) {
+                divText.style.opacity = 0;
+                setTimeout(() => {
+                    previousValue = divText.textContent;
+                    divText.textContent = `(${div.dataset.proba}%)`;
+                    divText.style.opacity = 1;
+                }, 300);
+                setTimeout(() => {
+                    divText.style.opacity = 0;
+                    setTimeout(() => {
+                        divText.textContent = previousValue;
+                        divText.style.opacity = 1;
+                        eventProcessed = false;  // Reset the flag
+                    }, 300);
+                }, 1000);
+            }
+        }
+        // For desktop
+        div.addEventListener('mouseenter', handleEnter);
+        // For mobile
+        div.addEventListener('touchstart', handleEnter);
+    }
+    // Populate dropdown
+    let selectedWeek;
+    async function populateDropdown() {
+        const weekSelector = document.getElementById('weekSelector');
+        weekSelector.innerHTML = "";
+        const response = await fetch('/get_weeks');
+        const data = await response.json();
+        data.forEach((week, index) => {
+            const option = document.createElement('option');
+            option.value = week;
+            option.text = `Week ${week}`;
+            weekSelector.appendChild(option);
+            if (index === 0) {
+                selectedWeek = week;
+            }
+        });
+    }
+    // Get new games when new week selected
+    document.getElementById('weekSelector').addEventListener('change', function(event) {
+        selectedWeek = event.target.value;
+        getNew();
     });
+    // Initial load
+    function loadThings() {
+        populateDropdown()
+        .then(() => fetchGames(selectedWeek))
+        .then(() => submitData())
+        .catch(error => console.error(error));
     }
+    // Get new
+    async function getNew() {
+        const table = document.getElementById('gameTable');
+        table.style.opacity = "0.5";
+        try {
+            await fetchGames(selectedWeek);
+            await submitData();
+            table.style.opacity = "1";
+        } catch (error) {
+            console.error(error);
+        }
+    }
+    // Submit on click, enter, and pageload
+    loadThings();
+    document.getElementById('submitButton').addEventListener('click', submitData);
+    document.addEventListener('keydown', function(event) {
+        if (event.keyCode === 13) {
+            submitData();
+        }
+    });
 </script>

main.py CHANGED Viewed

@@ -1,5 +1,5 @@
 from Source.Predict import predict
-from flask import Flask, render_template, jsonify, request
 import requests
 import pickle as pkl
 import pandas as pd
@@ -7,54 +7,74 @@ import numpy as np
 pd.set_option('display.max_columns', None)
 pd.set_option('display.expand_frame_repr', False)
-import os
 import json
 with open('Source/Data/record.json','r') as f:
     record = json.load(f)
-# input the over/under lines here for quicker predictions!
-lines = [45.5,
-         43,
-         53.5,
-         45.5,
-         46,
-         41,
-         42.5,
-         46.5,
-         40.5,
-         43.5,
-         41,
-         48,
-         43,
-         44.5,
-         41.5,
-         47]
-# get week, season
-week, season = predict.get_week()
 app = Flask(__name__, template_folder="Templates", static_folder="Static", static_url_path="/Static")
 app.secret_key = 'green-flounder'
-games = predict.get_games(week)[['Date','Away Team','Home Team']]
 @app.route('/')
 def index():
     return render_template('index.html', **record)
 @app.route('/get_lines')
 def get_lines():
-    return jsonify(lines)
 @app.route('/get_games')
 def get_games():
-    return jsonify(games.to_dict(orient='records'))
 @app.route('/submit_games', methods=['POST'])
 def submit_games():
     data = request.json
     data = pd.DataFrame(data).replace('', np.nan).dropna()
-    print(data)
     home_teams = data['HomeTeam'].values
     away_teams = data['AwayTeam'].values
     ou_lines = data['OverUnderLine'].values
@@ -63,19 +83,15 @@ def submit_games():
     moneylines = []
     over_unders = []
     for row_index,home,away,total in zip(row_indices,home_teams,away_teams,ou_lines):
-        game_id, moneyline, over_under = predict.predict(home,away,season,week,total)
         moneyline['rowIndex'] = int(row_index)
         over_under['rowIndex'] = int(row_index)
         moneylines.append(moneyline)
         over_unders.append(over_under)
-    print('MoneyLines')
-    print(moneylines)
-    print('OverUnders')
-    print(over_unders)
     return jsonify({'moneylines': moneylines,
                     'over_unders': over_unders})
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port='7860')

 from Source.Predict import predict
+from flask import Flask, render_template, jsonify, request, session
 import requests
 import pickle as pkl
 import pandas as pd
 pd.set_option('display.max_columns', None)
 pd.set_option('display.expand_frame_repr', False)
 import json
 with open('Source/Data/record.json','r') as f:
     record = json.load(f)
+with open('Source/Data/lines.json','r') as f:
+    lines = json.load(f)
 app = Flask(__name__, template_folder="Templates", static_folder="Static", static_url_path="/Static")
+app.config.update(
+    SESSION_COOKIE_SECURE=True,
+    SESSION_COOKIE_SAMESITE='None',
+)
 app.secret_key = 'green-flounder'
+# get week, season
+current_week, season = predict.get_week()
+current_games = predict.get_games(current_week)[['Date','Away Team','Home Team']]
+available_weeks = list(range(current_week+1))[2:]
+available_weeks.reverse()
+# load current data by default
 @app.route('/')
 def index():
+    print(current_week)
+    session['selected_week'] = current_week
+    session[f'games_week_{current_week}'] = current_games.to_json()
     return render_template('index.html', **record)
+# send week list to front end
+@app.route('/get_weeks')
+def get_weeks():
+    return jsonify(available_weeks)
+# send lines to front end
 @app.route('/get_lines')
 def get_lines():
+    try:
+        return jsonify(lines[str(session.get('selected_week'))])
+    except:
+        return jsonify(lines[str(current_week)])
+# send games of selected week to front end
 @app.route('/get_games')
 def get_games():
+    requested_week = int(request.args.get('week'))
+    session['selected_week'] = requested_week
+    # If select a new week
+    if requested_week and requested_week != current_week:
+        # Check if that week's games are cached
+        if session.get(f'games_week_{requested_week}'):
+            print("Using cached games")
+            games = session.get(f'games_week_{requested_week}')
+            games = json.loads(games)
+            return jsonify(games)
+        else:
+            games = predict.get_games(requested_week)[['Date','Away Team','Home Team']]
+            session[f'games_week_{requested_week}'] = games.to_json(orient='records')
+            return jsonify(games.to_dict(orient='records'))
+    else:
+        games = current_games
+        return jsonify(games.to_dict(orient='records'))
+# make predictions
 @app.route('/submit_games', methods=['POST'])
 def submit_games():
     data = request.json
     data = pd.DataFrame(data).replace('', np.nan).dropna()
     home_teams = data['HomeTeam'].values
     away_teams = data['AwayTeam'].values
     ou_lines = data['OverUnderLine'].values
     moneylines = []
     over_unders = []
     for row_index,home,away,total in zip(row_indices,home_teams,away_teams,ou_lines):
+        selected_week = session.get('selected_week')
+        game_id, moneyline, over_under = predict.predict(home,away,season,selected_week,total)
         moneyline['rowIndex'] = int(row_index)
         over_under['rowIndex'] = int(row_index)
         moneylines.append(moneyline)
         over_unders.append(over_under)
     return jsonify({'moneylines': moneylines,
                     'over_unders': over_unders})
 if __name__ == '__main__':
+    app.run(host='0.0.0.0', port='7860', debug=True)