Improve speed and add week selector

Source/Data/lines.json

@@ -0,0 +1,56 @@
+{   
+    "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
+    ]
+}  

Templates/index.html

@@ -35,6 +35,7 @@
     }
 
     table {
+        transition: 0.3s ease;
         margin-top: 20px;
         width: 80%;
         border-collapse: collapse;
@@ -275,6 +276,15 @@
         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);
@@ -328,6 +338,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>
+
+    <select id="weekSelector">
+    </select>
+
     <div class="table-div">
         <table id="gameTable">
             <tr>
@@ -386,10 +400,15 @@
     
 
     <script>
-    async function fetchGames() {
-        const response = await fetch('/get_games');
+    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()
@@ -561,17 +580,69 @@
 
     }
 
-    document.getElementById('submitButton').addEventListener('click', submitData);
 
-    fetchGames().then(() => {
-        submitData();
+    // 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();
     });
 
-    document.addEventListener('keydown', function(event) {
-    if (event.keyCode === 13) {  
-        submitData();
+
+    // 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

@@ -1,5 +1,5 @@
 from Source.Predict import predict
-from flask import Flask, render_template, jsonify, request
+from flask import Flask, render_template, jsonify, request, session
 import requests
 import pickle as pkl
 import pandas as pd
@@ -7,54 +7,66 @@ 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()
+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.secret_key = 'green-flounder'
 
-games = predict.get_games(week)[['Date','Away Team','Home Team']]
+# 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():
+    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():
-    return jsonify(lines)
+    return jsonify(lines[str(session.get('selected_week'))])
 
+# send games of selected week to front end
 @app.route('/get_games')
 def get_games():
-    return jsonify(games.to_dict(orient='records'))
+    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()
-    print(data)
     home_teams = data['HomeTeam'].values
     away_teams = data['AwayTeam'].values
     ou_lines = data['OverUnderLine'].values
@@ -63,19 +75,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)
+        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)
 
-    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')
+    app.run(host='0.0.0.0', port='7860', debug=True)