James McCool commited on
Commit
0da9464
·
1 Parent(s): 437b6cc

Refactor trimming dictionary handling in app.py: initialize trimming dictionary max values in session state for improved state management and ensure accurate threshold inputs during portfolio updates.

Browse files
Files changed (1) hide show
  1. app.py +15 -21
app.py CHANGED
@@ -883,13 +883,14 @@ with tab2:
883
  )
884
  col1, col2 = st.columns([2, 8])
885
  with col1:
886
- trimming_dict_maxes = {
887
- 'Own': 500.0,
888
- 'Geomean': 500.0,
889
- 'Weighted Own': 500.0,
890
- 'median': 500.0,
891
- 'Finish_percentile': 1.0
892
- }
 
893
  with st.expander('Macro Filter Options'):
894
  with st.form(key='macro_filter_form'):
895
  max_dupes = st.number_input("Max acceptable dupes?", value=1000, min_value=1, step=1)
@@ -943,13 +944,6 @@ with tab2:
943
  if submitted:
944
  st.write('initiated')
945
  st.session_state['portfolio'] = predict_dupes(st.session_state['portfolio'], map_dict, site_var, type_var, Contest_Size, strength_var, sport_var)
946
- trimming_dict_maxes = {
947
- 'Own': st.session_state['portfolio']['Own'].max(),
948
- 'Geomean': st.session_state['portfolio']['Geomean'].max(),
949
- 'Weighted Own': st.session_state['portfolio']['Weighted Own'].max(),
950
- 'median': st.session_state['portfolio']['median'].max(),
951
- 'Finish_percentile': st.session_state['portfolio']['Finish_percentile'].max()
952
- }
953
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['Dupes'] <= max_dupes]
954
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] >= min_salary]
955
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] <= max_salary]
@@ -985,13 +979,13 @@ with tab2:
985
  with col2:
986
  st.write('initiated')
987
  st.session_state['portfolio'] = predict_dupes(st.session_state['portfolio'], map_dict, site_var, type_var, Contest_Size, strength_var, sport_var)
988
- trimming_dict_maxes = {
989
- 'Own': st.session_state['portfolio']['Own'].max(),
990
- 'Geomean': st.session_state['portfolio']['Geomean'].max(),
991
- 'Weighted Own': st.session_state['portfolio']['Weighted Own'].max(),
992
- 'median': st.session_state['portfolio']['median'].max(),
993
- 'Finish_percentile': st.session_state['portfolio']['Finish_percentile'].max()
994
- }
995
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['Dupes'] <= max_dupes]
996
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] >= min_salary]
997
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] <= max_salary]
 
883
  )
884
  col1, col2 = st.columns([2, 8])
885
  with col1:
886
+ if 'trimming_dict_maxes' not in st.session_state:
887
+ trimming_dict_maxes = {
888
+ 'Own': 500.0,
889
+ 'Geomean': 500.0,
890
+ 'Weighted Own': 500.0,
891
+ 'median': 500.0,
892
+ 'Finish_percentile': 1.0
893
+ }
894
  with st.expander('Macro Filter Options'):
895
  with st.form(key='macro_filter_form'):
896
  max_dupes = st.number_input("Max acceptable dupes?", value=1000, min_value=1, step=1)
 
944
  if submitted:
945
  st.write('initiated')
946
  st.session_state['portfolio'] = predict_dupes(st.session_state['portfolio'], map_dict, site_var, type_var, Contest_Size, strength_var, sport_var)
 
 
 
 
 
 
 
947
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['Dupes'] <= max_dupes]
948
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] >= min_salary]
949
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] <= max_salary]
 
979
  with col2:
980
  st.write('initiated')
981
  st.session_state['portfolio'] = predict_dupes(st.session_state['portfolio'], map_dict, site_var, type_var, Contest_Size, strength_var, sport_var)
982
+ st.session_state['trimming_dict_maxes'] = {
983
+ 'Own': st.session_state['portfolio']['Own'].max(),
984
+ 'Geomean': st.session_state['portfolio']['Geomean'].max(),
985
+ 'Weighted Own': st.session_state['portfolio']['Weighted Own'].max(),
986
+ 'median': st.session_state['portfolio']['median'].max(),
987
+ 'Finish_percentile': st.session_state['portfolio']['Finish_percentile'].max()
988
+ }
989
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['Dupes'] <= max_dupes]
990
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] >= min_salary]
991
  st.session_state['portfolio'] = st.session_state['portfolio'][st.session_state['portfolio']['salary'] <= max_salary]