Linting

Author: cmutel

bw_graph_tools/graph_traversal/__init__.py

@@ -11,11 +11,11 @@
     "TaggedGraphTraversalSettings",
 )
 
-from bw_graph_tools.graph_traversal.settings import GraphTraversalSettings
 from bw_graph_tools.graph_traversal.assumed_diagonal import AssumedDiagonalGraphTraversal
 from bw_graph_tools.graph_traversal.graph_objects import Edge, Flow, Node
 from bw_graph_tools.graph_traversal.new_node_each_visit import NewNodeEachVisitGraphTraversal
 from bw_graph_tools.graph_traversal.same_node_each_visit import SameNodeEachVisitGraphTraversal
+from bw_graph_tools.graph_traversal.settings import GraphTraversalSettings
 from bw_graph_tools.graph_traversal.tagged_nodes import (
     NewNodeEachVisitTaggedGraphTraversal,
     SameNodeEachVisitTaggedGraphTraversal,

bw_graph_tools/graph_traversal/new_node_each_visit.py

@@ -1,6 +1,6 @@
 import warnings
 from heapq import heappop, heappush
-from typing import Dict, Optional, List
+from typing import Dict, List, Optional
 
 import matrix_utils as mu
 import numpy as np
@@ -13,11 +13,15 @@
 except ImportError:
     databases = {}
 
-from bw_graph_tools.matrix_tools import guess_production_exchanges
-from bw_graph_tools.graph_traversal.settings import GraphTraversalSettings
 from bw_graph_tools.graph_traversal.base import BaseGraphTraversal
 from bw_graph_tools.graph_traversal.graph_objects import Edge, Flow, Node
-from bw_graph_tools.graph_traversal.utils import CachingSolver, Counter, get_demand_vector_for_activity
+from bw_graph_tools.graph_traversal.settings import GraphTraversalSettings
+from bw_graph_tools.graph_traversal.utils import (
+    CachingSolver,
+    Counter,
+    get_demand_vector_for_activity,
+)
+from bw_graph_tools.matrix_tools import guess_production_exchanges
 
 
 class NewNodeEachVisitGraphTraversal(BaseGraphTraversal[GraphTraversalSettings]):
@@ -310,7 +314,10 @@ def traverse(
                 if self.settings.separate_biosphere_flows:
                     self.add_biosphere_flows(
                         flows=self._flows,
-                        matrix=(node.supply_amount * self.characterized_biosphere[:, node.activity_index]).tocoo(),
+                        matrix=(
+                            node.supply_amount
+                            * self.characterized_biosphere[:, node.activity_index]
+                        ).tocoo(),
                         lca=self.lca,
                         node=node,
                         biosphere_cutoff_score=self.biosphere_cutoff_score,
@@ -323,7 +330,7 @@ def traverse(
 
         non_terminal_nodes = {edge.consumer_unique_id for edge in self._edges}
         for key, obj in self._nodes.items():
-            obj.terminal = (key not in non_terminal_nodes)
+            obj.terminal = key not in non_terminal_nodes
 
     @property
     def exceeded_calculation_count(self):
@@ -463,7 +470,9 @@ def traverse_edges(
                 # Local max depth overrides everything, and already include global max depth
                 satisfies_depth_constraint = producing_node.max_depth > producing_node.depth
             else:
-                satisfies_depth_constraint = (max_depth is None) or (producing_node.depth < max_depth)
+                satisfies_depth_constraint = (max_depth is None) or (
+                    producing_node.depth < max_depth
+                )
 
             if satisfies_depth_constraint:
                 heappush(heap, (abs(1 / cumulative_score), producing_node))

bw_graph_tools/graph_traversal/settings.py

@@ -1,6 +1,7 @@
-from typing import Optional, List
-from typing_extensions import Annotated
+from typing import List, Optional
+
 from pydantic import BaseModel, Field, model_validator
+from typing_extensions import Annotated
 
 
 class GraphTraversalSettings(BaseModel):
@@ -37,9 +38,7 @@ class GraphTraversalSettings(BaseModel):
     @model_validator(mode="after")
     def max_depth_positive(self):
         if self.max_depth is not None and self.max_depth <= 0:
-            raise ValueError(
-                f"If specified, `max_depth` must be greater than zero"
-            )
+            raise ValueError(f"If specified, `max_depth` must be greater than zero")
         return self
 
 

bw_graph_tools/graph_traversal/tagged_nodes.py

@@ -1,16 +1,14 @@
 import hashlib
 from collections import defaultdict
-from typing import Dict, List, Optional, Set, Tuple, Union, Iterable
+from typing import Dict, Iterable, List, Optional, Set, Tuple, Union
 
 import bw2data as bd
 
 from bw_graph_tools.graph_traversal import SameNodeEachVisitGraphTraversal
-from bw_graph_tools.graph_traversal.settings import TaggedGraphTraversalSettings
 from bw_graph_tools.graph_traversal.base import BaseGraphTraversal
-from bw_graph_tools.graph_traversal.graph_objects import Edge, GroupedNodes, Node, Flow
-from bw_graph_tools.graph_traversal.new_node_each_visit import (
-    NewNodeEachVisitGraphTraversal,
-)
+from bw_graph_tools.graph_traversal.graph_objects import Edge, Flow, GroupedNodes, Node
+from bw_graph_tools.graph_traversal.new_node_each_visit import NewNodeEachVisitGraphTraversal
+from bw_graph_tools.graph_traversal.settings import TaggedGraphTraversalSettings
 
 
 class NewNodeEachVisitTaggedGraphTraversal(

bw_graph_tools/graph_traversal/utils.py

@@ -1,7 +1,8 @@
-from scipy.sparse import spmatrix
 from functools import lru_cache
+
 import numpy as np
 from bw2calc import LCA
+from scipy.sparse import spmatrix
 
 from bw_graph_tools.graph_traversal.graph_objects import Node
 

tests/traversal/test_same_node.py

@@ -1,9 +1,6 @@
 import pytest
 
-from bw_graph_tools.graph_traversal import (
-    SameNodeEachVisitGraphTraversal,
-    GraphTraversalSettings,
-)
+from bw_graph_tools.graph_traversal import GraphTraversalSettings, SameNodeEachVisitGraphTraversal
 from bw_graph_tools.graph_traversal.base import GraphTraversalException
 
 

tests/traversal/test_tagging_traversal.py

@@ -1,16 +1,15 @@
 from itertools import groupby
 
+import bw2data as bd
 import pytest
 
 from bw_graph_tools import NewNodeEachVisitGraphTraversal
 from bw_graph_tools.graph_traversal import (
-    NewNodeEachVisitTaggedGraphTraversal,
     GraphTraversalSettings,
+    NewNodeEachVisitTaggedGraphTraversal,
     TaggedGraphTraversalSettings,
 )
-from bw_graph_tools.graph_traversal.graph_objects import GroupedNodes, Node, Edge
-import bw2data as bd
-
+from bw_graph_tools.graph_traversal.graph_objects import Edge, GroupedNodes, Node
 from bw_graph_tools.graph_traversal.utils import Counter
 
 

tests/traversal/test_traversal_from_nodes_with_relative_depth.py

@@ -3,7 +3,7 @@
 from bw2data import Database, Method, get_node
 from bw2data.tests import bw2test
 
-from bw_graph_tools import NewNodeEachVisitGraphTraversal, GraphTraversalSettings
+from bw_graph_tools import GraphTraversalSettings, NewNodeEachVisitGraphTraversal
 from bw_graph_tools.testing import edge_equal_dict, flow_equal_dict, node_equal_dict
 
 
@@ -120,11 +120,7 @@ def test_basic_traversal():
     assert np.allclose(lca.score, 24.96)
 
     gtr = NewNodeEachVisitGraphTraversal(
-        lca=lca,
-        settings=GraphTraversalSettings(
-            max_depth=2,
-            cutoff=0.001
-        )
+        lca=lca, settings=GraphTraversalSettings(max_depth=2, cutoff=0.001)
     )
     gtr.traverse()