refactor

app.py

@@ -33,51 +33,12 @@ N_OVERALL_STEPS = 6
 ########################################################################################################
 ### Progress bar                                                                                    ####
 ########################################################################################################
-# class ProgressReport:
-#     def __init__(self, overall_bar, batch_bar, text_overall, text_batch):
-#         self.overall_bar = overall_bar
-#         self.batch_bar = batch_bar
-#         self.text_overall = text_overall
-#         self.text_batch = text_batch
-#         self.current_overall_step = 0
-#         self.total_overall_steps = 20  # number of major steps in machine function
-#         self.current_batch = 0
-#         self.total_batches = 20
-
-#     def update_overall(self, step_name=""):
-#         self.current_overall_step += 1
-#         self.overall_bar.progress(self.current_overall_step / self.total_overall_steps)
-#         self.text_overall.text(step_name)
-
-#     def update_batch(self, step_name=""):
-#         self.current_batch += 1
-#         self.batch_bar.progress(self.current_batch / self.total_batches)
-#         self.text_batch.text(step_name)
-
-#     def set_n_batches(self, n_batches):
-#         self.total_batches = n_batches
-
-#     def set_n_overall(self, total_overall_steps):
-#         self.current_overall_step = 0
-#         self.overall_bar.progress(0)
-#         self.total_overall_steps = total_overall_steps
-
-#     def reset_batch(self, step_name):
-#         self.current_batch = 0
-#         self.batch_bar.progress(0)
-#         self.text_batch.text(step_name)
-#     def reset_overall(self, step_name):
-#         self.current_overall_step = 0
-#         self.overall_bar.progress(0)
-#         self.text_overall.text(step_name)
-        
-#     def get_n_images(self):
-#         return self.n_images
-#     def get_n_overall(self):
-#         return self.total_overall_steps
 class ProgressReport:
-    def __init__(self, update_progress):
-        self.update_progress = update_progress
+    def __init__(self, overall_bar, batch_bar, text_overall, text_batch):
+        self.overall_bar = overall_bar
+        self.batch_bar = batch_bar
+        self.text_overall = text_overall
+        self.text_batch = text_batch
         self.current_overall_step = 0
         self.total_overall_steps = 20  # number of major steps in machine function
         self.current_batch = 0
@@ -85,29 +46,35 @@ class ProgressReport:
 
     def update_overall(self, step_name=""):
         self.current_overall_step += 1
-        overall_progress = self.current_overall_step / self.total_overall_steps
-        self.update_progress(overall_progress=overall_progress, overall_text=step_name)
+        self.overall_bar.progress(self.current_overall_step / self.total_overall_steps)
+        self.text_overall.text(step_name)
 
     def update_batch(self, step_name=""):
         self.current_batch += 1
-        batch_progress = self.current_batch / self.total_batches
-        self.update_progress(batch_progress=batch_progress, batch_text=step_name)
+        self.batch_bar.progress(self.current_batch / self.total_batches)
+        self.text_batch.text(step_name)
 
     def set_n_batches(self, n_batches):
         self.total_batches = n_batches
 
     def set_n_overall(self, total_overall_steps):
         self.current_overall_step = 0
-        self.update_progress(overall_progress=0, overall_text="")
+        self.overall_bar.progress(0)
         self.total_overall_steps = total_overall_steps
 
-    def reset_batch(self, step_name=""):
+    def reset_batch(self, step_name):
         self.current_batch = 0
-        self.update_progress(batch_progress=0, batch_text=step_name)
-
-    def reset_overall(self, step_name=""):
+        self.batch_bar.progress(0)
+        self.text_batch.text(step_name)
+    def reset_overall(self, step_name):
         self.current_overall_step = 0
-        self.update_progress(overall_progress=0, overall_text=step_name)
+        self.overall_bar.progress(0)
+        self.text_overall.text(step_name)
+        
+    def get_n_images(self):
+        return self.n_images
+    def get_n_overall(self):
+        return self.total_overall_steps
     
 
 
@@ -405,6 +372,7 @@ def btn_load_prompt(selected_yaml_file, dir_prompt):
 
 
 def refresh():
+    st.session_state['uploader_idk'] += 1
     st.write('')
 
 
@@ -423,8 +391,6 @@ def upload_local_prompt_to_server(dir_prompt):
             st.success(f"Saved file {file_name} in {dir_prompt}")
         else:
             st.error("Please upload a .yaml file that you previously created using this Prompt Builder tool.")
-        st.session_state['uploader_idk'] += 1
-        st.rerun()
 
 
 
@@ -454,7 +420,7 @@ def use_test_image():
     n_images = len([f for f in os.listdir(st.session_state.config['leafmachine']['project']['dir_images_local']) if os.path.isfile(os.path.join(st.session_state.config['leafmachine']['project']['dir_images_local'], f))])
     st.session_state['processing_add_on'] = f" {n_images} Images"
     clear_image_gallery()
-
+    st.session_state['uploader_idk'] += 1
 
 
 
@@ -990,53 +956,24 @@ The desired null value is also given. Populate the field with the null value of
         }
         st.json(st.session_state['prompt_info'])
 
-# def content_header():
-#     # Header section, run, quick start, API report
-#     col_run_1, col_run_2, col_run_3, col_run_4 = st.columns([2,2,2,2])
-
-#     # Progress bar
-#     col_run_info_1 = st.columns([1])[0]
-
-#     with col_run_info_1:
-#         # Progress
-#         st.subheader("Overall Progress")
-#         overall_progress_bar = st.progress(0)
-#         text_overall = st.empty()  # Placeholder for current step name
-        
-#         st.subheader('Transcription Progress')
-#         batch_progress_bar = st.progress(0)
-#         text_batch = st.empty()  # Placeholder for current step name
-
-#         progress_report = ProgressReport(overall_progress_bar, batch_progress_bar, text_overall, text_batch)
 def content_header():
     # Header section, run, quick start, API report
     col_run_1, col_run_2, col_run_3, col_run_4 = st.columns([2,2,2,2])
 
-    # Progress bar placeholders
+    # Progress bar
     col_run_info_1 = st.columns([1])[0]
 
     with col_run_info_1:
-        # Placeholders for the progress bars
+        # Progress
         st.subheader("Overall Progress")
-        overall_progress_placeholder = st.empty()  # Placeholder for overall progress bar
+        overall_progress_bar = st.progress(0)
         text_overall = st.empty()  # Placeholder for current step name
         
         st.subheader('Transcription Progress')
-        batch_progress_placeholder = st.empty()  # Placeholder for batch progress bar
+        batch_progress_bar = st.progress(0)
         text_batch = st.empty()  # Placeholder for current step name
 
-        # Function to update progress
-        def update_progress(overall_progress, batch_progress, overall_text, batch_text):
-            if overall_progress is not None:
-                overall_progress_bar = overall_progress_placeholder.progress(overall_progress)
-            if batch_progress is not None:
-                batch_progress_bar = batch_progress_placeholder.progress(batch_progress)
-            if overall_text is not None:
-                text_overall.text(overall_text)
-            if batch_text is not None:
-                text_batch.text(batch_text)
-
-        progress_report = ProgressReport(update_progress) 
+        progress_report = ProgressReport(overall_progress_bar, batch_progress_bar, text_overall, text_batch)
         
         st.info("***Note:*** There is a known bug with tabs in Streamlit. If you update an input field it may take you back to the 'Project Settings' tab. Changes that you made are saved, it's just an annoying glitch. We are aware of this issue and will fix it as soon as we can.")
         st.write("If you use VoucherVision frequently, you can change the default values that are auto-populated in the form below. In a text editor or IDE, edit the first few rows in the file `../VoucherVision/vouchervision/VoucherVision_Config_Builder.py`")
@@ -1199,8 +1136,10 @@ def content_tab_settings():
             n_images = len([f for f in os.listdir(st.session_state.config['leafmachine']['project']['dir_images_local']) if os.path.isfile(os.path.join(st.session_state.config['leafmachine']['project']['dir_images_local'], f))])
             st.session_state['processing_add_on'] = f" {n_images} Images"
             uploaded_files = None
+            st.session_state['uploader_idk'] += 1
             st.info(f"Processing **{n_images}** images from {st.session_state.config['leafmachine']['project']['dir_images_local']}")
 
+
         st.button("Use Test Image",help="This will clear any uploaded images and load the 1 provided test image.",on_click=use_test_image)
 
     # Show uploaded images gallery (thumbnails only)