Feat leafbranch proposals

src/neuron_proofreader/proposal_graph.py

@@ -132,7 +132,7 @@ def add_soma_nodes(self, soma_centroids):
 
             # Add attributes
             self.add_node(node_id)
-            self.component_id_to_swc_id[cnt + i] = "soma-component-{cnt}"
+            self.component_id_to_swc_id[cnt + i] = f"soma-component-{i}"
             self.node_component_id[node_id] = cnt + i
             self.node_radius[node_id] = 10
             self.node_xyz[node_id] = xyz

src/neuron_proofreader/skeleton_graph.py

@@ -356,11 +356,12 @@ def create_job(batch, i):
 
             # Submit last batch
             if batch:
-                threads.append(create_job(batch, i + 1))
+                threads.append(create_job(list(batch), i + 1))
 
             # Watch progress
             pbar = tqdm(total=len(threads), desc="Write SWCs")
-            for _ in as_completed(threads):
+            for thread in as_completed(threads):
+                thread.result()
                 pbar.update(1)
 
     def _batch_to_zipped_swcs(self, nodes_list, zip_path, preserve_radius):
@@ -423,7 +424,8 @@ def write_entry(node, parent):
                 write_entry(j, i)
 
             # Finish
-            zip_writer.writestr(self.node_swc_id(i), text_buffer.getvalue())
+            filename = self.node_swc_id(root)
+            zip_writer.writestr(filename, text_buffer.getvalue())
 
     # --- Helpers ---
     def branching_nodes(self):

src/neuron_proofreader/split_proofreading/split_inference.py

@@ -369,8 +369,8 @@ def reconfigure_node_radius(self):
 
     def save_connections(self, round_id=None):
         """
-        Writes the accepted proposals from the graph to a text file. Each line
-        contains the two swc ids as comma separated values.
+        Writes the accepted proposals to a text file. Each line contains the
+        two SWC IDs as comma separated values.
         """
         suffix = f"-{round_id}" if round_id else ""
         path = os.path.join(self.output_dir, f"connections{suffix}.txt")