lca-algebraic 1.4.1.dev4__tar.gz → 1.4.1.dev6__tar.gz

{lca_algebraic-1.4.1.dev4 → lca_algebraic-1.4.1.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lca_algebraic
-Version: 1.4.1.dev4
+Version: 1.4.1.dev6
 Summary: This library provides a layer above Brightway for defining parametric models and running super fast LCA for monte carlo analysis.
 Author-email: OIE - Mines ParisTech <raphael.jolivet@mines-paristech.fr>
 License: BSD

{lca_algebraic-1.4.1.dev4 → lca_algebraic-1.4.1.dev6}/lca_algebraic/activity.py

@@ -13,12 +13,14 @@ from lca_algebraic.bw_wrapper import (
     Activity,
     Exchange,
     ExchangeDataset,
+    activity_not_found,
     copy_activity_skip_keys,
     dict_as_exchangedataset,
     exchange_type_for_sub_act,
     get_activity,
     process_node_default,
     production_edge_default,
+    purge_activity_content,
 )
 from lca_algebraic.database import (
     _find_biosphere_db,
@@ -168,6 +170,11 @@ class ActivityExtended(Activity):
                 or activity for updating only input,
             or dict of attributes, for updating both at once, or any other attribute.
             The amount can reference the symbol 'old_amount' that will be replaced with the current amount of the exchange.
+
+            Passing a dict of attributes is also the way to tag a single exchange with an axis \
+            (see ``compute_impacts``) : only that exchange will be ventilated under the category::
+
+                myActivity.updateExchanges({some_act: dict(amount=2, phase="transport")})
         """
         if not _isForeground(self["database"]) and not Settings.internals:
             msg = f"You are updating a background activity in {self['database']}. Use copyActivity() in a foreground db instead."
@@ -319,7 +326,6 @@ class ActivityExtended(Activity):
     def _amount_to_formula(self, amount: ValueOrExpression, exchange: ExchangeDataset):
         res = dict()
         if isinstance(amount, Basic):
-
             if amount.is_number:
                 return {"amount": float(amount.evalf())}
 
@@ -336,7 +342,7 @@ class ActivityExtended(Activity):
             res[STORE_FORMULA_KEY] = str(amount)
             res[STORE_FORMULA_TAG] = True
             res["amount"] = 0
-        elif isinstance(amount, float|int):
+        elif isinstance(amount, float | int):
             res["amount"] = amount
         else:
             raise Exception(
@@ -401,7 +407,14 @@ class ActivityExtended(Activity):
                 yield exch
 
     def updateMeta(self, **kwargs):
-        """Update any property. Useful to update axes"""
+        """Update any custom property of the activity.
+
+        This is typically used to tag an activity with an axis : all its outgoing
+        exchanges will then be ventilated under that category by ``compute_impacts``::
+
+            myActivity.updateMeta(phase="manufacturing")
+            compute_impacts(model, methods, axis="phase")
+        """
         for key, val in kwargs.items():
             self._data[key] = val
         self.save()
@@ -484,6 +497,11 @@ def findActivity(
             search = search.lower()
             search = search.replace(",", " ")
 
+            # bw2data >= 4 backs `search` with FTS5, which rejects blank queries
+            # while bw2data 3 silently returned nothing.
+            if not search.strip():
+                return []
+
             # Find candidates via index
             # candidates = _find_candidates(db_name, name_key)
             candidates = _getDb(db_name).search(search, limit=limit)
@@ -491,7 +509,8 @@ def findActivity(
             if len(candidates) == 0:
                 # Try again removing strange caracters
                 search = re.sub(r"\w*[^a-zA-Z ]+\w*", " ", search)
-                candidates = _getDb(db_name).search(search, limit=limit)
+                if search.strip():
+                    candidates = _getDb(db_name).search(search, limit=limit)
 
             # Exact match
             return list(filter(act_filter, candidates))
@@ -555,13 +574,19 @@ def _newAct(db_name, code):
         warn(msg)
 
     db = _getDb(db_name)
-    # Already present : delete it ?
-    for act in db:
-        if act["code"] == code:
-            warn("Activity '%s' was already in '%s'. Overwriting it" % (code, db_name))
-            act.delete()
 
-    return db.new_activity(code)
+    try:
+        act = getActByCode(db_name, code)
+    except activity_not_found():
+        return db.new_activity(code)
+
+    # Already present : overwrite it in place.
+    # We must not delete+recreate the activity : on brightway 2.5, deleting an
+    # activity also removes the incoming links (exchanges from other activities
+    # consuming it), which would silently break previously built models.
+    warn("Activity '%s' was already in '%s'. Overwriting it" % (code, db_name))
+    purge_activity_content(act)
+    return act
 
 
 def newActivity(
@@ -638,7 +663,9 @@ def newActivity(
 
 
 @atomic
-def copyActivity(db_name, activity: ActivityExtended, code=None, withExchanges=True, stripFormula=True, input_mapping=None, **kwargs) -> ActivityExtended:
+def copyActivity(
+    db_name, activity: ActivityExtended, code=None, withExchanges=True, stripFormula=True, input_mapping=None, **kwargs
+) -> ActivityExtended:
     """Copy an activity and its exchanges into another database. You usually want to copy activities from your background to
     your foreground DB to update them, keeping your background DB clean.
 

{lca_algebraic-1.4.1.dev4 → lca_algebraic-1.4.1.dev6}/lca_algebraic/base_utils.py

@@ -52,6 +52,7 @@ def _getDb(dbname):
 
 def _MinMax(op, arg0, *args):
     from lca_algebraic.units import unit_registry as u
+
     if not Settings.units_enabled:
         return op(arg0, *args)
     same_unit = all(x.units == arg0.units for x in args)

{lca_algebraic-1.4.1.dev4 → lca_algebraic-1.4.1.dev6}/lca_algebraic/bw_wrapper/__init__.py

@@ -111,6 +111,10 @@ def copy_activity_skip_keys() -> set:
     return _backend.copy_activity_skip_keys()
 
 
+def purge_activity_content(act) -> None:
+    _backend.purge_activity_content(act)
+
+
 def bw2setup() -> None:
     _backend.bw2setup()
 
@@ -146,5 +150,6 @@ __all__ = [
     "process_node_default",
     "production_edge_default",
     "projects",
+    "purge_activity_content",
     "sqlite3_lci_db",
 ]

{lca_algebraic-1.4.1.dev4 → lca_algebraic-1.4.1.dev6}/lca_algebraic/bw_wrapper/bw2.py

@@ -91,6 +91,16 @@ class BW2Backend:
     def copy_activity_skip_keys(self) -> set:
         return {"database", "code"}
 
+    def purge_activity_content(self, act) -> None:
+        """Remove an activity's outgoing exchanges and non-identity attributes.
+
+        The activity row, its code and the incoming links (exchanges of other
+        activities pointing to it) are preserved.
+        """
+        act.exchanges().delete()
+        for key in [k for k in act._data if k not in {"database", "code"}]:
+            del act._data[key]
+
     def bw2setup(self):
         bw.bw2setup()
 

{lca_algebraic-1.4.1.dev4 → lca_algebraic-1.4.1.dev6}/lca_algebraic/bw_wrapper/bw25.py

@@ -108,6 +108,16 @@ class BW25Backend:
     def copy_activity_skip_keys(self) -> set:
         return {"database", "code", "id"}
 
+    def purge_activity_content(self, act) -> None:
+        """Remove an activity's outgoing exchanges and non-identity attributes.
+
+        The activity row, its code and the incoming links (exchanges of other
+        activities pointing to it) are preserved.
+        """
+        act.exchanges().delete(allow_in_sourced_project=True)
+        for key in [k for k in act._data if k not in {"database", "code", "id"}]:
+            del act._data[key]
+
     def bw2setup(self) -> None:
         raise NotImplementedError("bw2setup is only supported with brightway2")
 

{lca_algebraic-1.4.1.dev4 → lca_algebraic-1.4.1.dev6}/lca_algebraic/bw_wrapper/protocol.py

@@ -74,6 +74,9 @@ class BrightwayBackend(Protocol):
     def copy_activity_skip_keys(self) -> set:
         ...
 
+    def purge_activity_content(self, act) -> None:
+        ...
+
     def bw2setup(self) -> None:
         ...
 

{lca_algebraic-1.4.1.dev4 → lca_algebraic-1.4.1.dev6}/lca_algebraic/cache.py

@@ -49,8 +49,16 @@ def flush_caches():
         cache.sync()
 
 
-def get_dependant_dbs(db_name, skip_proxy=True):
-    """Recursively get list of dependant db names, including the current one"""
+def get_dependant_dbs(db_name, skip_proxy=None):
+    """Recursively get list of dependant db names, including the current one
+
+    Proxy databases are skipped unless background factorization is enabled : with
+    ``factorize_static_bg`` the developed expressions / LCIA of a database refer to
+    the acts of its ``<db>-proxy`` databases, so a change of those proxies must be
+    visible (see the staleness check in ``_CacheDict``).
+    """
+    if skip_proxy is None:
+        skip_proxy = not Settings.factorize_static_bg
 
     # Only work if database is up to date (processed)
     if databases[db_name].get("dirty"):

{lca_algebraic-1.4.1.dev4 → lca_algebraic-1.4.1.dev6}/lca_algebraic/lambda_expression.py

@@ -1,6 +1,6 @@
 from copy import copy
 from dataclasses import dataclass
-from typing import Dict, List
+from typing import Dict, List, Optional
 
 from sympy import Basic, Expr, lambdify, parse_expr
 from sympy.core import S
@@ -9,6 +9,7 @@ from sympy.printing.numpy import NumPyPrinter
 from lca_algebraic.axis_dict import AxisDict
 from lca_algebraic.base_utils import _user_functions
 from lca_algebraic.bw_wrapper import Activity
+from lca_algebraic.log import warn
 from lca_algebraic.params import (
     _complete_params,
     _expand_param_names,
@@ -66,7 +67,7 @@ class LambdaExpr:
 
         # List of background activities, indexed in the same order as impacts[i]
         self.background_activities: List[Activity] = list()
-        self.impacts: List[float] = None
+        self.impacts: Optional[List[float]] = None
 
         if isinstance(expr, dict) and not isinstance(expr, AxisDict):
             # Come from JSON serialization
@@ -150,12 +151,17 @@ class LambdaExpr:
     def with_impacts(self, impacts: Dict[Activity, float]):
         """Transforms a generic LambaExpr toa one with custom impact values"""
         if self.impacts is not None:
-            raise Exception("You are specializing a LambaExpression with impacts already set.")
+            warn("You are specializing a LambaExpression with impacts already set.")
+
         res = copy(self)
         res.impacts = [impacts[bg_act] for bg_act in self.background_activities]
 
         return res
 
+    def impacts_dict(self):
+        """Returns list of impacts as dict"""
+        return {bg_act: val for bg_act, val in zip(self.background_activities, self.impacts)}
+
 
 def _filter_param_values(params, expanded_param_names):
     return {key: val for key, val in params.items() if key in expanded_param_names}