v0.65.8: Added Download Weather Data

Author: Nazchanel

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "umd-api" 
-version = "0.65.7"
+version = "0.65.8"
 description = "A package for accessing the UMD API in Python"
 readme = "README.md"
 authors = [

umd_api/__init__.py

@@ -1,14 +1,20 @@
+# umd.io
 from .general.base_api import _BaseAPI
 from .general.bus import Bus        
 from .general.courses import Courses 
 from .general.majors import Majors   
 from .general.map import Map         
 from .general.professors import Professors 
 
+# PlanetTerp
 from .planet_terp.base_api import _BaseAPI
 from .planet_terp.courses import Courses
 from .planet_terp.professors import Professors
 from .planet_terp.grades import Grades
 from .planet_terp.search import Search
 
-__all__ = ["Bus", "Courses", "Majors", "Map", "Professors", "Grades", "Search"]
+# Self-Implemented weather.umd.edu
+from .weather.forecast import Forecast
+from .weather.weather import Weather
+
+__all__ = ["Bus", "Courses", "Majors", "Map", "Professors", "Grades", "Search", "Weather", "Forecast"]

umd_api/weather/forecast.py

@@ -2,79 +2,103 @@
 import re
 from bs4 import BeautifulSoup
 
-class Forecast():
+class Forecast:
+    BASE_URL = "https://weather.umd.edu/"
 
     def get_hourly_forecast(self):
+        """Fetches the hourly weather forecast for the next five hours."""
         hourly_forecast = []
-        url = "https://weather.umd.edu/"
-
-        response = requests.get(url)
-        soup = BeautifulSoup(response.text, 'html.parser')
-        a = soup.find('div', id="umdwx_weeklyfcst_widget-9")
-
-        for day in a.find_all('div', class_='fcst_day')[:5]:
-            time = day.find('div', class_='fcst_txt-day').text.strip()
-            temp = day.find('div', class_='fcst_txt-temp')
-            wind = day.find('div', class_='fcst_txt-wind')
-            
-            temp =  temp.text.replace('\u2009', ' ').replace('F', ' ').strip()
-
-            wind = re.sub(r'[^\x00-\x7F]+', '', wind.text)
-
-            wind = wind.replace('mph', '').strip()
-            
-            hour, period = time.split()
-
-            hour = int(hour)
-            
-            if period == 'PM' and hour != 12:
-                hour += 12
-            elif period == 'AM' and hour == 12:
-                hour = 0
-
-            time = hour
-
-            
-            if time and temp and wind:
-                hourly_forecast.append({
-                    'time': time,
-                    'temperature': temp,
-                    'wind': wind
-                })
-        return hourly_forecast
+        soup = self._fetch_soup()
+
+        forecast_div = soup.find('div', id="umdwx_weeklyfcst_widget-9")
+        if not forecast_div:
+            raise ValueError("Hourly forecast data not found on the page.")
 
-    def get_weekly_forecast(self):  
-        url = "https://weather.umd.edu/"
+        for day in forecast_div.find_all('div', class_='fcst_day')[:5]:
+            forecast = self._parse_hourly_forecast(day)
+            if forecast:
+                hourly_forecast.append(forecast)
 
-        response = requests.get(url)
-        soup = BeautifulSoup(response.text, 'html.parser')
+        return hourly_forecast
 
-        a = soup.find('div', id="umdwx_weeklyfcst_widget-9")
-    
+    def get_weekly_forecast(self):
+        """Fetches the weekly weather forecast."""
         weekly_forecast = []
-        weekly_forecast_start = 5  # Skip first part for weekly forecast
-        for day in a.find_all('div', class_='fcst_day')[weekly_forecast_start:]:
-            day_name = day.find('div', class_='fcst_txt-day')
-            temp_range = day.find('div', class_='fcst_txt-temp')
-            
-            if day_name and temp_range:
-                # Fix Thursday typo in website
-                if day_name.text == 'Thi':
-                    day_name = 'Thu'
-                else:
-                    day_name = day_name.text
-
-                # Extract high and low temperatures
-                temp_values = temp_range.text.split(' / ')  # Split by the separator
-                if len(temp_values) == 2:  # Ensure we have both high and low values
-                    high_temp = temp_values[0].replace('\u2009', ' ').strip()  # Remove narrow space
-                    low_temp = temp_values[1].replace('\u2009', ' ').strip()  # Remove narrow space
-                    high_temp = temp_values[0].replace('F', ' ').strip()
-                    low_temp = temp_values[1].replace('F', ' ').strip()
-                    weekly_forecast.append({
-                        'day': day_name,
-                        'high': high_temp,
-                        'low': low_temp
-                    })
+        soup = self._fetch_soup()
+
+        forecast_div = soup.find('div', id="umdwx_weeklyfcst_widget-9")
+        if not forecast_div:
+            raise ValueError("Weekly forecast data not found on the page.")
+
+        for day in forecast_div.find_all('div', class_='fcst_day')[5:]:
+            forecast = self._parse_weekly_forecast(day)
+            if forecast:
+                weekly_forecast.append(forecast)
 
         return weekly_forecast
+
+    def _fetch_soup(self):
+        """Fetches the HTML content and returns a BeautifulSoup object."""
+        response = requests.get(self.BASE_URL)
+        response.raise_for_status()  # Raise an error for bad responses
+        return BeautifulSoup(response.text, 'html.parser')
+
+    def _parse_hourly_forecast(self, day):
+        """Parses the hourly forecast data from a single day element."""
+        time = day.find('div', class_='fcst_txt-day').text.strip()
+        temp_div = day.find('div', class_='fcst_txt-temp')
+        wind_div = day.find('div', class_='fcst_txt-wind')
+
+        if temp_div and wind_div:
+            temp = self._clean_temperature(temp_div.text)
+            wind = self._clean_wind_speed(wind_div.text)
+
+            hour, period = self._convert_time_to_24_hour_format(time)
+            return {'time': hour, 'temperature': temp, 'wind': wind}
+
+        return None
+
+    def _parse_weekly_forecast(self, day):
+        """Parses the weekly forecast data from a single day element."""
+        day_name_div = day.find('div', class_='fcst_txt-day')
+        temp_range_div = day.find('div', class_='fcst_txt-temp')
+
+        if day_name_div and temp_range_div:
+            day_name = self._fix_day_name(day_name_div.text)
+            high_temp, low_temp = self._extract_temperatures(temp_range_div.text)
+            return {'day': day_name, 'high': high_temp, 'low': low_temp}
+
+        return None
+
+    def _clean_temperature(self, temp_text):
+        """Cleans and formats the temperature text."""
+        return temp_text.replace('\u2009', ' ').replace('F', '').strip()
+
+    def _clean_wind_speed(self, wind_text):
+        """Cleans and formats the wind speed text."""
+        return re.sub(r'[^\x00-\x7F]+', '', wind_text).replace('mph', '').strip()
+
+    def _convert_time_to_24_hour_format(self, time_text):
+        """Converts the 12-hour format time to 24-hour format."""
+        hour, period = time_text.split()
+        hour = int(hour)
+
+        if period == 'PM' and hour != 12:
+            hour += 12
+        elif period == 'AM' and hour == 12:
+            hour = 0
+
+        return hour, period
+
+    def _fix_day_name(self, day_name):
+        """Fixes specific typos in day names."""
+        return 'Thu' if day_name == 'Thi' else day_name
+
+    def _extract_temperatures(self, temp_range_text):
+        """Extracts high and low temperatures from the temperature range text."""
+        temp_values = temp_range_text.split(' / ')
+        if len(temp_values) == 2:
+            high_temp = self._clean_temperature(temp_values[0])
+            low_temp = self._clean_temperature(temp_values[1])
+            return high_temp, low_temp
+        return None, None