Ingredients (#497)

Co-authored-by: Ingredient editor <[email protected]>
Co-authored-by: Christophe Combelles <[email protected]>

data/common/export.py

@@ -38,10 +38,7 @@ def load_json(filename):
 
 
 def progress_bar(index, total):
-    print(
-        "(" + (index) * "•" + (total - index) * " " + f") {str(index)}/{total}",
-        end="\r",
-    )
+    print(f"Export in progress: {str(index)}/{total}", end="\r")
 
 
 def with_subimpacts(process):

data/common/import_.py

@@ -174,6 +174,8 @@ def import_simapro_csv(
     biosphere=BIOSPHERE,
     migrations=[],
     excluded_strategies=[],
+    other_strategies=[],
+    source=None,
 ):
     """
     Import file at path `datapath` into database named `dbname`, and apply provided brightway `migrations`.
@@ -199,6 +201,9 @@ def import_simapro_csv(
     database = bw2io.importers.simapro_csv.SimaProCSVImporter(
         unzipped, dbname, normalize_biosphere=True
     )
+    if source:
+        for ds in database:
+            ds["source"] = source
     os.unlink(unzipped)
 
     print("### Applying migrations...")
@@ -218,11 +223,13 @@ def import_simapro_csv(
         s
         for s in database.strategies
         if not any([e in repr(s) for e in excluded_strategies])
-    ]
+    ] + other_strategies
     database.apply_strategies()
     database.statistics()
-
     # try to link remaining unlinked technosphere activities
+    database.apply_strategy(
+        functools.partial(link_technosphere_by_activity_hash, fields=("name", "unit"))
+    )
     database.apply_strategy(
         functools.partial(
             link_technosphere_by_activity_hash, fields=("name", "location")
@@ -231,7 +238,7 @@ def import_simapro_csv(
     database.statistics()
 
     print("### Adding unlinked flows and activities...")
-    # comment to enable stopping on unlinked activities
+    # comment to enable stopping on unlinked activities and creating an excel file
     database.add_unlinked_flows_to_biosphere_database(biosphere)
     database.add_unlinked_activities()
 
@@ -362,3 +369,12 @@ def add_missing_substances(project, biosphere):
     for code, activity in substances.items():
         if not [flow for flow in bio if flow["code"] == code]:
             bio.new_activity(code, **activity)
+
+
+def sync_datapackages():
+    print("Syncing datapackages...")
+    for method in bw2data.methods:
+        bw2data.Method(method).process()
+
+    for database in bw2data.databases:
+        bw2data.Database(database).process()

data/docker/Dockerfile

@@ -16,7 +16,7 @@ RUN mkdir -p /home/$NB_USER/data \
 
 # keep in sync with requirements.txt
 # allow to update the image if the source repo is updated
-ADD https://api.github.com/repos/ccomb/brightway2-io/git/refs/tags/ccomb-2 bw2-io.json
+ADD https://api.github.com/repos/ccomb/brightway2-io/git/refs/tags/ccomb-3 bw2-io.json
 ADD https://api.github.com/repos/brightway-lca/brightway2-parameters/git/refs/tags/1.1.0 bw2-parameters.json
 ADD https://api.github.com/repos/brightway-lca/brightway2-data/git/refs/tags/4.0.DEV33 bw2-data.json
 ADD https://api.github.com/repos/brightway-lca/brightway2-calc/git/refs/tags/2.0.DEV16 bw2-calc.json

data/docker/requirements.txt

@@ -10,7 +10,7 @@ git+https://github.com/brightway-lca/[email protected]
 git+https://github.com/brightway-lca/[email protected]
 git+https://github.com/brightway-lca/[email protected]
 git+https://github.com/brightway-lca/[email protected]
-git+https://github.com/ccomb/brightway2-io@ccomb-2
+git+https://github.com/ccomb/brightway2-io@ccomb-3
 ipywidgets>=8.1, <8.2
 jupyter-collaboration
 matplotlib>=3.7, <3.8