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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lca_algebraic
-Version: 1.4.1.dev2
+Version: 1.4.1.dev4
 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
@@ -41,6 +41,7 @@ Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: nbmake; extra == "dev"
 Requires-Dist: build; extra == "dev"
+Requires-Dist: twine>=6.1; extra == "dev"
 Dynamic: license-file
 
 

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

@@ -29,6 +29,7 @@ from lca_algebraic.database import (
 )
 from lca_algebraic.params import (
     STORE_FORMULA_KEY,
+    STORE_FORMULA_TAG,
     DbContext,
     ParamDef,
     _complete_and_expand_params,
@@ -318,6 +319,10 @@ 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())}
+
             current_amount = exchange.get("amount", None)
             if current_amount is not None:
                 amount = amount.subs(old_amount, current_amount)
@@ -329,8 +334,9 @@ class ActivityExtended(Activity):
                     raise Exception("Symbol '%s' not found in params : %s" % (symbol, all_symbols))
 
             res[STORE_FORMULA_KEY] = str(amount)
+            res[STORE_FORMULA_TAG] = True
             res["amount"] = 0
-        elif isinstance(amount, float) or isinstance(amount, int):
+        elif isinstance(amount, float|int):
             res["amount"] = amount
         else:
             raise Exception(
@@ -349,6 +355,9 @@ class ActivityExtended(Activity):
             # Update units
             amount = self._transform_unit(amount, exchange["unit"])
 
+            updates.pop(STORE_FORMULA_TAG, None)
+            exchange.pop(STORE_FORMULA_TAG, None)
+
             # Extract formula if two separate field "amount" and "formula"
             # Update the list of updates
             updates.update(self._amount_to_formula(amount, exchange))
@@ -629,9 +638,7 @@ def newActivity(
 
 
 @atomic
-def copyActivity(
-    db_name, activity: ActivityExtended, code=None, withExchanges=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.
 
@@ -643,7 +650,10 @@ def copyActivity(
         Source activity
     code:
         Code of the target activity. Also used as its name
-
+    withExchange:
+        Copy exchanges is True (default), otherwise do not copy them
+    stripFormula:
+        keep exchanges formula if True, default is False
 
     Returns
     -------
@@ -680,7 +690,7 @@ def copyActivity(
 
         # Chemical formulas might be in ecoinvent technosphere
         # We don't want them
-        if "formula" in data:
+        if stripFormula and ("formula" in data) and (STORE_FORMULA_TAG not in data):
             del data["formula"]
         ExchangeDataset.create(**dict_as_exchangedataset(data))
 

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

@@ -3,14 +3,16 @@ from functools import cache
 from inspect import isfunction
 from typing import Dict, Iterable, Tuple, Union
 
+import sympy
 import ipywidgets as widgets
 import numpy as np
 import pandas as pd
 from IPython.display import display
 from six import raise_from
 from sympy import Basic
-from sympy.physics.units import Quantity
+from pint import Quantity
 
+from lca_algebraic.settings import Settings
 from lca_algebraic.bw_wrapper import Activity, Database, is_output_exchange
 
 _user_functions = dict()
@@ -48,14 +50,22 @@ def _getDb(dbname):
     return dbs[dbname]
 
 
-def Max(a, b):
-    """Max define as algrebraic forumal with 'abs' for proper computation on vectors"""
-    return (a + b + abs(a - b)) / 2
+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)
+    if not same_unit:
+        raise Exception("MinMax argments must have the same units")
+    return u.Quantity(op(arg0.magnitude, *[x.magnitude for x in args]), arg0.units)
 
 
-def Min(a, b):
-    """Max define as algrebraic forumal with 'abs' for proper computation on vectors"""
-    return (a + b - abs(b - a)) / 2
+def Max(arg0, *args):
+    return _MinMax(sympy.Max, arg0, *args)
+
+
+def Min(arg0, *args):
+    return _MinMax(sympy.Min, arg0, *args)
 
 
 def _actDesc(act: Activity):

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

@@ -1,5 +1,6 @@
 import os
 import time
+from base64 import b32encode
 from collections.abc import MutableMapping
 from datetime import datetime
 from os import path
@@ -19,6 +20,10 @@ EXPR_CACHE = "expr"
 MAPPING_CACHE = "mapping"
 
 
+def _filename_encode(s: str):
+    return b32encode(s.encode("utf-8")).decode("utf-8")
+
+
 # Overide the behaviour for pickling sympy.UndefineFunction
 class MyPickler(Pickler):
     def reducer_override(self, obj):
@@ -89,7 +94,9 @@ class SyncDict(MutableMapping):
         self.load()
 
     def _filename(self):
-        return path.join(projects.dir, f"lca_algebraic_cache-{self.name}-{self.db_name}.pickle")
+        return path.join(
+            projects.dir, f"lca_algebraic_cache-{_filename_encode(self.name)}-{_filename_encode(self.db_name)}.pickle"
+        )
 
     # ---------- core MutableMapping ----------
     def __getitem__(self, key):

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

@@ -1,14 +1,14 @@
 from copy import copy
 from dataclasses import dataclass
-from typing import Dict, List, Optional
+from typing import Dict, List
 
 from sympy import Basic, Expr, lambdify, parse_expr
+from sympy.core import S
 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,
@@ -19,6 +19,32 @@ from lca_algebraic.settings import CSE, Settings
 from lca_algebraic.sympy_utils import find_cses, find_symbols
 
 
+class NumPyPrinterExt(NumPyPrinter):
+    def __init__(self, settings=None):
+        super().__init__(settings=settings)
+
+    def _helper_piecewise(self, *args):
+        from sympy.logic.boolalg import ITE, simplify_logic
+
+        def print_cond(cond):
+            """Problem having an ITE in the cond."""
+            if cond.has(ITE):
+                return self._print(simplify_logic(cond))
+            else:
+                return self._print(cond)
+
+        return "{}({},{},{})".format(
+            self._module_format(self._module + ".where"),
+            print_cond(args[0].cond),
+            self._print(args[0].expr),
+            self._helper_piecewise(*args[1:]) if len(args) > 1 else self._print(S.NaN),
+        )
+
+    def _print_Piecewise(self, expr):
+        "Piecewise function printer"
+        return self._helper_piecewise(*expr.args)
+
+
 @dataclass
 class ValueContext:
     """Represents a result value, with all parameters values used in context"""
@@ -40,7 +66,7 @@ class LambdaExpr:
 
         # List of background activities, indexed in the same order as impacts[i]
         self.background_activities: List[Activity] = list()
-        self.impacts: Optional[List[float]] = None
+        self.impacts: List[float] = None
 
         if isinstance(expr, dict) and not isinstance(expr, AxisDict):
             # Come from JSON serialization
@@ -124,17 +150,12 @@ 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:
-            warn("You are specializing a LambaExpression with impacts already set.")
-
+            raise Exception("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}
@@ -172,7 +193,7 @@ class LambdWrapper:
 def _lambdify(expr: Basic, expanded_params):
     """Lambdify, handling manually the case of SymDict (for impacts by axis)"""
 
-    printer = NumPyPrinter(
+    printer = NumPyPrinterExt(
         {"fully_qualified_modules": False, "inline": True, "allow_unknown_functions": True, "user_functions": dict()}
     )