Enhance position requirement calculations in the Streamlit app to support both user-defined (flat) and default (nested) configurations. Improved handling of flex percentiles for Superflex and non-Superflex cases, ensuring accurate index calculations for QB, RB, WR, and TE positions.

src/streamlit_app.py

@@ -273,13 +273,23 @@ def designate_custom_position_reqs(league_settings: dict, flex_percentiles: dict
     wr_base = league_settings['WR'] * league_settings['TEAMS']
     te_base = league_settings['TE'] * league_settings['TEAMS']
 
-    # Handle both nested and flat dictionary structures
-    if 'QB' in flex_percentiles:
+    # Check if we're using user configuration (flat structure) or default configuration (nested structure)
+    # User configuration will have direct position keys in flex_multipliers
+    if isinstance(flex_multipliers, dict) and 'QB' in flex_multipliers:
         # User configuration (flat structure)
         qb_rv_index = math.ceil((qb_base) * flex_multipliers['QB'])
-        rb_rv_index = math.ceil((rb_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['RB'])) * flex_multipliers['RB'])
-        wr_rv_index = math.ceil((wr_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['WR'])) * flex_multipliers['WR'])
-        te_rv_index = math.ceil((te_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['TE'])) * flex_multipliers['TE'])
+        
+        # Handle flex percentiles - for Superflex, QB is included; for others, it's not
+        if 'QB' in flex_percentiles:
+            # Superflex case
+            rb_rv_index = math.ceil((rb_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['RB'])) * flex_multipliers['RB'])
+            wr_rv_index = math.ceil((wr_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['WR'])) * flex_multipliers['WR'])
+            te_rv_index = math.ceil((te_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['TE'])) * flex_multipliers['TE'])
+        else:
+            # Non-Superflex case
+            rb_rv_index = math.ceil((rb_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['RB'])) * flex_multipliers['RB'])
+            wr_rv_index = math.ceil((wr_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['WR'])) * flex_multipliers['WR'])
+            te_rv_index = math.ceil((te_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['TE'])) * flex_multipliers['TE'])
     else:
         # Default configuration (nested structure)
         qb_rv_index = math.ceil((qb_base) * flex_multipliers[league_settings['TYPE']]['QB'])
@@ -307,13 +317,22 @@ def designate_base_position_reqs(league_settings: dict, flex_percentiles: dict,
     wr_base = league_settings['WR'] * league_settings['TEAMS']
     te_base = league_settings['TE'] * league_settings['TEAMS']
 
-    # Handle both nested and flat dictionary structures
-    if 'QB' in flex_percentiles:
+    # Check if we're using user configuration (flat structure) or default configuration (nested structure)
+    if isinstance(flex_multipliers, dict) and 'QB' in flex_multipliers:
         # User configuration (flat structure)
         qb_rv_index = math.ceil(qb_base * flex_multipliers['QB'])
-        rb_rv_index = math.ceil((rb_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['RB'])) * flex_multipliers['RB'])
-        wr_rv_index = math.ceil((wr_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['WR'])) * flex_multipliers['WR'])
-        te_rv_index = math.ceil((te_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['TE'])) * flex_multipliers['TE'])
+        
+        # Handle flex percentiles - for Superflex, QB is included; for others, it's not
+        if 'QB' in flex_percentiles:
+            # Superflex case
+            rb_rv_index = math.ceil((rb_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['RB'])) * flex_multipliers['RB'])
+            wr_rv_index = math.ceil((wr_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['WR'])) * flex_multipliers['WR'])
+            te_rv_index = math.ceil((te_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['TE'])) * flex_multipliers['TE'])
+        else:
+            # Non-Superflex case
+            rb_rv_index = math.ceil((rb_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['RB'])) * flex_multipliers['RB'])
+            wr_rv_index = math.ceil((wr_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['WR'])) * flex_multipliers['WR'])
+            te_rv_index = math.ceil((te_base + ((league_settings['TEAMS'] * league_settings['FLEX']) * flex_percentiles['TE'])) * flex_multipliers['TE'])
     else:
         # Default configuration (nested structure)
         qb_rv_index = math.ceil(qb_base * flex_multipliers[league_settings['TYPE']]['QB'])