weathergrabber 0.0.8b7__py3-none-any.whl → 0.0.9__py3-none-any.whl

weathergrabber/domain/adapter/params.py

@@ -18,20 +18,25 @@ class Params:
 
         def __str__(self):
             return f"Location(search_name={self.search_name}, id={self.id})"
-        
+
     def __init__(
             self,
             location: Optional["Params.Location"] = None,
             language: str = "en-US",
             output_format: OutputEnum = OutputEnum.CONSOLE,
             keep_open: bool = False,
-            icons: IconEnum = IconEnum.EMOJI
+            icons: IconEnum = IconEnum.EMOJI,
+            force_cache: bool = False,
+            cache_statistics: bool = False,
+
         ):
         self._location = location
         self._language = language
         self._output_format = output_format
         self._keep_open = keep_open
         self._icons = icons
+        self._force_cache = force_cache
+        self._cache_statistics = cache_statistics
 
     @property
     def location(self) -> Optional["Params.Location"]:
@@ -52,7 +57,23 @@ class Params:
     @property
     def icons(self) -> IconEnum:
         return self._icons
+
+    @property
+    def force_cache(self) -> bool:
+        return self._force_cache
     
+    @property
+    def cache_statistics(self) -> bool:
+        return self._cache_statistics
+
     def __str__(self):
-        return f"Params(location={self.location}, language={self.language}, output_format={self.output_format}, keep_open={self.keep_open}, icons={self.icons})"
-    
+        return f'''
+            Params(
+                location={self.location},
+                language={self.language},
+                output_format={self.output_format},
+                keep_open={self.keep_open}, 
+                icons={self.icons},
+                force_cache={self.force_cache},
+                cache_statistics={self.cache_statistics})
+        '''

weathergrabber/domain/{moon_phase.py → entities/moon_phase.py}

@@ -1,4 +1,4 @@
-from weathergrabber.domain.moon_phase_enum import MoonPhaseEnum
+from weathergrabber.domain.entities.moon_phase_enum import MoonPhaseEnum
 
 class MoonPhase:
     def __init__(self, icon: MoonPhaseEnum, phase: str, label:str = None):

weathergrabber/domain/entities/statistics.py

@@ -0,0 +1,46 @@
+from typing import Optional
+
+
+class Statistics:
+    def __init__(
+        self,
+        total_forecasts: int,
+        unique_locations: int,
+        unique_search_names: int,
+        database_path: str,
+        error: Optional[str] = None
+    ):
+        self._total_forecasts = total_forecasts
+        self._unique_locations = unique_locations
+        self._unique_search_names = unique_search_names
+        self._database_path = database_path
+        self._error = error
+        
+    @property
+    def total_forecasts(self) -> int:
+        return self._total_forecasts
+    
+    @property
+    def unique_locations(self) -> int:
+        return self._unique_locations
+    
+    @property
+    def unique_search_names(self) -> int:
+        return self._unique_search_names
+    
+    @property
+    def database_path(self) -> str:
+        return self._database_path
+
+    @property
+    def error(self) -> Optional[str]:
+        return self._error
+    
+    def __repr__(self):
+        return (
+            f"Statistics(total_forecasts={self.total_forecasts!r}, "
+            f"unique_locations={self.unique_locations!r}, "
+            f"unique_search_names={self.unique_search_names!r}, "
+            f"database_path={self.database_path!r}, "
+            f"error={self.error!r})"
+        )

weathergrabber/domain/{sunrise_sunset.py → entities/sunrise_sunset.py}

@@ -20,7 +20,6 @@ class SunriseSunset:
         def __repr__(self):
             return f"IconValue(icon={self._icon}, value='{self._value}')"
 
-
     def __init__(self, sunrise: str, sunset: str):
         self._sunrise = SunriseSunset.IconValue(WeatherIconEnum.SUNRISE, sunrise)
         self._sunset = SunriseSunset.IconValue(WeatherIconEnum.SUNSET, sunset)

weathergrabber/domain/{weather_icon_enum.py → entities/weather_icon_enum.py}

@@ -49,6 +49,7 @@ class WeatherIconEnum(Enum):
     DUST = ('dust', '\uf063', '🌪️')
     FLURRIES = ('flurries', '\u2744', '🌨️')
     FREEZING_DRIZZLE = ('freezing-drizzle', '\uf0e9', '🌧️')
+    FREEZING_DRIZZLE_RAIN = ('freezing-drizzle-rain', '\uf0e9', '🌧️')
     FREEZING_RAIN = ('freezing-rain', '\uf0e9', '🌧️')
     HAIL = ('hail', '\uf015', '🌨️')
     HAZE = ('haze', '\uf0b6', '🌫️')

{weathergrabber-0.0.8b7.dist-info → weathergrabber-0.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: weathergrabber
-Version: 0.0.8b7
+Version: 0.0.9
 Summary: A grabber for weather.com data with various output formats.
 Author-email: Carlos Anselmo Mendes Junior <cjuniorfox@gmail.com>
 License: MIT
@@ -11,6 +11,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pyquery>=1.4.3
 Requires-Dist: requests>=2.32.4
+Provides-Extra: dev
+Requires-Dist: pytest>=8.0.0; extra == "dev"
+Requires-Dist: pytest-cov>=4.1.0; extra == "dev"
 Dynamic: license-file
 
 # Weather Forecast CLI Script
@@ -34,6 +37,8 @@ This script fetches and parses weather forecast data from Weather.com and format
   - **Console output**: Richly formatted weather data with icons.
   - **Waybar JSON**: For integration with Waybar.
 - Supports multiple languages for Weather.com data.
+- **Offline support**: Automatically retrieves cached weather data when internet connection is unavailable.
+- **Cache management**: SQLite-based caching system for storing weather forecasts and enabling offline access.
 - Includes data such as:
   - Current temperature and "feels-like" temperature.
   - Wind speed, humidity, visibility, and air quality.
@@ -163,24 +168,42 @@ weathergrabber.main_cli()
 
 ### Options
 
-- `--location-id`, `-l`   : 64-character-hex code for location (from Weather.com)
-- `--lang`, `-L`          : Language (e.g., `pt-BR`, `fr-FR`). Defaults to system locale if not set.
-- `--output`, `-o`        : Output format. One of `console`, `json`, or `waybar`. Default: `console`.
-- `--keep-open`, `-k`     : Keep open and refresh every 5 minutes (only makes sense for `console` output).
-- `--icons`, `-i`         : Icon set. `fa` for Font-Awesome, `emoji` for emoji icons. Default: `emoji`.
-- `--log`                 : Set logging level. One of `debug`, `info`, `warning`, `error`, `critical`. Default: `critical`.
+- `--location-id`, `-l`     : 64-character-hex code for location (from Weather.com)
+- `--lang`, `-L`            : Language (e.g., `pt-BR`, `fr-FR`). Defaults to system locale if not set.
+- `--output`, `-o`          : Output format. One of `console`, `json`, `waybar`, or `statistics`. Default: `console`.
+- `--keep-open`, `-k`       : Keep open and refresh every 5 minutes (only makes sense for `console` output).
+- `--force-cache`           : Retrieve weather data from cache regardless of internet connection availability. Useful for offline mode.
+- `--cache-statistics`      : Display cache database statistics including total forecasts, unique locations, unique search names, and database file path.
+- `--icons`, `-i`           : Icon set. `fa` for Font-Awesome, `emoji` for emoji icons. Default: `emoji`.
+- `--log`                   : Set logging level. One of `debug`, `info`, `warning`, `error`, `critical`. Default: `critical`.
 
 ### Environment Variables
 
 - `LANG`                  : Used as default language if `--lang` is not set.
 - `WEATHER_LOCATION_ID`   : Used as default location if neither `location_name` nor `--location-id` is set.
 
+## Cache & Offline Support
+
+The script maintains a SQLite cache database for storing weather forecasts. This enables several key features:
+
+- **Automatic offline fallback**: When internet connection is unavailable, the script automatically retrieves the most recent cached weather data for the requested location.
+- **Forced cache retrieval**: Use `--force-cache` to retrieve data exclusively from the cache, regardless of internet availability. This is useful for offline scenarios or reducing API calls.
+- **Cache statistics**: Use `--cache-statistics` to display information about the cache database, including:
+  - Total number of cached forecasts
+  - Number of unique locations searched
+  - Number of unique search names used
+  - Database file path
+
+By default, the cache database is stored in the system's temporary directory (`/tmp` on Linux/macOS).
+
 ### Example Usage
 
 ```sh
 weathergrabber "London" --output console --lang en-GB
 weathergrabber --location-id 1234567890abcdef... --output json
 weathergrabber "Paris" -o waybar -i fa
+weathergrabber "New York" --force-cache
+weathergrabber --cache-statistics
 ```
 
 Or as a Python module:
@@ -189,4 +212,6 @@ Or as a Python module:
 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
+python -m weathergrabber "Toronto" --force-cache
+python -m weathergrabber --cache-statistics
 ```

weathergrabber-0.0.9.dist-info/RECORD

@@ -0,0 +1,80 @@
+weathergrabber/__init__.py,sha256=z_8SVcvgPHVKWJg57APMX_xsh9hDcvZYhnsrGmiN9_E,216
+weathergrabber/__main__.py,sha256=yYL-jc4kVHqaYVADzjKZfmCN2mziRofsXgnzrECbGDo,68
+weathergrabber/cli.py,sha256=o5CgYggCGNzLpTj8Ynuy_QqoloGYGcnPCgm9RN8iO_c,2480
+weathergrabber/core.py,sha256=76xkBPJluuQkhfEEWLrMp7ash03MZLnwl0kHzOKJseY,1376
+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
+weathergrabber/adapter/tty/console_tty.py,sha256=YMe1xaOdBkMil4KidvAJWh3Qwbyg9dzHNJHAO9DjYnI,6022
+weathergrabber/adapter/tty/json_tty.py,sha256=sZEUxsNKrCr6U3rAtn9dAtDJNdsnCAupWac_tmSnL3w,682
+weathergrabber/adapter/tty/statistics_tty.py,sha256=6ES5AsnCAnXl6Bp_8tyqz2_C2j92nbf6ahHQj3UkTAI,1525
+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_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
+weathergrabber/application/services/extract_hourly_forecast_oldstyle_service.py,sha256=yVNhcMF0kYvwhofalv4z3GKqF33SBC41c2j4QU65nCA,2127
+weathergrabber/application/services/extract_hourly_forecast_service.py,sha256=4y2xntFyXsorBUng5_KndNIvBZQCnTQ6ig6QDZsCT6E,2802
+weathergrabber/application/services/extract_temperature_service.py,sha256=46nRO3Izj1QmG4BNTh8flsODsovHyWPzZzOnkl1Gbj4,634
+weathergrabber/application/services/extract_today_details_service.py,sha256=lUt0D3SZy7NlPvDRjnIRhvZgSRm_WTBMtOhk7CUte3o,3814
+weathergrabber/application/services/read_weather_service.py,sha256=7_B8E9IN1KCwOhpuS5PfWazI1sCrDyYrZhkV2R38bhc,649
+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/usecases/statistics_uc.py,sha256=ycr0dH9Ddy5S8kdzjdk5Munk01RUfY1JNPXEriH2dE0,836
+weathergrabber/application/usecases/weather_forecast_uc.py,sha256=zD77byoQx3YOJeKqgp1LgyRZU15OAzXfErt-7LMRqvo,6968
+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
+weathergrabber/domain/adapter/mappers/air_quality_index_mapper.py,sha256=uEAVVvuib64lASvJosZXt3KmwmYl8CklHEPxIE3uXa4,889
+weathergrabber/domain/adapter/mappers/city_location_mapper.py,sha256=1OLftve-uZ2APUv9lTWabHt-yxrop7R17IWgJE7fn9g,454
+weathergrabber/domain/adapter/mappers/color_mapper.py,sha256=9B4Eas4VU5khnLhqtL_9zpX9TsHIYeoZLxI-Qg-Tsoo,398
+weathergrabber/domain/adapter/mappers/current_conditions_mapper.py,sha256=MYRci1NZTjk7op0zxbMfEA71Qmi4n17FtkvKPI3FAOU,1852
+weathergrabber/domain/adapter/mappers/daily_predictions_mapper.py,sha256=cFfBIfIkXj9DcxOugYW_sQ9qmpdJZ-3KmbMwy7ukqPs,1921
+weathergrabber/domain/adapter/mappers/day_night_mapper.py,sha256=Qileog_XlKzdaSvubEzxVQNcx-jGfZt-tfpoiWNd3Jw,770
+weathergrabber/domain/adapter/mappers/forecast_mapper.py,sha256=KNifHlqnPtQiHuB92ENBRY2YFhqkxtpgcLsaUQan9mY,3149
+weathergrabber/domain/adapter/mappers/health_activities_mapper.py,sha256=f-H8uzy-d3ZH46KZRcoIE07UMT_buPsG6JVZRrMkQwU,482
+weathergrabber/domain/adapter/mappers/hourly_predictions_mapper.py,sha256=EWyzfaFDUub04IgMAVNLW2QIzRiOzLjx3BXimohfEE4,2080
+weathergrabber/domain/adapter/mappers/label_value_mapper.py,sha256=rHftbEvAGHXIZWgRuoLR8VWYsUcjjA1MTHzU2M1pCgc,328
+weathergrabber/domain/adapter/mappers/moon_phase_mapper.py,sha256=KXoM_0vdb5fE9RR6bhiI0nkf8xfUEF7wjziYcxdQYaA,535
+weathergrabber/domain/adapter/mappers/precipitation_mapper.py,sha256=Y-JmjtM3HjQSzLFPFmLbDwdaB5CpJ4Lcj6h0Igrk3lw,367
+weathergrabber/domain/adapter/mappers/search_mapper.py,sha256=bRXzqGlonVZj-PeeJb4ptVfiLhagC51Mcuv3KUSu50E,321
+weathergrabber/domain/adapter/mappers/statistics_mapper.py,sha256=B2rTkujzfQQT4SW6nq_RPAh9azLEPp30UzTOXjRrNLw,904
+weathergrabber/domain/adapter/mappers/sunrise_sunset_mapper.py,sha256=c7RvsOzwVB7g4akKN7QnyIDk7Q41U40eQPYmpzXYMzU,975
+weathergrabber/domain/adapter/mappers/temperature_high_low_mapper.py,sha256=EIH-ALc2iU5AzR66sjIREhdvuJmgnvrv7bMvtP71OPs,448
+weathergrabber/domain/adapter/mappers/timestamp_mapper.py,sha256=0TvnW8RLcRuZHaf3gH74PKvrojPorQA0-CYXmbL1hSQ,370
+weathergrabber/domain/adapter/mappers/today_details_mapper.py,sha256=PkoD6mF6uGi41EDj61uqutPSsiIe-fMEsroUr1-RvwQ,2949
+weathergrabber/domain/adapter/mappers/uv_index_mapper.py,sha256=KnmZjHta2GLFg4xzSED7dFMZ1CF0z46UksugV1-pBDw,451
+weathergrabber/domain/adapter/mappers/weather_icon_enum_mapper.py,sha256=Wtr-DgGwlTIWav4GxlruOW0E3nFO0CGBp38OLfJc80k,375
+weathergrabber/domain/adapter/mappers/wind_mapper.py,sha256=U8KKhRi8ZcgDyKzIp0fywVpKpctxEg1o085uf8GYlUQ,366
+weathergrabber/domain/entities/air_quality_index.py,sha256=8uBqxVIKCYIvrHuP-XbCHjYZhq7Z0RmqkgAAdCw6Tp4,2680
+weathergrabber/domain/entities/city_location.py,sha256=p-11c7AwA8t-nNdvTjl9-Oc5Kw4D2XP7tI4WrATVYpQ,2382
+weathergrabber/domain/entities/color.py,sha256=HfgB5CwxrSHT05TIXCqVCy0GoRpuEl99aUrUSJhaqcE,1601
+weathergrabber/domain/entities/current_conditions.py,sha256=S14j2lL_gc2pds0wbl5M4_72PbVdubOuX8lnE_tZVTg,1477
+weathergrabber/domain/entities/daily_predictions.py,sha256=8pzmaU-yugS2Hx_6MBWAk24wlSISe1OQIRrCK_lfvbw,1618
+weathergrabber/domain/entities/day_night.py,sha256=7geOuVH9xDb1ecLKnZmj6eqp3H3kp9G0YY497cEyPtg,1442
+weathergrabber/domain/entities/forecast.py,sha256=CO0VTdMI0kjuwbpwwDNRCf_82oNtw5QkN-9GgobPet8,2399
+weathergrabber/domain/entities/health_activities.py,sha256=oaIF_nI-iaN4OIHWTL-L7QZUQxCemdmNvzprDXysK-g,1481
+weathergrabber/domain/entities/hourly_predictions.py,sha256=PFiGuo7mBoQHLR-bDirV--R126YAOzkwIHgaeRGFQSA,2179
+weathergrabber/domain/entities/label_value.py,sha256=LvrvZbSrcEUUpxvKAmYkFnpDFWsa6LFmGA9O8i6HB84,446
+weathergrabber/domain/entities/moon_phase.py,sha256=UltNeGfFYO7tQ0IGD3pLV9xvo9nO-5iDZRwk0KGST4E,596
+weathergrabber/domain/entities/moon_phase_enum.py,sha256=U4h4s5xDQfX37nkmt5ppkk6uJdamngeE-hQx3E44HHk,2185
+weathergrabber/domain/entities/precipitation.py,sha256=eXrpwMOsEJWGqV4bEBhN9niWYXalgdZRLG4-I39JZ2A,466
+weathergrabber/domain/entities/search.py,sha256=j3BzskyPl0hDWV02XTOC4tJonV5RHxr5Rop_rYMKUtA,387
+weathergrabber/domain/entities/statistics.py,sha256=yOZm7Z2osePE3nvU7trQx3F7_d_gJoJKSOo__wGUAEQ,1280
+weathergrabber/domain/entities/sunrise_sunset.py,sha256=i2FxwrCmgGEYV56Rq8Hvlf-mIcFcxn2Aw7S81gSTFcg,1206
+weathergrabber/domain/entities/temperature_hight_low.py,sha256=PQOJ5uDtfMRBR5yMxXA46xuorJC08jva2C0-WAV5yxs,909
+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/wind.py,sha256=wTDz3X1rYsnw_eNoDi1miwaomxwhiJkY_q6xrdZtLak,789
+weathergrabber-0.0.9.dist-info/licenses/LICENSE,sha256=X5JFljoqN43yFwpMLudQ9rtty4K_FeZfnz3v8Yhw23Q,1067
+weathergrabber-0.0.9.dist-info/METADATA,sha256=4FKucUYm98q6YWNOfDI3Glq990k3_XWwzNLbMwVGy6I,7473
+weathergrabber-0.0.9.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+weathergrabber-0.0.9.dist-info/entry_points.txt,sha256=m2P9a4mrJDTzuNaiTU438NA60GxCfaw7VKvruWw43N8,63
+weathergrabber-0.0.9.dist-info/top_level.txt,sha256=P3NMDJJYRIvQujf994Vb4gZrobkKWkL2gh3NF_ajQWM,15
+weathergrabber-0.0.9.dist-info/RECORD,,

{weathergrabber-0.0.8b7.dist-info → weathergrabber-0.0.9.dist-info}/WHEEL

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

weathergrabber/domain/adapter/mapper/air_quality_index_mapper.py

@@ -1,13 +0,0 @@
-
-from weathergrabber.domain.air_quality_index import AirQualityIndex
-from weathergrabber.domain.adapter.mapper.color_mapper import color_to_dict
-
-def air_quality_index_to_dict(aqi: AirQualityIndex) -> dict:
-    return {
-        "title": aqi.title,
-        "value": aqi.value,
-        "category": aqi.category,
-        "description": aqi.description,
-        "acronym": aqi.acronym,
-        "color": color_to_dict(aqi.color) if aqi.color else None,
-    }

weathergrabber/domain/adapter/mapper/city_location_mapper.py

@@ -1,8 +0,0 @@
-from weathergrabber.domain.city_location import CityLocation
-
-def city_location_to_dict(loc: CityLocation) -> dict:
-    return {
-        "city": loc.city,
-        "state_province": loc.state_province,
-        "country": loc.country,
-    }

weathergrabber/domain/adapter/mapper/color_mapper.py

@@ -1,10 +0,0 @@
-from weathergrabber.domain.color import Color
-
-def color_to_dict(color: Color) -> dict:
-    return {
-        "red": color.red,
-        "green": color.green,
-        "blue": color.blue,
-        "hex": color.hex,
-        "rgb": color.rgb,
-    }

weathergrabber/domain/adapter/mapper/current_conditions_mapper.py

@@ -1,16 +0,0 @@
-
-from weathergrabber.domain.current_conditions import CurrentConditions
-from weathergrabber.domain.adapter.mapper.city_location_mapper import city_location_to_dict
-from weathergrabber.domain.adapter.mapper.timestamp_mapper import timestamp_to_dict
-from weathergrabber.domain.adapter.mapper.weather_icon_enum_mapper import weather_icon_enum_to_dict
-from weathergrabber.domain.adapter.mapper.day_night_mapper import day_night_to_dict
-
-def current_conditions_to_dict(cc: CurrentConditions) -> dict:
-    return {
-        "location": city_location_to_dict(cc.location) if cc.location else None,
-        "timestamp": timestamp_to_dict(cc.timestamp) if cc.timestamp else None,
-        "temperature": cc.temperature,
-        "icon": weather_icon_enum_to_dict(cc.icon) if cc.icon else None,
-        "summary": cc.summary,
-        "day_night": day_night_to_dict(cc.day_night) if cc.day_night else None,
-    }

weathergrabber/domain/adapter/mapper/daily_predictions_mapper.py

@@ -1,15 +0,0 @@
-from weathergrabber.domain.daily_predictions import DailyPredictions
-from weathergrabber.domain.adapter.mapper.temperature_high_low_mapper import temperature_high_low_to_dict
-from weathergrabber.domain.adapter.mapper.weather_icon_enum_mapper import weather_icon_enum_to_dict
-from weathergrabber.domain.adapter.mapper.precipitation_mapper import precipitation_to_dict
-from weathergrabber.domain.adapter.mapper.moon_phase_mapper import moon_phase_to_dict
-
-def daily_predictions_to_dict(dp: DailyPredictions) -> dict:
-    return {
-        "title": dp.title,
-        "high_low": temperature_high_low_to_dict(dp.high_low) if dp.high_low else None,
-        "icon": weather_icon_enum_to_dict(dp.icon) if dp.icon else None,
-        "summary": dp.summary,
-        "precipitation": precipitation_to_dict(dp.precipitation) if dp.precipitation else None,
-        "moon_phase": moon_phase_to_dict(dp.moon_phase) if dp.moon_phase else None,
-    }

weathergrabber/domain/adapter/mapper/day_night_mapper.py

@@ -1,12 +0,0 @@
-from weathergrabber.domain.day_night import DayNight
-
-def day_night_to_dict(dn: DayNight) -> dict:
-    def temp_to_dict(temp):
-        return {
-            "label": temp.label,
-            "value": temp.value,
-        } if temp else None
-    return {
-        "day": temp_to_dict(dn.day) if dn.day else None,
-        "night": temp_to_dict(dn.night) if dn.night else None,
-    }

weathergrabber/domain/adapter/mapper/forecast_mapper.py

@@ -1,20 +0,0 @@
-from weathergrabber.domain.forecast import Forecast
-
-from weathergrabber.domain.adapter.mapper.search_mapper import search_to_dict
-from weathergrabber.domain.adapter.mapper.current_conditions_mapper import current_conditions_to_dict
-from weathergrabber.domain.adapter.mapper.today_details_mapper import today_details_to_dict
-from weathergrabber.domain.adapter.mapper.air_quality_index_mapper import air_quality_index_to_dict
-from weathergrabber.domain.adapter.mapper.health_activities_mapper import health_activities_to_dict
-from weathergrabber.domain.adapter.mapper.hourly_predictions_mapper import hourly_predictions_to_dict
-from weathergrabber.domain.adapter.mapper.daily_predictions_mapper import daily_predictions_to_dict
-
-def forecast_to_dict(forecast: Forecast) -> dict:
-    return {
-        "search": search_to_dict(forecast.search) if forecast.search else None,
-        "current_conditions": current_conditions_to_dict(forecast.current_conditions) if forecast.current_conditions else None,
-        "today_details": today_details_to_dict(forecast.today_details) if forecast.today_details else None,
-        "air_quality_index": air_quality_index_to_dict(forecast.air_quality_index) if forecast.air_quality_index else None,
-        "health_activities": health_activities_to_dict(forecast.health_activities) if forecast.health_activities else None,
-        "hourly_predictions": [hourly_predictions_to_dict(h) for h in forecast.hourly_predictions],
-        "daily_predictions": [daily_predictions_to_dict(d) for d in forecast.daily_predictions],
-    }

weathergrabber/domain/adapter/mapper/health_activities_mapper.py

@@ -1,8 +0,0 @@
-from weathergrabber.domain.health_activities import HealthActivities
-
-def health_activities_to_dict(ha: HealthActivities) -> dict:
-    return {
-        "category_name": ha.category_name,
-        "title": ha.title,
-        "description": ha.description,
-    }

weathergrabber/domain/adapter/mapper/hourly_predictions_mapper.py

@@ -1,19 +0,0 @@
-from weathergrabber.domain.hourly_predictions import HourlyPredictions
-from weathergrabber.domain.adapter.mapper.weather_icon_enum_mapper import weather_icon_enum_to_dict
-from weathergrabber.domain.adapter.mapper.precipitation_mapper import precipitation_to_dict
-from weathergrabber.domain.adapter.mapper.wind_mapper import wind_to_dict
-from weathergrabber.domain.adapter.mapper.uv_index_mapper import uv_index_to_dict
-
-def hourly_predictions_to_dict(hp: HourlyPredictions) -> dict:
-    return {
-        "title": hp.title,
-        "temperature": hp.temperature,
-        "icon": weather_icon_enum_to_dict(hp.icon) if hp.icon else None,
-        "summary": hp.summary,
-        "precipitation": precipitation_to_dict(hp.precipitation) if hp.precipitation else None,
-        "wind": wind_to_dict(hp.wind) if hp.wind else None,
-        "feels_like": hp.feels_like,
-        "humidity": hp.humidity,
-        "uv_index": uv_index_to_dict(hp.uv_index) if hp.uv_index else None,
-        "cloud_cover": hp.cloud_cover,
-    }

weathergrabber/domain/adapter/mapper/label_value_mapper.py

@@ -1,7 +0,0 @@
-from weathergrabber.domain.label_value import LabelValue
-
-def label_value_to_dict(lv: LabelValue) -> dict:
-    return {
-        "label": lv.label,
-        "value": lv.value,
-    }

weathergrabber/domain/adapter/mapper/moon_phase_mapper.py

@@ -1,9 +0,0 @@
-from weathergrabber.domain.moon_phase import MoonPhase
-from weathergrabber.domain.moon_phase_enum import MoonPhaseEnum
-
-def moon_phase_to_dict(mp: MoonPhase) -> dict:
-    return {
-        "icon": mp.icon.name if mp.icon else None,
-        "phase": mp.phase,
-        "label": mp.label,
-    }

weathergrabber/domain/adapter/mapper/precipitation_mapper.py

@@ -1,7 +0,0 @@
-from weathergrabber.domain.precipitation import Precipitation
-
-def precipitation_to_dict(p: Precipitation) -> dict:
-    return {
-        "percentage": p.percentage,
-        "amount": p.amount,
-    }

weathergrabber/domain/adapter/mapper/search_mapper.py

@@ -1,7 +0,0 @@
-from weathergrabber.domain.search import Search
-
-def search_to_dict(search: Search) -> dict:
-    return {
-        "id": search.id,
-        "search_name": search.search_name,
-    }

weathergrabber/domain/adapter/mapper/sunrise_sunset_mapper.py

@@ -1,13 +0,0 @@
-from weathergrabber.domain.sunrise_sunset import SunriseSunset
-from weathergrabber.domain.adapter.mapper.weather_icon_enum_mapper import weather_icon_enum_to_dict
-
-def sunrise_sunset_to_dict(ss: SunriseSunset) -> dict:
-    def icon_value_to_dict(iv):
-        return {
-            "icon": weather_icon_enum_to_dict(iv.icon) if iv.icon else None,
-            "value": iv.value,
-        } if iv else None
-    return {
-        "sunrise": icon_value_to_dict(ss.sunrise) if ss.sunrise else None,
-        "sunset": icon_value_to_dict(ss.sunset) if ss.sunset else None,
-    }

weathergrabber/domain/adapter/mapper/temperature_high_low_mapper.py

@@ -1,8 +0,0 @@
-from weathergrabber.domain.temperature_hight_low import TemperatureHighLow
-
-def temperature_high_low_to_dict(thl: TemperatureHighLow) -> dict:
-    return {
-        "high": thl.high,
-        "low": thl.low,
-        "label": thl.label,
-    }

weathergrabber/domain/adapter/mapper/timestamp_mapper.py

@@ -1,8 +0,0 @@
-from weathergrabber.domain.timestamp import Timestamp
-
-def timestamp_to_dict(ts: Timestamp) -> dict:
-    return {
-        "time": ts.time,
-        "gmt": ts.gmt,
-        "text": ts.text,
-    }

weathergrabber/domain/adapter/mapper/today_details_mapper.py

@@ -1,21 +0,0 @@
-
-from weathergrabber.domain.today_details import TodayDetails
-from weathergrabber.domain.adapter.mapper.label_value_mapper import label_value_to_dict
-from weathergrabber.domain.adapter.mapper.sunrise_sunset_mapper import sunrise_sunset_to_dict
-from weathergrabber.domain.adapter.mapper.temperature_high_low_mapper import temperature_high_low_to_dict
-from weathergrabber.domain.adapter.mapper.uv_index_mapper import uv_index_to_dict
-from weathergrabber.domain.adapter.mapper.moon_phase_mapper import moon_phase_to_dict
-
-def today_details_to_dict(td: TodayDetails) -> dict:
-    return {
-        "feelslike": label_value_to_dict(td.feelslike) if td.feelslike else None,
-        "sunrise_sunset": sunrise_sunset_to_dict(td.sunrise_sunset) if td.sunrise_sunset else None,
-        "high_low": temperature_high_low_to_dict(td.high_low) if td.high_low else None,
-        "wind": label_value_to_dict(td.wind) if td.wind else None,
-        "humidity": label_value_to_dict(td.humidity) if td.humidity else None,
-        "dew_point": label_value_to_dict(td.dew_point) if td.dew_point else None,
-        "pressure": label_value_to_dict(td.pressure) if td.pressure else None,
-        "uv_index": uv_index_to_dict(td.uv_index) if td.uv_index else None,
-        "visibility": label_value_to_dict(td.visibility) if td.visibility else None,
-        "moon_phase": moon_phase_to_dict(td.moon_phase) if td.moon_phase else None,
-    }

weathergrabber/domain/adapter/mapper/uv_index_mapper.py

@@ -1,9 +0,0 @@
-from weathergrabber.domain.uv_index import UVIndex
-
-def uv_index_to_dict(uv: UVIndex) -> dict:
-    return {
-        "string_value": uv.string_value,
-        "index": uv.index,
-        "of": uv.of,
-        "label": uv.label,
-    }

weathergrabber/domain/adapter/mapper/weather_icon_enum_mapper.py

@@ -1,8 +0,0 @@
-from weathergrabber.domain.weather_icon_enum import WeatherIconEnum
-
-def weather_icon_enum_to_dict(icon: WeatherIconEnum) -> dict:
-    return {
-        "name": icon.name,
-        "fa_icon": icon.fa_icon,
-        "emoji_icon": icon.emoji_icon,
-    }

weathergrabber/domain/adapter/mapper/wind_mapper.py

@@ -1,7 +0,0 @@
-def wind_to_dict(wind):
-    if wind is None:
-        return None
-    return {
-        "direction": wind.direction,
-        "speed": wind.speed
-    }