weathergrabber 0.0.8b2__tar.gz → 0.0.8b4__tar.gz

{weathergrabber-0.0.8b2/weathergrabber.egg-info → weathergrabber-0.0.8b4}/PKG-INFO

@@ -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 → weathergrabber-0.0.8b4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "weathergrabber"
-version = "0.0.8b2"
+version = "0.0.8b4"
 description = "A grabber for weather.com data with various output formats."
 readme = "README.md"
 requires-python = ">=3.12"

{weathergrabber-0.0.8b2 → weathergrabber-0.0.8b4}/tests/test_cli.py

@@ -1,10 +1,11 @@
+from asyncio import subprocess
 import pytest
 from unittest.mock import patch, MagicMock
 import sys
 
 @pytest.fixture
 def mock_main():
-    with patch('weathergrabber.cli.main') as m:
+    with patch('weathergrabber.cli.weathergrabber.main') as m:
         yield m
 
 def test_cli_location_name(monkeypatch, mock_main):
@@ -73,3 +74,11 @@ def test_cli_location_id_env(monkeypatch, mock_main):
     main_cli()
     args = mock_main.call_args[1]
     assert args["location_id"] == "envlocationid"
+
+def test_cli_log_level(monkeypatch, mock_main):
+    test_args = ["weathergrabber", "Tokyo", "--log", "debug"]
+    monkeypatch.setattr(sys, "argv", test_args)
+    from weathergrabber.cli import main_cli
+    main_cli()
+    args = mock_main.call_args[1]
+    assert args["log_level"] == "debug"

weathergrabber-0.0.8b4/tests/test_cli_version.py

@@ -0,0 +1,13 @@
+import subprocess
+import sys
+import weathergrabber
+
+
+def test_cli_version_flag_prints_version():
+    result = subprocess.run([
+        sys.executable, "-m", "weathergrabber", "-v"
+    ], capture_output=True, text=True)
+    assert result.returncode in (0, 2)
+    output = (result.stdout or "") + (result.stderr or "")
+    assert str(weathergrabber.__version__) in output
+    assert "Weathergrabber" in output

weathergrabber-0.0.8b4/tests/test_main.py

@@ -0,0 +1,11 @@
+import subprocess
+import sys
+
+def test_main_entrypoint():
+    result = subprocess.run(
+        [sys.executable, "-m", "weathergrabber", "--version"],
+        capture_output=True,
+        text=True
+    )
+    assert result.returncode == 0
+    assert "Weathergrabber" in result.stdout

{weathergrabber-0.0.8b2 → weathergrabber-0.0.8b4}/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-0.0.8b2 → weathergrabber-0.0.8b4}/weathergrabber/__main__.py

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

{weathergrabber-0.0.8b2 → weathergrabber-0.0.8b4}/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-0.0.8b2 → weathergrabber-0.0.8b4}/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-0.0.8b2 → weathergrabber-0.0.8b4}/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-0.0.8b2 → weathergrabber-0.0.8b4}/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-0.0.8b2 → weathergrabber-0.0.8b4}/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-0.0.8b4/weathergrabber/domain/color.py

@@ -0,0 +1,55 @@
+import re
+
+class Color:
+
+    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) -> int:
+        return self._red
+    
+    @property
+    def green(self) -> int:
+        return self._green
+    
+    @property
+    def blue(self) -> int:
+        return self._blue
+    
+    @classmethod
+    def from_string(cls,string_value: str) -> "Color":
+
+        color_pattern = r"#([0-9A-Fa-f]{6})"        
+        
+        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}".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-0.0.8b2 → weathergrabber-0.0.8b4}/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-0.0.8b2 → weathergrabber-0.0.8b4}/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-0.0.8b2 → weathergrabber-0.0.8b4}/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-0.0.8b4/weathergrabber/service/extract_aqi_service.py

@@ -0,0 +1,27 @@
+import logging
+from weathergrabber.domain.air_quality_index import AirQualityIndex
+from pyquery import PyQuery
+
+class ExtractAQIService:
+
+    def __init__(self):
+        self.logger = logging.getLogger(__name__)
+        pass
+
+    def execute(self, weather_data: PyQuery) -> AirQualityIndex | None:
+
+        self.logger.debug("Extracting Air Quality Index (AQI)...")
+
+        # '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")
+            
+        air_quality_index = AirQualityIndex.aqi_color_from_string(aqi_data,color_data)
+            
+        self.logger.debug(f"Extracted AQI data: {air_quality_index}")
+            
+        return air_quality_index
+       
+        

weathergrabber-0.0.8b4/weathergrabber/service/extract_hourly_forecast_service.py

@@ -0,0 +1,58 @@
+import logging
+from pyquery import PyQuery
+from weathergrabber.domain.hourly_predictions import HourlyPredictions
+from weathergrabber.domain.weather_icon_enum import WeatherIconEnum
+from weathergrabber.domain.uv_index import UVIndex
+from weathergrabber.domain.precipitation import Precipitation
+from weathergrabber.domain.wind import Wind
+from typing import List
+
+
+class ExtractHourlyForecastService:
+    def __init__(self):
+        self.logger = logging.getLogger(__name__)
+        pass
+
+    def execute(self, weather_data: PyQuery) -> List[HourlyPredictions]:
+        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-0.0.8b4/weathergrabber/service/extract_today_details_service.py

@@ -0,0 +1,80 @@
+import logging
+from pyquery import PyQuery
+from weathergrabber.domain.today_details import TodayDetails
+from weathergrabber.domain.temperature_hight_low import TemperatureHighLow
+from weathergrabber.domain.uv_index import UVIndex
+from weathergrabber.domain.moon_phase import MoonPhase
+from weathergrabber.domain.moon_phase_enum import MoonPhaseEnum
+from weathergrabber.domain.label_value import LabelValue
+from weathergrabber.domain.sunrise_sunset import SunriseSunset
+
+class ExtractTodayDetailsService:
+    def __init__(self):
+        self.logger = logging.getLogger(__name__)
+        pass
+
+    def execute(self, weather_data: PyQuery) -> TodayDetails:
+        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']")
+
+        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'
+
+        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°'
+
+        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%'
+
+        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

{weathergrabber-0.0.8b2 → weathergrabber-0.0.8b4}/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 → weathergrabber-0.0.8b4/weathergrabber.egg-info}/PKG-INFO

@@ -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 → weathergrabber-0.0.8b4}/weathergrabber.egg-info/SOURCES.txt

@@ -2,7 +2,9 @@ LICENSE
 README.md
 pyproject.toml
 tests/test_cli.py
+tests/test_cli_version.py
 tests/test_core.py
+tests/test_main.py
 weathergrabber/__init__.py
 weathergrabber/__main__.py
 weathergrabber/cli.py

weathergrabber-0.0.8b2/weathergrabber/domain/color.py

@@ -1,43 +0,0 @@
-import re
-
-class Color:
-    
-    def __init__(self, red: str, green: str, blue: str):
-        self._red = red
-        self._green = green
-        self._blue = blue
-
-    @property
-    def red(self):
-        return self._red
-    
-    @property
-    def green(self):
-        return self._green
-    
-    @property
-    def blue(self):
-        return self._blue
-    
-    @classmethod
-    def from_string(cls,string_value: str) -> "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)
-    
-    @property
-    def hex(self) -> str:
-        return f"#{self.red:02x}{self.green:02x}{self.blue:02x}"
-    
-    @property
-    def rgb(self) -> str:
-        return f"rgb({self.red}, {self.green}, {self.blue})"
-    
-    def __repr__(self):
-        return f"Color(red='{self.red}', green='{self.green}', blue='{self.blue}')"

weathergrabber-0.0.8b2/weathergrabber/service/extract_aqi_service.py

@@ -1,30 +0,0 @@
-import logging
-from weathergrabber.domain.air_quality_index import AirQualityIndex
-from pyquery import PyQuery
-
-class ExtractAQIService:
-
-    def __init__(self):
-        self.logger = logging.getLogger(__name__)
-        pass
-
-    def execute(self, weather_data: PyQuery) -> AirQualityIndex | None:
-
-        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()
-            
-            # '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)
-            
-            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
-        

weathergrabber-0.0.8b2/weathergrabber/service/extract_hourly_forecast_service.py

@@ -1,64 +0,0 @@
-import logging
-from pyquery import PyQuery
-from weathergrabber.domain.hourly_predictions import HourlyPredictions
-from weathergrabber.domain.weather_icon_enum import WeatherIconEnum
-from weathergrabber.domain.uv_index import UVIndex
-from weathergrabber.domain.precipitation import Precipitation
-from weathergrabber.domain.wind import Wind
-from typing import List
-
-
-class ExtractHourlyForecastService:
-    def __init__(self):
-        self.logger = logging.getLogger(__name__)
-        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

weathergrabber-0.0.8b2/weathergrabber/service/extract_today_details_service.py

@@ -1,85 +0,0 @@
-import logging
-from pyquery import PyQuery
-from weathergrabber.domain.today_details import TodayDetails
-from weathergrabber.domain.temperature_hight_low import TemperatureHighLow
-from weathergrabber.domain.uv_index import UVIndex
-from weathergrabber.domain.moon_phase import MoonPhase
-from weathergrabber.domain.moon_phase_enum import MoonPhaseEnum
-from weathergrabber.domain.label_value import LabelValue
-from weathergrabber.domain.sunrise_sunset import SunriseSunset
-
-class ExtractTodayDetailsService:
-    def __init__(self):
-        self.logger = logging.getLogger(__name__)
-        pass
-
-    def execute(self, weather_data: PyQuery) -> TodayDetails:
-        try:
-            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']")
-
-            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'
-
-            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°'
-
-            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%'
-
-            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