Cleaned up the code, added a BTW message, and changed where I put the deep copy

workshops.py

@@ -7,8 +7,6 @@ import random
 import re
 from datetime import date
 
-from websockets import asyncio
-
 import supabase
 import json
 
@@ -87,6 +85,7 @@ def convert_df(df, num_timeslots: int):
         if len(curr_avail) == num_timeslots: 
             completely_available.append(name)
             
+        # should I wrap this in an "if" statement? # yes
         else: 
             curr_avail = [elem.strip() for elem in curr_avail]
             availability[name] = curr_avail 
@@ -105,7 +104,7 @@ def convert_df(df, num_timeslots: int):
         new_avail_dict[instructor] = availability[instructor]
         
 
-    # Sorts the dict such that people who want to teach less are first in the dict
+    # Sorts the dict such that people who want to teach fewer workshops are first in the dict
     pref_dict = {k: v for k, v in sorted(pref_dict.items(), key=lambda item: item[1])}
 
     people = []
@@ -143,12 +142,13 @@ def initialize_timeslots(df) -> dict:
 
 # Recursive function that generates all possible schedules
 def find_all_schedules(people: list, availability: dict, schedule_obj: Schedule, capacity: int, schedules: list, max_timeslots_list: list, max_workshops_list: list) -> None: 
-    if schedule_obj.num_timeslots_filled > max_timeslots_list[0] or schedule_obj.num_timeslots_filled == max_timeslots_list[0]: 
-        schedules.append(copy.deepcopy(schedule_obj))
+    if schedule_obj.num_timeslots_filled >= max_timeslots_list[0]: 
         max_timeslots_list[0] = schedule_obj.num_timeslots_filled
+        
         # Keep track of total number of workshops taught
-        if schedule_obj.total_num_workshops > max_workshops_list[0] or schedule_obj.total_num_workshops == max_workshops_list[0]: 
+        if schedule_obj.total_num_workshops >= max_workshops_list[0]: 
             max_workshops_list[0] = schedule_obj.total_num_workshops
+            schedules.append(copy.deepcopy(schedule_obj))
     
     # Base case
     if len(people) == 0: 
@@ -215,7 +215,7 @@ def make_df(schedules: list, descrip_dict: dict, og_slots: list):
             all_times.append("")
             all_instructors.append("")
 
-        if len(schedules) > 1 or len(schedules) == 1: 
+        if len(schedules) >= 1: 
             all_times.append(f"Schedule #{count}")
             all_instructors.append("")
             count += 1
@@ -276,7 +276,7 @@ def get_description_dict(df):
 # Complete = everyone is teaching desired number of timeslots and each timeslot has at least one workshop
 # NOTE: I'm using "valid" instead of "complete" as a variable name so that I don't mix it up
 # Incomplete = not complete 
-def classify_schedules(people: list, schedules: list, partial_names: list, total_timeslots: int, max_timeslots_filled: int) -> tuple: 
+def classify_schedules(people: list, schedules: list, total_timeslots: int, max_timeslots_filled: int) -> tuple: 
     valid_schedules = []
 
     # Key: score 
@@ -287,8 +287,6 @@ def classify_schedules(people: list, schedules: list, partial_names: list, total
     # Key: person 
     # Value: number of workshops they WANT to teach
     pref_dict = Counter(people)
-
-    pref_dict.update(Counter(partial_names))
     
     all_names = pref_dict.keys() 
     
@@ -310,7 +308,7 @@ def classify_schedules(people: list, schedules: list, partial_names: list, total
                 if instructor in freq_dict: 
                     freq_dict[instructor] += 1 
                 else: 
-                    print("there is a serious issue!!!!")
+                    raise Exception("There is a serious issue!!!!")
 
         # See if everyone is teaching their desired number of workshops 
         everyone_is_teaching = True
@@ -328,7 +326,7 @@ def classify_schedules(people: list, schedules: list, partial_names: list, total
             if len(valid_schedules) > 0: 
                 continue 
             #print(f"teaching desired number of timeslots: {everyone_is_teaching}. At least one workshop per slot: {filled_all_timeslots}.\n{sched}\n")
-            if sched.num_timeslots_filled > overall_max or sched.num_timeslots_filled == overall_max: 
+            if sched.num_timeslots_filled >= overall_max: 
                 overall_max = sched.num_timeslots_filled 
 
                 if sched.num_timeslots_filled not in incomplete_schedules: 
@@ -377,11 +375,8 @@ def get_best_schedules(schedules: list, cutoff: str, max_workshops: int) -> list
 def main(df, capacity:int, num_results: int, og_slots: list):     
     descrip_dict = get_description_dict(df)    
 
-    partial_names = []
-
     timeslots = initialize_timeslots(df) 
     total_timeslots = len(timeslots)
-    print(total_timeslots)
     schedules = []
     schedule_obj = Schedule(timeslots)
     
@@ -390,9 +385,6 @@ def main(df, capacity:int, num_results: int, og_slots: list):
     people = res['people']
     availability = res['availability']
     completely_available = res['completely_available']
-    print(', '.join(people))
-    print(availability)
-    print(f"These instructors are completely avaialable: {', '.join(completely_available)}")
 
 
 
@@ -402,7 +394,6 @@ def main(df, capacity:int, num_results: int, og_slots: list):
         for elem in slots:
             distinct_slots.add(elem)
     num_distinct_slots = len(distinct_slots)
-    print(num_distinct_slots)
 
 
     max_timeslots_list = [num_distinct_slots]
@@ -413,11 +404,26 @@ def main(df, capacity:int, num_results: int, og_slots: list):
     find_all_schedules(people, availability, schedule_obj, capacity, schedules, max_timeslots_list, max_workshops_list)
 
 
-    res = classify_schedules(people, schedules, partial_names, total_timeslots, max_timeslots_list[0])
+    res = classify_schedules(people, schedules, total_timeslots, max_timeslots_list[0])
     valid_schedules = res[0]
     decent_schedules = res[1]
 
     
+    
+
+    # Format "BTW" message
+    if len(completely_available) == 0: 
+        btw = ''
+    else:
+        btw = 'BTW, '
+        if len(completely_available) == 1:
+            btw += f"{completely_available[0]} can teach any time."
+        elif len(completely_available) == 2: 
+            btw += f"{completely_available[0]} and {completely_available[1]} can teach any time."
+        else: 
+            btw += f"{', '.join(completely_available)}can teach any time."
+        btw += " They are NOT in any of the schedules below. Put them where you want!"
+    
     # Return schedules
     if len(valid_schedules) > 0: 
         best_schedules = get_best_schedules(valid_schedules, num_results, max_workshops_list[0])
@@ -425,20 +431,19 @@ def main(df, capacity:int, num_results: int, og_slots: list):
         new_df = res[0]
         count = res[1]
         if count == 1: 
-            results = "Good news! I was able to make a complete schedule." 
+            results = f"Good news! I was able to make a complete schedule. {btw}" 
         else: 
-            results = "Good news! I was able to make multiple complete schedules."
+            results = f"Good news! I was able to make multiple complete schedules. {btw}"
         
     else:
         best_schedules = get_best_schedules(decent_schedules, num_results, max_workshops_list[0])
         res = make_df(best_schedules, descrip_dict, og_slots)
         new_df = res[0]
         count = res[1]
-        beginning = "Here"
         if count == 1: 
-            results = f"{beginning} is the best option."
+            results = f"Here is the best option. {btw}"
         else: 
-            results = f"{beginning} are the best options."
+            results = f"Here are the best options. {btw}"
         
 
     directory = os.path.abspath(os.getcwd())