weathergrabber 0.0.7a4__tar.gz → 0.0.8a2__tar.gz

{weathergrabber-0.0.7a4/weathergrabber.egg-info → weathergrabber-0.0.8a2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weathergrabber
-Version: 0.0.7a4
+Version: 0.0.8a2
 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.7a4 → weathergrabber-0.0.8a2}/pyproject.toml

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

{weathergrabber-0.0.7a4 → weathergrabber-0.0.8a2}/weathergrabber/__init__.py

@@ -4,4 +4,4 @@ from .core import main
 from .cli import main_cli
 
 __all__ = ["main", "main_cli"]
-__version__ = "0.0.7a4"
+__version__ = "0.0.8a2"

{weathergrabber-0.0.7a4 → weathergrabber-0.0.8a2}/weathergrabber/adapter/tty/console_tty.py

@@ -21,8 +21,7 @@ class ConsoleTTY:
 
         rain_icon = WeatherIconEnum.RAIN.fa_icon if is_fa else WeatherIconEnum.RAIN.emoji_icon
 
-        city = forecast.current_conditions.location.city
-        state_province = forecast.current_conditions.location.state_province
+        city_location = forecast.current_conditions.location
         icon = forecast.current_conditions.icon.fa_icon if is_fa else forecast.current_conditions.icon.emoji_icon
         temperature = forecast.current_conditions.temperature
         
@@ -62,18 +61,48 @@ class ConsoleTTY:
         aqi_acronym = forecast.air_quality_index.acronym
         aqi_value = forecast.air_quality_index.value
 
+        hourly_predictions_format = [
+            {
+                'title': h.title if len(h.title) < 8 else h.title[:6] + '.',
+                'temperature' : h.temperature,
+                'icon': h.icon.fa_icon if is_fa else h.icon.emoji_icon,
+                'precipitation': f"{h.precipitation.percentage if h.precipitation.percentage else ''}"
+            } for h in forecast.hourly_predictions
+        ]
+
+        daily_predictions_format = [
+            {
+                'title': d.title if len(d.title) < 8 else d.title[:6] + '.',
+                'high_low': f"{d.high_low}",
+                'icon': d.icon.fa_icon if is_fa else d.icon.emoji_icon,
+                'precipitation': f"{d.precipitation.percentage}"
+            } for d in forecast.daily_predictions
+        ]
+
+        # Hourly predictions and daily predictions
         hourly_predictions = [
-            f"{h.title}\t{h.temperature}\t{h.icon.fa_icon if is_fa else h.icon.emoji_icon}\t{rain_icon  if h.precipitation.percentage else ''}  {h.precipitation.percentage}"
-            for h in forecast.hourly_predictions
+                f"{h['title']}"
+                f"{'\t' if len(h['title']) < 3 else ''}\t"
+                f"{h['temperature']}"
+                "\t"
+                f"{h['icon']}\t"
+                f"{rain_icon}  {h['precipitation']}"
+            for h in hourly_predictions_format
         ]
+
         daily_predictions = [
-            f"{d.title}\t{d.high_low}\t{d.icon.fa_icon if is_fa else d.icon.emoji_icon}\t{rain_icon}  {d.precipitation.percentage}"
-            for d in forecast.daily_predictions
+                f"{d['title']}"
+                f"{'\t' if len(d['title']) < 3 else ''}\t"
+                f"{d['high_low']}"
+                f"\t"
+                f"{d['icon']}\t"
+                f"{rain_icon}  {d['precipitation']}"
+            for d in daily_predictions_format
         ]
 
         print_value = (
             "\n"
-            f"{city}, {state_province}\n"
+            f"{city_location}\n"
             "\n"
             f"{icon}       {temperature}\n"
             "\n"
@@ -84,9 +113,11 @@ class ConsoleTTY:
             "\n"
             f"{moon_icon} {moon_phase}\n"
             "\n"
-            f"{wind_icon} {wind}\t {uv_index}\n"
-            f"{humidity_icon} {humidity}\t\t {pressure}\n"
-            f"{visibility_icon} {visibility}\t {aqi_acronym} {aqi_category} {aqi_value}\n"
+            f"{wind_icon} {wind}\t{uv_index}\n"
+            f"{humidity_icon} {humidity}\t\t{pressure}\n"
+            f"{visibility_icon} {visibility}"
+            f"\t{'\t' if len(visibility) < 6 else ''}" 
+            f"{aqi_acronym} {aqi_category} {aqi_value}\n"
             "\n"
             f"{'\n'.join(hourly_predictions)}\n"
             "\n"

{weathergrabber-0.0.7a4 → weathergrabber-0.0.8a2}/weathergrabber/adapter/tty/waybar_tty.py

@@ -21,10 +21,11 @@ class WaybarTTY:
         # Forecast icon and temperature
         icon = forecast.current_conditions.icon.fa_icon if is_fa else forecast.current_conditions.icon.emoji_icon
         temperature = forecast.current_conditions.temperature
+        rain_icon = WeatherIconEnum.RAIN.fa_icon if is_fa else WeatherIconEnum.RAIN.emoji_icon
+
 
         # City and state/province
-        city = forecast.current_conditions.location.city
-        state_province = forecast.current_conditions.location.state_province
+        city_location = forecast.current_conditions.location
 
         # Summary
         summary = forecast.current_conditions.summary
@@ -65,19 +66,45 @@ class WaybarTTY:
         aqi_acronym = forecast.air_quality_index.acronym
         aqi_value = forecast.air_quality_index.value
 
+        hourly_predictions_format = [{
+            'title': h.title if len(h.title) < 10 else h.title[:9] + '.',
+            'temperature' : h.temperature,
+            'icon': h.icon.fa_icon if is_fa else h.icon.emoji_icon,
+            'precipitation': f"{h.precipitation.percentage if h.precipitation.percentage else ''}"
+        } for h in forecast.hourly_predictions]
+
+        daily_predictions_format = [
+            {
+                'title': d.title if len(d.title) < 10 else d.title[:9] + '.',
+                'high_low': f"{d.high_low.high}/<span size='small'>{d.high_low.low}</span>",
+                'icon': d.icon.fa_icon if is_fa else d.icon.emoji_icon,
+                'precipitation': f"{d.precipitation.percentage}"
+            } for d in forecast.daily_predictions
+        ]
+
         # Hourly predictions and daily predictions
-        rain_icon = WeatherIconEnum.RAIN.fa_icon if is_fa else WeatherIconEnum.RAIN.emoji_icon
         hourly_predictions = [
-            f"{h.title}{'\t' if len(h.title) < 5 else ''}\t{h.temperature}\t\t{h.icon.fa_icon if is_fa else h.icon.emoji_icon}\t{rain_icon  if h.precipitation.percentage else ''}  {h.precipitation.percentage}"
-            for h in forecast.hourly_predictions
+                f"{h['title']}"
+                f"{'\t\t' if len(h['title']) < 4 else '\t'}"
+                f"{h['temperature']}"
+                "\t\t"
+                f"{h['icon']}\t"
+                f"{rain_icon} {h['precipitation']}"
+            for h in hourly_predictions_format
         ]
+
         daily_predictions = [
-            f"{d.title}{'\t' if len(d.title) < 5 else ''}\t{d.high_low.high}/<span size='small'>{d.high_low.low}</span>\t{'\t' if len(d.title) < 5 else ''}{d.icon.fa_icon if is_fa else d.icon.emoji_icon}\t{rain_icon}  {d.precipitation.percentage}"
-            for d in forecast.daily_predictions
+                f"{d['title']}"
+                f"\t{'\t' if len(d['title']) < 6 else ' '}"
+                f"{d['high_low']}"
+                f"\t{'\t' if len(d['high_low']) < 6 else ''}"
+                f"{d['icon']}\t"
+                f"{rain_icon} {d['precipitation']}"
+            for d in daily_predictions_format
         ]
 
         tooltip = (
-            f"{city}, {state_province}\n"
+            f"{city_location}\n"
             "\n"
             f"<span size='xx-large'>{icon}\t\t{temperature}</span>\n"
             "\n"
@@ -89,9 +116,9 @@ class WaybarTTY:
             "\n"
             f"{moon_icon} {moon_phase}\n"
             "\n"
-            f"{wind_icon} {wind}\t {uv_index}\n"
-            f"{humidity_icon} {humidity}\t\t {pressure}\n"
-            f"{visibility_icon} {visibility}\t {aqi_acronym} {aqi_category} {aqi_value}\n"
+            f"{wind_icon} {wind}\t\t{uv_index}\n"
+            f"{humidity_icon} {humidity}\t\t{pressure}\n"
+            f"{visibility_icon} {visibility}\t{aqi_acronym} {aqi_category} {aqi_value}\n"
             "\n"
             f"{'\n'.join(hourly_predictions)}\n"
             "\n"

weathergrabber-0.0.8a2/weathergrabber/domain/city_location.py

@@ -0,0 +1,71 @@
+class CityLocation:
+
+    def __init__(self, city: str, state_province: str = None, country: str = None, location = None):
+        self._city = city
+        self._state_province = state_province
+        self._country = country
+        self._location = location
+
+    @property
+    def city(self) -> str:
+        return self._city
+    
+    @property
+    def state_province(self) -> str:
+        return self._state_province
+    
+    @property
+    def country(self) -> str:
+        return self._country
+    
+    @property
+    def location(self):
+        return self._location
+    
+    def __repr__(self):
+        return f"CityLocation(city={self.city}, state_province={self.state_province}, country={self.country}, location={self.location})"
+    
+    def __str__(self):
+        parts = []
+        if self.location:
+            parts.append(self.location)
+        if self.city:
+            parts.append(self.city)
+        if self.state_province:
+            parts.append(self.state_province)
+        if self.country:
+            parts.append(self.country)
+        return ", ".join(parts) if parts else "Unknown Location"
+
+    @classmethod
+    def from_string(cls, data: str) -> "CityLocation":
+        #'Nova Friburgo, Rio de Janeiro, Brazil'
+        #'Macuco, Santos, São Paulo, Brésil'
+        #'New York, NY, USA'
+        #'Tokyo, Tokyo Prefecture, Japan'
+        country, state_province, city, location = None, None, None, None
+        parts = data.split(", ")
+
+        if len(parts) > 2:
+            i = len(parts) - 1
+            while i > 0:
+                if not country:
+                    country = parts[i]
+                elif not state_province:
+                    state_province = parts[i]
+                elif not city:
+                    city = parts[i]
+                i -= 1
+            # Location is the first registry. If it's different from city, use it.
+            if city != parts[0]:
+                location = parts[0]
+            return cls(city=city, state_province=state_province, country=country, location=location)
+        
+        if len(parts) == 2:
+            city, state_province = parts
+            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")

{weathergrabber-0.0.7a4 → weathergrabber-0.0.8a2}/weathergrabber/domain/moon_phase_enum.py

@@ -18,12 +18,12 @@ class MoonPhaseEnum(Enum):
     PHASE_10 = ("phase-10", "\uf186", "🌔")
     PHASE_11 = ("phase-11", "\uf186", "🌔")
     PHASE_12 = ("phase-12", "\uf186", "🌔")
-    PHASE_13 = ("phase-13", "\uf186", "🌔")
+    PHASE_13 = ("phase-13", "\uf186", "🌕")
     # Full Moon
     PHASE_14 = ("phase-14", "\uf186", "🌕")
     # Waning Gibbous
-    PHASE_15 = ("phase-15", "\uf186", "🌖")
-    PHASE_16 = ("phase-16", "\uf186", "🌖")
+    PHASE_15 = ("phase-15", "\uf186", "🌕")
+    PHASE_16 = ("phase-16", "\uf186", "🌕")
     PHASE_17 = ("phase-17", "\uf186", "🌖")
     PHASE_18 = ("phase-18", "\uf186", "🌖")
     PHASE_19 = ("phase-19", "\uf186", "🌖")

{weathergrabber-0.0.7a4 → weathergrabber-0.0.8a2}/weathergrabber/domain/weather_icon_enum.py

@@ -11,6 +11,7 @@ class WeatherIconEnum(Enum):
     FEEL = ('feel', '\uf2c9', '🥵')
     FOGGY = ('foggy', '\uf74e', '🌫️')
     HUMIDITY = ('humidity', '\uf043', '💧')
+    ISOLATED_THUNDERSTORMS = ('isolated-thunderstorms', chr(0x26C8), '⛈️')
     MOSTLY_CLEAR_DAY = ('mostly-clear-day', chr(0xF0599), '☀️')
     MOSTLY_CLEAR_NIGHT = ('mostly-clear-night', chr(0xF0594), '🌙')
     MOSTLY_CLOUDY_DAY = ('mostly-cloudy-day', chr(0xf013), '☁️')

weathergrabber-0.0.8a2/weathergrabber/service/extract_current_conditions_service.py

@@ -0,0 +1,42 @@
+import logging
+from pyquery import PyQuery
+from weathergrabber.domain.weather_icon_enum import WeatherIconEnum
+from weathergrabber.domain.city_location import CityLocation
+from weathergrabber.domain.timestamp import Timestamp
+from weathergrabber.domain.day_night import DayNight
+from weathergrabber.domain.current_conditions import CurrentConditions
+
+class ExtractCurrentConditionsService:
+    def __init__(self):
+        self.logger = logging.getLogger(__name__)
+        pass
+
+    def execute(self, weather_data: PyQuery) -> dict:
+        self.logger.debug("Extracting Current Conditions")
+
+        data = PyQuery(weather_data('div[data-testid="CurrentConditionsContainer"]'))
+    
+        city_location_data = data.find('h1').text() #'Nova Friburgo, Rio de Janeiro, Brazil'
+        timestamp_data = data.find('span[class*="timestamp"]').text() # 'As of 8:01 pm GMT-03:00'
+        icon_data = data.find('svg[class*="wxIcon"]').attr('name') # 'partly-cloudy-night'
+        temp_day_night = data.find('div[class*="tempHiLoValue"]').text() #'Day\xa063°\xa0•\xa0Night\xa046°'
+
+        city_location = CityLocation.from_string(city_location_data)
+        timestamp = Timestamp.from_string(timestamp_data)
+        temperature = data.find('span[class*="tempValue"]').text() # '48°'
+        icon = WeatherIconEnum.from_name(icon_data)
+        phrase = data.find('div[data-testid*="wxPhrase"]').text() # 'Partly Cloudy'
+        day_night = DayNight.from_string(temp_day_night)
+
+        current_conditions = CurrentConditions(
+            location=city_location,
+            timestamp=timestamp,
+            temperature=temperature,
+            icon=icon,
+            summary=phrase,
+            day_night=day_night
+        )
+
+        self.logger.debug(f"Extracted current conditions: {current_conditions}")
+
+        return current_conditions

{weathergrabber-0.0.7a4 → weathergrabber-0.0.8a2/weathergrabber.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weathergrabber
-Version: 0.0.7a4
+Version: 0.0.8a2
 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.7a4/weathergrabber/domain/city_location.py

@@ -1,37 +0,0 @@
-class CityLocation:
-
-    def __init__(self, city: str, state_province: str = None, country: str = None):
-        self._city = city
-        self._state_province = state_province
-        self._country = country
-
-    @property
-    def city(self) -> str:
-        return self._city
-    
-    @property
-    def state_province(self) -> str:
-        return self._state_province
-    
-    @property
-    def country(self) -> str:
-        return self._country
-    
-    def __repr__(self):
-        return f"CityLocation(city={self.city}, state_province={self.state_province}, country={self.country})"
-
-    @classmethod
-    def from_string(cls, data: str) -> "CityLocation":
-        #'Nova Friburgo, Rio de Janeiro, Brazil'
-        parts = data.split(", ")
-        if len(parts) == 3:
-            city, state_province, country = parts
-            return cls(city=city, state_province=state_province, country=country)
-        if len(parts) == 2:
-            city, state_province = parts
-            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")

weathergrabber-0.0.7a4/weathergrabber/service/extract_current_conditions_service.py

@@ -1,47 +0,0 @@
-import logging
-from pyquery import PyQuery
-from weathergrabber.domain.weather_icon_enum import WeatherIconEnum
-from weathergrabber.domain.city_location import CityLocation
-from weathergrabber.domain.timestamp import Timestamp
-from weathergrabber.domain.day_night import DayNight
-from weathergrabber.domain.current_conditions import CurrentConditions
-
-class ExtractCurrentConditionsService:
-    def __init__(self):
-        self.logger = logging.getLogger(__name__)
-        pass
-
-    def execute(self, weather_data: PyQuery) -> dict:
-        try:
-            self.logger.debug("Extracting Current Conditions")
-
-            data = PyQuery(weather_data('div[data-testid="CurrentConditionsContainer"]'))
-            
-            city_location_data = data.find('h1').text() #'Nova Friburgo, Rio de Janeiro, Brazil'
-            timestamp_data = data.find('span[class*="timestamp"]').text() # 'As of 8:01 pm GMT-03:00'
-            icon_data = data.find('svg[class*="wxIcon"]').attr('name') # 'partly-cloudy-night'
-            temp_day_night = data.find('div[class*="tempHiLoValue"]').text() #'Day\xa063°\xa0•\xa0Night\xa046°'
-
-            city_location = CityLocation.from_string(city_location_data)
-            timestamp = Timestamp.from_string(timestamp_data)
-            temperature = data.find('span[class*="tempValue"]').text() # '48°'
-            icon = WeatherIconEnum.from_name(icon_data)
-            phrase = data.find('div[data-testid*="wxPhrase"]').text() # 'Partly Cloudy'
-            day_night = DayNight.from_string(temp_day_night)
-
-            current_conditions = CurrentConditions(
-                location=city_location,
-                timestamp=timestamp,
-                temperature=temperature,
-                icon=icon,
-                summary=phrase,
-                day_night=day_night
-            )
-
-            self.logger.debug(f"Extracted current conditions: {current_conditions}")
-
-            return current_conditions
-
-        except Exception as e:
-            self.logger.error(f"Error extracting current conditions: {e}")
-            raise ValueError("Could not extract current conditions") from e