Merge pull request #21 from coreofscience/revert-leaf-changes-if-they-remove-all-leaves

Revert leaf removals if they delete all leaves

Author: jdalzatec

setup.py

@@ -10,7 +10,7 @@
 requirements = [
     "Click>=7.0,<8",
     "python-igraph>=0.8.0,<1",
-    "wostools>=2.0.6,<3",
+    "wostools>=2.0.7,<3",
 ]
 
 setup_requirements = [

src/sap/__init__.py

@@ -145,8 +145,12 @@ def leaf(self, graph: Graph) -> Graph:
             not_leaves_anymore["leaf"] = 0
 
         if self.max_leaf_age is not None:
-            ignored = "\n".join(new_graph.vs.select(year_eq=None)["name"])
-            logging.info(f"Ignoring these nodes for year calculations:\n{ignored}")
+            ignored = new_graph.vs.select(year_eq=None)
+            ignored = [
+                {attr: v[attr] for attr in ignored.attributes()} for v in ignored
+            ]
+            if ignored:
+                logging.info(f"Ignoring these nodes for year calculations:\n{ignored}")
             newest_publication_year: int = max(
                 filter(None, new_graph.vs[potential_leaves]["year"])
             )
@@ -156,6 +160,12 @@ def leaf(self, graph: Graph) -> Graph:
             )
             not_leaves_anymore["leaf"] = 0
 
+        if not any(new_graph.vs["leaf"]) and any(new_graph.vs["extended_leaf"]):
+            logging.info(
+                f"Reverting leaf cut policies, as they remove all possible leaves"
+            )
+            new_graph.vs["leaf"] = new_graph.vs["extended_leaf"]
+
         if self.max_leaves is not None:
             sorted_leaves = _sorted_nodes(new_graph, "leaf")
             not_leaves_anymore = sorted_leaves[self.max_leaves :]

src/sap/cli.py

@@ -90,7 +90,7 @@ def describe(ctx, sources, output):
             click.echo(graph.summary() + "\n")
         except TypeError:
             logger.exception(
-                f"There was an error processin the graph\n{graph.summary()}"
+                f"There was an error processing the graph\n{graph.summary()}"
             )