refactor: update countries and format functions using electricity mix repository

data/electricity_mix.csv

@@ -1,4 +0,0 @@
-name,unit,source,WOR,EEE,ZWE,ZMB,ZAF,YEM,VNM,VEN,UZB,URY,USA,UKR,TZA,TWN,TTO,TUR,TUN,TKM,TJK,THA,TGO,SYR,SLV,SEN,SVK,SVN,SGP,SWE,SDN,SAU,RUS,SCG,ROU,QAT,PRY,PRT,POL,PAK,PHL,PER,PAN,OMN,NZL,NPL,NOR,NLD,NIC,NGA,NAM,MOZ,MYS,MEX,MLT,MNG,MMR,MKD,MDA,MAR,LBY,LVA,LUX,LTU,LKA,LBN,KAZ,KWT,KOR,PRK,KHM,KGZ,KEN,JPN,JOR,JAM,ITA,ISL,IRN,IRQ,IND,ISR,IRL,IDN,HUN,HTI,HRV,HND,HKG,GTM,GRC,GIB,GHA,GEO,GBR,GAB,FRA,FIN,ETH,ESP,ERI,EGY,EST,ECU,DZA,DOM,DNK,DEU,CZE,CYP,CUB,CRI,COL,CHN,CMR,CHL,CIV,CHE,COG,COD,CAN,BLR,BWA,BRA,BOL,BRN,BEN,BHR,BGR,BEL,BGD,BIH,AZE,AUS,AUT,ARG,AGO,ANT,ARM,ALB,ARE
-adpe,kg éq. Sb,ADEME Base IMPACTS ®,0.0000000737708,0.0000000642317,0.000000109502,0.000000162193,0.0000000862445,0.0000000163908,0.0000000945573,0.000000112811,0.000000103681,0.000000104586,0.0000000985548,0.0000000647907,0.000000132261,0.0000000578088,0.000000064552,0.0000000749765,0.0000000177021,0.000000131822,0.000000152621,0.0000000569593,0.000000134255,0.0000000268396,0.0000000472135,0.0000000470662,0.0000000606109,0.0000000992283,0.0000000198459,0.0000000777062,0.0000000955701,0.0000000134206,0.0000000960312,0.000000132772,0.0000000981761,0.00000001324,0.000000149181,0.0000000341863,0.000000101946,0.0000000842952,0.0000000595304,0.0000000952688,0.0000000790553,0.0000000374073,0.0000000720474,0.000000238273,0.000000127486,0.0000000329318,0.0000000414983,0.0000000621,0.000000128285,0.000000148382,0.000000044938,0.0000000578358,0.000000049475,0.000000176361,0.000000152699,0.000000119873,0.000000110674,0.0000000641089,0.0000000206592,0.000000153757,0.000000105692,0.0000000294596,0.0000000986932,0.0000000182134,0.000000135386,0.0000000141168,0.0000000518017,0.000000117457,0.0000000319202,0.000000181827,0.0000000958533,0.0000000596578,0.0000000147031,0.0000000196047,0.00000005439,0.0000000781905,0.0000000220304,0.0000000404306,0.000000100099,0.0000000610194,0.0000000219257,0.0000000610451,0.0000000644587,0.0000000937057,0.000000153989,0.0000000649373,0.0000000816213,0.0000000803251,0.0000000691645,0.0000000286211,0.000000156003,0.000000137999,0.0000000370973,0.000000113843,0.0000000485798,0.0000000805114,0.000000174161,0.0000000518326,0.0000000512406,0.000000033925,0.0000000990171,0.000000127168,0.0000000216438,0.0000000429285,0.0000000157411,0.0000000878733,0.0000000817565,0.0000000448771,0.0000000299542,0.0000000863908,0.000000122031,0.0000000851552,0.000000146313,0.000000105851,0.0000000949004,0.000000100467,0.000000265575,0.000000174647,0.0000000993179,0.0000000840478,0.0000000866014,0.00000010962,0.0000000969793,0.0000000185641,0.0000000239702,0.0000000135014,0.0000000823611,0.0000000337201,0.0000000394158,0.000000148007,0.000000092567,0.0000000790846,0.000000141124,0.0000000768612,0.000000124074,0.0000000449103,0.0000000854245,0.000000229556,0.0000000141548
-pe,MJ,ADPf / (1-%renewable_energy),9.988,12.873,16.122,1.798,11.732,16.250,11.238,15.163,17.367,107.570,11.358,12.936,9.305,11.439,14.289,16.150,12.902,23.300,19.165,10.414,21.978,16.989,13.012,14.516,11.680,12.146,10.477,11.026,29.629,14.058,13.200,14.242,15.585,11.916,0.020,14.153,13.178,16.175,11.120,8.211,16.364,22.306,24.731,0.396,4.952,8.511,24.696,11.279,468.150,0.206,12.268,11.775,19.374,15.114,14.132,19.120,18.429,11.702,19.116,8.249,10.128,21.043,12.116,12.341,13.260,12.753,10.199,32.793,34.655,15.380,68.996,10.718,13.677,14.799,12.656,0.013,15.022,20.372,20.363,10.023,10.706,11.603,11.784,20.167,18.548,15.762,,14.340,14.487,,10.097,10.425,13.579,28.341,11.289,11.275,36.133,12.090,13.289,10.195,16.334,20.908,16.376,12.412,16.824,16.260,12.517,13.118,17.317,45.996,7.312,14.119,10.807,11.348,14.783,11.782,34.147,0.097,11.987,13.194,19.642,9.031,11.587,15.689,14.337,14.036,14.375,10.776,12.935,21.705,12.831,16.908,11.036,10.049,16.972,,13.380,0.201,19.032
-gwp,kg éq. CO2,ADEME Base IMPACTS ®,0.590478,0.509427,0.842811,0.0141304,1.17562,1.06777,0.555572,0.497373,0.81178,0.296953,0.67978,0.646745,0.475635,0.845351,0.933059,0.706988,0.80722,1.38296,0.0426743,0.646174,0.545455,1.08778,0.473128,1.1195,0.309341,0.498523,0.655825,0.0464664,1.12472,0.913677,0.66131,1.07808,0.664245,0.722125,0.241601,0.571172,1.15075,0.748727,0.761317,0.284364,0.53403,1.41292,0.293397,0.0841323,0.023754,0.544803,0.941626,0.693123,0.357253,0.00880732,0.832206,0.739214,1.31149,1.47192,0.48193,1.24074,1.04213,0.933694,1.35361,0.234273,0.490016,0.154229,0.709185,0.883627,1.128,0.885084,0.599585,0.797361,1.41054,0.156039,0.589603,0.540891,0.781372,1.07345,0.621329,0.0194609,0.930385,1.48728,1.58299,0.901842,0.648118,0.875394,0.541558,1.3858,0.535759,0.692837,0.95888,0.645801,1.13127,0.977477,0.540126,0.132046,0.602137,0.732511,0.0813225,0.322068,0.251299,0.467803,1.13153,0.587775,1.51492,0.627714,1.02318,0.909252,0.633534,0.657374,0.799077,0.978041,1.28325,0.224471,0.214014,1.05738,0.456622,0.574415,0.928583,0.0448568,0.904053,0.0613102,0.238191,0.795697,2.12572,0.278647,0.585131,0.997577,1.19128,0.804567,0.827087,0.256537,0.795168,1.56025,0.726126,1.12326,0.245573,0.476811,0.412014,1.13161,0.252002,0.0207635,1.09088

src/data/electricity_mix.csv

@@ -1,4 +0,0 @@
-name,unit,source,WOR,EEE,ZWE,ZMB,ZAF,YEM,VNM,VEN,UZB,URY,USA,UKR,TZA,TWN,TTO,TUR,TUN,TKM,TJK,THA,TGO,SYR,SLV,SEN,SVK,SVN,SGP,SWE,SDN,SAU,RUS,SCG,ROU,QAT,PRY,PRT,POL,PAK,PHL,PER,PAN,OMN,NZL,NPL,NOR,NLD,NIC,NGA,NAM,MOZ,MYS,MEX,MLT,MNG,MMR,MKD,MDA,MAR,LBY,LVA,LUX,LTU,LKA,LBN,KAZ,KWT,KOR,PRK,KHM,KGZ,KEN,JPN,JOR,JAM,ITA,ISL,IRN,IRQ,IND,ISR,IRL,IDN,HUN,HTI,HRV,HND,HKG,GTM,GRC,GIB,GHA,GEO,GBR,GAB,FRA,FIN,ETH,ESP,ERI,EGY,EST,ECU,DZA,DOM,DNK,DEU,CZE,CYP,CUB,CRI,COL,CHN,CMR,CHL,CIV,CHE,COG,COD,CAN,BLR,BWA,BRA,BOL,BRN,BEN,BHR,BGR,BEL,BGD,BIH,AZE,AUS,AUT,ARG,AGO,ANT,ARM,ALB,ARE
-adpe,kg éq. Sb,ADEME Base IMPACTS ®,0.0000000737708,0.0000000642317,0.000000109502,0.000000162193,0.0000000862445,0.0000000163908,0.0000000945573,0.000000112811,0.000000103681,0.000000104586,0.0000000985548,0.0000000647907,0.000000132261,0.0000000578088,0.000000064552,0.0000000749765,0.0000000177021,0.000000131822,0.000000152621,0.0000000569593,0.000000134255,0.0000000268396,0.0000000472135,0.0000000470662,0.0000000606109,0.0000000992283,0.0000000198459,0.0000000777062,0.0000000955701,0.0000000134206,0.0000000960312,0.000000132772,0.0000000981761,0.00000001324,0.000000149181,0.0000000341863,0.000000101946,0.0000000842952,0.0000000595304,0.0000000952688,0.0000000790553,0.0000000374073,0.0000000720474,0.000000238273,0.000000127486,0.0000000329318,0.0000000414983,0.0000000621,0.000000128285,0.000000148382,0.000000044938,0.0000000578358,0.000000049475,0.000000176361,0.000000152699,0.000000119873,0.000000110674,0.0000000641089,0.0000000206592,0.000000153757,0.000000105692,0.0000000294596,0.0000000986932,0.0000000182134,0.000000135386,0.0000000141168,0.0000000518017,0.000000117457,0.0000000319202,0.000000181827,0.0000000958533,0.0000000596578,0.0000000147031,0.0000000196047,0.00000005439,0.0000000781905,0.0000000220304,0.0000000404306,0.000000100099,0.0000000610194,0.0000000219257,0.0000000610451,0.0000000644587,0.0000000937057,0.000000153989,0.0000000649373,0.0000000816213,0.0000000803251,0.0000000691645,0.0000000286211,0.000000156003,0.000000137999,0.0000000370973,0.000000113843,0.0000000485798,0.0000000805114,0.000000174161,0.0000000518326,0.0000000512406,0.000000033925,0.0000000990171,0.000000127168,0.0000000216438,0.0000000429285,0.0000000157411,0.0000000878733,0.0000000817565,0.0000000448771,0.0000000299542,0.0000000863908,0.000000122031,0.0000000851552,0.000000146313,0.000000105851,0.0000000949004,0.000000100467,0.000000265575,0.000000174647,0.0000000993179,0.0000000840478,0.0000000866014,0.00000010962,0.0000000969793,0.0000000185641,0.0000000239702,0.0000000135014,0.0000000823611,0.0000000337201,0.0000000394158,0.000000148007,0.000000092567,0.0000000790846,0.000000141124,0.0000000768612,0.000000124074,0.0000000449103,0.0000000854245,0.000000229556,0.0000000141548
-pe,MJ,ADPf / (1-%renewable_energy),9.988,12.873,16.122,1.798,11.732,16.250,11.238,15.163,17.367,107.570,11.358,12.936,9.305,11.439,14.289,16.150,12.902,23.300,19.165,10.414,21.978,16.989,13.012,14.516,11.680,12.146,10.477,11.026,29.629,14.058,13.200,14.242,15.585,11.916,0.020,14.153,13.178,16.175,11.120,8.211,16.364,22.306,24.731,0.396,4.952,8.511,24.696,11.279,468.150,0.206,12.268,11.775,19.374,15.114,14.132,19.120,18.429,11.702,19.116,8.249,10.128,21.043,12.116,12.341,13.260,12.753,10.199,32.793,34.655,15.380,68.996,10.718,13.677,14.799,12.656,0.013,15.022,20.372,20.363,10.023,10.706,11.603,11.784,20.167,18.548,15.762,,14.340,14.487,,10.097,10.425,13.579,28.341,11.289,11.275,36.133,12.090,13.289,10.195,16.334,20.908,16.376,12.412,16.824,16.260,12.517,13.118,17.317,45.996,7.312,14.119,10.807,11.348,14.783,11.782,34.147,0.097,11.987,13.194,19.642,9.031,11.587,15.689,14.337,14.036,14.375,10.776,12.935,21.705,12.831,16.908,11.036,10.049,16.972,,13.380,0.201,19.032
-gwp,kg éq. CO2,ADEME Base IMPACTS ®,0.590478,0.509427,0.842811,0.0141304,1.17562,1.06777,0.555572,0.497373,0.81178,0.296953,0.67978,0.646745,0.475635,0.845351,0.933059,0.706988,0.80722,1.38296,0.0426743,0.646174,0.545455,1.08778,0.473128,1.1195,0.309341,0.498523,0.655825,0.0464664,1.12472,0.913677,0.66131,1.07808,0.664245,0.722125,0.241601,0.571172,1.15075,0.748727,0.761317,0.284364,0.53403,1.41292,0.293397,0.0841323,0.023754,0.544803,0.941626,0.693123,0.357253,0.00880732,0.832206,0.739214,1.31149,1.47192,0.48193,1.24074,1.04213,0.933694,1.35361,0.234273,0.490016,0.154229,0.709185,0.883627,1.128,0.885084,0.599585,0.797361,1.41054,0.156039,0.589603,0.540891,0.781372,1.07345,0.621329,0.0194609,0.930385,1.48728,1.58299,0.901842,0.648118,0.875394,0.541558,1.3858,0.535759,0.692837,0.95888,0.645801,1.13127,0.977477,0.540126,0.132046,0.602137,0.732511,0.0813225,0.322068,0.251299,0.467803,1.13153,0.587775,1.51492,0.627714,1.02318,0.909252,0.633534,0.657374,0.799077,0.978041,1.28325,0.224471,0.214014,1.05738,0.456622,0.574415,0.928583,0.0448568,0.904053,0.0613102,0.238191,0.795697,2.12572,0.278647,0.585131,0.997577,1.19128,0.804567,0.827087,0.256537,0.795168,1.56025,0.726126,1.12326,0.245573,0.476811,0.412014,1.13161,0.252002,0.0207635,1.09088

src/electricity_mix.py

@@ -1,153 +1,85 @@
+from __future__ import annotations
+
 import pandas as pd
 
 
 PATH = "src/data/electricity_mix.csv"
-
 COUNTRY_CODES = [
-    ("🌎 World", "WOR"),
-    ("🇪🇺 Europe", "EEE"),
-    ("🇿🇼 Zimbabwe", "ZWE"),
-    ("🇿🇲 Zambia", "ZMB"),
-    ("🇿🇦 South Africa", "ZAF"),
-    ("🇾🇪 Yemen", "YEM"),
-    ("🇻🇳 Vietnam", "VNM"),
-    ("🇻🇪 Venezuela", "VEN"),
-    ("🇺🇿 Uzbekistan", "UZB"),
-    ("🇺🇾 Uruguay", "URY"),
-    ("🇺🇸 United States", "USA"),
-    ("🇺🇦 Ukraine", "UKR"),
-    ("🇹🇿 Tanzania", "TZA"),
-    ("🇹🇼 Taiwan", "TWN"),
-    ("🇹🇹 Trinidad and Tobago", "TTO"),
-    ("🇹🇷 Turkey", "TUR"),
-    ("🇹🇳 Tunisia", "TUN"),
-    ("🇹🇲 Turkmenistan", "TKM"),
-    ("🇹🇯 Tajikistan", "TJK"),
-    ("🇹🇭 Thailand", "THA"),
-    ("🇹🇬 Togo", "TGO"),
-    ("🇸🇾 Syrian Arab Republic", "SYR"),
-    ("🇸🇻 El Salvador", "SLV"),
-    ("🇸🇳 Senegal", "SEN"),
-    ("🇸🇰 Slovak Republic", "SVK"),
-    ("🇸🇮 Slovenia", "SVN"),
-    ("🇸🇬 Singapore", "SGP"),
-    ("🇸🇪 Sweden", "SWE"),
-    ("🇸🇩 Sudan", "SDN"),
-    ("🇸🇦 Saudi Arabia", "SAU"),
-    ("🇷🇺 Russian Federation", "RUS"),
-    ("🇷🇸 Serbia and Montenegro", "SCG"),
-    ("🇷🇴 Romania", "ROU"),
-    ("🇶🇦 Qatar", "QAT"),
-    ("🇵🇾 Paraguay", "PRY"),
-    ("🇵🇹 Portugal", "PRT"),
-    ("🇵🇱 Poland", "POL"),
-    ("🇵🇰 Pakistan", "PAK"),
-    ("🇵🇭 Philippines", "PHL"),
-    ("🇵🇪 Peru", "PER"),
-    ("🇵🇦 Panama", "PAN"),
-    ("🇴🇲 Oman", "OMN"),
-    ("🇳🇿 New Zealand", "NZL"),
-    ("🇳🇵 Nepal", "NPL"),
-    ("🇳🇴 Norway", "NOR"),
-    ("🇳🇱 Netherlands", "NLD"),
-    ("🇳🇮 Nicaragua", "NIC"),
-    ("🇳🇬 Nigeria", "NGA"),
-    ("🇳🇦 Namibia", "NAM"),
-    ("🇲🇿 Mozambique", "MOZ"),
-    ("🇲🇾 Malaysia", "MYS"),
-    ("🇲🇽 Mexico", "MEX"),
-    ("🇲🇹 Malta", "MLT"),
-    ("🇲🇳 Mongolia", "MNG"),
-    ("🇲🇲 Myanmar", "MMR"),
-    ("🇲🇰 North Macedonia", "MKD"),
-    ("🇲🇩 Moldova", "MDA"),
-    ("🇲🇦 Morocco", "MAR"),
-    ("🇱🇾 Libya", "LBY"),
-    ("🇱🇻 Latvia", "LVA"),
-    ("🇱🇺 Luxembourg", "LUX"),
-    ("🇱🇹 Lithuania", "LTU"),
-    ("🇱🇰 Sri Lanka", "LKA"),
-    ("🇱🇧 Lebanon", "LBN"),
-    ("🇰🇿 Kazakhstan", "KAZ"),
-    ("🇰🇼 Kuwait", "KWT"),
-    ("🇰🇷 South Korea", "KOR"),
-    ("🇰🇵 North Korea", "PRK"),
-    ("🇰🇭 Cambodia", "KHM"),
-    ("🇰🇬 Kyrgyz Republic", "KGZ"),
-    ("🇰🇪 Kenya", "KEN"),
-    ("🇯🇵 Japan", "JPN"),
-    ("🇯🇴 Jordan", "JOR"),
-    ("🇯🇲 Jamaica", "JAM"),
-    ("🇮🇹 Italy", "ITA"),
-    ("🇮🇸 Iceland", "ISL"),
-    ("🇮🇷 Iran", "IRN"),
-    ("🇮🇶 Iraq", "IRQ"),
-    ("🇮🇳 India", "IND"),
-    ("🇮🇱 Israel", "ISR"),
-    ("🇮🇪 Ireland", "IRL"),
-    ("🇮🇩 Indonesia", "IDN"),
-    ("🇭🇺 Hungary", "HUN"),
-    ("🇭🇹 Haiti", "HTI"),
-    ("🇭🇷 Croatia", "HRV"),
-    ("🇭🇳 Honduras", "HND"),
-    ("🇭🇰 Hong Kong", "HKG"),
-    ("🇬🇹 Guatemala", "GTM"),
-    ("🇬🇷 Greece", "GRC"),
-    ("🇬🇮 Gibraltar", "GIB"),
-    ("🇬🇭 Ghana", "GHA"),
-    ("🇬🇪 Georgia", "GEO"),
-    ("🇬🇧 United Kingdom", "GBR"),
-    ("🇬🇦 Gabon", "GAB"),
-    ("🇫🇷 France", "FRA"),
-    ("🇫🇮 Finland", "FIN"),
-    ("🇪🇹 Ethiopia", "ETH"),
-    ("🇪🇸 Spain", "ESP"),
-    ("🇪🇷 Eritrea", "ERI"),
-    ("🇪🇬 Egypt", "EGY"),
-    ("🇪🇪 Estonia", "EST"),
-    ("🇪🇨 Ecuador", "ECU"),
-    ("🇩🇿 Algeria", "DZA"),
-    ("🇩🇴 Dominican Republic", "DOM"),
-    ("🇩🇰 Denmark", "DNK"),
-    ("🇩🇪 Germany", "DEU"),
-    ("🇨🇿 Czech Republic", "CZE"),
-    ("🇨🇾 Cyprus", "CYP"),
-    ("🇨🇺 Cuba", "CUB"),
-    ("🇨🇷 Costa Rica", "CRI"),
-    ("🇨🇴 Colombia", "COL"),
-    ("🇨🇳 China", "CHN"),
-    ("🇨🇲 Cameroon", "CMR"),
-    ("🇨🇱 Chile", "CHL"),
-    ("🇨🇮 Cote d'Ivoire", "CIV"),
-    ("🇨🇭 Switzerland", "CHE"),
-    ("🇨🇬 Congo", "COG"),
-    ("🇨🇩 Democratic Republic of the Congo", "COD"),
-    ("🇨🇦 Canada", "CAN"),
-    ("🇧🇾 Belarus", "BLR"),
-    ("🇧🇼 Botswana", "BWA"),
-    ("🇧🇷 Brazil", "BRA"),
-    ("🇧🇴 Bolivia", "BOL"),
-    ("🇧🇳 Brunei", "BRN"),
-    ("🇧🇯 Benin", "BEN"),
-    ("🇧🇭 Bahrain", "BHR"),
-    ("🇧🇬 Bulgaria", "BGR"),
-    ("🇧🇪 Belgium", "BEL"),
-    ("🇧🇩 Bangladesh", "BGD"),
-    ("🇧🇦 Bosnia and Herzegovina", "BIH"),
-    ("🇦🇿 Azerbaijan", "AZE"),
     ("🇦🇺 Australia", "AUS"),
     ("🇦🇹 Austria", "AUT"),
     ("🇦🇷 Argentina", "ARG"),
-    ("🇦🇴 Angola", "AGO"),
-    ("🇦 Netherlands Antilles", "ANT"),
-    ("🇦🇲 Armenia", "ARM"),
-    ("🇦🇱 Albania", "ALB"),
-    ("🇦🇪 United Arab Emirates", "ARE"),
+    ("🇧🇪 Belgium", "BEL"),
+    ("🇧🇬 Bulgaria", "BGR"),
+    ("🇧🇷 Brazil", "BRA"),
+    ("🇨🇦 Canada", "CAN"),
+    ("🇨🇭 Switzerland", "CHE"),
+    ("🇨🇱 Chile", "CHL"),
+    ("🇨🇳 China", "CHN"),
+    ("🇨🇾 Cyprus", "CYP"),
+    ("🇨🇿 Czech Republic", "CZE"),
+    ("🇩🇪 Germany", "DEU"),
+    ("🇩🇰 Denmark", "DNK"),
+    ("🇪🇸 Spain", "ESP"),
+    ("🇪🇪 Estonia", "EST"),
+    ("🇫🇮 Finland", "FIN"),
+    ("🇫🇷 France", "FRA"),
+    ("🇬🇧 United Kingdom", "GBR"),
+    ("🇬🇷 Greece", "GRC"),
+    ("🇭🇺 Hungary", "HUN"),
+    ("🇮🇩 Indonesia", "IDN"),
+    ("🇮🇳 India", "IND"),
+    ("🇮🇪 Ireland", "IRL"),
+    ("🇮🇸 Iceland", "ISL"),
+    ("🇮🇹 Italy", "ITA"),
+    ("🇯🇵 Japan", "JPN"),
+    ("🇰🇷 South Korea", "KOR"),
+    ("🇱🇹 Lithuania", "LTU"),
+    ("🇱🇺 Luxembourg", "LUX"),
+    ("🇱🇻 Latvia", "LVA"),
+    ("🇲🇽 Mexico", "MEX"),
+    ("🇲🇹 Malta", "MLT"),
+    ("🇲🇾 Malaysia", "MYS"),
+    ("🇳🇱 Netherlands", "NLD"),
+    ("🇳🇴 Norway", "NOR"),
+    ("🇳🇿 New Zealand", "NZL"),
+    ("🇵🇱 Poland", "POL"),
+    ("🇵🇹 Portugal", "PRT"),
+    ("🇷🇴 Romania", "ROU"),
+    ("🇷🇺 Russian Federation", "RUS"),
+    ("🇸🇰 Slovak Republic", "SVK"),
+    ("🇸🇮 Slovenia", "SVN"),
+    ("🇸🇪 Sweden", "SWE"),
+    ("🇺🇦 Ukraine", "UKR"),
+    ("🇹🇭 Thailand", "THA"),
+    ("🇹🇷 Turkey", "TUR"),
+    ("🇹🇼 Taiwan", "TWN"),
+    ("🇺🇸 United States", "USA"),
+    ("🌎 World", "WOR"),
 ]
 
+CRITERIA = {
+    "gwp": "GHG Emission (kg CO2 eq)",
+    "adpe": "Abiotic Resources (kg Sb eq)",
+    "pe": "Primary Energy (MJ)",
+    "wue": "Water Usage Effectiveness (L/kWh)"
+}
+
+
+def format_country_name(code: str) -> str | None:
+    for country_name, country_code in COUNTRY_CODES:
+        if country_code == code:
+            return country_name
+    return None
+
+
+def format_electricity_mix_criterion(criterion: str) -> str | None:
+    return CRITERIA.get(criterion)
+
 
 def dataframe_electricity_mix(countries: list):
     df = pd.read_csv("src/data/electricity_mix.csv")
+
+
     df["name_unit"] = df["name"] + " (" + df["unit"] + ")"
     df = df[["name_unit"] + [x[1] for x in COUNTRY_CODES if x[0] in countries]]
 

src/expert.py

@@ -1,27 +1,23 @@
+import pandas as pd
 import streamlit as st
 from ecologits.electricity_mix_repository import electricity_mixes
 from ecologits.impacts.llm import compute_llm_impacts
 
 from src.utils import format_impacts, average_range_impacts
 from src.impacts import display_impacts
-from src.electricity_mix import (
-    COUNTRY_CODES,
-    dataframe_electricity_mix,
-)
+from src.electricity_mix import COUNTRY_CODES, format_electricity_mix_criterion, format_country_name
 from src.models import load_models
 from src.constants import PROMPTS
 
 import plotly.express as px
 
 
-def reset_model():
-    model = "CUSTOM"
-
-
 def expert_mode():
     st.markdown("### 🤓 Expert mode")
 
     with st.container(border=True):
+        st.markdown("###### Configure the model")
+
         ########## Model info ##########
 
         col1, col2, col3 = st.columns(3)
@@ -48,11 +44,6 @@ def expert_mode():
                 key=2,
             )
 
-        with col3:
-            output_tokens_exp = st.selectbox(
-                label="Example prompt", options=[x[0] for x in PROMPTS], key=3
-            )
-
         df_filtered = df[
             (df["provider_clean"] == provider_exp) & (df["name_clean"] == model_exp)
         ]
@@ -93,17 +84,27 @@ def expert_mode():
                 "Total parameters (B)", 0, None, total_params
             )
 
-        with col33:
+
+    with st.container(border=True):
+        st.markdown("###### Configure the prompt")
+
+        col1, col2 = st.columns(2)
+
+        with col1:
+            output_tokens_exp = st.selectbox(
+                label="Example prompt", options=[x[0] for x in PROMPTS], key=3
+            )
+
+        with col2:
             output_tokens = st.number_input(
                 label="Output completion tokens",
                 min_value=0,
                 value=[x[1] for x in PROMPTS if x[0] == output_tokens_exp][0],
             )
 
-        ########## Electricity mix ##########
 
     with st.container(border=True):
-        st.markdown("##### Electricity mix")
+        st.markdown("###### Configure the electricity mix of the data center")
 
         location = st.selectbox("Location", [x[0] for x in COUNTRY_CODES])
 
@@ -224,24 +225,25 @@ def expert_mode():
 
         countries_to_compare = st.multiselect(
             label="Countries to compare",
-            options=[x[0] for x in COUNTRY_CODES],
-            default=["🇫🇷 France", "🇺🇸 United States", "🇨🇳 China"],
+            options=[c[1] for c in COUNTRY_CODES],
+            format_func=format_country_name,
+            default=["FRA", "USA", "CHN"],
         )
 
         try:
-            df_comp = dataframe_electricity_mix(countries_to_compare)
-
             impact_type = st.selectbox(
                 label="Select an impact type to compare",
-                options=[x for x in df_comp.columns if x != "country"],
-                index=1,
+                options=["gwp", "adpe", "pe", "wue"],
+                format_func=format_electricity_mix_criterion,
+                index=0,
             )
 
-            df_comp.sort_values(by=impact_type, inplace=True)
+            df_comp = pd.DataFrame([em for em in electricity_mixes.list_electricity_mixes() if em.zone in countries_to_compare])
+            df_comp = df_comp.sort_values(by=impact_type, ascending=True)
 
             fig_2 = px.bar(
                 df_comp,
-                x=df_comp.index,
+                x=df_comp.zone.apply(format_country_name),
                 y=impact_type,
                 text=impact_type,
                 color=impact_type,