Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 dev/docker/python/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.8-buster
FROM python:3.8-bookworm

RUN apt-get update && apt-get install -y r-base && Rscript -e "install.packages(c('httr','xml2'))"

Expand Down
18 changes: 18 additions & 0 deletions integrations/server/test_covidcast_endpoints.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

from delphi.epidata.maintenance.covidcast_meta_cache_updater import main as update_cache
from delphi.epidata.acquisition.covidcast.test_utils import CovidcastBase, CovidcastTestRow
from delphi.epidata.maintenance.coverage_crossref_updater import main as update_crossref


# use the local instance of the Epidata API
BASE_URL = "http://delphi_web_epidata/epidata/covidcast"
Expand Down Expand Up @@ -385,3 +387,19 @@ def test_coverage(self):
with self.subTest("invalid geo_type"):
out = self._fetch("/coverage", signal=first.signal_pair(), geo_type="doesnt_exist", format="json")
self.assertEqual(len(out), 0)

def test_geo_indicator_coverage(self):
"""Request a geo_type:geo_value from the /geo_indicator_coverage endpoint."""

self._insert_rows([
CovidcastTestRow.make_default_row(geo_type="state", geo_value="pa"),
CovidcastTestRow.make_default_row(geo_type="state", geo_value="ny"),
CovidcastTestRow.make_default_row(geo_type="state", geo_value="ny", signal="sig2"),
])

update_crossref()

out = self._fetch("/geo_indicator_coverage", data_source="src", signals="sig")
self.assertEqual(len(out["epidata"]), 2)
self.assertEqual(out["epidata"], ['state:ny', 'state:pa'])

20 changes: 20 additions & 0 deletions src/server/endpoints/covidcast.py
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,26 @@ def handle_geo_coverage():

return execute_query(q.query, q.params, fields_string, [], [])

@bp.route("/geo_indicator_coverage", methods=("GET", "POST"))
def handle_geo_indicator_coverage():
source_signal_sets = parse_source_signal_sets()
source_signal_sets = restrict_by_roles(source_signal_sets)
source_signal_sets, _ = create_source_signal_alias_mapper(source_signal_sets)

q = QueryBuilder("coverage_crossref_v", "c")
fields_string = ["geo_type", "geo_value"]

q.set_fields(fields_string)

q.apply_source_signal_filters("source", "signal", source_signal_sets)
q.set_sort_order("geo_type", "geo_value")
q.group_by = ["c." + field for field in fields_string] # this condenses duplicate results, similar to `SELECT DISTINCT`

def transform_row(row, proxy):
return f"{row['geo_type']}:{row['geo_value']}"

return execute_query(q.query, q.params, fields_string, [], [], transform=transform_row)

@bp.route("/anomalies", methods=("GET", "POST"))
def handle_anomalies():
"""
Expand Down