From 05ccd7b59e9bb6b60c5af90c16b6e90e56c6b6c7 Mon Sep 17 00:00:00 2001 From: Jeremy <1524722+jerr0328@users.noreply.github.com> Date: Tue, 29 Jan 2019 10:10:30 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Switch=20to=20Dark=20Sky=20API=20(#?= =?UTF-8?q?8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ✨ Switch to Dark Sky API * ⬆️ Update dependencies --- Pipfile.lock | 88 ++++++++++++++++++++++++++++-------------- index.html | 2 +- isitsnowinginberlin.py | 70 ++++++++------------------------- snowing_test.py | 2 + tomorrow/index.html | 2 +- 5 files changed, 78 insertions(+), 86 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 7d101d2..2b907e9 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "71847a182067db662b637d048d1a453481fbd099f13788744c285918d421fccc" + "sha256": "d318d3d4c6614335258b5b1e1642681a87decacf0a6a62c6e3417bb3d26bbdab" }, "pipfile-spec": 6, "requires": { @@ -10,7 +10,7 @@ "sources": [ { "name": "pypi", - "url": "https://pypi.python.org/simple", + "url": "https://pypi.org/simple", "verify_ssl": true } ] @@ -18,10 +18,10 @@ "default": { "certifi": { "hashes": [ - "sha256:13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7", - "sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0" + "sha256:47f9c83ef4c0c621eaef743f133f09fa8a74a9b75f037e8624f83bd1b6626cb7", + "sha256:993f830721089fef441cdfeb4b2c8c9df86f0c63239f06bd025a76a7daddb033" ], - "version": "==2018.4.16" + "version": "==2018.11.29" }, "chardet": { "hashes": [ @@ -32,18 +32,18 @@ }, "click": { "hashes": [ - "sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d", - "sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b" + "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13", + "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" ], - "version": "==6.7" + "version": "==7.0" }, "flask": { "hashes": [ - "sha256:0749df235e3ff61ac108f69ac178c9770caeaccad2509cb762ce1f65570a8856", - "sha256:49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1" + "sha256:2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48", + "sha256:a080b744b7e345ccfcbc77954861cb05b3c63786e93f2b3875e0913d44b43f05" ], "index": "pypi", - "version": "==0.12.2" + "version": "==1.0.2" }, "flask-redis": { "hashes": [ @@ -55,24 +55,25 @@ }, "gunicorn": { "hashes": [ - "sha256:75af03c99389535f218cc596c7de74df4763803f7b63eb09d77e92b3956b36c6", - "sha256:eee1169f0ca667be05db3351a0960765620dad53f53434262ff8901b68a1b622" + "sha256:aa8e0b40b4157b36a5df5e599f45c9c76d6af43845ba3b3b0efe2c70473c2471", + "sha256:fa2662097c66f920f53f70621c6c58ca4a3c4d3434205e608e121b5b3b71f4f3" ], "index": "pypi", - "version": "==19.7.1" + "version": "==19.9.0" }, "idna": { "hashes": [ - "sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f", - "sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4" + "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", + "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" ], - "version": "==2.6" + "version": "==2.8" }, "itsdangerous": { "hashes": [ - "sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519" + "sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19", + "sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749" ], - "version": "==0.24" + "version": "==1.1.0" }, "jinja2": { "hashes": [ @@ -83,31 +84,58 @@ }, "markupsafe": { "hashes": [ - "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665" + "sha256:048ef924c1623740e70204aa7143ec592504045ae4429b59c30054cb31e3c432", + "sha256:130f844e7f5bdd8e9f3f42e7102ef1d49b2e6fdf0d7526df3f87281a532d8c8b", + "sha256:19f637c2ac5ae9da8bfd98cef74d64b7e1bb8a63038a3505cd182c3fac5eb4d9", + "sha256:1b8a7a87ad1b92bd887568ce54b23565f3fd7018c4180136e1cf412b405a47af", + "sha256:1c25694ca680b6919de53a4bb3bdd0602beafc63ff001fea2f2fc16ec3a11834", + "sha256:1f19ef5d3908110e1e891deefb5586aae1b49a7440db952454b4e281b41620cd", + "sha256:1fa6058938190ebe8290e5cae6c351e14e7bb44505c4a7624555ce57fbbeba0d", + "sha256:31cbb1359e8c25f9f48e156e59e2eaad51cd5242c05ed18a8de6dbe85184e4b7", + "sha256:3e835d8841ae7863f64e40e19477f7eb398674da6a47f09871673742531e6f4b", + "sha256:4e97332c9ce444b0c2c38dd22ddc61c743eb208d916e4265a2a3b575bdccb1d3", + "sha256:525396ee324ee2da82919f2ee9c9e73b012f23e7640131dd1b53a90206a0f09c", + "sha256:52b07fbc32032c21ad4ab060fec137b76eb804c4b9a1c7c7dc562549306afad2", + "sha256:52ccb45e77a1085ec5461cde794e1aa037df79f473cbc69b974e73940655c8d7", + "sha256:5c3fbebd7de20ce93103cb3183b47671f2885307df4a17a0ad56a1dd51273d36", + "sha256:5e5851969aea17660e55f6a3be00037a25b96a9b44d2083651812c99d53b14d1", + "sha256:5edfa27b2d3eefa2210fb2f5d539fbed81722b49f083b2c6566455eb7422fd7e", + "sha256:7d263e5770efddf465a9e31b78362d84d015cc894ca2c131901a4445eaa61ee1", + "sha256:83381342bfc22b3c8c06f2dd93a505413888694302de25add756254beee8449c", + "sha256:857eebb2c1dc60e4219ec8e98dfa19553dae33608237e107db9c6078b1167856", + "sha256:98e439297f78fca3a6169fd330fbe88d78b3bb72f967ad9961bcac0d7fdd1550", + "sha256:bf54103892a83c64db58125b3f2a43df6d2cb2d28889f14c78519394feb41492", + "sha256:d9ac82be533394d341b41d78aca7ed0e0f4ba5a2231602e2f05aa87f25c51672", + "sha256:e982fe07ede9fada6ff6705af70514a52beb1b2c3d25d4e873e82114cf3c5401", + "sha256:edce2ea7f3dfc981c4ddc97add8a61381d9642dc3273737e756517cc03e84dd6", + "sha256:efdc45ef1afc238db84cb4963aa689c0408912a0239b0721cb172b4016eb31d6", + "sha256:f137c02498f8b935892d5c0172560d7ab54bc45039de8805075e19079c639a9c", + "sha256:f82e347a72f955b7017a39708a3667f106e6ad4d10b25f237396a7115d8ed5fd", + "sha256:fb7c206e01ad85ce57feeaaa0bf784b97fa3cad0d4a5737bc5295785f5c613a1" ], - "version": "==1.0" + "version": "==1.1.0" }, "redis": { "hashes": [ - "sha256:8a1900a9f2a0a44ecf6e8b5eb3e967a9909dfed219ad66df094f27f7d6f330fb", - "sha256:a22ca993cea2962dbb588f9f30d0015ac4afcc45bee27d3978c0dbe9e97c6c0f" + "sha256:2100750629beff143b6a200a2ea8e719fcf26420adabb81402895e144c5083cf", + "sha256:8e0bdd2de02e829b6225b25646f9fb9daffea99a252610d040409a6738541f0a" ], - "version": "==2.10.6" + "version": "==3.0.1" }, "requests": { "hashes": [ - "sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b", - "sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e" + "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", + "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" ], "index": "pypi", - "version": "==2.18.4" + "version": "==2.21.0" }, "urllib3": { "hashes": [ - "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b", - "sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f" + "sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39", + "sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22" ], - "version": "==1.22" + "version": "==1.24.1" }, "werkzeug": { "hashes": [ diff --git a/index.html b/index.html index 7805e32..2758fd0 100644 --- a/index.html +++ b/index.html @@ -128,7 +128,7 @@

-
Data updated: {{updateTimestamp}} - using OpenWeatherMap
+
Data updated: {{updateTimestamp}} - Powered by Dark Sky
 
diff --git a/isitsnowinginberlin.py b/isitsnowinginberlin.py index c75151e..f6057f9 100755 --- a/isitsnowinginberlin.py +++ b/isitsnowinginberlin.py @@ -31,12 +31,11 @@ redis_store = FlaskRedis(APP) # Update delay in seconds (10 minutes) UPDATE_DELAY_SECONDS = 600 -OWM_URL = "http://api.openweathermap.org/data/2.5/weather" -OWM_FORECAST_URL = "http://api.openweathermap.org/data/2.5/forecast/daily" -OWM_HEADERS = {'x-api-key': os.getenv('OWMAPIKEY')} -OWM_PAYLOAD = {'id': 2950159} -OWM_FORECAST_PAYLOAD = {'id': 2950159, 'cnt': 2} -KELVIN = 273.15 +DARKSKY_URL = "https://api.darksky.net/forecast/{key}/{coords}".format( + key=os.getenv('DARKSKY_KEY'), coords="52.52,13.37" +) +DARKSKY_PAYLOAD = {'units': 'si', 'exclude': '[minutely,hourly,flags,alerts]'} + logger = logging.getLogger('isitsnowinginberlin') @@ -49,17 +48,8 @@ def save_current_to_redis(wx): pipe.execute() -def save_forecast_to_redis(wx): - wx_str = json.dumps(wx) - with redis_store.pipeline() as pipe: - pipe.set('cached-forecast', wx_str) - pipe.expire('cached-forecast', UPDATE_DELAY_SECONDS) - pipe.set('last-forecast', wx_str) - pipe.execute() - - def update_weather(update_redis=True): - r = requests.get(OWM_URL, params=OWM_PAYLOAD, headers=OWM_HEADERS) + r = requests.get(DARKSKY_URL, params=DARKSKY_PAYLOAD) r.raise_for_status() wx = r.json() if update_redis: @@ -67,15 +57,6 @@ def update_weather(update_redis=True): return wx -def update_forecast(update_redis=True): - r = requests.get(OWM_FORECAST_URL, params=OWM_FORECAST_PAYLOAD, headers=OWM_HEADERS) - r.raise_for_status() - wx = r.json() - if update_redis: - save_forecast_to_redis(wx) - return wx - - def get_weather(key='cached-wx', update_redis=True): cached_str = redis_store.get(key) if cached_str: @@ -86,28 +67,19 @@ def get_weather(key='cached-wx', update_redis=True): return update_weather(update_redis) -def get_forecast(key='cached-forecast', update_redis=True): - cached_str = redis_store.get(key) - if cached_str: - logger.info("Using cached forecast") - return json.loads(cached_str) - else: - logger.info("Need to fetch forecast") - return update_forecast(update_redis) - - def is_snowing(wx): - return any("Snow" in item['main'] for item in wx['weather']) + return wx['currently']['icon'] == 'snow' -def will_snow(forecast): +def will_snow(wx): now = datetime.now() - return any(is_snowing(element) for element in forecast['list'] if now < datetime.fromtimestamp(element['dt'])) + next_forecast = next(data for data in wx['daily']['data'] if now < datetime.fromtimestamp(data['time'])) + return next_forecast['icon'] == 'snow' @APP.route('/api/flushCache') def api_flush_cache(): - redis_store.delete('cached-wx', 'cached-forecast') + redis_store.delete('cached-wx') return flask.jsonify({'success': True}) @@ -121,33 +93,23 @@ def api_raw_weather(): return flask.jsonify(get_weather()) -@APP.route('/api/noUpdate/rawForecast') -def api_raw_forecast_no_update(): - return flask.jsonify(get_forecast('last-forecast', False)) - - -@APP.route('/api/rawForecast') -def api_raw_forecast(): - return flask.jsonify(get_forecast()) - - @APP.route('/api/isSnowing') def api_is_snowing(): wx = get_weather() obj = { 'isSnowing': is_snowing(wx), - 'dataUpdated': wx['dt'], - 'temperature': wx['main']['temp'] - KELVIN + 'dataUpdated': wx['currently']['time'], + 'temperature': wx['currently']['temperature'] } return flask.jsonify(obj) @APP.route('/api/willSnow') def api_will_snow(): - forecast = get_forecast() + wx = get_weather() obj = { - 'willSnow': will_snow(forecast), - 'dataUpdated': forecast['list'][1]['dt'] + 'willSnow': will_snow(wx), + 'dataUpdated': wx['currently']['time'] } return flask.jsonify(obj) diff --git a/snowing_test.py b/snowing_test.py index 6e3271b..d2843b3 100644 --- a/snowing_test.py +++ b/snowing_test.py @@ -3,10 +3,12 @@ # import flask # from isitsnowinginberlin import isitsnowinginberlin + class SnowingTests(unittest.TestCase): def test_truthiness(self): five = 5 self.assertEqual(five, 5) + if __name__ == "__main__": unittest.main() \ No newline at end of file diff --git a/tomorrow/index.html b/tomorrow/index.html index 8061693..bd75356 100644 --- a/tomorrow/index.html +++ b/tomorrow/index.html @@ -29,7 +29,7 @@

-
Forecast for: {{updateTimestamp}} - using OpenWeatherMap
+
Forecast for: {{updateTimestamp}} - Powered by Dark Sky