weathergrabber 0.0.8b2__py3-none-any.whl → 0.0.8b4__py3-none-any.whl

weathergrabber/__init__.py

@@ -4,4 +4,7 @@ from .core import main
 from .cli import main_cli
 
 __all__ = ["main", "main_cli"]
-__version__ = "0.0.8b2"
+__version__ = "0.0.8b4"
+
+def get_version():
+    return __version__

weathergrabber/__main__.py

@@ -1,4 +1,4 @@
-"""weathergrabber CLI entry point."""
 from .cli import main_cli
+
 if __name__ == "__main__":
     main_cli()

weathergrabber/adapter/tty/json_tty.py

@@ -15,5 +15,5 @@ class JsonTTY:
         self.logger.info("Executing JSON output")
         forecast = self.use_case.execute(params)
         output: dict = forecast_to_dict(forecast)
-        output_json = json.dumps(output, indent=4)
+        output_json = json.dumps(output)
         print(output_json)

weathergrabber/adapter/tty/waybar_tty.py

@@ -62,7 +62,7 @@ class WaybarTTY:
 
         #Air quality index
         color = forecast.air_quality_index.color.hex
-        aqi_category = f" <span color=\"{color}\">{forecast.air_quality_index.category}</span>"
+        aqi_category = f" <span color=\"#{color}\">{forecast.air_quality_index.category}</span>"
         aqi_acronym = forecast.air_quality_index.acronym
         aqi_value = forecast.air_quality_index.value
 

weathergrabber/cli.py

@@ -1,6 +1,6 @@
 import argparse
 import os
-from weathergrabber import main
+import weathergrabber
 
 def main_cli():
     ## Get current locale, or use the default one
@@ -11,6 +11,7 @@ def main_cli():
     parser.add_argument("--output", "-o", type=str, choices=['console','json','waybar'], default='console', help="Output format. console, json or waybar")
     parser.add_argument("--keep-open", "-k",action='store_true', default=False, help="Keep open and refreshing every 5 minutes instead of exiting after execution. Does only makes sense for --output=console")
     parser.add_argument("--icons", "-i", type=str, choices=['fa','emoji'], default='emoji', help="Icon set. 'fa' for Font-Awesome, or 'emoji'")
+    parser.add_argument("--version", "-v", action='version', version=f'Weathergrabber {weathergrabber.get_version()}', help="Show version and exit")
     parser.add_argument(
         "--log",
         default="critical",
@@ -25,7 +26,7 @@ def main_cli():
     if not args.location_id and not args.location_name:
         location_id = os.getenv('WEATHER_LOCATION_ID')
 
-    main(
+    weathergrabber.main(
         log_level=args.log,
         location_name = args.location_name,
         location_id = location_id,
@@ -34,6 +35,3 @@ def main_cli():
         keep_open=args.keep_open,
         icons=args.icons
     )
-
-if __name__ == "__main__":
-    main_cli()

weathergrabber/domain/air_quality_index.py

@@ -45,34 +45,32 @@ class AirQualityIndex:
         return f"Title: {self.title}. AQI: {self.value}, Category: {self.category}, Description: {self.description}, Acronym: {self.acronym}, Color: {self.color}"
     
     def __repr__(self) -> str:
-        return f"AirQualityIndex(title={self.title}, value={self.value}, category={self.category}, description={self.description}, acronym:{self.acronym}, color={self.color})"
+        return f"AirQualityIndex(title='{self.title}', value={self.value}, category='{self.category}', description='{self.description}', acronym='{self.acronym}', color='{self.color}')"
     
     @staticmethod
     def _extract_aqi(data: str):
-        parts = data.split('\n')
-        title = parts[0].strip()
-        aqi = int(parts[1].strip())
-        category = parts[2].strip() if len(parts) > 2 else None
-        description = parts[3].strip() if len(parts) > 3 else None
-        acronym = ''.join(word[0].strip().upper() for word in title.split())
+        try:
+            parts = data.split('\n')
+            title = parts[0].strip()
+            aqi = int(parts[1].strip())
+            category = parts[2].strip() if len(parts) > 2 else None
+            description = parts[3].strip() if len(parts) > 3 else None
+            acronym = ''.join(word[0].strip().upper() for word in title.split())
 
-        return title, aqi, category, description, acronym
+            return title, aqi, category, description, acronym
+        except (ValueError, IndexError) as e:
+            raise ValueError("Invalid AQI data format") from e
     
     # 'Air Quality Index\n26\nGood\nAir quality is considered satisfactory, and air pollution poses little or no risk.'
     @classmethod
     def from_string(cls, data: str) -> 'AirQualityIndex':
-        try:
-            title, aqi, category, description, acronym = AirQualityIndex._extract_aqi(data)
-            return cls(title, aqi, category, description, acronym)
-        except (ValueError, IndexError) as e:
-            raise ValueError("Invalid AQI data format") from e
+        title, aqi, category, description, acronym = AirQualityIndex._extract_aqi(data)
+        return cls(title, aqi, category, description, acronym)
         
     @classmethod
     def aqi_color_from_string(cls, aqi_data: str, color_data: str):
-        try:
-            title, aqi, category, description, acronym = AirQualityIndex._extract_aqi(aqi_data)
-            color = Color.from_string(color_data)
-            return cls(title, aqi, category, description, acronym, color)
-        except(ValueError, IndexError) as e:
-            raise ValueError("Invalid AQI data format or color data format") from e
+        title, aqi, category, description, acronym = AirQualityIndex._extract_aqi(aqi_data)
+        color = Color.from_string(color_data)
+        return cls(title, aqi, category, description, acronym, color)
+            
 

weathergrabber/domain/city_location.py

@@ -46,9 +46,12 @@ class CityLocation:
         country, state_province, city, location = None, None, None, None
         parts = data.split(", ")
 
+        if data.strip() == "":
+            raise ValueError("City location string cannot be empty")
+
         if len(parts) > 2:
             i = len(parts) - 1
-            while i > 0:
+            while i >= 0:
                 if not country:
                     country = parts[i]
                 elif not state_province:
@@ -66,6 +69,4 @@ class CityLocation:
             return cls(city=city, state_province=state_province)
         elif len(parts) == 1:
             city = parts[0]
-            return cls(city=city)
-        else:
-            raise ValueError("Invalid city location string format")
+            return cls(city=city)

weathergrabber/domain/color.py

@@ -1,22 +1,29 @@
 import re
 
 class Color:
-    
-    def __init__(self, red: str, green: str, blue: str):
-        self._red = red
-        self._green = green
-        self._blue = blue
+
+    def __init__(self, red: str | int, green: str | int, blue: str | int):
+        self._red = self._int_or_hex(red)
+        self._green = self._int_or_hex(green)
+        self._blue = self._int_or_hex(blue)
+
+    def _int_or_hex(self, value: str | int) -> int:
+        if type(value) == int:
+            if not (0 <= value <= 255):
+                raise ValueError("RGB integer values must be between 0 and 255")
+            return value
+        return int(value, 16)
 
     @property
-    def red(self):
+    def red(self) -> int:
         return self._red
     
     @property
-    def green(self):
+    def green(self) -> int:
         return self._green
     
     @property
-    def blue(self):
+    def blue(self) -> int:
         return self._blue
     
     @classmethod
@@ -24,20 +31,25 @@ class Color:
 
         color_pattern = r"#([0-9A-Fa-f]{6})"        
         
-        match = re.search(color_pattern, string_value)
-        color = f"#{match.group(1)}"
-        hex_color = color.lstrip('#')
-        r, g, b = int(hex_color[:2], 16), int(hex_color[2:4], 16), int(hex_color[4:], 16)
-        
-        return cls(r, g, b)
-    
+        try:
+            match = re.search(color_pattern, string_value)
+            color = f"#{match.group(1)}"
+            hex_color = color.lstrip('#')
+            r, g, b = hex_color[:2], hex_color[2:4], hex_color[4:]
+            return cls(r, g, b)
+        except (AttributeError, ValueError):
+            raise ValueError(f"Invalid color string: {string_value}")
+
     @property
     def hex(self) -> str:
-        return f"#{self.red:02x}{self.green:02x}{self.blue:02x}"
+        return f"{self.red:02x}{self.green:02x}{self.blue:02x}".upper()
     
     @property
     def rgb(self) -> str:
         return f"rgb({self.red}, {self.green}, {self.blue})"
     
+    def __str__(self):
+        return f"{self.hex}"
+    
     def __repr__(self):
         return f"Color(red='{self.red}', green='{self.green}', blue='{self.blue}')"

weathergrabber/domain/health_activities.py

@@ -23,8 +23,8 @@ class HealthActivities:
         return f"HealthActivities(category_name={self._category_name!r}, title={self._title!r}, description={self._description!r})"
     
     # 'Health & Activities\nGrass\nSeasonal Allergies and Pollen Count Forecast\nGrass pollen is low in your area'
-    @staticmethod
-    def from_text(text: str):
+    @classmethod
+    def from_text(cls, text: str):
         try:
             lines = text.split('\n')
             if len(lines) >= 4:
@@ -32,7 +32,7 @@ class HealthActivities:
                 #Ignore the "grass" line
                 title = lines[2].strip()
                 description = ' '.join(line.strip() for line in lines[3:]).strip()
-                return HealthActivities(category_name, title, description)
+                return cls(category_name, title, description)
             else:
                 raise ValueError("Insufficient data to parse HealthActivities")
         except Exception as e:

weathergrabber/domain/moon_phase_enum.py

@@ -8,9 +8,9 @@ class MoonPhaseEnum(Enum):
     PHASE_2 = ("phase-2", "\uf186", "🌒")
     PHASE_3 = ("phase-3", "\uf186", "🌒")
     PHASE_4 = ("phase-4", "\uf186", "🌒")
-    PHASE_5 = ("phase-5", "\uf186", "🌒")
-    PHASE_6 = ("phase-6", "\uf186", "🌒")
     # First Quarter
+    PHASE_5 = ("phase-5", "\uf186", "🌓")
+    PHASE_6 = ("phase-6", "\uf186", "🌓")
     PHASE_7 = ("phase-7", "\uf186", "🌓")
     # Waxing Gibbous
     PHASE_8 = ("phase-8", "\uf186", "🌔")
@@ -21,8 +21,8 @@ class MoonPhaseEnum(Enum):
     PHASE_13 = ("phase-13", "\uf186", "🌕")
     # Full Moon
     PHASE_14 = ("phase-14", "\uf186", "🌕")
-    # Waning Gibbous
     PHASE_15 = ("phase-15", "\uf186", "🌕")
+    # Waning Gibbous
     PHASE_16 = ("phase-16", "\uf186", "🌖")
     PHASE_17 = ("phase-17", "\uf186", "🌖")
     PHASE_18 = ("phase-18", "\uf186", "🌖")
@@ -30,10 +30,10 @@ class MoonPhaseEnum(Enum):
     PHASE_20 = ("phase-20", "\uf186", "🌖")
     # Last Quarter
     PHASE_21 = ("phase-21", "\uf186", "🌗")
-    # Waning Crescent
-    PHASE_22 = ("phase-22", "\uf186", "🌘")
-    PHASE_23 = ("phase-23", "\uf186", "🌘")
-    PHASE_24 = ("phase-24", "\uf186", "🌘")
+    PHASE_22 = ("phase-22", "\uf186", "🌗")
+    PHASE_23 = ("phase-23", "\uf186", "🌗")
+    PHASE_24 = ("phase-24", "\uf186", "🌗")
+    
     PHASE_25 = ("phase-25", "\uf186", "🌘")
     PHASE_26 = ("phase-26", "\uf186", "🌘")
     PHASE_27 = ("phase-27", "\uf186", "🌘")

weathergrabber/domain/uv_index.py

@@ -24,6 +24,8 @@ class UVIndex:
 
     @classmethod
     def from_string(cls, data: str, label: str = None) -> 'UVIndex':
+        if not data:
+            raise ValueError("UV Index string cannot be empty")
         parts = data.split(' ')
         if len(parts) == 1:
             return cls(string_value = data, index= parts[0].strip(), of="", label=label)
@@ -31,7 +33,7 @@ class UVIndex:
             index, of, some = parts
             return cls(string_value = data, index=index.strip(), of=some.strip(), label=label)
         else:
-            raise ValueError(f"Cannot parse UV Index from string: {data}")
+            return cls(string_value = data, index="", of="", label=label)
     
     def __repr__(self) -> str:
         return f"UVIndex(string_value={self.string_value!r}, index={self.index!r}, of={self.of!r}, label={self.label!r})"
@@ -39,5 +41,5 @@ class UVIndex:
     def __str__(self) -> str:
         if self.string_value:
             return f"{self.label} {self.string_value}"
-        elif self.index and self.of:
+        else:
             return f"{self.label} {self.index} {self.of}" if self.label else f"{self.index} {self.of}"

weathergrabber/service/extract_aqi_service.py

@@ -12,19 +12,16 @@ class ExtractAQIService:
 
         self.logger.debug("Extracting Air Quality Index (AQI)...")
 
-        try:
-            # 'Air Quality Index\n27\nGood\nAir quality is considered satisfactory, and air pollution poses little or no risk.\nSee Details\nInfo'
-            aqi_data = weather_data("section[data-testid='AirQualityModule']").text()
+        # 'Air Quality Index\n27\nGood\nAir quality is considered satisfactory, and air pollution poses little or no risk.\nSee Details\nInfo'
+        aqi_data = weather_data("section[data-testid='AirQualityModule']").text()
             
-            # 'stroke-width:5;stroke-dasharray:10.021680564951442 172.78759594743863;stroke:#00E838'
-            color_data = weather_data("section[data-testid='AirQualityModule'] svg[data-testid='DonutChart'] circle:nth-of-type(2)").attr("style")
+        # 'stroke-width:5;stroke-dasharray:10.021680564951442 172.78759594743863;stroke:#00E838'
+        color_data = weather_data("section[data-testid='AirQualityModule'] svg[data-testid='DonutChart'] circle:nth-of-type(2)").attr("style")
             
-            air_quality_index = AirQualityIndex.aqi_color_from_string(aqi_data,color_data)
+        air_quality_index = AirQualityIndex.aqi_color_from_string(aqi_data,color_data)
             
-            self.logger.debug(f"Extracted AQI data: {air_quality_index}")
+        self.logger.debug(f"Extracted AQI data: {air_quality_index}")
             
-            return air_quality_index
-        except Exception as e:
-            self.logger.error(f"Error extracting AQI data: {e}")
-            raise ValueError("Could not extract AQI data") from e
+        return air_quality_index
+       
         

weathergrabber/service/extract_hourly_forecast_service.py

@@ -14,51 +14,45 @@ class ExtractHourlyForecastService:
         pass
 
     def execute(self, weather_data: PyQuery) -> List[HourlyPredictions]:
-        try:
-            self.logger.debug("Extracting hourly forecast...")
-
-            data = weather_data.find("section[data-testid='HourlyForecast'] div[class*='Card'] details")
-
-            if len(data) == 0:
-                raise ValueError("Unable to extract hourly forecast")
-
-            details = [ { 
-                "title": PyQuery(item).find("h2").text(),
-                "temperature" : PyQuery(item).find("div[data-testid='detailsTemperature']").text(),
-                "icon" : PyQuery(item).find("svg[class*='DetailsSummary']").attr("name"),
-                "summary" : PyQuery(item).find("span[class*='DetailsSummary--wxPhrase']").text(),
-                "precip-percentage": PyQuery(item).find("div[data-testid='Precip'] span[data-testid='PercentageValue']").text(),
-                "wind": PyQuery(item).find("span[data-testid='WindTitle']").next().eq(0).text(),
-                "feels-like" : PyQuery(item).find("span[data-testid='FeelsLikeTitle']").next().text(),
-                "humidity" : PyQuery(item).find("span[data-testid='HumidityTitle']").next().text(),
-                "uv-index" : PyQuery(item).find("span[data-testid='UVIndexValue']").text(),
-                "cloud-cover" : PyQuery(item).find("span[data-testid='CloudCoverTitle']").next().text(),
-                "rain-amount" : PyQuery(item).find("span[data-testid='AccumulationTitle']").next().text()
-            } for item in data ]
-
-            self.logger.debug("Extracted %s register(s)...",len(details))
-
-            hourly_forecasts = [HourlyPredictions(
-                title=item["title"],
-                temperature=item["temperature"],
-                icon=WeatherIconEnum.from_name(item["icon"]),
-                summary=item["summary"],
-                precipitation=Precipitation(
-                    percentage=item["precip-percentage"],
-                    amount=item["rain-amount"]
-                ),
-                wind=Wind.from_string(item["wind"]),
-                feels_like=item["feels-like"],
-                humidity=item["humidity"],
-                uv_index=UVIndex.from_string(item["uv-index"]),
-                cloud_cover=item["cloud-cover"]
-            ) for item in details]
-
-            self.logger.debug("Created hourly forecast list with %s registers", len(hourly_forecasts))
-
-            return hourly_forecasts
-
-
-        except Exception as e:
-            self.logger.error(f"Error extracting hourly forecast: {e}")
-            raise ValueError("Could not extract hourly forecast.") from e
+        self.logger.debug("Extracting hourly forecast...")
+
+        data = weather_data.find("section[data-testid='HourlyForecast'] div[class*='Card'] details")
+
+        if len(data) == 0:
+            raise ValueError("There's no hourly forecast data available.")
+
+        details = [ { 
+            "title": PyQuery(item).find("h2").text(),
+            "temperature" : PyQuery(item).find("div[data-testid='detailsTemperature']").text(),
+            "icon" : PyQuery(item).find("svg[class*='DetailsSummary']").attr("name"),
+            "summary" : PyQuery(item).find("span[class*='DetailsSummary--wxPhrase']").text(),
+            "precip-percentage": PyQuery(item).find("div[data-testid='Precip'] span[data-testid='PercentageValue']").text(),
+            "wind": PyQuery(item).find("span[data-testid='WindTitle']").next().eq(0).text(),
+            "feels-like" : PyQuery(item).find("span[data-testid='FeelsLikeTitle']").next().text(),
+            "humidity" : PyQuery(item).find("span[data-testid='HumidityTitle']").next().text(),
+            "uv-index" : PyQuery(item).find("span[data-testid='UVIndexValue']").text(),
+            "cloud-cover" : PyQuery(item).find("span[data-testid='CloudCoverTitle']").next().text(),
+            "rain-amount" : PyQuery(item).find("span[data-testid='AccumulationTitle']").next().text()
+        } for item in data ]
+
+        self.logger.debug("Extracted %s register(s)...",len(details))
+
+        hourly_forecasts = [HourlyPredictions(
+            title=item["title"],
+            temperature=item["temperature"],
+            icon=WeatherIconEnum.from_name(item["icon"]),
+            summary=item["summary"],
+            precipitation=Precipitation(
+                percentage=item["precip-percentage"],
+                amount=item["rain-amount"]
+            ),
+            wind=Wind.from_string(item["wind"]),
+            feels_like=item["feels-like"],
+            humidity=item["humidity"],
+            uv_index=UVIndex.from_string(item["uv-index"]),
+            cloud_cover=item["cloud-cover"]
+        ) for item in details]
+
+        self.logger.debug("Created hourly forecast list with %s registers", len(hourly_forecasts))
+
+        return hourly_forecasts

weathergrabber/service/extract_today_details_service.py

@@ -14,72 +14,67 @@ class ExtractTodayDetailsService:
         pass
 
     def execute(self, weather_data: PyQuery) -> TodayDetails:
-        try:
-            self.logger.debug("Extracting today's details...")
+        self.logger.debug("Extracting today's details...")
 
-            today_details_data = weather_data.find("div#todayDetails")
-            feelslike = PyQuery(today_details_data).find("div[data-testid='FeelsLikeSection'] span")
-            sunrise_sunset = PyQuery(today_details_data).find("div[data-testid='sunriseSunsetContainer'] div p[class*='TwcSunChart']")
+        today_details_data = weather_data.find("div#todayDetails")
+        feelslike = PyQuery(today_details_data).find("div[data-testid='FeelsLikeSection'] span")
+        sunrise_sunset = PyQuery(today_details_data).find("div[data-testid='sunriseSunsetContainer'] div p[class*='TwcSunChart']")
 
-            feelslike_label = feelslike.eq(0).text()  #'Feels Like'
-            feelslike_value = feelslike.eq(1).text()  #'60°'
+        feelslike_label = feelslike.eq(0).text()  #'Feels Like'
+        feelslike_value = feelslike.eq(1).text()  #'60°'
 
-            sunrise = sunrise_sunset.eq(0).text()  #'6:12 AM'
-            sunset = sunrise_sunset.eq(1).text()  #'7:45 PM'
+        sunrise = sunrise_sunset.eq(0).text()  #'6:12 AM'
+        sunset = sunrise_sunset.eq(1).text()  #'7:45 PM'
 
-            icons = today_details_data.find('svg[class*="WeatherDetailsListItem--icon"]')
-            labels = today_details_data.find('div[class*="WeatherDetailsListItem--label"]')
-            values = today_details_data.find('div[data-testid="wxData"]')
+        icons = today_details_data.find('svg[class*="WeatherDetailsListItem--icon"]')
+        labels = today_details_data.find('div[class*="WeatherDetailsListItem--label"]')
+        values = today_details_data.find('div[data-testid="wxData"]')
 
-            self.logger.debug(f"Parsing today details values...")
-            high_low_label = labels.eq(0).text()  #'High / Low'
-            high_low_value = values.eq(0).text() #'--/54°'
+        self.logger.debug(f"Parsing today details values...")
+        high_low_label = labels.eq(0).text()  #'High / Low'
+        high_low_value = values.eq(0).text() #'--/54°'
 
-            wind_label = labels.eq(1).text()  #'Wind'
-            wind_value = values.eq(1).text()  #'7\xa0mph'
+        wind_label = labels.eq(1).text()  #'Wind'
+        wind_value = values.eq(1).text()  #'7\xa0mph'
 
-            humidity_label = labels.eq(2).text()  #'Humidity'
-            humidity_value = values.eq(2).text()  #'100%'
+        humidity_label = labels.eq(2).text()  #'Humidity'
+        humidity_value = values.eq(2).text()  #'100%'
 
-            dew_point_label = labels.eq(3).text()  #'Dew Point'
-            dew_point_value = values.eq(3).text()  #'60°'
+        dew_point_label = labels.eq(3).text()  #'Dew Point'
+        dew_point_value = values.eq(3).text()  #'60°'
             
-            pressure_label = labels.eq(4).text()  #'Pressure'
-            pressure_value = values.eq(4).text()  #'30.31\xa0in'
-
-            uv_index_label = labels.eq(5).text()  #'UV Index'
-            uv_index_value = values.eq(5).text()  #'5 of 10'
-
-            visibility_label = labels.eq(6).text()  #'Visibility'
-            visibility_value = values.eq(6).text()  #'10.0 mi'
-
-            moon_phase_label = labels.eq(7).text()  #'Moon Phase'
-            moon_phase_icon = icons.eq(7).attr('name')  #'phase-2'
-            moon_phase_value = values.eq(7).text()  #'Waxing Crescent'
-
-            self.logger.debug(f"Creating domain objects for today details...")
-
-            sunrise_sunset = SunriseSunset(sunrise=sunrise, sunset=sunset)
-            high_low = TemperatureHighLow.from_string(high_low_value, label=high_low_label)
-            uv_index = UVIndex.from_string(uv_index_value, label=uv_index_label)
-            moon_phase = MoonPhase(MoonPhaseEnum.from_name(moon_phase_icon), moon_phase_value, moon_phase_label)
-
-            today_details = TodayDetails(
-                feelslike=LabelValue(label=feelslike_label, value=feelslike_value),
-                sunrise_sunset=sunrise_sunset,
-                high_low=high_low,
-                wind=LabelValue(label=wind_label, value=wind_value),
-                humidity=LabelValue(label=humidity_label, value=humidity_value),
-                dew_point=LabelValue(label=dew_point_label, value=dew_point_value),
-                pressure=LabelValue(label=pressure_label, value=pressure_value),
-                uv_index=uv_index,
-                visibility=LabelValue(label=visibility_label, value=visibility_value),
-                moon_phase=moon_phase
-            )
-
-            self.logger.debug(f"Extracted today's details: {today_details}")
-            return today_details
-
-        except Exception as e:
-            self.logger.error(f"Error extracting today's details: {e}")
-            raise ValueError("Could not extract today's details.") from e
+        pressure_label = labels.eq(4).text()  #'Pressure'
+        pressure_value = values.eq(4).text()  #'30.31\xa0in'
+
+        uv_index_label = labels.eq(5).text()  #'UV Index'
+        uv_index_value = values.eq(5).text()  #'5 of 10'
+
+        visibility_label = labels.eq(6).text()  #'Visibility'
+        visibility_value = values.eq(6).text()  #'10.0 mi'
+
+        moon_phase_label = labels.eq(7).text()  #'Moon Phase'
+        moon_phase_icon = icons.eq(7).attr('name')  #'phase-2'
+        moon_phase_value = values.eq(7).text()  #'Waxing Crescent'
+
+        self.logger.debug(f"Creating domain objects for today details...")
+
+        sunrise_sunset = SunriseSunset(sunrise=sunrise, sunset=sunset)
+        high_low = TemperatureHighLow.from_string(high_low_value, label=high_low_label)
+        uv_index = UVIndex.from_string(uv_index_value, label=uv_index_label)
+        moon_phase = MoonPhase(MoonPhaseEnum.from_name(moon_phase_icon), moon_phase_value, moon_phase_label)
+
+        today_details = TodayDetails(
+            feelslike=LabelValue(label=feelslike_label, value=feelslike_value),
+            sunrise_sunset=sunrise_sunset,
+            high_low=high_low,
+            wind=LabelValue(label=wind_label, value=wind_value),
+            humidity=LabelValue(label=humidity_label, value=humidity_value),
+            dew_point=LabelValue(label=dew_point_label, value=dew_point_value),
+            pressure=LabelValue(label=pressure_label, value=pressure_value),
+            uv_index=uv_index,
+            visibility=LabelValue(label=visibility_label, value=visibility_value),
+            moon_phase=moon_phase
+        )
+
+        self.logger.debug(f"Extracted today's details: {today_details}")
+        return today_details

weathergrabber/usecase/use_case.py

@@ -57,16 +57,16 @@ class UseCase:
         health_activities = self.extract_health_activities_service.execute(weather_data)
         
         try:
-            hourly_predictions = self.extract_hourly_forecast_service.execute(weather_data)
-        except ValueError:
-            self.logger.warning("Falling back to old style hourly forecast extraction")
             hourly_predictions = self.extract_hourly_forecast_oldstyle_service.execute(weather_data)
-        
-        try:
-            daily_predictions = self.extract_daily_forecast_service.execute(weather_data)
         except ValueError:
-            self.logger.warning("Falling back to old style daily forecast extraction")
+            self.logger.warning("Falling back to new style hourly forecast extraction")
+            hourly_predictions = self.extract_hourly_forecast_service.execute(weather_data)
+
+        try:
             daily_predictions = self.extract_daily_forecast_oldstyle_service.execute(weather_data)
+        except ValueError:
+            self.logger.warning("Falling back to new style daily forecast extraction")
+            daily_predictions = self.extract_daily_forecast_service.execute(weather_data)
 
         forecast = Forecast(
             search = Search(

{weathergrabber-0.0.8b2.dist-info → weathergrabber-0.0.8b4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weathergrabber
-Version: 0.0.8b2
+Version: 0.0.8b4
 Summary: A grabber for weather.com data with various output formats.
 Author-email: Carlos Anselmo Mendes Junior <cjuniorfox@gmail.com>
 License: MIT

{weathergrabber-0.0.8b2.dist-info → weathergrabber-0.0.8b4.dist-info}/RECORD

@@ -1,32 +1,32 @@
-weathergrabber/__init__.py,sha256=Fz2isfYK8Ge58jAn1cCUV1qLN1qDNdlKlKjsNOeCRco,175
-weathergrabber/__main__.py,sha256=K10wQv3-LSRD_FRLHWphdSs3OAcuzIb4sQaKmj7Fql0,105
-weathergrabber/cli.py,sha256=YOWoVLfwktgqK1bp89GUKkAEKyMM4DaNL4akBi6xVVk,1979
+weathergrabber/__init__.py,sha256=zluMrDBKUQsyNxzMD46YlM7Dl5CLzgFXzkbWD4-tYjs,218
+weathergrabber/__main__.py,sha256=yYL-jc4kVHqaYVADzjKZfmCN2mziRofsXgnzrECbGDo,68
+weathergrabber/cli.py,sha256=GA1EVClwfHOImM0TEfkTlYOgZU9bzscKg_0HL-Y9TBc,2090
 weathergrabber/core.py,sha256=TiZ2utmYKf9lkIXWv8YBfSdiHZXJZXuHS8B-dBDvevw,1138
 weathergrabber/weathergrabber_application.py,sha256=2JfZAR94En3rmGrYKWRKxdRXmK_ikhJdgrGotFjtDys,3987
 weathergrabber/adapter/client/weather_api.py,sha256=9S7JmXaAVvvPY60dz6rC3lx7X68BcqyvNzvSVM1-af8,963
 weathergrabber/adapter/client/weather_search_api.py,sha256=1oy7JitHcmwkkhFlD0eIt5A7a4cGbf7LMNi26tR8z5o,1724
 weathergrabber/adapter/tty/console_tty.py,sha256=7Ih0DwRyEfaYM4tfCMHhyHo-ti97u-OmZ36ANwEAu5I,5953
-weathergrabber/adapter/tty/json_tty.py,sha256=ZRZSfVhFYsb8AXD1qjb1GBpaRMxHGNaMXW5VN8AvdaU,647
-weathergrabber/adapter/tty/waybar_tty.py,sha256=wRvqT63ubb8Zz0YxeJM_mhOiJE0USK4Y5NquFf_V1qw,6136
-weathergrabber/domain/air_quality_index.py,sha256=eH1glUdedtbRCZMcw5_zB5ybJQUcyY-EBMxL8vVJ6zA,2791
-weathergrabber/domain/city_location.py,sha256=GHzFMvOhks7iQkWgR0mS-L21uAb_tlNycvfrdY-itzc,2362
-weathergrabber/domain/color.py,sha256=dkWZnQ2BjXUV8qTfZnmNGng_cqKtKuDdekYw4R2NJ9U,1080
+weathergrabber/adapter/tty/json_tty.py,sha256=GyUc13w_5cjFLJda65Xt4e87gYGJow1dYnkY3ZmcmP8,637
+weathergrabber/adapter/tty/waybar_tty.py,sha256=SJtqdvxmt2lIpjwP29x7lS32KcakYMLCaztApO8L7wM,6137
+weathergrabber/domain/air_quality_index.py,sha256=8uBqxVIKCYIvrHuP-XbCHjYZhq7Z0RmqkgAAdCw6Tp4,2680
+weathergrabber/domain/city_location.py,sha256=p-11c7AwA8t-nNdvTjl9-Oc5Kw4D2XP7tI4WrATVYpQ,2382
+weathergrabber/domain/color.py,sha256=HfgB5CwxrSHT05TIXCqVCy0GoRpuEl99aUrUSJhaqcE,1601
 weathergrabber/domain/current_conditions.py,sha256=S14j2lL_gc2pds0wbl5M4_72PbVdubOuX8lnE_tZVTg,1477
 weathergrabber/domain/daily_predictions.py,sha256=8pzmaU-yugS2Hx_6MBWAk24wlSISe1OQIRrCK_lfvbw,1618
 weathergrabber/domain/day_night.py,sha256=7geOuVH9xDb1ecLKnZmj6eqp3H3kp9G0YY497cEyPtg,1442
 weathergrabber/domain/forecast.py,sha256=CO0VTdMI0kjuwbpwwDNRCf_82oNtw5QkN-9GgobPet8,2399
-weathergrabber/domain/health_activities.py,sha256=wCG82-lBfrnIwxptgnMZt-fXHJsBnIl4YLpoeFOmC48,1490
+weathergrabber/domain/health_activities.py,sha256=oaIF_nI-iaN4OIHWTL-L7QZUQxCemdmNvzprDXysK-g,1481
 weathergrabber/domain/hourly_predictions.py,sha256=PFiGuo7mBoQHLR-bDirV--R126YAOzkwIHgaeRGFQSA,2179
 weathergrabber/domain/label_value.py,sha256=LvrvZbSrcEUUpxvKAmYkFnpDFWsa6LFmGA9O8i6HB84,446
 weathergrabber/domain/moon_phase.py,sha256=sEHRi8yPIHTzaEcOkz556uNYsKLq4YmYa5qDncSX44c,587
-weathergrabber/domain/moon_phase_enum.py,sha256=5NUySSwDr4k5n2aMrNDc9YYmKAbb6zycFO2w1z1SwxQ,2091
+weathergrabber/domain/moon_phase_enum.py,sha256=unHTHWKXrYNyRrUbRqI-7KsXWUSYPnd7PeL23-cyiew,2074
 weathergrabber/domain/precipitation.py,sha256=eXrpwMOsEJWGqV4bEBhN9niWYXalgdZRLG4-I39JZ2A,466
 weathergrabber/domain/search.py,sha256=j3BzskyPl0hDWV02XTOC4tJonV5RHxr5Rop_rYMKUtA,387
 weathergrabber/domain/sunrise_sunset.py,sha256=wNTk01NIuLbQ7gN_giAFv4f3FaRx9khul-mj19g57vE,1207
 weathergrabber/domain/temperature_hight_low.py,sha256=PQOJ5uDtfMRBR5yMxXA46xuorJC08jva2C0-WAV5yxs,909
 weathergrabber/domain/timestamp.py,sha256=Bk6f8Tx0-yNitYmEKIWHnqh_ALDwxEHrhoCRSrfvYTU,1222
 weathergrabber/domain/today_details.py,sha256=EUlV7xerYw5QhEsBfvO5m6-9Ghm4nPkXJz9zCmSYTbA,2398
-weathergrabber/domain/uv_index.py,sha256=lNdk38Jq-A9msuzOLjIKrZIHUc2C9J8V4MA7HU3s1ZM,1420
+weathergrabber/domain/uv_index.py,sha256=7XalamfjJdVSqo4x7G4JVf_HJtrPJxO1BpbvmAfBhnw,1481
 weathergrabber/domain/weather_icon_enum.py,sha256=oY-V6qIHjJjUE0baTkrECFwL0VSe4IYte-aR53zl_ew,3901
 weathergrabber/domain/wind.py,sha256=wTDz3X1rYsnw_eNoDi1miwaomxwhiJkY_q6xrdZtLak,789
 weathergrabber/domain/adapter/icon_enum.py,sha256=YxGYS5vBRV2AiAfeuPOdqaQOHixAssiMbOzQnTmdSBg,84
@@ -52,21 +52,21 @@ weathergrabber/domain/adapter/mapper/today_details_mapper.py,sha256=y9F5b3IQXIvb
 weathergrabber/domain/adapter/mapper/uv_index_mapper.py,sha256=K3AdRnAPv1Yqudc3eKcw_EBQidNPbHbLcG4lYrQvOOw,230
 weathergrabber/domain/adapter/mapper/weather_icon_enum_mapper.py,sha256=YC7juvt38Ehtb3Y-iQFM77s1EQAv4qNHd6vGOqws6HI,249
 weathergrabber/domain/adapter/mapper/wind_mapper.py,sha256=nXyYwqTvLLMyKtSey27GaGvBV8xVhB_Y3HU0sbmIe_E,149
-weathergrabber/service/extract_aqi_service.py,sha256=IT3S9zZmThdqPtJDBF_G8LDUNlwUYoBh49z_WUlB-tk,1285
+weathergrabber/service/extract_aqi_service.py,sha256=WKxNvZoLRE-_vmTMR4efWNrowkc8cfo28fVRJ1XmQ1c,1090
 weathergrabber/service/extract_current_conditions_service.py,sha256=R4rd-_53HOQ7YqhHdfI_gKrIy27scYkNEmLgqS23f40,1838
 weathergrabber/service/extract_daily_forecast_oldstyle_service.py,sha256=DiKfaGbMnIIBnxI-IYG8HmfLHNAW5AGew5NjFSMqBk4,2190
 weathergrabber/service/extract_daily_forecast_service.py,sha256=ZN61_neEAdn7RPedLvmmFKH7Pq1EQGhG9A9Dy8o09zM,2709
 weathergrabber/service/extract_health_activities_service.py,sha256=2qJ4tEEz5uV6EwHUIFhWM8zol_BbDW3omEohf8kDg3M,1014
 weathergrabber/service/extract_hourly_forecast_oldstyle_service.py,sha256=U5O2tG9YF8wrUUoTimDr7oqMIb670j9oeVjoIpCKKLs,2100
-weathergrabber/service/extract_hourly_forecast_service.py,sha256=MhVweMlvJNQjPdVqw0AAvni3f8TVTq_0PD76NDUUQHM,3079
+weathergrabber/service/extract_hourly_forecast_service.py,sha256=KFsl6G6FAmGtkski3lj31VIhs6guP0BxVZTGQSHk8Do,2757
 weathergrabber/service/extract_temperature_service.py,sha256=46nRO3Izj1QmG4BNTh8flsODsovHyWPzZzOnkl1Gbj4,634
-weathergrabber/service/extract_today_details_service.py,sha256=QAwF7EzVaL1STGNDyxve9r7oQTjvNKhYQ53d_68lbKA,4126
+weathergrabber/service/extract_today_details_service.py,sha256=VBsyv-W9y52fXbutb9ETI04zCpJrxJzXBHmKoHTCb80,3743
 weathergrabber/service/read_weather_service.py,sha256=7_B8E9IN1KCwOhpuS5PfWazI1sCrDyYrZhkV2R38bhc,649
 weathergrabber/service/search_location_service.py,sha256=tZmVgO45hjwoa4cl5bKPjMBmYlGxJiH_I9Ymb5pwEwU,1422
-weathergrabber/usecase/use_case.py,sha256=K2RBIEi7S0ixAM6oDKmCPYkuJ9azatxle8zAqX0xM1E,4635
-weathergrabber-0.0.8b2.dist-info/licenses/LICENSE,sha256=X5JFljoqN43yFwpMLudQ9rtty4K_FeZfnz3v8Yhw23Q,1067
-weathergrabber-0.0.8b2.dist-info/METADATA,sha256=GPhdo6t_JisDkKPSjkbIa7h4iMTx9R84Zzxn8gvL5kw,5801
-weathergrabber-0.0.8b2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-weathergrabber-0.0.8b2.dist-info/entry_points.txt,sha256=m2P9a4mrJDTzuNaiTU438NA60GxCfaw7VKvruWw43N8,63
-weathergrabber-0.0.8b2.dist-info/top_level.txt,sha256=P3NMDJJYRIvQujf994Vb4gZrobkKWkL2gh3NF_ajQWM,15
-weathergrabber-0.0.8b2.dist-info/RECORD,,
+weathergrabber/usecase/use_case.py,sha256=OM36GtGlzotgRJqSu_3kaM3F3WaSQsUs90DMHQdWPsk,4627
+weathergrabber-0.0.8b4.dist-info/licenses/LICENSE,sha256=X5JFljoqN43yFwpMLudQ9rtty4K_FeZfnz3v8Yhw23Q,1067
+weathergrabber-0.0.8b4.dist-info/METADATA,sha256=XbMK4_xR4lNo79Hy-YFiQe78KXtpkj20FXiknIQZC9A,5801
+weathergrabber-0.0.8b4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+weathergrabber-0.0.8b4.dist-info/entry_points.txt,sha256=m2P9a4mrJDTzuNaiTU438NA60GxCfaw7VKvruWw43N8,63
+weathergrabber-0.0.8b4.dist-info/top_level.txt,sha256=P3NMDJJYRIvQujf994Vb4gZrobkKWkL2gh3NF_ajQWM,15
+weathergrabber-0.0.8b4.dist-info/RECORD,,