weathergrabber 0.0.8b7__tar.gz → 0.0.9__tar.gz

{weathergrabber-0.0.8b7/weathergrabber.egg-info → weathergrabber-0.0.9}/PKG-INFO

@@ -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.8b7 → weathergrabber-0.0.9}/README.md

@@ -19,6 +19,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.
@@ -148,24 +150,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:
@@ -174,4 +194,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.8b7 → weathergrabber-0.0.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "weathergrabber"
-version = "0.0.8b7"
+version = "0.0.9"
 description = "A grabber for weather.com data with various output formats."
 readme = "README.md"
 requires-python = ">=3.12"
@@ -14,6 +14,12 @@ dependencies = [
     "requests>=2.32.4"
 ]
 
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.0.0",
+    "pytest-cov>=4.1.0",
+]
+
 [build-system]
 requires = ["setuptools>=61", "wheel"]
 build-backend = "setuptools.build_meta"
@@ -23,4 +29,10 @@ weathergrabber = "weathergrabber.cli:main_cli"
 
 [project.urls]
 homepage = "https://github.com/cjuniorfox/weather"
-repository = "https://github.com/cjuniorfox/weather"
+repository = "https://github.com/cjuniorfox/weather"
+
+[tool.pytest.ini_options]
+filterwarnings = [
+    "ignore:unclosed database:ResourceWarning",
+    "ignore::DeprecationWarning:sqlite3",
+]

{weathergrabber-0.0.8b7 → weathergrabber-0.0.9}/tests/test_core.py

@@ -12,7 +12,9 @@ def test_main_invokes_application(mock_app):
         'lang': 'en-US',
         'output': 'console',
         'keep_open': False,
-        'icons': 'emoji'
+        'icons': 'emoji',
+        'force_cache': False,
+        'cache_statistics': False,
     }
     main(**params)
     mock_app.assert_called_once()
@@ -25,7 +27,9 @@ def test_main_invokes_application(mock_app):
     assert args[0].output_format.name.lower() == 'console'
     assert args[0].keep_open is False
     assert args[0].icons.name.lower() == 'emoji'
-
+    assert args[0].force_cache is False
+    assert args[0].cache_statistics is False
+    
 @patch('weathergrabber.core.WeatherGrabberApplication')
 def test_main_sets_log_level(mock_app):
     from weathergrabber.core import main
@@ -36,6 +40,8 @@ def test_main_sets_log_level(mock_app):
         lang='fr-FR',
         output='json',
         keep_open=True,
-        icons='fa'
+        icons='fa',
+        force_cache=False,
+        cache_statistics=False,
     )
     assert logging.getLogger().level == logging.DEBUG

{weathergrabber-0.0.8b7 → weathergrabber-0.0.9}/weathergrabber/__init__.py

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

weathergrabber-0.0.9/weathergrabber/adapter/repository/forecast_repository.py

@@ -0,0 +1,135 @@
+import sqlite3
+import json
+import os
+import tempfile
+from datetime import datetime
+from typing import Optional
+import logging
+from weathergrabber.domain.entities.forecast import Forecast
+from weathergrabber.domain.adapter.mappers.forecast_mapper import forecast_to_dict, dict_to_forecast
+
+class ForecastRepository:
+    def __init__(self, db_path: str = None):
+        # Use /tmp directory for ephemeral storage by default
+        if db_path is None:
+            db_path = os.path.join(tempfile.gettempdir(), "weather_forecasts.db")
+        
+        self.logger = logging.getLogger(__name__)
+        self.logger.info(f"Initializing ForecastRepository with DB path: {db_path}")
+        self.db_path = db_path
+        self._initialize_database()
+
+    def _initialize_database(self):
+        self.logger.debug("Initializing database and creating tables if they do not exist.")
+        try:
+            with sqlite3.connect(self.db_path) as conn:
+                cursor = conn.cursor()
+                cursor.execute('''
+                    CREATE TABLE IF NOT EXISTS forecasts (
+                        id INTEGER PRIMARY KEY AUTOINCREMENT,
+                        location_id TEXT NOT NULL,
+                        search_name TEXT,
+                        forecast_data TEXT NOT NULL,
+                        created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+                        updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+                    )
+                ''')
+                # Create indexes for fast retrieval
+                cursor.execute("CREATE INDEX IF NOT EXISTS idx_location_id ON forecasts (location_id)")
+                conn.commit()
+                self.logger.debug(f"Database initialized successfully at {self.db_path}")
+        except sqlite3.Error as e:
+            self.logger.error(f"Error initializing database: {e}")
+            raise
+
+    def save_forecast(self, location_id: str, search_name: str, forecast_data: Forecast) -> None:
+        forecast_dict_data = forecast_to_dict(forecast_data)
+        now = datetime.now().isoformat()
+        with sqlite3.connect(self.db_path) as conn:
+            cursor = conn.cursor()
+            cursor.execute('''
+                INSERT INTO forecasts (location_id, search_name, forecast_data, created_at, updated_at)
+                VALUES (?, ?, ?, ?, ?)
+            ''', (
+                location_id,
+                search_name,
+                json.dumps(forecast_dict_data),
+                now,
+                now
+            ))
+            conn.commit()
+
+    def get_by_location_id(self, location_id: str) -> Optional[Forecast]:
+        with sqlite3.connect(self.db_path) as conn:
+            cursor = conn.cursor()
+            cursor.execute('''
+                SELECT forecast_data FROM forecasts
+                WHERE location_id = ? ORDER BY created_at DESC
+                LIMIT 1
+            ''', (location_id,))
+            row = cursor.fetchone()
+            forecast_dict_data = json.loads(row[0]) if row else None
+            return dict_to_forecast(forecast_dict_data) if forecast_dict_data else None
+        
+    def get_by_search_name(self, search_name: str) -> Optional[Forecast]:
+        with sqlite3.connect(self.db_path) as conn:
+            cursor = conn.cursor()
+            cursor.execute('''
+                SELECT forecast_data FROM forecasts
+                WHERE search_name = ? ORDER BY created_at DESC
+                LIMIT 1
+            ''', (search_name,))
+            row = cursor.fetchone()
+            forecast_dict_data = json.loads(row[0]) if row else None
+            return dict_to_forecast(forecast_dict_data) if forecast_dict_data else None
+
+    def clear_cache(self) -> None:
+        """Clear all cached forecasts from the database."""
+        try:
+            with sqlite3.connect(self.db_path) as conn:
+                cursor = conn.cursor()
+                cursor.execute("DELETE FROM forecasts")
+                conn.commit()
+                self.logger.info("Cache cleared successfully")
+        except sqlite3.Error as e:
+            self.logger.error(f"Error clearing cache: {e}")
+
+    def get_cache_stats(self) -> dict:
+        """Get statistics about the cached forecasts."""
+        try:
+            with sqlite3.connect(self.db_path) as conn:
+                cursor = conn.cursor()
+                cursor.execute("SELECT COUNT(*) FROM forecasts")
+                total_count = cursor.fetchone()[0]
+                
+                cursor.execute("""
+                    SELECT COUNT(DISTINCT location_id) as unique_locations,
+                           COUNT(DISTINCT search_name) as unique_search_names
+                    FROM forecasts
+                """)
+                stats = cursor.fetchone()
+                
+                return {
+                    'total_forecasts': total_count,
+                    'unique_locations': stats[0],
+                    'unique_search_names': stats[1],
+                    'database_path': self.db_path
+                }
+        except sqlite3.Error as e:
+            self.logger.error(f"Error getting cache stats: {e}")
+            return {'error': str(e)}
+
+    def cleanup_old_forecasts(self, hours_old: int = 24) -> None:
+        """Remove forecasts older than specified hours."""
+        try:
+            with sqlite3.connect(self.db_path) as conn:
+                cursor = conn.cursor()
+                cursor.execute("""
+                    DELETE FROM forecasts 
+                    WHERE created_at < datetime('now', '-{} hours')
+                """.format(hours_old))
+                deleted_count = cursor.rowcount
+                conn.commit()
+                self.logger.info(f"Cleaned up {deleted_count} old forecasts")
+        except sqlite3.Error as e:
+            self.logger.error(f"Error cleaning up old forecasts: {e}")

{weathergrabber-0.0.8b7 → weathergrabber-0.0.9}/weathergrabber/adapter/tty/console_tty.py

@@ -1,13 +1,13 @@
-from weathergrabber.usecase.use_case import UseCase
+from weathergrabber.application.usecases.weather_forecast_uc import WeatherForecastUC
 from weathergrabber.domain.adapter.params import Params
 from weathergrabber.domain.adapter.icon_enum import IconEnum
-from weathergrabber.domain.weather_icon_enum import WeatherIconEnum
-from weathergrabber.weathergrabber_application import WeatherGrabberApplication
+from weathergrabber.domain.entities.weather_icon_enum import WeatherIconEnum
+from weathergrabber.application.weathergrabber_application import WeatherGrabberApplication
 import logging
 
 class ConsoleTTY:
 
-    def __init__(self, use_case: UseCase):
+    def __init__(self, use_case: WeatherForecastUC):
         self.logger = logging.getLogger(__name__)
         self.use_case = use_case
         pass

{weathergrabber-0.0.8b7 → weathergrabber-0.0.9}/weathergrabber/adapter/tty/json_tty.py

@@ -1,12 +1,12 @@
-from weathergrabber.usecase.use_case import UseCase
+from weathergrabber.application.usecases.weather_forecast_uc import WeatherForecastUC
 from weathergrabber.domain.adapter.params import Params
-from weathergrabber.domain.adapter.mapper.forecast_mapper import forecast_to_dict
+from weathergrabber.domain.adapter.mappers.forecast_mapper import forecast_to_dict
 import logging
 import json
 
 class JsonTTY:
 
-    def __init__(self, use_case: UseCase):
+    def __init__(self, use_case: WeatherForecastUC):
         self.logger = logging.getLogger(__name__)
         self.use_case = use_case
         pass

weathergrabber-0.0.9/weathergrabber/adapter/tty/statistics_tty.py

@@ -0,0 +1,35 @@
+from weathergrabber.application.usecases.statistics_uc import StatisticsUC
+from weathergrabber.domain.adapter.params import Params
+from weathergrabber.domain.adapter.output_enum import OutputEnum
+from weathergrabber.domain.adapter.mappers.statistics_mapper import statistics_to_dict
+from weathergrabber.domain.entities.statistics import Statistics
+import logging
+import json
+
+class StatisticsTTY:
+    def __init__(self, statistics_uc: StatisticsUC):
+        self.logger = logging.getLogger(__name__)
+        self.statistics_uc = statistics_uc
+
+    def execute(self, params : Params):
+        statistics = self.statistics_uc.execute(params)
+        print_value = self.json_print(statistics) if (params.output_format == OutputEnum.JSON) else self.tty_print(statistics)
+        print(print_value)
+            
+    def tty_print(self, statistics: Statistics):
+        self.logger.info("Preparing TTY output for statistics")
+        lines = [
+            "",
+            "WeatherGrabber Statistics",
+            "=========================",
+            f"Total Forecasts: {statistics.total_forecasts}",
+            f"Unique Locations: {statistics.unique_locations}",
+            f"Unique Search Names: {statistics.unique_search_names}",
+            f"Database Path: {statistics.database_path}",
+            "",
+        ]
+        return "\n".join(lines)
+    
+    def json_print(self, statistics: Statistics):
+        self.logger.info("Preparing JSON output for statistics")
+        return json.dumps(statistics_to_dict(statistics))

{weathergrabber-0.0.8b7 → weathergrabber-0.0.9}/weathergrabber/adapter/tty/waybar_tty.py

@@ -1,13 +1,13 @@
-from weathergrabber.usecase.use_case import UseCase
+from weathergrabber.application.usecases.weather_forecast_uc import WeatherForecastUC
 from weathergrabber.domain.adapter.params import Params
 from weathergrabber.domain.adapter.icon_enum import IconEnum
-from weathergrabber.domain.weather_icon_enum import WeatherIconEnum
+from weathergrabber.domain.entities.weather_icon_enum import WeatherIconEnum
 import logging
 import json
 
 class WaybarTTY:
 
-    def __init__(self, use_case: UseCase):
+    def __init__(self, use_case: WeatherForecastUC):
         self.logger = logging.getLogger(__name__)
         self.use_case = use_case
         pass

{weathergrabber-0.0.8b7/weathergrabber/service → weathergrabber-0.0.9/weathergrabber/application/services}/extract_aqi_service.py

@@ -1,5 +1,5 @@
 import logging
-from weathergrabber.domain.air_quality_index import AirQualityIndex
+from weathergrabber.domain.entities.air_quality_index import AirQualityIndex
 from pyquery import PyQuery
 
 class ExtractAQIService:

{weathergrabber-0.0.8b7/weathergrabber/service → weathergrabber-0.0.9/weathergrabber/application/services}/extract_current_conditions_service.py

@@ -1,10 +1,10 @@
 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
+from weathergrabber.domain.entities.weather_icon_enum import WeatherIconEnum
+from weathergrabber.domain.entities.city_location import CityLocation
+from weathergrabber.domain.entities.timestamp import Timestamp
+from weathergrabber.domain.entities.day_night import DayNight
+from weathergrabber.domain.entities.current_conditions import CurrentConditions
 
 class ExtractCurrentConditionsService:
     def __init__(self):

{weathergrabber-0.0.8b7/weathergrabber/service → weathergrabber-0.0.9/weathergrabber/application/services}/extract_daily_forecast_oldstyle_service.py

@@ -1,9 +1,9 @@
 import logging
 from pyquery import PyQuery
-from weathergrabber.domain.daily_predictions import DailyPredictions
-from weathergrabber.domain.temperature_hight_low import TemperatureHighLow
-from weathergrabber.domain.weather_icon_enum import WeatherIconEnum
-from weathergrabber.domain.precipitation import Precipitation
+from weathergrabber.domain.entities.daily_predictions import DailyPredictions
+from weathergrabber.domain.entities.temperature_hight_low import TemperatureHighLow
+from weathergrabber.domain.entities.weather_icon_enum import WeatherIconEnum
+from weathergrabber.domain.entities.precipitation import Precipitation
 from typing import List
 
 class ExtractDailyForecastOldstyleService:

{weathergrabber-0.0.8b7/weathergrabber/service → weathergrabber-0.0.9/weathergrabber/application/services}/extract_daily_forecast_service.py

@@ -1,11 +1,11 @@
 import logging
 from pyquery import PyQuery
-from weathergrabber.domain.precipitation import Precipitation
-from weathergrabber.domain.weather_icon_enum import WeatherIconEnum
-from weathergrabber.domain.moon_phase_enum import MoonPhaseEnum
-from weathergrabber.domain.moon_phase import MoonPhase
-from weathergrabber.domain.temperature_hight_low import TemperatureHighLow
-from weathergrabber.domain.daily_predictions import DailyPredictions
+from weathergrabber.domain.entities.precipitation import Precipitation
+from weathergrabber.domain.entities.weather_icon_enum import WeatherIconEnum
+from weathergrabber.domain.entities.moon_phase_enum import MoonPhaseEnum
+from weathergrabber.domain.entities.moon_phase import MoonPhase
+from weathergrabber.domain.entities.temperature_hight_low import TemperatureHighLow
+from weathergrabber.domain.entities.daily_predictions import DailyPredictions
 
 from typing import List
 

{weathergrabber-0.0.8b7/weathergrabber/service → weathergrabber-0.0.9/weathergrabber/application/services}/extract_health_activities_service.py

@@ -1,6 +1,6 @@
 import logging
 from pyquery import PyQuery
-from weathergrabber.domain.health_activities import HealthActivities
+from weathergrabber.domain.entities.health_activities import HealthActivities
 
 class ExtractHealthActivitiesService:
     def __init__(self):

{weathergrabber-0.0.8b7/weathergrabber/service → weathergrabber-0.0.9/weathergrabber/application/services}/extract_hourly_forecast_oldstyle_service.py

@@ -1,8 +1,8 @@
 import logging
 from pyquery import PyQuery
-from weathergrabber.domain.hourly_predictions import HourlyPredictions
-from weathergrabber.domain.weather_icon_enum import WeatherIconEnum
-from weathergrabber.domain.precipitation import Precipitation
+from weathergrabber.domain.entities.hourly_predictions import HourlyPredictions
+from weathergrabber.domain.entities.weather_icon_enum import WeatherIconEnum
+from weathergrabber.domain.entities.precipitation import Precipitation
 from typing import List
 
 class ExtractHourlyForecastOldstyleService:

{weathergrabber-0.0.8b7/weathergrabber/service → weathergrabber-0.0.9/weathergrabber/application/services}/extract_hourly_forecast_service.py

@@ -1,10 +1,10 @@
 import logging
 from pyquery import PyQuery
-from weathergrabber.domain.hourly_predictions import HourlyPredictions
-from weathergrabber.domain.weather_icon_enum import WeatherIconEnum
-from weathergrabber.domain.uv_index import UVIndex
-from weathergrabber.domain.precipitation import Precipitation
-from weathergrabber.domain.wind import Wind
+from weathergrabber.domain.entities.hourly_predictions import HourlyPredictions
+from weathergrabber.domain.entities.weather_icon_enum import WeatherIconEnum
+from weathergrabber.domain.entities.uv_index import UVIndex
+from weathergrabber.domain.entities.precipitation import Precipitation
+from weathergrabber.domain.entities.wind import Wind
 from typing import List
 
 

{weathergrabber-0.0.8b7/weathergrabber/service → weathergrabber-0.0.9/weathergrabber/application/services}/extract_today_details_service.py

@@ -1,12 +1,12 @@
 import logging
 from pyquery import PyQuery
-from weathergrabber.domain.today_details import TodayDetails
-from weathergrabber.domain.temperature_hight_low import TemperatureHighLow
-from weathergrabber.domain.uv_index import UVIndex
-from weathergrabber.domain.moon_phase import MoonPhase
-from weathergrabber.domain.moon_phase_enum import MoonPhaseEnum
-from weathergrabber.domain.label_value import LabelValue
-from weathergrabber.domain.sunrise_sunset import SunriseSunset
+from weathergrabber.domain.entities.today_details import TodayDetails
+from weathergrabber.domain.entities.temperature_hight_low import TemperatureHighLow
+from weathergrabber.domain.entities.uv_index import UVIndex
+from weathergrabber.domain.entities.moon_phase import MoonPhase
+from weathergrabber.domain.entities.moon_phase_enum import MoonPhaseEnum
+from weathergrabber.domain.entities.label_value import LabelValue
+from weathergrabber.domain.entities.sunrise_sunset import SunriseSunset
 
 class ExtractTodayDetailsService:
     def __init__(self):
@@ -57,7 +57,7 @@ class ExtractTodayDetailsService:
         moon_phase_icon = icons.eq(7).attr('name')  #'phase-2'
         moon_phase_value = values.eq(7).text()  #'Waxing Crescent'
 
-        self.logger.debug(f"Creating domain objects for today details...")
+        self.logger.debug("Creating domain objects for today details...")
 
         sunrise_sunset = SunriseSunset(sunrise=sunrise, sunset=sunset)
         high_low = TemperatureHighLow.from_string(high_low_value, label=high_low_label)

weathergrabber-0.0.9/weathergrabber/application/services/retrieve_forecast_from_cache_service.py

@@ -0,0 +1,27 @@
+from weathergrabber.adapter.repository.forecast_repository import ForecastRepository
+from weathergrabber.domain.adapter.params import Params
+from weathergrabber.domain.entities.forecast import Forecast
+from typing import Optional
+import logging
+
+class RetrieveForecastFromCacheService:
+    def __init__(self, forecast_repository: ForecastRepository):
+        self.forecast_repository = forecast_repository
+        self.log = logging.getLogger(__name__)
+
+    def execute(self, params: Params) -> Optional[Forecast]:
+        """Retrieve forecast from cache based on parameters."""
+        if params.location.id:
+            forecast = self.forecast_repository.get_by_location_id(params.location.id)
+        elif params.location.search_name:
+            forecast = self.forecast_repository.get_by_search_name(params.location.search_name)
+        else:
+            self.log.debug("No location_id provided in params; cannot retrieve from cache.")
+            raise ValueError("Location ID must be provided to retrieve forecast from cache.")
+
+        if forecast:
+            self.log.debug("Forecast retrieved from cache successfully.")
+            return forecast
+        else:
+            self.log.debug("No forecast found in cache.")
+            raise ValueError("No forecast found in cache for the given location.")

weathergrabber-0.0.9/weathergrabber/application/services/retrieve_statistics_service.py

@@ -0,0 +1,20 @@
+from weathergrabber.adapter.repository.forecast_repository import ForecastRepository
+from weathergrabber.domain.entities.statistics import Statistics
+from weathergrabber.domain.adapter.mappers.statistics_mapper import dict_to_statistics
+import logging
+
+class RetrieveStatisticsService:
+    def __init__(self, weather_repository: ForecastRepository):
+        self.log = logging.getLogger(__name__)
+        self.weather_repository = weather_repository
+    
+    def execute(self) -> Statistics:
+        """Retrieve and process database."""
+        self.log.debug("Retrieving statistics from repository...")
+        
+        result = self.weather_repository.get_cache_stats()
+        statistics = dict_to_statistics(result)
+        
+        self.log.debug(f"Statistics retrieved successfully: {statistics}")
+        return statistics
+        

weathergrabber-0.0.9/weathergrabber/application/services/save_forecast_to_cache_service.py

@@ -0,0 +1,21 @@
+from weathergrabber.adapter.repository.forecast_repository import ForecastRepository
+from weathergrabber.domain.entities.forecast import Forecast
+import logging
+
+
+class SaveForecastToCacheService:
+    def __init__(self, forecast_repository: ForecastRepository):
+        self.forecast_repository = forecast_repository
+        self.logger = logging.getLogger(__name__)
+
+    def execute(self, forecast : Forecast) -> None:
+
+        self.logger.info("Saving forecast to cache")
+        
+        self.forecast_repository.save_forecast(
+            location_id=forecast.search.id,
+            search_name=forecast.search.search_name,
+            forecast_data=forecast
+        )
+        
+        self.logger.debug("Forecast saved to cache successfully")