fix and simplify logic

app.py

@@ -140,16 +140,11 @@ with gr.Blocks(title="RFD3 Test") as demo:
     display_state.value = "Please Select a Batch and Design number to show sequence"
     
     def generate(config_upload, scaffold_upload, num_batches, num_designs_per_batch, extra_args):
-        if config_upload is None and scaffold_upload is None:
+        if config_upload is None:
             return None, None
-        if config_upload is not None and scaffold_upload is None:
+        else:
             gen_directory, gen_results = generation_with_input_config(config_upload, scaffold_upload, num_batches, num_designs_per_batch, extra_args)
             return gen_directory, gen_results
-        if config_upload is not None and scaffold_upload is not None:
-            gen_directory, gen_results = generation_with_input_config(config_upload, scaffold_upload, num_batches, num_designs_per_batch, extra_args)
-            return gen_directory, gen_results         
-        else:
-            return None, None
         
     run_btn.click(give_run_status, inputs=[num_batches, num_designs_per_batch, config_upload, scaffold_upload], outputs=runtextbox).then(
         generate, inputs=[config_upload, scaffold_upload, num_batches, num_designs_per_batch, extra_args], outputs=[gen_directory, gen_results]

utils/handle_events.py

@@ -121,11 +121,9 @@ def give_run_status(num_batches, num_designs_per_batch, config_upload, scaffold_
 
     
     """
-    if config_upload is None and scaffold_upload is None:        
+    if config_upload is None:        
         return gr.update(value="Please ensure you have uploaded a configuration file: .yaml or .json")
-    if config_upload is not None and scaffold_upload is None:
+    elif scaffold_upload is None:
         return gr.update(value=f"Running unconditional generation for {num_batches} batches of {num_designs_per_batch}, config uploaded from file {os.path.basename(config_upload)}")
-    if config_upload is not None and scaffold_upload is not None:
-        return gr.update(value=f"Running conditional generation for {num_batches} batches of {num_designs_per_batch}, config uploaded from file {os.path.basename(config_upload)}, scaffold uploaded as {os.path.basename(scaffold_upload)}")
     else:
-        return gr.update(value=f"Not implemented yet")
+        return gr.update(value=f"Running conditional generation for {num_batches} batches of {num_designs_per_batch}, config uploaded from file {os.path.basename(config_upload)}, scaffold uploaded as {os.path.basename(scaffold_upload)}")