weathergrabber 0.0.8b3__tar.gz → 0.0.8b5__tar.gz

{weathergrabber-0.0.8b3/weathergrabber.egg-info → weathergrabber-0.0.8b5}/PKG-INFO

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

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

{weathergrabber-0.0.8b3 → weathergrabber-0.0.8b5}/tests/test_cli.py

@@ -1,3 +1,4 @@
+from asyncio import subprocess
 import pytest
 from unittest.mock import patch, MagicMock
 import sys
@@ -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.8b5/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.8b3 → weathergrabber-0.0.8b5}/weathergrabber/__init__.py

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

{weathergrabber-0.0.8b3 → weathergrabber-0.0.8b5}/weathergrabber/__main__.py

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

{weathergrabber-0.0.8b3 → weathergrabber-0.0.8b5}/weathergrabber/adapter/tty/console_tty.py

@@ -82,7 +82,7 @@ class ConsoleTTY:
         # Hourly predictions and daily predictions
         hourly_predictions = [
                 f"{h['title']}"
-                f"{'\t' if len(h['title']) < 3 else ''}\t"
+                f"{'\t\t' if len(h['title']) < 3 else '\t'}"
                 f"{h['temperature']}"
                 "\t"
                 f"{h['icon']}\t"
@@ -92,7 +92,7 @@ class ConsoleTTY:
 
         daily_predictions = [
                 f"{d['title']}"
-                f"{'\t' if len(d['title']) < 3 else ''}\t"
+                f"{'\t\t' if len(d['title']) < 3 else '\t'}"
                 f"{d['high_low']}"
                 f"\t"
                 f"{d['icon']}\t"

{weathergrabber-0.0.8b3 → weathergrabber-0.0.8b5}/weathergrabber/adapter/tty/waybar_tty.py

@@ -62,12 +62,12 @@ 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
 
         hourly_predictions_format = [{
-            'title': h.title if len(h.title) < 10 else h.title[:9] + '.',
+            'title': h.title if len(h.title) < 9 else h.title[:8] + '.',
             '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 ''}"
@@ -75,7 +75,7 @@ class WaybarTTY:
 
         daily_predictions_format = [
             {
-                'title': d.title if len(d.title) < 10 else d.title[:9] + '.',
+                'title': d.title if len(d.title) < 9 else d.title[:8] + '.',
                 '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}"
@@ -85,7 +85,7 @@ class WaybarTTY:
         # Hourly predictions and daily predictions
         hourly_predictions = [
                 f"{h['title']}"
-                f"{'\t\t' if len(h['title']) < 4 else '\t'}"
+                f"{'\t\t' if len(h['title']) < 5 else '\t'}"
                 f"{h['temperature']}"
                 "\t\t"
                 f"{h['icon']}\t"
@@ -95,9 +95,9 @@ class WaybarTTY:
 
         daily_predictions = [
                 f"{d['title']}"
-                f"\t{'\t' if len(d['title']) < 6 else ' '}"
+                f"{'\t\t' if len(d['title']) < 5 else '\t'}"
                 f"{d['high_low']}"
-                f"\t{'\t' if len(d['high_low']) < 33 else ''}"
+                f"{'\t\t' if len(d['high_low']) < 32 else '\t'}"
                 f"{d['icon']}\t"
                 f"{rain_icon} {d['precipitation']}"
             for d in daily_predictions_format

{weathergrabber-0.0.8b3 → weathergrabber-0.0.8b5}/weathergrabber/cli.py

@@ -35,6 +35,3 @@ def main_cli():
         keep_open=args.keep_open,
         icons=args.icons
     )
-
-if __name__ == "__main__":
-    main_cli()

{weathergrabber-0.0.8b3 → weathergrabber-0.0.8b5}/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.8b3 → weathergrabber-0.0.8b5}/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.8b5/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.8b3 → weathergrabber-0.0.8b5}/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.8b3 → weathergrabber-0.0.8b5}/weathergrabber/domain/moon_phase_enum.py

@@ -38,6 +38,7 @@ class MoonPhaseEnum(Enum):
     PHASE_26 = ("phase-26", "\uf186", "🌘")
     PHASE_27 = ("phase-27", "\uf186", "🌘")
     PHASE_28 = ("phase-28", "\uf186", "🌘")
+    PHASE_29 = ("phase-29", "\uf186", "🌑")
     DEFAULT = ("default", "\uf186", "🌑")
 
     def __init__(self, name: str, fa_icon: str, emoji_icon: str):

{weathergrabber-0.0.8b3 → weathergrabber-0.0.8b5}/weathergrabber/domain/uv_index.py

@@ -24,14 +24,14 @@ 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)
         elif len(parts) == 3:
             index, of, some = parts
             return cls(string_value = data, index=index.strip(), of=some.strip(), label=label)
-        elif len(data) == 0:
-            raise ValueError("UV Index string cannot be empty")
         else:
             return cls(string_value = data, index="", of="", label=label)
     
@@ -41,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.8b3 → weathergrabber-0.0.8b5}/weathergrabber/domain/weather_icon_enum.py

@@ -10,6 +10,7 @@ class WeatherIconEnum(Enum):
     DRIZZLE = ('drizzle', '\uf0e9', '🌦️')
     FEEL = ('feel', '\uf2c9', '🥵')
     FOGGY = ('foggy', '\uf74e', '🌫️')
+    HEAVY_RAIN = ('heavy-rain', '\uf0e9', '🌧️')
     HUMIDITY = ('humidity', '\uf043', '💧')
     ISOLATED_THUNDERSTORMS = ('isolated-thunderstorms', chr(0x26C8), '⛈️')
     MOSTLY_CLEAR_DAY = ('mostly-clear-day', chr(0xF0599), '☀️')

weathergrabber-0.0.8b5/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.8b3 → weathergrabber-0.0.8b5/weathergrabber.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weathergrabber
-Version: 0.0.8b3
+Version: 0.0.8b5
 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.8b3 → weathergrabber-0.0.8b5}/weathergrabber.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ 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.8b3/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.8b3/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
-