Merge pull request #37 from Mixss/new-weather-api

use new weather api

Author: pcichowski

data/birthdays/famous_people.csv

@@ -8,7 +8,7 @@
 8,1,Elvis Presley,1935,,,,,,
 9,1,Rodrygo,2001,Eric Garcia,2001,,,,
 10,1,Mason Mount,1999,,,,,,
-11,1,Albert Hofmann (odkrywca LSD),,1906,,,,,
+11,1,Albert Hofmann (odkrywca LSD),1906,,,,,,
 12,1,Jeff Bezos,1964,,,,,,
 13,1,Orlando Bloom,1977,,,,,,
 14,1,Gosia Andrzejewicz,1984,,,,,,

logic/advanced_forecast.py

@@ -60,17 +60,21 @@ def graph_rainfall(canvas, hours, rainfall, humidity):
 
 def graph_wind(canvas, hours, wind_speed, wind_gust):
 
-    canvas.plot(hours, wind_speed, linewidth=3.0, color='#4189e8')
-    canvas.hlines(wind_gust, xmin=[i - 0.2 for i, x in enumerate(hours)], xmax=[i + 0.2 for i, x in enumerate(hours)], colors='red', label='Podmuchy wiatru')
+    canvas.plot(hours, [x * 0.539957 for x in wind_speed], linewidth=3.0, color='#4189e8')
+    # canvas.set_ylim(canvas.get_ylim()[0] * 0.539957, canvas.get_ylim()[1] * 0.539957)
+    canvas.hlines([x * 0.539957 for x in wind_gust], xmin=[i - 0.2 for i, x in enumerate(hours)], xmax=[i + 0.2 for i, x in enumerate(hours)], colors='red', label='Podmuchy wiatru')
+
+    # canvas.hlines(wind_gust, xmin=[i - 0.2 for i, x in enumerate(hours)], xmax=[i + 0.2 for i, x in enumerate(hours)], colors='red', label='Podmuchy wiatru')
 
     canvas.margins(x=0.0)
 
-    canvas.set_ylabel('Prędkość wiatru [km/h]')
+    canvas.set_ylabel('Prędkość wiatru [kt]')
 
     secondary_canvas = canvas.twinx()
-    secondary_canvas.plot(hours, [x * 1000 / 3600 for x in wind_speed], linewidth=3.0, color='#4189e8')
-    secondary_canvas.set_ylim(canvas.get_ylim()[0] * 1000 / 3600, canvas.get_ylim()[1] * 1000 / 3600)
-    secondary_canvas.set_ylabel('Prędkość wiatru [m/s]')
+    # secondary_canvas.plot(hours, [x * 1000 / 3600 for x in wind_speed], linewidth=3.0, color='#4189e8')
+    secondary_canvas.hlines([x * 0.539957 for x in wind_gust], xmin=[i - 0.2 for i, x in enumerate(hours)], xmax=[i + 0.2 for i, x in enumerate(hours)], colors='red', label='Podmuchy wiatru')
+    secondary_canvas.set_ylim(canvas.get_ylim()[0], canvas.get_ylim()[1])
+    secondary_canvas.set_ylabel('Porywy wiatru [kt]')
 
     canvas.grid(True)
 

logic/forecast_image.py

@@ -20,7 +20,7 @@
 
 HOUR_VERT_OFFSET = 400
 
-WIND_SPEED_LEFT_OFFSET = 20
+WIND_SPEED_LEFT_OFFSET = -30
 WIND_SPEED_TOP_OFFSET = 340
 
 
@@ -133,10 +133,11 @@ def draw_temperatures(image, temperatures, color, font_size):
 
     counter = 0
     for line_x, temp in zip(lines, temperatures):
+        temp = round(temp)
 
         center_x = line_x + SPACE_BETWEEN_LINES / 2
 
-        text_x = center_x - unicode_font.getsize(str(temp) + "°C")[0] / 2
+        text_x = center_x - unicode_font.getlength(str(temp) + "°C") / 2
 
         if counter < 3:
             draw.text((int(text_x), TEMP_TOP_OFFSET), str(temp) + "°C", font=unicode_font, fill=color)
@@ -222,21 +223,25 @@ def draw_wind(image, wind_speeds, wind_directions, color, text_scale):
         rotated_arrow_image = rotation(resized_arrow_image, direction - 180)
 
         if counter < 3:
-            cv.putText(image, str(speed), (int(text_x) + WIND_SPEED_LEFT_OFFSET, WIND_SPEED_TOP_OFFSET), font,
+            cv.putText(image, str(speed) + ' km/h', (int(text_x) + WIND_SPEED_LEFT_OFFSET, WIND_SPEED_TOP_OFFSET - 20), font,
+                       text_scale, color, 1, bottomLeftOrigin=False, lineType=cv.LINE_AA)
+            cv.putText(image, str(round(speed * 0.539957, 1)) + ' kt', (int(text_x) + WIND_SPEED_LEFT_OFFSET + 5, WIND_SPEED_TOP_OFFSET + 30), font,
                        text_scale, color, 1, bottomLeftOrigin=False, lineType=cv.LINE_AA)
 
             text_y = text_size[1] / 2 + WIND_SPEED_TOP_OFFSET
 
-            overlay_image(image, rotated_arrow_image, int(text_x - 35),
+            overlay_image(image, rotated_arrow_image, int(text_x - 80),
                           int(text_y - rotated_arrow_image.shape[1] / 2 - 20))
         else:
-            cv.putText(image, str(speed), (int(text_x) + WIND_SPEED_LEFT_OFFSET, WIND_SPEED_TOP_OFFSET +
-                                           HOUR_VERT_OFFSET), font, text_scale, color, 1, bottomLeftOrigin=False,
+            cv.putText(image, str(speed) + ' km/h', (int(text_x) + WIND_SPEED_LEFT_OFFSET, WIND_SPEED_TOP_OFFSET +
+                                           HOUR_VERT_OFFSET - 20), font, text_scale, color, 1, bottomLeftOrigin=False,
                        lineType=cv.LINE_AA)
+            cv.putText(image, str(round(speed * 0.539957, 1)) + ' kt', (int(text_x) + WIND_SPEED_LEFT_OFFSET + 5, WIND_SPEED_TOP_OFFSET + HOUR_VERT_OFFSET + 30), font,
+                       text_scale, color, 1, bottomLeftOrigin=False, lineType=cv.LINE_AA)
 
             text_y = text_size[1] / 2 + WIND_SPEED_TOP_OFFSET + HOUR_VERT_OFFSET
 
-            overlay_image(image, rotated_arrow_image, int(text_x - 35),
+            overlay_image(image, rotated_arrow_image, int(text_x - 80),
                           int(text_y - rotated_arrow_image.shape[1] / 2 - 20))
         counter += 1
 
@@ -247,17 +252,17 @@ def generate_forecast_image():
 
     image = np.full((IMAGE_HEIGHT, IMAGE_WIDTH, 3), MAIN_BACKGROUND_COLOR, dtype=np.uint8)
 
-    wind_speeds = wind_speeds[::2]
-    wind_directions = wind_directions[::2]
-    hours = hours[::2]
-    temperatures = temperatures[::2]
-    icons = icons[::2]
+    wind_speeds = wind_speeds[8::2]
+    wind_directions = wind_directions[8::2]
+    hours = hours[8::2]
+    temperatures = temperatures[8::2]
+    icons = icons[8::2]
 
     draw_lines(image)
     draw_hours(image, hours, (191, 188, 186), 1.0)
     image = draw_temperatures(image, temperatures, (221, 218, 216), 86)
     draw_icons(image, icons)
-    draw_wind(image, wind_speeds, wind_directions, (191, 188, 186), 1.3)
+    draw_wind(image, wind_speeds, wind_directions, (191, 188, 186), 1.2)
 
     cv.imwrite("assets/generated_images/image.png", image)
 

logic/logic.py

@@ -154,8 +154,8 @@ def get_day_of_week_capitalized():
 
 def get_sunset_sunrise():
     data = download_forecast(type="daily")
-    sunrise = data["DailyForecasts"][0]["Sun"]["Rise"][11:16]
-    sunset = data["DailyForecasts"][0]["Sun"]["Set"][11:16]
+    sunrise = data['daily']['sunrise'][0][11:16]
+    sunset = data['daily']['sunset'][0][11:16]
 
     return sunrise, sunset
 
@@ -202,49 +202,46 @@ def download_forecast(type='daily'):
         if not Path('data/forecast_daily.json').exists():
             print(f"{datetime.today()}: forecast_daily.json doesn't exist, downloading new one")
             with urllib.request.urlopen(
-                    "http://dataservice.accuweather.com/forecasts/v1/daily/1day/275174?apikey"
-                    "=GZcekJNnnT8F1qo8VJteym6lRa54mH2b&language=pl-pl&details=true&metric=true") as url:
+                    "https://api.open-meteo.com/v1/forecast?latitude=54.3523&longitude=18.6491&daily=sunrise,sunset,uv_index_max&hourly=temperature_2m,rain,wind_speed_10m,wind_direction_10m,relative_humidity_2m,weather_code,apparent_temperature,wind_gusts_10m&timezone=auto&forecast_days=1") as url:
                 data = json.loads(url.read())
                 with open("data/forecast_daily.json", "w") as new_forecast:
                     json.dump(data, new_forecast)
 
         with open("data/forecast_daily.json") as file:
             data = json.load(file)
-        date_of_download = data["DailyForecasts"][0]["Date"][:10]
+        date_of_download = data['hourly']['time'][0][:10]
         todays_date = f"{datetime.today()}"[:10]
 
         if date_of_download != todays_date:
             # forecast data is outdated
             print("Downloading new file: forecast_daily.json")
 
             with urllib.request.urlopen(
-                    "http://dataservice.accuweather.com/forecasts/v1/daily/1day/275174?apikey"
-                    "=GZcekJNnnT8F1qo8VJteym6lRa54mH2b&language=pl-pl&details=true&metric=true") as url:
+                    "https://api.open-meteo.com/v1/forecast?latitude=54.3523&longitude=18.6491&daily=sunrise,sunset,uv_index_max&hourly=temperature_2m,rain,wind_speed_10m,wind_direction_10m,relative_humidity_2m,weather_code,apparent_temperature,wind_gusts_10m&timezone=auto&forecast_days=1") as url:
                 data = json.loads(url.read())
                 with open("data/forecast_daily.json", "w") as new_forecast:
                     json.dump(data, new_forecast)
 
         return data
     if type == 'hourly':
         if not Path('data/forecast_12_hours.json').exists():
-            with urllib.request.urlopen("http://dataservice.accuweather.com/forecasts/v1/hourly/12hour/275174?apikey"
-                                        "=GZcekJNnnT8F1qo8VJteym6lRa54mH2b&language=pl-pl&details=true&metric=true") \
+            with urllib.request.urlopen("https://api.open-meteo.com/v1/forecast?latitude=54.3523&longitude=18.6491&daily=sunrise,sunset,uv_index_max&hourly=temperature_2m,rain,wind_speed_10m,wind_direction_10m,relative_humidity_2m,weather_code,apparent_temperature,wind_gusts_10m&timezone=auto&forecast_days=1") \
                     as url:
                 data = json.loads(url.read())
                 with open("data/forecast_12_hours.json", "w") as new_forecast:
                     json.dump(data, new_forecast)
 
         with open("data/forecast_12_hours.json") as file:
             data = json.load(file)
-        date_of_download = data[0]["DateTime"][:10]
+
+        date_of_download = data['hourly']['time'][0][:10]
         todays_date = f"{datetime.today()}"[:10]
 
         if date_of_download != todays_date:
             # forecast data is outdated
             print("Downloading new file: forecast_12_hours.json")
 
-            with urllib.request.urlopen("http://dataservice.accuweather.com/forecasts/v1/hourly/12hour/275174?apikey"
-                                        "=GZcekJNnnT8F1qo8VJteym6lRa54mH2b&language=pl-pl&details=true&metric=true") \
+            with urllib.request.urlopen("https://api.open-meteo.com/v1/forecast?latitude=54.3523&longitude=18.6491&daily=sunrise,sunset,uv_index_max&hourly=temperature_2m,rain,wind_speed_10m,wind_direction_10m,relative_humidity_2m,weather_code,apparent_temperature,wind_gusts_10m&timezone=auto&forecast_days=1") \
                     as url:
                 data = json.loads(url.read())
                 with open("data/forecast_12_hours.json", "w") as new_forecast:
@@ -258,37 +255,30 @@ def download_forecast(type='daily'):
 def get_daily_forecast():
     data = download_forecast(type='daily')
 
-    headline = data["Headline"]["Text"]
-    minTemp = round(data["DailyForecasts"][0]["Temperature"]["Minimum"]["Value"])
-    maxTemp = round(data["DailyForecasts"][0]["Temperature"]["Maximum"]["Value"])
-    info = data["DailyForecasts"][0]["Day"]["LongPhrase"]
-    rain = data["DailyForecasts"][0]["Day"]["RainProbability"]
-    air = data["DailyForecasts"][0]["AirAndPollen"][0]["Category"]
-    uvindex = data["DailyForecasts"][0]["AirAndPollen"][5]["Value"]
-    uvdanger = data["DailyForecasts"][0]["AirAndPollen"][5]["Category"]
-    try:
-        moon = moon_phases[data["DailyForecasts"][0]["Moon"]["Phase"]]
-    except KeyError:
-        moon = data["DailyForecasts"][0]["Moon"]["Phase"]
+    # headline = data["Headline"]["Text"]
+    # minTemp = round(data["DailyForecasts"][0]["Temperature"]["Minimum"]["Value"])
+    # maxTemp = round(data["DailyForecasts"][0]["Temperature"]["Maximum"]["Value"])
+    # info = data["DailyForecasts"][0]["Day"]["LongPhrase"]
+    # rain = data["DailyForecasts"][0]["Day"]["RainProbability"]
+    # air = data["DailyForecasts"][0]["AirAndPollen"][0]["Category"]
+    # uvindex = data["DailyForecasts"][0]["AirAndPollen"][5]["Value"]
+    # uvdanger = data["DailyForecasts"][0]["AirAndPollen"][5]["Category"]
+    # try:
+    #     moon = moon_phases[data["DailyForecasts"][0]["Moon"]["Phase"]]
+    # except KeyError:
+    #     moon = data["DailyForecasts"][0]["Moon"]["Phase"]
 
     return headline, minTemp, maxTemp, info, rain, air, uvindex, uvdanger, moon
 
 
 def get_hourly_forecast():
     data = download_forecast(type='hourly')
 
-    hours = []
-    temperatures = []
-    icons = []
-    wind_speeds = []
-    wind_directions = []
-
-    for one_hour in data:
-        hours.append(one_hour["DateTime"][11:13])
-        temperatures.append(round(one_hour["Temperature"]["Value"]))
-        icons.append(one_hour["WeatherIcon"])
-        wind_speeds.append(one_hour["Wind"]["Speed"]["Value"])
-        wind_directions.append(one_hour["Wind"]["Direction"]["Degrees"])
+    hours = [h[11:13] for h in data['hourly']['time']]
+    temperatures = [t for t in data['hourly']['temperature_2m']]
+    icons = [i for i in data['hourly']['weather_code']]
+    wind_speeds = [w for w in data['hourly']['wind_speed_10m']]
+    wind_directions = [w for w in data['hourly']['wind_direction_10m']]
 
     return hours, temperatures, icons, wind_speeds, wind_directions
 
@@ -299,24 +289,15 @@ def get_advanced_hourly_forecast():
     # hours, temperature, temperature_feel, rainfall, humidity, wind_speed, wind_gust
 
     forecast = {
-        'hours': [],
-        'temperature': [],
-        'temperature_feel': [],
-        'rainfall': [],
-        'humidity': [],
-        'wind_speed': [],
-        'wind_gust': [],
+        'hours': [h[11:13] for h in data['hourly']['time']],
+        'temperature': [t for t in data['hourly']['temperature_2m']],
+        'temperature_feel': [t for t in data['hourly']['apparent_temperature']],
+        'rainfall': [r for r in data['hourly']['rain']],
+        'humidity': [h for h in data['hourly']['relative_humidity_2m']],
+        'wind_speed': [w for w in data['hourly']['wind_speed_10m']],
+        'wind_gust': [w for w in data['hourly']['wind_gusts_10m']],
     }
 
-    for sample in data:
-        forecast['hours'].append(sample['DateTime'][11:13])
-        forecast['temperature'].append(sample['Temperature']['Value'])
-        forecast['temperature_feel'].append(sample['RealFeelTemperature']['Value'])
-        forecast['rainfall'].append(sample['TotalLiquid']['Value'])
-        forecast['humidity'].append(sample['RelativeHumidity'])
-        forecast['wind_speed'].append(sample['Wind']['Speed']['Value'])
-        forecast['wind_gust'].append(sample['WindGust']['Speed']['Value'])
-
     return forecast
 
 

requirements.txt

@@ -1,11 +1,14 @@
-nextcord
+nextcord~=3.0.1
 
-matplotlib
-numpy
-scipy
+matplotlib~=3.10.0
+numpy~=2.2.2
+scipy~=1.15.1
 
-pillow<=9.5.0
+pillow~=11.1.0
 opencv-python-headless==4.5.5.64
-bs4
-requests
+bs4~=0.0.2
+requests~=2.32.3
 setuptools
+opencv-python
+
+beautifulsoup4~=4.13.3

ui/message_templates.py

@@ -8,7 +8,7 @@
 
 
 async def daily_stats_embed(image_path, our_server=False):
-    _, _, _, _, _, air_quality, uvidex, _, moon_phase = get_daily_forecast()
+    # _, _, _, _, _, air_quality, uvidex, _, moon_phase = get_daily_forecast()
     birthday_message, num_of_birthdays = await get_birthday_message(our_server)
 
     embed = nextcord.Embed(title=f'Statystyki na dzień **{get_today()}** ({get_day_of_week()}):',
@@ -24,10 +24,10 @@ async def daily_stats_embed(image_path, our_server=False):
     embed.add_field(name='🌇 Zachód słońca', value=get_sunset_sunrise()[1] + '\n‎', inline=True)
 
     embed.add_field(name='👫 Imieniny', value=get_today_names() + '\n‎', inline=True)
-    embed.add_field(name='Faza księżyca', value=moon_phase + '\n‎', inline=True)
-
-    embed.add_field(name='😷 Jakość powietrza', value=air_quality + '\n‎', inline=True)
-    embed.add_field(name='😎 Index UV', value=str(uvidex) + '\n‎', inline=True)
+    # embed.add_field(name='Faza księżyca', value=moon_phase + '\n‎', inline=True)
+    #
+    # embed.add_field(name='😷 Jakość powietrza', value=air_quality + '\n‎', inline=True)
+    # embed.add_field(name='😎 Index UV', value=str(uvidex) + '\n‎', inline=True)
 
     embed.add_field(name='⛅ Prognoza pogody', value=' ', inline=False)
 
@@ -120,4 +120,4 @@ def help_message_embed():
                                          'prognozę pogody, ceny walut, paliwa itd\n‎', inline=False)
     embed.add_field(name='/weather', value='Wyświetla aktualną prognozę pogody w Gdańsku w pigułce')
 
-    return embed
+    return embed