Merge pull request #424 from EdAbati/fix-dashboard-data-process

Fix dashboard data processing
mlco2 · Jul 25, 2023 · 0963f17 · 0963f17
2 parents 45386fc + 291e061
commit 0963f17
Show file tree

Hide file tree

Showing 13 changed files with 4,051 additions and 3,709 deletions.
diff --git a/.conda/meta.yaml b/.conda/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "2.2.6" %}
+{% set version = "2.2.7" %}
 
 package:
   name: codecarbon

diff --git a/codecarbon/_version.py b/codecarbon/_version.py
@@ -1 +1 @@
-__version__ = "2.2.6"
+__version__ = "2.2.7"
diff --git a/codecarbon/core/emissions.py b/codecarbon/core/emissions.py
@@ -195,7 +195,6 @@ def get_country_emissions(self, energy: Energy, geo: GeoMetadata) -> float:
             )  # kgs
 
         country_energy_mix: Dict = energy_mix[geo.country_iso_code]
-
         emissions_per_kWh = self._global_energy_mix_to_emissions_rate(
             country_energy_mix
         )
@@ -243,7 +242,7 @@ def _global_energy_mix_to_emissions_rate(energy_mix: Dict) -> EmissionsPerKWh:
         # Sanity check
         if energy_sum_computed != energy_sum:
             logger.error(
-                f"We find {energy_sum_computed} TWh instead of {energy_sum} TWh for {energy_mix.get('official_name_en')}, using world average."
+                f"We find {energy_sum_computed} TWh instead of {energy_sum} TWh for {energy_mix.get('country_name')}, using world average."
             )
             return EmissionsPerKWh.from_g_per_kWh(
                 carbon_intensity_per_source.get("world_average")

diff --git a/codecarbon/data/private_infra/2023-07-07-22-40-48.png b/codecarbon/data/private_infra/2023-07-07-22-40-48.png