Update app.py

app.py

@@ -120,68 +120,41 @@ def generate_main_accounts(updated_data=None):
 # Global variable to store updated assignments from the main account generation
 UPDATED_ASSIGNMENTS = {}
 
-def generate_schedule(chatter_files, account_data):
-    """
-    Generate schedules for different shifts (Overnight, Day, Prime) using chatter and account data.
-    """
-    schedules = {}
-
-    # Debugging: Log columns of the account data
-    print("DEBUG: Account Data Columns")
-    print(account_data.columns)
-
-    # Validate required columns in the account data
-    if not {"Creator", "ActiveFans"}.issubset(account_data.columns):
-        raise KeyError(f"The account data must contain 'Creator' and 'ActiveFans' columns. Found: {list(account_data.columns)}")
-
-    shift_names = ["Overnight", "Day", "Prime"]
-
-    for idx, chatter_df in enumerate(chatter_files):
-        shift_name = shift_names[idx]
-
-        # Debugging: Print initial chatter data
-        print(f"DEBUG: Initial {shift_name} Chatter Data:")
-        print(chatter_df.head())
-
-        # Clean chatter data
-        chatter_df = clean_chatter_data(chatter_df)
-
-        # Debugging: Print cleaned chatter data
-        print(f"DEBUG: Cleaned {shift_name} Chatter Data:")
-        print(chatter_df.head())
-
-        # Create a blank schedule template
-        schedule = create_schedule_template(account_data)
-
-        # Debugging: Print initial schedule template
-        print(f"DEBUG: Initial Schedule Template for {shift_name}:")
-        print(schedule.head())
-
-        # Assign main accounts to the schedule
-        schedule = assign_main_accounts_to_schedule(schedule, chatter_df)
-
-        # Debugging: Print schedule after assigning main accounts
-        print(f"DEBUG: Schedule After Assigning Main Accounts for {shift_name}:")
-        print(schedule.head())
-
-        # Assign days off based on chatter preferences
-        schedule = assign_off_days(schedule, chatter_df)
-
-        # Debugging: Print schedule after assigning off days
-        print(f"DEBUG: Schedule After Assigning Off Days for {shift_name}:")
-        print(schedule.head())
+def generate_full_schedule():
+    global UPDATED_ASSIGNMENTS
 
-        # Randomly fill the remaining slots while respecting constraints
-        schedule = randomly_fill_slots(schedule, chatter_df)
+    # Check if UPDATED_ASSIGNMENTS is populated
+    if UPDATED_ASSIGNMENTS:
+        # Convert the in-memory assignments to DataFrames
+        chatter_files = []
+        for shift in ["overnight", "day", "prime"]:
+            if shift in UPDATED_ASSIGNMENTS:
+                df = pd.DataFrame(UPDATED_ASSIGNMENTS[shift])
+                chatter_files.append(df)
 
-        # Debugging: Print final schedule for the shift
-        print(f"DEBUG: Final Schedule for {shift_name}:")
-        print(schedule.head())
+        creators_file = pd.DataFrame({"Creator": UPDATED_ASSIGNMENTS.get("creator_names", [])})
+    else:
+        # Fall back to reading processed files
+        chatter_files = [
+            pd.read_excel(os.path.join(PROCESSED_FOLDER, "Updated_overnight_file.xlsx")),
+            pd.read_excel(os.path.join(PROCESSED_FOLDER, "Updated_day_file.xlsx")),
+            pd.read_excel(os.path.join(PROCESSED_FOLDER, "Updated_prime_file.xlsx")),
+        ]
+        creators_file = pd.read_excel(os.path.join(PROCESSED_FOLDER, "creators_file.xlsx"))
+
+    # Debugging: Ensure chatter files and creators file are populated
+    print("DEBUG: Chatter Files and Creators File for Schedule Generation")
+    for chatter_file in chatter_files:
+        print(chatter_file.head())
+    print(creators_file.head())
 
-        # Save the schedule
-        schedules[shift_name] = schedule.to_dict(orient="records")
+    try:
+        # Generate schedules using in-memory or processed data
+        full_schedules = generate_schedule(chatter_files, creators_file)
+        return full_schedules
+    except Exception as e:
+        return f"Error generating full schedule: {e}"
 
-    return schedules