Merge pull request #1532 from mrvisscher/major-ecoinvent-import

Quick-fix for already extracted ecoinvent releases

Author: marc-vdm

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,6 @@
 name: Bug report
 description: File a bug report for AB.
-labels: ["bug"]
+type: Bug
 body:
   - type: markdown
     attributes:
@@ -35,9 +35,10 @@ body:
       options:
         - Windows 10
         - Windows 11
-        - MacOS
+        - MacOS (Apple Silicon)
+        - MacOS (Intel)        
         - Linux/Other (please specify above)
-      default: 0
+      default: 1
   - type: textarea
     id: conda-env
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: File a feature request for AB.
-labels: ["feature"]
+type: Feature
 body:
   - type: markdown
     attributes:

README.md

@@ -9,6 +9,16 @@
 
 # Activity Browser
 
+
+> [!TIP]
+> **Activity Browser** now has an open beta for Version 3🚀.
+>
+> The beta supports many new features such as Multi-functionality and uses Brightway 2.5 under the hood.
+> Help us by making Activity Browser even better by using and providing feedback on Activity Browser.
+>
+> Learn more about the beta
+> [here](https://lca-activitybrowser.github.io/activity-browser/beta.html).
+
 <img src="https://user-images.githubusercontent.com/33026150/54299977-47a9f680-45bc-11e9-81c6-b99462f84d0b.png" width=100%/>
 
 The **Activity Browser (AB) is an open source software for Life Cycle Assessment (LCA)** that builds on [Brightway2](https://brightway.dev).

activity_browser/actions/database/database_import_from_ecoinvent.py

@@ -1,4 +1,5 @@
 import re
+import os
 from logging import getLogger
 from copy import deepcopy
 
@@ -223,7 +224,7 @@ def run_safely(self, release: ei.release, version: str, model: str):
                     fix_version=False
                 )
                 path = str(path)
-                if not path.endswith(".7z"):
+                if not path.endswith(".7z") and os.path.exists(path + ".7z"):
                     path = path + ".7z"
                 self.download_ready.emit(path)
 

activity_browser/bwutils/io/ecoinvent_importer.py

@@ -42,17 +42,21 @@ class Ecoinvent7zImporter:
 
     def __init__(self, archive_path: str) -> None:
         self.archive_path = archive_path
+        self.is_compressed = archive_path.endswith('.7z')
 
     def install_biosphere(self, biosphere_name: str = "biosphere3") -> None:
         """
         Installs the biosphere that is bundled in the ecoinvent .7z. Simple extraction and installing through the
         standard bw2io importer is quick enough because we're talking about a single file.
         """
-        # extract the elementary exchanges to a temporary location
-        with py7zr.SevenZipFile(self.archive_path, mode='r') as archive:
-            temp = tempfile.gettempdir()
-            archive.extract(temp, ["MasterData/ElementaryExchanges.xml"])
-            bio_file = os.path.join(temp, "MasterData/ElementaryExchanges.xml")
+        if self.is_compressed:
+            # extract the elementary exchanges to a temporary location
+            with py7zr.SevenZipFile(self.archive_path, mode='r') as archive:
+                temp = tempfile.gettempdir()
+                archive.extract(temp, ["MasterData/ElementaryExchanges.xml"])
+                bio_file = os.path.join(temp, "MasterData", "ElementaryExchanges.xml")
+        else:
+            bio_file = os.path.join(self.archive_path, "MasterData", "ElementaryExchanges.xml")
 
         # initiate the importer with the elementary exchanges file
         importer = Ecospold2BiosphereImporter(biosphere_name, None, bio_file)
@@ -71,11 +75,16 @@ def install_ecoinvent(self, db_name, biosphere_name: str = "biosphere3"):
             log.warning(f"Database already exists, overwriting {db_name}")
             bd.Database(db_name).delete(warn=False)
 
-        # load the spold files into memory
-        spold_bytes = self.read_archive_to_bytes()
+        if self.is_compressed:
+            # load the spold files into memory
+            spold_bytes = self.read_archive_to_bytes()
+
+            # process the in-memory data to a dict format and applying strategies
+            db_data = self.process_bytes(spold_bytes, db_name)
+        else:
+            # if the archive is not compressed, we can use the standard importer
+            db_data = Ecospold2DataExtractor.extract(os.path.join(self.archive_path, "datasets"), db_name)
 
-        # process the in-memory data to a dict format and applying strategies
-        db_data = self.process_bytes(spold_bytes, db_name)
         db_data = self.apply_strategies(db_data, biosphere_name)
 
         # rewrite into an ingestible format

activity_browser/docs/wiki/_Footer.md

@@ -2,3 +2,12 @@ Activity Browser is a __community project__, we rely on __you__ for it to be awe
 
 | <picture><img alt="Activity Browser logo" src="./assets/activitybrowser.png" width="25"></picture> | ❓ Need help?<br/>[💬 Ask the community](https://github.com/LCA-ActivityBrowser/activity-browser/discussions?discussions_q=) | 💡 Ideas to improve?<br/>[💭 Request a feature](https://github.com/LCA-ActivityBrowser/activity-browser/issues/new?assignees=&labels=feature&projects=&template=feature_request.yml) | 🔥 Something Broken?<br/>[🪲 Start a bug report](https://github.com/LCA-ActivityBrowser/activity-browser/issues/new?assignees=&labels=bug&projects=&template=bug_report.yml) | ⚙️ Want to help out? <br/>[🛠️ Learn how to contribute](https://github.com/LCA-ActivityBrowser/activity-browser/blob/main/CONTRIBUTING.md) |
 |----------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------|
+
+> [!TIP]
+> **Activity Browser** now has an open beta for Version 3🚀.
+>
+> The beta supports many new features such as Multi-functionality and uses Brightway 2.5 under the hood.
+> Help us by making Activity Browser even better by using and providing feedback on Activity Browser.
+>
+> Learn more about the beta
+> [here](https://lca-activitybrowser.github.io/activity-browser/beta.html).