Skip to content

fix: fall back to city when cloud region has no state (#1456) #1467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Maduk86 wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −1
Open

fix: fall back to city when cloud region has no state (#1456) #1467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion codecarbon/core/emissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def get_cloud_geo_region(self, cloud: CloudMetadata) -> str:
)

state = selected["state"].item()
if state is not None:
if isinstance(state, str):
return state
city = selected["city"].item()
return city
Expand Down
18 changes: 18 additions & 0 deletions tests/test_emissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,24 @@ def test_emissions_CLOUD_GCP(self):
assert isinstance(emissions, float)
self.assertAlmostEqual(emissions, 0.0010, places=2)

def test_get_cloud_geo_region_returns_state(self):
# WHEN
region = self._emissions.get_cloud_geo_region(
CloudMetadata(provider="gcp", region="us-central1")
)

# THEN
self.assertEqual(region, "Iowa")

def test_get_cloud_geo_region_falls_back_to_city_without_state(self):
# WHEN
region = self._emissions.get_cloud_geo_region(
CloudMetadata(provider="gcp", region="asia-east1")
)

# THEN
self.assertEqual(region, "Changhua County")

def test_get_carbon_intensity_per_source_data(self):
# pytest tests/test_emissions.py::TestEmissions::test_get_carbon_intensity_per_source_data
carbon_intensity = DataSource().get_carbon_intensity_per_source_data()
Expand Down
Loading