weathergrabber 0.0.9a0__py3-none-any.whl → 0.0.11__py3-none-any.whl

weathergrabber/__init__.py

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

weathergrabber/application/services/extract_current_conditions_service.py

@@ -1,4 +1,5 @@
 import logging
+import json
 from pyquery import PyQuery
 from weathergrabber.domain.entities.weather_icon_enum import WeatherIconEnum
 from weathergrabber.domain.entities.city_location import CityLocation
@@ -16,12 +17,12 @@ class ExtractCurrentConditionsService:
 
         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)
+        city_location = self.__location(weather_data)
         timestamp = Timestamp.from_string(timestamp_data)
         temperature = data.find('span[class*="tempValue"]').text() # '48°'
         icon = WeatherIconEnum.from_name(icon_data)
@@ -39,4 +40,15 @@ class ExtractCurrentConditionsService:
 
         self.logger.debug(f"Extracted current conditions: {current_conditions}")
 
-        return current_conditions
+        return current_conditions
+    
+    def __location(self, weather_data: PyQuery) -> CityLocation:
+        location_str = weather_data.find('script[type="application/ld+json"]').contents().eq(2).text()
+        location_data = json.loads(location_str)
+        address = location_data.get("address", {})
+        
+        return CityLocation(
+            city=address.get("addressLocality"),
+            state_province=address.get("addressRegion"),
+            country=address.get("addressCountry")
+        )

weathergrabber/application/services/search_location_service.py

@@ -13,13 +13,9 @@ class SearchLocationService:
         if not location_name:
             self.logger.debug("No location name provided. Bypassing search.")
             return None
+        data = self.api.search(location_name, lang)
         
         try:
-            data = self.api.search(location_name, lang)
-            if not data:
-                self.logger.error(f"No data found for location: {location_name}")
-                raise ValueError(f"Location '{location_name}' not found.")
-            
             dal = data["dal"]["getSunV3LocationSearchUrlConfig"]
 
             # Pick the first (arbitrary) key, then get the value
@@ -29,7 +25,7 @@ class SearchLocationService:
             self.logger.debug(f"Found location ID: {location_id} for location name: {location_name}")
             
             return location_id
-        except Exception as e:
-            self.logger.error(f"Error searching for location '{location_name}': {e}")
+        except KeyError as e:
+            self.logger.debug(f"Error searching for location '{location_name}': {e}")
             raise ValueError(f"Could not find location '{location_name}'.")
 

weathergrabber/application/usecases/weather_forecast_uc.py

@@ -68,10 +68,10 @@ class WeatherForecastUC:
         
         try:
             location_id = self._resolve_location_id(params)
+            weather_data = self.read_weather_service.execute(params.language, location_id)
         except ConnectionError as e:
+            self.logger.debug("A connection error occurred while fetching weather data. Trying to retrieve from cache.")
             return self.retrieve_forecast_from_cache_service.execute(params)
-        
-        weather_data = self.read_weather_service.execute(params.language, location_id)
 
         current_conditions = self.extract_current_conditions_service.execute(weather_data)
         today_details = self.extract_today_details_service.execute(weather_data)

weathergrabber/cli.py

@@ -16,9 +16,9 @@ def main_cli():
     parser.add_argument("--version", "-v", action='version', version=f'Weathergrabber {weathergrabber.get_version()}', help="Show version and exit")
     parser.add_argument(
         "--log",
-        default="critical",
+        default="ERROR",
         choices=["debug", "info", "warning", "error", "critical", "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
-        help="Set the logging level (default: CRITICAL)"
+        help="Set the logging level (default: ERROR)"
     )
     args = parser.parse_args()
 

weathergrabber/core.py

@@ -32,4 +32,12 @@ def main(log_level: str, location_name: str, location_id: str, lang: str, output
         cache_statistics=cache_statistics,
     )
 
-    app = WeatherGrabberApplication(params)
+    try:
+        app = WeatherGrabberApplication(params)
+    except Exception as e:
+        logger = logging.getLogger()
+        if logger.level == logging.DEBUG:
+            logger.error(f"{e}", exc_info=True)
+        else:
+            logger.error(f"{e}")
+        raise SystemExit(1)

weathergrabber/domain/entities/weather_icon_enum.py

@@ -47,6 +47,7 @@ class WeatherIconEnum(Enum):
     # Suggestions from Copilot
     BLIZZARD = ('blizzard', '\u2744', '🌨️')
     DUST = ('dust', '\uf063', '🌪️')
+    BLOWING_DUST_SANDSTORM = ('blowing-dust-sandstorm', '\uf063', '🌪️')
     FLURRIES = ('flurries', '\u2744', '🌨️')
     FREEZING_DRIZZLE = ('freezing-drizzle', '\uf0e9', '🌧️')
     FREEZING_DRIZZLE_RAIN = ('freezing-drizzle-rain', '\uf0e9', '🌧️')

{weathergrabber-0.0.9a0.dist-info → weathergrabber-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weathergrabber
-Version: 0.0.9a0
+Version: 0.0.11
 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.9a0.dist-info → weathergrabber-0.0.11.dist-info}/RECORD

@@ -1,7 +1,7 @@
-weathergrabber/__init__.py,sha256=5f7V1Cw3xEDm1ILym-TI69RtSvznomtyNcxDLunUHjY,217
+weathergrabber/__init__.py,sha256=jyad_PXvxFjRMqfok4rwKL7ULoOSuH6Cwf7SJef7XIE,217
 weathergrabber/__main__.py,sha256=yYL-jc4kVHqaYVADzjKZfmCN2mziRofsXgnzrECbGDo,68
-weathergrabber/cli.py,sha256=o5CgYggCGNzLpTj8Ynuy_QqoloGYGcnPCgm9RN8iO_c,2480
-weathergrabber/core.py,sha256=76xkBPJluuQkhfEEWLrMp7ash03MZLnwl0kHzOKJseY,1376
+weathergrabber/cli.py,sha256=oGHgkWWC3wnMDuisV2XgImQpQRHWNUL_yoqNhnJT2V4,2474
+weathergrabber/core.py,sha256=ARQrqtLI-UMqJVS_T2l16dpANXLj-3bxctui2RGChpA,1618
 weathergrabber/adapter/client/weather_api.py,sha256=9S7JmXaAVvvPY60dz6rC3lx7X68BcqyvNzvSVM1-af8,963
 weathergrabber/adapter/client/weather_search_api.py,sha256=1oy7JitHcmwkkhFlD0eIt5A7a4cGbf7LMNi26tR8z5o,1724
 weathergrabber/adapter/repository/forecast_repository.py,sha256=kuQWG6e-cNzFpS7BxqbHJUKw6OLH59zYUD6sOTtEO2o,5814
@@ -11,7 +11,7 @@ weathergrabber/adapter/tty/statistics_tty.py,sha256=6ES5AsnCAnXl6Bp_8tyqz2_C2j92
 weathergrabber/adapter/tty/waybar_tty.py,sha256=vGErv9NshqPVzP2eh-O3govZRumUM-VXiwWRBsiRGzo,6191
 weathergrabber/application/weathergrabber_application.py,sha256=yFbo920vGLi6TreDMw6n1bZ-wy1lcBJewKurP0qKfCA,5190
 weathergrabber/application/services/extract_aqi_service.py,sha256=OIDbdXankKCn3LrxUsZkAlpf0tIgniFxuGiSDviL5UM,1099
-weathergrabber/application/services/extract_current_conditions_service.py,sha256=lUo7meqt5SMCuZTKEjVW-iWYpxsYksvsDOGZdHD57ac,1883
+weathergrabber/application/services/extract_current_conditions_service.py,sha256=2LUkHwF8zS9xQg-TjchbdK8_4DR8KmZb80lG_57e7ig,2269
 weathergrabber/application/services/extract_daily_forecast_oldstyle_service.py,sha256=HPODxFKinUIhZrE6O-1PyaKavWtp1go4Xp5yY2KnC10,2226
 weathergrabber/application/services/extract_daily_forecast_service.py,sha256=tJ7Lvi3bEiAT1cN6byoq4nx00BG91fG16iXEhwT0MDc,2762
 weathergrabber/application/services/extract_health_activities_service.py,sha256=efrJMsVXEGTURGqOTmlbD973eF00vrX53tQqwbtytmo,1023
@@ -23,9 +23,9 @@ weathergrabber/application/services/read_weather_service.py,sha256=7_B8E9IN1KCwO
 weathergrabber/application/services/retrieve_forecast_from_cache_service.py,sha256=7fY6pJ_2qahbFNzhnxJ7taG1cb9-ExFEV7tYnLlMCAs,1314
 weathergrabber/application/services/retrieve_statistics_service.py,sha256=XjDGbjZNlaaV1eT3hgVq_Pm012b6JHMQ66xT9DdVnPI,838
 weathergrabber/application/services/save_forecast_to_cache_service.py,sha256=a64D2_JIpFHiQodltlWJ4Us3MtTcDff_xVwSJZmwZ0c,747
-weathergrabber/application/services/search_location_service.py,sha256=tZmVgO45hjwoa4cl5bKPjMBmYlGxJiH_I9Ymb5pwEwU,1422
+weathergrabber/application/services/search_location_service.py,sha256=8Snv8CnweRfx1LHFASgF0_N6k_tDdL7RN3zE4LDWJ64,1222
 weathergrabber/application/usecases/statistics_uc.py,sha256=ycr0dH9Ddy5S8kdzjdk5Munk01RUfY1JNPXEriH2dE0,836
-weathergrabber/application/usecases/weather_forecast_uc.py,sha256=zD77byoQx3YOJeKqgp1LgyRZU15OAzXfErt-7LMRqvo,6968
+weathergrabber/application/usecases/weather_forecast_uc.py,sha256=PZMalRrIALLSfFOYeE26Uorud415x_J6YYZJOL-osHA,7084
 weathergrabber/domain/adapter/icon_enum.py,sha256=YxGYS5vBRV2AiAfeuPOdqaQOHixAssiMbOzQnTmdSBg,84
 weathergrabber/domain/adapter/output_enum.py,sha256=KwR3mpIrW9T3b6mV3vEHjv4ff8BAxQM-58UTtX5EVZ0,116
 weathergrabber/domain/adapter/params.py,sha256=TBhF1H2esDG16HuME43yUwm7OZivgHHnanzRpjVfj-M,2220
@@ -70,11 +70,11 @@ weathergrabber/domain/entities/temperature_hight_low.py,sha256=PQOJ5uDtfMRBR5yMx
 weathergrabber/domain/entities/timestamp.py,sha256=Bk6f8Tx0-yNitYmEKIWHnqh_ALDwxEHrhoCRSrfvYTU,1222
 weathergrabber/domain/entities/today_details.py,sha256=EUlV7xerYw5QhEsBfvO5m6-9Ghm4nPkXJz9zCmSYTbA,2398
 weathergrabber/domain/entities/uv_index.py,sha256=7XalamfjJdVSqo4x7G4JVf_HJtrPJxO1BpbvmAfBhnw,1481
-weathergrabber/domain/entities/weather_icon_enum.py,sha256=4mbTtZjyYaX7hNlKh1LLQdVNAEjZkmFGPijARxilZLs,4088
+weathergrabber/domain/entities/weather_icon_enum.py,sha256=2JqK3MJEAdbmL_jqzJUw0V31qF9EXJFq6zF1J653eRU,4165
 weathergrabber/domain/entities/wind.py,sha256=wTDz3X1rYsnw_eNoDi1miwaomxwhiJkY_q6xrdZtLak,789
-weathergrabber-0.0.9a0.dist-info/licenses/LICENSE,sha256=X5JFljoqN43yFwpMLudQ9rtty4K_FeZfnz3v8Yhw23Q,1067
-weathergrabber-0.0.9a0.dist-info/METADATA,sha256=xRa6noDzRVyXgMOGAwxGKUVrk9rzOaVZkgVwCkowVBo,7475
-weathergrabber-0.0.9a0.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-weathergrabber-0.0.9a0.dist-info/entry_points.txt,sha256=m2P9a4mrJDTzuNaiTU438NA60GxCfaw7VKvruWw43N8,63
-weathergrabber-0.0.9a0.dist-info/top_level.txt,sha256=P3NMDJJYRIvQujf994Vb4gZrobkKWkL2gh3NF_ajQWM,15
-weathergrabber-0.0.9a0.dist-info/RECORD,,
+weathergrabber-0.0.11.dist-info/licenses/LICENSE,sha256=X5JFljoqN43yFwpMLudQ9rtty4K_FeZfnz3v8Yhw23Q,1067
+weathergrabber-0.0.11.dist-info/METADATA,sha256=q0ESC-yO8eh_aNuDF_ASFuXg6GZPeG1ryX9qawdA-kk,7474
+weathergrabber-0.0.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+weathergrabber-0.0.11.dist-info/entry_points.txt,sha256=m2P9a4mrJDTzuNaiTU438NA60GxCfaw7VKvruWw43N8,63
+weathergrabber-0.0.11.dist-info/top_level.txt,sha256=P3NMDJJYRIvQujf994Vb4gZrobkKWkL2gh3NF_ajQWM,15
+weathergrabber-0.0.11.dist-info/RECORD,,

{weathergrabber-0.0.9a0.dist-info → weathergrabber-0.0.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any