Merge branch 'major' into major_search

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/actions/project/project_import.py

@@ -3,6 +3,7 @@
 import tarfile
 from logging import getLogger
 
+import bw2data as bd
 from qtpy import QtWidgets, QtCore
 from bw2io import backup
 
@@ -95,7 +96,7 @@ def get_project_name(fp):
             for member in tar:
                 if member.name[-17:] == "project-name.json":
                     return json.load(reader(tar.extractfile(member)))["name"]
-            raise ValueError("Couldn't find project name file in archive")
+            return ""
 
 
 class ImportThread(ABThread):
@@ -105,5 +106,11 @@ def run_safely(self):
                   f'\nPATH: {self.path}'
                   f'\nNAME: {self.project_name}')
         backup.restore_project_directory(fp=self.path, project_name=self.project_name)
+
+        # fix wrong hashing
+        ds = bd.project.ProjectDataset.get(name=self.project_name)
+        ds.full_hash = False
+        ds.save()
+
         log.info(f"Project `{self.project_name}` imported.")
 

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).

activity_browser/layouts/pages/calculation_setup/functional_unit_section.py

@@ -1,11 +1,10 @@
 from qtpy import QtWidgets
-from qtpy.QtCore import Qt
 
 import bw2data as bd
 import pandas as pd
 
 from activity_browser import actions
-from activity_browser.ui import widgets, icons, delegates
+from activity_browser.ui import widgets, icons
 from activity_browser.bwutils import AB_metadata
 
 
@@ -47,7 +46,6 @@ def build_df(self):
         act_df = AB_metadata.get_metadata(keys, cols)
         act_df["amount"] = amounts
         act_df["_activity_key"] = keys
-        act_df["_cs_name"] = self.calculation_setup_name
 
         act_df["_processor_key"] = act_df["processor"]
         act_df["_processor_key"] = act_df["_processor_key"].fillna(act_df["_activity_key"])
@@ -75,15 +73,12 @@ def build_df(self):
         act_df.update(act_df["product"].rename("name"))
         act_df["product"] = act_df["name"]
 
-        cols = ["amount", "unit", "product", "process", "database", "location", "_processor_key", "_activity_key", "_cs_name"]
+        cols = ["amount", "unit", "product", "process", "database", "location", "_processor_key", "_activity_key"]
 
         return act_df[cols].reset_index(drop=True)
 
 
 class FunctionalUnitView(widgets.ABTreeView):
-    defaultColumnDelegates = {
-        "amount": delegates.AmountDelegate
-    }
 
     class ContextMenu(widgets.ABMenu):
         menuSetup = [
@@ -124,16 +119,10 @@ def mouseDoubleClickEvent(self, event) -> None:
         Args:
             event: The mouse double click event.
         """
-        index = self.indexAt(event.pos())
-        if index.column() == 0:
-            return super().mouseDoubleClickEvent(event)
-
         if self.selectedIndexes():
             activities = [index.internalPointer()["_processor_key"] for index in self.selectedIndexes()]
             actions.ActivityOpen.run(list(set(activities)))
 
-        return None
-
     def dragMoveEvent(self, event) -> None:
         pass
 
@@ -142,7 +131,7 @@ def dragEnterEvent(self, event):
             keys: list = event.mimeData().retrievePickleData("application/bw-nodekeylist")
             for key in keys:
                 act = bd.get_node(key=key)
-                if act["type"] not in bd.labels.product_node_types + ["processwithreferenceproduct"]:
+                if act["type"] not in bd.labels.product_node_types + ["processwithreferenceproduct", "process"]:
                     keys.remove(key)
 
             if not keys:
@@ -157,7 +146,7 @@ def dropEvent(self, event) -> None:
         keys: list = event.mimeData().retrievePickleData("application/bw-nodekeylist")
         for key in keys:
             act = bd.get_node(key=key)
-            if act["type"] not in bd.labels.product_node_types + ["processwithreferenceproduct"]:
+            if act["type"] not in bd.labels.product_node_types + ["processwithreferenceproduct", "process"]:
                 keys.remove(key)
 
         actions.CSAddFunctionalUnit.run(cs_name, keys)
@@ -169,45 +158,6 @@ def decorationData(self, col: int, key: str):
             return icons.qicons.product
         if key == "process":
             return icons.qicons.process
-        return super().decorationData(col, key)
-
-    def flags(self, col: int, key: str):
-        """
-        Returns the item flags for the given column and key.
-
-        Args:
-            col (int): The column index.
-            key (str): The key for which to return the flags.
-
-        Returns:
-            QtCore.Qt.ItemFlags: The item flags.
-        """
-        flags = super().flags(col, key)
-        if key in ["amount"]:
-            return flags | Qt.ItemFlag.ItemIsEditable
-        return flags
-
-    def setData(self, col: int, key: str, value) -> bool:
-        """
-        Sets the data for the given column and key.
-
-        Args:
-            col (int): The column index.
-            key (str): The key for which to set the data.
-            value: The value to set.
-
-        Returns:
-            bool: True if the data was set successfully, False otherwise.
-        """
-        if key not in ["amount"]:
-            return False
-
-        cs_name = self["_cs_name"]
-        index = self.key()
-
-        actions.CSChangeFunctionalUnit.run(cs_name, index, value)
-
-
 
 
 class FunctionalUnitModel(widgets.ABItemModel):

activity_browser/layouts/pages/impact_category_details/impact_category_header.py

@@ -0,0 +1,83 @@
+from qtpy import QtWidgets, QtCore
+from activity_browser import actions
+from activity_browser.ui import widgets
+
+
+class ImpactCategoryHeader(QtWidgets.QWidget):
+
+    def __init__(self, parent: QtWidgets.QWidget):
+        """
+        Initializes the ActivityHeader widget.
+
+        Args:
+            parent (QtWidgets.QWidget): The parent widget.
+        """
+        super().__init__(parent)
+        self.impact_category = parent.impact_category
+
+        layout = QtWidgets.QVBoxLayout()
+        layout.setContentsMargins(0, 0, 0, 0)
+        self.setLayout(layout)
+
+    def sync(self):
+        """
+        Synchronizes the widget with the current state of the activity.
+        """
+        self.clear_layout()
+        self.layout().addLayout(self.build_grid())
+
+    def clear_layout(self, layout: QtWidgets.QLayout = None):
+        layout = layout or self.layout()
+
+        if layout is None:
+            return
+
+        while layout.count():
+            item = layout.takeAt(0)
+            widget = item.widget()
+            if widget is not None:
+                widget.deleteLater()
+            elif item.layout() is not None:
+                self.clear_layout(item.layout())
+
+    def build_grid(self) -> QtWidgets.QGridLayout:
+        grid = QtWidgets.QGridLayout(self)
+        grid.setContentsMargins(0, 5, 0, 5)
+        grid.setSpacing(10)
+        grid.setAlignment(QtCore.Qt.AlignmentFlag.AlignTop)
+
+        setup = [
+            ("Name:", QtWidgets.QLabel(str(self.impact_category.name)),),
+            ("Unit:", QtWidgets.QLabel(str(self.impact_category.metadata.get("unit", "Undefined"))),),
+        ]
+
+        # Arrange widgets for display as a grid
+        for i, (title, widget) in enumerate(setup):
+            grid.addWidget(widgets.ABLabel.demiBold(title, self), i, 1)
+            grid.addWidget(widget, i, 2, 1, 4)
+
+        return grid
+
+
+class ImpactCategoryName(QtWidgets.QLineEdit):
+    """
+    A widget that displays and edits the name of the activity.
+    """
+
+    def __init__(self, parent: ImpactCategoryHeader):
+        """
+        Initializes the ActivityName widget.
+
+        Args:
+            parent (ActivityHeader): The parent widget.
+        """
+        super().__init__(str(parent.impact_category.name), parent)
+        self.editingFinished.connect(self.change_name)
+
+    def change_name(self):
+        """
+        Changes the name of the activity if it has been modified.
+        """
+        if self.text() == self.parent().impact_category.name:
+            return
+        # actions.ActivityModify.run(self.parent().activity, "name", self.text())

pyproject.toml

@@ -25,11 +25,12 @@ classifiers = [
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: Scientific/Engineering :: Information Analysis",
     "Topic :: Scientific/Engineering :: Mathematics",
     "Topic :: Scientific/Engineering :: Visualization",
 ]
-requires-python = ">=3.10, <=3.13"
+requires-python = ">=3.10, <3.13"
 dependencies = [
     "arrow",
     "bw2analyzer>=0.11.5",