bw-functional 0b80__tar.gz → 0b83__tar.gz

{bw_functional-0b80/bw_functional.egg-info → bw_functional-0b83}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bw-functional
-Version: 0b80
+Version: 0b83
 Summary: Code for handling multifunctional activities in Brightway
 Author-email: Chris Mutel <cmutel@gmail.com>, Marin Visscher <m.r.visscher@cml.leidenuniv.nl>
 Maintainer-email: Marin Visscher <m.r.visscher@cml.leidenuniv.nl>

{bw_functional-0b80 → bw_functional-0b83}/bw_functional/__init__.py

@@ -8,6 +8,8 @@ __all__ = (
     "MFExchanges",
     "FunctionalSQLiteDatabase",
     "property_allocation",
+    "convert_sqlite_to_functional_sqlite",
+    "convert_functional_sqlite_to_sqlite"
 )
 # import os
 __version__ = "0.0.2"
@@ -21,6 +23,7 @@ from .allocation import allocation_strategies, generic_allocation, property_allo
 from .database import FunctionalSQLiteDatabase
 from .node_classes import Process, Product
 from .edge_classes import MFExchange, MFExchanges
+from .convert import convert_sqlite_to_functional_sqlite, convert_functional_sqlite_to_sqlite
 
 log = getLogger(__name__)
 

{bw_functional-0b80 → bw_functional-0b83}/bw_functional/allocation.py

@@ -101,7 +101,7 @@ def get_property_value(
 
     props = product.get("properties")
 
-    if not props:
+    if not props or not isinstance(props, dict):
         raise KeyError(f"Product {product} from process {product.processor} doesn't have properties")
 
     prop = props.get(property_label)

{bw_functional-0b80 → bw_functional-0b83}/bw_functional/convert.py

@@ -9,21 +9,16 @@ from .database import FunctionalSQLiteDatabase
 log = getLogger(__name__)
 
 
-def convert_sqlite_to_functional_sqlite(database_name: str) -> dict:
-    return SQLiteToFunctionalSQLite.convert(database_name)
+def convert_sqlite_to_functional_sqlite(database_dict: dict) -> dict:
+    return SQLiteToFunctionalSQLite.convert(database_dict)
 
 
 class SQLiteToFunctionalSQLite:
     @classmethod
-    def convert(cls, database_name: str):
-        db = bd.Database(database_name)
-
-        if not isinstance(db, SQLiteBackend):
-            raise TypeError("Database is not of type SQLite.")
-
+    def convert(cls, database_dict: dict):
         converted = {}
 
-        for key, ds in tqdm.tqdm(db.load().items()):
+        for key, ds in tqdm.tqdm(database_dict.items()):
             if ds["type"] in ["process", "processwithreferenceproduct"]:
                 converted.update(cls.convert_process(key, ds))
 
@@ -87,24 +82,18 @@ class SQLiteToFunctionalSQLite:
             exc["input"] = (database, exc["input"][1] + "_function")
 
 
-def convert_functional_sqlite_to_sqlite(database_name: str):
-    return FunctionalSQLiteToSQLite.convert(database_name)
+def convert_functional_sqlite_to_sqlite(database_dict: dict):
+    return FunctionalSQLiteToSQLite.convert(database_dict)
 
 
 class FunctionalSQLiteToSQLite:
     @classmethod
-    def convert(cls, database_name: str):
-        db = bd.Database(database_name)
-
-        if not isinstance(db, FunctionalSQLiteDatabase):
-            raise TypeError("Database is not of type functional_sqlite.")
-
-        raw = db.load()
+    def convert(cls, database_dict: dict):
         converted = {}
 
-        for key, ds in tqdm.tqdm(raw.items()):
+        for key, ds in tqdm.tqdm(database_dict.items()):
             if ds["type"] in ["product", "waste"]:
-                processor = raw[ds["processor"]]
+                processor = database_dict[ds["processor"]]
                 converted[key] = cls.convert_function(key, ds, processor)
 
         return converted

{bw_functional-0b80 → bw_functional-0b83}/bw_functional/node_classes.py

@@ -257,7 +257,7 @@ class Process(MFActivity):
         Returns:
             set[str]: A list of property names available in the process.
         """
-        properties = [prod["properties"] for prod in self.products()]
+        properties = [prod.get("properties", {}) for prod in self.products()]
         property_names = [set(prop.keys()) for prop in properties]
         common_properties = set.intersection(*property_names) if property_names else set()
 

{bw_functional-0b80 → bw_functional-0b83/bw_functional.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bw-functional
-Version: 0b80
+Version: 0b83
 Summary: Code for handling multifunctional activities in Brightway
 Author-email: Chris Mutel <cmutel@gmail.com>, Marin Visscher <m.r.visscher@cml.leidenuniv.nl>
 Maintainer-email: Marin Visscher <m.r.visscher@cml.leidenuniv.nl>