Merge pull request #1499 from mrvisscher/parameter-robustness

Parameter robustness

Author: mrvisscher

.github/conda-envs/test.yml

@@ -3,6 +3,6 @@ channels:
   - conda-forge
 dependencies:
   - pytest
-  - pytest-qt
+  - pytest-qt =4.4.0
   - pytest-mock
   - pytest-env

activity_browser/actions/exchange/exchange_formula_remove.py

@@ -1,5 +1,7 @@
 from typing import Any, List
 
+from bw2data.parameters import ParameterizedExchange
+
 from activity_browser.actions.base import ABAction, exception_dialogs
 from activity_browser.ui.icons import qicons
 
@@ -16,5 +18,10 @@ class ExchangeFormulaRemove(ABAction):
     @exception_dialogs
     def run(exchanges: List[Any]):
         for exchange in exchanges:
+            if "formula" not in exchange:
+                return
+
             del exchange["formula"]
             exchange.save()
+
+            ParameterizedExchange.delete().where(ParameterizedExchange.exchange == exchange._document.id).execute()

activity_browser/actions/exchange/exchange_modify.py

@@ -6,6 +6,7 @@
 from activity_browser.ui.icons import qicons
 
 from ..parameter.parameter_new_automatic import ParameterNewAutomatic
+from .exchange_formula_remove import ExchangeFormulaRemove
 
 
 class ExchangeModify(ABAction):
@@ -19,6 +20,11 @@ class ExchangeModify(ABAction):
     @classmethod
     @exception_dialogs
     def run(cls, exchange: Any, data: dict):
+        # remove the formula if it is an empty string
+        if "formula" in exchange and data.get("formula") == "":
+            del data["formula"]
+            ExchangeFormulaRemove.run([exchange])
+
         for key, value in data.items():
             exchange[key] = value
 

activity_browser/ui/tables/models/activity.py

@@ -4,6 +4,7 @@
 from logging import getLogger
 
 import pandas as pd
+import numpy as np
 from asteval import Interpreter
 from bw2data.parameters import (ActivityParameter, DatabaseParameter, Group,
                                 ProjectParameter)
@@ -61,8 +62,18 @@ def columns(self) -> list:
     def create_row(self, exchange) -> dict:
         """Take the given Exchange object and extract a number of attributes."""
         try:
+            # fixing a broken exchange
+            if not isinstance(exchange.get("amount"), float) or pd.isna(exchange.get("amount")):
+                log.warning(f"Fixing broken exchange amount for {exchange.get('type', '')} exchange from: {exchange.input}")
+                try:
+                    amount = float(exchange.get("amount")) if exchange.get("amount") is not np.nan else 1.0
+                except TypeError:
+                    amount = 1.0
+                exchange["amount"] = amount
+                exchange.save()
+
             row = {
-                "Amount": float(exchange.get("amount", 1)),
+                "Amount": exchange.get("amount"),
                 "Unit": exchange.input.get("unit", "Unknown"),
                 "exchange": exchange,
             }