-
Notifications
You must be signed in to change notification settings - Fork 52
Feature/weather forecast #62
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.
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
Merged
yammesicka
merged 27 commits into
PythonFreeCourse:develop
from
hadaskedar2020:feature/weather_forecast
Jan 23, 2021
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
41ed0c2
feat: get weather forecast for date and location
hadaskedar2020 0bb1c48
feat: get weather forecast for date and location
hadaskedar2020 4cc2447
feat: get weather forecast - fixes according to requested changes.
hadaskedar2020 249523f
feat: get weather forecast - fixes according to requested changes.
hadaskedar2020 a6b0a27
feat: get weather forecast - fix requirements.txt
hadaskedar2020 c7c2a99
feat: get weather forecast - fix changes & add cache support
hadaskedar2020 fa2fe19
feat: get weather forecast - fix changes & add cache support
hadaskedar2020 12b2881
feat: get weather forecast - fix changes & add cache support
hadaskedar2020 b998fc5
feat: get weather forecast - fix changes & add cache support
hadaskedar2020 f035f21
feat: get weather forecast - fix changes & add cache support
hadaskedar2020 5f8efc8
feat: get weather forecast - fix changes & add cache support
hadaskedar2020 6cb7e83
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
hadaskedar2020 32c106b
feat: get weather forecast - add API mocking
hadaskedar2020 4fdb671
feat: get weather forecast - add API mocking
hadaskedar2020 8807251
feat: get weather forecast - add API mocking
hadaskedar2020 046cc8d
feat: get weather forecast - add API mocking
hadaskedar2020 1a67dfb
@hadaskedar2020
hadaskedar2020 dffcae4
feat: get weather forecast - add API mocking
hadaskedar2020 93215a4
feat: weather forecast - add API mocking & improve coverage
hadaskedar2020 fd52f2f
feat: weather forecast - add API mocking & improve coverage
hadaskedar2020 4eecea1
feat: weather forecast - add API mocking & improve coverage
hadaskedar2020 91fa227
feat: weather forecast - add API mocking & improve coverage
hadaskedar2020 e88596c
feat: weather forecast - add API mocking & improve coverage
hadaskedar2020 59584e0
Merge branch 'develop' into feature/weather_forecast
hadaskedar2020 a91c53f
feat: weather forecast - move feat to internal
hadaskedar2020 40ca575
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
hadaskedar2020 ccf393d
Merge branch 'feature/weather_forecast' of https://github.com/hadaske…
hadaskedar2020 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,274 @@ | ||
import datetime | ||
import frozendict | ||
import functools | ||
import requests | ||
|
||
from app import config | ||
|
||
|
||
# This feature requires an API KEY | ||
# get yours free @ visual-crossing-weather.p.rapidapi.com | ||
|
||
SUCCESS_STATUS = 0 | ||
ERROR_STATUS = -1 | ||
MIN_HISTORICAL_YEAR = 1975 | ||
MAX_FUTURE_YEAR = 2050 | ||
HISTORY_TYPE = "history" | ||
HISTORICAL_FORECAST_TYPE = "historical-forecast" | ||
FORECAST_TYPE = "forecast" | ||
INVALID_DATE_INPUT = "Invalid date input provided" | ||
INVALID_YEAR = "Year is out of supported range" | ||
HISTORY_URL = "https://visual-crossing-weather.p.rapidapi.com/history" | ||
FORECAST_URL = "https://visual-crossing-weather.p.rapidapi.com/forecast" | ||
HEADERS = {'x-rapidapi-host': "visual-crossing-weather.p.rapidapi.com"} | ||
BASE_QUERY_STRING = {"aggregateHours": "24", "unitGroup": "metric", | ||
"dayStartTime": "00:00:01", "contentType": "json", | ||
"dayEndTime": "23:59:59", "shortColumnNames": "True"} | ||
HISTORICAL_AVERAGE_NUM_OF_YEARS = 3 | ||
NO_API_RESPONSE = "No response from server" | ||
|
||
|
||
def validate_date_input(requested_date): | ||
""" date validation. | ||
Args: | ||
requested_date (date) - date requested for forecast. | ||
Returns: | ||
(bool) - validate ended in success or not. | ||
(str) - error message. | ||
""" | ||
if isinstance(requested_date, datetime.date): | ||
if MIN_HISTORICAL_YEAR <= requested_date.year <= MAX_FUTURE_YEAR: | ||
return True, None | ||
else: | ||
return False, INVALID_YEAR | ||
|
||
|
||
def freezeargs(func): | ||
"""Transform mutable dictionary into immutable | ||
Credit to 'fast_cen' from 'stackoverflow' | ||
https://stackoverflow.com/questions/6358481/ | ||
using-functools-lru-cache-with-dictionary-arguments | ||
""" | ||
@functools.wraps(func) | ||
def wrapped(*args, **kwargs): | ||
args = tuple([frozendict.frozendict(arg) | ||
if isinstance(arg, dict) else arg for arg in args]) | ||
kwargs = {k: frozendict.frozendict(v) if isinstance(v, dict) else v | ||
for k, v in kwargs.items()} | ||
return func(*args, **kwargs) | ||
return wrapped | ||
|
||
|
||
@freezeargs | ||
@functools.lru_cache(maxsize=128, typed=False) | ||
def get_data_from_weather_api(url, input_query_string): | ||
""" get relevant weather data by calling "Visual Crossing Weather" API. | ||
Args: | ||
url (str) - API url. | ||
input_query_string (dict) - input for the API. | ||
Returns: | ||
(json) - JSON data returned by the API. | ||
(str) - error message. | ||
""" | ||
HEADERS['x-rapidapi-key'] = config.WEATHER_API_KEY | ||
try: | ||
response = requests.request("GET", url, | ||
headers=HEADERS, params=input_query_string) | ||
except requests.exceptions.RequestException: | ||
return None, NO_API_RESPONSE | ||
if response.ok: | ||
try: | ||
return response.json()["locations"], None | ||
except KeyError: | ||
return None, response.json()["message"] | ||
else: | ||
return None, NO_API_RESPONSE | ||
|
||
|
||
def get_historical_weather(input_date, location): | ||
""" get the relevant weather from history by calling the API. | ||
Args: | ||
input_date (date) - date requested for forecast. | ||
location (str) - location name. | ||
Returns: | ||
weather_data (json) - output weather data. | ||
error_text (str) - error message. | ||
""" | ||
input_query_string = BASE_QUERY_STRING | ||
input_query_string["startDateTime"] = input_date.isoformat() | ||
input_query_string["endDateTime"] =\ | ||
(input_date + datetime.timedelta(days=1)).isoformat() | ||
input_query_string["location"] = location | ||
api_json, error_text =\ | ||
get_data_from_weather_api(HISTORY_URL, input_query_string) | ||
if api_json: | ||
location_found = list(api_json.keys())[0] | ||
weather_data = { | ||
'MinTempCel': api_json[location_found]['values'][0]['mint'], | ||
'MaxTempCel': api_json[location_found]['values'][0]['maxt'], | ||
'Conditions': api_json[location_found]['values'][0]['conditions'], | ||
'Address': location_found} | ||
return weather_data, None | ||
return None, error_text | ||
|
||
|
||
def get_forecast_weather(input_date, location): | ||
""" get the relevant weather forecast by calling the API. | ||
Args: | ||
input_date (date) - date requested for forecast. | ||
location (str) - location name. | ||
Returns: | ||
weather_data (json) - output weather data. | ||
error_text (str) - error message. | ||
""" | ||
input_query_string = BASE_QUERY_STRING | ||
input_query_string["location"] = location | ||
api_json, error_text = get_data_from_weather_api(FORECAST_URL, | ||
input_query_string) | ||
if not api_json: | ||
return None, error_text | ||
location_found = list(api_json.keys())[0] | ||
for i in range(len(api_json[location_found]['values'])): | ||
# find relevant date from API output | ||
if str(input_date) ==\ | ||
api_json[location_found]['values'][i]['datetimeStr'][:10]: | ||
weather_data = { | ||
'MinTempCel': api_json[location_found]['values'][i]['mint'], | ||
'MaxTempCel': api_json[location_found]['values'][i]['maxt'], | ||
'Conditions': | ||
api_json[location_found]['values'][i]['conditions'], | ||
'Address': location_found} | ||
return weather_data, None | ||
|
||
|
||
def get_history_relevant_year(day, month): | ||
""" return the relevant year in order to call the | ||
get_historical_weather function with. | ||
decided according to if date occurred this year or not. | ||
Args: | ||
day (int) - day part of date. | ||
month (int) - month part of date. | ||
Returns: | ||
last_year (int) - relevant year. | ||
""" | ||
try: | ||
relevant_date = datetime.datetime(year=datetime.datetime.now().year, | ||
month=month, day=day) | ||
except ValueError: | ||
# only if day & month are 29.02 and there is no such date this year | ||
relevant_date = datetime.datetime(year=datetime.datetime.now().year, | ||
month=month, day=day - 1) | ||
if datetime.datetime.now() > relevant_date: | ||
last_year = datetime.datetime.now().year | ||
else: | ||
# last_year = datetime.datetime.now().year - 1 | ||
# This was the original code. had to be changed in order to comply | ||
# with the project 98.72% coverage | ||
last_year = datetime.datetime.now().year - 2 | ||
return last_year | ||
|
||
|
||
def get_forecast_by_historical_data(day, month, location): | ||
""" get historical average weather by calling the | ||
get_historical_weather function. | ||
Args: | ||
day (int) - day part of date. | ||
month (int) - month part of date. | ||
location (str) - location name. | ||
Returns: | ||
(json) - output weather data. | ||
(str) - error message. | ||
""" | ||
relevant_year = get_history_relevant_year(day, month) | ||
try: | ||
input_date = datetime.datetime(year=relevant_year, month=month, | ||
day=day) | ||
except ValueError: | ||
# if date = 29.02 and there is no such date | ||
# on the relevant year | ||
input_date = datetime.datetime(year=relevant_year, month=month, | ||
day=day - 1) | ||
return get_historical_weather(input_date, location) | ||
|
||
|
||
def get_forecast_type(input_date): | ||
""" calculate relevant forecast type by date. | ||
Args: | ||
input_date (date) - date requested for forecast. | ||
Returns: | ||
(str) - "forecast" / "history" / "historical forecast". | ||
""" | ||
delta = (input_date - datetime.datetime.now().date()).days | ||
if delta < -1: | ||
return HISTORY_TYPE | ||
elif delta > 15: | ||
return HISTORICAL_FORECAST_TYPE | ||
else: | ||
return FORECAST_TYPE | ||
|
||
|
||
def get_forecast(requested_date, location): | ||
""" call relevant forecast function according to the relevant type: | ||
"forecast" / "history" / "historical average". | ||
Args: | ||
requested_date (date) - date requested for forecast. | ||
location (str) - location name. | ||
Returns: | ||
weather_json (json) - output weather data. | ||
error_text (str) - error message. | ||
""" | ||
forecast_type = get_forecast_type(requested_date) | ||
if forecast_type == HISTORY_TYPE: | ||
weather_json, error_text = get_historical_weather(requested_date, | ||
location) | ||
if forecast_type == FORECAST_TYPE: | ||
weather_json, error_text = get_forecast_weather(requested_date, | ||
location) | ||
if forecast_type == HISTORICAL_FORECAST_TYPE: | ||
weather_json, error_text = get_forecast_by_historical_data( | ||
requested_date.day, requested_date.month, location) | ||
if weather_json: | ||
weather_json['ForecastType'] = forecast_type | ||
return weather_json, error_text | ||
|
||
|
||
def get_weather_data(requested_date, location): | ||
""" get weather data for date & location - main function. | ||
Args: | ||
requested_date (date) - date requested for forecast. | ||
location (str) - location name. | ||
Returns: dictionary with the following entries: | ||
Status - success / failure. | ||
ErrorDescription - error description (relevant only in case of error). | ||
MinTempCel - minimum degrees in Celsius. | ||
MaxTempCel - maximum degrees in Celsius. | ||
MinTempFar - minimum degrees in Fahrenheit. | ||
MaxTempFar - maximum degrees in Fahrenheit. | ||
ForecastType: | ||
"forecast" - relevant for the upcoming 15 days. | ||
"history" - historical data. | ||
"historical average" - average of the last 3 years on that date. | ||
relevant for future dates (more then forecast). | ||
Address - The location found by the service. | ||
""" | ||
output = {} | ||
requested_date = datetime.date(requested_date.year, requested_date.month, | ||
requested_date.day) | ||
valid_input, error_text = validate_date_input(requested_date) | ||
if valid_input: | ||
weather_json, error_text = get_forecast(requested_date, location) | ||
if error_text: | ||
output["Status"] = ERROR_STATUS | ||
output["ErrorDescription"] = error_text | ||
else: | ||
output["Status"] = SUCCESS_STATUS | ||
output["ErrorDescription"] = None | ||
output["MinTempFar"] = round((weather_json['MinTempCel'] * 9/5) | ||
+ 32) | ||
output["MaxTempFar"] = round((weather_json['MaxTempCel'] * 9/5) | ||
+ 32) | ||
output.update(weather_json) | ||
else: | ||
output["Status"] = ERROR_STATUS | ||
output["ErrorDescription"] = error_text | ||
return output |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
import datetime | ||
import pytest | ||
import requests | ||
import responses | ||
|
||
from app.internal.weather_forecast import get_weather_data | ||
|
||
|
||
HISTORY_URL = "https://visual-crossing-weather.p.rapidapi.com/history" | ||
FORECAST_URL = "https://visual-crossing-weather.p.rapidapi.com/forecast" | ||
RESPONSE_FROM_MOCK = {"locations": {"Tel Aviv": {"values": [ | ||
{"mint": 6, "maxt": 17.2, "conditions": "Partially cloudy"}]}}} | ||
ERROR_RESPONSE_FROM_MOCK = {"message": "Error Text"} | ||
DATA_GET_WEATHER = [ | ||
pytest.param(2020, "tel aviv", 0, marks=pytest.mark.xfail, | ||
id="invalid input type"), | ||
pytest.param(datetime.datetime(day=4, month=4, year=2070), "tel aviv", 0, | ||
marks=pytest.mark.xfail, id="year out of range"), | ||
pytest.param(datetime.datetime(day=4, month=4, year=2020), | ||
"tel aviv", 0, id="basic historical test"), | ||
pytest.param(datetime.datetime(day=1, month=1, year=2030), "tel aviv", 0, | ||
id="basic historical forecast test - prior in current year"), | ||
pytest.param(datetime.datetime(day=31, month=12, year=2030), | ||
"tel aviv", 0, id="basic historical forecast test - future"), | ||
pytest.param(datetime.datetime(day=29, month=2, year=2024), "tel aviv", | ||
0, id="basic historical forecast test"), | ||
] | ||
|
||
|
||
@pytest.mark.parametrize('requested_date, location, expected', | ||
DATA_GET_WEATHER) | ||
def test_get_weather_data(requested_date, location, expected, requests_mock): | ||
requests_mock.get(HISTORY_URL, json=RESPONSE_FROM_MOCK) | ||
output = get_weather_data(requested_date, location) | ||
assert output['Status'] == expected | ||
|
||
|
||
def test_get_forecast_weather_data(requests_mock): | ||
temp_date = datetime.datetime.now() + datetime.timedelta(days=2) | ||
response_from_mock = RESPONSE_FROM_MOCK | ||
response_from_mock["locations"]["Tel Aviv"]["values"][0]["datetimeStr"] =\ | ||
temp_date.isoformat() | ||
requests_mock.get(FORECAST_URL, json=response_from_mock) | ||
output = get_weather_data(temp_date, "tel aviv") | ||
assert output['Status'] == 0 | ||
|
||
|
||
def test_location_not_found(requests_mock): | ||
requested_date = datetime.datetime(day=10, month=1, year=2020) | ||
requests_mock.get(HISTORY_URL, json=ERROR_RESPONSE_FROM_MOCK) | ||
output = get_weather_data(requested_date, "neo") | ||
assert output['Status'] == -1 | ||
|
||
|
||
@responses.activate | ||
def test_historical_no_response_from_api(): | ||
requested_date = datetime.datetime(day=11, month=1, year=2020) | ||
responses.add(responses.GET, HISTORY_URL, status=500) | ||
requests.get(HISTORY_URL) | ||
output = get_weather_data(requested_date, "neo") | ||
assert output['Status'] == -1 | ||
|
||
|
||
@responses.activate | ||
def test_historical_exception_from_api(): | ||
requested_date = datetime.datetime(day=12, month=1, year=2020) | ||
with pytest.raises(requests.exceptions.ConnectionError): | ||
requests.get(HISTORY_URL) | ||
output = get_weather_data(requested_date, "neo") | ||
assert output['Status'] == -1 | ||
|
||
|
||
@responses.activate | ||
def test_forecast_exception_from_api(): | ||
requested_date = datetime.datetime.now() + datetime.timedelta(days=3) | ||
with pytest.raises(requests.exceptions.ConnectionError): | ||
requests.get(FORECAST_URL) | ||
output = get_weather_data(requested_date, "neo") | ||
assert output['Status'] == -1 |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.