Merge pull request #19 from brightway-lca/wiser_deliverables

More #18 Fixes

app/index.py

@@ -80,10 +80,13 @@ def nodes_dict_to_dataframe(nodes: dict) -> pd.DataFrame:
         A dataframe with human-readable descriptions and emissions values of the nodes in the graph traversal.
     """
     list_of_row_dicts = []
-    for i in range(0, len(nodes)):
-        current_node: Node = nodes[i]
+    for current_node in nodes.values():
+
         scope_1: bool = False
-        if current_node.unique_id == 0:
+
+        if current_node.unique_id == -1:
+            continue
+        elif current_node.unique_id == 0:
             scope_1 = True
         else:
             pass
@@ -101,16 +104,15 @@ def nodes_dict_to_dataframe(nodes: dict) -> pd.DataFrame:
     return pd.DataFrame(list_of_row_dicts)
 
 
-def edges_dict_to_dataframe(edges: dict) -> pd.DataFrame:
+def edges_dict_to_dataframe(edges: list) -> pd.DataFrame:
     """
     To be added...
     """
     if len(edges) < 2:
         return pd.DataFrame()
     else:
         list_of_row_dicts = []
-        for i in range(0, len(edges)-1):
-            current_edge: Edge = edges[i]
+        for current_edge in edges:
             list_of_row_dicts.append(
                 {
                     'consumer_unique_id': current_edge.consumer_unique_id,

dev/edit_graph.py

@@ -0,0 +1,12 @@
+import pandas as pd
+
+# %%
+
+data = {
+    'uid': [0, 1, 2, 3],
+    'description': ['cardboard', 'paper', 'wood', 'electricity'],
+    'production': [True, False, True, False],
+    'emissions_intensity': [1.5, 2.2, 0.7, 0.2],
+}
+
+df = pd.DataFrame(data)

dev/trace_branch.py

@@ -51,10 +51,13 @@ def nodes_dict_to_dataframe(nodes: dict) -> pd.DataFrame:
         A dataframe with human-readable descriptions and emissions values of the nodes in the graph traversal.
     """
     list_of_row_dicts = []
-    for i in range(0, len(nodes)-1):
-        current_node: Node = nodes[i]
+    for current_node in nodes.values():
+
         scope_1: bool = False
-        if current_node.unique_id == 0:
+
+        if current_node.unique_id == -1:
+            continue
+        elif current_node.unique_id == 0:
             scope_1 = True
         else:
             pass

requirements.txt

@@ -1,4 +1,4 @@
-panel==1.5.0 # https://pypi.org/project/panel/#history
+panel==1.5.1 # https://pypi.org/project/panel/#history
 plotly==5.24.0 # https://pypi.org/project/plotly/#history
 bw2data==4.0.dev52 # https://pypi.org/project/bw2data/#history
 bw2io==0.9.dev37 # https://pypi.org/project/bw2io/#history