minor improvements, allow more freedom for gradio and spaces versions

app.py

@@ -28,13 +28,12 @@ def run_on_gpu(input_point_cloud: gr.utils.NamedString,
 
     in_file = '{}'.format(input_point_cloud.name)
 
-    # append 'rec' to the input file name
-    # splitext_result = os.path.splitext(in_file)
     rand_hash = uuid.uuid4().hex
     out_dir = '/tmp/outputs/{}'.format(rand_hash)
     out_file_basename = os.path.basename(in_file) + '.ply'
     out_file = os.path.join(out_dir, os.path.basename(in_file), out_file_basename)
     os.makedirs(out_dir, exist_ok=True)
+
     model_path = 'models/ppsurf_50nn/version_0/checkpoints/last.ckpt'
 
     args = [
@@ -57,20 +56,17 @@ def run_on_gpu(input_point_cloud: gr.utils.NamedString,
     try:
         subprocess.run(['python', 'ppsurf/pps.py'] + args[1:])  # need subprocess to spawn workers
     except Exception as e:
-        print('Error:', e)  # print to console
-        gr.Warning("Reconstruction failed, see console log for details.")  # notify user
+        gr.Warning("Reconstruction failed:\n{}".format(e))
 
     print('Finished inference at {}'.format(datetime.datetime.now()))
-
     result_3d_model = out_file
-
     return result_3d_model
 
 
 def main():
-    description_header = '# PPSurf [Github](https://github.com/cg-tuwien/ppsurf) [Project](https://www.cg.tuwien.ac.at/research/publications/2024/erler_2024_ppsurf/)'
+    description_header = '# PPSurf: Combining Patches and Point Convolutions for Detailed Surface Reconstruction'
 
-    description_col0 = '''
+    description_col0 = '''## [Github](https://github.com/cg-tuwien/ppsurf)
     Supported file formats: 
     - PLY, STL, OBJ and other mesh files, 
     - XYZ as whitespace-separated text file, 
@@ -79,7 +75,7 @@ def main():
     Best results for 50k-250k points. 
     '''
 
-    description_col1 = '''
+    description_col1 = '''## [Project Info](https://www.cg.tuwien.ac.at/research/publications/2024/erler_2024_ppsurf/)
     This method is meant for scans of single and few objects. 
     Quality for scenes and landscapes will be lower.
     
@@ -128,23 +124,30 @@ def main():
                              f'src="https://bit.ly/3gLdBN6" alt="Duplicate Space" /></a></p>')
 
     with gr.Blocks(css='style.css') as demo:
+        # descriptions
         gr.Markdown(description_header)
         with gr.Row():
             with gr.Column():
                 gr.Markdown(description_col0)
+            with gr.Column():
+                gr.Markdown(description_col1)
+
+        # inputs and outputs
+        with gr.Row():
+            with gr.Column():
+                input_point_cloud_upload = gr.File(show_label=False, file_count='single')
                 # with gr.Tabs() as input_tabs:  # re-enable when Gradio supports point clouds
                 #     with gr.TabItem(label='Input Point Cloud Upload', id='pc_upload'):
-                input_point_cloud_upload = gr.File(show_label=False, file_count='single')
-                        # input_point_cloud_upload.upload(
-                        #     fn=convert_to_ply,
-                        #     inputs=[
-                        #         input_point_cloud_upload,
-                        #     ],
-                        #     outputs=[
-                        #         # input_point_cloud_viewer,  # not available here
-                        #     ])
-                    # with gr.TabItem(label='Input Point Cloud Viewer', id='pc_viewer'):
-                    #     input_point_cloud_viewer = gr.Model3D(show_label=False)
+                #         input_point_cloud_upload.upload(
+                #             fn=convert_to_ply,
+                #             inputs=[
+                #                 input_point_cloud_upload,
+                #             ],
+                #             outputs=[
+                #                 # input_point_cloud_viewer,  # not available here
+                #             ])
+                #     with gr.TabItem(label='Input Point Cloud Viewer', id='pc_viewer'):
+                #         input_point_cloud_viewer = gr.Model3D(show_label=False)
                 gen_resolution_global = gr.Slider(
                     label='Grid Resolution (larger for more details)',
                     minimum=17, maximum=513, value=129, step=2)
@@ -158,33 +161,13 @@ def main():
                     label='Edge Refinement Iterations (larger for more details)',
                     minimum=3, maximum=30, value=10, step=1)
             with gr.Column():
-                gr.Markdown(description_col1)
+                result_3d_model = gr.Model3D(label='Reconstructed 3D model')
                 # progress_text = gr.Text(label='Progress')
-                with gr.Tabs():
-                    with gr.TabItem(label='Reconstructed 3D model'):
-                        result_3d_model = gr.Model3D(show_label=False)
-                    # with gr.TabItem(label='Output mesh file'):
-                    #     output_file = gr.File(show_label=False)
-        # with gr.Row():
-        #     examples = [
-        #         ['shapes/dragon1.obj', 'a photo of a dragon', 0, 7.5],
-        #         ['shapes/dragon2.obj', 'a photo of a dragon', 0, 7.5],
-        #         ['shapes/eagle.obj', 'a photo of an eagle', 0, 7.5],
-        #         ['shapes/napoleon.obj', 'a photo of Napoleon Bonaparte', 3, 7.5],
-        #         ['shapes/nascar.obj', 'A next gen nascar', 2, 10],
-        #     ]
-        #     gr.Examples(examples=examples,
-        #                 inputs=[
-        #                     input_point_cloud_viewer,
-        #                     text,
-        #                     seed,
-        #                     guidance_scale,
-        #                 ],
-        #                 outputs=[
-        #                     result_3d_model,
-        #                     output_file,
-        #                 ],
-        #                 cache_examples=False)
+                # with gr.Tabs():
+                #     with gr.TabItem(label='Reconstructed 3D model'):
+                #         result_3d_model = gr.Model3D(show_label=False)
+                #     with gr.TabItem(label='Output mesh file'):
+                #         output_file = gr.File(show_label=False)
 
         with gr.Row():
             run_button = gr.Button('Reconstruct with PPSurf')

requirements.txt

@@ -19,5 +19,5 @@ trimesh>=3.23.5
 pysdf>=0.1.9
 jsonargparse[signatures]>=4.27.5
 
-spaces>=0.23.2
-gradio>=4.19.1
+spaces>=0.23
+gradio>=4.19