Lots of updates to the query process, mix seed matching and sample increase, seoncdary stack querying

app.py

@@ -1324,7 +1324,7 @@ with st.container():
 
     # Info and Filters for the initial load
     with st.expander("Info and Filters"):
-        prio_col, optimals_site_col, optimals_salary_col, optimals_stacks_col = st.columns(4)
+        prio_col, optimals_site_col, optimals_salary_col, optimals_stacks_col, optimals_secondaries_col = st.columns(5)
 
         with prio_col:
             prio_var = st.radio("Which priority variable do you want to use?", ('proj', 'Own', 'Mix'), key='prio_var_radio')
@@ -1390,8 +1390,8 @@ with st.container():
                 max_stacks_var = st.number_input("Maximum stacks used", min_value = 0, max_value = 4, value = 4, step = 1, key = 'max_stacks_var_fd')
         with optimals_ssecondaries_col:
             if site_var == 'Draftkings':
-                min_secondary_stacks_var = st.number_input("Minimum secondary stacks used", min_value = 0, max_value = 5, value = 1, step = 1, key = 'min_secondary_stacks_var_dk')
-                max_secondary_stacks_var = st.number_input("Maximum secondary stacks used", min_value = 0, max_value = 5, value = 5, step = 1, key = 'max_secondary_stacks_var_dk')
+                min_secondary_stacks_var = st.number_input("Minimum secondary stacks used", min_value = 0, max_value = 4, value = 1, step = 1, key = 'min_secondary_stacks_var_dk')
+                max_secondary_stacks_var = st.number_input("Maximum secondary stacks used", min_value = 0, max_value = 4, value = 4, step = 1, key = 'max_secondary_stacks_var_dk')
             elif site_var == 'Fanduel':
                 min_secondary_stacks_var = st.number_input("Minimum secondary stacks used", min_value = 0, max_value = 4, value = 1, step = 1, key = 'min_secondary_stacks_var_fd')
                 max_secondary_stacks_var = st.number_input("Maximum secondary stacks used", min_value = 0, max_value = 4, value = 4, step = 1, key = 'max_secondary_stacks_var_fd')
@@ -1668,11 +1668,11 @@ if selected_tab == 'Data Load':
                     if site_var == 'Draftkings':
                         if type_var != 'Showdown':
                             if sport_var == 'NBA':
-                                portfolio_load = init_DK_NBA_lineups(type_var, slate_var3, prio_var, 50, dk_nba_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_DK_NBA_lineups(type_var, slate_var3, prio_var, 50, dk_nba_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'NFL':
-                                portfolio_load = init_DK_NFL_lineups(type_var, slate_var3, prio_var, 50, dk_nfl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_DK_NFL_lineups(type_var, slate_var3, prio_var, 50, dk_nfl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'NHL':
-                                portfolio_load = init_DK_NHL_lineups(type_var, slate_var3, prio_var, 50, dk_nhl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_DK_NHL_lineups(type_var, slate_var3, prio_var, 50, dk_nhl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'MMA':
                                 portfolio_load = init_DK_MMA_lineups(type_var, slate_var3, prio_var, 50, lineup_num_var, salary_min_var, salary_max_var, [])
                             elif sport_var == 'GOLF':
@@ -1680,14 +1680,14 @@ if selected_tab == 'Data Load':
                             elif sport_var == 'NASCAR':
                                 portfolio_load = init_DK_NASCAR_lineups(type_var, slate_var3, prio_var, 50, lineup_num_var, salary_min_var, salary_max_var, [])
                             elif sport_var == 'MLB':
-                                portfolio_load = init_DK_MLB_lineups(type_var, slate_var3, prio_var, 50, dk_mlb_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_DK_MLB_lineups(type_var, slate_var3, prio_var, 50, dk_mlb_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                         else:
                             if sport_var == 'NBA':
-                                portfolio_load = init_DK_NBA_lineups(type_var, nba_slate_name_lookup_dk[slate_var3], prio_var, 50, dk_nba_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_DK_NBA_lineups(type_var, nba_slate_name_lookup_dk[slate_var3], prio_var, 50, dk_nba_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'NFL':
-                                portfolio_load = init_DK_NFL_lineups(type_var, nfl_slate_name_lookup_dk[slate_var3], prio_var, 50, dk_nfl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_DK_NFL_lineups(type_var, nfl_slate_name_lookup_dk[slate_var3], prio_var, 50, dk_nfl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'NHL':
-                                portfolio_load = init_DK_NHL_lineups(type_var, nhl_slate_name_lookup_dk[slate_var3], prio_var, 50, dk_nhl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_DK_NHL_lineups(type_var, nhl_slate_name_lookup_dk[slate_var3], prio_var, 50, dk_nhl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'MMA':
                                 portfolio_load = init_DK_MMA_lineups(type_var, slate_var3, prio_var, 50, lineup_num_var, salary_min_var, salary_max_var, [])
                             elif sport_var == 'GOLF':
@@ -1695,7 +1695,7 @@ if selected_tab == 'Data Load':
                             elif sport_var == 'NASCAR':
                                 portfolio_load = init_DK_NASCAR_lineups(type_var, slate_var3, prio_var, 50, lineup_num_var, salary_min_var, salary_max_var, [])
                             elif sport_var == 'MLB':
-                                portfolio_load = init_DK_MLB_lineups(type_var, mlb_slate_name_lookup_dk[slate_var3], prio_var, 50, dk_mlb_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_DK_MLB_lineups(type_var, mlb_slate_name_lookup_dk[slate_var3], prio_var, 50, dk_mlb_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
 
                         st.session_state['db_portfolio_file'] = pd.DataFrame(portfolio_load)
                         st.session_state['portfolio_loaded'] = True
@@ -1707,11 +1707,11 @@ if selected_tab == 'Data Load':
                         if type_var != 'Showdown':
                             ## Testing something here
                             if sport_var == 'NBA':
-                                portfolio_load = init_FD_NBA_lineups(type_var, slate_var3, prio_var, 50, fd_nba_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_FD_NBA_lineups(type_var, slate_var3, prio_var, 50, fd_nba_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'NFL':
-                                portfolio_load = init_FD_NFL_lineups(type_var, slate_var3, prio_var, 50, fd_nfl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_FD_NFL_lineups(type_var, slate_var3, prio_var, 50, fd_nfl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'NHL':
-                                portfolio_load = init_FD_NHL_lineups(type_var, slate_var3, prio_var, 50, fd_nhl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_FD_NHL_lineups(type_var, slate_var3, prio_var, 50, fd_nhl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'MMA':
                                 portfolio_load = init_FD_MMA_lineups(type_var, slate_var3, prio_var, 50, lineup_num_var, salary_min_var, salary_max_var, [])
                             elif sport_var == 'GOLF':
@@ -1719,14 +1719,14 @@ if selected_tab == 'Data Load':
                             elif sport_var == 'NASCAR':
                                 portfolio_load = init_FD_NASCAR_lineups(type_var, slate_var3, prio_var, 50, lineup_num_var, salary_min_var, salary_max_var, [])
                             elif sport_var == 'MLB':
-                                portfolio_load = init_FD_MLB_lineups(type_var, slate_var3, prio_var, 50, fd_mlb_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_FD_MLB_lineups(type_var, slate_var3, prio_var, 50, fd_mlb_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                         else:
                             if sport_var == 'NBA':
-                                portfolio_load = init_FD_NBA_lineups(type_var, nba_slate_name_lookup_fd[slate_var3], prio_var, 50, fd_nba_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_FD_NBA_lineups(type_var, nba_slate_name_lookup_fd[slate_var3], prio_var, 50, fd_nba_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'NFL':
-                                portfolio_load = init_FD_NFL_lineups(type_var, nfl_slate_name_lookup_fd[slate_var3], prio_var, 50, fd_nfl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_FD_NFL_lineups(type_var, nfl_slate_name_lookup_fd[slate_var3], prio_var, 50, fd_nfl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'NHL':
-                                portfolio_load = init_FD_NHL_lineups(type_var, nhl_slate_name_lookup_fd[slate_var3], prio_var, 50, fd_nhl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_FD_NHL_lineups(type_var, nhl_slate_name_lookup_fd[slate_var3], prio_var, 50, fd_nhl_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
                             elif sport_var == 'MMA':
                                 portfolio_load = init_FD_MMA_lineups(type_var, slate_var3, prio_var, 50, lineup_num_var, salary_min_var, salary_max_var, [])
                             elif sport_var == 'GOLF':
@@ -1734,7 +1734,7 @@ if selected_tab == 'Data Load':
                             elif sport_var == 'NASCAR':
                                 portfolio_load = init_FD_NASCAR_lineups(type_var, slate_var3, prio_var, 50, lineup_num_var, salary_min_var, salary_max_var, [])
                             elif sport_var == 'MLB':
-                                portfolio_load = init_FD_MLB_lineups(type_var, mlb_slate_name_lookup_fd[slate_var3], prio_var, 50, fd_mlb_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, [])
+                                portfolio_load = init_FD_MLB_lineups(type_var, mlb_slate_name_lookup_fd[slate_var3], prio_var, 50, fd_mlb_showdown_db_translation, lineup_num_var, salary_min_var, salary_max_var, min_stacks_var, max_stacks_var, min_secondary_stacks_var, max_secondary_stacks_var, [])
 
                         st.session_state['db_portfolio_file'] = pd.DataFrame(portfolio_load)
                         st.session_state['portfolio_loaded'] = True