mirror of
https://github.com/Akkudoktor-EOS/EOS.git
synced 2025-10-11 11:56:17 +00:00
bd38b3c5ef
Some checks failed
docker-build / platform-excludes (push) Has been cancelled
pre-commit / pre-commit (push) Has been cancelled
Run Pytest on Pull Request / test (push) Has been cancelled
docker-build / build (push) Has been cancelled
docker-build / merge (push) Has been cancelled
Close stale pull requests/issues / Find Stale issues and PRs (push) Has been cancelled
* Fix logging configuration issues that made logging stop operation. Switch to Loguru logging (from Python logging). Enable console and file logging with different log levels. Add logging documentation. * Fix logging configuration and EOS configuration out of sync. Added tracking support for nested value updates of Pydantic models. This used to update the logging configuration when the EOS configurationm for logging is changed. Should keep logging config and EOS config in sync as long as all changes to the EOS logging configuration are done by set_nested_value(), which is the case for the REST API. * Fix energy management task looping endlessly after the second update when trying to update the last_update datetime. * Fix get_nested_value() to correctly take values from the dicts in a Pydantic model instance. * Fix usage of model classes instead of model instances in nested value access when evaluation the value type that is associated to each key. * Fix illegal json format in prediction documentation for PVForecastAkkudoktor provider. * Fix documentation qirks and add EOS Connect to integrations. * Support deprecated fields in configuration in documentation generation and EOSdash. * Enhance EOSdash demo to show BrightSky humidity data (that is often missing) * Update documentation reference to German EOS installation videos. Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>
75 lines
2.9 KiB
Python
75 lines
2.9 KiB
Python
"""Retrieves weather forecast data from an import file.
|
|
|
|
This module provides classes and mappings to manage weather data obtained from
|
|
an import file, including support for various weather attributes such as temperature,
|
|
humidity, cloud cover, and solar irradiance. The data is mapped to the `WeatherDataRecord`
|
|
format, enabling consistent access to forecasted and historical weather attributes.
|
|
"""
|
|
|
|
from pathlib import Path
|
|
from typing import Optional, Union
|
|
|
|
from loguru import logger
|
|
from pydantic import Field, field_validator
|
|
|
|
from akkudoktoreos.config.configabc import SettingsBaseModel
|
|
from akkudoktoreos.prediction.predictionabc import PredictionImportProvider
|
|
from akkudoktoreos.prediction.weatherabc import WeatherProvider
|
|
|
|
|
|
class WeatherImportCommonSettings(SettingsBaseModel):
|
|
"""Common settings for weather data import from file or JSON string."""
|
|
|
|
import_file_path: Optional[Union[str, Path]] = Field(
|
|
default=None,
|
|
description="Path to the file to import weather data from.",
|
|
examples=[None, "/path/to/weather_data.json"],
|
|
)
|
|
|
|
import_json: Optional[str] = Field(
|
|
default=None,
|
|
description="JSON string, dictionary of weather forecast value lists.",
|
|
examples=['{"weather_temp_air": [18.3, 17.8, 16.9]}'],
|
|
)
|
|
|
|
# Validators
|
|
@field_validator("import_file_path", mode="after")
|
|
@classmethod
|
|
def validate_import_file_path(cls, value: Optional[Union[str, Path]]) -> Optional[Path]:
|
|
if value is None:
|
|
return None
|
|
if isinstance(value, str):
|
|
value = Path(value)
|
|
"""Ensure file is available."""
|
|
value.resolve()
|
|
if not value.is_file():
|
|
raise ValueError(f"Import file path '{value}' is not a file.")
|
|
return value
|
|
|
|
|
|
class WeatherImport(WeatherProvider, PredictionImportProvider):
|
|
"""Fetch weather forecast data from import file or JSON string.
|
|
|
|
WeatherImport is a singleton-based class that retrieves weather forecast data
|
|
from a file or JSON string and maps it to `WeatherDataRecord` fields. It manages the forecast
|
|
over a range of hours into the future and retains historical data.
|
|
"""
|
|
|
|
@classmethod
|
|
def provider_id(cls) -> str:
|
|
"""Return the unique identifier for the WeatherImport provider."""
|
|
return "WeatherImport"
|
|
|
|
def _update_data(self, force_update: Optional[bool] = False) -> None:
|
|
if self.config.weather.provider_settings is None:
|
|
logger.debug(f"{self.provider_id()} data update without provider settings.")
|
|
return
|
|
if self.config.weather.provider_settings.import_file_path:
|
|
self.import_from_file(
|
|
self.config.weather.provider_settings.import_file_path, key_prefix="weather"
|
|
)
|
|
if self.config.weather.provider_settings.import_json:
|
|
self.import_from_json(
|
|
self.config.weather.provider_settings.import_json, key_prefix="weather"
|
|
)
|