Update app.py

app.py

@@ -2,6 +2,7 @@ import requests
 import structlog
 import openai
 import os
+import io
 import random
 import tiktoken
 import enum
@@ -96,19 +97,15 @@ class Weather:
         return requests.get(url, headers=headers).json()
 
     @cachetools.func.ttl_cache(maxsize=128, ttl=15*60)
-    def get_info(self):
         weather = self.get_weather()
-        curr_hour = None
         next_hour = None
         for hour_data in weather['forecast']['forecastday'][0]["hour"]:
             if abs(hour_data["time_epoch"] - time.time()) < 60 * 60:
-                if curr_hour is None: curr_hour = hour_data
                 next_hour = hour_data
         return {
             "now": weather["current"],
             "day": weather["forecast"]["forecastday"][0]["day"],
-            "curr_hour": curr_hour,
-            "next_hour": next_hour,
+            "hour": next_hour,
         }
 
 
@@ -218,6 +215,47 @@ Do not include specific numbers.'''.replace('\n', ' '))
         # return overlay_text_on_image(img, text, 'bottom-left')
         return img, txt
 
+    def weather_img(self, weather_data):
+        import io
+        # Create a new image with white background
+        image = PIL.Image.new('RGB', (256, 256), (255, 255, 255))
+        draw = PIL.ImageDraw.Draw(image)
+    
+        # Load a font
+        font = PIL.ImageFont.truetype(font_path, 12)
+
+        # Draw text on the image
+        y_text = 5
+        items_to_display = {
+            'Now': {'Temperature': weather_data['now']['temp_f'], 
+                    'Condition': weather_data['now']['condition']['text'], 
+                    'AQI': max(v for c, v in weather_data['now']['air_quality'].items() if c != 'co')}, 
+            'Hour': {'Condition': weather_data['hour']['condition']['text']},
+            'Day': {'High': weather_data['day']['maxtemp_f'], 
+                    'Low': weather_data['day']['mintemp_f'], 
+                    'Condition': weather_data['day']['condition']['text']}, 
+        }
+    
+        for category, values in items_to_display.items():
+            draw.text((5, y_text), category, font=font, fill=(0, 0, 0))
+            y_text += 15
+            for key, value in values.items():
+                text = f"{key}: {value}"
+                draw.text((10, y_text), text, font=font, fill=(0, 0, 0))
+                y_text += 15
+    
+        # Download the weather condition icon for now, day and next hour
+        for index, time in enumerate(items_to_display.keys()):
+            icon_url = "https:" + weather_data[time.lower()]['condition']['icon']
+            response = requests.get(icon_url)
+            icon = PIL.Image.open(io.BytesIO(response.content))
+            # Resize the icon
+            icon = icon.resize((60, 60))
+            # Paste the icon on the image
+            image.paste(icon, (180, index*80))
+    
+        return image
+
     def step(self, zip_code='10001', **kwargs):
         forecast = Weather(zip_code).get_info()
         images, texts = [], []
@@ -229,8 +267,9 @@ Do not include specific numbers.'''.replace('\n', ' '))
                 img, txt = r.result()
                 time, data = runs[r]
                 images.append(overlay_text_on_image(img, time, 'top-right', decode=True))
+                # images.append(overlay_text_on_image(img, '', 'top-right', decode=True))
                 texts.append(txt)
-        return create_collage(*images), *texts
+        return create_collage(*images, self.weather_img(forecast)), *texts
 
 
 # Define Gradio interface