premise 2.1.0.dev4__tar.gz → 2.1.0.dev5__tar.gz

{premise-2.1.0.dev4/premise.egg-info → premise-2.1.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: premise
-Version: 2.1.0.dev4
+Version: 2.1.0.dev5
 Summary: Coupling IAM output to ecoinvent LCA database ecoinvent for prospective LCA
 Author-email: Romain Sacchi <romain.sacchi@psi.ch>, Alois Dirnaichner <dirnaichner@pik-potsdam.de>,  Chris Mutel <cmutel@gmail.com>
 Maintainer-email: Romain Sacchi <romain.sacchi@psi.ch>

{premise-2.1.0.dev4 → premise-2.1.0.dev5}/premise/__init__.py

@@ -1,5 +1,5 @@
 __all__ = ("NewDatabase", "clear_cache", "get_regions_definition")
-__version__ = (2, 1, 0, "dev4")
+__version__ = (2, 1, 0, "dev5")
 
 
 from premise.new_database import NewDatabase

{premise-2.1.0.dev4 → premise-2.1.0.dev5}/premise/logger.py

@@ -3,12 +3,9 @@ Module to create a logger with the given handler.
 """
 
 import logging.config
-from logging.handlers import QueueHandler
 from multiprocessing import Queue
 from pathlib import Path
 
-import yaml
-
 from .filesystem_constants import DATA_DIR
 
 LOG_CONFIG = DATA_DIR / "utils" / "logging" / "logconfig.yaml"
@@ -58,4 +55,12 @@ def empty_log_files():
     for file in DIR_LOG_REPORT.iterdir():
         # if suffix is ".log"
         if file.suffix == ".log":
-            file.unlink()
+            try:
+                file.unlink()
+            except PermissionError:
+                try:
+                    # instead, let's empty the file
+                    with open(file, "w") as f:
+                        f.write("")
+                except PermissionError:
+                    pass

{premise-2.1.0.dev4 → premise-2.1.0.dev5}/premise/new_database.py

@@ -904,11 +904,21 @@ class NewDatabase:
                 # add database to scenarios
                 scenario["database"] = pickle.loads(pickle.dumps(self.database, -1))
                 for sector in sectors:
+                    if sector in scenario.get("applied functions", []):
+                        print(
+                            f"Function to update {sector} already applied to scenario."
+                        )
+                        continue
+
                     # Prepare the function and arguments
                     update_func = sector_update_methods[sector]["func"]
                     fixed_args = sector_update_methods[sector]["args"]
                     scenario = update_func(scenario, *fixed_args)
 
+                    if "applied functions" not in scenario:
+                        scenario["applied functions"] = []
+                    scenario["applied functions"].append(sector)
+
                 # dump database
                 dump_database(scenario)
                 # Manually update the outer progress bar after each sector is completed
@@ -1042,10 +1052,18 @@ class NewDatabase:
 
         """
 
+        def scenario_name(scenario):
+            name = scenario["pathway"]
+
+            if "external scenarios" in scenario:
+                for external in scenario["external scenarios"]:
+                    name += f"-{external['scenario']}"
+            return name
+
         if filepath is not None:
             if isinstance(filepath, str):
                 filepath = [
-                    (Path(filepath) / s["model"] / s["pathway"] / str(s["year"]))
+                    (Path(filepath) / s["model"] / scenario_name(s) / str(s["year"]))
                     for s in self.scenarios
                 ]
             elif isinstance(filepath, list):
@@ -1072,7 +1090,6 @@ class NewDatabase:
                 keep_uncertainty_data=self.keep_uncertainty_data,
             )
             Export(scenario, filepath[s], self.version).export_db_to_matrices()
-            del scenario["database"]
 
         # generate scenario report
         self.generate_scenario_report()

{premise-2.1.0.dev4 → premise-2.1.0.dev5}/premise/transformation.py

@@ -310,23 +310,6 @@ def find_fuel_efficiency(
             print(
                 f"Warning: {dataset['name'], dataset['location']} has no energy input"
             )
-            for exc in dataset["exchanges"]:
-                print(
-                    exc["type"],
-                    exc["name"],
-                    exc["amount"],
-                    exc.get("product"),
-                    exc["unit"],
-                )
-            from pprint import pprint
-
-            print()
-            pprint(fuel_filters)
-            print()
-            pprint(fuel_specs)
-            print()
-            pprint(fuel_map_reverse)
-            print()
 
     if energy_input != 0 and float(energy_out) != 0:
         current_efficiency = float(energy_out) / energy_input

{premise-2.1.0.dev4 → premise-2.1.0.dev5}/premise/transport.py

@@ -517,26 +517,6 @@ class Transport(BaseTransformation):
         Create vehicle market (fleet average) datasets.
         """
 
-        # # create and regionalize vehicle datasets
-        # vehicle_datasets = list(ws.get_many(
-        #     self.database,
-        #     ws.either(*[
-        #         ws.contains("name", size)
-        #         for size in self.mapping[self.vehicle_type]["sizes"]
-        #     ]),
-        #     ws.contains("name", self.vehicle_type),
-        #     ws.equals("unit", "unit")
-        # ))
-        #
-        # for ds in vehicle_datasets:
-        #     new_vehicle_datasets = self.fetch_proxies(
-        #         subset = vehicle_datasets,
-        #         name=ds["name"],
-        #         ref_prod=ds["reference product"],
-        #     )
-        #
-        #     self.database.extend(new_vehicle_datasets.values())
-
         # create and regionalize transport datasets
         filters = [
             ws.either(

{premise-2.1.0.dev4 → premise-2.1.0.dev5}/premise/utils.py

@@ -357,6 +357,9 @@ def dump_database(scenario):
     :param scenario: scenario dictionary
     """
 
+    if "database filepath" in scenario:
+        return scenario
+
     # generate random name
     name = f"{uuid.uuid4().hex}.pickle"
     # dump as pickle
@@ -374,6 +377,9 @@ def load_database(scenario):
     :param scenario: scenario dictionary
     """
 
+    if "database" in scenario:
+        return scenario
+
     filepath = scenario["database filepath"]
 
     # load pickle

{premise-2.1.0.dev4 → premise-2.1.0.dev5/premise.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: premise
-Version: 2.1.0.dev4
+Version: 2.1.0.dev5
 Summary: Coupling IAM output to ecoinvent LCA database ecoinvent for prospective LCA
 Author-email: Romain Sacchi <romain.sacchi@psi.ch>, Alois Dirnaichner <dirnaichner@pik-potsdam.de>,  Chris Mutel <cmutel@gmail.com>
 Maintainer-email: Romain Sacchi <romain.sacchi@psi.ch>