Got restrictive to work

.gitignore

@@ -1,3 +1,4 @@
 /app_with_api.py
 /app_with_rte.py
+/app_notrestrictive.py
 /venv

app.py

@@ -186,33 +186,32 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
 
     sorted_df = sorted_df.copy().reset_index(drop=True)
 
-    cruas_2 = sorted_df.copy()[(sorted_df.copy()["name"] == "CRUAS 2") & (sorted_df.copy()["end_date"] >= start_date_str)]
-    print(cruas_2[['updated_date', 'end_date', 'available_capacity']])
+    # cruas_2 = sorted_df.copy()[(sorted_df.copy()["name"] == "ST ALBAN 2") & (sorted_df.copy()["end_date"] >= start_date_str)]
+    # print(cruas_2[['updated_date', 'end_date', 'available_capacity']])
 
     # Filter to get identifiers
     filtered_id_df = sorted_df.copy()
-# --------------------------- !!!!!!!!!!!!!!!!!!!!!!! HERE IS POTENTIAL ERROR!!!!!!!!!!!!!!!!!!!!!!! --------------------------- #
+
 # I commented this out
     filtered_id_df = filtered_id_df.drop_duplicates(subset='identifier', keep='last')
 
-    cruas_2 = filtered_id_df.copy()[(filtered_id_df.copy()["name"] == "CRUAS 2") & (filtered_id_df.copy()["end_date"] >= start_date_str)]
-    print(cruas_2[['updated_date', 'end_date', 'available_capacity']])
-# --------------------------- !!!!!!!!!!!!!!!!!!!!!!! HERE IS POTENTIAL ERROR!!!!!!!!!!!!!!!!!!!!!!! --------------------------- #
+    # cruas_2 = filtered_id_df.copy()[(filtered_id_df.copy()["name"] == "ST ALBAN 2") & (filtered_id_df.copy()["end_date"] >= start_date_str)]
+    # print(cruas_2[['updated_date', 'end_date', 'available_capacity']])
 
     filtered_id_df = filtered_id_df.copy().reset_index(drop=True)
 
     # This filter should take all the dates with unavs that include days with unavs in the range of the start and end date
 
-# --------------------------- !!!!!!!!!!!!!!!!!!!!!!! HERE IS POTENTIAL ERROR!!!!!!!!!!!!!!!!!!!!!!! --------------------------- #
 
     # This filter might take out the most recent identifiers (Message ID) that change the dates of unavailability of a plant. 
     # This means that the actual unavailability is something else
     # filtered_df = filtered_id_df.copy()[(filtered_id_df.copy()['start_date'] <= end_date_str) & (filtered_id_df.copy()['end_date'] >= start_date_str)]
+    
+    # Need to eventually do a filter that takes the most restrictive updated identifier instead of the most recent when there 
+    # is an overlap
+    
     filtered_df = filtered_id_df.copy()
 
-
-# --------------------------- !!!!!!!!!!!!!!!!!!!!!!! HERE IS POTENTIAL ERROR!!!!!!!!!!!!!!!!!!!!!!! --------------------------- #
-
     # Update available_capacity where the condition is True
 
     # Standardize datetime in dataframe
@@ -282,8 +281,6 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
                 filtered_values.append(item)
         results_filtered[key] = filtered_values
 
-    # Need to eventually do a filter that takes the most restrictive updated identifier instead of the most recent when there 
-    # is an overlap
 
     sorted_results = results_filtered
     # --------------------- SECOND DATA CLEANING ------------------------ #    
@@ -308,7 +305,7 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
     results_plants = {plant_name: {date: {"available_capacity": power, "updated_date": pd.to_datetime("1970-01-01", utc=True)} for date in dates_of_interest}
                     for plant_name, power in plants_metadata.items()}
 
-
+    print(results_sorted)
     for plant, unavailabilities in results_sorted.items():
         # Get the full power of a given plant according to the sorted results
         original_power = plants_metadata[plant]
@@ -336,7 +333,29 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
 
                 if start_date_unav <= day <= end_date_unav:
                     # Check if the day is already updated with a later update_date
+
                     if day in results_current_plant and updated_date_unav <= results_current_plant[day]["updated_date"]:
+                        # Here is likely where we can do the filter for worst case scenario
+                        # --------------------------- !!!!!!CREATE NEW FILTER THAT KEEPS ONLY MOST RESTRICTIVE OVERLAP!!!!!! --------------------------- #
+                        # if power_unavailability < results_current_plant[day]['available_capacity']:
+
+                        #     # Calculate the % of the day that the plant is under maintenance
+                        #     if start_date_unav == day and day == end_date_unav:
+                        #         # The unavailability starts and ends on the same day
+                        #         percentage_of_day = (end_hour * 60 + end_minute - start_hour * 60 - start_minute) / (24 * 60)
+                        #     elif start_date_unav == day:
+                        #         # The unavailability starts on the current day but ends on a later day
+                        #         percentage_of_day = (24 * 60 - (start_hour * 60 + start_minute)) / (24 * 60)
+                        #     elif day == end_date_unav:
+                        #         # The unavailability starts on a previous day and ends on the current day
+                        #         percentage_of_day = (end_hour * 60 + end_minute) / (24 * 60)
+                        #     else:
+                        #         # The unavailability covers the entire day
+                        #         percentage_of_day = 1
+
+                        # --------------------------- !!!!!!CREATE NEW FILTER THAT KEEPS ONLY MOST RESTRICTIVE OVERLAP!!!!!! --------------------------- #
+                        # else:
+
                         continue  # Skip to the next loop if there is already information for a later update_date
 
                     # Calculate the % of the day that the plant is under maintenance
@@ -357,8 +376,15 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
                     power_of_day = percentage_of_day * power_unavailability + (1 - percentage_of_day) * original_power
 
                     # Update the available_capacity for the day only if it's not already updated with a later update_date
-                    if day not in results_current_plant or updated_date_unav > results_current_plant[day]["updated_date"]:
+                    if (day not in results_current_plant):
                         results_current_plant[day] = {"available_capacity": power_of_day, "updated_date": updated_date_unav}
+                    
+                    elif (day in results_current_plant) and (updated_date_unav > results_current_plant[day]["updated_date"]) and (power_of_day < results_current_plant[day]['available_capacity']):
+                        results_current_plant[day] = {"available_capacity": power_of_day, "updated_date": updated_date_unav}
+
+                    else:
+                        continue
+
 
 
     output_results = {}
@@ -381,12 +407,12 @@ def nuc_monitor(usr_start_date, usr_end_date, past_date, mongo_db_data):
     # -------------------------------------------------
 
 
-@st.cache_data
+# @st.cache_data
 def get_mongodb_data(start_date, end_date, past_date):
     database_data = mongo_unavs_call(start_date, end_date, past_date)
     return database_data
 
-@st.cache_data
+# @st.cache_data
 def get_nucmonitor_data(start_date, end_date, past_date):
     mongo = get_mongodb_data(start_date, end_date, past_date)
     response_nucmonitor = nuc_monitor(start_date, end_date, past_date, mongo)
@@ -396,7 +422,7 @@ def get_nucmonitor_data(start_date, end_date, past_date):
     df = pd.read_json(response_nucmonitor)
     return df
 
-@st.cache_data
+# @st.cache_data
 def get_photodate_data(start_date, end_date, past_date):
     mongo = get_mongodb_data(start_date, end_date, past_date)
     response_nucmonitor = nuc_monitor(start_date, end_date, past_date, mongo)