Update app.py

app.py

@@ -20,6 +20,7 @@ import gradio as gr
 import cachetools.func
 from huggingface_hub import hf_hub_download
 import concurrent.futures
+import geopy
 
 
 logger = structlog.getLogger()
@@ -31,6 +32,11 @@ art_styles = [x.strip() for x in open('art_styles.txt').readlines()]
 font_path = hf_hub_download("ybelkada/fonts", "Arial.TTF")
 
 
+@cachetools.cached(cache={})
+def get_lat_long(zip):
+    loc = geopy.Nominatim(user_agent='weatherboy-gpt').geocode(str(zip))
+    return loc.latitude, loc.longitude
+
 
 class Chat:
     class Model(enum.Enum):
@@ -91,23 +97,42 @@ class Weather:
         self.zip_code = zip_code
         self.api_key = api_key
 
+    @cachetools.func.ttl_cache(maxsize=128, ttl=15*60)
     def get_weather(self):
-        url = f"https://api.weatherapi.com/v1/forecast.json?q={self.zip_code}&days=1&lang=en&aqi=yes&key={self.api_key}"
+        lat, long = get_lat_long(self.zip_code)
+        url = f"https://forecast.weather.gov/MapClick.php?lat={lat:.2f}&lon={long:.2f}&unit=0&lg=english&FcstType=json"
         headers = {'accept': 'application/json'}
         return requests.get(url, headers=headers).json()
 
-    @cachetools.func.ttl_cache(maxsize=128, ttl=15*60)
     def get_info(self):
-        weather = self.get_weather()
-        next_hour = None
-        for hour_data in weather['forecast']['forecastday'][0]["hour"]:
-            if abs(hour_data["time_epoch"] - time.time()) < 60 * 60:
-                next_hour = hour_data
-        return {
-            "now": weather["current"],
-            "day": weather["forecast"]["forecastday"][0]["day"],
-            "hour": next_hour,
+        data = self.get_weather()
+        new_data = {}
+        new_data['now'] = data['currentobservation']
+    
+        # The 'time' and 'data' keys seem to have hourly/daily data
+        # Assuming the first entry in these lists is for the current hour
+        new_data['hour'] = {
+            'time': data['time']['startValidTime'][0],
+            'tempLabel': data['time']['tempLabel'][0],
+            'temperature': data['data']['temperature'][0],
+            'pop': data['data']['pop'][0],
+            'weather': data['data']['weather'][0],
+            'iconLink': data['data']['iconLink'][0],
+            'text': data['data']['text'][0],
         }
+    
+        # And the rest of the 'time' and 'data' lists are for the rest of the day
+        new_data['day'] = {
+            'time': data['time']['startValidTime'][1:],
+            'tempLabel': data['time']['tempLabel'][1:],
+            'temperature': data['data']['temperature'][1:],
+            'pop': data['data']['pop'][1:],
+            'weather': data['data']['weather'][1:],
+            'iconLink': data['data']['iconLink'][1:],
+            'text': data['data']['text'][1:],
+        }
+    
+        return new_data
 
 
 class Image:
@@ -228,13 +253,13 @@ Do not include specific numbers.'''.replace('\n', ' '))
         # 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']}, 
+            'now': {'Temperature': weather_data['now']['Temp'], 
+                    'Condition': weather_data['now']['Weather'],}, 
+            'hour': {'Temperature': weather_data['hour']['temperature'], 
+                    'Condition': weather_data['hour']['weather']},
+            'day': {'High': max(weather_data['day']['temperature']), 
+                    'Low': min(weather_data['day']['temperature']), 
+                    'Condition': weather_data['day']['weather'][0]}, 
         }
     
         for category, values in items_to_display.items():
@@ -247,14 +272,20 @@ Do not include specific numbers.'''.replace('\n', ' '))
     
         # 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']
+            if time == 'day':
+                icon_url = weather_data['day']['iconLink'][0]
+            elif time == 'now':
+                icon_url = 'https://forecast.weather.gov/newimages/medium/'+weather_data['now']['Weatherimage']
+            else:
+                icon_url = weather_data[time]['iconLink']
+            print(time, icon_url)
             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))
-    
+            image.paste(icon, (index*70 + 10, 190))
+
         return image
 
     def step(self, zip_code='10001', **kwargs):
@@ -263,6 +294,7 @@ Do not include specific numbers.'''.replace('\n', ' '))
         with concurrent.futures.ThreadPoolExecutor(max_workers=4) as e:
             runs = {}
             for time, data in forecast.items():
+                if time == 'etc': continue
                 runs[e.submit(self.step_one_forecast, data, **kwargs)] = time, data
             for r in concurrent.futures.as_completed(runs.keys()):
                 img, txt = r.result()
@@ -270,7 +302,7 @@ Do not include specific numbers.'''.replace('\n', ' '))
                 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, self.weather_img(forecast)), *texts, str(forecast)
+        return create_collage(*images, self.weather_img(forecast)), *texts
 
 
 # Define Gradio interface