brightway-basic-explorer 0.9.dev2__tar.gz → 0.9.dev3__tar.gz

{brightway_basic_explorer-0.9.dev2 → brightway_basic_explorer-0.9.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brightway-basic-explorer
-Version: 0.9.dev2
+Version: 0.9.dev3
 Summary: Implement basic GUI to explorer brightway ativities
 Author-email: Benoît GSCHWIND <benoit.gschwind@minesparis.psl.eu>, OIE - Mines Paris PSL <benoit.gschwind@minesparis.psl.eu>
 Maintainer-email: Benoît GSCHWIND <benoit.gschwind@minesparis.psl.eu>

{brightway_basic_explorer-0.9.dev2 → brightway_basic_explorer-0.9.dev3}/brightway_basic_explorer/__init__.py

@@ -18,6 +18,40 @@ def activity_to_json(act):
     a["exchanges"] = exs
     return a
 
+def activity_to_json_with_params(act, params):
+    try:
+        from lca_algebraic.params import (
+            all_params,
+            _complete_and_expand_params,
+            _getAmountOrFormula,
+        )
+
+        from sympy import Basic, Symbol
+    except:
+        raise Exception("lca_algebraic not found, please install it before using show_activity_with_params")
+
+    a = dict(act)
+    exs = list()
+    for e in act.exchanges():
+        de = dict(bw2data.get_activity(e["input"]))
+
+        amount = _getAmountOrFormula(e)
+
+        # Params provided ? Evaluate formulas
+        if isinstance(amount, Basic):
+            print(amount)
+            new_params = [(name, value) for name, value in _complete_and_expand_params(params, list(all_params().keys())).items()]
+            print(new_params)
+            amount = amount.subs(new_params).evalf()
+            print(amount)
+            de["computed_amount"] = True
+
+        de["amount"] = amount
+        de["formula"] = e.get("formula", None)
+        exs.append(de)
+    a["exchanges"] = exs
+    return a
+
 class QStandardItemRO(QtGui.QStandardItem):
     def __init__(self, *args, data=None, **kwargs):
         super().__init__(*args, **kwargs)
@@ -46,6 +80,9 @@ class TableModel(QtGui.QStandardItemModel):
                 for k in ["name", "unit", "categories", "location", "amount", "formula"]
             ]
 
+            if "computed_amount" in e:
+               row[-2].setForeground(QtGui.QBrush(QtCore.Qt.GlobalColor.red))
+
             etype = e.get("type", "unknown")
             if etype == "emission":
                 path = os.path.join(os.path.dirname(__file__), "icons", "emission.png")
@@ -89,11 +126,9 @@ class ActionMenu(QtGui.QMenu):
 class ActivityWindow(QtGui.QMainWindow):
     keep = dict()
 
-    def __init__(self, act):
+    def __init__(self, activity_json):
         super().__init__()
-        self.act = act
-
-        data = activity_to_json(act)
+        self.activity_key = (activity_json["database"], activity_json["code"])
 
         self.setWindowTitle("Activity Viewer")
         self.setGeometry(100, 100, 800, 600)
@@ -109,7 +144,7 @@ class ActivityWindow(QtGui.QMainWindow):
 
         for i, k in enumerate(["database", "name", "location", "unit", "categories", "type"]):
             grid.addWidget(QtGui.QLabel(f"{k}:"), i, 0)
-            x = QtGui.QLabel(f"{str(data.get(k, '-'))}")
+            x = QtGui.QLabel(f"{str(activity_json.get(k, '-'))}")
             x.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.TextSelectableByMouse)
             grid.addWidget(x, i, 1)
         next_row = grid.rowCount()
@@ -134,7 +169,7 @@ class ActivityWindow(QtGui.QMainWindow):
         self.tree_view.setAlternatingRowColors(True)
 
         self.model = TableModel()
-        self.model.load(data["exchanges"])
+        self.model.load(activity_json["exchanges"])
         self.tree_view.setModel(self.model)
         self.tree_view.doubleClicked.connect(self.doubleCliked)
         self.tree_view.setExpandsOnDoubleClick(False)
@@ -149,8 +184,8 @@ class ActivityWindow(QtGui.QMainWindow):
         self.action_menu.exec(self.tree_view.viewport().mapToGlobal(point))
 
     def closeEvent(self, ev):
-        if self.act.key in ActivityWindow.keep:
-            del ActivityWindow.keep[self.act.key]
+        if self.activity_key in ActivityWindow.keep:
+            del ActivityWindow.keep[self.activity_key]
         super().closeEvent(ev)
 
     def update_filter(self, *args):
@@ -173,12 +208,29 @@ class ActivityWindow(QtGui.QMainWindow):
     def explore(self, index):
         r = index.row()
         v = self.model.root.child(r, 0).data()
-        show_activity(bw2data.get_activity((v["database"], v["code"])))
+        show_activity(bw2data.get_activity((v["database"], v["code"])), self.params)
 
     def show(self, *args, **kwargs):
         super().show(*args, **kwargs)
         self.tree_view.setColumnWidth(0, 400)
 
+class ActivityWindowWithParams(ActivityWindow):
+    keep = dict()
+
+    def __init__(self, activity_json, params):
+        super().__init__(activity_json)
+        self.params = params
+
+    def closeEvent(self, ev):
+        if self.activity_key in ActivityWindow.keep:
+            del ActivityWindowWithParams.keep[self.activity_key]
+        super().closeEvent(ev)
+
+    def explore(self, index):
+        r = index.row()
+        v = self.model.root.child(r, 0).data()
+        show_activity_with_params(bw2data.get_activity((v["database"], v["code"])), self.params)
+
 # Replace IPython version to one compatible with Qt6
 def start_event_loop_qt4(app=None):
     """Start the qt event loop in a consistent manner."""
@@ -194,7 +246,7 @@ def start_event_loop_qt4(app=None):
     else:
         app._in_event_loop = True
 
-def show_activity(act):
+def _show_activity(cls, activity_json, *args):
 
     if 'matplotlib' in sys.modules:
         import matplotlib
@@ -204,9 +256,9 @@ def show_activity(act):
 
     app = get_app_qt4()
 
-    if (window := ActivityWindow.keep.get(act.key, None)) is None:
-        window = ActivityWindow(act)
-        ActivityWindow.keep[act.key] = window
+    if (window := cls.keep.get((activity_json["database"], activity_json["code"]), None)) is None:
+        window = cls(activity_json, *args)
+        cls.keep[(activity_json["database"], activity_json["code"])] = window
     window.show()
 
     if not is_event_loop_running_qt4(app):
@@ -214,6 +266,14 @@ def show_activity(act):
 
     window.activateWindow()
 
+def show_activity(act):
+    activity_json = activity_to_json(act)
+    _show_activity(ActivityWindow, activity_json)
+
+def show_activity_with_params(act, params):
+    activity_json = activity_to_json_with_params(act, params)
+    _show_activity(ActivityWindowWithParams, activity_json, params)
+
 def close_all():
     for w in list(ActivityWindow.keep.values()):
         w.close()

{brightway_basic_explorer-0.9.dev2 → brightway_basic_explorer-0.9.dev3}/brightway_basic_explorer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brightway-basic-explorer
-Version: 0.9.dev2
+Version: 0.9.dev3
 Summary: Implement basic GUI to explorer brightway ativities
 Author-email: Benoît GSCHWIND <benoit.gschwind@minesparis.psl.eu>, OIE - Mines Paris PSL <benoit.gschwind@minesparis.psl.eu>
 Maintainer-email: Benoît GSCHWIND <benoit.gschwind@minesparis.psl.eu>

{brightway_basic_explorer-0.9.dev2 → brightway_basic_explorer-0.9.dev3}/pyproject.toml

@@ -12,7 +12,7 @@ name = "brightway-basic-explorer"
 description = "Implement basic GUI to explorer brightway ativities"
 readme = "README.md"
 license-files = ["COPYING"]
-version = "0.9.dev2"
+version = "0.9.dev3"
 dependencies = [ "ipython" ]
 requires-python = ">= 3.10"
 keywords = ["lca", "ecoinvent", "brightway"]