update to use new weather api

since DarkSky is going away, switching to VisualCrossing

Author: w00kie

Makefile

@@ -18,7 +18,6 @@ project-requirements:
 
 requirements: project-requirements
 	pip-compile
-	pip-sync
 
 check-updates:
 	pip-compile -nU | diff requirements.txt -

hotasballs/config.example.yaml

@@ -3,7 +3,7 @@ region: ap-northeast-1
 function_name: hotasballs
 handler: service.handler
 description: Is your city hot as balls?
-runtime: python3.7
+runtime: python3.9
 # role: lambda_basic_execution
 
 # S3 upload requires appropriate role with s3:PutObject permission
@@ -25,6 +25,7 @@ memory_size: 128
 # Experimental Environment variables
 environment_variables:
     DARKSKY_SECRET_KEY:
+    WEATHER_SECRET_KEY:
     HOT_THRESHOLD:
     COLD_THRESHOLD:
     TWITTER_CONSUMER_KEY:

hotasballs/requirements.txt

@@ -1,16 +1,14 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.10
 # To update, run:
 #
 #    pip-compile --no-annotate
 #
-certifi==2019.3.9
-chardet==3.0.4
-idna==2.8
-oauthlib==3.0.1
-pysocks==1.7.0
-requests-oauthlib==1.2.0
-requests==2.22.0
-six==1.12.0
-tweepy==3.7.0
-urllib3==1.25.3
+certifi==2022.6.15
+charset-normalizer==2.0.12
+idna==3.3
+oauthlib==3.2.0
+requests==2.28.0
+requests-oauthlib==1.3.1
+tweepy==4.10.0
+urllib3==1.26.9

hotasballs/service.py

@@ -5,36 +5,37 @@
 import requests
 import tweepy
 
-DARKSKY_SECRET_KEY: str = os.environ.get('DARKSKY_SECRET_KEY')
+WEATHER_SECRET_KEY: str = os.environ.get('WEATHER_SECRET_KEY')
 HOT_THRESHOLD: int = int(os.environ.get('HOT_THRESHOLD', 35))
 COLD_THRESHOLD: int = int(os.environ.get('COLD_THRESHOLD', 28))
 TWITTER_CONSUMER_KEY: str = os.environ.get('TWITTER_CONSUMER_KEY')
 TWITTER_CONSUMER_SECRET: str = os.environ.get('TWITTER_CONSUMER_SECRET')
 
 
 class Weather:
-    '''Get data we're interested in from Darsky forecast json and format it.'''
+    '''Get data we're interested in from weather forecast json and format it.'''
     temperatureHigh: float
     apparentTemperatureHigh: float
     humidity: int
 
     def __init__(self, data: dict) -> None:
-        self.temperatureHigh = round(data['temperatureHigh'], 1)
-        self.apparentTemperatureHigh = round(data['apparentTemperatureHigh'], 1)
-        self.humidity = round(data['humidity'] * 100)
+        self.temperatureHigh = round(data['tempmax'], 1)
+        self.apparentTemperatureHigh = round(data['feelslikemax'], 1)
+        self.humidity = round(data['humidity'])
 
 
-def get_weather(lat: float, lon: float) -> object:
-    '''Call Darksky API and return the weather data we need.'''
-    DARKSKY_URL = f'https://api.darksky.net/forecast/{DARKSKY_SECRET_KEY}/{lat},{lon}'
+def get_weather(lat: float, lon: float, city: str) -> object:
+    '''Call Weather API and return the weather data we need.'''
+    WEATHER_URL = f'https://weather.visualcrossing.com/VisualCrossingWebServices/rest/services/timeline/{city}'
     payload = {
-        'units': 'si',
-        'exclude': 'hourly',
+        'unitGroup': 'metric',
+        'key': WEATHER_SECRET_KEY,
+        'contentType': 'json',
     }
-    forecast = requests.get(DARKSKY_URL, params=payload).json()
+    forecast = requests.get(WEATHER_URL, params=payload).json()
 
     # Only interested in today's forecast
-    today = forecast['daily']['data'][0]
+    today = forecast['days'][0]
 
     return Weather(today)
 
@@ -80,7 +81,7 @@ def handler(event, context):
     access_token: str = event.get('access_token')
     access_token_secret: str = event.get('access_token_secret')
 
-    weather = get_weather(lat, lon)
+    weather = get_weather(lat, lon, city)
 
     message = generate_message(weather, city)
 

requirements.in

@@ -1,5 +1,6 @@
 -r hotasballs/requirements.in
-python-lambda
+pip-tools
+git+https://github.com/Lowess/python-lambda@master#egg=python-lambda
 pylint
 autopep8
 python-dotenv

requirements.txt

@@ -8,18 +8,20 @@ astroid==2.11.6
     # via pylint
 autopep8==1.6.0
     # via -r requirements.in
-boto3==1.24.14
+boto3==1.24.15
     # via python-lambda
-botocore==1.27.14
+botocore==1.27.15
     # via
     #   boto3
     #   s3transfer
 certifi==2022.6.15
     # via requests
 charset-normalizer==2.0.12
     # via requests
-click==6.6
-    # via python-lambda
+click==7.1.2
+    # via
+    #   pip-tools
+    #   python-lambda
 colorama==0.4.5
     # via green
 coverage==6.4.1
@@ -52,6 +54,10 @@ oauthlib==3.2.0
     # via
     #   requests-oauthlib
     #   tweepy
+pep517==0.12.0
+    # via pip-tools
+pip-tools==6.6.2
+    # via -r requirements.in
 platformdirs==2.5.2
     # via pylint
 pycodestyle==2.8.0
@@ -62,7 +68,7 @@ python-dateutil==2.8.2
     # via botocore
 python-dotenv==0.20.0
     # via -r requirements.in
-python-lambda==11.8.0
+python-lambda @ git+https://github.com/Lowess/python-lambda@master
     # via -r requirements.in
 pyyaml==5.1
     # via python-lambda
@@ -86,7 +92,9 @@ six==1.16.0
 toml==0.10.2
     # via autopep8
 tomli==2.0.1
-    # via pylint
+    # via
+    #   pep517
+    #   pylint
 tomlkit==0.11.0
     # via pylint
 tweepy==4.10.0
@@ -97,8 +105,11 @@ urllib3==1.26.9
     # via
     #   botocore
     #   requests
+wheel==0.37.1
+    # via pip-tools
 wrapt==1.14.1
     # via astroid
 
 # The following packages are considered to be unsafe in a requirements file:
+# pip
 # setuptools

test/.env

@@ -1,5 +1,5 @@
 # Fake environment variable for testing
-DARKSKY_SECRET_KEY=darkskysecret
+WEATHER_SECRET_KEY=secretkey
 HOT_THRESHOLD=35
 COLD_THRESHOLD=28
 TWITTER_CONSUMER_KEY=consumerkey

test/test_service.py

@@ -17,48 +17,49 @@ def setUp(self):
             open(Path(__file__).parent / 'weather_data.json', 'r'))
         self.lat = 35.640432
         self.lon = 139.728833
+        self.city = 'Tokyo'
         event_input = {
             'lat': self.lat,
             'lon': self.lon,
-            'city': 'Tokyo',
+            'city': self.city,
             'access_token': 'token',
             'access_token_secret': 'secret',
         }
         event_template = json.load(
-            open(Path(__file__).parent / 'weather_data.json', 'r'))
+            open(Path(__file__).parent / 'cloudwatch_event.json', 'r'))
         self.event = {**event_template, **event_input}
 
     def testTestEnv(self):
         '''Test that we have proper environment variables setup.'''
         self.assertEqual(service.HOT_THRESHOLD, 35)
-        self.assertEqual(service.DARKSKY_SECRET_KEY, 'darkskysecret')
+        self.assertEqual(service.WEATHER_SECRET_KEY, 'secretkey')
 
     def testWeatherGet(self):
-        '''Test that we can grab data from Darksky and format it.'''
+        '''Test that we can grab data from weather API and format it.'''
         with requests_mock.Mocker() as mock:
             mock.get(
-                f"https://api.darksky.net/forecast/{os.getenv('DARKSKY_SECRET_KEY')}/{self.lat},{self.lon}?units=si&exclude=hourly",
+                f"https://weather.visualcrossing.com/VisualCrossingWebServices/rest/services/timeline/{self.city}?unitGroup=metric&key={os.getenv('WEATHER_SECRET_KEY')}&contentType=json",
                 json=self.weather_data
             )
-            weather = service.get_weather(self.lat, self.lon)
-            self.assertEqual(weather.temperatureHigh, 26.4)
-            self.assertEqual(weather.apparentTemperatureHigh, 28.0)
-            self.assertEqual(weather.humidity, 85)
+            weather = service.get_weather(self.lat, self.lon, self.city)
+            self.assertEqual(weather.temperatureHigh, 28.1)
+            self.assertEqual(weather.apparentTemperatureHigh, 29.0)
+            self.assertEqual(weather.humidity, 78)
 
     def testColdMessage(self):
         '''Test message creation when too cold.'''
         w = service.Weather({
-            'temperatureHigh': 23.4,
-            'apparentTemperatureHigh': 24.0,
+            'tempmax': 23.4,
+            'feelslikemax': 24.0,
             'humidity': 85,
         })
         self.assertEqual(service.generate_message(w, 'Tokyo'), None)
 
     def testWarmMessage(self):
         '''Test message creation when just warm.'''
         w = service.Weather({
-            'temperatureHigh': 23.4,
-            'apparentTemperatureHigh': 29.3,
+            'tempmax': 23.4,
+            'feelslikemax': 29.3,
             'humidity': 85,
         })
         message = service.generate_message(w, 'Tokyo')
@@ -68,8 +69,8 @@ def testWarmMessage(self):
     def testHotMessage(self):
         '''Test message creation when it's hot as balls.'''
         w = service.Weather({
-            'temperatureHigh': 35.8,
-            'apparentTemperatureHigh': 36.3,
+            'tempmax': 35.8,
+            'feelslikemax': 36.3,
             'humidity': 85,
         })
         message = service.generate_message(w, 'Tokyo')
@@ -80,8 +81,8 @@ def testHotMessage(self):
     def testHotFeltMessage(self):
         '''Test message creation when it's hot as balls and apparent temp gap.'''
         w = service.Weather({
-            'temperatureHigh': 29.4,
-            'apparentTemperatureHigh': 36.3,
+            'tempmax': 29.4,
+            'feelslikemax': 36.3,
             'humidity': 85,
         })
         message = service.generate_message(w, 'Tokyo')
@@ -94,7 +95,7 @@ def testFullHandler(self, mock_update_status):
         '''Test the full handler including twitter.'''
         with requests_mock.Mocker() as mock:
             mock.get(
-                f"https://api.darksky.net/forecast/{os.getenv('DARKSKY_SECRET_KEY')}/{self.lat},{self.lon}?units=si&exclude=hourly",
+                f"https://weather.visualcrossing.com/VisualCrossingWebServices/rest/services/timeline/{self.city}?unitGroup=metric&key={os.getenv('WEATHER_SECRET_KEY')}&contentType=json",
                 json=self.weather_data
             )
             output = service.handler(self.event, None)