Skip to content

Newly created class import part of Aggregation 2 #424

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

Closed
Billa32 wants to merge 3 commits into from
Closed

Newly created class import part of Aggregation 2 #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7274f96
Create baseurls.py
Billa32 Jul 26, 2021
6bc1467
Merge pull request #2 from Billa32/Base_url
Billa32 Jul 26, 2021
5780c38
Update jhu.py
Billa32 Jul 26, 2021
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
4 changes: 3 additions & 1 deletion app/services/location/jhu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from ...utils import date as date_util
from ...utils import httputils
from . import LocationService
from ...utils.baseurls import BaseUrl

LOGGER = logging.getLogger("services.location.jhu")
PID = os.getpid()
Expand All @@ -41,7 +42,7 @@ async def get(self, loc_id): # pylint: disable=arguments-differ


# Base URL for fetching category.
BASE_URL = "https://raw.githubusercontent.com/CSSEGISandData/2019-nCoV/master/csse_covid_19_data/csse_covid_19_time_series/"
BASE_URL = BaseUrl.JHU


@cached(cache=TTLCache(maxsize=4, ttl=1800))
Expand Down Expand Up @@ -226,3 +227,4 @@ def parse_history(key: tuple, locations: list, index: int):
LOGGER.debug(f"iteration data merge error: {index} {key}")

return location_history

10 changes: 10 additions & 0 deletions app/utils/baseurls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import enum

class BaseUrl(str, enum.Enum):
"""
A base url available for retrieving data.
"""

JHU = "https://raw.githubusercontent.com/CSSEGISandData/2019-nCoV/master/csse_covid_19_data/csse_covid_19_time_series/"
CSBS = "https://facts.csbs.org/covid-19/covid19_county.csv"
NYT = "https://raw.githubusercontent.com/nytimes/covid-19-data/master/us-counties.csv"