Update media_plan_templater.py

media_plan_templater.py

@@ -610,107 +610,120 @@ def render(get_conn):
 
     updated_inputs = edited_inputs.copy()
 
-    # ── Row-by-row dependent Selectboxes with PACKAGE_EXIST rules
-    st.markdown("#### Choose Placement for each row")
-
-    col_a, col_b = st.columns([1, 4])
-    with col_a:
-        if st.button("Reload options", use_container_width=True):
-            fetch_media_plan_options.clear()
-            st.rerun()
-    with col_b:
-        st.caption("When a package *exists*, Details auto-fills with its elements and the Placement selector is disabled.")
-
+  # ─────────────────────────────────────────────────────────────────────────────
+    # Row-by-row controls (all selectors in one visual row per table row)
+    # - Package → Placement dependency (bundle disables placement)
+    # - Targeting multiselect, Notes
+    # - No Details preview UI; Details is set silently
+    # ─────────────────────────────────────────────────────────────────────────────
+    
+    st.markdown("#### Row controls")
+    
+    # Fallbacks: allow placement selection even if Package is blank
+    ALL_PLACEMENTS = sorted({plc for lst in opts["placementMap"].values() for plc in lst})
+    
     for idx, row in updated_inputs.iterrows():
-        pkg = (row.get("Product") or "").strip()
-        exists = opts["packageExistsMap"].get(pkg, False)
-        label = f"Row {idx+1} placement (Package: {pkg or '—'})"
-
-        if exists:
-            # Clear any stale placement and render disabled selector
-            updated_inputs.at[idx, "Placement"] = ""
-            st.selectbox(
-                label,
-                options=["(package-defined elements; no placement selection)"],
-                index=0,
-                key=f"placement_row_{idx}",
-                disabled=True,
+        pkg_current = (row.get("Product") or "").strip()
+        rate_current = (row.get("Rate") or "").strip()
+        plc_current = (row.get("Placement") or "").strip()
+        notes_current = str(row.get("Notes") or "")
+        tgt_raw = str(row.get("Targeting") or "")
+    
+        # Preselect Targeting choices from existing string ("A OR B")
+        tgt_tokens = [p.strip() for p in re.split(r"\s+OR\s+", tgt_raw) if p.strip()]
+        tgt_default = [t for t in tgt_tokens if t in TARGETING_OPTIONS]
+    
+        # One visual row: Package | Placement | Rate | Targeting | Notes
+        c_pkg, c_plc, c_rate, c_tgt, c_notes = st.columns([1.2, 1.4, 1.0, 2.0, 1.8])
+    
+        with c_pkg:
+            pkg_options = [""] + package_opts
+            pkg_index = pkg_options.index(pkg_current) if pkg_current in pkg_options else 0
+            sel_pkg = st.selectbox(
+                f"Row {idx+1} — Package",
+                options=pkg_options,
+                index=pkg_index,
+                key=f"row{idx}_pkg",
+                help="Choose a Package. If left blank, you can still pick any Placement."
             )
-            # Build bullet list from PLACEMENT_EXTRACTION for this package
-            bullets = opts["extractionMap"].get(pkg, [])
-            details_text = "\n".join(f"• {b}" for b in bullets) if bullets else ""
-            updated_inputs.at[idx, "Details"] = details_text
-        else:
-            choices = build_row_placement_choices(row)
-            if choices:
-                current = (row.get("Placement") or "").strip()
-                default_ix = choices.index(current) if current in choices else 0
-                sel = st.selectbox(
-                    label,
-                    choices,
-                    index=default_ix,
-                    key=f"placement_row_{idx}",
-                )
-                updated_inputs.at[idx, "Placement"] = sel
-                # When package doesn't exist, user must select a placement; Details = selection
-                updated_inputs.at[idx, "Details"] = sel
-            else:
-                updated_inputs.at[idx, "Placement"] = ""
-                updated_inputs.at[idx, "Details"] = ""
+    
+        with c_plc:
+            # Determine placement choices based on Package
+            pkg_exists = opts["packageExistsMap"].get(sel_pkg.strip(), False) if sel_pkg else False
+            if pkg_exists:
                 st.selectbox(
-                    label,
-                    options=["(no placements available for this package)"],
+                    "Placement",
+                    options=["(package-defined elements)"],
                     index=0,
-                    key=f"placement_row_{idx}",
+                    key=f"row{idx}_plc_disabled",
                     disabled=True,
                 )
-
-        # ── Row-by-row Targeting multi-selects
-    st.markdown("#### Choose Targeting for each row")
+                sel_plc = ""
+            else:
+                choices = opts["placementMap"].get(sel_pkg.strip(), []) if sel_pkg else ALL_PLACEMENTS
+                if choices:
+                    plc_index = choices.index(plc_current) if plc_current in choices else 0
+                    sel_plc = st.selectbox(
+                        "Placement",
+                        options=choices,
+                        index=plc_index,
+                        key=f"row{idx}_plc",
+                        help="Placement options depend on the selected Package."
+                    )
+                else:
+                    st.selectbox(
+                        "Placement",
+                        options=["(no placements available)"],
+                        index=0,
+                        key=f"row{idx}_plc_empty",
+                        disabled=True,
+                    )
+                    sel_plc = ""
     
-    for idx, row in updated_inputs.iterrows():
-        current_raw = (row.get("Targeting") or "")
-        # Preselect any presets already present (split on 'OR')
-        current_tokens = [p.strip() for p in re.split(r"\s+OR\s+", str(current_raw)) if p and p.strip()]
-        default_presets = [p for p in current_tokens if p in TARGETING_OPTIONS]
+        with c_rate:
+            rate_index = rate_opts.index(rate_current) if rate_current in rate_opts else 0
+            sel_rate = st.selectbox(
+                "Rate",
+                options=rate_opts,
+                index=rate_index,
+                key=f"row{idx}_rate",
+            )
     
-        sel = st.multiselect(
-            f"Row {idx+1} targeting",
-            options=TARGETING_OPTIONS,            # curated presets
-            default=default_presets,              # preselect if they match
-            key=f"targeting_row_{idx}",
-            help="Pick one or more targeting presets. You can still type custom text in the table if you prefer."
-        )
+        with c_tgt:
+            sel_tgts = st.multiselect(
+                "Targeting",
+                options=TARGETING_OPTIONS,
+                default=tgt_default,
+                key=f"row{idx}_tgt",
+                help="Pick one or more presets; saved as 'A OR B'."
+            )
     
-        # If user picked presets here, overwrite this row's Targeting cell with them
-        if sel:
-            updated_inputs.at[idx, "Targeting"] = " OR ".join(sel)
-
-    # Canonicalize what we store
-    canonical_inputs = _normalize_input_table(updated_inputs[DEFAULT_INPUT_COLUMNS])
-    if "Rate" in updated_inputs.columns:
-        canonical_inputs["Rate"] = updated_inputs["Rate"].fillna("").astype(str)
-    if "Placement" in updated_inputs.columns:
-        canonical_inputs["Placement"] = updated_inputs["Placement"].fillna("").astype(str)
-
-    st.session_state["media_plan_inputs"] = canonical_inputs
-
-    # Downloadable, cleaned CSV of inputs
-    download_df = st.session_state["media_plan_inputs"].copy()
-    if "Targeting" in download_df.columns:
-        download_df["Targeting"] = download_df["Targeting"].apply(_normalize_targeting_value)
-    for numeric_col in ("Budget", "Rate"):
-        if numeric_col in download_df.columns:
-            download_df[numeric_col] = download_df[numeric_col].apply(
-                lambda val: "" if pd.isna(val) else val
+        with c_notes:
+            sel_notes = st.text_input(
+                "Notes",
+                value=notes_current,
+                key=f"row{idx}_notes",
+                placeholder="Optional",
             )
-    st.download_button(
-        "Download input table",
-        data=download_df.to_csv(index=False).encode("utf-8"),
-        file_name="media_plan_inputs.csv",
-        mime="text/csv",
-        use_container_width=True,
-    )
+    
+        # Write back to the table
+        updated_inputs.at[idx, "Product"] = sel_pkg
+        updated_inputs.at[idx, "Rate"] = sel_rate
+        updated_inputs.at[idx, "Notes"] = sel_notes
+    
+        if sel_tgts:
+            updated_inputs.at[idx, "Targeting"] = " OR ".join(sel_tgts)
+    
+        # Details logic (silent)
+        if sel_pkg and opts["packageExistsMap"].get(sel_pkg.strip(), False):
+            # Bundle: Details = package elements; no placement
+            updated_inputs.at[idx, "Placement"] = ""
+            bullets = opts["extractionMap"].get(sel_pkg.strip(), [])
+            updated_inputs.at[idx, "Details"] = "\n".join(f"• {b}" for b in bullets) if bullets else ""
+        else:
+            # Non-bundle or no package: Details = chosen placement
+            updated_inputs.at[idx, "Placement"] = sel_plc
+            updated_inputs.at[idx, "Details"] = sel_plc
 
 # (The remainder of your app continues here: Word upload/parsing, Excel template
 #  mapping, fill + export logic, etc. The code above includes the PACKAGE_EXIST