weathergrabber 0.0.6__tar.gz → 0.0.7a2__tar.gz

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: weathergrabber
-Version: 0.0.6
+Version: 0.0.7a2
 Summary: A grabber for weather.com data with various output formats.
 Author-email: Carlos Anselmo Mendes Junior <cjuniorfox@gmail.com>
-License: MIT
+License-Expression: MIT
 Project-URL: homepage, https://github.com/cjuniorfox/weather
 Project-URL: repository, https://github.com/cjuniorfox/weather
 Requires-Python: >=3.12
@@ -140,7 +140,21 @@ weathergrabber [location_name] [options]
 Or as a Python module:
 
 ```sh
-python -m weathergrabber.cli [location_name] [options]
+python -m weathergrabber [location_name] [options]
+```
+
+### Importing as a Python module
+
+You can also use the main API or CLI entry point in your own Python code:
+
+```python
+import weathergrabber
+
+# Call the main API
+weathergrabber.main(log_level="INFO", location_name="London", location_id="", lang="en-GB", output="console", keep_open=False, icons="emoji")
+
+# Or run the CLI programmatically
+weathergrabber.main_cli()
 ```
 
 ### Arguments
@@ -172,7 +186,7 @@ weathergrabber "Paris" -o waybar -i fa
 Or as a Python module:
 
 ```sh
-python -m weathergrabber.cli "London" --output console --lang en-GB
-python -m weathergrabber.cli --location-id 1234567890abcdef... --output json
-python -m weathergrabber.cli "Paris" -o waybar -i fa
+python -m weathergrabber "London" --output console --lang en-GB
+python -m weathergrabber --location-id 1234567890abcdef... --output json
+python -m weathergrabber "Paris" -o waybar -i fa
 ```

{weathergrabber-0.0.6 → weathergrabber-0.0.7a2}/README.md

@@ -125,7 +125,21 @@ weathergrabber [location_name] [options]
 Or as a Python module:
 
 ```sh
-python -m weathergrabber.cli [location_name] [options]
+python -m weathergrabber [location_name] [options]
+```
+
+### Importing as a Python module
+
+You can also use the main API or CLI entry point in your own Python code:
+
+```python
+import weathergrabber
+
+# Call the main API
+weathergrabber.main(log_level="INFO", location_name="London", location_id="", lang="en-GB", output="console", keep_open=False, icons="emoji")
+
+# Or run the CLI programmatically
+weathergrabber.main_cli()
 ```
 
 ### Arguments
@@ -157,7 +171,7 @@ weathergrabber "Paris" -o waybar -i fa
 Or as a Python module:
 
 ```sh
-python -m weathergrabber.cli "London" --output console --lang en-GB
-python -m weathergrabber.cli --location-id 1234567890abcdef... --output json
-python -m weathergrabber.cli "Paris" -o waybar -i fa
+python -m weathergrabber "London" --output console --lang en-GB
+python -m weathergrabber --location-id 1234567890abcdef... --output json
+python -m weathergrabber "Paris" -o waybar -i fa
 ```

{weathergrabber-0.0.6 → weathergrabber-0.0.7a2}/pyproject.toml

@@ -1,10 +1,10 @@
 [project]
 name = "weathergrabber"
-version = "0.0.6"
+version = "0.0.7a2"
 description = "A grabber for weather.com data with various output formats."
 readme = "README.md"
 requires-python = ">=3.12"
-license = { text = "MIT" }
+license = "MIT"
 authors = [
     { name = "Carlos Anselmo Mendes Junior", email = "cjuniorfox@gmail.com" }
 ]

weathergrabber-0.0.7a2/weathergrabber/__init__.py

@@ -0,0 +1,7 @@
+"""weathergrabber - Python interface and CLI for weather.com data."""
+
+from .core import main
+from .cli import main_cli
+
+__all__ = ["main", "main_cli"]
+__version__ = "0.1.0"

weathergrabber-0.0.7a2/weathergrabber/__main__.py

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

{weathergrabber-0.0.6 → weathergrabber-0.0.7a2}/weathergrabber/cli.py

@@ -1,6 +1,6 @@
 import argparse
 import os
-from .core import main
+from weathergrabber import main
 
 def main_cli():
     ## Get current locale, or use the default one

{weathergrabber-0.0.6 → weathergrabber-0.0.7a2}/weathergrabber/domain/timestamp.py

@@ -30,9 +30,12 @@ class Timestamp:
     @classmethod
     def from_string(cls, text) -> "Timestamp":
         # "As of 4:23 pm GMT-03:00",
+        # "As of 4:23 pm EDT",
         # "As of 16:37 GMT-03:00",
         # "Até 16:38 GMT-03:00"
-        pattern = re.compile(r'(\d{1,2}:\d{2}(?: ?[ap]m)?)\s+(GMT[+-]\d{2}:\d{2})')
+        # "Até 20:44 EDT"
+        # Simplified: just match time (with optional am/pm) and timezone (GMT offset or abbreviation)
+        pattern = re.compile(r'(\d{1,2}:\d{2}(?: ?[ap]m)?)\s*((?:GMT[+-]\d{2}:\d{2})|[A-Z]{2,4})', re.IGNORECASE)
         match = pattern.search(text)
         if match:
             time, gmt = match.groups()

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

@@ -7,6 +7,7 @@ class WeatherIconEnum(Enum):
     CLOUDY_FOGGY_DAY = ('cloudy-foggy-day', chr(0xF013), '🌥️')
     CLOUDY_FOGGY_NIGHT = ('cloudy-foggy-night', chr(0xF013), '🌥️')
     DAY = ('day', '\uf185', '🌞')
+    DRIZZLE = ('drizzle', '\uf0e9', '🌦️')
     FEEL = ('feel', '\uf2c9', '🥵')
     FOGGY = ('foggy', '\uf74e', '🌫️')
     HUMIDITY = ('humidity', '\uf043', '💧')
@@ -22,6 +23,8 @@ class WeatherIconEnum(Enum):
     RAINY_NIGHT = ('rainy-night', chr(0x1F326), '🌧️')
     SCATTERED_SHOWERS_DAY = ('scattered-showers-day', chr(0x1F326), '🌦️')
     SCATTERED_SHOWERS_NIGHT = ('scattered-showers-night', chr(0x1F326), '🌦️')
+    SCATTERED_THUNDERSTORMS_DAY = ('scattered-thunderstorms-day', chr(0x26C8), '⛈️')
+    SCATTERED_THUNDERSTORMS_NIGHT = ('scattered-thunderstorms-night', chr(0x26C8), '⛈️')
     SEVERE = ('severe', '\ue317', '🌩️')
     SHOWERS = ('showers', '\u26c6', '🌧️')
     SNOW = ('snow', '\uf2dc', '❄️')
@@ -30,9 +33,10 @@ class WeatherIconEnum(Enum):
     SUNNY = ('sunny', chr(0xF0599), '☀️')
     SUNRISE = ('sunrise', '\ue34c', '🌅')
     SUNSET = ('sunset', '\ue34d', '🌇')
-    THUNDERSTORM = ('thunderstorm', '\uf0e7', '⛈️')
+    THUNDERSTORMS = ('thunderstorms', '\uf0e7', '⛈️')
     VISIBILITY = ('visibility', '\uf06e', '👁️')
     WIND = ('wind', chr(0xf059d), '🌪️')
+    WINDY = ('windy', chr(0xf059d), '🌪️')
 
     def __init__(self, name: str, fa_icon: str, emoji_icon: str):
         self._name = name
@@ -56,4 +60,4 @@ class WeatherIconEnum(Enum):
         for item in WeatherIconEnum:
             if item._name == name:
                 return item
-        return None
+        raise ValueError(f'WeatherIconEnum: No icon found for name "{name}"')

{weathergrabber-0.0.6 → weathergrabber-0.0.7a2}/weathergrabber/usecase/use_case.py

@@ -59,11 +59,13 @@ class UseCase:
         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")
             daily_predictions = self.extract_daily_forecast_oldstyle_service.execute(weather_data)
 
         forecast = Forecast(

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: weathergrabber
-Version: 0.0.6
+Version: 0.0.7a2
 Summary: A grabber for weather.com data with various output formats.
 Author-email: Carlos Anselmo Mendes Junior <cjuniorfox@gmail.com>
-License: MIT
+License-Expression: MIT
 Project-URL: homepage, https://github.com/cjuniorfox/weather
 Project-URL: repository, https://github.com/cjuniorfox/weather
 Requires-Python: >=3.12
@@ -140,7 +140,21 @@ weathergrabber [location_name] [options]
 Or as a Python module:
 
 ```sh
-python -m weathergrabber.cli [location_name] [options]
+python -m weathergrabber [location_name] [options]
+```
+
+### Importing as a Python module
+
+You can also use the main API or CLI entry point in your own Python code:
+
+```python
+import weathergrabber
+
+# Call the main API
+weathergrabber.main(log_level="INFO", location_name="London", location_id="", lang="en-GB", output="console", keep_open=False, icons="emoji")
+
+# Or run the CLI programmatically
+weathergrabber.main_cli()
 ```
 
 ### Arguments
@@ -172,7 +186,7 @@ weathergrabber "Paris" -o waybar -i fa
 Or as a Python module:
 
 ```sh
-python -m weathergrabber.cli "London" --output console --lang en-GB
-python -m weathergrabber.cli --location-id 1234567890abcdef... --output json
-python -m weathergrabber.cli "Paris" -o waybar -i fa
+python -m weathergrabber "London" --output console --lang en-GB
+python -m weathergrabber --location-id 1234567890abcdef... --output json
+python -m weathergrabber "Paris" -o waybar -i fa
 ```

{weathergrabber-0.0.6 → weathergrabber-0.0.7a2}/weathergrabber.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 tests/test_cli.py
 tests/test_core.py
 weathergrabber/__init__.py
+weathergrabber/__main__.py
 weathergrabber/cli.py
 weathergrabber/core.py
 weathergrabber/weathergrabber_application.py