Update app.py

app.py

@@ -1,65 +1,75 @@
 import pandas as pd
 import gradio as gr
 
-# Conversion by explicit iteration: map texters ↔ models per day
-# Handles merged headers, multi-row headers, and 'OFF' days
+# 7-Day Schedule Converter with explicit iteration and header fill
 
 def convert_schedule(file_path, direction):
-    # -- 1. Load Excel with potential two-row header for merged cells --
-    try:
-        df = pd.read_excel(file_path, header=[0,1], index_col=0)
-        # Use second header row as actual day labels
-        days = df.columns.get_level_values(1).astype(str)
-        # If all are unnamed, treat as single-header
-        if all(lbl.startswith('Unnamed') for lbl in days):
-            raise ValueError
-        df.columns = days
-    except Exception:
-        df = pd.read_excel(file_path, header=0, index_col=0)
-        df.columns = df.columns.astype(str)
+    # 1. Load Excel sheet into DataFrame
+    # Read without header to inspect first two rows for header fill
+    raw = pd.read_excel(file_path, header=None)
+    # Extract potential header rows (skip first column)
+    header1 = raw.iloc[0,1:].astype(object)
+    header2 = raw.iloc[1,1:].astype(object)
 
-    # -- 2. Clean up: drop any phantom 'Unnamed' columns --
-    df = df.loc[:, ~df.columns.str.match(r'^Unnamed')]  # keep only real day columns
+    # Decide which header row to use: prefer second if fully populated
+    if header2.notna().all() and not header2.str.startswith('Unnamed').any():
+        days = header2.tolist()
+        data_start = 2
+    else:
+        # Forward-fill merged first-row headers
+        days = []
+        last = None
+        for val in header1:
+            if pd.isna(val) or str(val).startswith('Unnamed'):
+                days.append(last)
+            else:
+                last = str(val)
+                days.append(last)
+        data_start = 1
 
-    # Order of days as in the original sheet
+    # Load actual data with day columns
+    df = pd.read_excel(
+        file_path,
+        header=data_start,
+        index_col=0,
+        usecols=[0] + list(range(1, len(days)+1))
+    )
+    df.columns = [str(day) for day in days]
+
+    # 2. Ensure we have exactly the original 7 day columns
     day_cols = list(df.columns)
 
-    # -- 3. Build assignment mapping --
-    # For A→B: iterate models (rows), assign each texter
-    # For B→A: iterate texters (rows), assign each model
+    # 3. Build mapping: for each Model (or Texter) assign days
     assignments = {}
     if direction == 'A to B':
-        for model in df.index:
+        # Rows are Models → output rows are Texters
+        for model in df.index.astype(str):
             for day in day_cols:
-                texters = df.at[model, day]
-                # split if multiple names in one cell
-                for texter in str(texters).split(','):
+                cell = df.at[model, day]
+                for texter in str(cell).split(','):
                     texter = texter.strip()
                     if not texter or texter.lower() in ['nan', 'none']:
                         continue
-                    if texter not in assignments:
-                        # initialize all days as empty list
-                        assignments[texter] = {d: [] for d in day_cols}
-                    assignments[texter][day].append(str(model))
-        # After populating, convert lists to comma-joined or 'OFF'
+                    assignments.setdefault(texter, {d: [] for d in day_cols})
+                    assignments[texter][day].append(model)
+        # Build output DataFrame
         index = sorted(assignments.keys())
         result = pd.DataFrame(index=index, columns=day_cols)
         for texter, days_map in assignments.items():
             for day in day_cols:
                 models = days_map.get(day, [])
                 result.at[texter, day] = ', '.join(models) if models else 'OFF'
-
-    else:  # B→A
-        for texter in df.index:
+    else:
+        # Rows are Texters → output rows are Models
+        for texter in df.index.astype(str):
             for day in day_cols:
-                models = df.at[texter, day]
-                for model in str(models).split(','):
+                cell = df.at[texter, day]
+                for model in str(cell).split(','):
                     model = model.strip()
                     if not model or model.lower() in ['nan', 'none']:
                         continue
-                    if model not in assignments:
-                        assignments[model] = {d: [] for d in day_cols}
-                    assignments[model][day].append(str(texter))
+                    assignments.setdefault(model, {d: [] for d in day_cols})
+                    assignments[model][day].append(texter)
         index = sorted(assignments.keys())
         result = pd.DataFrame(index=index, columns=day_cols)
         for model, days_map in assignments.items():
@@ -67,23 +77,23 @@ def convert_schedule(file_path, direction):
                 texters = days_map.get(day, [])
                 result.at[model, day] = ', '.join(texters) if texters else 'OFF'
 
-    # -- 4. Cleanup axis names --
+    # 4. Cleanup axis names
     result.index.name = None
     result.columns.name = None
     return result
 
-# -- Gradio UI definition --
+# Gradio UI
 def main():
     iface = gr.Interface(
         fn=convert_schedule,
         inputs=[
             gr.File(label='Upload Weekly Schedule (.xlsx)', file_count='single', type='filepath'),
-            gr.Radio(['A to B', 'B to A'], label='Conversion Direction')
+            gr.Radio(['A to B', 'B to A'], label='Convert Direction')
         ],
         outputs=gr.Dataframe(label='Converted Schedule'),
         title='7-Day Schedule Converter',
-        description=('Upload a 7-column weekly schedule (Models vs Days) and flip ' 
-                     'between Models→Texters or Texters→Models with explicit iteration.'),
+        description=('Upload a 7-column weekly schedule (Models vs Days) with merged or single headers, '\
+                     'then flip between Models→Texters or Texters→Models. Uses explicit iteration.'),
         allow_flagging='never'
     )
     iface.launch(server_name='0.0.0.0', server_port=7860)