clean up stop thread

pages/01-main.py

@@ -73,7 +73,6 @@ status_message = solara.reactive("Ready to start.")
 timer_value = solara.reactive(0)
 
 available_dates = solara.reactive(None)
-
 selected_coordinates = solara.reactive(None)
 selected_country = solara.reactive(None)
 
@@ -81,7 +80,7 @@ selected_country = solara.reactive(None)
 thread_running = threading.Event()  # A simple event to signal the thread.
 
 @solara.component
-def ModelControl(running, status_message):
+def ModelControl(running, status_message,available_dates,selected_coordinates,selected_country ):
 
     def start_model():
         running.value = True
@@ -89,12 +88,14 @@ def ModelControl(running, status_message):
         
 
     def stop_model():
-        running.value = False
-        print(running)
-        timer_value.value = 0 
-        thread_running.wait()
         thread_running.clear()  # Signal the thread to stop.
-        status_message.value = "Model stopped by user."
+        running.value = False
+        timer_value.value = 0
+        status_message.value = "Model stopped by user.Reselect Dates and Region."
+        available_dates.value = None
+        selected_coordinates.value = None
+        selected_country.value = None
+        
 
     if running.value:
         return solara.Button(label="Stop Execution",
@@ -129,11 +130,11 @@ def StatusBar(status_message, timer_value):
         if timer_value.value == 1:
            solara.ProgressLinear(True, color= 'green') 
         elif timer_value.value == 0:
-            solara.ProgressLinear(False )
+            solara.ProgressLinear(False)
 
         if status_message.value == "Ready to start." or status_message.value == "Model is running...":
             solara.Info(f"Status: {status_message.value}")
-        elif status_message.value == "Model stopped by user.":
+        elif status_message.value == "Model stopped by user.Reselect Dates and Region.":
             solara.Warning(f"Status: {status_message.value}")
         elif status_message.value == 'Requires Date Selection':
             solara.Error(f"Status: {status_message.value}")
@@ -170,16 +171,18 @@ def CombinedThread(running, timer_value, status_message, available_dates, select
                 # Reset after model completion.
                 status_message.value = "Model run complete!"
                 running.value = False
+                thread_running.wait()
                 thread_running.clear()
+                return final_df
 
 
             elif not available_dates.value:
                 status_message.value = 'Requires Date Selection'
                 running.value = False
-                
+                thread_running.wait()
                 thread_running.clear()
                 timer_value.value = 0
-                time.sleep(0.5)
+                
 
 
 
@@ -220,7 +223,7 @@ def Page():
         display( map_ui.display_map())
 
     # Control buttons
-    ModelControl(running, status_message)
+    ModelControl(running, status_message,available_dates, selected_coordinates, selected_country )
     # Call the CombinedThread
     CombinedThread(running, timer_value, status_message, available_dates, selected_coordinates, selected_country)
     # Status display

public/ee_cnn.py

@@ -11,6 +11,8 @@ import datetime as dt
 import keras
 import keras as k
 import keras.backend as kr
+import keras.losses
+import h5py
 import multiprocessing as mp
 from pysolar.solar import get_altitude_fast
 import tensorflow as tf
@@ -288,7 +290,7 @@ def CNN(dates_list, coordinates=None, country = None):
 
 
                 num_cores = mp.cpu_count()
-                with mp.Pool(num_cores-1) as pool:
+                with mp.Pool(num_cores) as pool:
                     a = pool.imap(get_SZA, DF[["Date",'lat', 'lon']].itertuples(name=None), chunksize=10)
                     DF['SZA'] = [x for x in a]
 
@@ -309,15 +311,14 @@ def CNN(dates_list, coordinates=None, country = None):
 
                 # Get the project root directory
                 project_root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-
                 module_path = os.path.join(project_root, 'public')
-                print(module_path)
                 # Add the module path to the Python path
                 sys.path.append(module_path)
                
               
                 MODEL = os.path.join(project_root,'public', 'Models/')
                 SCALAR = os.path.join(project_root,'public', 'Scalars/')
+                
 
 
                 #SCALAR = DP + "/Scalars/"     # Universal Scalers