refacto

Author: aoustry

src/andromede/pypsa_converter/pypsa_converter.py

@@ -171,9 +171,9 @@ def _pypsa_network_preprocessing(self) -> None:
             co2_emissions=0,
             max_growth=any_to_float(inf),
         )
-        self.pypsa_network.carriers["carrier"] = (
-            self.pypsa_network.carriers.index.values
-        )
+        self.pypsa_network.carriers[
+            "carrier"
+        ] = self.pypsa_network.carriers.index.values
         ### Rename PyPSA buses, to delete spaces
         if len(self.pypsa_network.buses) > 0:
             self.pypsa_network.buses.index = self.pypsa_network.buses.index.str.replace(
@@ -364,32 +364,32 @@ def _register_pypsa_globalconstraints(self) -> None:
                 ],
             )
             if carrier_attribute == "co2_emissions" and sense == "<=":
-                self.pypsa_globalconstraints_data[pypsa_model_id] = (
-                    PyPSAGlobalConstraintData(
-                        name,
-                        carrier_attribute,
-                        sense,
-                        self.pypsa_network.global_constraints.loc[
-                            pypsa_model_id, "constant"
-                        ],
-                        "global_constraint_co2_max",
-                        "emission_port",
-                        gems_components_and_ports,
-                    )
+                self.pypsa_globalconstraints_data[
+                    pypsa_model_id
+                ] = PyPSAGlobalConstraintData(
+                    name,
+                    carrier_attribute,
+                    sense,
+                    self.pypsa_network.global_constraints.loc[
+                        pypsa_model_id, "constant"
+                    ],
+                    "global_constraint_co2_max",
+                    "emission_port",
+                    gems_components_and_ports,
                 )
             elif carrier_attribute == "co2_emissions" and sense == "==":
-                self.pypsa_globalconstraints_data[pypsa_model_id] = (
-                    PyPSAGlobalConstraintData(
-                        name,
-                        carrier_attribute,
-                        sense,
-                        self.pypsa_network.global_constraints.loc[
-                            pypsa_model_id, "constant"
-                        ],
-                        "global_constraint_co2_eq",
-                        "emission_port",
-                        gems_components_and_ports,
-                    )
+                self.pypsa_globalconstraints_data[
+                    pypsa_model_id
+                ] = PyPSAGlobalConstraintData(
+                    name,
+                    carrier_attribute,
+                    sense,
+                    self.pypsa_network.global_constraints.loc[
+                        pypsa_model_id, "constant"
+                    ],
+                    "global_constraint_co2_eq",
+                    "emission_port",
+                    gems_components_and_ports,
                 )
             else:
                 raise ValueError("Type of GlobalConstraint not supported.")

tests/pypsa_converter/utils.py

@@ -11,10 +11,7 @@
 
 
 def convert_pypsa_network(
-    pypsa_network: Network,
-    systems_dir: Path,
-    series_dir: Path,
-    series_file_format:str
+    pypsa_network: Network, systems_dir: Path, series_dir: Path, series_file_format: str
 ) -> InputSystem:
     """
     Convert a PyPSA network to an Andromede InputSystem.
@@ -28,7 +25,9 @@ def convert_pypsa_network(
         InputSystem: The converted Andromede InputSystem
     """
     logger = Logger(__name__, "")
-    converter = PyPSAStudyConverter(pypsa_network, logger, systems_dir, series_dir,series_file_format)
+    converter = PyPSAStudyConverter(
+        pypsa_network, logger, systems_dir, series_dir, series_file_format
+    )
     input_system_from_pypsa_converter = converter.to_gems_study()
     return input_system_from_pypsa_converter