Update app.py

app.py

@@ -54,68 +54,39 @@ def generate_main_accounts(updated_data=None):
         return "Missing required files. Please upload all necessary files.", None
 
     try:
-        if updated_data is not None:
-            # Ensure updated_data is in the correct format
-            if isinstance(updated_data, pd.DataFrame):
-                updated_data = updated_data.to_dict(orient="records")
-
-            # Group updated data by shift and save to UPDATED_ASSIGNMENTS
-            UPDATED_ASSIGNMENTS = {
-                shift.lower(): [
-                    {key: record[key] for key in record if key != "Shift"}  # Remove the Shift column
-                    for record in updated_data if record["Shift"] == shift.capitalize()
-                ]
-                for shift in ["overnight", "day", "prime"]
-            }
-
-            UPDATED_ASSIGNMENTS["creator_names"] = list(
-                set(record["Main Account"] for record in updated_data if "Main Account" in record)
-            )
-
-            save_processed_files(UPDATED_ASSIGNMENTS, PROCESSED_FOLDER)
-            return "Assignments updated successfully!", pd.DataFrame(updated_data)
-
-        # Debugging: Verify creators file before processing
-        print("DEBUG: Original Creators File Columns")
-        creators_df = pd.read_excel(creators_file)
-        print(creators_df.columns)
-
-        # Ensure creators file has correct columns
-        column_mapping = {
-            "Creator": "Creator",
-            "Total earnings": "Total earnings",
-            "Subscription": "Subscription",
-            "Active Fans": "ActiveFans",
-            "Total active fans": "ActiveFans",
+        # Step 1: Assign main accounts
+        updated_chatter_files, account_data = assign_main_accounts(creators_file, chatter_files)
+        print("DEBUG: Updated Chatter Files and Account Data Successfully Generated")
+
+        # Save processed files
+        UPDATED_ASSIGNMENTS = {
+            "chatter_files": updated_chatter_files,
+            "account_data": account_data
         }
-        creators_df.rename(columns={k: v for k, v in column_mapping.items() if k in creators_df.columns}, inplace=True)
-
-        # Debugging: Verify creators file after renaming
-        print("DEBUG: Renamed Creators File Columns")
-        print(creators_df.columns)
-
-        required_columns = ["Creator", "ActiveFans"]
-        missing_columns = [col for col in required_columns if col not in creators_df.columns]
-        if missing_columns:
-            raise KeyError(f"Missing required columns in creators file: {missing_columns}")
+        for idx, chatter_df in enumerate(updated_chatter_files):
+            chatter_df.to_excel(
+                os.path.join(PROCESSED_FOLDER, f"Updated_{['overnight', 'day', 'prime'][idx]}_file.xlsx"),
+                index=False
+            )
+        account_data.to_excel(os.path.join(PROCESSED_FOLDER, "creators_file.xlsx"), index=False)
 
-        # Save the processed creators file
-        creators_df.to_excel(os.path.join(PROCESSED_FOLDER, "creators_file.xlsx"), index=False)
-        main_assignments = assign_main_accounts(creators_file, chatter_files)
-        UPDATED_ASSIGNMENTS = main_assignments
-        save_processed_files(main_assignments, PROCESSED_FOLDER)
+        # Save Creator and ActiveFans to a separate file
+        creator_output_file = os.path.join(PROCESSED_FOLDER, "Creators_ActiveFans.xlsx")
+        account_data.to_excel(creator_output_file, index=False)
+        print(f"DEBUG: Saved Creator-ActiveFans data to {creator_output_file}")
 
-        # Combine all shifts into a single DataFrame for preview
+        # Step 2: Combine for preview
         preview_data = []
-        for shift, data in main_assignments.items():
-            if shift != "creator_names":  # Skip creator names
-                for record in data:
-                    record["Shift"] = shift.capitalize()
-                    preview_data.append(record)
+        shift_names = ["Overnight", "Day", "Prime"]
+        for idx, chatter_df in enumerate(updated_chatter_files):
+            chatter_df["Shift"] = shift_names[idx]
+            preview_data.append(chatter_df)
 
-        preview_df = pd.DataFrame(preview_data)
+        preview_df = pd.concat(preview_data, ignore_index=True)
         return "Main accounts generated successfully!", preview_df
+
     except Exception as e:
+        print(f"Error during main account generation: {e}")
         return f"Error during main account generation: {e}", None
 
 
@@ -124,6 +95,7 @@ def generate_main_accounts(updated_data=None):
 
 
 
+
 # Global variable to store updated assignments from the main account generation
 UPDATED_ASSIGNMENTS = {}