chore(release): Release v0.2.0

Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>

.pre-commit-config.yaml

@@ -1,8 +1,9 @@
 # Exclude some file types from automatic code style
 exclude: \.(json|csv)$
 repos:
+  # --- Basic sanity checks ---
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-merge-conflict
       - id: check-toml
@@ -10,31 +11,38 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: check-merge-conflict
-        exclude: '\.rst$'  # Exclude .rst files
+        exclude: '\.rst$'  # Exclude .rst files from whitespace cleanup
+
+  # --- Import sorting ---
   - repo: https://github.com/PyCQA/isort
-    rev: 6.0.0
+    rev: 7.0.0
     hooks:
       - id: isort
-        name: isort
+
+  # --- Linting + Formatting via Ruff ---
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.6
+    rev: v0.14.1
     hooks:
-      # Run the linter and fix simple issues automatically
+      # Run the linter and fix simple isssues automatically
       - id: ruff
         args: [--fix]
-      # Run the formatter.
+      # Run the formatter
       - id: ruff-format
+
+  # --- Static type checking ---
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.15.0'
+    rev: v1.18.2
     hooks:
       - id: mypy
         additional_dependencies:
-          - "types-requests==2.32.0.20241016"
-          - "pandas-stubs==2.2.3.241009"
-          - "numpy==2.1.3"
+          - types-requests==2.32.4.20250913
+          - pandas-stubs==2.3.2.250926
+          - tokenize-rt==3.2.0
         pass_filenames: false
+
+  # --- Markdown linter ---
   - repo: https://github.com/jackdewinter/pymarkdown
-    rev: v0.9.29
+    rev: v0.9.32
     hooks:
       - id: pymarkdown
         files: ^docs/
@@ -42,7 +50,31 @@ repos:
         args:
           - --config=docs/pymarkdown.json
           - scan
-  - repo: https://github.com/jorisroovers/gitlint
-    rev:  v0.19.1
+
+  # --- Commit message linting ---
+  # - Local cross-platform hooks
+  - repo: local
     hooks:
-      - id: gitlint
+      # Validate commit messages (using Python wrapper)
+      - id: commitizen-commit
+        name: Commitizen (venv-aware)
+        entry: python3 scripts/cz_check_commit_message.py
+        language: system
+        stages: [commit-msg]
+        pass_filenames: false
+
+      # Branch name check on push (using Python wrapper)
+      - id: commitizen-branch
+        name: Commitizen branch check
+        entry: python3 scripts/cz_check_branch.py
+        language: system
+        stages: [pre-push]
+        pass_filenames: false
+
+      # Validate new commit messages before push (using Python wrapper)
+      - id: commitizen-new-commits
+        name: Commitizen (check new commits only, .venv aware)
+        entry: python3 -m scripts.cz_check_new_commits
+        language: system
+        stages: [pre-push]
+        pass_filenames: false

CHANGELOG.md

@@ -5,114 +5,252 @@ All notable changes to the akkudoktoreos project will be documented in this file
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.1.0] - 2025-09-30
+## 0.2.0 (2025-11-09)
 
-### Added
+The most important new feature is **automatic optimization**.
+EOS can now independently perform optimization at regular intervals.
+This is based on the configured system parameters and forecasts, and also uses supplied
+measurement data, such as the current battery SoC.
+The result is an energy-management plan as well as the optimization output.
+The existing optimization interface using `POST /optimize` remains available and can still
+be used as before.
 
-- Added Changelog for 0.0.0 amd 0.1.0
+In addition, bugs were fixed and new features were added:
 
-## [0.0.0] - 2025-09-30
+- Automatic optimization creates a **default configuration** if none is provided.
+  This is intended to make it easier to create a custom configuration by adapting the default.
+- The parameters of the genetic optimization algorithm (number of generations, etc.) are now
+  configurable.
+- For home appliances, start windows can now be specified (experimental).
+- Configuration files from previous versions are converted to the current format on first launch.
+- There are now measurement keys that are permanently assigned to a specific device simulation.
+  This simplifies providing measurement values for device simulations (e.g. battery SoC).
+- The infrastructure and first applications for **feed-in tariff forecasting**
+  (currently only fixed tariffs) are now integrated.
+- EOSdash has been expanded with new tabs for displaying the **energy-management plan**
+  and **predictions**.
+- The documentation has been updated and expanded in many places.
+
+### Feat
+
+- Energy-management plan generation based on S2 standard instructions
+- Feed-in-tariff prediction support (incl. tests & docs)
+- `LoadAkkudoktorAdjusted` load prediction variant
+- Standardized measurement keys for battery/EV SoC
+- Measurement keys configurable via EOS configuration
+- Setup default device configuration for automatic optimization
+- Health endpoints show version + last optimization timestamps
+- Configuration of genetic algorithm parameters
+- Configuration options for home-appliance time windows
+- Mitigation of legacy configuration
+- Config backup enhancements:
+
+  - Timestamp-based backup IDs
+  - API to list backups
+  - API to revert to a specific backup
+  - EOSdash Admin tab integration
+
+- Pendulum date types via `pydantic_extra_types.pendulum_dt`
+- `Time`, `TimeWindow`, `TimeWindowSequence`, and `to_time` helpers in `datetimeutil`
+- Extended `DataRecord` with configurable field-like semantics
+- EOSdash: Solution view now displays genetic optimization results and aggregated totals
+- EOSdash UI:
+
+  - Plan tab
+  - Predictions tab
+  - Cache management in Admin tab
+  - About tab
+
+- Pydantic merge model tests
+- Developer profiling entry in Makefile
+- Changelog & docs updated for commitizen release flow
+- Developer documentation updated
+- Improved install & development documentation
+
+### Changed
+
+- Battery simulation
+
+  - Performance improvements
+  - Charge + start times now reflect realistic simulation
+
+- Appliance simulation:
+
+  - Time windows may roll over to next day
+
+- Revised load prediction by splitting original `LoadAkkudoktor` into:
+
+  - `LoadAkkudoktor`
+  - `LoadAkkudoktorAdjusted`
+
+### Fixed
+
+- Correct URL/path for Akkudoktor forum in README
+- Automatic optimization:
+
+  - Reuses previous start solution
+  - Interval execution + locking + new endpoints
+  - Properly loads required data
+  - EV charge-rate migration for proper availability
+
+- Genetic common settings consistently available
+- Config markdown generation
+- Recognize environment variables on EOS server startup
+- Remove `0.0.0.0 → localhost` translation on Windows
+- Allow hostnames as well as IPs
+- Access Pydantic model fields via class instead of instance
+- Down-sampling in `key_to_array`
+- `/v1/admin/cache/clear` clears all cache files; added `/clear-expired`
+- Use `tzfpy` instead of timezonefinder for more accurate EU timezones
+- Explicit provider settings in config instead of union
+- ClearOutside weather prediction irradiance calculation
+- Test config file priority without `config_eos` fixture
+- Complete optimization sample-request documentation
+- Replace gitlint with commitizen
+- Synchronize pre-commit config with real dependencies
+- Add missing `babel` to requirements
+- Fix documentation, tests, and implementation around optimization + predictions
+
+### Chore
+
+- Use memory cache for inverter interpolation
+- Refactor genetic modules (split config, remove device singleton)
+- Rename memory cache to `CacheEnergyManagementStore`
+- Use class properties for config/EMS/prediction mixins
+- Skip matplotlib debug logs
+- Auto-sync Bokeh JS CDN version
+- Rename `hello.py` → `about.py` in EOSdash
+- Remove EOSdash demo page
+- Split server test from system test
+- Move doc utils to `generate_config_md.py`
+- Improve documentation for pydantic merge models
+- Remove pendulum warning from README
+- Drop GitHub Discussions from contributing docs
+- Rename or reorganize files / classes during refactors
+
+### BREAKING CHANGES
+
+EOS configuration + v1 API have changed:
+
+- `available_charge_rates_percent` removed → replaced by `charge_rate`
+- Optimization parameter `hours` → renamed to `horizon_hours`
+- Device config must explicitly list devices + properties
+- Prediction providers now explicit (instead of union)
+- Measurement keys provided as lists
+- Feed-in-tariff providers must be explicitly configured
+- `/v1/measurement/loadxxx` endpoints removed → use generic measurement endpoints
+- `/v1/admin/cache/clear` now clears **all*- cache files;
+  `/v1/admin/cache/clear-expired` only clears expired entries
+
+## v0.1.0 (2025-09-30)
+
+### Feat
+
+- added Changelog for 0.0.0 and 0.1.0
+
+## v0.0.0 (2025-09-30)
 
 This version represents one year of development of EOS (Energy Optimization System). From this point forward, release management will be introduced.
 
-### Added
+### Feat
 
 #### Core Features
-- Energy Management System (EMS) with battery optimization
+- energy Management System (EMS) with battery optimization
 - PV (Photovoltaic) forecast integration with multiple providers
-- Load prediction and forecasting capabilities
-- Electricity price integration
+- load prediction and forecasting capabilities
+- electricity price integration
 - VRM API integration for load and PV forecasting
-- Battery State of Charge (SoC) prediction and optimization
-- Inverter class with AC/DC charging logic
-- Electric vehicle (EV) charging optimization with configurable currents
-- Home appliance scheduling optimization
-- Horizon validation for shading calculations
+- battery State of Charge (SoC) prediction and optimization
+- inverter class with AC/DC charging logic
+- electric vehicle (EV) charging optimization with configurable currents
+- home appliance scheduling optimization
+- horizon validation for shading calculations
 
 #### API & Server
-- Migration from Flask to FastAPI
+- migration from Flask to FastAPI
 - RESTful API with comprehensive endpoints
 - EOSdash web interface for configuration and visualization
 - Docker support with multi-architecture builds
-- Web-based visualization with interactive charts
+- web-based visualization with interactive charts
 - OpenAPI/Swagger documentation
-- Configurable server settings (port, host)
+- configurable server settings (port, host)
 
 #### Configuration & Data Management
 - JSON-based configuration system with nested support
-- Configuration validation with Pydantic
-- Device registry for managing multiple devices
-- Persistent caching for predictions and prices
-- Manual prediction updates
-- Timezone support with automatic detection
-- Configurable VAT rates for electricity prices
+- configuration validation with Pydantic
+- device registry for managing multiple devices
+- persistent caching for predictions and prices
+- manual prediction updates
+- timezone support with automatic detection
+- configurable VAT rates for electricity prices
 
 #### Optimization
 - DEAP-based genetic algorithm optimization
-- Multi-objective optimization (cost, battery usage, self-consumption)
+- multi-objective optimization (cost, battery usage, self-consumption)
 - 48-hour prediction and optimization window
 - AC/DC charging decision optimization
-- Discharge hour optimization
-- Start solution enforcement
-- Fitness visualization with violin plots
-- Self-consumption probability interpolator
+- discharge hour optimization
+- start solution enforcement
+- fitness visualization with violin plots
+- self-consumption probability interpolator
 
 #### Testing & Quality
-- Comprehensive test suite with pytest
-- Unit tests for major components (EMS, battery, inverter, load, optimization)
-- Integration tests for server endpoints
-- Pre-commit hooks for code quality
-- Type checking with mypy
-- Code formatting with ruff and isort
-- Markdown linting
+- comprehensive test suite with pytest
+- unit tests for major components (EMS, battery, inverter, load, optimization)
+- integration tests for server endpoints
+- pre-commit hooks for code quality
+- type checking with mypy
+- code formatting with ruff and isort
+- markdown linting
 
 #### Documentation
-- Conceptual documentation
+- conceptual documentation
 - API documentation with Sphinx
 - ReadTheDocs integration
 - Docker setup instructions
-- Contributing guidelines
+- contributing guidelines
 - English README translation
 
 #### Providers & Integrations
 - PVForecast.Akkudoktor provider
 - BrightSky weather provider
 - ClearOutside weather provider
-- Electricity price provider
+- electricity price provider
 
-### Changed
-- Python version requirement updated to 3.10+
-- Optimized Inverter class for improved SCR calculation performance
-- Improved caching mechanisms for better performance
-- Enhanced visualization with proper timestamp handling
-- Updated dependency management with automatic Dependabot updates
-- Restructured code into logical submodules
-- Package directory structure reorganization
-- Improved error handling and logging
+### Refactor
+
+- optimized Inverter class for improved SCR calculation performance
+- improved caching mechanisms for better performance
+- enhanced visualization with proper timestamp handling
+- updated dependency management with automatic Dependabot updates
+- restructured code into logical submodules
+- package directory structure reorganization
+- improved error handling and logging
 - Windows compatibility improvements
 
-### Fixed
-- Cross-site scripting (XSS) vulnerabilities
+### Fix
+
+- cross-site scripting (XSS) vulnerabilities
 - ReDoS vulnerability in duration parsing
-- Timezone and daylight saving time handling
+- timezone and daylight saving time handling
 - BrightSky provider with None humidity data
-- Negative values in load mean adjusted calculations
+- negative values in load mean adjusted calculations
 - SoC calculation bugs
 - AC charge efficiency in price calculations
-- Optimization timing bugs
+- optimization timing bugs
 - Docker BuildKit compatibility
-- Float value handling in user horizon configuration
-- Circular runtime import issues
-- Load simulation data return issues
-- Multiple optimization-related bugs
+- float value handling in user horizon configuration
+- circular runtime import issues
+- load simulation data return issues
+- multiple optimization-related bugs
 
-### Security
-- Added Bandit security checks
-- Fixed XSS vulnerabilities
-- Mitigated ReDoS attacks with input length validation
-- Improved credential management with environment variables
+### Build
 
-### Dependencies
+- Python version requirement updated to 3.10+
+- added Bandit security checks
+- improved credential management with environment variables
+
+#### Dependencies
 Major dependencies included in this release:
 - FastAPI 0.115.14
 - Pydantic 2.11.9
@@ -125,69 +263,15 @@ Major dependencies included in this release:
 - PVLib 0.13.1
 - Python-FastHTML 0.12.29
 
-### Development Notes
+### Notes
+
+#### Development Notes
 This version encompasses all development from the initial commit (February 16, 2024) through September 29, 2025. The project evolved from a basic energy optimization concept to a comprehensive energy management system with:
 - 698+ commits
-- Multiple contributor involvement
-- Continuous integration/deployment setup
-- Automated dependency updates
-- Comprehensive testing infrastructure
+- multiple contributor involvement
+- continuous integration/deployment setup
+- automated dependency updates
+- comprehensive testing infrastructure
 
-### Migration Notes
+#### Migration Notes
 As this is the initial versioned release, no migration is required. Future releases will include migration guides as needed.
-
----
-
-**Full Changelog**: Initial development phase (v0.0.0)
-
-
-## v0.1.0-a0 (2025-09-30)
-
-### BREAKING CHANGE
-
-- This is a BREAKING CHANGE as the configuration structure changed
-once again and the server API was also enhanced and streamlined. The server API
-that is used by Andreas and Jörg in their videos has not changed
-- This is a BREAKING CHANGE as the configuration structure changed
-once again and the server API was also enhanced and streamlined. The server API
-that is used by Andreas and Jörg in their videos has not changed.
-- EOS configuration changed. V1 API changed.
-- Default IP address for EOS and EOSdash changed to 127.0.0.1
-- Azimuth configurations that followed the PVForecastAkkudoktor convention
-(north=+-180, east=-90, south=0, west=90) must be converted to the general azimuth definition:
-north=0, east=90, south=180, west=270.
-
-### Feat
-
-- **VRM forecast**: add load and pv forecast by VRM API (#611)
-- run pytest for PRs
-- be helpful, provide a list of valid routes when visiting /
-- add documentation, enable makefile driven usage
-- Detailliertere README
-- andere ports/bind ips erlauben
-
-### Fix
-
-- dependencies and optimization solution beginning
-- typos in bokeh.py
-- automatic optimization
-- handle float values in userhorizon configuration (#657)
-- **docker**: make EOSDash accessible in Docker containers (#656)
-- **ElecPriceEnergyCharts**: get history series, update docs (#606)
-- logging, prediction update, multiple bugs (#584)
-- add required fields to example optimization request (#574)
-- pvforecast fails when there is only a single plane (#569)
-- delete empty inverter from testdata optimize_input_2.json (#568)
-- azimuth setting of pvforecastakkudoktor provider (#567)
-- BrightSky with None humidity data (#555)
-- Catch optimize error and return error message. (#534)
-- Circular runtime import Closes #533 (#535)
-- **docker**: enable BuildKit to support --mount (closes #493)
-- mitigate ReDoS in to_duration via max input length check (closes #494) (#523)
-- relax stale issue/pr handling
-- remove verbose comment
-- make port configurable via env
-
-### Refactor
-
-- remove `README-DE.md`

CONTRIBUTING.md

@@ -14,9 +14,10 @@ Please report flaws or vulnerabilities in the [GitHub Issue Tracker](https://git
 
 ## Ideas & Features
 
-Please first discuss the idea in a [GitHub Discussion](https://github.com/Akkudoktor-EOS/EOS/discussions) or the [Akkudoktor Forum](https://www.akkudoktor.net/forum/diy-energie-optimierungssystem-opensource-projekt/) before opening an issue.
+Issues in the [GitHub Issue Tracker](https://github.com/Akkudoktor-EOS/EOS/issues) are also fine
+to discuss ideas and features.
 
-There are just too many possibilities and the project would drown in tickets otherwise.
+You may first discuss the idea in the [Akkudoktor Forum](https://www.akkudoktor.net/forum/diy-energie-optimierungssystem-opensource-projekt/) before opening an issue.
 
 ## Code Contributions
 
@@ -27,7 +28,6 @@ message style checks.
 ### Setup development environment
 
 Setup virtual environment, then activate virtual environment and install development dependencies.
-See also [README.md](README.md).
 
 ```bash
 python -m venv .venv
@@ -60,7 +60,7 @@ To run formatting automatically before every commit:
 
 ```bash
 pre-commit install
-pre-commit install --hook-type commit-msg
+pre-commit install --hook-type commit-msg --hook-type pre-push
 ```
 
 Or run them manually:
@@ -79,5 +79,15 @@ python -m pytest -vs --cov src --cov-report term-missing tests/
 
 ### Commit message style
 
-Our commit message checks use [`gitlint`](https://github.com/jorisroovers/gitlint). The checks
+Our commit message checks use
+[`commitizen`](https://commitizen-tools.github.io/commitizen/#pre-commit-integration). The checks
 enforce the [`Conventional Commits`](https://www.conventionalcommits.org) commit message style.
+
+You may use [`commitizen`](https://commitizen-tools.github.io/commitizen) also to create a
+commit message and commit your change.
+
+## Thank you!
+
+And last but not least thanks to all our contributors
+
+[![Contributors](https://contrib.rocks/image?repo=Akkudoktor-EOS/EOS)](https://github.com/Akkudoktor-EOS/EOS/graphs/contributors)

Dockerfile

@@ -13,6 +13,13 @@ ENV EOS_CONFIG_DIR="${EOS_DIR}/config"
 # Overwrite when starting the container in a production environment
 ENV EOS_SERVER__EOSDASH_SESSKEY=s3cr3t
 
+# Set environment variables to reduce threading needs
+ENV OPENBLAS_NUM_THREADS=1
+ENV OMP_NUM_THREADS=1
+ENV MKL_NUM_THREADS=1
+ENV PIP_PROGRESS_BAR=off
+ENV PIP_NO_COLOR=1
+
 WORKDIR ${EOS_DIR}
 
 RUN adduser --system --group --no-create-home eos \
@@ -28,10 +35,10 @@ RUN adduser --system --group --no-create-home eos \
 COPY requirements.txt .
 
 RUN --mount=type=cache,target=/root/.cache/pip \
-    pip install -r requirements.txt
+    pip install --no-cache-dir -r requirements.txt
 
 COPY pyproject.toml .
-RUN mkdir -p src && pip install -e .
+RUN mkdir -p src && pip install --no-cache-dir -e .
 
 COPY src src
 

Makefile

@@ -1,5 +1,5 @@
 # Define the targets
-.PHONY: help venv pip install dist test test-full docker-run docker-build docs read-docs clean format gitlint mypy run run-dev
+.PHONY: help venv pip install dist test test-full test-system test-ci test-profile docker-run docker-build docs read-docs clean format gitlint mypy run run-dev run-dash run-dash-dev bumps
 
 # Default target
 all: help
@@ -26,9 +26,12 @@ help:
 	@echo "  run-dash-dev - Run EOSdash development server in virtual environment (automatically reloads)."
 	@echo "  test         - Run tests."
 	@echo "  test-full    - Run tests with full optimization."
+	@echo "  test-system  - Run tests with system tests enabled."
 	@echo "  test-ci      - Run tests as CI does. No user config file allowed."
+	@echo "  test-profile - Run single test optimization with profiling."
 	@echo "  dist         - Create distribution (in dist/)."
 	@echo "  clean        - Remove generated documentation, distribution and virtual environment."
+	@echo "  bump         - Bump version to next release version."
 
 # Target to set up a Python 3 virtual environment
 venv:
@@ -47,7 +50,7 @@ pip-dev: pip
 	@echo "Dependencies installed from requirements-dev.txt."
 
 # Target to install EOS in editable form (development mode) into virtual environment.
-install: pip
+install: pip-dev
 	.venv/bin/pip install build
 	.venv/bin/pip install -e .
 	@echo "EOS installed in editable form (development mode)."
@@ -100,7 +103,7 @@ run:
 
 run-dev:
 	@echo "Starting EOS development server, please wait..."
-	.venv/bin/python -m akkudoktoreos.server.eos --host localhost --port 8503 --reload true
+	.venv/bin/python -m akkudoktoreos.server.eos --host localhost --port 8503 --log_level DEBUG --startup_eosdash false --reload true
 
 run-dash:
 	@echo "Starting EOSdash production server, please wait..."
@@ -108,7 +111,7 @@ run-dash:
 
 run-dash-dev:
 	@echo "Starting EOSdash development server, please wait..."
-	.venv/bin/python -m akkudoktoreos.server.eosdash --host localhost --port 8504 --reload true
+	.venv/bin/python -m akkudoktoreos.server.eosdash --host localhost --port 8504 --log_level DEBUG --reload true
 
 # Target to setup tests.
 test-setup: pip-dev
@@ -124,18 +127,28 @@ test-ci:
 	@echo "Running tests as CI..."
 	.venv/bin/pytest --full-run --check-config-side-effect -vs --cov src --cov-report term-missing
 
+# Target to run tests including the system tests.
+test-system:
+	@echo "Running tests incl. system tests..."
+	.venv/bin/pytest --system-test -vs --cov src --cov-report term-missing
+
 # Target to run all tests.
 test-full:
 	@echo "Running all tests..."
 	.venv/bin/pytest --full-run
 
+# Target to run tests including the single test optimization with profiling.
+test-profile:
+	@echo "Running single test optimization with profiling..."
+	.venv/bin/python tests/single_test_optimization.py --profile
+
 # Target to format code.
 format:
 	.venv/bin/pre-commit run --all-files
 
-# Target to trigger gitlint using pre-commit for the last commit message
+# Target to trigger gitlint using pre-commit for the latest commit messages
 gitlint:
-	.venv/bin/pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_EDITMSG
+	.venv/bin/cz check --rev-range main..HEAD
 
 # Target to format code.
 mypy:
@@ -147,3 +160,17 @@ docker-run:
 
 docker-build:
 	@docker compose build --pull
+
+# Bump Akkudoktoreos version
+VERSION ?= 0.2.0
+NEW_VERSION ?= $(VERSION)+dev
+
+bump: pip-dev
+	@echo "Bumping akkudoktoreos version from $(VERSION) to $(NEW_VERSION) (dry-run: $(EXTRA_ARGS))"
+	.venv/bin/python scripts/convert_lightweight_tags.py
+	.venv/bin/python scripts/bump_version.py $(VERSION) $(NEW_VERSION) $(EXTRA_ARGS)
+
+bump-dry: pip-dev
+	@echo "Bumping akkudoktoreos version from $(VERSION) to $(NEW_VERSION) (dry-run: --dry-run)"
+	.venv/bin/python scripts/convert_lightweight_tags.py
+	.venv/bin/python scripts/bump_version.py $(VERSION) $(NEW_VERSION) --dry-run

README.md

@@ -1,119 +1,158 @@
-# Energy System Simulation and Optimization
+![AkkudoktorEOS](./docs/_static/logo.png#gh-light-mode-only)
+![AkkudoktorEOS](./docs/_static/logo_dark.png#gh-dark-mode-only)
 
-This project provides a comprehensive solution for simulating and optimizing an energy system based on renewable energy sources. With a focus on photovoltaic (PV) systems, battery storage (batteries), load management (consumer requirements), heat pumps, electric vehicles, and consideration of electricity price data, this system enables forecasting and optimization of energy flow and costs over a specified period.
+**Build optimized energy management plans for your home automation**
 
-Documentation can be found at [Akkudoktor-EOS](https://akkudoktor-eos.readthedocs.io/en/latest/).
+AkkudoktorEOS is a comprehensive solution for simulating and optimizing energy systems based on
+renewable sources. Optimize your photovoltaic systems, battery storage, load management, and
+electric vehicles while considering real-time electricity pricing.
 
-## Getting Involved
+## Why use AkkudoktorEOS?
 
-See [CONTRIBUTING.md](CONTRIBUTING.md).
+AkkudoktorEOS can be used to build energy management plans that are optimized for your specific
+setup of PV system, battery, electric vehicle, household load and electricity pricing. It can
+be integrated into home automation systems such as NodeRED, Home Assistant, EVCC.
 
-## System requirements
+## 🏘️ Community
 
-- Python >= 3.11, < 3.13
-- Architecture: amd64, aarch64 (armv8)
-- OS: Linux, Windows, macOS
+We are an open-source community-driven project and we love to hear from you. Here are some ways to
+get involved:
 
-Note: For Python 3.13 some dependencies (e.g. [Pendulum](https://github.com/python-pendulum/Pendulum)) are not yet available on https://pypi.org and have to be manually compiled (a recent [Rust](https://www.rust-lang.org/tools/install) installation is required).
+- [GitHub Issue Tracker](https://github.com/Akkudoktor-EOS/EOS/issues): discuss ideas and features,
+and report bugs.
 
-Other architectures (e.g. armv6, armv7) are unsupported for now, because a multitude of dependencies are not available on https://piwheels.org and have to be built manually (a recent Rust installation and [GCC](https://gcc.gnu.org/) are required, Python 3.11 is recommended).
+- [Akkudoktor Forum](https://www.akkudoktor.net/c/der-akkudoktor/eos): get direct suppport from the
+cummunity.
+
+## What do people build with AkkudoktorEOS
+
+The community uses AkkudoktorEOS to minimize grid energy consumption and to maximize the revenue
+from grid energy feed in with their home automation system.
+
+- Andreas Schmitz, [the Akkudoktor](https://www.youtube.com/@Akkudoktor), uses
+  EOS integrated in his NodeRED home automation system for
+  [OpenSource Energieoptimierung](https://www.youtube.com/watch?v=sHtv0JCxAYk).
+- Jörg, [meintechblog](https://www.youtube.com/@meintechblog), uses EOS for
+  day-ahead optimization for time-variable energy prices. See:
+  [So installiere ich EOS von Andreas Schmitz](https://www.youtube.com/watch?v=9XCPNU9UqSs)
+
+## Why not use AkkudoktorEOS?
+
+AkkudoktorEOS does not control your home automation assets. It must be integrated into a home
+automation system. If you do not use a home automation system or you feel uncomfortable with
+the configuration effort needed for the integration you should better use other solutions.
+
+## Quick Start
+
+Run EOS with Docker (access dashboard at `http://localhost:8504`):
+
+```bash
+docker run -d \
+  --name akkudoktoreos \
+  -p 8503:8503 \
+  -p 8504:8504 \
+  -e OPENBLAS_NUM_THREADS=1 \
+  -e OMP_NUM_THREADS=1 \
+  -e MKL_NUM_THREADS=1 \
+  -e EOS_SERVER__HOST=0.0.0.0 \
+  -e EOS_SERVER__EOSDASH_HOST=0.0.0.0 \
+  -e EOS_SERVER__EOSDASH_PORT=8504 \
+  --ulimit nproc=65535:65535 \
+  --ulimit nofile=65535:65535 \
+  --security-opt seccomp=unconfined \
+  akkudoktor/eos:latest
+```
+
+## System Requirements
+
+- **Python**: 3.11 or higher
+- **Architecture**: amd64, aarch64 (armv8)
+- **OS**: Linux, Windows, macOS
+
+> **Note**: Other architectures (armv6, armv7) require manual compilation of dependencies with Rust and GCC.
 
 ## Installation
 
-The project requires Python 3.11 or newer. Docker images (amd64/aarch64) can be found at [akkudoktor/eos](https://hub.docker.com/r/akkudoktor/eos).
+### Docker (Recommended)
 
-Following sections describe how to locally start the EOS server on `http://localhost:8503`.
+```bash
+docker pull akkudoktor/eos:latest
+docker compose up -d
+```
 
-### Run from source
+Access the API at `http://localhost:8503` (docs at `http://localhost:8503/docs`)
 
-Install dependencies in virtual environment:
+### From Source
 
-Linux:
+```bash
+git clone https://github.com/Akkudoktor-EOS/EOS.git
+cd EOS
+```
+
+**Linux:**
 
 ```bash
 python -m venv .venv
 .venv/bin/pip install -r requirements.txt
 .venv/bin/pip install -e .
+.venv/bin/python -m akkudoktoreos.server.eos
 ```
 
-Windows:
+**Windows:**
 
 ```cmd
 python -m venv .venv
-.venv\Scripts\Activate
 .venv\Scripts\pip install -r requirements.txt
 .venv\Scripts\pip install -e .
+.venv\Scripts\python -m akkudoktoreos.server.eos
 ```
 
-Finally, start the EOS server to access it at `http://localhost:8503` (API docs at `http://localhost:8503/docs`):
-
-Linux:
-
-```bash
-.venv/bin/python src/akkudoktoreos/server/eos.py
-```
-
-Windows:
-
-```cmd
-.venv\Scripts\python src/akkudoktoreos/server/eos.py
-```
-
-### Docker
-
-Start EOS with following command to access it at `http://localhost:8503` (API docs at `http://localhost:8503/docs`):
-
-```bash
-docker compose up
-```
-
-If you are running the EOS container on a system hosting multiple services, such as a Synology NAS, and want to allow external network access to EOS, please ensure that the default exported ports (8503, 8504) are available on the host. On Synology systems, these ports might already be in use (refer to [this guide](https://kb.synology.com/en-me/DSM/tutorial/What_network_ports_are_used_by_Synology_services)). If the ports are occupied, you will need to reconfigure the exported ports accordingly.
-
 ## Configuration
 
-This project uses the `EOS.config.json` file to manage configuration settings.
+EOS uses `EOS.config.json` for configuration. If the file doesn't exist, a default configuration is
+created automatically.
 
-### Default Configuration
+### Custom Configuration Directory
 
-A default configuration file `default.config.json` is provided. This file contains all the necessary configuration keys with their default values.
+```bash
+export EOS_DIR=/path/to/your/config
+```
 
-### Custom Configuration
+### Configuration Methods
 
-Users can specify a custom configuration directory by setting the environment variable `EOS_DIR`.
+1. **EOSdash** (Recommended) - Web interface at `http://localhost:8504`
+2. **Manual** - Edit `EOS.config.json` directly
+3. **API** - Use the [Server API](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json)
 
-- If the directory specified by `EOS_DIR` contains an existing `config.json` file, the application will use this configuration file.
-- If the `EOS.config.json` file does not exist in the specified directory, the `default.config.json` file will be copied to the directory as `EOS.config.json`.
+See the [documentation](https://akkudoktor-eos.readthedocs.io/) for all configuration options.
 
-### Configuration Updates
+## Port Configuration
 
-If the configuration keys in the `EOS.config.json` file are missing or different from those in `default.config.json`, they will be automatically updated to match the default settings, ensuring that all required keys are present.
+**Default ports**: 8503 (API), 8504 (Dashboard)
 
-## Classes and Functionalities
+If running on shared systems (e.g., Synology NAS), these ports may conflict with system services. Reconfigure port mappings as needed:
 
-This project uses various classes to simulate and optimize the components of an energy system. Each class represents a specific aspect of the system, as described below:
+```bash
+docker run -p 8505:8503 -p 8506:8504 ...
+```
 
-- `Battery`: Simulates a battery storage system, including capacity, state of charge, and now charge and discharge losses.
+## API Documentation
 
-- `PVForecast`: Provides forecast data for photovoltaic generation, based on weather data and historical generation data.
+Interactive API docs available at:
+- Swagger UI: `http://localhost:8503/docs`
+- OpenAPI Spec: [View Online](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json)
 
-- `Load`: Models the load requirements of a household or business, enabling the prediction of future energy demand.
+## Resources
 
-- `Heatpump`: Simulates a heat pump, including its energy consumption and efficiency under various operating conditions.
+- [Full Documentation](https://akkudoktor-eos.readthedocs.io/)
+- [Installation Guide (German)](https://www.youtube.com/watch?v=9XCPNU9UqSs)
 
-- `Strompreis`: Provides information on electricity prices, enabling optimization of energy consumption and generation based on tariff information.
+## Contributing
 
-- `EMS`: The Energy Management System (EMS) coordinates the interaction between the various components, performs optimization, and simulates the operation of the entire energy system.
+We welcome contributions! See [CONTRIBUTING](CONTRIBUTING.md) for guidelines.
 
-These classes work together to enable a detailed simulation and optimization of the energy system. For each class, specific parameters and settings can be adjusted to test different scenarios and strategies.
+[![Contributors](https://contrib.rocks/image?repo=Akkudoktor-EOS/EOS)](https://github.com/Akkudoktor-EOS/EOS/graphs/contributors)
 
-### Customization and Extension
+## License
 
-Each class is designed to be easily customized and extended to integrate additional functions or improvements. For example, new methods can be added for more accurate modeling of PV system or battery behavior. Developers are invited to modify and extend the system according to their needs.
-
-## Server API
-
-See the Swagger API documentation for detailed information: [EOS OpenAPI Spec](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json)
-
-## Further resources
-
-- [Installation guide (de)](https://meintechblog.de/2024/09/05/andreas-schmitz-joerg-installiert-mein-energieoptimierungssystem/)
+This project is licensed under the Apache License 2.0 - see the LICENSE file for details.

docker-compose.yaml

@@ -5,6 +5,7 @@ networks:
 services:
   eos:
     image: "akkudoktor/eos:${EOS_VERSION}"
+    container_name: "akkudoktoreos"
     read_only: true
     build:
       context: .
@@ -14,12 +15,23 @@ services:
     env_file:
       - .env
     environment:
+      - OPENBLAS_NUM_THREADS=1
+      - OMP_NUM_THREADS=1
+      - MKL_NUM_THREADS=1
+      - PIP_PROGRESS_BAR=off
+      - PIP_NO_COLOR=1
       - EOS_CONFIG_DIR=config
       - EOS_SERVER__EOSDASH_SESSKEY=s3cr3t
-      - EOS_PREDICTION__LATITUDE=52.2
-      - EOS_PREDICTION__LONGITUDE=13.4
-      - EOS_ELECPRICE__PROVIDER=ElecPriceAkkudoktor
-      - EOS_ELECPRICE__CHARGES_KWH=0.21
+      - EOS_SERVER__HOST=0.0.0.0
+      - EOS_SERVER__PORT=8503
+      - EOS_SERVER__EOSDASH_HOST=0.0.0.0
+      - EOS_SERVER__EOSDASH_PORT=8504
+    ulimits:
+      nproc: 65535
+      nofile: 65535
+    security_opt:
+      - seccomp:unconfined
+    restart: unless-stopped
     ports:
       # Configure what ports to expose on host
       - "${EOS_SERVER__PORT}:8503"

docs/_generated/openapi.md

@@ -1,6 +1,6 @@
 # Akkudoktor-EOS
 
-**Version**: `0.0.1`
+**Version**: `v0.2.0`
 
 **Description**: This project provides a comprehensive solution for simulating and optimizing an energy system based on renewable energy sources. With a focus on photovoltaic (PV) systems, battery storage (batteries), load management (consumer requirements), heat pumps, electric vehicles, and consideration of electricity price data, this system enables forecasting and optimization of energy flow and costs over a specified period.
 
@@ -24,10 +24,12 @@ If no prediction values are available the missing ones at the start of the serie
 filled with the first available prediction value.
 
 Note:
-    Use '/v1/prediction/list?key=load_mean_adjusted' instead.
+    Use '/v1/prediction/list?key=loadforecast_power_w' instead.
     Load energy meter readings to be added to EOS measurement by:
-    '/v1/measurement/load-mr/value/by-name' or
-    '/v1/measurement/value'
+    '/v1/measurement/value' or
+    '/v1/measurement/series' or
+    '/v1/measurement/dataframe' or
+    '/v1/measurement/data'
 ```
 
 **Request Body**:
@@ -66,7 +68,7 @@ Note:
     Set LoadAkkudoktor as provider, then update data with
     '/v1/prediction/update'
     and then request data with
-    '/v1/prediction/list?key=load_mean' instead.
+    '/v1/prediction/list?key=loadforecast_power_w' instead.
 ```
 
 **Parameters**:
@@ -87,16 +89,25 @@ Note:
 
 Fastapi Optimize
 
+```
+Deprecated: Optimize.
+
+Endpoint to handle optimization.
+
+Note:
+    Use automatic optimization instead.
+```
+
 **Parameters**:
 
 - `start_hour` (query, optional): Defaults to current hour of the day.
 
-- `ngen` (query, optional): No description provided.
+- `ngen` (query, optional): Number of indivuals to generate for genetic algorithm.
 
 **Request Body**:
 
 - `application/json`: {
-  "$ref": "#/components/schemas/OptimizationParameters"
+  "$ref": "#/components/schemas/GeneticOptimizationParameters"
 }
 
 **Responses**:
@@ -192,26 +203,38 @@ Returns:
 Fastapi Admin Cache Clear Post
 
 ```
-Clear the cache from expired data.
+Clear the cache.
 
-Deletes expired cache files.
-
-Args:
-    clear_all (Optional[bool]): Delete all cached files. Default is False.
+Deletes all cache files.
 
 Returns:
     data (dict): The management data after cleanup.
 ```
 
-**Parameters**:
-
-- `clear_all` (query, optional): No description provided.
-
 **Responses**:
 
 - **200**: Successful Response
 
-- **422**: Validation Error
+---
+
+## POST /v1/admin/cache/clear-expired
+
+**Links**: [local](http://localhost:8503/docs#/default/fastapi_admin_cache_clear_expired_post_v1_admin_cache_clear-expired_post), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_admin_cache_clear_expired_post_v1_admin_cache_clear-expired_post)
+
+Fastapi Admin Cache Clear Expired Post
+
+```
+Clear the cache from expired data.
+
+Deletes expired cache files.
+
+Returns:
+    data (dict): The management data after cleanup.
+```
+
+**Responses**:
+
+- **200**: Successful Response
 
 ---
 
@@ -340,6 +363,25 @@ Returns:
 
 ---
 
+## GET /v1/config/backup
+
+**Links**: [local](http://localhost:8503/docs#/default/fastapi_config_backup_get_v1_config_backup_get), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_config_backup_get_v1_config_backup_get)
+
+Fastapi Config Backup Get
+
+```
+Get the EOS configuration backup identifiers and backup metadata.
+
+Returns:
+    dict[str, dict[str, Any]]: Mapping of backup identifiers to metadata.
+```
+
+**Responses**:
+
+- **200**: Successful Response
+
+---
+
 ## PUT /v1/config/file
 
 **Links**: [local](http://localhost:8503/docs#/default/fastapi_config_file_put_v1_config_file_put), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_config_file_put_v1_config_file_put)
@@ -378,6 +420,31 @@ Returns:
 
 ---
 
+## PUT /v1/config/revert
+
+**Links**: [local](http://localhost:8503/docs#/default/fastapi_config_revert_put_v1_config_revert_put), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_config_revert_put_v1_config_revert_put)
+
+Fastapi Config Revert Put
+
+```
+Revert the configuration to a EOS configuration backup.
+
+Returns:
+    configuration (ConfigEOS): The current configuration after revert.
+```
+
+**Parameters**:
+
+- `backup_id` (query, required): EOS configuration backup ID.
+
+**Responses**:
+
+- **200**: Successful Response
+
+- **422**: Validation Error
+
+---
+
 ## GET /v1/config/{path}
 
 **Links**: [local](http://localhost:8503/docs#/default/fastapi_config_get_key_v1_config__path__get), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_config_get_key_v1_config__path__get)
@@ -448,6 +515,38 @@ Returns:
 
 ---
 
+## GET /v1/energy-management/optimization/solution
+
+**Links**: [local](http://localhost:8503/docs#/default/fastapi_energy_management_optimization_solution_get_v1_energy-management_optimization_solution_get), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_energy_management_optimization_solution_get_v1_energy-management_optimization_solution_get)
+
+Fastapi Energy Management Optimization Solution Get
+
+```
+Get the latest solution of the optimization.
+```
+
+**Responses**:
+
+- **200**: Successful Response
+
+---
+
+## GET /v1/energy-management/plan
+
+**Links**: [local](http://localhost:8503/docs#/default/fastapi_energy_management_plan_get_v1_energy-management_plan_get), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_energy_management_plan_get_v1_energy-management_plan_get)
+
+Fastapi Energy Management Plan Get
+
+```
+Get the latest energy management plan.
+```
+
+**Responses**:
+
+- **200**: Successful Response
+
+---
+
 ## GET /v1/health
 
 **Links**: [local](http://localhost:8503/docs#/default/fastapi_health_get_v1_health_get), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_health_get_v1_health_get)
@@ -577,82 +676,6 @@ Get a list of available measurement keys.
 
 ---
 
-## GET /v1/measurement/load-mr/series/by-name
-
-**Links**: [local](http://localhost:8503/docs#/default/fastapi_measurement_load_mr_series_by_name_get_v1_measurement_load-mr_series_by-name_get), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_measurement_load_mr_series_by_name_get_v1_measurement_load-mr_series_by-name_get)
-
-Fastapi Measurement Load Mr Series By Name Get
-
-```
-Get the meter reading of given load name as series.
-```
-
-**Parameters**:
-
-- `name` (query, required): Load name.
-
-**Responses**:
-
-- **200**: Successful Response
-
-- **422**: Validation Error
-
----
-
-## PUT /v1/measurement/load-mr/series/by-name
-
-**Links**: [local](http://localhost:8503/docs#/default/fastapi_measurement_load_mr_series_by_name_put_v1_measurement_load-mr_series_by-name_put), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_measurement_load_mr_series_by_name_put_v1_measurement_load-mr_series_by-name_put)
-
-Fastapi Measurement Load Mr Series By Name Put
-
-```
-Merge the meter readings series of given load name into EOS measurements at given datetime.
-```
-
-**Parameters**:
-
-- `name` (query, required): Load name.
-
-**Request Body**:
-
-- `application/json`: {
-  "$ref": "#/components/schemas/PydanticDateTimeSeries"
-}
-
-**Responses**:
-
-- **200**: Successful Response
-
-- **422**: Validation Error
-
----
-
-## PUT /v1/measurement/load-mr/value/by-name
-
-**Links**: [local](http://localhost:8503/docs#/default/fastapi_measurement_load_mr_value_by_name_put_v1_measurement_load-mr_value_by-name_put), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_measurement_load_mr_value_by_name_put_v1_measurement_load-mr_value_by-name_put)
-
-Fastapi Measurement Load Mr Value By Name Put
-
-```
-Merge the meter reading of given load name and value into EOS measurements at given datetime.
-```
-
-**Parameters**:
-
-- `datetime` (query, required): Datetime.
-
-- `name` (query, required): Load name.
-
-- `value` (query, required): No description provided.
-
-**Responses**:
-
-- **200**: Successful Response
-
-- **422**: Validation Error
-
----
-
 ## GET /v1/measurement/series
 
 **Links**: [local](http://localhost:8503/docs#/default/fastapi_measurement_series_get_v1_measurement_series_get), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_measurement_series_get_v1_measurement_series_get)
@@ -665,7 +688,7 @@ Get the measurements of given key as series.
 
 **Parameters**:
 
-- `key` (query, required): Prediction key.
+- `key` (query, required): Measurement key.
 
 **Responses**:
 
@@ -687,7 +710,7 @@ Merge measurement given as series into given key.
 
 **Parameters**:
 
-- `key` (query, required): Prediction key.
+- `key` (query, required): Measurement key.
 
 **Request Body**:
 
@@ -717,7 +740,7 @@ Merge the measurement of given key and value into EOS measurements at given date
 
 - `datetime` (query, required): Datetime.
 
-- `key` (query, required): Prediction key.
+- `key` (query, required): Measurement key.
 
 - `value` (query, required): No description provided.
 
@@ -990,6 +1013,96 @@ Args:
 
 ---
 
+## GET /v1/resource/status
+
+**Links**: [local](http://localhost:8503/docs#/default/fastapi_devices_status_get_v1_resource_status_get), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_devices_status_get_v1_resource_status_get)
+
+Fastapi Devices Status Get
+
+```
+Get the latest status of a resource/ device.
+
+Return:
+    latest_status: The latest status of a resource/ device.
+```
+
+**Parameters**:
+
+- `resource_id` (query, required): Resource ID.
+
+- `actuator_id` (query, optional): Actuator ID.
+
+**Responses**:
+
+- **200**: Successful Response
+
+- **422**: Validation Error
+
+---
+
+## PUT /v1/resource/status
+
+**Links**: [local](http://localhost:8503/docs#/default/fastapi_devices_status_put_v1_resource_status_put), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/fastapi_devices_status_put_v1_resource_status_put)
+
+Fastapi Devices Status Put
+
+```
+Update the status of a resource/ device.
+
+Return:
+    latest_status: The latest status of a resource/ device.
+```
+
+**Parameters**:
+
+- `resource_id` (query, required): Resource ID.
+
+- `actuator_id` (query, optional): Actuator ID.
+
+**Request Body**:
+
+- `application/json`: {
+  "anyOf": [
+    {
+      "$ref": "#/components/schemas/PowerMeasurement-Input"
+    },
+    {
+      "$ref": "#/components/schemas/EnergyMeasurement-Input"
+    },
+    {
+      "$ref": "#/components/schemas/PPBCPowerProfileStatus-Input"
+    },
+    {
+      "$ref": "#/components/schemas/OMBCStatus"
+    },
+    {
+      "$ref": "#/components/schemas/FRBCActuatorStatus"
+    },
+    {
+      "$ref": "#/components/schemas/FRBCEnergyStatus-Input"
+    },
+    {
+      "$ref": "#/components/schemas/FRBCStorageStatus"
+    },
+    {
+      "$ref": "#/components/schemas/FRBCTimerStatus"
+    },
+    {
+      "$ref": "#/components/schemas/DDBCActuatorStatus"
+    }
+  ],
+  "description": "Resource Status.",
+  "title": "Status"
+}
+
+**Responses**:
+
+- **200**: Successful Response
+
+- **422**: Validation Error
+
+---
+
 ## GET /visualization_results.pdf
 
 **Links**: [local](http://localhost:8503/docs#/default/get_pdf_visualization_results_pdf_get), [eos](https://petstore3.swagger.io/?url=https://raw.githubusercontent.com/Akkudoktor-EOS/EOS/refs/heads/main/openapi.json#/default/get_pdf_visualization_results_pdf_get)

docs/akkudoktoreos/configtimewindow.md

@@ -0,0 +1,849 @@
+% SPDX-License-Identifier: Apache-2.0
+(configtimewindow-page)=
+
+# Time Window Sequence Configuration
+
+## Overview
+
+The `TimeWindowSequence` model is used to configure allowed time slots for home appliance runs.
+It contains a collection of `TimeWindow` objects that define when appliances can operate.
+
+## Basic Structure
+
+A `TimeWindowSequence` is configured as a JSON object with a `windows` array:
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "09:00",
+      "duration": "PT2H",
+      "day_of_week": null,
+      "date": null,
+      "locale": null
+    }
+  ]
+}
+```
+
+## TimeWindow Fields
+
+Each `TimeWindow` object has the following fields:
+
+- **`start_time`** (required): Time when the window begins
+- **`duration`** (required): How long the window lasts
+- **`day_of_week`** (optional): Restrict to specific day of week
+- **`date`** (optional): Restrict to specific calendar date
+- **`locale`** (optional): Language for day name parsing
+
+## Time Formats
+
+### Start Time (`start_time`)
+
+The `start_time` field accepts various time formats:
+
+#### 24-Hour Format
+
+```json
+{
+  "start_time": "14:30"        // 2:30 PM
+}
+```
+
+#### 12-Hour Format with AM/PM
+
+```json
+{
+  "start_time": "2:30 PM"      // 2:30 PM
+}
+```
+
+#### Compact Format
+
+```json
+{
+  "start_time": "1430"         // 2:30 PM
+}
+```
+
+#### With Seconds
+
+```json
+{
+  "start_time": "14:30:45"     // 2:30:45 PM
+}
+```
+
+#### With Microseconds
+
+```json
+{
+  "start_time": "14:30:45.123456"
+}
+```
+
+#### European Format
+
+```json
+{
+  "start_time": "14h30"        // 2:30 PM
+}
+```
+
+#### Short Formats
+
+```json
+{
+  "start_time": "14"           // 2:00 PM
+}
+```
+
+```json
+{
+  "start_time": "2PM"          // 2:00 PM
+}
+```
+
+#### Decimal Time
+
+```json
+{
+  "start_time": "14.5"         // 2:30 PM (14:30)
+}
+```
+
+#### With Timezones
+
+```json
+{
+  "start_time": "14:30 UTC"
+}
+```
+
+```json
+{
+  "start_time": "2:30 PM EST"
+}
+```
+
+```json
+{
+  "start_time": "14:30 +05:30"
+}
+```
+
+### Duration (`duration`)
+
+The `duration` field supports multiple formats for maximum flexibility:
+
+#### ISO 8601 Duration Format (Recommended)
+
+```json
+{
+  "duration": "PT2H30M"        // 2 hours 30 minutes
+}
+```
+
+```json
+{
+  "duration": "PT3H"           // 3 hours
+}
+```
+
+```json
+{
+  "duration": "PT90M"          // 90 minutes
+}
+```
+
+```json
+{
+  "duration": "PT1H30M45S"     // 1 hour 30 minutes 45 seconds
+}
+```
+
+#### Human-Readable String Format
+
+The system accepts natural language duration strings:
+
+```json
+{
+  "duration": "2 hours 30 minutes"
+}
+```
+
+```json
+{
+  "duration": "3 hours"
+}
+```
+
+```json
+{
+  "duration": "90 minutes"
+}
+```
+
+```json
+{
+  "duration": "1 hour 30 minutes 45 seconds"
+}
+```
+
+```json
+{
+  "duration": "2 days 5 hours"
+}
+```
+
+```json
+{
+  "duration": "1 day 2 hours 30 minutes"
+}
+```
+
+#### Singular and Plural Forms
+
+Both singular and plural forms are supported:
+
+```json
+{
+  "duration": "1 day"          // Singular
+}
+```
+
+```json
+{
+  "duration": "2 days"         // Plural
+}
+```
+
+```json
+{
+  "duration": "1 hour"         // Singular
+}
+```
+
+```json
+{
+  "duration": "5 hours"        // Plural
+}
+```
+
+#### Numeric Formats
+
+##### Seconds as Integer
+
+```json
+{
+  "duration": 3600             // 3600 seconds = 1 hour
+}
+```
+
+```json
+{
+  "duration": 1800             // 1800 seconds = 30 minutes
+}
+```
+
+##### Seconds as Float
+
+```json
+{
+  "duration": 3600.5           // 3600.5 seconds = 1 hour 0.5 seconds
+}
+```
+
+##### Tuple Format [days, hours, minutes, seconds]
+
+```json
+{
+  "duration": [0, 2, 30, 0]    // 0 days, 2 hours, 30 minutes, 0 seconds
+}
+```
+
+```json
+{
+  "duration": [1, 0, 0, 0]     // 1 day
+}
+```
+
+```json
+{
+  "duration": [0, 0, 45, 30]   // 45 minutes 30 seconds
+}
+```
+
+```json
+{
+  "duration": [2, 5, 15, 45]   // 2 days, 5 hours, 15 minutes, 45 seconds
+}
+```
+
+#### Mixed Time Units
+
+You can combine different time units in string format:
+
+```json
+{
+  "duration": "1 day 4 hours 30 minutes 15 seconds"
+}
+```
+
+```json
+{
+  "duration": "3 days 2 hours"
+}
+```
+
+```json
+{
+  "duration": "45 minutes 30 seconds"
+}
+```
+
+#### Common Duration Examples
+
+##### Short Durations
+
+```json
+{
+  "duration": "30 minutes"     // Quick appliance cycle
+}
+```
+
+```json
+{
+  "duration": "PT30M"          // ISO format equivalent
+}
+```
+
+```json
+{
+  "duration": 1800             // Numeric equivalent (seconds)
+}
+```
+
+##### Medium Durations
+
+```json
+{
+  "duration": "2 hours 15 minutes"
+}
+```
+
+```json
+{
+  "duration": "PT2H15M"        // ISO format equivalent
+}
+```
+
+```json
+{
+  "duration": [0, 2, 15, 0]    // Tuple format equivalent
+}
+```
+
+##### Long Durations
+
+```json
+{
+  "duration": "1 day 8 hours"  // All-day appliance window
+}
+```
+
+```json
+{
+  "duration": "PT32H"          // ISO format equivalent
+}
+```
+
+```json
+{
+  "duration": [1, 8, 0, 0]     // Tuple format equivalent
+}
+```
+
+#### Validation Rules for Duration
+
+- **ISO 8601 format**: Must start with `PT` and use valid duration specifiers (H, M, S)
+- **String format**: Must contain valid time units (day/days, hour/hours, minute/minutes, second/seconds)
+- **Numeric format**: Must be a positive number representing seconds
+- **Tuple format**: Must be exactly 4 elements: [days, hours, minutes, seconds]
+- **All formats**: Duration must be positive (greater than 0)
+
+#### Duration Format Recommendations
+
+1. **Use ISO 8601 format** for API consistency: `"PT2H30M"`
+2. **Use human-readable strings** for configuration files: `"2 hours 30 minutes"`
+3. **Use numeric format** for programmatic calculations: `9000` (seconds)
+4. **Use tuple format** for structured data: `[0, 2, 30, 0]`
+
+#### Error Handling for Duration
+
+Common duration errors and solutions:
+
+- **Invalid ISO format**: Ensure proper `PT` prefix and valid specifiers
+- **Unknown time units**: Use day/days, hour/hours, minute/minutes, second/seconds
+- **Negative duration**: All durations must be positive
+- **Invalid tuple length**: Tuple must have exactly 4 elements
+- **String too long**: Duration strings have a maximum length limit for security
+
+## Day of Week Restrictions
+
+### Using Numbers (0=Monday, 6=Sunday)
+
+```json
+{
+  "day_of_week": 0             // Monday
+}
+```
+
+```json
+{
+  "day_of_week": 6             // Sunday
+}
+```
+
+### Using English Day Names
+
+```json
+{
+  "day_of_week": "Monday"
+}
+```
+
+```json
+{
+  "day_of_week": "sunday"      // Case insensitive
+}
+```
+
+### Using Localized Day Names
+
+```json
+{
+  "day_of_week": "Montag",     // German for Monday
+  "locale": "de"
+}
+```
+
+```json
+{
+  "day_of_week": "Lundi",      // French for Monday
+  "locale": "fr"
+}
+```
+
+## Date Restrictions
+
+### Specific Date
+
+```json
+{
+  "date": "2024-12-25"         // Christmas Day 2024
+}
+```
+
+**Note**: When `date` is specified, `day_of_week` is ignored.
+
+## Complete Examples
+
+### Example 1: Basic Daily Window
+
+Allow appliance to run between 9:00 AM and 11:00 AM every day:
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "09:00",
+      "duration": "PT2H"
+    }
+  ]
+}
+```
+
+### Example 2: Weekday Only
+
+Allow appliance to run between 8:00 AM and 6:00 PM on weekdays:
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "08:00",
+      "duration": "PT10H",
+      "day_of_week": 0
+    },
+    {
+      "start_time": "08:00",
+      "duration": "PT10H",
+      "day_of_week": 1
+    },
+    {
+      "start_time": "08:00",
+      "duration": "PT10H",
+      "day_of_week": 2
+    },
+    {
+      "start_time": "08:00",
+      "duration": "PT10H",
+      "day_of_week": 3
+    },
+    {
+      "start_time": "08:00",
+      "duration": "PT10H",
+      "day_of_week": 4
+    }
+  ]
+}
+```
+
+### Example 3: Multiple Daily Windows
+
+Allow appliance to run during morning and evening hours:
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "06:00",
+      "duration": "PT3H"
+    },
+    {
+      "start_time": "18:00",
+      "duration": "PT4H"
+    }
+  ]
+}
+```
+
+### Example 4: Weekend Special Hours
+
+Different hours for weekdays and weekends:
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "08:00",
+      "duration": "PT8H",
+      "day_of_week": "Monday"
+    },
+    {
+      "start_time": "08:00",
+      "duration": "PT8H",
+      "day_of_week": "Tuesday"
+    },
+    {
+      "start_time": "08:00",
+      "duration": "PT8H",
+      "day_of_week": "Wednesday"
+    },
+    {
+      "start_time": "08:00",
+      "duration": "PT8H",
+      "day_of_week": "Thursday"
+    },
+    {
+      "start_time": "08:00",
+      "duration": "PT8H",
+      "day_of_week": "Friday"
+    },
+    {
+      "start_time": "10:00",
+      "duration": "PT6H",
+      "day_of_week": "Saturday"
+    },
+    {
+      "start_time": "10:00",
+      "duration": "PT6H",
+      "day_of_week": "Sunday"
+    }
+  ]
+}
+```
+
+### Example 5: Holiday Schedule
+
+Special schedule for a specific date:
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "10:00",
+      "duration": "PT4H",
+      "date": "2024-12-25"
+    }
+  ]
+}
+```
+
+### Example 6: Localized Configuration
+
+Using German day names:
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "14:00",
+      "duration": "PT2H",
+      "day_of_week": "Montag",
+      "locale": "de"
+    },
+    {
+      "start_time": "14:00",
+      "duration": "PT2H",
+      "day_of_week": "Mittwoch",
+      "locale": "de"
+    },
+    {
+      "start_time": "14:00",
+      "duration": "PT2H",
+      "day_of_week": "Freitag",
+      "locale": "de"
+    }
+  ]
+}
+```
+
+### Example 7: Complex Schedule with Timezones
+
+Multiple windows with different timezones:
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "09:00 UTC",
+      "duration": "PT4H",
+      "day_of_week": "Monday"
+    },
+    {
+      "start_time": "2:00 PM EST",
+      "duration": "PT3H",
+      "day_of_week": "Friday"
+    }
+  ]
+}
+```
+
+### Example 8: Night Shift Schedule
+
+Crossing midnight (note: each window is within a single day):
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "22:00",
+      "duration": "PT2H"
+    },
+    {
+      "start_time": "00:00",
+      "duration": "PT6H"
+    }
+  ]
+}
+```
+
+## Advanced Usage Patterns
+
+### Off-Peak Hours
+
+Configure appliance to run during off-peak electricity hours:
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "23:00",
+      "duration": "PT1H"
+    },
+    {
+      "start_time": "00:00",
+      "duration": "PT7H"
+    }
+  ]
+}
+```
+
+### Workday Lunch Break
+
+Allow appliance to run during lunch break on workdays:
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "12:00",
+      "duration": "PT1H",
+      "day_of_week": 0
+    },
+    {
+      "start_time": "12:00",
+      "duration": "PT1H",
+      "day_of_week": 1
+    },
+    {
+      "start_time": "12:00",
+      "duration": "PT1H",
+      "day_of_week": 2
+    },
+    {
+      "start_time": "12:00",
+      "duration": "PT1H",
+      "day_of_week": 3
+    },
+    {
+      "start_time": "12:00",
+      "duration": "PT1H",
+      "day_of_week": 4
+    }
+  ]
+}
+```
+
+### Seasonal Schedule
+
+Different schedules for different dates:
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "08:00",
+      "duration": "PT10H",
+      "date": "2024-06-21"
+    },
+    {
+      "start_time": "09:00",
+      "duration": "PT8H",
+      "date": "2024-12-21"
+    }
+  ]
+}
+```
+
+## Common Patterns
+
+### 1. Always Available
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "00:00",
+      "duration": "PT24H"
+    }
+  ]
+}
+```
+
+### 2. Business Hours
+
+```json
+{
+  "windows": [
+    {
+      "start_time": "09:00",
+      "duration": "PT8H",
+      "day_of_week": 0
+    },
+    {
+      "start_time": "09:00",
+      "duration": "PT8H",
+      "day_of_week": 1
+    },
+    {
+      "start_time": "09:00",
+      "duration": "PT8H",
+      "day_of_week": 2
+    },
+    {
+      "start_time": "09:00",
+      "duration": "PT8H",
+      "day_of_week": 3
+    },
+    {
+      "start_time": "09:00",
+      "duration": "PT8H",
+      "day_of_week": 4
+    }
+  ]
+}
+```
+
+### 3. Never Available
+
+```json
+{
+  "windows": []
+}
+```
+
+## Validation Rules
+
+- `start_time` must be a valid time format
+- `duration` must be a positive duration
+- `day_of_week` must be 0-6 (integer) or valid day name (string)
+- `date` must be a valid ISO date format (YYYY-MM-DD)
+- If `date` is specified, `day_of_week` is ignored
+- `locale` must be a valid locale code when using localized day names
+
+## Tips and Best Practices
+
+1. **Use 24-hour format** for clarity: `"14:30"` instead of `"2:30 PM"`
+2. **Keep durations reasonable** for appliance operation cycles
+3. **Test timezone handling** if using timezone-aware times
+4. **Use specific dates** for holiday schedules
+5. **Consider overlapping windows** for flexibility
+6. **Use localization** for international deployments
+7. **Document your patterns** for maintenance
+
+## Error Handling
+
+Common errors and solutions:
+
+- **Invalid time format**: Use supported time formats listed above
+- **Invalid duration**: Use ISO 8601 duration format (PT1H30M)
+- **Invalid day name**: Check spelling and locale settings
+- **Invalid date**: Use YYYY-MM-DD format
+- **Unknown locale**: Use standard locale codes (en, de, fr, etc.)
+
+## Integration Examples
+
+### Python Usage
+
+```python
+from pydantic import ValidationError
+
+try:
+    config = TimeWindowSequence.model_validate_json(json_string)
+    print(f"Configured {len(config.windows)} time windows")
+except ValidationError as e:
+    print(f"Configuration error: {e}")
+```
+
+### API Configuration
+
+```json
+{
+  "device_id": "dishwasher_01",
+  "time_windows": {
+    "windows": [
+      {
+        "start_time": "22:00",
+        "duration": "PT2H"
+      },
+      {
+        "start_time": "06:00",
+        "duration": "PT2H"
+      }
+    ]
+  }
+}
+```

docs/akkudoktoreos/configuration.md

@@ -1,6 +1,7 @@
 % SPDX-License-Identifier: Apache-2.0
+(configuration-page)=
 
-# Configuration
+# Configuration Guideline
 
 The configuration controls all aspects of EOS: optimization, prediction, measurement, and energy
 management.

docs/akkudoktoreos/integration.md

@@ -32,8 +32,7 @@ emphasizes local control and user privacy.
 
 ### Home Assistant Resources
 
-- Duetting's [EOS Home Assistant Addon](https://github.com/Duetting/ha_eos_addon) — Additional
-  details can be found in this [discussion thread](https://github.com/Akkudoktor-EOS/EOS/discussions/294).
+- Duetting's [EOS Home Assistant Addon](https://github.com/Duetting/ha_eos_addon).
 
 ## EOS Connect
 

docs/akkudoktoreos/logging.md

@@ -73,3 +73,9 @@ You can also control the log level by setting the `EOS_LOGGING__CONSOLE_LEVEL` a
 If the `file_level` configuration is set, log records are written to a rotating log file. The log
 file is in the data output directory and named `eos.log`. You may directly read the file or use
 the `/v1/logging/log` endpoint to access the file log.
+
+:::{admonition} Note
+:class: note
+The `/v1/logging/log` endpoint needs file logging to be enabled. Otherwise old or no logging
+information is provided.
+:::

docs/akkudoktoreos/measurement.md

@@ -1,4 +1,5 @@
 % SPDX-License-Identifier: Apache-2.0
+(measurement-page)=
 
 # Measurements
 
@@ -12,14 +13,7 @@ accuracy.
 ## Storing Measurements
 
 EOS stores measurements in a **key-value store**, where the term `measurement key` refers to the
-unique identifier used to store and retrieve specific measurement data. Note that the key-value
-store is memory-based, meaning that all stored data will be lost upon restarting the EOS REST
-server.
-
-:::{admonition} Todo
-:class: note
-Ensure that measurement data persists across server restarts.
-:::
+unique identifier used to store and retrieve specific measurement data.
 
 Several endpoints of the EOS REST server allow for the management and retrieval of these
 measurements.
@@ -30,14 +24,14 @@ The measurement data must be or is provided in one of the following formats:
 
 A dictionary with the following structure:
 
-```python
-    {
+```json
+{
     "start_datetime": "2024-01-01 00:00:00",
-        "interval": "1 Hour",
+    "interval": "1 hour",
     "<measurement key>": [value, value, ...],
     "<measurement key>": [value, value, ...],
     ...
-    }
+}
 ```
 
 ### 2. DateTimeDataFrame
@@ -51,43 +45,84 @@ The column name of the data must be the same as the names of the `measurement ke
 A JSON string created from a [pandas](https://pandas.pydata.org/docs/index.html) series with a
 `DatetimeIndex`. Use [pandas.Series.to_json(orient="index")](https://pandas.pydata.org/docs/reference/api/pandas.Series.to_json.html#pandas.Series.to_json).
 
+Creates a dictionary like this:
+
+```json
+{
+  "data": {
+     "2024-01-01T00:00:00+01:00": 1,
+     "2024-01-02T00:00:00+01:00": 2,
+     "2024-01-03T00:00:00+01:00": 3,
+     ...
+  },
+  "dtype": "float64",
+  "tz": "Europe/Berlin"
+}
+```
+
 ## Load Measurement
 
-The EOS measurement store provides for storing meter readings of loads. There are currently five loads
-foreseen. The associated `measurement key`s are:
+The EOS measurement store provides for storing energy meter readings of loads.
 
-- `load0_mr`: Load0 meter reading [kWh]
-- `load1_mr`: Load1 meter reading [kWh]
-- `load2_mr`: Load2 meter reading [kWh]
-- `load3_mr`: Load3 meter reading [kWh]
-- `load4_mr`: Load4 meter reading [kWh]
+The associated `measurement key`s can be configured by:
 
-For ease of use, you can assign descriptive names to the `measurement key`s to represent your
-system's load sources. Use the following `configuration options` to set these names
-(e.g., 'Dish Washer', 'Heat Pump'):
-
-- `load0_name`: Name of the load0 source
-- `load1_name`: Name of the load1 source
-- `load2_name`: Name of the load2 source
-- `load3_name`: Name of the load3 source
-- `load4_name`: Name of the load4 source
+```json
+{
+  "measurement": {
+    "load_emr_keys": ["load0_emr", "my special load", ...]
+  }
+}
+```
 
 Load measurements can be stored for any datetime. The values between different meter readings are
-linearly approximated. Since optimization occurs on the hour, storing values between hours is
-generally not useful.
+linearly approximated. Storing values between optimization intervals is generally not useful.
 
 The EOS measurement store automatically sums all given loads to create a total load value series
 for specified intervals, usually one hour. This aggregated data can be used for load predictions.
 
+:::{admonition} Warning
+:class: warning
+Only use **actual meter readings** in **kWh**, not energy consumption.
+Example: `112345.77`, `112389.23`, `112412.55`, …
+:::
+
 ## Grid Export/ Import Measurement
 
 The EOS measurement store also allows for the storage of meter readings for grid import and export.
-The associated `measurement key`s are:
 
-- `grid_export_mr`: Export to grid meter reading [kWh]
-- `grid_import_mr`: Import from grid meter reading [kWh]
+The associated `measurement key`s can be configured by:
+
+```json
+{
+  "measurement": {
+    "grid_export_emr_keys": ["grid_export_emr", ...],
+    "grid_import_emr_keys": ["grid_import_emr", ...],
+  }
+}
+```
 
 :::{admonition} Todo
 :class: note
 Currently not used. Integrate grid meter readings into the respective predictions.
 :::
+
+## Battery/ Electric Vehicle State of Charge (SoC) Measurement
+
+The state of charge (SoC) measurement of batteries and electric vehicle batteries can be stored.
+
+The associated `measurement key` is pre-defined by the device configuration. It can be
+determined from the device configuration by the read-only `measurement_key_soc_factor` configuration
+option.
+
+## Battery/ Electric Vehicle Power Measurement
+
+The charge/ discharge power measurements of batteries and electric vehicle batteries can be stored.
+Charging power is denoted by a negative value, discharging power by a positive value.
+
+The associated `measurement key`s are pre-defined by the device configuration. They can be
+determined from the device configuration by read-only configuration options:
+
+- `measurement_key_power_l1_w`
+- `measurement_key_power_l2_w`
+- `measurement_key_power_l3_w`
+- `measurement_key_power_3_phase_sym_w`

docs/akkudoktoreos/optimauto.md

@@ -0,0 +1,448 @@
+% SPDX-License-Identifier: Apache-2.0
+
+# Automatic Optimization
+
+## Introduction
+
+EOS offers two approaches to optimize your energy management system: `post /optimize optimization` and
+`automatic optimization`.
+
+The `post /optimize optimization` interface, based on a **POST** request to `/optimize`, is widely
+used. It was originally developed by Andreas at the start of the project and is still demonstrated
+in his instructional videos. This interface allows users or external systems to trigger an
+optimization manually, supplying custom parameters and timing.
+
+As an alternative, EOS supports `automatic optimization`, which runs automatically at configured
+intervals. It retrieves all required input data — including electricity prices, battery storage
+capacity, PV production forecasts, and temperature data — based on your system configuration.
+
+### Genetic Algorithm
+
+Both optimization modes use the same core optimization engine.
+
+EOS uses a [genetic algorithm](https://en.wikipedia.org/wiki/Genetic_algorithm) to find an optimal
+control strategy for home energy devices such as household loads, batteries, and electric vehicles.
+
+In this context, each **individual** represents a possible solution — a specific control schedule
+that defines how devices should operate over time. These individuals are evaluated using
+[resource simulations](#resource-page), which model the system’s energy behavior over a defined time
+period divided into fixed intervals.
+
+The quality of each solution (its *fitness*) is determined by how well it performs during
+simulation, based on objectives such as minimizing electricity costs, maximizing self-consumption,
+or meeting battery charge targets.
+
+Through an iterative process of selection, crossover, and mutation, the algorithm gradually evolves
+more effective solutions. The final result is an optimized control strategy that balances multiple
+system goals within the constraints of the input data and configuration.
+
+:::{note}
+You don’t need to understand the internal workings of the genetic algorithm to benefit from
+automatic optimization. EOS handles everything behind the scenes based on your configuration.
+However, advanced users can fine-tune the optimization behavior using additional settings like
+population size, penalties, and random seed.
+:::
+
+## Energy Management Plan
+
+Whenever the optimization is run, the energy management plan is updated. The energy management plan
+provides a list of energy management instructions in chronological order. The instructions lean on
+to the [S2 standard](https://docs.s2standard.org/) to have maximum flexibility and stay completely
+independent from any manufacturer.
+
+### Battery Instructions
+
+The battery control instructions assume an idealized battery model. Under this model, the battery
+can be operated in four discrete operation modes:
+
+| **Operation Mode ID** | **Description**                                                                      |
+| --------------------- | ------------------------------------------------------------------------------------ |
+| **IDLE**              | Battery neither charges nor discharges; holds its state of charge.                   |
+| **CHARGE**            | Charge at a specified power rate up to the allowable maximum.                        |
+| **DISCHARGE**         | Discharge at a specified power rate up to the allowable maximum.                     |
+| **ALLOW_DISCHARGE**   | Allow the battery to freely discharge depending on its instantaneous power setpoint. |
+
+The **operation mode factor** (0.0–1.0) specifies the normalized power rate relative to the
+battery's nominal maximum charge or discharge power. A value of 1.0 corresponds to full-rate
+charging or discharging, while 0.0 indicates no power transfer. Intermediate values scale the power
+proportionally.
+
+### Electric Vehicle Instructions
+
+The electric vehicle control instructions assume an idealized EV battery model. Under this model,
+the EV battery can be operated in two operation modes:
+
+| **Operation Mode ID** | **Description**                                                                      |
+| --------------------- | ------------------------------------------------------------------------------------ |
+| **IDLE**              | Battery neither charges nor discharges; holds its state of charge.                   |
+| **CHARGE**            | Charge at a specified power rate up to the allowable maximum.                        |
+
+The **operation mode factor** (0.0–1.0) specifies the normalized power rate relative to the
+battery's nominal maximum charge power. A value of 1.0 corresponds to full-rate charging, while 0.0
+indicates no power transfer. Intermediate values scale the power proportionally.
+
+### Home Appliance Instructions
+
+The home appliance instructions assume an idealized home appliance model. Under this model,
+the home appliance can be operated in two operation modes:
+
+| **Operation Mode ID** | **Description**                                                                      |
+| --------------------- | ------------------------------------------------------------------------------------ |
+| **RUN**               | The home appliance is started and runs until the end of it's power sequence.         |
+| **IDLE**              | The home appliance does not run.                                                     |
+
+The **operation mode factor** (0.0–1.0) is ignored.
+
+## Configuration
+
+### Energy management configuration
+
+The energy management is run on configured intervals with some startup delay after server start.
+Both values are given in seconds.
+
+:::{admonition} Note
+:class: note
+If no interval is configured (`None`, `null`) there will be only one energy management run at
+startup.
+:::
+
+The energy management can be run in two modes:
+
+- **OPTIMIZATION**: A full optimization is done. This includes update of predictions.
+- **PREDICTION**: Only the predictions are updated.
+
+**Example:**
+
+```json
+{
+    "ems": {
+        "startup_delay": 5.0,
+        "interval": 300.0,
+        "mode": "OPTIMIZATION"
+    }
+}
+```
+
+### Optimization Configuration
+
+#### Optimization Time Configuration
+
+- **horizon_hours**:
+    The optimization horizon parameter defines the default time window — in hours — within which
+    the energy optimization goal shall be achieved.
+
+    Specific devices, like the home appliance, have their own configuration for time windows. If
+    the time windows are not configured the simulation uses the default time window.
+
+    Each device simulation run must ensure that all tasks or appliance cycles (e.g., running a
+    dishwasher) are completed within the configured time windows.
+
+- **interval**: Defines the time step in seconds between control actions
+    (e.g. `3600` for one hour, `900` for 15 minutes).
+
+:::{warning}
+**Current Limitation**
+
+At present, the `interval` setting is **not used** by the genetic algorithm. Instead:
+
+- The control interval is fixed to **1 hour**.
+
+Support for configurable intervals (e.g. 15-minute steps) may be added in a future release.
+:::
+
+#### Genetic Algorithm Parameters
+
+The behavior of the genetic algorithm can be customized using the following configuration options:
+
+- **individuals** (`int`, default: `300`):
+  Sets the number of individuals (candidate solutions) in the (first) generation. A higher number
+  increases solution diversity and the chance of finding a good result, but also increases
+  computation time.
+
+- **generations** (`int`, default: `400`):
+  Sets the number of generations to evaluate the optimal solution. In each generation, solutions are
+  evaluated and evolved. More generations can improve optimization quality but increase computation
+  time. Best results are usually found within a moderate number of generations.
+
+- **seed** (`int` or `null`, default: `null`):
+  Sets the random seed for reproducible results.
+
+  - If `null`, a random seed is used (non-reproducible).
+  - If an integer is provided, it ensures that the same optimization input yields the same output.
+
+    A fixed seed to ensure reproducibility. Runs with the same seed and configuration will
+    produce the same results.
+
+- **penalties** (`dict`):
+  Defines how penalties are applied to solutions that violate constraints (e.g., undercharged
+  batteries). Penalty function parameter values influence the fitness score, discouraging
+  undesirable solutions.
+
+:::{note}
+**Supported Penalty Functions**
+
+Currently, the only supported penalty function parameter is:
+
+- `ev_soc_miss`:
+  Applies a penalty when the **state of charge (SOC)** of the electric vehicle battery falls below
+  the required minimum. This encourages the optimizer to ensure sufficient EV charging.
+:::
+
+#### Value Formats
+
+- **Time-related values**:
+  - `hours`: specified in **hours** (e.g. `24`)
+  - `interval`: specified in **seconds** (e.g. `3600`)
+
+- **Genetic algorithm parameters**:
+  - `individuals`: must be an **integer**
+  - `seed`: must be an **integer** or `null` for random behavior
+
+- **Penalty function parameter values**: may be `float`, `int`, or `string`, depending on the type
+  of penalty function.
+
+#### Optimization configuration example
+
+```json
+{
+    "optimization": {
+        "hours": 24,
+        "interval": 3600,
+        "genetic" : {
+            "individuals": 300,
+            "generations": 400,
+            "seed": null,
+            "penalties": {
+                "ev_soc_miss": 10
+            }
+        }
+    }
+}
+```
+
+### Device simulation configuration
+
+The device simulations are used to evaluate the fitness of the individuals of the solution
+population.
+
+The GENETIC algorithm supports 4 devices:
+
+- **inverter**: A photovoltaic power inverter that can export to the grid and charge a battery.
+  The inverter is mandatory.
+- **electric_vehicle**: An electric vehicle, basically the battery of an electric vehicle. The
+  The electrical vehicle is optional.
+- **battery**: A battery that can be charged by the inverter. The battery is mandatory.
+- **home_appliance**: A home appliance, like a washing machine or a dish washer. The home
+  appliance is optional.
+
+:::{admonition} Warning
+:class: warning
+The GENETIC algorithm can only use the first inverter, electrical vehicle, battery, home appliance
+that is configured, even if more devices are configured.
+:::
+
+#### Inverter simulation configuration
+
+**Example:**
+
+```json
+{
+    "devices": {
+        "max_inverters": 1,
+        "inverters": [
+            {
+                "device_id": "inv1",
+                "max_power_w": 10000,
+                "battery_id": "bat1"
+            }
+        ]
+    }
+}
+```
+
+#### Electric vehicle simulation configuration
+
+**Example:**
+
+```json
+{
+    "devices": {
+        "max_electric_vehicles": 1,
+        "electric_vehicles": [
+            {
+                "device_id": "ev1",
+                "capacity_wh": 50000,
+                "max_charge_power_w": 10000,
+                "charge_rates": [0.0, 0.25, 0.5, 0.75, 1.0],
+                "min_soc_percentage": 10,
+                "max_soc_percentage": 80
+            }
+        ]
+    },
+    "measurement": {
+        "electric_vehicle_soc_keys": ["ev1_soc"]
+    }
+}
+```
+
+#### Battery simulation configuration
+
+**Example:**
+
+```json
+{
+    "devices": {
+        "max_batteries": 1,
+        "batteries": [
+            {
+                "device_id": "battery1",
+                "capacity_wh": 8000,
+                "charging_efficiency": 0.88,
+                "discharging_efficiency": 0.88,
+                "levelized_cost_of_storage_kwh": 0.12,
+                "max_charge_power_w": 8000,
+                "min_charge_power_w": 50,
+                "charge_rates": null,
+                "min_soc_percentage": 5,
+                "max_soc_percentage": 95
+            }
+        ]
+    }
+}
+```
+
+#### Home appliance simulation configuration
+
+**Example:**
+
+```json
+{
+    "devices": {
+        "max_home_appliances": 1,
+        "home_appliances": [
+            {
+                "device_id": "washing machine",
+                "consumption_wh": 600,
+                "duration_h": 3,
+                "time_windows": null,
+            }
+        ]
+    }
+}
+```
+
+The time windows the home appliance may run can be [configured](#configtimewindow-page) in several
+ways. See the [time window configuration](#configtimewindow-page) for details.
+
+## Predictions configuration
+
+The device simulation may rely on predictions to simulate proper behaviour. E.g. the inverter needs
+to know the PV forecast.
+
+Configure the [predictions](#prediction-page) as described on the [prediction page](#prediction-page).
+
+### Providing your own prediction data
+
+If EOS does not have a suitable prediction provider you can provide your own data for a prediction.
+Configure the respective import provider (ElecPriceImport, LoadImport, PVForecastImport,
+WeatherImport) and use one of the following endpoints to provide your own data:
+
+- **PUT** `/v1/prediction/import/ElecPriceImport`
+- **PUT** `/v1/prediction/import/LoadImport`
+- **PUT** `/v1/prediction/import/PVForecastImport`
+- **PUT** `/v1/prediction/import/WeatherImport`
+
+## Measurement configuration
+
+Predictions and device simulations often rely on **measurement data** to produce accurate results.
+For example:
+
+- A **load forecast** requires past energy meter readings.
+- A **battery simulation** needs the current **state of charge (SoC)** to start from the correct
+  condition.
+
+Before using these features, make sure to configure the [measurement](#measurement-page) as
+described on the [measurement page](#measurement-page).
+
+### Providing your own measurement data
+
+You can provide your own measurement data to the prediction and simulation engine through the
+following REST endpoints (see the [measurement page](#measurement-page) for details on the data
+format):
+
+- **PUT** `/v1/measurement/data`
+- **PUT** `/v1/measurement/dataframe`
+- **PUT** `/v1/measurement/series`
+- **PUT** `/v1/measurement/value`
+
+### Example: Supplying Battery and EV SoC
+
+For **batteries** and **electric vehicles**, it is strongly recommended to provide
+**current SoC**. This ensures that simulations start with the correct state.
+
+The simplest way is to use the `/v1/measurement/value` endpoint.
+Assuming the battery is named `battery1` and the EV is named `ev11`:
+
+1. **Use the measurement keys** that are pre-configured for your **devices**. For example:
+
+    ```json
+    {
+        "devices": {
+            "batteries": [
+                {
+                "device_id": "battery1", "capacity_wh": 8000,  ...
+                "measurement_key_soc_factor": "battery1-soc-factor", ...
+                }
+            ],
+            "electric_vehicles": [
+                {
+                "device_id": "ev11", "capacity_wh": 8000,  ...
+                "measurement_key_soc_factor": "ev11-soc-factor", ...
+                }
+            ]
+        }
+    }
+    ```
+
+2. **Record your SoC readings** to these keys.
+
+   - Enter the values as **factor of total capacity** of the respective **battery**.
+
+In these examples:
+
+- datetime specifies the timestamp of the measurement.
+- key is the measurement key (e.g. battery1-soc-factor).
+- value is the numeric measurement value (e.g. SoC as factor of total capacity).
+
+#### Raw HTTP request
+
+```http
+PUT http://127.0.0.1:8503/v1/measurement/value?datetime=2025-09-26T16%3A39&key=battery1-soc-factor&value=0.57
+PUT http://127.0.0.1:8503/v1/measurement/value?datetime=2025-09-26T16%3A39&key=ev11-soc-factor&value=0.22
+```
+
+#### Equivalent curl commands
+
+```bash
+curl -X PUT "http://127.0.0.1:8503/v1/measurement/value?datetime=2025-09-26T16%3A39&key=battery1-soc-factor&value=0.57"
+curl -X PUT "http://127.0.0.1:8503/v1/measurement/value?datetime=2025-09-26T16%3A39&key=ev11-soc-factor&value=0.22"
+```
+
+### Example: Supplying Load Data
+
+To provide your actual load measurements in Akkudoktor-EOS:
+
+1. **Configure the measurement keys** for your load energy meters. For example:
+
+    ```json
+    {
+        "measurements": {
+            "load_emr_keys": ["my_load_meter_reading", "my_other_load_meter_reading"]
+        }
+    }
+    ```
+
+2. **Record your meter readings** to these keys.
+
+   - Enter the values exactly as your energy meters report them, in **kWh**.
+   - Use the same approach as when supplying battery or EV SoC data.

docs/akkudoktoreos/optimpost.md

@@ -1,12 +1,22 @@
 % SPDX-License-Identifier: Apache-2.0
 
-# Optimization
+# `POST /optimize` Optimization
 
 ## Introduction
 
 The `POST /optimize` API endpoint optimizes your energy management system based on various inputs
 including electricity prices, battery storage capacity, PV forecast, and temperature data.
 
+The `POST /optimize` optimization interface is the "classical" interface developed by Andreas at the
+start of the projects and used and described in his videos. It allows and requires to define all the
+optimization paramters on the endpoint request.
+
+:::{admonition} Warning
+:class: warning
+The `POST /optimize` endpoint interface does not regard configurations set for the parameters
+passed to the request. You have to set the parameters even if given in the configuration.
+:::
+
 ## Input Payload
 
 ### Sample Request
@@ -14,38 +24,71 @@ including electricity prices, battery storage capacity, PV forecast, and tempera
 ```json
 {
     "ems": {
-        "preis_euro_pro_wh_akku": 0.0007,
-        "einspeiseverguetung_euro_pro_wh": 0.00007,
-        "gesamtlast": [500, 500, ..., 500, 500],
-        "pv_prognose_wh": [300, 0, 0, ..., 2160, 1840],
-        "strompreis_euro_pro_wh": [0.0003784, 0.0003868, ..., 0.00034102, 0.00033709]
+        "preis_euro_pro_wh_akku": 0.0001,
+        "einspeiseverguetung_euro_pro_wh": [
+          0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007,
+          0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007,
+          0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007,
+          0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007,
+          0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007,
+          0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007,
+          0.00007, 0.00007, 0.00007, 0.00007, 0.00007, 0.00007
+        ],
+        "gesamtlast": [
+          676.71, 876.19, 527.13, 468.88, 531.38, 517.95, 483.15, 472.28,
+          1011.68, 995.00, 1053.07, 1063.91, 1320.56, 1132.03, 1163.67,
+          1176.82, 1216.22, 1103.78, 1129.12, 1178.71, 1050.98, 988.56, 912.38,
+          704.61, 516.37, 868.05, 694.34, 608.79, 556.31, 488.89, 506.91,
+          804.89, 1141.98, 1056.97, 992.46, 1155.99, 827.01, 1257.98, 1232.67,
+          871.26, 860.88, 1158.03, 1222.72, 1221.04, 949.99, 987.01, 733.99,
+          592.97
+        ],
+        "pv_prognose_wh": [
+          0, 0, 0, 0, 0, 0, 0, 8.05, 352.91, 728.51, 930.28, 1043.25, 1106.74,
+          1161.69, 6018.82, 5519.07, 3969.88, 3017.96, 1943.07, 1007.17,
+          319.67, 7.88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5.04, 335.59, 705.32,
+          1121.12, 1604.79, 2157.38, 1433.25, 5718.49, 4553.96, 3027.55,
+          2574.46, 1720.4, 963.4, 383.3, 0, 0, 0
+        ],
+        "strompreis_euro_pro_wh": [
+          0.0003384, 0.0003318, 0.0003284, 0.0003283, 0.0003289, 0.0003334,
+          0.0003290, 0.0003302, 0.0003042, 0.0002430, 0.0002280, 0.0002212,
+          0.0002093, 0.0001879, 0.0001838, 0.0002004, 0.0002198, 0.0002270,
+          0.0002997, 0.0003195, 0.0003081, 0.0002969, 0.0002921, 0.0002780,
+          0.0003384, 0.0003318, 0.0003284, 0.0003283, 0.0003289, 0.0003334,
+          0.0003290, 0.0003302, 0.0003042, 0.0002430, 0.0002280, 0.0002212,
+          0.0002093, 0.0001879, 0.0001838, 0.0002004, 0.0002198, 0.0002270,
+          0.0002997, 0.0003195, 0.0003081, 0.0002969, 0.0002921, 0.0002780
+        ]
     },
     "pv_akku": {
         "device_id": "battery1",
-        "capacity_wh": 12000,
-        "charging_efficiency": 0.92,
-        "discharging_efficiency": 0.92,
-        "max_charge_power_w": 5700,
-        "initial_soc_percentage": 66,
-        "min_soc_percentage": 5,
-        "max_soc_percentage": 100
+        "capacity_wh": 26400,
+        "max_charge_power_w": 5000,
+        "initial_soc_percentage": 80,
+        "min_soc_percentage": 15
     },
     "inverter": {
         "device_id": "inverter1",
-        "max_power_wh": 15500
-        "battery_id": "battery1",
+        "max_power_wh": 10000,
+        "battery_id": "battery1"
     },
     "eauto": {
-        "device_id": "auto1",
-        "capacity_wh": 64000,
-        "charging_efficiency": 0.88,
-        "discharging_efficiency": 0.88,
+        "device_id": "ev1",
+        "capacity_wh": 60000,
+        "charging_efficiency": 0.95,
+        "charge_rates": [0.0, 0.375, 0.5, 0.625, 0.75, 0.875, 1.0],
+        "discharging_efficiency": 1.0,
         "max_charge_power_w": 11040,
-        "initial_soc_percentage": 98,
-        "min_soc_percentage": 60,
-        "max_soc_percentage": 100
+        "initial_soc_percentage": 54,
+        "min_soc_percentage": 0
     },
-    "temperature_forecast": [18.3, 18, ..., 20.16, 19.84],
+    "temperature_forecast": [
+      18.3, 17.8, 16.9, 16.2, 15.6, 15.1, 14.6, 14.2, 14.3, 14.8, 15.7, 16.7, 17.4,
+      18.0, 18.6, 19.2, 19.1, 18.7, 18.5, 17.7, 16.2, 14.6, 13.6, 13.0, 12.6, 12.2,
+      11.7, 11.6, 11.3, 11.0, 10.7, 10.2, 11.4, 14.4, 16.4, 18.3, 19.5, 20.7, 21.9,
+      22.7, 23.1, 23.1, 22.8, 21.8, 20.2, 19.1, 18.0, 17.4
+    ],
     "start_solution": null
 }
 ```
@@ -58,7 +101,8 @@ including electricity prices, battery storage capacity, PV forecast, and tempera
 
 - Unit: €/Wh
 - Purpose: Represents the residual value of energy stored in the battery
-- Impact: Lower values encourage battery depletion, higher values preserve charge at the end of the simulation.
+- Impact: Lower values encourage battery depletion, higher values preserve charge at the end of the
+  simulation.
 
 #### Feed-in Tariff (`einspeiseverguetung_euro_pro_wh`)
 
@@ -162,23 +206,24 @@ Verify prices against your local tariffs.
 
 #### Battery Control
 
-- `ac_charge`: Grid charging schedule (0-1)
+- `ac_charge`: Grid charging schedule (0.0-1.0)
 - `dc_charge`: DC charging schedule (0-1)
 - `discharge_allowed`: Discharge permission (0 or 1)
 
 0 (no charge)
 1 (charge with full load)
 
-`ac_charge` multiplied by the maximum charge power of the battery results in the planned charging power.
+`ac_charge` multiplied by the maximum charge power of the battery results in the planned charging
+power.
 
 #### EV Charging
 
-- `eautocharge_hours_float`: EV charging schedule (0-1)
+- `eautocharge_hours_float`: EV charging schedule (0.0-1.0)
 
 #### Results
 
-The `result` object contains detailed information about the optimization outcome.
-The length of the array is between 25 and 48 and starts at the current hour and ends at 23:00 tomorrow.
+The `result` object contains detailed information about the optimization outcome. The length of the
+array is between 25 and 48 and starts at the current hour and ends at 23:00 tomorrow.
 
 - `Last_Wh_pro_Stunde`: Array of hourly load values in Wh
   - Shows the total energy consumption per hour

docs/akkudoktoreos/prediction.md

@@ -8,21 +8,21 @@ optimization is executed. In EOS, a standard set of predictions is managed, incl
 
 - Household Load Prediction
 - Electricity Price Prediction
+- Feed In Tariff Prediction
 - PV Power Prediction
 - Weather Prediction
 
 ## Storing Predictions
 
 EOS stores predictions in a **key-value store**, where the term `prediction key` refers to the
-unique key used to retrieve specific prediction data. The key-value store is in memory. Stored
-data is lost on re-start of the EOS REST server.
+unique key used to retrieve specific prediction data.
 
 ## Prediction Providers
 
 Most predictions can be sourced from various providers. The specific provider to use is configured
 in the EOS configuration and can be set by prediction type. For example:
 
-```python
+```json
 {
   "weather": {
     "provider": "ClearOutside"
@@ -48,7 +48,7 @@ The prediction data must be provided in one of the following formats:
 
 A dictionary with the following structure:
 
-```python
+```json
     {
         "start_datetime": "2024-01-01 00:00:00",
         "interval": "1 Hour",
@@ -170,11 +170,31 @@ The electricity proce forecast data must be provided in one of the formats descr
 The data may additionally or solely be provided by the
 **PUT** `/v1/prediction/import/ElecPriceImport` endpoint.
 
+## Feed In Tariff Prediction
+
+Prediction keys:
+
+- `feed_in_tarif_wh`: Feed in tarif per Wh (€/Wh).
+- `feed_in_tarif_kwh`: Feed in tarif per kWh (€/kWh)
+
+Configuration options:
+
+- `feedintarif`: Feed in tariff configuration.
+
+  - `provider`: Feed in tariff provider id of provider to be used.
+
+    - `FeedInTariffFixed`: Provides fixed feed in tariff values.
+    - `FeedInTariffImport`: Imports from a file or JSON string.
+
+  - `provider_settings.feed_in_tariff_kwh`: Fixed feed in tariff (€/kWh).
+  - `provider_settings.import_file_path`: Path to the file to import feed in tariff forecast data from.
+  - `provider_settings.import_json`: JSON string, dictionary of feed in tariff value lists.
+
 ## Load Prediction
 
 Prediction keys:
 
-- `load_mean`: Predicted load mean value (W).
+- `loadforecast_power_w`: Predicted load mean value (W).
 - `load_std`: Predicted load standard deviation (W).
 - `load_mean_adjusted`: Predicted load mean value adjusted by load measurement (W).
 
@@ -188,15 +208,27 @@ Configuration options:
     - `LoadVrm`: Retrieves data from the VRM API by Victron Energy.
     - `LoadImport`: Imports from a file or JSON string.
 
-  - `provider_settings.loadakkudoktor_year_energy`: Yearly energy consumption (kWh).
-  - `provider_settings.loadimport_file_path`: Path to the file to import load forecast data from.
-  - `provider_settings.loadimport_json`: JSON string, dictionary of load forecast value lists.
+  - `provider_settings.LoadAkkudoktor.loadakkudoktor_year_energy_kwh`: Yearly energy consumption (kWh).
+  - `provider_settings.LoadVRM.load_vrm_token`: API token.
+  - `provider_settings.LoadVRM.load_vrm_idsite`: load_vrm_idsite.
+  - `provider_settings.LoadImport.loadimport_file_path`: Path to the file to import load forecast data from.
+  - `provider_settings.LoadImport.loadimport_json`: JSON string, dictionary of load forecast value lists.
 
 ### LoadAkkudoktor Provider
 
-The `LoadAkkudoktor` provider retrieves generic load data from a local database and tailors it to
-align with the annual energy consumption specified in the `loadakkudoktor_year_energy` configuration
-option.
+The `LoadAkkudoktor` provider retrieves generic load data from the local database and scales
+it to match the annual energy consumption specified in the
+`LoadAkkudoktor.loadakkudoktor_year_energy` configuration option.
+
+### LoadAkkudoktorAdjusted Provider
+
+The `LoadAkkudoktorAdjusted` provider retrieves generic load data from the local database and scales
+it to match the annual energy consumption specified in the
+`LoadAkkudoktor.loadakkudoktor_year_energy` configuration option. In addition, the provider refines
+the forecast by incorporating available measured load data, ensuring a more realistic and
+site-specific consumption profile.
+
+For details on how to supply load measurements, see the [Measurements](measurement-page) section.
 
 ### LoadVrm Provider
 
@@ -205,14 +237,18 @@ To receive forecasts, the system data must be configured under Dynamic ESS in th
 To query the forecasts, an API token is required, which can also be created in the VRM portal under Preferences.
 This token must be stored in the EOS configuration along with the VRM-Installations-ID.
 
-```python
+```json
     {
         "load": {
             "provider": "LoadVrm",
             "provider_settings": {
+                "LoadVRM": {
                     "load_vrm_token": "dummy-token",
                     "load_vrm_idsite": 12345
                 }
+             }
+        }
+    }
 ```
 
 The prediction keys for the load forecast data are:
@@ -510,7 +546,7 @@ Prediction keys:
 - `weather_temp_air`: Temperature (°C)
 - `weather_total_clouds`: Total Clouds (% Sky Obscured)
 - `weather_visibility`: Visibility (m)
-- `weather_wind_direction`: "Wind Direction (°)
+- `weather_wind_direction`: Wind Direction (°)
 - `weather_wind_speed`: Wind Speed (kmph)
 
 Configuration options:
@@ -542,7 +578,7 @@ The provider provides forecast data for the following prediction keys:
 - `weather_temp_air`: Temperature (°C)
 - `weather_total_clouds`: Total Clouds (% Sky Obscured)
 - `weather_visibility`: Visibility (m)
-- `weather_wind_direction`: "Wind Direction (°)
+- `weather_wind_direction`: Wind Direction (°)
 - `weather_wind_speed`: Wind Speed (kmph)
 
 ### ClearOutside Provider
@@ -572,7 +608,7 @@ The provider provides forecast data for the following prediction keys:
 - `weather_temp_air`: Temperature (°C)
 - `weather_total_clouds`: Total Clouds (% Sky Obscured)
 - `weather_visibility`: Visibility (m)
-- `weather_wind_direction`: "Wind Direction (°)
+- `weather_wind_direction`: Wind Direction (°)
 - `weather_wind_speed`: Wind Speed (kmph)
 
 ### WeatherImport Provider
@@ -603,7 +639,7 @@ The prediction keys for the weather forecast data are:
 - `weather_temp_air`: Temperature (°C)
 - `weather_total_clouds`: Total Clouds (% Sky Obscured)
 - `weather_visibility`: Visibility (m)
-- `weather_wind_direction`: "Wind Direction (°)
+- `weather_wind_direction`: Wind Direction (°)
 - `weather_wind_speed`: Wind Speed (kmph)
 
 The PV forecast data must be provided in one of the formats described in

docs/akkudoktoreos/resource.md

@@ -0,0 +1,258 @@
+% SPDX-License-Identifier: Apache-2.0
+(resource-page)=
+
+# Resources (Device Simulations)
+
+## Concepts
+
+The simulations for resources are leaning on general concepts of the [S2 standard].
+
+### Control Types
+
+The control of resources and such what a resource simulation will simulate follows three
+basic control principles:
+
+- Operation Mode Based Control (OMBC)
+- Fill Rate Based Control (FRBC)
+- Demand Driven Based Control (DDBC)
+
+Although these control principles differ enough to separate them into three distinct control types,
+there are some common aspects that make them similar:
+
+- Operation Modes
+- Transitions and
+- Timers.
+
+The objective for a control type is under which circumstances what things can be adjusted, and what
+the constraints are for these adjustments. The three control types model a virtual, abstract resource
+for simulation.
+
+The abstract resource ignores all details of pyhsical device that are not relevant to energy
+management. In addition, physical devices have an enormous variety in parameters, sensors, control
+strategies, concerns, safeguards, and so on. It would be practically impossible to develop a
+simulation that can
+understand all the parameters of all the physical devices on the market. By making the resource more
+abstract, its concepts can be translated to all sorts of physical devices, even though internally
+they function very differently. As a consequence, it not always possible to make a 100% accurate
+description of all the behaviors and constraints in these abstractions. But the abstractions used
+in the control types are quite powerful, and should allow you to come pretty close.
+
+The control types basically define how the simulated resource can be described. The user in the end
+selects the proper desciption of a physical device using the configuration options provided for
+resource simulations. The configuration sets how the simulated resource functions, what it can do and
+what kind of constraints it has.
+
+### Resource Simulation
+
+Based on the description of this virtual resource, the resource simulation can make predictions of
+what the physical device will do in certain situations, and when it is allowed to execute
+instructions generated by the optimization as part of the energy management plan evaluation.
+
+### Resource Status
+
+Once the physical device has changed it's behavior, the resource simulation should be informed
+to make the simulation change it's state accordingly.
+
+The actual state of a pyhsical device may be reported to the resource simulation by the
+**PUT** `/v1/resource/status` API endpoint.
+
+## Battery
+
+There is a wealth of possible battery operation modes:
+
+<!-- pyml disable line-length -->
+| Mode                      | Purpose / Behavior                                                                      | Typical Trigger / Context                                        |
+| ------------------------- | --------------------------------------------------------------------------------------- | ---------------------------------------------------------------- |
+| **IDLE**                  | Battery neither charges nor discharges (SOC stable).                                    | No active control objective or power imbalance below thresholds. |
+| **SELF_CONSUMPTION**      | Charge from PV surplus and discharge to cover local load.                               | PV generation > load (charge) or load > PV (discharge).          |
+| **NON_EXPORT**   | Charge from on-site or local surplus with the goal of minimizing or preventing energy export to the external grid. Discharging to the grid is not allowed. | Export limit reached and SOC < SOC_max.                          |
+| **PEAK_SHAVING**          | Discharge to keep grid import below a target threshold.                                 | Predicted or measured site load exceeds peak limit.              |
+| **GRID_SUPPORT_EXPORT**   | Discharge energy to grid for revenue (V2G, wholesale market, flexibility service).      | Market or signal permits profitable export.                      |
+| **GRID_SUPPORT_IMPORT**   | Charge from grid to absorb surplus or provide up-regulation service.                    | Low-price or grid-support signal detected.                       |
+| **FREQUENCY_REGULATION**  | Rapid charge/discharge response to grid frequency deviations.                           | Active participation in frequency control.                       |
+| **RAMP_RATE_CONTROL**     | Smooth site-level power ramp rates by buffering fluctuations.                           | Sudden PV/load change exceeding ramp limit.                      |
+| **RESERVE_BACKUP**        | Maintain SOC ≥ reserve threshold to ensure backup capacity.                             | Resilience mode active, grid operational.                        |
+| **OUTAGE_SUPPLY**         | Islanded operation: power local loads using stored energy (and PV if available).        | Grid failure detected.                                           |
+| **FORCED_CHARGE**         | Manual or external control command to charge (e.g., pre-event, maintenance). No discharge.  | Operator or optimizer command. |
+| **FORCED_DISCHARGE**      | Manual or external control command to discharge. No charge.                             | Operator or optimizer command.                                   |
+| **FAULT**                 | Battery unavailable due to fault, safety, or protection state.                          | Fault detected (thermal, voltage, comms, etc.).                  |
+<!-- pyml enable line-length -->
+
+The optimization algorithm, the device simulation and the configuration properties only support the
+most important of these modes.
+
+### Battery Simulation
+
+The battery simulation assumes an idealized battery model. Under this model, the battery can be
+operated in three discrete operation modes with fill rate based control (FRBC):
+
+| **Operation Mode ID**    | **Description**                                                       |
+| ------------------------ | --------------------------------------------------------------------- |
+| **SELF_CONSUMPTION**     | Charge from local surplus and discharge to cover local load.          |
+| **NON_EXPORT**           | Charge from local surplus and do not discharge.                       |
+| **FORCED_CHARGE**        | Charge.                                                               |
+
+The **operation mode factor** (0.0–1.0) specifies the normalized power rate relative to the
+battery's nominal maximum charge or discharge power. A value of 1.0 corresponds to full-rate
+charging or discharging, while 0.0 indicates no power transfer. Intermediate values scale the power
+proportionally.
+
+The **fill level** (0.0–1.0) specifies the normalized fill level relative to the
+battery's nominal maximum charge. A value of 1.0 corresponds to full while 0.0 indicates empty.
+Intermediate values scale the fill level proportionally.
+
+### Battery Configuration
+
+### Battery Stati
+
+To keep the battery simulation in synchonization with the actual stati of the battery the following
+resource stati may be reported to EOS by the **PUT** `/v1/resource/status` API endpoint.
+
+#### Battery FRBCActuatorStatus
+
+The operation mode the battery is currently operated.
+
+```json
+{
+  "type": "FRBCActuatorStatus",
+  "active_operation_mode_id": "GRID_SUPPORT_IMPORT",
+  "operation_mode_factor": "0.375",
+  "previous_operation_mode_id": "SELF_CONSUMPTION",
+  "transistion_timestamp": "20250725T12:00:12"
+}
+```
+
+#### Battery FRBCStorageStatus
+
+The current battery state of charge (SoC).
+
+```json
+{
+  "type": "FRBCStorageStatus",
+  "present_fill_level": "0.88"
+}
+```
+
+#### Battery PowerMeasurement
+
+The current power that the battery is charged or discharged with \[W\].
+
+```json
+{
+  "type": "PowerMeasurement",
+  "measurement_timestamp": "20250725T12:00:12",
+  "values": [
+    {
+      "commodity_quantity": "ELECTRIC.POWER.L1",
+      "value": "887.5"
+    },
+    {
+      "commodity_quantity": "ELECTRIC.POWER.L2",
+      "value": "905.5"
+    },
+    {
+      "commodity_quantity": "ELECTRIC.POWER.L2",
+      "value": "1100.7"
+    },
+  ]
+}
+```
+
+For symmetric (or unknown) power distribution:
+
+```json
+{
+  "type": "PowerMeasurement",
+  "measurement_timestamp": "20250725T12:00:12",
+  "values": [
+    {
+      "commodity_quantity": "ELECTRIC.POWER.3_PHASE_SYM",
+      "value": "1000"
+    }
+  ]
+}
+```
+
+## Electric Vehicle
+
+The electric vehicle is basically a battery with a reduced set of operation modes.
+
+### Electric Vehicle Instructions
+
+The electric vehicle control instructions assume an idealized EV battery model. Under this model,
+the EV battery can be operated in two operation modes:
+
+| **Operation Mode ID** | **Description**                                                         |
+| --------------------- | ----------------------------------------------------------------------- |
+| **IDLE**              | Battery neither charges nor discharges; holds its state of charge.      |
+| **FORCED_CHARGE**     | Charge at a specified power rate up to the allowable maximum.           |
+
+The **operation mode factor** (0.0–1.0) specifies the normalized power rate relative to the
+battery's nominal maximum charge power. A value of 1.0 corresponds to full-rate charging, while 0.0
+indicates no power transfer. Intermediate values scale the power proportionally.
+
+## Home Appliance
+
+The optimization algorithm supports one start of the home appliance within the optimization
+horizon.
+
+### Home Appliance Simulation
+
+### Home Appliance Configuration
+
+Home appliance to run within the optimization horizon.
+
+```json
+[
+  {
+    "device_id": "dishwasher1",
+    "consumption_wh": 2000,
+    "duration_h": 3
+  }
+]
+```
+
+Home appliance to run within a time window of 5 hours starting at 8:00 every day and another time
+window of 3 hours starting at 15:00 every day. See
+[Time Window Sequence Configuration](configtimewindow-page) for more information.
+
+```json
+[
+  {
+    "device_id": "dishwasher1",
+    "consumption_wh": 2000,
+    "duration_h": 3,
+    "time_windows": {
+      "windows": [
+        {
+          "start_time": "08:00",
+          "duration": "5 hours"
+        },
+        {
+          "start_time": "15:00",
+          "duration": "3 hours"
+        }
+      ]
+    }
+  }
+]
+```
+
+:::{admonition} Note
+:class: note
+The optimization algorithm always restricts to one start within the optimization horizon per
+energy management run.
+:::
+
+### Home Appliance Instructions
+
+The home appliance instructions assume an idealized home appliance model. Under this model,
+the home appliance can be operated in two operation modes:
+
+| **Operation Mode ID** | **Description**                                                         |
+|-----------------------|-------------------------------------------------------------------------|
+| **RUN**               | The home appliance is started and runs until the end of it's power      |
+|                       | sequence.                                                               |
+| **IDLE**              | The home appliance does not run.                                        |
+
+The **operation mode factor** (0.0–1.0) is ignored.

docs/akkudoktoreos/serverapi.md

@@ -1,4 +1,5 @@
 % SPDX-License-Identifier: Apache-2.0
+(server-api-page)=
 
 # Server API
 

docs/conf.py

@@ -99,7 +99,7 @@ html_theme_options = {
     "logo_only": False,
     "titles_only": True,
 }
-html_css_files = ["eos.css"]
+html_css_files = ["eos.css"]  # Make body size wider
 
 # -- Options for autodoc -------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/extensions/autodoc.html

docs/develop/CHANGELOG.md

@@ -0,0 +1,4 @@
+```{include} ../../CHANGELOG.md
+:relative-docs: ../
+:relative-images:
+```

docs/develop/develop.md

@@ -0,0 +1,593 @@
+% SPDX-License-Identifier: Apache-2.0
+(develop-page)=
+
+# Development Guide
+
+## Development Prerequisites
+
+Have or
+[create](https://docs.github.com/en/get-started/start-your-journey/creating-an-account-on-github)
+a [GitHub](https://github.com/) account.
+
+Make shure all the source installation prequistes are installed. See the
+[installation guideline](#install-page) for a detailed list of tools.
+
+Under Linux the [make](https://www.gnu.org/software/make/manual/make.html) tool should be installed
+as we have a lot of pre-fabricated commands for it.
+
+Install your favorite editor or integrated development environment (IDE):
+
+- Full-Featured IDEs
+
+  - [Eclipse + PyDev](https://www.pydev.org/)
+  - [KDevelop](https://www.kdevelop.org/)
+  - [PyCharm](https://www.jetbrains.com/pycharm/)
+  - ...
+
+- Code Editors with Python Support
+
+  - [Visual Studio Code (VS Code)](https://code.visualstudio.com/)
+  - [Sublime Text](https://www.sublimetext.com/)
+  - [Atom / Pulsar](https://pulsar-edit.dev/)
+  - ...
+
+- Python-Focused or Beginner-Friendly IDEs
+
+  - [Spyder](https://www.spyder-ide.org/)
+  - [Thonny](https://thonny.org/)
+  - [IDLE](https://www.python.org/downloads/)
+  - ...
+
+## Step 1 – Fork the Repository
+
+[Fork the EOS repository](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo)
+to your GitHub account.
+
+Clone your fork locally and add the EOS upstream remote to track updates.
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        git clone https://github.com/<YOURUSERNAME>/EOS.git
+        cd EOS
+        git remote add eos https://github.com/Akkudoktor-EOS/EOS.git
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        git clone https://github.com/<YOURUSERNAME>/EOS.git
+        cd EOS
+        git remote add eos https://github.com/Akkudoktor-EOS/EOS.git
+```
+
+Replace `<YOURUSERNAME>` with your GitHub username.
+
+## Step 2 – Development Setup
+
+This is recommended for developers who want to modify the source code and test changes locally.
+
+### Step 2.1 – Create a Virtual Environment
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        python -m venv .venv
+        .venv\Scripts\pip install --upgrade pip
+        .venv\Scripts\pip install -r requirements-dev.txt
+        .venv\Scripts\pip install build
+        .venv\Scripts\pip install -e .
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        python3 -m venv .venv
+        .venv/bin/pip install --upgrade pip
+        .venv/bin/pip install -r requirements-dev.txt
+        .venv/bin/pip install build
+        .venv/bin/pip install -e .
+
+  .. tab:: Linux Make
+
+     .. code-block:: bash
+
+        make install
+```
+
+### Step 2.2 – Activate the Virtual Environment
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        .venv\Scripts\activate.bat
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        source .venv/bin/activate
+```
+
+### Step 2.3 - Install pre-commit
+
+Our code style and commit message checks use [`pre-commit`](https://pre-commit.com).
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        pre-commit install
+        pre-commit install --hook-type commit-msg --hook-type pre-push
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        pre-commit install
+        pre-commit install --hook-type commit-msg --hook-type pre-push
+```
+
+## Step 3 - Run EOS
+
+Make EOS accessible at [http://localhost:8503/docs](http://localhost:8503/docs) and EOSdash at
+[http://localhost:8504](http://localhost:8504).
+
+### Option 1 – Using Python Virtual Environment
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        python -m akkudoktoreos.server.eos
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        python -m akkudoktoreos.server.eos
+
+  .. tab:: Linux Make
+
+     .. code-block:: bash
+
+        make run
+```
+
+To have full control of the servers during development you may start the servers independently -
+e.g. in different terminal windows. Don't forget to activate the virtual environment in your
+terminal window.
+
+:::{admonition} Note
+:class: note
+If you killed or stopped the servers shortly before, the ports may still be occupied by the last
+processes. It may take more than 60 seconds until the ports are released.
+:::
+
+You may add the `--reload true` parameter to have the servers automatically restarted on source code
+changes. It is best to also add `--startup_eosdash false` to EOS to prevent the automatic restart
+interfere with the EOS server trying to start EOSdash.
+
+<!-- pyml disable line-length -->
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        python -m akkudoktoreos.server.eosdash --host localhost --port 8504 --log_level DEBUG --reload true
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        python -m akkudoktoreos.server.eosdash --host localhost --port 8504 --log_level DEBUG --reload true
+
+  .. tab:: Linux Make
+
+     .. code-block:: bash
+
+        make run-dash-dev
+```
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        python -m akkudoktoreos.server.eos --host localhost --port 8503 --log_level DEBUG --startup_eosdash false --reload true
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        python -m akkudoktoreos.server.eos --host localhost --port 8503 --log_level DEBUG --startup_eosdash false --reload true
+
+  .. tab:: Linux Make
+
+     .. code-block:: bash
+
+        make run-dev
+```
+<!-- pyml enable line-length -->
+
+### Option 2 – Using Docker
+
+#### Step 3.1 – Build the Docker Image
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        docker build -t akkudoktoreos .
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        docker build -t akkudoktoreos .
+```
+
+#### Step 3.2 – Run the Container
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        docker run -d `
+          --name akkudoktoreos `
+          -p 8503:8503 `
+          -p 8504:8504 `
+          -e OPENBLAS_NUM_THREADS=1 `
+          -e OMP_NUM_THREADS=1 `
+          -e MKL_NUM_THREADS=1 `
+          -e EOS_SERVER__HOST=0.0.0.0 `
+          -e EOS_SERVER__PORT=8503 `
+          -e EOS_SERVER__EOSDASH_HOST=0.0.0.0 `
+          -e EOS_SERVER__EOSDASH_PORT=8504 `
+          --ulimit nproc=65535:65535 `
+          --ulimit nofile=65535:65535 `
+          --security-opt seccomp=unconfined `
+          akkudoktor-eos:latest
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+          docker run -d \
+            --name akkudoktoreos \
+            -p 8503:8503 \
+            -p 8504:8504 \
+            -e OPENBLAS_NUM_THREADS=1 \
+            -e OMP_NUM_THREADS=1 \
+            -e MKL_NUM_THREADS=1 \
+            -e EOS_SERVER__HOST=0.0.0.0 \
+            -e EOS_SERVER__PORT=8503 \
+            -e EOS_SERVER__EOSDASH_HOST=0.0.0.0 \
+            -e EOS_SERVER__EOSDASH_PORT=8504 \
+            --ulimit nproc=65535:65535 \
+            --ulimit nofile=65535:65535 \
+            --security-opt seccomp=unconfined \
+            akkudoktor-eos:latest
+```
+
+#### Step 3.3 – Manage the Container
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        docker logs -f akkudoktoreos
+        docker stop akkudoktoreos
+        docker start akkudoktoreos
+        docker rm -f akkudoktoreos
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        docker logs -f akkudoktoreos
+        docker stop akkudoktoreos
+        docker start akkudoktoreos
+        docker rm -f akkudoktoreos
+```
+
+For detailed Docker instructions, refer to [Installation Guideline](install-page)
+
+### Step 4 - Create the changes
+
+#### Step 4.1 - Create a development branch
+
+```bash
+git checkout -b <MY_DEVELOPMENT_BRANCH>
+```
+
+Replace `<MY_DEVELOPMENT_BRANCH>` with the development branch name. The branch name shall be of the
+format (feat|fix|chore|docs|refactor|test)/[a-z0-9._-]+, e.g:
+
+- feat/my_cool_new_feature
+- fix/this_annoying_bug
+- ...
+
+#### Step 4.2 – Edit the sources
+
+Use your fovourite editor or IDE to edit the sources.
+
+#### Step 4.3 - Check the source code for correct format
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        pre-commit run --all-files
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        pre-commit run --all-files
+
+  .. tab:: Linux Make
+
+     .. code-block:: bash
+
+        make format
+```
+
+#### Step 4.4 - Test the changes
+
+At a minimum, you should run the module tests:
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        pytest -vs --cov src --cov-report term-missing
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        pytest -vs --cov src --cov-report term-missing
+
+  .. tab:: Linux Make
+
+     .. code-block:: bash
+
+        make test
+```
+
+You should also run the system tests. These include additional tests that interact with real
+resources:
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        pytest --system-test -vs --cov src --cov-report term-missing
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        pytest --system-test -vs --cov src --cov-report term-missing
+
+  .. tab:: Linux Make
+
+     .. code-block:: bash
+
+        make test-system
+```
+
+To do profiling use:
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        python tests/single_test_optimization.py --profile
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        python tests/single_test_optimization.py --profile
+
+  .. tab:: Linux Make
+
+     .. code-block:: bash
+
+        make test-profile
+```
+
+#### Step 4.5 - Commit the changes
+
+Add the changed and new files to the commit.
+
+Create a commit.
+
+### Step 5 - Pull request
+
+Before creating a pull request assure the changes are based on the latest EOS upstream.
+
+Update your local main branch:
+
+```bash
+git checkout main
+git pull eos main
+```
+
+Switch back to your local development branch and rebase to main.
+
+```bash
+git checkout <MY_DEVELOPMENT_BRANCH>
+git rebase -i main
+```
+
+During rebase you can also squash your changes into one (preferred) or a set of commits that have
+proper commit messages and can easily be reviewed.
+
+After rebase run the tests once again.
+
+If everything is ok push the commit(s) to your fork on Github.
+
+```bash
+git push -f origin
+```
+
+If your push by intention does not comply to the rules you can skip the verification by:
+
+```bash
+git push -f --no-verify origin
+```
+
+<!-- pyml disable line-length -->
+Once ready, [submit a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)
+with your fork to the [Akkudoktor-EOS/EOS@master](https://github.com/Akkudoktor-EOS/EOS) repository.
+<!-- pyml enable line-length -->
+
+## Developer Tips
+
+### Keep Your Fork Updated
+
+Regularly pull changes from the eos repository to avoid merge conflicts:
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        git checkout main
+        git pull eos main
+        git push origin
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        git checkout main
+        git pull eos main
+        git push origin
+```
+
+Rebase your development branch to the latest eos main branch.
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        git checkout  <MY_DEVELOPMENT_BRANCH>
+        git rebase -i main
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        git checkout  <MY_DEVELOPMENT_BRANCH>
+        git rebase -i main
+```
+
+### Create Feature Branches
+
+Work in separate branches for each feature or bug fix:
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        git checkout -b feat/my-feature
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        git checkout -b feat/my-feature
+```
+
+### Run Tests Frequently
+
+Ensure your changes do not break existing functionality:
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        pytest -vs --cov src --cov-report term-missing
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        pytest -vs --cov src --cov-report term-missing
+
+  .. tab:: Linux Make
+
+     .. code-block:: bash
+
+        make test
+```
+
+### Follow Coding Standards
+
+Keep your code consistent with existing style and conventions.
+
+### Use Issues for Discussion
+
+Before making major changes, open an issue or discuss with maintainers.
+
+### Document Changes
+
+Update docstrings, comments, and any relevant documentation.

docs/develop/getting_started.md

@@ -1,127 +1,86 @@
+% SPDX-License-Identifier: Apache-2.0
+(getting-started-page)=
+
 # Getting Started
 
-## Installation
+## Installation and Running
 
-The project requires Python 3.10 or newer. Currently there are no official packages or images published.
+AkkudoktorEOS can be installed and run using several different methods:
 
-Following sections describe how to locally start the EOS server on `http://localhost:8503`.
+- **Release package** (for stable versions)
+- **Docker image** (for easy deployment)
+- **From source** (for developers)
 
-### Run from source
+See the [installation guideline](#install-page) for detailed instructions on each method.
 
-Install the dependencies in a virtual environment:
+### Where to Find AkkudoktorEOS
 
-```{eval-rst}
-.. tabs::
-
-  .. tab:: Windows
-
-     .. code-block:: powershell
-
-        python -m venv .venv
-        .venv\Scripts\pip install -r requirements.txt
-        .venv\Scripts\pip install -e .
-
-  .. tab:: Linux
-
-     .. code-block:: bash
-
-        python -m venv .venv
-        .venv/bin/pip install -r requirements.txt
-        .venv/bin/pip install -e .
-
-```
-
-Start the EOS fastapi server:
-
-```{eval-rst}
-.. tabs::
-
-  .. tab:: Windows
-
-     .. code-block:: powershell
-
-        .venv\Scripts\python src/akkudoktoreos/server/eos.py
-
-  .. tab:: Linux
-
-     .. code-block:: bash
-
-        .venv/bin/python src/akkudoktoreos/server/eos.py
-
-```
-
-### Docker
-
-```{eval-rst}
-.. tabs::
-
-  .. tab:: Windows
-
-     .. code-block:: powershell
-
-        docker compose up --build
-
-  .. tab:: Linux
-
-     .. code-block:: bash
-
-        docker compose up --build
-
-```
+- **Release Packages**: [GitHub Releases](https://github.com/Akkudoktor-EOS/EOS/releases)
+- **Docker Images**: [Docker Hub](https://hub.docker.com/r/akkudoktor/eos)
+- **Source Code**: [GitHub Repository](https://github.com/Akkudoktor-EOS/EOS)
 
 ## Configuration
 
-This project uses the `EOS.config.json` file to manage configuration settings.
+AkkudoktorEOS uses the `EOS.config.json` file to manage all configuration settings.
 
 ### Default Configuration
 
-A default configuration file `default.config.json` is provided. This file contains all the necessary
-configuration keys with their default values.
+If essential configuration settings are missing, the application automatically uses a default
+configuration to get you started quickly.
 
-### Custom Configuration
+### Custom Configuration Directory
 
-Users can specify a custom configuration directory by setting the environment variable `EOS_DIR`.
+You can specify a custom location for your configuration by setting the `EOS_DIR` environment
+variable:
 
-- If the directory specified by `EOS_DIR` contains an existing `EOS.config.json` file, the
-  application will use this configuration file.
-- If the `EOS.config.json` file does not exist in the specified directory, the `default.config.json`
-  file will be copied to the directory as `EOS.config.json`.
+```bash
+export EOS_DIR=/path/to/your/config
+```
 
-### Configuration Updates
+**How it works:**
 
-If the configuration keys in the `EOS.config.json` file are missing or different from those in
-`default.config.json`, they will be automatically updated to match the default settings, ensuring
-that all required keys are present.
+- **If `EOS.config.json` exists** in the `EOS_DIR` directory → the application uses this
+  configuration
+- **If `EOS.config.json` doesn't exist** → the application copies `default.config.json` to `EOS_DIR`
+  as `EOS.config.json`
 
-## Classes and Functionalities
+### Creating Your Configuration
 
-This project uses various classes to simulate and optimize the components of an energy system. Each
-class represents a specific aspect of the system, as described below:
+There are three ways to configure AkkudoktorEOS:
 
-- `Battery`: Simulates a battery storage system, including capacity, state of charge, and now
-             charge and discharge losses.
+1. **EOSdash (Recommended)** - The easiest method is to use the web-based dashboard at
+   [http://localhost:8504](http://localhost:8504)
 
-- `PVForecast`: Provides forecast data for photovoltaic generation, based on weather data and
-                historical generation data.
+2. **Manual editing** - Create or edit the `EOS.config.json` file directly in your preferred text
+   editor
 
-- `Load`: Models the load requirements of a household or business, enabling the prediction of future
-          energy demand.
+3. **Server API** - Programmatically change configuration through the [server API](#server-api-page)
 
-- `Heatpump`: Simulates a heat pump, including its energy consumption and efficiency under various
-              operating conditions.
+For a complete reference of all available configuration options, see the [configuration guideline](#configuration-page).
 
-- `Strompreis`: Provides information on electricity prices, enabling optimization of energy
-                consumption and generation based on tariff information.
+## Quick Start Example
 
-- `EMS`: The Energy Management System (EMS) coordinates the interaction between the various
-         components, performs optimization, and simulates the operation of the entire energy system.
+```bash
+# Pull the latest docker image
+docker pull akkudoktor/eos:latest
 
-These classes work together to enable a detailed simulation and optimization of the energy system.
-For each class, specific parameters and settings can be adjusted to test different scenarios and
-strategies.
+# Run the application
+docker run -d \
+  --name akkudoktoreos \
+  -p 8503:8503 \
+  -p 8504:8504 \
+  -e OPENBLAS_NUM_THREADS=1 \
+  -e OMP_NUM_THREADS=1 \
+  -e MKL_NUM_THREADS=1 \
+  -e EOS_SERVER__HOST=0.0.0.0 \
+  -e EOS_SERVER__PORT=8503 \
+  -e EOS_SERVER__EOSDASH_HOST=0.0.0.0 \
+  -e EOS_SERVER__EOSDASH_PORT=8504 \
+  --ulimit nproc=65535:65535 \
+  --ulimit nofile=65535:65535 \
+  --security-opt seccomp=unconfined \
+  akkudoktor/eos:latest
 
-### Customization and Extension
-
-Each class is designed to be easily customized and extended to integrate additional functions or
-improvements. For example, new methods can be added for more accurate modeling of PV system or
-battery behavior. Developers are invited to modify and extend the system according to their needs.
+# Access the dashboard
+open http://localhost:8504
+```

docs/develop/install.md

@@ -0,0 +1,288 @@
+% SPDX-License-Identifier: Apache-2.0
+(install-page)=
+
+# Installation Guide
+
+This guide provides different methods to install AkkudoktorEOS:
+
+- Installation from Source (GitHub)
+- Installation from Release Package (GitHub)
+- Installation with Docker (DockerHub)
+- Installation with Docker (docker-compose)
+
+Choose the method that best suits your needs.
+
+:::{admonition} Tip
+:class: Note
+If you need to update instead, see the [Update Guideline](update-page). For reverting to a previous
+release see the [Revert Guideline](revert-page).
+:::
+
+## Installation Prerequisites
+
+Before installing, ensure you have the following:
+
+### For Source / Release Installation
+
+- Python 3.10 or higher
+- pip
+- Git (only for source)
+- Tar/Zip (for release package)
+
+### For Docker Installation
+
+- Docker Engine 20.10 or higher
+- Docker Compose (optional, recommended)
+
+## Installation from Source (GitHub) (M1)
+
+Recommended for developers or users wanting the latest updates.
+
+### 1) Clone the Repository (M1)
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        git clone https://github.com/Akkudoktor-EOS/EOS.git
+        cd EOS
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        git clone https://github.com/Akkudoktor-EOS/EOS.git
+        cd EOS
+```
+
+### 2) Create a Virtual Environment and install dependencies (M1)
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        python -m venv .venv
+        .venv\Scripts\pip install -r requirements.txt
+        .venv\Scripts\pip install -e .
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        python -m venv .venv
+        .venv/bin/pip install -r requirements.txt
+        .venv/bin/pip install -e .
+
+```
+
+### 3) Run EOS (M1)
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        .venv\Scripts\python -m akkudoktoreos.server.eos
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        .venv/bin/python -m akkudoktoreos.server.eos
+
+```
+
+EOS is now available at:
+
+- API: [http://localhost:8503/docs](http://localhost:8503/docs)
+- EOSdash: [http://localhost:8504](http://localhost:8504)
+
+If you want to make EOS and EOSdash accessible from outside of your machine or container at this
+stage of the installation provide appropriate IP addresses on startup.
+
+<!-- pyml disable line-length -->
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        .venv\Scripts\python -m akkudoktoreos.server.eos --host 0.0.0.0 --eosdash-host 0.0.0.0
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        .venv/bin/python -m akkudoktoreos.server.eos --host 0.0.0.0 --eosdash-host 0.0.0.0
+
+```
+<!-- pyml enable line-length -->
+
+### 4) Configure EOS (M1)
+
+Use EOSdash at [http://localhost:8504](http://localhost:8504) to configure EOS.
+
+## Installation from Release Package (GitHub) (M2)
+
+This method is recommended for users who want a stable, tested version.
+
+### 1) Download the Latest Release (M2)
+
+Visit the [Releases page](https://github.com/Akkudoktor-EOS/EOS/tags) and download the latest
+release package (e.g., `akkudoktoreos-v0.2.0.tar.gz` or `akkudoktoreos-v0.2.0.zip`).
+
+### 2) Extract the Package (M2)
+
+```bash
+tar -xzf akkudoktoreos-v0.2.0.tar.gz  # For .tar.gz
+# or
+unzip akkudoktoreos-v0.2.0.zip  # For .zip
+
+cd akkudoktoreos-v0.2.0
+```
+
+### 3) Create a virtual environment and run and configure EOS (M2)
+
+Follow Step 2), 3) and 4) of method M1. Start at
+`2) Create a Virtual Environment and install dependencies`
+
+### 4) Update the source code (M2)
+
+To extract a new release to a new directory just proceed with method M2 step 1) for the new release.
+
+You may remove the old release directory afterwards.
+
+## Installation with Docker (DockerHub) (M3)
+
+This method is recommended for easy deployment and containerized environments.
+
+### 1) Pull the Docker Image (M3)
+
+```bash
+docker pull akkudoktor/eos:latest
+```
+
+For a specific version:
+
+```bash
+docker pull akkudoktor/eos:v<version>
+```
+
+### 2) Run the Container (M3)
+
+**Basic run:**
+
+```bash
+docker run -d \
+  --name akkudoktoreos \
+  -p 8503:8503 \
+  -p 8504:8504 \
+  -e OPENBLAS_NUM_THREADS=1 \
+  -e OMP_NUM_THREADS=1 \
+  -e MKL_NUM_THREADS=1 \
+  -e EOS_SERVER__HOST=0.0.0.0 \
+  -e EOS_SERVER__PORT=8503 \
+  -e EOS_SERVER__EOSDASH_HOST=0.0.0.0 \
+  -e EOS_SERVER__EOSDASH_PORT=8504 \
+  --ulimit nproc=65535:65535 \
+  --ulimit nofile=65535:65535 \
+  --security-opt seccomp=unconfined \
+  akkudoktor/eos:latest
+```
+
+### 3) Verify the Container is Running (M3)
+
+```bash
+docker ps
+docker logs akkudoktoreos
+```
+
+EOS should now be accessible at [http://localhost:8503/docs](http://localhost:8503/docs) and EOSdash
+should be available at [http://localhost:8504](http://localhost:8504).
+
+### 4) Configure EOS (M3)
+
+Use EOSdash at [http://localhost:8504](http://localhost:8504) to configure EOS.
+
+## Installation with Docker (docker-compose) (M4)
+
+### 1) Get the akkudoktoreos source code (M4)
+
+You may use either method M1 or method M2 to get the source code.
+
+### 2) Build and run the container (M4)
+
+```{eval-rst}
+.. tabs::
+
+  .. tab:: Windows
+
+     .. code-block:: powershell
+
+        docker compose up --build
+
+  .. tab:: Linux
+
+     .. code-block:: bash
+
+        docker compose up --build
+
+```
+
+### 3) Verify the Container is Running (M4)
+
+```bash
+docker ps
+docker logs akkudoktoreos
+```
+
+EOS should now be accessible at [http://localhost:8503/docs](http://localhost:8503/docs) and EOSdash
+should be available at [http://localhost:8504](http://localhost:8504).
+
+### 4) Configure EOS
+
+Use EOSdash at [http://localhost:8504](http://localhost:8504) to configure EOS.
+
+## Helpful Docker Commands
+
+**View logs:**
+
+```bash
+docker logs -f akkudoktoreos
+```
+
+**Stop the container:**
+
+```bash
+docker stop akkudoktoreos
+```
+
+**Start the container:**
+
+```bash
+docker start akkudoktoreos
+```
+
+**Remove the container:**
+
+```bash
+docker rm -f akkudoktoreos
+```
+
+**Update to latest version:**
+
+```bash
+docker pull Akkudoktor-EOS/EOS:latest
+docker stop akkudoktoreos
+docker rm akkudoktoreos
+# Then run the container again with the run command
+```

docs/develop/release.md

@@ -0,0 +1,212 @@
+% SPDX-License-Identifier: Apache-2.0
+(release-page)=
+
+# Release Process
+
+This document describes how to prepare and publish a new release **via a Pull Request from a fork**,
+and how to set a **development version** after the release.
+
+## ✅ Overview of the Process
+
+| Step | Actor       | Action |
+|------|-------------|--------|
+| 1    | Contributor | Prepare a release branch **in your fork** using Commitizen |
+| 2    | Contributor | Open a **Pull Request to upstream** (`Akkudoktor-EOS/EOS`) |
+| 3    | Maintainer  | Review and **merge the release PR** |
+| 4    | Maintainer  | Create the **GitHub Release and tag** |
+| 5    | Maintainer  | Set the **development version marker** via a follow-up PR |
+
+## 🔄 Detailed Workflow
+
+### 1️⃣ Contributor: Prepare the Release in Your Fork
+
+#### Clone and sync your fork
+
+```bash
+git clone https://github.com/<your-username>/EOS
+cd EOS
+git remote add eos https://github.com/Akkudoktor-EOS/EOS
+
+git fetch eos
+git checkout main
+git pull eos main
+````
+
+#### Create the release branch
+
+```bash
+git checkout -b release/vX.Y.Z
+```
+
+#### Bump the version information
+
+At least update
+
+- pyproject.toml
+- src/akkudoktoreos/core/version.py
+- src/akkudoktoreos/data/default.config.json
+- Makefile
+
+and the generated documentation:
+
+```bash
+make bump VERSION=0.1.0+dev NEW_VERSION=X.Y.Z
+make gen-docs
+```
+
+You may check the changes by:
+
+```bash
+git diff
+```
+
+#### Create a new CHANGELOG.md entry
+
+Edit CHANGELOG.md
+
+#### Create the new release commit
+
+```bash
+git add pyproject.toml src/akkudoktoreos/core/version.py \
+    src/akkudoktoreos/data/default.config.json Makefile CHANGELOG.md
+git commit -s -m "chore(release): Release vX.Y.Z"
+```
+
+#### Push the branch to your fork
+
+```bash
+git push --set-upstream origin release/vX.Y.Z
+```
+
+### 2️⃣ Contributor: Open the Release Pull Request
+
+| From                                 | To                        |
+| ------------------------------------ | ------------------------- |
+| `<your-username>/EOS:release/vX.Y.Z` | `Akkudoktor-EOS/EOS:main` |
+
+**PR Title:**
+
+```text
+chore(release): release vX.Y.Z
+```
+
+**PR Description Template:**
+
+```markdown
+## Release vX.Y.Z
+
+This pull request prepares release **vX.Y.Z**.
+
+### Changes
+- Version bump
+- Changelog update
+
+### Changelog Summary
+<!-- Copy key highlights from CHANGELOG.md here -->
+
+See `CHANGELOG.md` for full details.
+```
+
+### 3️⃣ Maintainer: Review and Merge the Release PR
+
+**Review Checklist:**
+
+- ✅ Only version files and `CHANGELOG.md` are modified
+- ✅ Version numbers are consistent
+- ✅ Changelog is complete and properly formatted
+- ✅ No unrelated changes are included
+
+**Merge Strategy:**
+
+- Prefer **Merge Commit** (or **Squash Merge**, per project preference)
+- Use commit message: `chore(release): Release vX.Y.Z`
+
+### 4️⃣ Maintainer: Publish the GitHub Release
+
+1. Go to **GitHub → Releases → Draft a new release**
+2. **Choose tag** → enter `vX.Y.Z` (GitHub creates the tag on publish)
+3. **Release title:** `vX.Y.Z`
+4. **Paste changelog entry** from `CHANGELOG.md`
+5. Optionally enable **Set as latest release**
+6. Click **Publish release** 🎉
+
+### 5️⃣ Maintainer: Prepare the Development Version Marker
+
+**Sync local copy:**
+
+```bash
+git fetch eos
+git checkout main
+git pull eos main
+```
+
+**Create a development version branch:**
+
+```bash
+git checkout -b release/vX.Y.Z_dev
+```
+
+**Set development version marker manually:**
+
+```bash
+make bump VERSION=X.Y.Z NEW_VERSION=X.Y.Z+dev
+make gen-docs
+```
+
+```bash
+git add pyproject.toml src/akkudoktoreos/core/version.py \
+    src/akkudoktoreos/data/default.config.json Makefile
+git commit -s -m "chore: set development version marker X.Y.Z+dev"
+```
+
+```bash
+git push --set-upstream origin release/vX.Y.Z_dev
+```
+
+### 6️⃣ Maintainer (or Contributor): Open the Development Version PR
+
+| From                                     | To                        |
+| ---------------------------------------- | ------------------------- |
+| `<your-username>/EOS:release/vX.Y.Z_dev` | `Akkudoktor-EOS/EOS:main` |
+
+**PR Title:**
+
+```text
+chore: development version vX.Y.Z+dev
+```
+
+**PR Description Template:**
+
+```markdown
+## Development version vX.Y.Z+dev
+
+This pull request marks the repository as back in active development.
+
+### Changes
+- Set version to `vX.Y.Z+dev`
+
+No changelog entry is needed.
+```
+
+### 7️⃣ Maintainer: Review and Merge the Development Version PR
+
+**Checklist:**
+
+- ✅ Only version files updated to `+dev`
+- ✅ No unintended changes
+
+**Merge Strategy:**
+
+- Merge with commit message: `chore: development version vX.Y.Z+dev`
+
+## ✅ Quick Reference
+
+| Step | Actor | Action |
+| ---- | ----- | ------ |
+| **1. Prepare release branch** | Contributor | Bump version & changelog via Commitizen |
+| **2. Open release PR** | Contributor | Submit release for review |
+| **3. Review & merge release PR** | Maintainer | Finalize changes into `main` |
+| **4. Publish GitHub Release** | Maintainer | Create tag & notify users |
+| **5. Prepare development version branch** | Maintainer | Set development marker |
+| **6. Open development PR** | Maintainer (or Contributor) | Propose returning to development state |
+| **7. Review & merge development PR** | Maintainer | Mark repository as back in development |

docs/develop/revert.md

@@ -0,0 +1,155 @@
+% SPDX-License-Identifier: Apache-2.0
+(revert-page)=
+
+# Revert Guide
+
+This guide explains how to **revert AkkudoktorEOS to a previous version**.
+The exact methods and steps differ depending on how EOS was installed:
+
+- M1/M2: Reverting when Installed from Source or Release Package
+- M3/M4: Reverting when Installed via Docker
+
+:::{admonition} Important
+:class: warning
+Before reverting, ensure you have a backup of your `EOS.config.json`.
+EOS also maintains internal configuration backups that can be restored after a downgrade.
+:::
+
+:::{admonition} Tip
+:class: Note
+If you need to update instead, see the [Update Guideline](update-page).
+:::
+
+## Revert to a Previous Version of EOS
+
+You can revert to a previous version using the same installation method you originally selected.
+See: [Installation Guideline](install-page)
+
+## Reverting when Installed from Source or Release Package (M1/M2)
+
+### 1) Locate the target version (M2)
+
+Go to the GitHub Releases page:
+
+> <https://github.com/Akkudoktor-EOS/EOS/tags>
+
+### 2) Download or check out that version (M1/M2)
+
+#### Git (source) (M1)
+
+```bash
+git fetch
+git checkout v<version>
+````
+
+Example:
+
+```bash
+git checkout v0.1.0
+```
+
+Then reinstall dependencies:
+
+```bash
+.venv/bin/pip install -r requirements.txt --upgrade
+```
+
+#### Release package (M2)
+
+Download and extract the desired ZIP or TAR release.
+Refer to **Method 2** in the [Installation Guideline](install-page).
+
+### 3) Restart EOS (M1/M2)
+
+```bash
+.venv/bin/python -m akkudoktoreos.server.eos
+```
+
+### 4) Restore configuration (optional) (M1/M2)
+
+If your configuration changed since the downgrade, you may restore a previous backup:
+
+- via **EOSdash**
+
+    Admin → configuration → Revert to backup
+
+    or
+
+    Admin → configuration → Import from file
+
+- via **REST**
+
+    ```bash
+    curl -X PUT "http://<host>:8503/v1/config/revert?backup_id=<backup>"
+    ```
+
+## Reverting when Installed via Docker (M3/M4)
+
+### 1) Pull the desired image version (M3/M4)
+
+```bash
+docker pull akkudoktor/eos:v<version>
+```
+
+Example:
+
+```bash
+docker pull akkudoktor/eos:v0.1.0
+```
+
+### 2) Stop and remove the current container (M3/M4)
+
+```bash
+docker stop akkudoktoreos
+docker rm akkudoktoreos
+```
+
+### 3) Start a container with the selected version (M3/M4)
+
+Start EOS as usual, using your existing `docker run` or `docker compose` setup
+(see Method 3 or Method 4 in the [Installation Guideline](install-page)).
+
+### 4) Restore configuration (optional) (M3/M4)
+
+In many cases configuration will migrate automatically.
+If needed, you may restore a configuration backup:
+
+- via **EOSdash**
+
+    Admin → configuration → Revert to backup
+
+    or
+
+    Admin → configuration → Import from file
+
+- via **REST**
+
+    ```bash
+    curl -X PUT "http://<host>:8503/v1/config/revert?backup_id=<backup>"
+    ```
+
+## About Configuration Backups
+
+EOS keeps configuration backup files next to your active `EOS.config.json`.
+
+You can list and restore backups:
+
+- via **EOSdash UI**
+- via **REST API**
+
+### List available backups
+
+```bash
+GET /v1/config/backups
+```
+
+### Restore backup
+
+```bash
+PUT /v1/config/revert?backup_id=<id>
+```
+
+:::{admonition} Important
+:class: warning
+If no backup file is available, create or copy a previously saved `EOS.config.json` before reverting.
+:::

docs/index.md

@@ -27,6 +27,9 @@ develop/getting_started.md
 :caption: How-To Guides
 
 develop/CONTRIBUTING.md
+develop/install.md
+develop/update.md
+develop/revert.md
 
 ```
 
@@ -36,7 +39,10 @@ develop/CONTRIBUTING.md
 
 akkudoktoreos/architecture.md
 akkudoktoreos/configuration.md
-akkudoktoreos/optimization.md
+akkudoktoreos/configtimewindow.md
+akkudoktoreos/optimpost.md
+akkudoktoreos/optimauto.md
+akkudoktoreos/resource.md
 akkudoktoreos/prediction.md
 akkudoktoreos/measurement.md
 akkudoktoreos/integration.md
@@ -46,6 +52,16 @@ akkudoktoreos/api.rst
 
 ```
 
+```{toctree}
+:maxdepth: 2
+:caption: Development
+
+develop/develop.md
+develop/release.md
+develop/CHANGELOG.md
+
+```
+
 ## Indices and tables
 
 - {ref}`genindex`

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "akkudoktor-eos"
-version = "0.0.1"
+version = "0.2.0"
 authors = [
   { name="Andreas Schmitz", email="author@example.com" },
 ]
@@ -107,3 +107,31 @@ ignore_missing_imports = true
 [[tool.mypy.overrides]]
 module = "xprocess.*"
 ignore_missing_imports = true
+
+[tool.commitizen]
+name = "cz_conventional_commits"
+version_scheme = "semver"
+version = "0.2.0"            # <-- Set your current version heretag_format = "v$version"
+
+# Files to automatically update when bumping version
+update_changelog_on_bump = true
+changelog_incremental = true
+annotated_tag = true
+bump_message = "chore(release): $current_version → $new_version"
+
+# Branch validation settings
+branch_validation = true
+branch_pattern = "^(feat|fix|chore|docs|refactor|test)/[a-z0-9._-]+$"
+
+# Customize changelog generation
+[tool.commitizen.changelog]
+path = "CHANGELOG.md"
+template = "keepachangelog"
+
+# If your version is stored in multiple files (Python modules, docs etc.), add them here
+[tool.commitizen.files]
+version = [
+  "pyproject.toml",          # Auto-update project version
+  "src/akkudoktoreos/core/version.py",
+  "src/akkudoktoreos/data/default.config.json"
+]

requirements-dev.txt

@@ -1,15 +1,29 @@
 -r requirements.txt
-gitlint==0.19.1
-GitPython==3.1.45
-myst-parser==4.0.1
+
+# Pre-commit framework - basic package requirements handled by pre-commit itself
+# - pre-commit-hooks
+# - isort
+# - ruff
+# - mypy (mirrors-mypy) - sync with requirements-dev.txt (if on pypi)
+# - pymarkdown
+# - commitizen - sync with requirements-dev.txt (if on pypi)
+pre-commit==4.3.0
+mypy==1.18.2
+types-requests==2.32.4.20250913 # for mypy
+pandas-stubs==2.3.2.250926 # for mypy
+tokenize-rt==6.2.0 # for mypy
+commitizen==4.9.1
+deprecated==1.3.1 # for commitizen
+
+# Sphinx
 sphinx==8.2.3
 sphinx_rtd_theme==3.0.2
 sphinx-tabs==3.4.7
-pymarkdownlnt==0.9.32
+GitPython==3.1.45
+myst-parser==4.0.1
+
+# Pytest
 pytest==8.4.2
 pytest-cov==7.0.0
+coverage==7.11.1
 pytest-xprocess==1.0.2
-pre-commit
-mypy==1.18.2
-types-requests==2.32.4.20250913
-pandas-stubs==2.3.2.250827

requirements.txt

@@ -1,24 +1,30 @@
-cachebox==5.0.2
-numpy==2.3.3
-numpydantic==1.6.11
-matplotlib==3.10.6
-fastapi[standard]==0.115.14
-python-fasthtml==0.12.29
-MonsterUI==1.0.29
+babel==2.17.0
+beautifulsoup4==4.14.2
+cachebox==5.1.0
+numpy==2.3.4
+numpydantic==1.7.0
+matplotlib==3.10.7
+contourpy==1.3.3
+fastapi[standard-no-fastapi-cloud-cli]==0.121.0
+fastapi_cli==0.0.14
+rich-toolkit==0.15.1
+python-fasthtml==0.12.33
+MonsterUI==1.0.32
 markdown-it-py==3.0.0
 mdit-py-plugins==0.5.0
-bokeh==3.8.0
-uvicorn==0.36.0
+bokeh==3.8.1
+uvicorn==0.38.0
 scikit-learn==1.7.2
-timezonefinder==7.0.2
+tzfpy==1.1.0
 deap==1.4.3
 requests==2.32.5
-pandas==2.3.2
+pandas==2.3.3
 pendulum==3.1.0
-platformdirs==4.4.0
-psutil==7.1.0
+platformdirs==4.5.0
+psutil==7.1.3
 pvlib==0.13.1
-pydantic==2.11.9
+pydantic==2.12.4
+pydantic_extra_types==2.10.6
 statsmodels==0.14.5
 pydantic-settings==2.11.0
 linkify-it-py==2.0.3

scripts/bump_version.py

@@ -0,0 +1,170 @@
+"""Update version strings in multiple project files only if the old version matches.
+
+This script updates version information in:
+- pyproject.toml
+- src/akkudoktoreos/core/version.py
+- src/akkudoktoreos/data/default.config.json
+- Makefile
+
+Supported version formats:
+- __version__ = "<version>"
+- version = "<version>"
+- "version": "<version>"
+- VERSION ?: <version>
+
+It will:
+- Replace VERSION → NEW_VERSION if the old version is found.
+- Report which files were updated.
+- Report which files contained mismatched versions.
+- Report which files had no version.
+
+Usage:
+    python bump_version.py VERSION NEW_VERSION
+
+Args:
+    VERSION (str): Version expected before replacement.
+    NEW_VERSION (str): Version to write.
+
+"""
+#!/usr/bin/env python3
+import argparse
+import glob
+import os
+import re
+import shutil
+from pathlib import Path
+from typing import List, Tuple
+
+# Patterns to match version strings
+VERSION_PATTERNS = [
+    re.compile(r'(__version__\s*=\s*")(?P<ver>[^"]+)(")'),
+    re.compile(r'(version\s*=\s*")(?P<ver>[^"]+)(")'),
+    re.compile(r'("version"\s*:\s*")(?P<ver>[^"]+)(")'),
+    re.compile(r'(VERSION\s*\?=\s*)(?P<ver>[^\s]+)'),  # For Makefile: VERSION ?= 0.2.0
+]
+
+# Default files to process
+DEFAULT_FILES = [
+    "pyproject.toml",
+    "src/akkudoktoreos/core/version.py",
+    "src/akkudoktoreos/data/default.config.json",
+    "Makefile",
+]
+
+
+def backup_file(file_path: str) -> str:
+    """Create a backup of the given file with a .bak suffix.
+
+    Args:
+        file_path: Path to the file to backup.
+
+    Returns:
+        Path to the backup file.
+    """
+    backup_path = f"{file_path}.bak"
+    shutil.copy2(file_path, backup_path)
+    return backup_path
+
+
+def replace_version_in_file(
+    file_path: Path, old_version: str, new_version: str, dry_run: bool = False
+) -> Tuple[bool, bool]:
+    """
+    Replace old_version with new_version in the given file if it matches.
+
+    Args:
+        file_path: Path to the file to modify.
+        old_version: The old version to replace.
+        new_version: The new version to set.
+        dry_run: If True, don't actually modify files.
+
+    Returns:
+        Tuple[bool, bool]: (file_would_be_updated, old_version_found)
+    """
+    content = file_path.read_text()
+    new_content = content
+    old_version_found = False
+    file_would_be_updated = False
+
+    for pattern in VERSION_PATTERNS:
+        def repl(match):
+            nonlocal old_version_found, file_would_be_updated
+            ver = match.group("ver")
+            if ver == old_version:
+                old_version_found = True
+                file_would_be_updated = True
+                # Some patterns have 3 groups (like quotes)
+                if len(match.groups()) == 3:
+                    return f"{match.group(1)}{new_version}{match.group(3)}"
+                else:
+                    return f"{match.group(1)}{new_version}"
+            return match.group(0)
+
+        new_content = pattern.sub(repl, new_content)
+
+    if file_would_be_updated:
+        if dry_run:
+            print(f"[DRY-RUN] Would update {file_path}")
+        else:
+            backup_path = file_path.with_suffix(file_path.suffix + ".bak")
+            shutil.copy(file_path, backup_path)
+            file_path.write_text(new_content)
+            print(f"Updated {file_path} (backup saved to {backup_path})")
+    elif not old_version_found:
+        print(f"[SKIP] {file_path}: old version '{old_version}' not found")
+
+    return file_would_be_updated, old_version_found
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Bump version across project files.")
+    parser.add_argument("old_version", help="Old version to replace")
+    parser.add_argument("new_version", help="New version to set")
+    parser.add_argument(
+        "--dry-run", action="store_true", help="Show what would be changed without modifying files"
+    )
+    parser.add_argument(
+        "--glob", nargs="*", help="Optional glob patterns to include additional files"
+    )
+    args = parser.parse_args()
+
+    updated_files = []
+    not_found_files = []
+
+    # Determine files to update
+    files_to_update: List[Path] = [Path(f) for f in DEFAULT_FILES]
+    if args.glob:
+        for pattern in args.glob:
+            files_to_update.extend(Path(".").glob(pattern))
+
+    files_to_update = list(dict.fromkeys(files_to_update))  # remove duplicates
+
+    any_updated = False
+    for file_path in files_to_update:
+        if file_path.exists() and file_path.is_file():
+            updated, _ = replace_version_in_file(
+                file_path, args.old_version, args.new_version, args.dry_run
+            )
+            any_updated |= updated
+            if updated:
+                updated_files.append(file_path)
+        else:
+            print(f"[SKIP] {file_path}: file does not exist")
+            not_found_files.append(file_path)
+
+    print("\nSummary:")
+    if updated_files:
+        print(f"Updated files ({len(updated_files)}):")
+        for f in updated_files:
+            print(f"  {f}")
+    else:
+        print("No files were updated.")
+
+    if not_found_files:
+        print(f"Files where old version was not found ({len(not_found_files)}):")
+        for f in not_found_files:
+            print(f"  {f}")
+
+
+if __name__ == "__main__":
+    main()

scripts/convert_lightweight_tags.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+
+import subprocess
+import sys
+
+MESSAGE_PREFIX = "Converted to annotated tag:"
+
+def run(cmd, capture_output=False):
+    """Run a shell command and return output if needed."""
+    result = subprocess.run(cmd, shell=True, check=True, text=True, capture_output=capture_output)
+    return result.stdout.strip() if capture_output else None
+
+def get_all_tags():
+    """Return a list of all tags."""
+    return run("git tag", capture_output=True).splitlines()
+
+def is_lightweight(tag):
+    """Return True if a tag is lightweight (points to commit, not tag object)."""
+    return run(f"git cat-file -t {tag}", capture_output=True) == "commit"
+
+def get_commit_of_tag(tag):
+    """Return the commit SHA a tag points to."""
+    return run(f"git rev-list -n 1 {tag}", capture_output=True)
+
+def convert_tag(tag):
+    """Delete and recreate a tag as annotated."""
+    commit = get_commit_of_tag(tag)
+    print(f"Converting {tag} -> annotated ({commit})")
+    run(f"git tag -d {tag}")
+    run(f'git tag -a {tag} -m "{MESSAGE_PREFIX} {tag}" {commit}')
+
+def main():
+    dry_run = "--dry-run" in sys.argv
+    push = "--push" in sys.argv
+
+    tags = get_all_tags()
+    lightweight_tags = [t for t in tags if is_lightweight(t)]
+
+    if not lightweight_tags:
+        print("✅ No lightweight tags found.")
+        return
+
+    print("🔍 Lightweight tags found:\n  " + "\n  ".join(lightweight_tags))
+
+    if dry_run:
+        print("\n📝 Dry run: No changes will be made.")
+        return
+
+    confirm = input("\n⚠️ Convert ALL of these tags to annotated? (y/N): ").lower()
+    if confirm != "y":
+        print("❌ Aborted.")
+        return
+
+    for tag in lightweight_tags:
+        convert_tag(tag)
+
+    print("\n✅ Conversion complete.")
+
+    if push:
+        print("📤 Pushing updated tags to origin (force)...")
+        run("git push origin --tags --force")
+        print("✅ Tags pushed.")
+    else:
+        print("\n🚀 To push changes, run:\n  git push origin --tags --force")
+
+if __name__ == "__main__":
+    print("=== Lightweight Tag Converter ===")
+    print("Usage: python convert_lightweight_tags.py [--dry-run] [--push]\n")
+    main()

scripts/cz_check_branch.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+"""Branch name checker using regex (compatible with Commitizen v4.9.1).
+
+Cross-platform + .venv aware.
+"""
+
+import os
+import re
+import subprocess
+import sys
+from pathlib import Path
+
+
+def find_cz() -> str:
+    venv = os.getenv("VIRTUAL_ENV")
+    paths = [Path(venv)] if venv else []
+    paths.append(Path.cwd() / ".venv")
+
+    for base in paths:
+        cz = base / ("Scripts" if os.name == "nt" else "bin") / ("cz.exe" if os.name == "nt" else "cz")
+        if cz.exists():
+            return str(cz)
+    return "cz"
+
+
+def main():
+    # Get current branch name
+    try:
+        branch = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"], text=True).strip()
+    except subprocess.CalledProcessError:
+        print("❌ Could not determine current branch name.")
+        return 1
+
+    # Regex pattern
+    pattern = r"^(feat|fix|chore|docs|refactor|test)/[a-z0-9._-]+$"
+
+    print(f"🔍 Checking branch name '{branch}'...")
+    if not re.match(pattern, branch):
+        print(f"❌ Branch name '{branch}' does not match pattern '{pattern}'")
+        return 1
+
+    print("✅ Branch name is valid.")
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

scripts/cz_check_commit_message.py

@@ -0,0 +1,63 @@
+#!/usr/bin/env python3
+"""Commitizen commit message checker that is .venv aware.
+
+Works for commits with -m or commit message file.
+"""
+
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+
+def find_cz() -> str:
+    """Find Commitizen executable, preferring virtualenv."""
+    venv = os.getenv("VIRTUAL_ENV")
+    paths = []
+    if venv:
+        paths.append(Path(venv))
+    paths.append(Path.cwd() / ".venv")
+
+    for base in paths:
+        cz = base / ("Scripts" if os.name == "nt" else "bin") / ("cz.exe" if os.name == "nt" else "cz")
+        if cz.exists():
+            return str(cz)
+    return "cz"
+
+
+def main():
+    cz = find_cz()
+
+    # 1️⃣ Try commit-msg file (interactive commit)
+    commit_msg_file = sys.argv[1] if len(sys.argv) > 1 else None
+
+    # 2️⃣ If not file, fallback to -m message (Git sets GIT_COMMIT_MSG in some environments, or we create a temp file)
+    if not commit_msg_file:
+        msg = os.getenv("GIT_COMMIT_MSG") or ""
+        if not msg:
+            print("⚠️  No commit message file or environment message found. Skipping Commitizen check.")
+            return 0
+        import tempfile
+
+        with tempfile.NamedTemporaryFile("w+", delete=False) as tmp:
+            tmp.write(msg)
+            tmp.flush()
+            commit_msg_file = tmp.name
+
+    print(f"🔍 Checking commit message using {cz}...")
+
+    try:
+        subprocess.check_call([cz, "check", "--commit-msg-file", commit_msg_file])
+        print("✅ Commit message follows Commitizen convention.")
+        return 0
+    except subprocess.CalledProcessError:
+        print("❌ Commit message validation failed.")
+        return 1
+    finally:
+        # Clean up temp file if we created one
+        if 'tmp' in locals():
+            os.unlink(tmp.name)
+
+
+if __name__ == "__main__":
+    sys.exit(main())

scripts/cz_check_new_commits.py

@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+"""Pre-push hook: Commitizen check for *new commits only*.
+
+Cross-platform + virtualenv-aware:
+- Prefers activated virtual environment (VIRTUAL_ENV)
+- Falls back to ./.venv if found
+- Falls back to global cz otherwise
+"""
+
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+
+def find_cz_executable() -> str:
+    """Return path to Commitizen executable, preferring virtual environments."""
+    # 1️⃣ Active virtual environment (if running inside one)
+    venv_env = os.getenv("VIRTUAL_ENV")
+    if venv_env:
+        cz_path = Path(venv_env) / ("Scripts" if os.name == "nt" else "bin") / ("cz.exe" if os.name == "nt" else "cz")
+        if cz_path.exists():
+            return str(cz_path)
+
+    # 2️⃣ Local .venv in repo root
+    repo_venv = Path.cwd() / ".venv"
+    cz_path = repo_venv / ("Scripts" if os.name == "nt" else "bin") / ("cz.exe" if os.name == "nt" else "cz")
+    if cz_path.exists():
+        return str(cz_path)
+
+    # 3️⃣ Global fallback
+    return "cz"
+
+
+def get_merge_base() -> str | None:
+    """Return merge-base between HEAD and upstream branch, or None if unavailable."""
+    try:
+        return (
+            subprocess.check_output(
+                ["git", "merge-base", "@{u}", "HEAD"],
+                stderr=subprocess.DEVNULL,
+                text=True,
+            )
+            .strip()
+        )
+    except subprocess.CalledProcessError:
+        return None
+
+
+def main() -> int:
+    cz = find_cz_executable()
+    base = get_merge_base()
+
+    if not base:
+        print("⚠️  No upstream found; skipping Commitizen check for new commits.")
+        return 0
+
+    print(f"🔍 Using {cz} to check new commits from {base}..HEAD ...")
+
+    try:
+        subprocess.check_call([cz, "check", "--rev-range", f"{base}..HEAD"])
+        print("✅ All new commits follow Commitizen conventions.")
+        return 0
+    except subprocess.CalledProcessError as e:
+        print("❌ Commitizen check failed for one or more new commits.")
+        return e.returncode
+
+
+if __name__ == "__main__":
+    sys.exit(main())

scripts/generate_config_md.py

@@ -8,7 +8,7 @@ import re
 import sys
 import textwrap
 from pathlib import Path
-from typing import Any, Union
+from typing import Any, Type, Union
 
 from loguru import logger
 from pydantic.fields import ComputedFieldInfo, FieldInfo
@@ -16,7 +16,7 @@ from pydantic_core import PydanticUndefined
 
 from akkudoktoreos.config.config import ConfigEOS, GeneralSettings, get_config
 from akkudoktoreos.core.pydantic import PydanticBaseModel
-from akkudoktoreos.utils.docs import get_model_structure_from_examples
+from akkudoktoreos.utils.datetimeutil import to_datetime
 
 documented_types: set[PydanticBaseModel] = set()
 undocumented_types: dict[PydanticBaseModel, tuple[str, list[str]]] = dict()
@@ -52,6 +52,45 @@ def resolve_nested_types(field_type: Any, parent_types: list[str]) -> list[tuple
     return resolved_types
 
 
+def get_example_or_default(field_name: str, field_info: FieldInfo, example_ix: int) -> Any:
+    """Generate a default value for a field, considering constraints."""
+    if field_info.examples is not None:
+        try:
+            return field_info.examples[example_ix]
+        except IndexError:
+            return field_info.examples[-1]
+
+    if field_info.default is not None:
+        return field_info.default
+
+    raise NotImplementedError(f"No default or example provided '{field_name}': {field_info}")
+
+
+def get_model_structure_from_examples(
+    model_class: type[PydanticBaseModel], multiple: bool
+) -> list[dict[str, Any]]:
+    """Create a model instance with default or example values, respecting constraints."""
+    example_max_length = 1
+
+    # Get first field with examples (non-default) to get example_max_length
+    if multiple:
+        for _, field_info in model_class.model_fields.items():
+            if field_info.examples is not None:
+                example_max_length = len(field_info.examples)
+                break
+
+    example_data: list[dict[str, Any]] = [{} for _ in range(example_max_length)]
+
+    for field_name, field_info in model_class.model_fields.items():
+        if field_info.deprecated:
+            continue
+        for example_ix in range(example_max_length):
+            example_data[example_ix][field_name] = get_example_or_default(
+                field_name, field_info, example_ix
+            )
+    return example_data
+
+
 def create_model_from_examples(
     model_class: PydanticBaseModel, multiple: bool
 ) -> list[PydanticBaseModel]:
@@ -160,23 +199,27 @@ def generate_config_table_md(
                 description = deprecated
         table += f"| {field_name} {env_entry}| `{type_name}` | `{read_only}` | `{default_value}` | {description} |\n"
 
-        inner_types: dict[PydanticBaseModel, tuple[str, list[str]]] = dict()
+        # inner_types: dict[type[PydanticBaseModel], tuple[str, list[str]]] = dict()
+        inner_types: dict[Any, tuple[str, list[str]]] = dict()
 
         def extract_nested_models(subtype: Any, subprefix: str, parent_types: list[str]):
+            """Extract nested models."""
             if subtype in inner_types.keys():
                 return
             nested_types = resolve_nested_types(subtype, [])
             for nested_type, nested_parent_types in nested_types:
-                if issubclass(nested_type, PydanticBaseModel):
+                # Nested type may be of type class, enum, typing.Any
+                if isinstance(nested_type, type) and issubclass(nested_type, PydanticBaseModel):
+                    # Nested type is a subclass of PydanticBaseModel
                     new_parent_types = parent_types + nested_parent_types
                     if "list" in parent_types:
                         new_prefix = ""
                     else:
                         new_prefix = f"{subprefix}"
                     inner_types.setdefault(nested_type, (new_prefix, new_parent_types))
-                    for nested_field_name, nested_field_info in list(
-                        nested_type.model_fields.items()
-                    ) + list(nested_type.model_computed_fields.items()):
+
+                    # Handle normal fields
+                    for nested_field_name, nested_field_info in nested_type.model_fields.items():
                         nested_field_type = nested_field_info.annotation
                         if new_prefix:
                             new_prefix += f"{nested_field_name.upper()}__"
@@ -186,6 +229,8 @@ def generate_config_table_md(
                             new_parent_types + [nested_field_name],
                         )
 
+                    # Do not extract computed fields
+
         extract_nested_models(field_type, f"{prefix}{config_name}__", toplevel_keys + [field_name])
 
         for new_type, info in inner_types.items():
@@ -290,6 +335,13 @@ def generate_config_md(config_eos: ConfigEOS) -> str:
         markdown
     )
 
+    # Assure timezone name does not leak to documentation
+    tz_name = to_datetime().timezone_name
+    markdown = re.sub(re.escape(tz_name), "Europe/Berlin", markdown, flags=re.IGNORECASE)
+    # Also replace UTC, as GitHub CI always is on UTC
+    markdown = re.sub(re.escape("UTC"), "Europe/Berlin", markdown, flags=re.IGNORECASE)
+
+
     return markdown
 
 

src/akkudoktoreos/config/config.py

@@ -9,39 +9,40 @@ Key features:
 - Managing directory setups for the application
 """
 
+import json
 import os
 import shutil
 from pathlib import Path
 from typing import Any, ClassVar, Optional, Type
 
+import pydantic_settings
 from loguru import logger
 from platformdirs import user_config_dir, user_data_dir
-from pydantic import Field, computed_field
-from pydantic_settings import (
-    BaseSettings,
-    JsonConfigSettingsSource,
-    PydanticBaseSettingsSource,
-    SettingsConfigDict,
-)
+from pydantic import Field, computed_field, field_validator
 
 # settings
 from akkudoktoreos.config.configabc import SettingsBaseModel
+from akkudoktoreos.config.configmigrate import migrate_config_data, migrate_config_file
 from akkudoktoreos.core.cachesettings import CacheCommonSettings
 from akkudoktoreos.core.coreabc import SingletonMixin
 from akkudoktoreos.core.decorators import classproperty
-from akkudoktoreos.core.emsettings import EnergyManagementCommonSettings
+from akkudoktoreos.core.emsettings import (
+    EnergyManagementCommonSettings,
+)
 from akkudoktoreos.core.logsettings import LoggingCommonSettings
 from akkudoktoreos.core.pydantic import PydanticModelNestedValueMixin, merge_models
-from akkudoktoreos.devices.settings import DevicesCommonSettings
+from akkudoktoreos.core.version import __version__
+from akkudoktoreos.devices.devices import DevicesCommonSettings
 from akkudoktoreos.measurement.measurement import MeasurementCommonSettings
 from akkudoktoreos.optimization.optimization import OptimizationCommonSettings
 from akkudoktoreos.prediction.elecprice import ElecPriceCommonSettings
+from akkudoktoreos.prediction.feedintariff import FeedInTariffCommonSettings
 from akkudoktoreos.prediction.load import LoadCommonSettings
 from akkudoktoreos.prediction.prediction import PredictionCommonSettings
 from akkudoktoreos.prediction.pvforecast import PVForecastCommonSettings
 from akkudoktoreos.prediction.weather import WeatherCommonSettings
 from akkudoktoreos.server.server import ServerCommonSettings
-from akkudoktoreos.utils.datetimeutil import to_timezone
+from akkudoktoreos.utils.datetimeutil import to_datetime, to_timezone
 from akkudoktoreos.utils.utils import UtilsCommonSettings
 
 
@@ -83,6 +84,10 @@ class GeneralSettings(SettingsBaseModel):
     _config_folder_path: ClassVar[Optional[Path]] = None
     _config_file_path: ClassVar[Optional[Path]] = None
 
+    version: str = Field(
+        default=__version__, description="Configuration file version. Used to check compatibility."
+    )
+
     data_folder_path: Optional[Path] = Field(
         default=None, description="Path to EOS data directory.", examples=[None, "/home/eos/data"]
     )
@@ -131,11 +136,25 @@ class GeneralSettings(SettingsBaseModel):
         """Path to EOS configuration file."""
         return self._config_file_path
 
+    compatible_versions: ClassVar[list[str]] = [__version__]
 
-class SettingsEOS(BaseSettings, PydanticModelNestedValueMixin):
+    @field_validator("version")
+    @classmethod
+    def check_version(cls, v: str) -> str:
+        if v not in cls.compatible_versions:
+            error = (
+                f"Incompatible configuration version '{v}'. "
+                f"Expected one of: {', '.join(cls.compatible_versions)}."
+            )
+            logger.error(error)
+            raise ValueError(error)
+        return v
+
+
+class SettingsEOS(pydantic_settings.BaseSettings, PydanticModelNestedValueMixin):
     """Settings for all EOS.
 
-    Used by updating the configuration with specific settings only.
+    Only used to update the configuration with specific settings.
     """
 
     general: Optional[GeneralSettings] = Field(
@@ -174,6 +193,10 @@ class SettingsEOS(BaseSettings, PydanticModelNestedValueMixin):
         default=None,
         description="Electricity Price Settings",
     )
+    feedintariff: Optional[FeedInTariffCommonSettings] = Field(
+        default=None,
+        description="Feed In Tariff Settings",
+    )
     load: Optional[LoadCommonSettings] = Field(
         default=None,
         description="Load Settings",
@@ -195,7 +218,7 @@ class SettingsEOS(BaseSettings, PydanticModelNestedValueMixin):
         description="Utilities Settings",
     )
 
-    model_config = SettingsConfigDict(
+    model_config = pydantic_settings.SettingsConfigDict(
         env_nested_delimiter="__",
         nested_model_default_partial_update=True,
         env_prefix="EOS_",
@@ -218,12 +241,18 @@ class SettingsEOSDefaults(SettingsEOS):
     optimization: OptimizationCommonSettings = OptimizationCommonSettings()
     prediction: PredictionCommonSettings = PredictionCommonSettings()
     elecprice: ElecPriceCommonSettings = ElecPriceCommonSettings()
+    feedintariff: FeedInTariffCommonSettings = FeedInTariffCommonSettings()
     load: LoadCommonSettings = LoadCommonSettings()
     pvforecast: PVForecastCommonSettings = PVForecastCommonSettings()
     weather: WeatherCommonSettings = WeatherCommonSettings()
     server: ServerCommonSettings = ServerCommonSettings()
     utils: UtilsCommonSettings = UtilsCommonSettings()
 
+    def __hash__(self) -> int:
+        # Just for usage in configmigrate, finally overwritten when used by ConfigEOS.
+        # This is mutable, so pydantic does not set a hash.
+        return id(self)
+
 
 class ConfigEOS(SingletonMixin, SettingsEOSDefaults):
     """Singleton configuration handler for the EOS application.
@@ -290,33 +319,34 @@ class ConfigEOS(SingletonMixin, SettingsEOSDefaults):
     @classmethod
     def settings_customise_sources(
         cls,
-        settings_cls: Type[BaseSettings],
-        init_settings: PydanticBaseSettingsSource,
-        env_settings: PydanticBaseSettingsSource,
-        dotenv_settings: PydanticBaseSettingsSource,
-        file_secret_settings: PydanticBaseSettingsSource,
-    ) -> tuple[PydanticBaseSettingsSource, ...]:
-        """Customizes the order and handling of settings sources for a Pydantic BaseSettings subclass.
+        settings_cls: Type[pydantic_settings.BaseSettings],
+        init_settings: pydantic_settings.PydanticBaseSettingsSource,
+        env_settings: pydantic_settings.PydanticBaseSettingsSource,
+        dotenv_settings: pydantic_settings.PydanticBaseSettingsSource,
+        file_secret_settings: pydantic_settings.PydanticBaseSettingsSource,
+    ) -> tuple[pydantic_settings.PydanticBaseSettingsSource, ...]:
+        """Customizes the order and handling of settings sources for a pydantic_settings.BaseSettings subclass.
 
         This method determines the sources for application configuration settings, including
         environment variables, dotenv files and JSON configuration files.
         It ensures that a default configuration file exists and creates one if necessary.
 
         Args:
-            settings_cls (Type[BaseSettings]): The Pydantic BaseSettings class for which sources are customized.
-            init_settings (PydanticBaseSettingsSource): The initial settings source, typically passed at runtime.
-            env_settings (PydanticBaseSettingsSource): Settings sourced from environment variables.
-            dotenv_settings (PydanticBaseSettingsSource): Settings sourced from a dotenv file.
-            file_secret_settings (PydanticBaseSettingsSource): Unused (needed for parent class interface).
+            settings_cls (Type[pydantic_settings.BaseSettings]): The Pydantic BaseSettings class for
+                which sources are customized.
+            init_settings (pydantic_settings.PydanticBaseSettingsSource): The initial settings source, typically passed at runtime.
+            env_settings (pydantic_settings.PydanticBaseSettingsSource): Settings sourced from environment variables.
+            dotenv_settings (pydantic_settings.PydanticBaseSettingsSource): Settings sourced from a dotenv file.
+            file_secret_settings (pydantic_settings.PydanticBaseSettingsSource): Unused (needed for parent class interface).
 
         Returns:
-            tuple[PydanticBaseSettingsSource, ...]: A tuple of settings sources in the order they should be applied.
+            tuple[pydantic_settings.PydanticBaseSettingsSource, ...]: A tuple of settings sources in the order they should be applied.
 
         Behavior:
             1. Checks for the existence of a JSON configuration file in the expected location.
             2. If the configuration file does not exist, creates the directory (if needed) and attempts to copy a
                default configuration file to the location. If the copy fails, uses the default configuration file directly.
-            3. Creates a `JsonConfigSettingsSource` for both the configuration file and the default configuration file.
+            3. Creates a `pydantic_settings.JsonConfigSettingsSource` for both the configuration file and the default configuration file.
             4. Updates class attributes `GeneralSettings._config_folder_path` and
                `GeneralSettings._config_file_path` to reflect the determined paths.
             5. Returns a tuple containing all provided and newly created settings sources in the desired order.
@@ -325,13 +355,7 @@ class ConfigEOS(SingletonMixin, SettingsEOSDefaults):
             - This method logs a warning if the default configuration file cannot be copied.
             - It ensures that a fallback to the default configuration file is always possible.
         """
-        setting_sources = [
-            init_settings,
-            env_settings,
-            dotenv_settings,
-        ]
-
-        file_settings: Optional[JsonConfigSettingsSource] = None
+        # Ensure we know and have the config folder path and the config file
         config_file, exists = cls._get_config_file_path()
         config_dir = config_file.parent
         if not exists:
@@ -342,20 +366,38 @@ class ConfigEOS(SingletonMixin, SettingsEOSDefaults):
                 logger.warning(f"Could not copy default config: {exc}. Using default config...")
                 config_file = cls.config_default_file_path
                 config_dir = config_file.parent
-        try:
-            file_settings = JsonConfigSettingsSource(settings_cls, json_file=config_file)
-            setting_sources.append(file_settings)
-        except Exception as e:
-            logger.error(
-                f"Error reading config file '{config_file}' (falling back to default config): {e}"
-            )
-        default_settings = JsonConfigSettingsSource(
-            settings_cls, json_file=cls.config_default_file_path
-        )
+        # Remember config_dir and config file
         GeneralSettings._config_folder_path = config_dir
         GeneralSettings._config_file_path = config_file
 
+        # All the settings sources in priority sequence
+        setting_sources = [
+            init_settings,
+            env_settings,
+            dotenv_settings,
+        ]
+
+        # Apend file settings to sources
+        file_settings: Optional[pydantic_settings.JsonConfigSettingsSource] = None
+        try:
+            backup_file = config_file.with_suffix(f".{to_datetime(as_string='YYYYMMDDHHmmss')}")
+            if migrate_config_file(config_file, backup_file):
+                # If the config file does have the correct version add it as settings source
+                file_settings = pydantic_settings.JsonConfigSettingsSource(
+                    settings_cls, json_file=config_file
+                )
+                setting_sources.append(file_settings)
+        except Exception as ex:
+            logger.error(
+                f"Error reading config file '{config_file}' (falling back to default config): {ex}"
+            )
+
+        # Append default settings to sources
+        default_settings = pydantic_settings.JsonConfigSettingsSource(
+            settings_cls, json_file=cls.config_default_file_path
+        )
         setting_sources.append(default_settings)
+
         return tuple(setting_sources)
 
     @classproperty
@@ -374,28 +416,24 @@ class ConfigEOS(SingletonMixin, SettingsEOSDefaults):
         Configuration data is loaded from a configuration file or a default one is created if none
         exists.
         """
+        logger.debug("Config init with parameters {} {}", args, kwargs)
+        # Check for singleton guard
         if hasattr(self, "_initialized"):
             return
         self._setup(self, *args, **kwargs)
 
     def _setup(self, *args: Any, **kwargs: Any) -> None:
         """Re-initialize global settings."""
-        # Check for config file content/ version type
-        config_file, exists = self._get_config_file_path()
-        if exists:
-            with config_file.open("r", encoding="utf-8", newline=None) as f_config:
-                config_txt = f_config.read()
-                if '"directories": {' in config_txt or '"server_eos_host": ' in config_txt:
-                    error_msg = f"Configuration file '{config_file}' is outdated. Please remove or update  manually."
-                    logger.error(error_msg)
-                    raise ValueError(error_msg)
-        # Assure settings base knows EOS configuration
+        logger.debug("Config setup with parameters {} {}", args, kwargs)
+        # Assure settings base knows the singleton EOS configuration
         SettingsBaseModel.config = self
-        # (Re-)load settings
+        # (Re-)load settings - call base class init
         SettingsEOSDefaults.__init__(self, *args, **kwargs)
         # Init config file and data folder pathes
         self._create_initial_config_file()
         self._update_data_folder_path()
+        self._initialized = True
+        logger.debug("Config setup:\n{}", self)
 
     def merge_settings(self, settings: SettingsEOS) -> None:
         """Merges the provided settings into the global settings for EOS, with optional overwrite.
@@ -441,6 +479,88 @@ class ConfigEOS(SingletonMixin, SettingsEOSDefaults):
         """
         self._setup()
 
+    def revert_settings(self, backup_id: str) -> None:
+        """Revert application settings to a stored backup.
+
+        This method restores configuration values from a backup file identified
+        by `backup_id`. The backup is expected to exist alongside the main
+        configuration file, using the main config file's path but with the given
+        suffix. Any settings previously applied will be overwritten.
+
+        Args:
+            backup_id (str): The suffix used to locate the backup configuration
+                file. Example: ``".bak"`` or ``".backup"``.
+
+        Returns:
+            None: The method does not return a value.
+
+        Raises:
+            ValueError: If the backup file cannot be found at the constructed path.
+            json.JSONDecodeError: If the backup file exists but contains invalid JSON.
+            TypeError: If the unpacked backup data fails to match the signature
+                required by ``self._setup()``.
+            OSError: If reading the backup file fails due to I/O issues.
+        """
+        backup_file_path = self.general.config_file_path.with_suffix(f".{backup_id}")
+        if not backup_file_path.exists():
+            error_msg = f"Configuration backup `{backup_id}` not found."
+            logger.error(error_msg)
+            raise ValueError(error_msg)
+
+        with backup_file_path.open("r", encoding="utf-8") as f:
+            backup_data: dict[str, Any] = json.load(f)
+        backup_settings = migrate_config_data(backup_data)
+
+        self._setup(**backup_settings.model_dump(exclude_none=True, exclude_unset=True))
+
+    def list_backups(self) -> dict[str, dict[str, Any]]:
+        """List available configuration backup files and extract metadata.
+
+        Backup files are identified by sharing the same stem as the main config
+        file but having a different suffix. Each backup file is assumed to contain
+        a JSON object.
+
+        The returned dictionary uses `backup_id` (suffix) as keys. The value for
+        each key is a dictionary including:
+        - ``storage_time``: The file modification timestamp in ISO-8601 format.
+        - ``version``: Version information found in the backup file
+            (defaults to ``"unknown"``).
+
+        Returns:
+            dict[str, dict[str, Any]]: Mapping of backup identifiers to metadata.
+
+        Raises:
+            OSError: If directory scanning or file reading fails.
+            json.JSONDecodeError: If a backup file cannot be parsed as JSON.
+        """
+        result: dict[str, dict[str, Any]] = {}
+
+        base_path: Path = self.general.config_file_path
+        parent = base_path.parent
+        stem = base_path.stem
+
+        # Iterate files next to config file
+        for file in parent.iterdir():
+            if file.is_file() and file.stem == stem and file != base_path:
+                backup_id = file.suffix[1:]
+
+                # Read version from file
+                with file.open("r", encoding="utf-8") as f:
+                    data: dict[str, Any] = json.load(f)
+
+                # Extract version safely
+                version = data.get("general", {}).get("version", "unknown")
+
+                # Read file modification time (OS-independent)
+                ts = file.stat().st_mtime
+                storage_time = to_datetime(ts, as_string=True)
+                result[backup_id] = {
+                    "date_time": storage_time,
+                    "version": version,
+                }
+
+        return result
+
     def _create_initial_config_file(self) -> None:
         if self.general.config_file_path and not self.general.config_file_path.exists():
             self.general.config_file_path.parent.mkdir(parents=True, exist_ok=True)
@@ -488,6 +608,11 @@ class ConfigEOS(SingletonMixin, SettingsEOSDefaults):
     def _get_config_file_path(cls) -> tuple[Path, bool]:
         """Find a valid configuration file or return the desired path for a new config file.
 
+        Searches:
+            1. environment variable directory
+            2. user configuration directory
+            3. current working directory
+
         Returns:
             tuple[Path, bool]: The path to the configuration file and if there is already a config file there
         """

src/akkudoktoreos/config/configmigrate.py

@@ -0,0 +1,252 @@
+"""Migrate config file to actual version."""
+
+import json
+import shutil
+from pathlib import Path
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Set, Tuple, Union
+
+from loguru import logger
+
+from akkudoktoreos.core.version import __version__
+
+if TYPE_CHECKING:
+    # There are circular dependencies - only import here for type checking
+    from akkudoktoreos.config.config import SettingsEOSDefaults
+
+# -----------------------------
+# Global migration map constant
+# -----------------------------
+# key: old JSON path, value: either
+#   - str (new model path)
+#   - tuple[str, Callable[[Any], Any]] (new path + transform)
+#   - None (drop)
+MIGRATION_MAP: Dict[str, Union[str, Tuple[str, Callable[[Any], Any]], None]] = {
+    # 0.1.0 -> 0.2.0
+    "devices/batteries/0/initial_soc_percentage": None,
+    "devices/electric_vehicles/0/initial_soc_percentage": None,
+    "elecprice/provider_settings/import_file_path": "elecprice/provider_settings/ElecPriceImport/import_file_path",
+    "elecprice/provider_settings/import_json": "elecprice/provider_settings/ElecPriceImport/import_json",
+    "load/provider_settings/import_file_path": "load/provider_settings/LoadImport/import_file_path",
+    "load/provider_settings/import_json": "load/provider_settings/LoadImport/import_json",
+    "load/provider_settings/loadakkudoktor_year_energy": "load/provider_settings/LoadAkkudoktor/loadakkudoktor_year_energy_kwh",
+    "load/provider_settings/load_vrm_idsite": "load/provider_settings/LoadVrm/load_vrm_idsite",
+    "load/provider_settings/load_vrm_token": "load/provider_settings/LoadVrm/load_vrm_token",
+    "logging/level": "logging/console_level",
+    "logging/root_level": None,
+    "measurement/load0_name": "measurement/load_emr_keys/0",
+    "measurement/load1_name": "measurement/load_emr_keys/1",
+    "measurement/load2_name": "measurement/load_emr_keys/2",
+    "measurement/load3_name": "measurement/load_emr_keys/3",
+    "measurement/load4_name": "measurement/load_emr_keys/4",
+    "optimization/ev_available_charge_rates_percent": (
+        "devices/electric_vehicles/0/charge_rates",
+        lambda v: [x / 100 for x in v],
+    ),
+    "optimization/hours": "optimization/horizon_hours",
+    "optimization/penalty": ("optimization/genetic/penalties/ev_soc_miss", lambda v: float(v)),
+    "pvforecast/provider_settings/import_file_path": "pvforecast/provider_settings/PVForecastImport/import_file_path",
+    "pvforecast/provider_settings/import_json": "pvforecast/provider_settings/PVForecastImport/import_json",
+    "pvforecast/provider_settings/load_vrm_idsite": "pvforecast/provider_settings/PVForecastVrm/load_vrm_idsite",
+    "pvforecast/provider_settings/load_vrm_token": "pvforecast/provider_settings/PVForecastVrm/load_vrm_token",
+    "weather/provider_settings/import_file_path": "weather/provider_settings/WeatherImport/import_file_path",
+    "weather/provider_settings/import_json": "weather/provider_settings/WeatherImport/import_json",
+}
+
+# -----------------------------
+# Global migration stats
+# -----------------------------
+migrated_source_paths: Set[str] = set()
+mapped_count: int = 0
+auto_count: int = 0
+skipped_paths: List[str] = []
+
+
+def migrate_config_data(config_data: Dict[str, Any]) -> "SettingsEOSDefaults":
+    """Migrate configuration data to the current version settings.
+
+    Returns:
+        SettingsEOSDefaults: The migrated settings.
+    """
+    global migrated_source_paths, mapped_count, auto_count, skipped_paths
+
+    # Reset globals at the start of each migration
+    migrated_source_paths = set()
+    mapped_count = 0
+    auto_count = 0
+    skipped_paths = []
+
+    from akkudoktoreos.config.config import SettingsEOSDefaults
+
+    new_config = SettingsEOSDefaults()
+
+    # 1) Apply explicit migration map
+    for old_path, mapping in MIGRATION_MAP.items():
+        new_path = None
+        transform = None
+        if mapping is None:
+            migrated_source_paths.add(old_path.strip("/"))
+            logger.debug(f"🗑️ Migration map: dropping '{old_path}'")
+            continue
+        if isinstance(mapping, tuple):
+            new_path, transform = mapping
+        else:
+            new_path = mapping
+
+        old_value = _get_json_nested_value(config_data, old_path)
+        if old_value is None:
+            migrated_source_paths.add(old_path.strip("/"))
+            mapped_count += 1
+            logger.debug(f"✅ Migrated mapped '{old_path}' → 'None'")
+            continue
+
+        try:
+            if transform:
+                old_value = transform(old_value)
+            new_config.set_nested_value(new_path, old_value)
+            migrated_source_paths.add(old_path.strip("/"))
+            mapped_count += 1
+            logger.debug(f"✅ Migrated mapped '{old_path}' → '{new_path}' = {old_value!r}")
+        except Exception as e:
+            logger.opt(exception=True).warning(
+                f"Failed mapped migration '{old_path}' -> '{new_path}': {e}"
+            )
+
+    # 2) Automatic migration for remaining fields
+    auto_count += _migrate_matching_fields(
+        config_data, new_config, migrated_source_paths, skipped_paths
+    )
+
+    # 3) Ensure version
+    try:
+        new_config.set_nested_value("general/version", __version__)
+    except Exception as e:
+        logger.warning(f"Could not set version on new configuration model: {e}")
+
+    # 4) Log final migration summary
+    logger.info(
+        f"Migration summary: "
+        f"mapped fields: {mapped_count}, automatically migrated: {auto_count}, skipped: {len(skipped_paths)}"
+    )
+    if skipped_paths:
+        logger.debug(f"Skipped paths: {', '.join(skipped_paths)}")
+
+    logger.success(f"Configuration successfully migrated to version {__version__}.")
+    return new_config
+
+
+def migrate_config_file(config_file: Path, backup_file: Path) -> bool:
+    """Migrate configuration file to the current version.
+
+    Returns:
+        bool: True if up-to-date or successfully migrated, False on failure.
+    """
+    global migrated_source_paths, mapped_count, auto_count, skipped_paths
+
+    # Reset globals at the start of each migration
+    migrated_source_paths = set()
+    mapped_count = 0
+    auto_count = 0
+    skipped_paths = []
+
+    try:
+        with config_file.open("r", encoding="utf-8") as f:
+            config_data: Dict[str, Any] = json.load(f)
+    except (FileNotFoundError, json.JSONDecodeError) as e:
+        logger.error(f"Failed to read configuration file '{config_file}': {e}")
+        return False
+
+    match config_data:
+        case {"general": {"version": v}} if v == __version__:
+            logger.debug(f"Configuration file '{config_file}' is up to date (v{v}).")
+            return True
+        case _:
+            logger.info(
+                f"Configuration file '{config_file}' is missing current version info. "
+                f"Starting migration to v{__version__}..."
+            )
+
+    try:
+        # Backup existing file - we already know it is existing
+        try:
+            config_file.replace(backup_file)
+            logger.info(f"Backed up old configuration to '{backup_file}'.")
+        except Exception as e_replace:
+            try:
+                shutil.copy(config_file, backup_file)
+                logger.info(
+                    f"Could not replace; copied old configuration to '{backup_file}' instead."
+                )
+            except Exception as e_copy:
+                logger.warning(
+                    f"Failed to backup existing config (replace: {e_replace}; copy: {e_copy}). Continuing without backup."
+                )
+
+        # Migrate config data
+        new_config = migrate_config_data(config_data)
+
+        # Write migrated configuration
+        try:
+            with config_file.open("w", encoding="utf-8", newline=None) as f_out:
+                json_str = new_config.model_dump_json(indent=4)
+                f_out.write(json_str)
+        except Exception as e_write:
+            logger.error(f"Failed to write migrated configuration to '{config_file}': {e_write}")
+            return False
+
+        return True
+
+    except Exception as e:
+        logger.exception(f"Unexpected error during migration: {e}")
+        return False
+
+
+def _get_json_nested_value(data: dict, path: str) -> Any:
+    """Retrieve a nested value from a JSON-like dict using '/'-separated path."""
+    current: Any = data
+    for part in path.strip("/").split("/"):
+        if isinstance(current, list):
+            try:
+                part_idx = int(part)
+                current = current[part_idx]
+            except (ValueError, IndexError):
+                return None
+        elif isinstance(current, dict):
+            if part not in current:
+                return None
+            current = current[part]
+        else:
+            return None
+    return current
+
+
+def _migrate_matching_fields(
+    source: Dict[str, Any],
+    target_model: Any,
+    migrated_source_paths: Set[str],
+    skipped_paths: List[str],
+    prefix: str = "",
+) -> int:
+    """Recursively copy matching keys from source dict into target_model using set_nested_value.
+
+    Returns:
+        int: number of fields successfully auto-migrated
+    """
+    count: int = 0
+    for key, value in source.items():
+        full_path = f"{prefix}/{key}".strip("/")
+
+        if full_path in migrated_source_paths:
+            continue
+
+        if isinstance(value, dict):
+            count += _migrate_matching_fields(
+                value, target_model, migrated_source_paths, skipped_paths, full_path
+            )
+        else:
+            try:
+                target_model.set_nested_value(full_path, value)
+                count += 1
+            except Exception:
+                skipped_paths.append(full_path)
+                continue
+    return count

src/akkudoktoreos/core/cache.py

@@ -28,12 +28,17 @@ from typing import (
 
 import cachebox
 from loguru import logger
-from pendulum import DateTime, Duration
 from pydantic import Field
 
 from akkudoktoreos.core.coreabc import ConfigMixin, SingletonMixin
 from akkudoktoreos.core.pydantic import PydanticBaseModel
-from akkudoktoreos.utils.datetimeutil import compare_datetimes, to_datetime, to_duration
+from akkudoktoreos.utils.datetimeutil import (
+    DateTime,
+    Duration,
+    compare_datetimes,
+    to_datetime,
+    to_duration,
+)
 
 # ---------------------------------
 # In-Memory Caching Functionality
@@ -43,25 +48,28 @@ from akkudoktoreos.utils.datetimeutil import compare_datetimes, to_datetime, to_
 TCallable = TypeVar("TCallable", bound=Callable[..., Any])
 
 
-def cache_until_update_store_callback(event: int, key: Any, value: Any) -> None:
-    """Calback function for CacheUntilUpdateStore."""
-    CacheUntilUpdateStore.last_event = event
-    CacheUntilUpdateStore.last_key = key
-    CacheUntilUpdateStore.last_value = value
+def cache_energy_management_store_callback(event: int, key: Any, value: Any) -> None:
+    """Calback function for CacheEnergyManagementStore."""
+    CacheEnergyManagementStore.last_event = event
+    CacheEnergyManagementStore.last_key = key
+    CacheEnergyManagementStore.last_value = value
     if event == cachebox.EVENT_MISS:
-        CacheUntilUpdateStore.miss_count += 1
+        CacheEnergyManagementStore.miss_count += 1
     elif event == cachebox.EVENT_HIT:
-        CacheUntilUpdateStore.hit_count += 1
+        CacheEnergyManagementStore.hit_count += 1
     else:
         # unreachable code
         raise NotImplementedError
 
 
-class CacheUntilUpdateStore(SingletonMixin):
+class CacheEnergyManagementStore(SingletonMixin):
     """Singleton-based in-memory LRU (Least Recently Used) cache.
 
     This cache is shared across the application to store results of decorated
-    methods or functions until the next EMS (Energy Management System) update.
+    methods or functions during energy management runs.
+
+    Energy management tasks shall clear the cache at the start of the energy management
+    task.
 
     The cache uses an LRU eviction strategy, storing up to 100 items, with the oldest
     items being evicted once the cache reaches its capacity.
@@ -75,14 +83,14 @@ class CacheUntilUpdateStore(SingletonMixin):
     miss_count: ClassVar[int] = 0
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
-        """Initializes the `CacheUntilUpdateStore` instance with default parameters.
+        """Initializes the `CacheEnergyManagementStore` instance with default parameters.
 
         The cache uses an LRU eviction strategy with a maximum size of 100 items.
         This cache is a singleton, meaning only one instance will exist throughout
         the application lifecycle.
 
         Example:
-            >>> cache = CacheUntilUpdateStore()
+            >>> cache = CacheEnergyManagementStore()
         """
         if hasattr(self, "_initialized"):
             return
@@ -128,7 +136,7 @@ class CacheUntilUpdateStore(SingletonMixin):
         Example:
             >>> value = cache["user_data"]
         """
-        return CacheUntilUpdateStore.cache[key]
+        return CacheEnergyManagementStore.cache[key]
 
     def __setitem__(self, key: Any, value: Any) -> None:
         """Stores an item in the cache.
@@ -140,15 +148,15 @@ class CacheUntilUpdateStore(SingletonMixin):
         Example:
             >>> cache["user_data"] = {"name": "Alice", "age": 30}
         """
-        CacheUntilUpdateStore.cache[key] = value
+        CacheEnergyManagementStore.cache[key] = value
 
     def __len__(self) -> int:
         """Returns the number of items in the cache."""
-        return len(CacheUntilUpdateStore.cache)
+        return len(CacheEnergyManagementStore.cache)
 
     def __repr__(self) -> str:
-        """Provides a string representation of the CacheUntilUpdateStore object."""
-        return repr(CacheUntilUpdateStore.cache)
+        """Provides a string representation of the CacheEnergyManagementStore object."""
+        return repr(CacheEnergyManagementStore.cache)
 
     def clear(self) -> None:
         """Clears the cache, removing all stored items.
@@ -161,22 +169,22 @@ class CacheUntilUpdateStore(SingletonMixin):
             >>> cache.clear()
         """
         if hasattr(self.cache, "clear") and callable(getattr(self.cache, "clear")):
-            CacheUntilUpdateStore.cache.clear()
-            CacheUntilUpdateStore.last_event = None
-            CacheUntilUpdateStore.last_key = None
-            CacheUntilUpdateStore.last_value = None
-            CacheUntilUpdateStore.miss_count = 0
-            CacheUntilUpdateStore.hit_count = 0
+            CacheEnergyManagementStore.cache.clear()
+            CacheEnergyManagementStore.last_event = None
+            CacheEnergyManagementStore.last_key = None
+            CacheEnergyManagementStore.last_value = None
+            CacheEnergyManagementStore.miss_count = 0
+            CacheEnergyManagementStore.hit_count = 0
         else:
             raise AttributeError(f"'{self.cache.__class__.__name__}' object has no method 'clear'")
 
 
-def cachemethod_until_update(method: TCallable) -> TCallable:
+def cachemethod_energy_management(method: TCallable) -> TCallable:
     """Decorator for in memory caching the result of an instance method.
 
-    This decorator caches the method's result in `CacheUntilUpdateStore`, ensuring
+    This decorator caches the method's result in `CacheEnergyManagementStore`, ensuring
     that subsequent calls with the same arguments return the cached result until the
-    next EMS update cycle.
+    next energy management start.
 
     Args:
         method (Callable): The instance method to be decorated.
@@ -186,14 +194,14 @@ def cachemethod_until_update(method: TCallable) -> TCallable:
 
     Example:
         >>> class MyClass:
-        >>>     @cachemethod_until_update
+        >>>     @cachemethod_energy_management
         >>>     def expensive_method(self, param: str) -> str:
         >>>         # Perform expensive computation
         >>>         return f"Computed {param}"
     """
 
     @cachebox.cachedmethod(
-        cache=CacheUntilUpdateStore().cache, callback=cache_until_update_store_callback
+        cache=CacheEnergyManagementStore().cache, callback=cache_energy_management_store_callback
     )
     @functools.wraps(method)
     def wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
@@ -203,12 +211,12 @@ def cachemethod_until_update(method: TCallable) -> TCallable:
     return wrapper
 
 
-def cache_until_update(func: TCallable) -> TCallable:
+def cache_energy_management(func: TCallable) -> TCallable:
     """Decorator for in memory caching the result of a standalone function.
 
-    This decorator caches the function's result in `CacheUntilUpdateStore`, ensuring
+    This decorator caches the function's result in `CacheEnergyManagementStore`, ensuring
     that subsequent calls with the same arguments return the cached result until the
-    next EMS update cycle.
+    next energy management start.
 
     Args:
         func (Callable): The function to be decorated.
@@ -224,7 +232,7 @@ def cache_until_update(func: TCallable) -> TCallable:
     """
 
     @cachebox.cached(
-        cache=CacheUntilUpdateStore().cache, callback=cache_until_update_store_callback
+        cache=CacheEnergyManagementStore().cache, callback=cache_energy_management_store_callback
     )
     @functools.wraps(func)
     def wrapper(*args: Any, **kwargs: Any) -> Any:
@@ -435,7 +443,7 @@ class CacheFileStore(ConfigMixin, SingletonMixin):
                     )
 
                 logger.debug(
-                    f"Search: ttl:{ttl_duration}, until:{until_datetime}, at:{at_datetime}, before:{before_datetime} -> hit: {generated_key == cache_file_key}, item: {cache_item.cache_file.seek(0), cache_item.cache_file.read()}"
+                    f"Search: ttl:{ttl_duration}, until:{until_datetime}, at:{at_datetime}, before:{before_datetime} -> hit: {generated_key == cache_file_key}, item: {cache_item.cache_file.seek(0), cache_item.cache_file.read()[:10]}..."
                 )
 
                 if generated_key == cache_file_key:

src/akkudoktoreos/core/coreabc.py

@@ -14,13 +14,13 @@ import threading
 from typing import Any, ClassVar, Dict, Optional, Type
 
 from loguru import logger
-from pendulum import DateTime
-from pydantic import computed_field
+
+from akkudoktoreos.core.decorators import classproperty
+from akkudoktoreos.utils.datetimeutil import DateTime
 
 config_eos: Any = None
 measurement_eos: Any = None
 prediction_eos: Any = None
-devices_eos: Any = None
 ems_eos: Any = None
 
 
@@ -46,9 +46,9 @@ class ConfigMixin:
         ```
     """
 
-    @property
-    def config(self) -> Any:
-        """Convenience method/ attribute to retrieve the EOS configuration data.
+    @classproperty
+    def config(cls) -> Any:
+        """Convenience class method/ attribute to retrieve the EOS configuration data.
 
         Returns:
             ConfigEOS: The configuration.
@@ -86,9 +86,9 @@ class MeasurementMixin:
         ```
     """
 
-    @property
-    def measurement(self) -> Any:
-        """Convenience method/ attribute to retrieve the EOS measurement data.
+    @classproperty
+    def measurement(cls) -> Any:
+        """Convenience class method/ attribute to retrieve the EOS measurement data.
 
         Returns:
             Measurement: The measurement.
@@ -126,9 +126,9 @@ class PredictionMixin:
         ```
     """
 
-    @property
-    def prediction(self) -> Any:
-        """Convenience method/ attribute to retrieve the EOS prediction data.
+    @classproperty
+    def prediction(cls) -> Any:
+        """Convenience class method/ attribute to retrieve the EOS prediction data.
 
         Returns:
             Prediction: The prediction.
@@ -143,46 +143,6 @@ class PredictionMixin:
         return prediction_eos
 
 
-class DevicesMixin:
-    """Mixin class for managing EOS devices simulation data.
-
-    This class serves as a foundational component for EOS-related classes requiring access
-    to global devices simulation data. It provides a `devices` property that dynamically retrieves
-    the devices instance, ensuring up-to-date access to devices simulation results.
-
-    Usage:
-        Subclass this base class to gain access to the `devices` attribute, which retrieves the
-        global devices instance lazily to avoid import-time circular dependencies.
-
-    Attributes:
-        devices (Devices): Property to access the global EOS devices simulation data.
-
-    Example:
-        ```python
-        class MyOptimizationClass(DevicesMixin):
-            def analyze_mydevicesimulation(self):
-                device_simulation_data = self.devices.mydevicesresult
-                # Perform analysis
-        ```
-    """
-
-    @property
-    def devices(self) -> Any:
-        """Convenience method/ attribute to retrieve the EOS devices simulation data.
-
-        Returns:
-            Devices: The devices simulation.
-        """
-        # avoid circular dependency at import time
-        global devices_eos
-        if devices_eos is None:
-            from akkudoktoreos.devices.devices import get_devices
-
-            devices_eos = get_devices()
-
-        return devices_eos
-
-
 class EnergyManagementSystemMixin:
     """Mixin class for managing EOS energy management system.
 
@@ -207,9 +167,9 @@ class EnergyManagementSystemMixin:
         ```
     """
 
-    @property
-    def ems(self) -> Any:
-        """Convenience method/ attribute to retrieve the EOS energy management system.
+    @classproperty
+    def ems(cls) -> Any:
+        """Convenience class method/ attribute to retrieve the EOS energy management system.
 
         Returns:
             EnergyManagementSystem: The energy management system.
@@ -231,16 +191,21 @@ class StartMixin(EnergyManagementSystemMixin):
         - `start_datetime`: The starting datetime of the current or latest energy management.
     """
 
-    # Computed field for start_datetime
-    @computed_field  # type: ignore[prop-decorator]
-    @property
-    def start_datetime(self) -> Optional[DateTime]:
-        """Returns the start datetime of the current or latest energy management.
+    @classproperty
+    def ems_start_datetime(cls) -> Optional[DateTime]:
+        """Convenience class method/ attribute to retrieve the start datetime of the current or latest energy management.
 
         Returns:
             DateTime: The starting datetime of the current or latest energy management, or None.
         """
-        return self.ems.start_datetime
+        # avoid circular dependency at import time
+        global ems_eos
+        if ems_eos is None:
+            from akkudoktoreos.core.ems import get_ems
+
+            ems_eos = get_ems()
+
+        return ems_eos.start_datetime
 
 
 class SingletonMixin:

src/akkudoktoreos/core/dataabc.py

@@ -14,14 +14,23 @@ from abc import abstractmethod
 from collections.abc import MutableMapping, MutableSequence
 from itertools import chain
 from pathlib import Path
-from typing import Any, Dict, Iterator, List, Optional, Tuple, Type, Union, overload
+from typing import (
+    Any,
+    Dict,
+    Iterator,
+    List,
+    Optional,
+    Tuple,
+    Type,
+    Union,
+    overload,
+)
 
 import numpy as np
 import pandas as pd
 import pendulum
 from loguru import logger
 from numpydantic import NDArray, Shape
-from pendulum import DateTime, Duration
 from pydantic import (
     AwareDatetime,
     ConfigDict,
@@ -29,6 +38,7 @@ from pydantic import (
     ValidationError,
     computed_field,
     field_validator,
+    model_validator,
 )
 
 from akkudoktoreos.core.coreabc import ConfigMixin, SingletonMixin, StartMixin
@@ -37,7 +47,13 @@ from akkudoktoreos.core.pydantic import (
     PydanticDateTimeData,
     PydanticDateTimeDataFrame,
 )
-from akkudoktoreos.utils.datetimeutil import compare_datetimes, to_datetime, to_duration
+from akkudoktoreos.utils.datetimeutil import (
+    DateTime,
+    Duration,
+    compare_datetimes,
+    to_datetime,
+    to_duration,
+)
 
 
 class DataBase(ConfigMixin, StartMixin, PydanticBaseModel):
@@ -55,6 +71,11 @@ class DataRecord(DataBase, MutableMapping):
     Fields can be accessed and mutated both using dictionary-style access (`record['field_name']`)
     and attribute-style access (`record.field_name`).
 
+    The data record also provides configured field like data. Configuration has to be done by the
+    derived class. Configuration is a list of key strings, which is usually taken from the EOS
+    configuration. The internal field for these data `configured_data` is mostly hidden from
+    dictionary-style and attribute-style access.
+
     Attributes:
         date_time (Optional[DateTime]): Aware datetime indicating when the data record applies.
 
@@ -65,9 +86,42 @@ class DataRecord(DataBase, MutableMapping):
 
     date_time: Optional[DateTime] = Field(default=None, description="DateTime")
 
+    configured_data: dict[str, Any] = Field(
+        default_factory=dict,
+        description="Configured field like data",
+        examples=[{"load0_mr": 40421}],
+    )
+
     # Pydantic v2 model configuration
     model_config = ConfigDict(arbitrary_types_allowed=True, populate_by_name=True)
 
+    @model_validator(mode="before")
+    @classmethod
+    def init_configured_field_like_data(cls, data: Any) -> Any:
+        """Extracts configured data keys from the input and assigns them to `configured_data`.
+
+        This validator is called before the model is initialized. It filters out any keys from the input
+        dictionary that are listed in the configured data keys, and moves them into
+        the `configured_data` field of the model. This enables flexible, key-driven population of
+        dynamic data while keeping the model schema clean.
+
+        Args:
+            data (Any): The raw input data used to initialize the model.
+
+        Returns:
+            Any: The modified input data dictionary, with configured keys moved to `configured_data`.
+        """
+        if not isinstance(data, dict):
+            return data
+
+        configured_keys: Union[list[str], set] = cls.configured_data_keys() or set()
+        extracted = {k: data.pop(k) for k in list(data.keys()) if k in configured_keys}
+
+        if extracted:
+            data.setdefault("configured_data", {}).update(extracted)
+
+        return data
+
     @field_validator("date_time", mode="before")
     @classmethod
     def transform_to_datetime(cls, value: Any) -> Optional[DateTime]:
@@ -77,18 +131,39 @@ class DataRecord(DataBase, MutableMapping):
             return None
         return to_datetime(value)
 
+    @classmethod
+    def configured_data_keys(cls) -> Optional[list[str]]:
+        """Return the keys for the configured field like data.
+
+        Can be overwritten by derived classes to define specific field like data. Usually provided
+        by configuration data.
+        """
+        return None
+
     @classmethod
     def record_keys(cls) -> List[str]:
         """Returns the keys of all fields in the data record."""
         key_list = []
         key_list.extend(list(cls.model_fields.keys()))
         key_list.extend(list(cls.__pydantic_decorators__.computed_fields.keys()))
+        # Add also keys that may be added by configuration
+        key_list.remove("configured_data")
+        configured_keys = cls.configured_data_keys()
+        if configured_keys is not None:
+            key_list.extend(configured_keys)
         return key_list
 
     @classmethod
     def record_keys_writable(cls) -> List[str]:
         """Returns the keys of all fields in the data record that are writable."""
-        return list(cls.model_fields.keys())
+        keys_writable = []
+        keys_writable.extend(list(cls.model_fields.keys()))
+        # Add also keys that may be added by configuration
+        keys_writable.remove("configured_data")
+        configured_keys = cls.configured_data_keys()
+        if configured_keys is not None:
+            keys_writable.extend(configured_keys)
+        return keys_writable
 
     def _validate_key_writable(self, key: str) -> None:
         """Verify that a specified key exists and is writable in the current record keys.
@@ -104,6 +179,40 @@ class DataRecord(DataBase, MutableMapping):
                 f"Key '{key}' is not in writable record keys: {self.record_keys_writable()}"
             )
 
+    def __dir__(self) -> list[str]:
+        """Extend the default `dir()` output to include configured field like data keys.
+
+        This enables editor auto-completion and interactive introspection, while hiding the internal
+        `configured_data` dictionary.
+
+        This ensures the configured field like data values appear like native fields,
+        in line with the base model's attribute behavior.
+        """
+        base = super().__dir__()
+        keys = set(base)
+        # Expose configured data keys as attributes
+        configured_keys = self.configured_data_keys()
+        if configured_keys is not None:
+            keys.update(configured_keys)
+        # Explicitly hide the 'configured_data' internal dict
+        keys.discard("configured_data")
+        return sorted(keys)
+
+    def __eq__(self, other: Any) -> bool:
+        """Ensure equality comparison includes the contents of the `configured_data` dict.
+
+        Contents of the `configured_data` dict are in addition to the base model fields.
+        """
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        # Compare all fields except `configured_data`
+        if self.model_dump(exclude={"configured_data"}) != other.model_dump(
+            exclude={"configured_data"}
+        ):
+            return False
+        # Compare `configured_data` explicitly
+        return self.configured_data == other.configured_data
+
     def __getitem__(self, key: str) -> Any:
         """Retrieve the value of a field by key name.
 
@@ -116,8 +225,10 @@ class DataRecord(DataBase, MutableMapping):
         Raises:
             KeyError: If the specified key does not exist.
         """
-        if key in self.model_fields:
-            return getattr(self, key)
+        try:
+            # Let getattr do the work
+            return self.__getattr__(key)
+        except:
             raise KeyError(f"'{key}' not found in the record fields.")
 
     def __setitem__(self, key: str, value: Any) -> None:
@@ -130,9 +241,10 @@ class DataRecord(DataBase, MutableMapping):
         Raises:
             KeyError: If the specified key does not exist in the fields.
         """
-        if key in self.model_fields:
-            setattr(self, key, value)
-        else:
+        try:
+            # Let setattr do the work
+            self.__setattr__(key, value)
+        except:
             raise KeyError(f"'{key}' is not a recognized field.")
 
     def __delitem__(self, key: str) -> None:
@@ -144,9 +256,9 @@ class DataRecord(DataBase, MutableMapping):
         Raises:
             KeyError: If the specified key does not exist in the fields.
         """
-        if key in self.model_fields:
-            setattr(self, key, None)  # Optional: set to None instead of deleting
-        else:
+        try:
+            self.__delattr__(key)
+        except:
             raise KeyError(f"'{key}' is not a recognized field.")
 
     def __iter__(self) -> Iterator[str]:
@@ -155,7 +267,7 @@ class DataRecord(DataBase, MutableMapping):
         Returns:
             Iterator[str]: An iterator over field names.
         """
-        return iter(self.model_fields)
+        return iter(self.record_keys_writable())
 
     def __len__(self) -> int:
         """Return the number of fields in the data record.
@@ -163,7 +275,7 @@ class DataRecord(DataBase, MutableMapping):
         Returns:
             int: The number of defined fields.
         """
-        return len(self.model_fields)
+        return len(self.record_keys_writable())
 
     def __repr__(self) -> str:
         """Provide a string representation of the data record.
@@ -171,7 +283,7 @@ class DataRecord(DataBase, MutableMapping):
         Returns:
             str: A string representation showing field names and their values.
         """
-        field_values = {field: getattr(self, field) for field in self.model_fields}
+        field_values = {field: getattr(self, field) for field in self.__class__.model_fields}
         return f"{self.__class__.__name__}({field_values})"
 
     def __getattr__(self, key: str) -> Any:
@@ -186,8 +298,13 @@ class DataRecord(DataBase, MutableMapping):
         Raises:
             AttributeError: If the field does not exist.
         """
-        if key in self.model_fields:
+        if key in self.__class__.model_fields:
             return getattr(self, key)
+        if key in self.configured_data.keys():
+            return self.configured_data[key]
+        configured_keys = self.configured_data_keys()
+        if configured_keys is not None and key in configured_keys:
+            return None
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{key}'")
 
     def __setattr__(self, key: str, value: Any) -> None:
@@ -200,9 +317,13 @@ class DataRecord(DataBase, MutableMapping):
         Raises:
             AttributeError: If the attribute/field does not exist.
         """
-        if key in self.model_fields:
+        if key in self.__class__.model_fields:
             super().__setattr__(key, value)
-        else:
+            return
+        configured_keys = self.configured_data_keys()
+        if configured_keys is not None and key in configured_keys:
+            self.configured_data[key] = value
+            return
         raise AttributeError(f"'{self.__class__.__name__}' object has no attribute '{key}'")
 
     def __delattr__(self, key: str) -> None:
@@ -214,9 +335,20 @@ class DataRecord(DataBase, MutableMapping):
         Raises:
             AttributeError: If the attribute/field does not exist.
         """
-        if key in self.model_fields:
-            setattr(self, key, None)  # Optional: set to None instead of deleting
+        if key in self.__class__.model_fields:
+            data: Optional[dict]
+            if key == "configured_data":
+                data = dict()
             else:
+                data = None
+            setattr(self, key, data)
+            return
+        if key in self.configured_data:
+            del self.configured_data[key]
+            return
+        configured_keys = self.configured_data_keys()
+        if configured_keys is not None and key in configured_keys:
+            return
         super().__delattr__(key)
 
     @classmethod
@@ -352,10 +484,7 @@ class DataSequence(DataBase, MutableSequence):
     @property
     def record_keys(self) -> List[str]:
         """Returns the keys of all fields in the data records."""
-        key_list = []
-        key_list.extend(list(self.record_class().model_fields.keys()))
-        key_list.extend(list(self.record_class().__pydantic_decorators__.computed_fields.keys()))
-        return key_list
+        return self.record_class().record_keys()
 
     @computed_field  # type: ignore[prop-decorator]
     @property
@@ -369,7 +498,7 @@ class DataSequence(DataBase, MutableSequence):
         Returns:
             List[str]: A list of field keys that are writable in the data records.
         """
-        return list(self.record_class().model_fields.keys())
+        return self.record_class().record_keys_writable()
 
     @classmethod
     def record_class(cls) -> Type:
@@ -707,6 +836,38 @@ class DataSequence(DataBase, MutableSequence):
 
         return filtered_data
 
+    def key_to_value(self, key: str, target_datetime: DateTime) -> Optional[float]:
+        """Returns the value corresponding to the specified key that is nearest to the given datetime.
+
+        Args:
+            key (str): The key of the attribute in DataRecord to extract.
+            target_datetime (datetime): The datetime to search nearest to.
+
+        Returns:
+            Optional[float]: The value nearest to the given datetime, or None if no valid records are found.
+
+        Raises:
+            KeyError: If the specified key is not found in any of the DataRecords.
+        """
+        self._validate_key(key)
+
+        # Filter out records with None or NaN values for the key
+        valid_records = [
+            record
+            for record in self.records
+            if record.date_time is not None
+            and getattr(record, key, None) not in (None, float("nan"))
+        ]
+
+        if not valid_records:
+            return None
+
+        # Find the record with datetime nearest to target_datetime
+        target = to_datetime(target_datetime)
+        nearest_record = min(valid_records, key=lambda r: abs(r.date_time - target))
+
+        return getattr(nearest_record, key, None)
+
     def key_to_lists(
         self,
         key: str,
@@ -868,6 +1029,11 @@ class DataSequence(DataBase, MutableSequence):
             KeyError: If the specified key is not found in any of the DataRecords.
         """
         self._validate_key(key)
+
+        # General check on fill_method
+        if fill_method not in ("ffill", "bfill", "linear", "none", None):
+            raise ValueError(f"Unsupported fill method: {fill_method}")
+
         # Ensure datetime objects are normalized
         start_datetime = to_datetime(start_datetime, to_maxtime=False) if start_datetime else None
         end_datetime = to_datetime(end_datetime, to_maxtime=False) if end_datetime else None
@@ -880,7 +1046,7 @@ class DataSequence(DataBase, MutableSequence):
         values_len = len(values)
 
         if values_len < 1:
-            # No values, assume at at least one value set to None
+            # No values, assume at least one value set to None
             if start_datetime is not None:
                 dates.append(start_datetime - interval)
             else:
@@ -902,6 +1068,11 @@ class DataSequence(DataBase, MutableSequence):
                 # Truncate all values before latest value before start_datetime
                 dates = dates[start_index - 1 :]
                 values = values[start_index - 1 :]
+            # We have a start_datetime, align to start datetime
+            resample_origin = start_datetime
+        else:
+            # We do not have a start_datetime, align resample buckets to midnight of first day
+            resample_origin = "start_day"
 
         if end_datetime is not None:
             if compare_datetimes(dates[-1], end_datetime).lt:
@@ -922,7 +1093,7 @@ class DataSequence(DataBase, MutableSequence):
             if fill_method is None:
                 fill_method = "linear"
             # Resample the series to the specified interval
-            resampled = series.resample(interval, origin="start").first()
+            resampled = series.resample(interval, origin=resample_origin).first()
             if fill_method == "linear":
                 resampled = resampled.interpolate(method="linear")
             elif fill_method == "ffill":
@@ -936,7 +1107,7 @@ class DataSequence(DataBase, MutableSequence):
             if fill_method is None:
                 fill_method = "ffill"
             # Resample the series to the specified interval
-            resampled = series.resample(interval, origin="start").first()
+            resampled = series.resample(interval, origin=resample_origin).first()
             if fill_method == "ffill":
                 resampled = resampled.ffill()
             elif fill_method == "bfill":
@@ -944,12 +1115,24 @@ class DataSequence(DataBase, MutableSequence):
             elif fill_method != "none":
                 raise ValueError(f"Unsupported fill method for non-numeric data: {fill_method}")
 
+        logger.debug(
+            "Resampled for '{}' with length {}: {}...{}",
+            key,
+            len(resampled),
+            resampled[:10],
+            resampled[-10:],
+        )
+
         # Convert the resampled series to a NumPy array
         if start_datetime is not None and len(resampled) > 0:
             resampled = resampled.truncate(before=start_datetime)
         if end_datetime is not None and len(resampled) > 0:
             resampled = resampled.truncate(after=end_datetime.subtract(seconds=1))
         array = resampled.values
+        logger.debug(
+            "Array for '{}' with length {}: {}...{}", key, len(array), array[:10], array[-10:]
+        )
+
         return array
 
     def to_dataframe(
@@ -1197,7 +1380,7 @@ class DataImportMixin:
     the values. `ìnterval` may be used to define the fixed time interval between two values.
 
     On import `self.update_value(datetime, key, value)` is called which has to be provided.
-    Also `self.start_datetime` may be necessary as a default in case `start_datetime`is not given.
+    Also `self.ems_start_datetime` may be necessary as a default in case `start_datetime`is not given.
     """
 
     # Attributes required but defined elsehere.
@@ -1315,7 +1498,7 @@ class DataImportMixin:
                 raise ValueError(f"Invalid start_datetime in import data: {e}")
 
         if start_datetime is None:
-            start_datetime = self.start_datetime  # type: ignore
+            start_datetime = self.ems_start_datetime  # type: ignore
 
         if "interval" in import_data:
             try:
@@ -1406,7 +1589,7 @@ class DataImportMixin:
                 raise ValueError(f"Invalid datetime index in DataFrame: {e}")
         else:
             if start_datetime is None:
-                start_datetime = self.start_datetime  # type: ignore
+                start_datetime = self.ems_start_datetime  # type: ignore
             has_datetime_index = False
 
         # Filter columns based on key_prefix and record_keys_writable
@@ -1463,7 +1646,7 @@ class DataImportMixin:
 
         If start_datetime and or interval is given in the JSON dict it will be used. Otherwise
         the given parameters are used. If None is given start_datetime defaults to
-        'self.start_datetime' and interval defaults to 1 hour.
+        'self.ems_start_datetime' and interval defaults to 1 hour.
 
         Args:
             json_str (str): The JSON string containing the generic data.
@@ -1481,11 +1664,11 @@ class DataImportMixin:
             {
                 "start_datetime": "2024-11-10 00:00:00"
                 "interval": "30 minutes"
-                "load_mean": [20.5, 21.0, 22.1],
+                "loadforecast_power_w": [20.5, 21.0, 22.1],
                 "other_xyz: [10.5, 11.0, 12.1],
             }
             ```
-            and `key_prefix = "load"`, only the "load_mean" key will be processed even though
+            and `key_prefix = "load"`, only the "loadforecast_power_w" key will be processed even though
             both keys are in the record.
         """
         # Try pandas dataframe with orient="split"
@@ -1538,7 +1721,7 @@ class DataImportMixin:
 
         If start_datetime and or interval is given in the JSON dict it will be used. Otherwise
         the given parameters are used. If None is given start_datetime defaults to
-        'self.start_datetime' and interval defaults to 1 hour.
+        'self.ems_start_datetime' and interval defaults to 1 hour.
 
         Args:
             import_file_path (Path): The path to the JSON file containing the generic data.
@@ -1555,11 +1738,11 @@ class DataImportMixin:
             Given a JSON file with the following content:
             ```json
             {
-                "load_mean": [20.5, 21.0, 22.1],
+                "loadforecast_power_w": [20.5, 21.0, 22.1],
                 "other_xyz: [10.5, 11.0, 12.1],
             }
             ```
-            and `key_prefix = "load"`, only the "load_mean" key will be processed even though
+            and `key_prefix = "load"`, only the "loadforecast_power_w" key will be processed even though
             both keys are in the record.
         """
         with import_file_path.open("r", encoding="utf-8", newline=None) as import_file:
@@ -1749,7 +1932,12 @@ class DataContainer(SingletonMixin, DataBase, MutableMapping):
             force_update (bool, optional): If True, forces the providers to update the data even if still cached.
         """
         for provider in self.providers:
+            try:
                 provider.update_data(force_enable=force_enable, force_update=force_update)
+            except Exception as ex:
+                error = f"Provider {provider.provider_id()} fails on update - enabled={provider.enabled()}, force_enable={force_enable}, force_update={force_update}: {ex}"
+                logger.error(error)
+                raise RuntimeError(error)
 
     def key_to_series(
         self,
@@ -1854,7 +2042,7 @@ class DataContainer(SingletonMixin, DataBase, MutableMapping):
     ) -> pd.DataFrame:
         """Retrieve a dataframe indexed by fixed time intervals for specified keys from the data in each DataProvider.
 
-        Generates a pandas DataFrame using the NumPy arrays for each specified key, ensuring a common time index..
+        Generates a pandas DataFrame using the NumPy arrays for each specified key, ensuring a common time index.
 
         Args:
             keys (list[str]): A list of field names to retrieve.
@@ -1903,8 +2091,15 @@ class DataContainer(SingletonMixin, DataBase, MutableMapping):
                 end_datetime.add(seconds=1)
 
         # Create a DatetimeIndex based on start, end, and interval
+        if start_datetime is None or end_datetime is None:
+            raise ValueError(
+                f"Can not determine datetime range. Got '{start_datetime}'..'{end_datetime}'."
+            )
         reference_index = pd.date_range(
-            start=start_datetime, end=end_datetime, freq=interval, inclusive="left"
+            start=start_datetime,
+            end=end_datetime,
+            freq=interval,
+            inclusive="left",
         )
 
         data = {}

src/akkudoktoreos/core/ems.py

@@ -1,123 +1,50 @@
 import traceback
-from typing import Any, ClassVar, Optional
+from asyncio import Lock, get_running_loop
+from concurrent.futures import ThreadPoolExecutor
+from functools import partial
+from typing import ClassVar, Optional
 
-import numpy as np
 from loguru import logger
-from numpydantic import NDArray, Shape
-from pendulum import DateTime
-from pydantic import ConfigDict, Field, computed_field, field_validator, model_validator
-from typing_extensions import Self
+from pydantic import computed_field
 
-from akkudoktoreos.core.cache import CacheUntilUpdateStore
+from akkudoktoreos.core.cache import CacheEnergyManagementStore
 from akkudoktoreos.core.coreabc import ConfigMixin, PredictionMixin, SingletonMixin
-from akkudoktoreos.core.pydantic import ParametersBaseModel, PydanticBaseModel
-from akkudoktoreos.devices.battery import Battery
-from akkudoktoreos.devices.generic import HomeAppliance
-from akkudoktoreos.devices.inverter import Inverter
-from akkudoktoreos.utils.datetimeutil import compare_datetimes, to_datetime
-from akkudoktoreos.utils.utils import NumpyEncoder
+from akkudoktoreos.core.emplan import EnergyManagementPlan
+from akkudoktoreos.core.emsettings import EnergyManagementMode
+from akkudoktoreos.core.pydantic import PydanticBaseModel
+from akkudoktoreos.optimization.genetic.genetic import GeneticOptimization
+from akkudoktoreos.optimization.genetic.geneticparams import (
+    GeneticOptimizationParameters,
+)
+from akkudoktoreos.optimization.genetic.geneticsolution import GeneticSolution
+from akkudoktoreos.optimization.optimization import OptimizationSolution
+from akkudoktoreos.utils.datetimeutil import DateTime, compare_datetimes, to_datetime
 
-
-class EnergyManagementParameters(ParametersBaseModel):
-    pv_prognose_wh: list[float] = Field(
-        description="An array of floats representing the forecasted photovoltaic output in watts for different time intervals."
-    )
-    strompreis_euro_pro_wh: list[float] = Field(
-        description="An array of floats representing the electricity price in euros per watt-hour for different time intervals."
-    )
-    einspeiseverguetung_euro_pro_wh: list[float] | float = Field(
-        description="A float or array of floats representing the feed-in compensation in euros per watt-hour."
-    )
-    preis_euro_pro_wh_akku: float = Field(
-        description="A float representing the cost of battery energy per watt-hour."
-    )
-    gesamtlast: list[float] = Field(
-        description="An array of floats representing the total load (consumption) in watts for different time intervals."
-    )
-
-    @model_validator(mode="after")
-    def validate_list_length(self) -> Self:
-        pv_prognose_length = len(self.pv_prognose_wh)
-        if (
-            pv_prognose_length != len(self.strompreis_euro_pro_wh)
-            or pv_prognose_length != len(self.gesamtlast)
-            or (
-                isinstance(self.einspeiseverguetung_euro_pro_wh, list)
-                and pv_prognose_length != len(self.einspeiseverguetung_euro_pro_wh)
-            )
-        ):
-            raise ValueError("Input lists have different lengths")
-        return self
-
-
-class SimulationResult(ParametersBaseModel):
-    """This object contains the results of the simulation and provides insights into various parameters over the entire forecast period."""
-
-    Last_Wh_pro_Stunde: list[Optional[float]] = Field(description="TBD")
-    EAuto_SoC_pro_Stunde: list[Optional[float]] = Field(
-        description="The state of charge of the EV for each hour."
-    )
-    Einnahmen_Euro_pro_Stunde: list[Optional[float]] = Field(
-        description="The revenue from grid feed-in or other sources in euros per hour."
-    )
-    Gesamt_Verluste: float = Field(
-        description="The total losses in watt-hours over the entire period."
-    )
-    Gesamtbilanz_Euro: float = Field(
-        description="The total balance of revenues minus costs in euros."
-    )
-    Gesamteinnahmen_Euro: float = Field(description="The total revenues in euros.")
-    Gesamtkosten_Euro: float = Field(description="The total costs in euros.")
-    Home_appliance_wh_per_hour: list[Optional[float]] = Field(
-        description="The energy consumption of a household appliance in watt-hours per hour."
-    )
-    Kosten_Euro_pro_Stunde: list[Optional[float]] = Field(
-        description="The costs in euros per hour."
-    )
-    Netzbezug_Wh_pro_Stunde: list[Optional[float]] = Field(
-        description="The grid energy drawn in watt-hours per hour."
-    )
-    Netzeinspeisung_Wh_pro_Stunde: list[Optional[float]] = Field(
-        description="The energy fed into the grid in watt-hours per hour."
-    )
-    Verluste_Pro_Stunde: list[Optional[float]] = Field(
-        description="The losses in watt-hours per hour."
-    )
-    akku_soc_pro_stunde: list[Optional[float]] = Field(
-        description="The state of charge of the battery (not the EV) in percentage per hour."
-    )
-    Electricity_price: list[Optional[float]] = Field(
-        description="Used Electricity Price, including predictions"
-    )
-
-    @field_validator(
-        "Last_Wh_pro_Stunde",
-        "Netzeinspeisung_Wh_pro_Stunde",
-        "akku_soc_pro_stunde",
-        "Netzbezug_Wh_pro_Stunde",
-        "Kosten_Euro_pro_Stunde",
-        "Einnahmen_Euro_pro_Stunde",
-        "EAuto_SoC_pro_Stunde",
-        "Verluste_Pro_Stunde",
-        "Home_appliance_wh_per_hour",
-        "Electricity_price",
-        mode="before",
-    )
-    def convert_numpy(cls, field: Any) -> Any:
-        return NumpyEncoder.convert_numpy(field)[0]
+# The executor to execute the CPU heavy energy management run
+executor = ThreadPoolExecutor(max_workers=1)
 
 
 class EnergyManagement(SingletonMixin, ConfigMixin, PredictionMixin, PydanticBaseModel):
-    # Disable validation on assignment to speed up simulation runs.
-    model_config = ConfigDict(
-        validate_assignment=False,
-    )
+    """Energy management."""
 
     # Start datetime.
     _start_datetime: ClassVar[Optional[DateTime]] = None
 
     # last run datetime. Used by energy management task
-    _last_datetime: ClassVar[Optional[DateTime]] = None
+    _last_run_datetime: ClassVar[Optional[DateTime]] = None
+
+    # energy management plan of latest energy management run with optimization
+    _plan: ClassVar[Optional[EnergyManagementPlan]] = None
+
+    # opimization solution of the latest energy management run
+    _optimization_solution: ClassVar[Optional[OptimizationSolution]] = None
+
+    # Solution of the genetic algorithm of latest energy management run with optimization
+    # For classic API
+    _genetic_solution: ClassVar[Optional[GeneticSolution]] = None
+
+    # energy management lock (for energy management run)
+    _run_lock: ClassVar[Lock] = Lock()
 
     @computed_field  # type: ignore[prop-decorator]
     @property
@@ -127,9 +54,15 @@ class EnergyManagement(SingletonMixin, ConfigMixin, PredictionMixin, PydanticBas
             EnergyManagement.set_start_datetime()
         return EnergyManagement._start_datetime
 
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def last_run_datetime(self) -> Optional[DateTime]:
+        """The datetime the last energy management was run."""
+        return EnergyManagement._last_run_datetime
+
     @classmethod
     def set_start_datetime(cls, start_datetime: Optional[DateTime] = None) -> DateTime:
-        """Set the start datetime for the next energy management cycle.
+        """Set the start datetime for the next energy management run.
 
         If no datetime is provided, the current datetime is used.
 
@@ -148,142 +81,208 @@ class EnergyManagement(SingletonMixin, ConfigMixin, PredictionMixin, PydanticBas
         cls._start_datetime = start_datetime.set(minute=0, second=0, microsecond=0)
         return cls._start_datetime
 
-    # -------------------------
-    # TODO: Take from prediction
-    # -------------------------
+    @classmethod
+    def plan(cls) -> Optional[EnergyManagementPlan]:
+        """Get the latest energy management plan.
 
-    load_energy_array: Optional[NDArray[Shape["*"], float]] = Field(
-        default=None,
-        description="An array of floats representing the total load (consumption) in watts for different time intervals.",
-    )
-    pv_prediction_wh: Optional[NDArray[Shape["*"], float]] = Field(
-        default=None,
-        description="An array of floats representing the forecasted photovoltaic output in watts for different time intervals.",
-    )
-    elect_price_hourly: Optional[NDArray[Shape["*"], float]] = Field(
-        default=None,
-        description="An array of floats representing the electricity price in euros per watt-hour for different time intervals.",
-    )
-    elect_revenue_per_hour_arr: Optional[NDArray[Shape["*"], float]] = Field(
-        default=None,
-        description="An array of floats representing the feed-in compensation in euros per watt-hour.",
-    )
+        Returns:
+            Optional[EnergyManagementPlan]: The latest energy management plan or None.
+        """
+        return cls._plan
 
-    # -------------------------
-    # TODO: Move to devices
-    # -------------------------
+    @classmethod
+    def optimization_solution(cls) -> Optional[OptimizationSolution]:
+        """Get the latest optimization solution.
 
-    battery: Optional[Battery] = Field(default=None, description="TBD.")
-    ev: Optional[Battery] = Field(default=None, description="TBD.")
-    home_appliance: Optional[HomeAppliance] = Field(default=None, description="TBD.")
-    inverter: Optional[Inverter] = Field(default=None, description="TBD.")
+        Returns:
+            Optional[OptimizationSolution]: The latest optimization solution.
+        """
+        return cls._optimization_solution
 
-    # -------------------------
-    # TODO: Move to devices
-    # -------------------------
+    @classmethod
+    def genetic_solution(cls) -> Optional[GeneticSolution]:
+        """Get the latest solution of the genetic algorithm.
 
-    ac_charge_hours: Optional[NDArray[Shape["*"], float]] = Field(default=None, description="TBD")
-    dc_charge_hours: Optional[NDArray[Shape["*"], float]] = Field(default=None, description="TBD")
-    ev_charge_hours: Optional[NDArray[Shape["*"], float]] = Field(default=None, description="TBD")
+        Returns:
+            Optional[GeneticSolution]: The latest solution of the genetic algorithm.
+        """
+        return cls._genetic_solution
 
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
-        if hasattr(self, "_initialized"):
-            return
-        super().__init__(*args, **kwargs)
-
-    def set_parameters(
-        self,
-        parameters: EnergyManagementParameters,
-        ev: Optional[Battery] = None,
-        home_appliance: Optional[HomeAppliance] = None,
-        inverter: Optional[Inverter] = None,
-    ) -> None:
-        self.load_energy_array = np.array(parameters.gesamtlast, float)
-        self.pv_prediction_wh = np.array(parameters.pv_prognose_wh, float)
-        self.elect_price_hourly = np.array(parameters.strompreis_euro_pro_wh, float)
-        self.elect_revenue_per_hour_arr = (
-            parameters.einspeiseverguetung_euro_pro_wh
-            if isinstance(parameters.einspeiseverguetung_euro_pro_wh, list)
-            else np.full(
-                len(self.load_energy_array), parameters.einspeiseverguetung_euro_pro_wh, float
-            )
-        )
-        if inverter:
-            self.battery = inverter.battery
-        else:
-            self.battery = None
-        self.ev = ev
-        self.home_appliance = home_appliance
-        self.inverter = inverter
-        self.ac_charge_hours = np.full(self.config.prediction.hours, 0.0)
-        self.dc_charge_hours = np.full(self.config.prediction.hours, 1.0)
-        self.ev_charge_hours = np.full(self.config.prediction.hours, 0.0)
-
-    def set_akku_discharge_hours(self, ds: np.ndarray) -> None:
-        if self.battery:
-            self.battery.set_discharge_per_hour(ds)
-
-    def set_akku_ac_charge_hours(self, ds: np.ndarray) -> None:
-        self.ac_charge_hours = ds
-
-    def set_akku_dc_charge_hours(self, ds: np.ndarray) -> None:
-        self.dc_charge_hours = ds
-
-    def set_ev_charge_hours(self, ds: np.ndarray) -> None:
-        self.ev_charge_hours = ds
-
-    def set_home_appliance_start(self, ds: int, global_start_hour: int = 0) -> None:
-        if self.home_appliance:
-            self.home_appliance.set_starting_time(ds, global_start_hour=global_start_hour)
-
-    def reset(self) -> None:
-        if self.ev:
-            self.ev.reset()
-        if self.battery:
-            self.battery.reset()
-
-    def run(
-        self,
-        start_hour: Optional[int] = None,
+    @classmethod
+    def _run(
+        cls,
+        start_datetime: Optional[DateTime] = None,
+        mode: Optional[EnergyManagementMode] = None,
+        genetic_parameters: Optional[GeneticOptimizationParameters] = None,
+        genetic_individuals: Optional[int] = None,
+        genetic_seed: Optional[int] = None,
         force_enable: Optional[bool] = False,
         force_update: Optional[bool] = False,
     ) -> None:
-        """Run energy management.
+        """Run the energy management.
 
-        Sets `start_datetime` to current hour, updates the configuration and the prediction, and
-        starts simulation at current hour.
+        This method initializes the energy management run by setting its
+        start datetime, updating predictions, and optionally starting
+        optimization depending on the selected mode or configuration.
 
         Args:
-            start_hour (int, optional): Hour to take as start time for the energy management. Defaults
-            to now.
-            force_enable (bool, optional): If True, forces to update even if disabled. This
-            is mostly relevant to prediction providers.
-            force_update (bool, optional): If True, forces to update the data even if still cached.
+            start_datetime (DateTime, optional): The starting timestamp
+                of the energy management run. Defaults to the current datetime
+                if not provided.
+            mode (EnergyManagementMode, optional): The management mode to use. Must be one of:
+                - "OPTIMIZATION": Runs the optimization process.
+                - "PREDICTION": Updates the forecast without optimization.
+
+                Defaults to the mode defined in the current configuration.
+            genetic_parameters (GeneticOptimizationParameters, optional): The
+                parameter set for the genetic algorithm. If not provided, it will
+                be constructed based on the current configuration and predictions.
+            genetic_individuals (int, optional): The number of individuals for the
+                genetic algorithm. Defaults to the algorithm's internal default (400)
+                if not specified.
+            genetic_seed (int, optional): The seed for the genetic algorithm. Defaults
+                to the algorithm's internal random seed if not specified.
+            force_enable (bool, optional): If True, bypasses any disabled state
+                to force the update process. This is mostly applicable to
+                prediction providers.
+            force_update (bool, optional): If True, forces data to be refreshed
+                even if a cached version is still valid.
+
+        Returns:
+            None
         """
-        # Throw away any cached results of the last run.
-        CacheUntilUpdateStore().clear()
-        self.set_start_hour(start_hour=start_hour)
+        # Ensure there is only one optimization/ energy management run at a time
+        if mode not in (None, "PREDICTION", "OPTIMIZATION"):
+            raise ValueError(f"Unknown energy management mode {mode}.")
 
-        # Check for run definitions
-        if self.start_datetime is None:
-            error_msg = "Start datetime unknown."
-            logger.error(error_msg)
-            raise ValueError(error_msg)
-        if self.config.prediction.hours is None:
-            error_msg = "Prediction hours unknown."
-            logger.error(error_msg)
-            raise ValueError(error_msg)
-        if self.config.optimization.hours is None:
-            error_msg = "Optimization hours unknown."
-            logger.error(error_msg)
-            raise ValueError(error_msg)
+        logger.info("Starting energy management run.")
 
-        self.prediction.update_data(force_enable=force_enable, force_update=force_update)
-        # TODO: Create optimisation problem that calls into devices.update_data() for simulations.
+        # Remember/ set the start datetime of this energy management run.
+        # None leads
+        cls.set_start_datetime(start_datetime)
 
-        logger.info("Energy management run (crippled version - prediction update only)")
+        # Throw away any memory cached results of the last energy management run.
+        CacheEnergyManagementStore().clear()
 
-    def manage_energy(self) -> None:
+        if mode is None:
+            mode = cls.config.ems.mode
+        if mode is None or mode == "PREDICTION":
+            # Update the predictions
+            cls.prediction.update_data(force_enable=force_enable, force_update=force_update)
+            logger.info("Energy management run done (predictions updated)")
+            return
+
+        # Prepare optimization parameters
+        # This also creates default configurations for missing values and updates the predictions
+        logger.info(
+            "Starting energy management prediction update and optimzation parameter preparation."
+        )
+        if genetic_parameters is None:
+            genetic_parameters = GeneticOptimizationParameters.prepare()
+
+        if not genetic_parameters:
+            logger.error(
+                "Energy management run canceled. Could not prepare optimisation parameters."
+            )
+            return
+
+        # Take values from config if not given
+        if genetic_individuals is None:
+            genetic_individuals = cls.config.optimization.genetic.individuals
+        if genetic_seed is None:
+            genetic_seed = cls.config.optimization.genetic.seed
+
+        if cls._start_datetime is None:  # Make mypy happy - already set by us
+            raise RuntimeError("Start datetime not set.")
+
+        logger.info("Starting energy management optimization.")
+        try:
+            optimization = GeneticOptimization(
+                verbose=bool(cls.config.server.verbose),
+                fixed_seed=genetic_seed,
+            )
+            solution = optimization.optimierung_ems(
+                start_hour=cls._start_datetime.hour,
+                parameters=genetic_parameters,
+                ngen=genetic_individuals,
+            )
+        except:
+            logger.exception("Energy management optimization failed.")
+            return
+
+        # Make genetic solution public
+        cls._genetic_solution = solution
+
+        # Make optimization solution public
+        cls._optimization_solution = solution.optimization_solution()
+
+        # Make plan public
+        cls._plan = solution.energy_management_plan()
+
+        logger.debug("Energy management genetic solution:\n{}", cls._genetic_solution)
+        logger.debug("Energy management optimization solution:\n{}", cls._optimization_solution)
+        logger.debug("Energy management plan:\n{}", cls._plan)
+        logger.info("Energy management run done (optimization updated)")
+
+    async def run(
+        self,
+        start_datetime: Optional[DateTime] = None,
+        mode: Optional[EnergyManagementMode] = None,
+        genetic_parameters: Optional[GeneticOptimizationParameters] = None,
+        genetic_individuals: Optional[int] = None,
+        genetic_seed: Optional[int] = None,
+        force_enable: Optional[bool] = False,
+        force_update: Optional[bool] = False,
+    ) -> None:
+        """Run the energy management.
+
+        This method initializes the energy management run by setting its
+        start datetime, updating predictions, and optionally starting
+        optimization depending on the selected mode or configuration.
+
+        Args:
+            start_datetime (DateTime, optional): The starting timestamp
+                of the energy management run. Defaults to the current datetime
+                if not provided.
+            mode (EnergyManagementMode, optional): The management mode to use. Must be one of:
+                - "OPTIMIZATION": Runs the optimization process.
+                - "PREDICTION": Updates the forecast without optimization.
+
+                Defaults to the mode defined in the current configuration.
+            genetic_parameters (GeneticOptimizationParameters, optional): The
+                parameter set for the genetic algorithm. If not provided, it will
+                be constructed based on the current configuration and predictions.
+            genetic_individuals (int, optional): The number of individuals for the
+                genetic algorithm. Defaults to the algorithm's internal default (400)
+                if not specified.
+            genetic_seed (int, optional): The seed for the genetic algorithm. Defaults
+                to the algorithm's internal random seed if not specified.
+            force_enable (bool, optional): If True, bypasses any disabled state
+                to force the update process. This is mostly applicable to
+                prediction providers.
+            force_update (bool, optional): If True, forces data to be refreshed
+                even if a cached version is still valid.
+
+        Returns:
+            None
+        """
+        async with self._run_lock:
+            loop = get_running_loop()
+            # Create a partial function with parameters "baked in"
+            func = partial(
+                EnergyManagement._run,
+                start_datetime=start_datetime,
+                mode=mode,
+                genetic_parameters=genetic_parameters,
+                genetic_individuals=genetic_individuals,
+                genetic_seed=genetic_seed,
+                force_enable=force_enable,
+                force_update=force_update,
+            )
+            # Run optimization in background thread to avoid blocking event loop
+            await loop.run_in_executor(executor, func)
+
+    async def manage_energy(self) -> None:
         """Repeating task for managing energy.
 
         This task should be executed by the server regularly (e.g., every 10 seconds)
@@ -304,13 +303,13 @@ class EnergyManagement(SingletonMixin, ConfigMixin, PredictionMixin, PydanticBas
         current_datetime = to_datetime()
         interval = self.config.ems.interval  # interval maybe changed in between
 
-        if EnergyManagement._last_datetime is None:
+        if EnergyManagement._last_run_datetime is None:
             # Never run before
             try:
                 # Remember energy run datetime.
-                EnergyManagement._last_datetime = current_datetime
+                EnergyManagement._last_run_datetime = current_datetime
                 # Try to run a first energy management. May fail due to config incomplete.
-                self.run()
+                await self.run()
             except Exception as e:
                 trace = "".join(traceback.TracebackException.from_exception(e).format())
                 message = f"EOS init: {e}\n{trace}"
@@ -322,14 +321,14 @@ class EnergyManagement(SingletonMixin, ConfigMixin, PredictionMixin, PydanticBas
             return
 
         if (
-            compare_datetimes(current_datetime, EnergyManagement._last_datetime).time_diff
+            compare_datetimes(current_datetime, EnergyManagement._last_run_datetime).time_diff
             < interval
         ):
             # Wait for next run
             return
 
         try:
-            self.run()
+            await self.run()
         except Exception as e:
             trace = "".join(traceback.TracebackException.from_exception(e).format())
             message = f"EOS run: {e}\n{trace}"
@@ -337,186 +336,12 @@ class EnergyManagement(SingletonMixin, ConfigMixin, PredictionMixin, PydanticBas
 
         # Remember the energy management run - keep on interval even if we missed some intervals
         while (
-            compare_datetimes(current_datetime, EnergyManagement._last_datetime).time_diff
+            compare_datetimes(current_datetime, EnergyManagement._last_run_datetime).time_diff
             >= interval
         ):
-            EnergyManagement._last_datetime = EnergyManagement._last_datetime.add(seconds=interval)
-
-    def set_start_hour(self, start_hour: Optional[int] = None) -> None:
-        """Sets start datetime to given hour.
-
-        Args:
-            start_hour (int, optional): Hour to take as start time for the energy management. Defaults
-            to now.
-        """
-        if start_hour is None:
-            self.set_start_datetime()
-        else:
-            start_datetime = to_datetime().set(hour=start_hour, minute=0, second=0, microsecond=0)
-            self.set_start_datetime(start_datetime)
-
-    def simulate_start_now(self) -> dict[str, Any]:
-        start_hour = to_datetime().now().hour
-        return self.simulate(start_hour)
-
-    def simulate(self, start_hour: int) -> dict[str, Any]:
-        """Simulate energy usage and costs for the given start hour.
-
-        akku_soc_pro_stunde begin of the hour, initial hour state!
-        last_wh_pro_stunde integral of last hour (end state)
-        """
-        # Check for simulation integrity
-        required_attrs = [
-            "load_energy_array",
-            "pv_prediction_wh",
-            "elect_price_hourly",
-            "ev_charge_hours",
-            "ac_charge_hours",
-            "dc_charge_hours",
-            "elect_revenue_per_hour_arr",
-        ]
-        missing_data = [
-            attr.replace("_", " ").title() for attr in required_attrs if getattr(self, attr) is None
-        ]
-
-        if missing_data:
-            logger.error("Mandatory data missing - %s", ", ".join(missing_data))
-            raise ValueError(f"Mandatory data missing: {', '.join(missing_data)}")
-
-        # Pre-fetch data
-        load_energy_array = np.array(self.load_energy_array)
-        pv_prediction_wh = np.array(self.pv_prediction_wh)
-        elect_price_hourly = np.array(self.elect_price_hourly)
-        ev_charge_hours = np.array(self.ev_charge_hours)
-        ac_charge_hours = np.array(self.ac_charge_hours)
-        dc_charge_hours = np.array(self.dc_charge_hours)
-        elect_revenue_per_hour_arr = np.array(self.elect_revenue_per_hour_arr)
-
-        # Fetch objects
-        battery = self.battery
-        if battery is None:
-            raise ValueError(f"battery not set: {battery}")
-        ev = self.ev
-        home_appliance = self.home_appliance
-        inverter = self.inverter
-
-        if not (len(load_energy_array) == len(pv_prediction_wh) == len(elect_price_hourly)):
-            error_msg = f"Array sizes do not match: Load Curve = {len(load_energy_array)}, PV Forecast = {len(pv_prediction_wh)}, Electricity Price = {len(elect_price_hourly)}"
-            logger.error(error_msg)
-            raise ValueError(error_msg)
-
-        end_hour = len(load_energy_array)
-        total_hours = end_hour - start_hour
-
-        # Pre-allocate arrays for the results, optimized for speed
-        loads_energy_per_hour = np.full((total_hours), np.nan)
-        feedin_energy_per_hour = np.full((total_hours), np.nan)
-        consumption_energy_per_hour = np.full((total_hours), np.nan)
-        costs_per_hour = np.full((total_hours), np.nan)
-        revenue_per_hour = np.full((total_hours), np.nan)
-        soc_per_hour = np.full((total_hours), np.nan)
-        soc_ev_per_hour = np.full((total_hours), np.nan)
-        losses_wh_per_hour = np.full((total_hours), np.nan)
-        home_appliance_wh_per_hour = np.full((total_hours), np.nan)
-        electricity_price_per_hour = np.full((total_hours), np.nan)
-
-        # Set initial state
-        soc_per_hour[0] = battery.current_soc_percentage()
-        if ev:
-            soc_ev_per_hour[0] = ev.current_soc_percentage()
-
-        for hour in range(start_hour, end_hour):
-            hour_idx = hour - start_hour
-
-            # save begin states
-            soc_per_hour[hour_idx] = battery.current_soc_percentage()
-
-            if ev:
-                soc_ev_per_hour[hour_idx] = ev.current_soc_percentage()
-
-            # Accumulate loads and PV generation
-            consumption = load_energy_array[hour]
-            losses_wh_per_hour[hour_idx] = 0.0
-
-            # Home appliances
-            if home_appliance:
-                ha_load = home_appliance.get_load_for_hour(hour)
-                consumption += ha_load
-                home_appliance_wh_per_hour[hour_idx] = ha_load
-
-            # E-Auto handling
-            if ev and ev_charge_hours[hour] > 0:
-                loaded_energy_ev, verluste_eauto = ev.charge_energy(
-                    None, hour, relative_power=ev_charge_hours[hour]
+            EnergyManagement._last_run_datetime = EnergyManagement._last_run_datetime.add(
+                seconds=interval
             )
-                consumption += loaded_energy_ev
-                losses_wh_per_hour[hour_idx] += verluste_eauto
-
-            # Process inverter logic
-            energy_feedin_grid_actual = energy_consumption_grid_actual = losses = eigenverbrauch = (
-                0.0
-            )
-
-            hour_ac_charge = ac_charge_hours[hour]
-            hour_dc_charge = dc_charge_hours[hour]
-            hourly_electricity_price = elect_price_hourly[hour]
-            hourly_energy_revenue = elect_revenue_per_hour_arr[hour]
-
-            battery.set_charge_allowed_for_hour(hour_dc_charge, hour)
-
-            if inverter:
-                energy_produced = pv_prediction_wh[hour]
-                (
-                    energy_feedin_grid_actual,
-                    energy_consumption_grid_actual,
-                    losses,
-                    eigenverbrauch,
-                ) = inverter.process_energy(energy_produced, consumption, hour)
-
-            # AC PV Battery Charge
-            if hour_ac_charge > 0.0:
-                battery.set_charge_allowed_for_hour(1, hour)
-                battery_charged_energy_actual, battery_losses_actual = battery.charge_energy(
-                    None, hour, relative_power=hour_ac_charge
-                )
-
-                total_battery_energy = battery_charged_energy_actual + battery_losses_actual
-                consumption += total_battery_energy
-                energy_consumption_grid_actual += total_battery_energy
-                losses_wh_per_hour[hour_idx] += battery_losses_actual
-
-            # Update hourly arrays
-            feedin_energy_per_hour[hour_idx] = energy_feedin_grid_actual
-            consumption_energy_per_hour[hour_idx] = energy_consumption_grid_actual
-            losses_wh_per_hour[hour_idx] += losses
-            loads_energy_per_hour[hour_idx] = consumption
-            electricity_price_per_hour[hour_idx] = hourly_electricity_price
-
-            # Financial calculations
-            costs_per_hour[hour_idx] = energy_consumption_grid_actual * hourly_electricity_price
-            revenue_per_hour[hour_idx] = energy_feedin_grid_actual * hourly_energy_revenue
-
-        total_cost = np.nansum(costs_per_hour)
-        total_losses = np.nansum(losses_wh_per_hour)
-        total_revenue = np.nansum(revenue_per_hour)
-
-        # Prepare output dictionary
-        return {
-            "Last_Wh_pro_Stunde": loads_energy_per_hour,
-            "Netzeinspeisung_Wh_pro_Stunde": feedin_energy_per_hour,
-            "Netzbezug_Wh_pro_Stunde": consumption_energy_per_hour,
-            "Kosten_Euro_pro_Stunde": costs_per_hour,
-            "akku_soc_pro_stunde": soc_per_hour,
-            "Einnahmen_Euro_pro_Stunde": revenue_per_hour,
-            "Gesamtbilanz_Euro": total_cost - total_revenue,
-            "EAuto_SoC_pro_Stunde": soc_ev_per_hour,
-            "Gesamteinnahmen_Euro": total_revenue,
-            "Gesamtkosten_Euro": total_cost,
-            "Verluste_Pro_Stunde": losses_wh_per_hour,
-            "Gesamt_Verluste": total_losses,
-            "Home_appliance_wh_per_hour": home_appliance_wh_per_hour,
-            "Electricity_price": electricity_price_per_hour,
-        }
 
 
 # Initialize the Energy Management System, it is a singleton.

src/akkudoktoreos/core/emsettings.py

@@ -3,6 +3,7 @@
 Kept in an extra module to avoid cyclic dependencies on package import.
 """
 
+from enum import Enum
 from typing import Optional
 
 from pydantic import Field
@@ -10,6 +11,13 @@ from pydantic import Field
 from akkudoktoreos.config.configabc import SettingsBaseModel
 
 
+class EnergyManagementMode(str, Enum):
+    """Energy management mode."""
+
+    PREDICTION = "PREDICTION"
+    OPTIMIZATION = "OPTIMIZATION"
+
+
 class EnergyManagementCommonSettings(SettingsBaseModel):
     """Energy Management Configuration."""
 
@@ -24,3 +32,9 @@ class EnergyManagementCommonSettings(SettingsBaseModel):
         description="Intervall in seconds between EOS energy management runs.",
         examples=["300"],
     )
+
+    mode: Optional[EnergyManagementMode] = Field(
+        default=None,
+        description="Energy management mode [OPTIMIZATION | PREDICTION].",
+        examples=["OPTIMIZATION", "PREDICTION"],
+    )

src/akkudoktoreos/core/logging.py

@@ -42,6 +42,10 @@ class InterceptHandler(pylogging.Handler):
         Args:
             record (logging.LogRecord): A record object containing log message and metadata.
         """
+        # Skip DEBUG logs from matplotlib - very noisy
+        if record.name.startswith("matplotlib") and record.levelno <= pylogging.DEBUG:
+            return
+
         try:
             level = logger.level(record.levelname).name
         except AttributeError:

src/akkudoktoreos/core/logsettings.py

@@ -15,11 +15,6 @@ from akkudoktoreos.core.logabc import LOGGING_LEVELS
 class LoggingCommonSettings(SettingsBaseModel):
     """Logging Configuration."""
 
-    level: Optional[str] = Field(
-        default=None,
-        deprecated="This is deprecated. Use console_level and file_level instead.",
-    )
-
     console_level: Optional[str] = Field(
         default=None,
         description="Logging level when logging to console.",

src/akkudoktoreos/core/pydantic.py

@@ -14,7 +14,6 @@ Key Features:
 
 import inspect
 import json
-import re
 import uuid
 import weakref
 from copy import deepcopy
@@ -32,23 +31,20 @@ from typing import (
 from zoneinfo import ZoneInfo
 
 import pandas as pd
-import pendulum
 from loguru import logger
 from pandas.api.types import is_datetime64_any_dtype
 from pydantic import (
-    AwareDatetime,
     BaseModel,
     ConfigDict,
     Field,
     PrivateAttr,
     RootModel,
-    TypeAdapter,
     ValidationError,
     ValidationInfo,
     field_validator,
 )
 
-from akkudoktoreos.utils.datetimeutil import to_datetime, to_duration
+from akkudoktoreos.utils.datetimeutil import DateTime, to_datetime, to_duration
 
 # Global weakref dictionary to hold external state per model instance
 # Used as a workaround for PrivateAttr not working in e.g. Mixin Classes
@@ -56,49 +52,40 @@ _model_private_state: "weakref.WeakKeyDictionary[Union[PydanticBaseModel, Pydant
 
 
 def merge_models(source: BaseModel, update_dict: dict[str, Any]) -> dict[str, Any]:
-    def deep_update(source_dict: dict[str, Any], update_dict: dict[str, Any]) -> dict[str, Any]:
-        for key, value in source_dict.items():
-            if isinstance(value, dict) and isinstance(update_dict.get(key), dict):
-                update_dict[key] = deep_update(update_dict[key], value)
+    """Merge a Pydantic model instance with an update dictionary.
+
+    Values in update_dict (including None) override source values.
+    Nested dictionaries are merged recursively.
+    Lists in update_dict replace source lists entirely.
+
+    Args:
+        source (BaseModel): Pydantic model instance serving as the source.
+        update_dict (dict[str, Any]): Dictionary with updates to apply.
+
+    Returns:
+        dict[str, Any]: Merged dictionary representing combined model data.
+    """
+
+    def deep_merge(source_data: Any, update_data: Any) -> Any:
+        if isinstance(source_data, dict) and isinstance(update_data, dict):
+            merged = dict(source_data)
+            for key, update_value in update_data.items():
+                if key in merged:
+                    merged[key] = deep_merge(merged[key], update_value)
                 else:
-                update_dict[key] = value
-        return update_dict
+                    merged[key] = update_value
+            return merged
+
+        # If both are lists, replace source list with update list
+        if isinstance(source_data, list) and isinstance(update_data, list):
+            return update_data
+
+        # For other types or if update_data is None, override source_data
+        return update_data
 
     source_dict = source.model_dump(exclude_unset=True)
-    merged_dict = deep_update(source_dict, deepcopy(update_dict))
-
-    return merged_dict
-
-
-class PydanticTypeAdapterDateTime(TypeAdapter[pendulum.DateTime]):
-    """Custom type adapter for Pendulum DateTime fields."""
-
-    @classmethod
-    def serialize(cls, value: Any) -> str:
-        """Convert pendulum.DateTime to ISO 8601 string."""
-        if isinstance(value, pendulum.DateTime):
-            return value.to_iso8601_string()
-        raise ValueError(f"Expected pendulum.DateTime, got {type(value)}")
-
-    @classmethod
-    def deserialize(cls, value: Any) -> pendulum.DateTime:
-        """Convert ISO 8601 string to pendulum.DateTime."""
-        if isinstance(value, str) and cls.is_iso8601(value):
-            try:
-                return pendulum.parse(value)
-            except pendulum.parsing.exceptions.ParserError as e:
-                raise ValueError(f"Invalid date format: {value}") from e
-        elif isinstance(value, pendulum.DateTime):
-            return value
-        raise ValueError(f"Expected ISO 8601 string or pendulum.DateTime, got {type(value)}")
-
-    @staticmethod
-    def is_iso8601(value: str) -> bool:
-        """Check if the string is a valid ISO 8601 date string."""
-        iso8601_pattern = (
-            r"^(\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}:\d{2}(?:\.\d{1,3})?(?:Z|[+-]\d{2}:\d{2})?)$"
-        )
-        return bool(re.match(iso8601_pattern, value))
+    merged_result = deep_merge(source_dict, deepcopy(update_dict))
+    return merged_result
 
 
 class PydanticModelNestedValueMixin:
@@ -653,67 +640,9 @@ class PydanticBaseModel(PydanticModelNestedValueMixin, BaseModel):
         """
         return hash(self._uuid)
 
-    @field_validator("*", mode="before")
-    def validate_and_convert_pendulum(cls, value: Any, info: ValidationInfo) -> Any:
-        """Validator to convert fields of type `pendulum.DateTime`.
-
-        Converts fields to proper `pendulum.DateTime` objects, ensuring correct input types.
-
-        This method is invoked for every field before the field value is set. If the field's type
-        is `pendulum.DateTime`, it tries to convert string or timestamp values to `pendulum.DateTime`
-        objects. If the value cannot be converted, a validation error is raised.
-
-        Args:
-            value: The value to be assigned to the field.
-            info: Validation information for the field.
-
-        Returns:
-            The converted value, if successful.
-
-        Raises:
-            ValidationError: If the value cannot be converted to `pendulum.DateTime`.
-        """
-        # Get the field name and expected type
-        field_name = info.field_name
-        expected_type = cls.model_fields[field_name].annotation
-
-        # Convert
-        if expected_type is pendulum.DateTime or expected_type is AwareDatetime:
-            try:
-                value = to_datetime(value)
-            except Exception as e:
-                raise ValueError(f"Cannot convert {value!r} to datetime: {e}")
-        return value
-
-    # Override Pydantic’s serialization for all DateTime fields
-    def model_dump(
-        self, *args: Any, include_computed_fields: bool = True, **kwargs: Any
-    ) -> dict[str, Any]:
-        """Custom dump method to handle serialization for DateTime fields."""
-        result = super().model_dump(*args, **kwargs)
-
-        if not include_computed_fields:
-            for computed_field_name in self.model_computed_fields:
-                result.pop(computed_field_name, None)
-
-        for key, value in result.items():
-            if isinstance(value, pendulum.DateTime):
-                result[key] = PydanticTypeAdapterDateTime.serialize(value)
-        return result
-
-    @classmethod
-    def model_construct(
-        cls, _fields_set: set[str] | None = None, **values: Any
-    ) -> "PydanticBaseModel":
-        """Custom constructor to handle deserialization for DateTime fields."""
-        for key, value in values.items():
-            if isinstance(value, str) and PydanticTypeAdapterDateTime.is_iso8601(value):
-                values[key] = PydanticTypeAdapterDateTime.deserialize(value)
-        return super().model_construct(_fields_set, **values)
-
     def reset_to_defaults(self) -> "PydanticBaseModel":
         """Resets the fields to their default values."""
-        for field_name, field_info in self.model_fields.items():
+        for field_name, field_info in self.__class__.model_fields.items():
             if field_info.default_factory is not None:  # Handle fields with default_factory
                 default_value = field_info.default_factory()
             else:
@@ -725,6 +654,19 @@ class PydanticBaseModel(PydanticModelNestedValueMixin, BaseModel):
                 pass
         return self
 
+    # Override Pydantic’s serialization to include computed fields by default
+    def model_dump(
+        self, *args: Any, include_computed_fields: bool = True, **kwargs: Any
+    ) -> dict[str, Any]:
+        """Custom dump method to serialize computed fields by default."""
+        result = super().model_dump(*args, **kwargs)
+
+        if not include_computed_fields:
+            for computed_field_name in self.__class__.model_computed_fields:
+                result.pop(computed_field_name, None)
+
+        return result
+
     def to_dict(self) -> dict:
         """Convert this PredictionRecord instance to a dictionary representation.
 
@@ -793,7 +735,7 @@ class PydanticDateTimeData(RootModel):
         {
             "start_datetime": "2024-01-01 00:00:00",  # optional
             "interval": "1 Hour",                     # optional
-            "load_mean": [20.5, 21.0, 22.1],
+            "loadforecast_power_w": [20.5, 21.0, 22.1],
             "load_min": [18.5, 19.0, 20.1]
         }
     """
@@ -910,16 +852,27 @@ class PydanticDateTimeDataFrame(PydanticBaseModel):
         if not v:
             return v
 
-        valid_dtypes = {"int64", "float64", "bool", "datetime64[ns]", "object", "string"}
-        invalid_dtypes = set(v.values()) - valid_dtypes
-        if invalid_dtypes:
-            raise ValueError(f"Unsupported dtypes: {invalid_dtypes}")
+        # Allowed exact dtypes
+        valid_base_dtypes = {"int64", "float64", "bool", "object", "string"}
 
+        def is_valid_dtype(dtype: str) -> bool:
+            # Allow timezone-aware or naive datetime64
+            if dtype.startswith("datetime64[ns"):
+                return True
+            return dtype in valid_base_dtypes
+
+        invalid_dtypes = [dtype for dtype in v.values() if not is_valid_dtype(dtype)]
+        if invalid_dtypes:
+            raise ValueError(f"Unsupported dtypes: {set(invalid_dtypes)}")
+
+        # Cross-check with data column existence
         data = info.data.get("data", {})
         if data:
             columns = set(next(iter(data.values())).keys())
-            if not all(col in columns for col in v.keys()):
-                raise ValueError("dtype columns must exist in data columns")
+            missing_columns = set(v.keys()) - columns
+            if missing_columns:
+                raise ValueError(f"dtype columns must exist in data columns: {missing_columns}")
+
         return v
 
     def to_dataframe(self) -> pd.DataFrame:
@@ -927,7 +880,8 @@ class PydanticDateTimeDataFrame(PydanticBaseModel):
         df = pd.DataFrame.from_dict(self.data, orient="index")
 
         # Convert index to datetime
-        index = pd.Index([to_datetime(dt, in_timezone=self.tz) for dt in df.index])
+        # index = pd.Index([to_datetime(dt, in_timezone=self.tz) for dt in df.index])
+        index = [to_datetime(dt, in_timezone=self.tz) for dt in df.index]
         df.index = index
 
         # Check if 'date_time' column exists, if not, create it
@@ -943,8 +897,8 @@ class PydanticDateTimeDataFrame(PydanticBaseModel):
 
         # Apply dtypes
         for col, dtype in self.dtypes.items():
-            if dtype == "datetime64[ns]":
-                df[col] = pd.to_datetime(to_datetime(df[col], in_timezone=self.tz))
+            if dtype.startswith("datetime64[ns"):
+                df[col] = pd.to_datetime(df[col], utc=True)
             elif dtype in dtype_mapping.keys():
                 df[col] = df[col].astype(dtype_mapping[dtype])
             else:
@@ -969,6 +923,132 @@ class PydanticDateTimeDataFrame(PydanticBaseModel):
             datetime_columns=datetime_columns,
         )
 
+    # --- Direct Manipulation Methods ---
+
+    def _normalize_index(self, index: str | DateTime) -> str:
+        """Normalize index into timezone-aware datetime string.
+
+        Args:
+            index (str | DateTime): A datetime-like value.
+
+        Returns:
+            str: Normalized datetime string based on model timezone.
+        """
+        return to_datetime(index, as_string=True, in_timezone=self.tz)
+
+    def add_row(self, index: str | DateTime, row: Dict[str, Any]) -> None:
+        """Add a new row to the dataset.
+
+        Args:
+            index (str | DateTime): Timestamp of the new row.
+            row (Dict[str, Any]): Dictionary of column values. Must match existing columns.
+
+        Raises:
+            ValueError: If row does not contain the exact same columns as existing rows.
+        """
+        idx = self._normalize_index(index)
+
+        if self.data:
+            existing_cols = set(next(iter(self.data.values())).keys())
+            if set(row.keys()) != existing_cols:
+                raise ValueError(f"Row must have exactly these columns: {existing_cols}")
+        self.data[idx] = row
+
+    def update_row(self, index: str | DateTime, updates: Dict[str, Any]) -> None:
+        """Update values for an existing row.
+
+        Args:
+            index (str | DateTime): Timestamp of the row to modify.
+            updates (Dict[str, Any]): Key/value pairs of columns to update.
+
+        Raises:
+            KeyError: If row or column does not exist.
+        """
+        idx = self._normalize_index(index)
+        if idx not in self.data:
+            raise KeyError(f"Row {idx} not found")
+        for col, value in updates.items():
+            if col not in self.data[idx]:
+                raise KeyError(f"Column {col} does not exist")
+            self.data[idx][col] = value
+
+    def delete_row(self, index: str | DateTime) -> None:
+        """Delete a row from the dataset.
+
+        Args:
+            index (str | DateTime): Timestamp of the row to delete.
+        """
+        idx = self._normalize_index(index)
+        if idx in self.data:
+            del self.data[idx]
+
+    def set_value(self, index: str | DateTime, column: str, value: Any) -> None:
+        """Set a single cell value.
+
+        Args:
+            index (str | datetime): Timestamp of the row.
+            column (str): Column name.
+            value (Any): New value.
+        """
+        self.update_row(index, {column: value})
+
+    def get_value(self, index: str | DateTime, column: str) -> Any:
+        """Retrieve a single cell value.
+
+        Args:
+            index (str | DateTime): Timestamp of the row.
+            column (str): Column name.
+
+        Returns:
+            Any: Value stored at the given location.
+        """
+        idx = self._normalize_index(index)
+        return self.data[idx][column]
+
+    def add_column(self, name: str, default: Any = None, dtype: Optional[str] = None) -> None:
+        """Add a new column to all rows.
+
+        Args:
+            name (str): Name of the column to add.
+            default (Any, optional): Default value for all rows. Defaults to None.
+            dtype (Optional[str], optional): Declared data type. Defaults to None.
+        """
+        for row in self.data.values():
+            row[name] = default
+        if dtype:
+            self.dtypes[name] = dtype
+
+    def rename_column(self, old: str, new: str) -> None:
+        """Rename a column across all rows.
+
+        Args:
+            old (str): Existing column name.
+            new (str): New column name.
+
+        Raises:
+            KeyError: If column does not exist.
+        """
+        for row in self.data.values():
+            if old not in row:
+                raise KeyError(f"Column {old} does not exist")
+            row[new] = row.pop(old)
+        if old in self.dtypes:
+            self.dtypes[new] = self.dtypes.pop(old)
+        if old in self.datetime_columns:
+            self.datetime_columns = [new if c == old else c for c in self.datetime_columns]
+
+    def drop_column(self, name: str) -> None:
+        """Remove a column from all rows.
+
+        Args:
+            name (str): Column to remove.
+        """
+        for row in self.data.values():
+            if name in row:
+                del row[name]
+        self.dtypes.pop(name, None)
+        self.datetime_columns = [c for c in self.datetime_columns if c != name]
+
 
 class PydanticDateTimeSeries(PydanticBaseModel):
     """Pydantic model for validating pandas Series with datetime index in JSON format.
@@ -1068,10 +1148,6 @@ class PydanticDateTimeSeries(PydanticBaseModel):
         )
 
 
-class ParametersBaseModel(PydanticBaseModel):
-    model_config = ConfigDict(extra="forbid")
-
-
 def set_private_attr(
     model: Union[PydanticBaseModel, PydanticModelNestedValueMixin], key: str, value: Any
 ) -> None:

src/akkudoktoreos/core/version.py

@@ -0,0 +1,5 @@
+"""Version information for akkudoktoreos."""
+
+# For development add `+dev` to previous release
+# For release omit `+dev`.
+__version__ = "0.2.0"

src/akkudoktoreos/data/default.config.json

@@ -1,2 +1,5 @@
 {
+  "general": {
+    "version": "0.2.0"
+  }
 }

src/akkudoktoreos/devices/battery.py

@@ -1,247 +0,0 @@
-from typing import Any, Optional
-
-import numpy as np
-from pydantic import Field, field_validator
-
-from akkudoktoreos.devices.devicesabc import (
-    DeviceBase,
-    DeviceOptimizeResult,
-    DeviceParameters,
-)
-from akkudoktoreos.utils.utils import NumpyEncoder
-
-
-def max_charging_power_field(description: Optional[str] = None) -> float:
-    if description is None:
-        description = "Maximum charging power in watts."
-    return Field(
-        default=5000,
-        gt=0,
-        description=description,
-    )
-
-
-def initial_soc_percentage_field(description: str) -> int:
-    return Field(default=0, ge=0, le=100, description=description, examples=[42])
-
-
-def discharging_efficiency_field(default_value: float) -> float:
-    return Field(
-        default=default_value,
-        gt=0,
-        le=1,
-        description="A float representing the discharge efficiency of the battery.",
-    )
-
-
-class BaseBatteryParameters(DeviceParameters):
-    """Battery Device Simulation Configuration."""
-
-    device_id: str = Field(description="ID of battery", examples=["battery1"])
-    capacity_wh: int = Field(
-        gt=0,
-        description="An integer representing the capacity of the battery in watt-hours.",
-        examples=[8000],
-    )
-    charging_efficiency: float = Field(
-        default=0.88,
-        gt=0,
-        le=1,
-        description="A float representing the charging efficiency of the battery.",
-    )
-    discharging_efficiency: float = discharging_efficiency_field(0.88)
-    max_charge_power_w: Optional[float] = max_charging_power_field()
-    initial_soc_percentage: int = initial_soc_percentage_field(
-        "An integer representing the state of charge of the battery at the **start** of the current hour (not the current state)."
-    )
-    min_soc_percentage: int = Field(
-        default=0,
-        ge=0,
-        le=100,
-        description="An integer representing the minimum state of charge (SOC) of the battery in percentage.",
-        examples=[10],
-    )
-    max_soc_percentage: int = Field(
-        default=100,
-        ge=0,
-        le=100,
-        description="An integer representing the maximum state of charge (SOC) of the battery in percentage.",
-    )
-
-
-class SolarPanelBatteryParameters(BaseBatteryParameters):
-    max_charge_power_w: Optional[float] = max_charging_power_field()
-
-
-class ElectricVehicleParameters(BaseBatteryParameters):
-    """Battery Electric Vehicle Device Simulation Configuration."""
-
-    device_id: str = Field(description="ID of electric vehicle", examples=["ev1"])
-    discharging_efficiency: float = discharging_efficiency_field(1.0)
-    initial_soc_percentage: int = initial_soc_percentage_field(
-        "An integer representing the current state of charge (SOC) of the battery in percentage."
-    )
-
-
-class ElectricVehicleResult(DeviceOptimizeResult):
-    """Result class containing information related to the electric vehicle's charging and discharging behavior."""
-
-    device_id: str = Field(description="ID of electric vehicle", examples=["ev1"])
-    charge_array: list[float] = Field(
-        description="Hourly charging status (0 for no charging, 1 for charging)."
-    )
-    discharge_array: list[int] = Field(
-        description="Hourly discharging status (0 for no discharging, 1 for discharging)."
-    )
-    discharging_efficiency: float = Field(description="The discharge efficiency as a float..")
-    capacity_wh: int = Field(description="Capacity of the EV’s battery in watt-hours.")
-    charging_efficiency: float = Field(description="Charging efficiency as a float..")
-    max_charge_power_w: int = Field(description="Maximum charging power in watts.")
-    soc_wh: float = Field(
-        description="State of charge of the battery in watt-hours at the start of the simulation."
-    )
-    initial_soc_percentage: int = Field(
-        description="State of charge at the start of the simulation in percentage."
-    )
-
-    @field_validator("discharge_array", "charge_array", mode="before")
-    def convert_numpy(cls, field: Any) -> Any:
-        return NumpyEncoder.convert_numpy(field)[0]
-
-
-class Battery(DeviceBase):
-    """Represents a battery device with methods to simulate energy charging and discharging."""
-
-    def __init__(self, parameters: Optional[BaseBatteryParameters] = None):
-        self.parameters: Optional[BaseBatteryParameters] = None
-        super().__init__(parameters)
-
-    def _setup(self) -> None:
-        """Sets up the battery parameters based on configuration or provided parameters."""
-        if self.parameters is None:
-            raise ValueError(f"Parameters not set: {self.parameters}")
-        self.capacity_wh = self.parameters.capacity_wh
-        self.initial_soc_percentage = self.parameters.initial_soc_percentage
-        self.charging_efficiency = self.parameters.charging_efficiency
-        self.discharging_efficiency = self.parameters.discharging_efficiency
-
-        # Only assign for storage battery
-        self.min_soc_percentage = (
-            self.parameters.min_soc_percentage
-            if isinstance(self.parameters, SolarPanelBatteryParameters)
-            else 0
-        )
-        self.max_soc_percentage = self.parameters.max_soc_percentage
-
-        # Initialize state of charge
-        if self.parameters.max_charge_power_w is not None:
-            self.max_charge_power_w = self.parameters.max_charge_power_w
-        else:
-            self.max_charge_power_w = self.capacity_wh  # TODO this should not be equal capacity_wh
-        self.discharge_array = np.full(self.hours, 1)
-        self.charge_array = np.full(self.hours, 1)
-        self.soc_wh = (self.initial_soc_percentage / 100) * self.capacity_wh
-        self.min_soc_wh = (self.min_soc_percentage / 100) * self.capacity_wh
-        self.max_soc_wh = (self.max_soc_percentage / 100) * self.capacity_wh
-
-    def to_dict(self) -> dict[str, Any]:
-        """Converts the object to a dictionary representation."""
-        return {
-            "device_id": self.device_id,
-            "capacity_wh": self.capacity_wh,
-            "initial_soc_percentage": self.initial_soc_percentage,
-            "soc_wh": self.soc_wh,
-            "hours": self.hours,
-            "discharge_array": self.discharge_array,
-            "charge_array": self.charge_array,
-            "charging_efficiency": self.charging_efficiency,
-            "discharging_efficiency": self.discharging_efficiency,
-            "max_charge_power_w": self.max_charge_power_w,
-        }
-
-    def reset(self) -> None:
-        """Resets the battery state to its initial values."""
-        self.soc_wh = (self.initial_soc_percentage / 100) * self.capacity_wh
-        self.soc_wh = min(max(self.soc_wh, self.min_soc_wh), self.max_soc_wh)
-        self.discharge_array = np.full(self.hours, 1)
-        self.charge_array = np.full(self.hours, 1)
-
-    def set_discharge_per_hour(self, discharge_array: np.ndarray) -> None:
-        """Sets the discharge values for each hour."""
-        if len(discharge_array) != self.hours:
-            raise ValueError(f"Discharge array must have exactly {self.hours} elements.")
-        self.discharge_array = np.array(discharge_array)
-
-    def set_charge_per_hour(self, charge_array: np.ndarray) -> None:
-        """Sets the charge values for each hour."""
-        if len(charge_array) != self.hours:
-            raise ValueError(f"Charge array must have exactly {self.hours} elements.")
-        self.charge_array = np.array(charge_array)
-
-    def set_charge_allowed_for_hour(self, charge: float, hour: int) -> None:
-        """Sets the charge for a specific hour."""
-        if hour >= self.hours:
-            raise ValueError(f"Hour {hour} is out of range. Must be less than {self.hours}.")
-        self.charge_array[hour] = charge
-
-    def current_soc_percentage(self) -> float:
-        """Calculates the current state of charge in percentage."""
-        return (self.soc_wh / self.capacity_wh) * 100
-
-    def discharge_energy(self, wh: float, hour: int) -> tuple[float, float]:
-        """Discharges energy from the battery."""
-        if self.discharge_array[hour] == 0:
-            return 0.0, 0.0
-
-        max_possible_discharge_wh = (self.soc_wh - self.min_soc_wh) * self.discharging_efficiency
-        max_possible_discharge_wh = max(max_possible_discharge_wh, 0.0)
-
-        max_possible_discharge_wh = min(
-            max_possible_discharge_wh, self.max_charge_power_w
-        )  # TODO make a new cfg variable max_discharge_power_w
-
-        actual_discharge_wh = min(wh, max_possible_discharge_wh)
-        actual_withdrawal_wh = (
-            actual_discharge_wh / self.discharging_efficiency
-            if self.discharging_efficiency > 0
-            else 0.0
-        )
-
-        self.soc_wh -= actual_withdrawal_wh
-        self.soc_wh = max(self.soc_wh, self.min_soc_wh)
-
-        losses_wh = actual_withdrawal_wh - actual_discharge_wh
-        return actual_discharge_wh, losses_wh
-
-    def charge_energy(
-        self, wh: Optional[float], hour: int, relative_power: float = 0.0
-    ) -> tuple[float, float]:
-        """Charges energy into the battery."""
-        if hour is not None and self.charge_array[hour] == 0:
-            return 0.0, 0.0  # Charging not allowed in this hour
-
-        if relative_power > 0.0:
-            wh = self.max_charge_power_w * relative_power
-
-        wh = wh if wh is not None else self.max_charge_power_w
-
-        max_possible_charge_wh = (
-            (self.max_soc_wh - self.soc_wh) / self.charging_efficiency
-            if self.charging_efficiency > 0
-            else 0.0
-        )
-        max_possible_charge_wh = max(max_possible_charge_wh, 0.0)
-
-        effective_charge_wh = min(wh, max_possible_charge_wh)
-        charged_wh = effective_charge_wh * self.charging_efficiency
-
-        self.soc_wh += charged_wh
-        self.soc_wh = min(self.soc_wh, self.max_soc_wh)
-
-        losses_wh = effective_charge_wh - charged_wh
-        return charged_wh, losses_wh
-
-    def current_energy_content(self) -> float:
-        """Returns the current usable energy in the battery."""
-        usable_energy = (self.soc_wh - self.min_soc_wh) * self.discharging_efficiency
-        return max(usable_energy, 0.0)

src/akkudoktoreos/devices/devices.py

@@ -1,49 +1,418 @@
-from typing import Optional
+"""General configuration settings for simulated devices for optimization."""
 
-from akkudoktoreos.core.coreabc import SingletonMixin
-from akkudoktoreos.devices.battery import Battery
-from akkudoktoreos.devices.devicesabc import DevicesBase
-from akkudoktoreos.devices.generic import HomeAppliance
-from akkudoktoreos.devices.inverter import Inverter
-from akkudoktoreos.devices.settings import DevicesCommonSettings
+import json
+import re
+from typing import Any, Optional, TextIO, cast
+
+import numpy as np
+from loguru import logger
+from numpydantic import NDArray, Shape
+from pydantic import Field, computed_field, field_validator, model_validator
+
+from akkudoktoreos.config.configabc import SettingsBaseModel
+from akkudoktoreos.core.cache import CacheFileStore
+from akkudoktoreos.core.coreabc import ConfigMixin, SingletonMixin
+from akkudoktoreos.core.emplan import ResourceStatus
+from akkudoktoreos.core.pydantic import ConfigDict, PydanticBaseModel
+from akkudoktoreos.devices.devicesabc import DevicesBaseSettings
+from akkudoktoreos.utils.datetimeutil import DateTime, TimeWindowSequence, to_datetime
+
+# Default charge rates for battery
+BATTERY_DEFAULT_CHARGE_RATES = np.linspace(0.0, 1.0, 11)  # 0.0, 0.1, ..., 1.0
 
 
-class Devices(SingletonMixin, DevicesBase):
-    def __init__(self, settings: Optional[DevicesCommonSettings] = None):
-        if hasattr(self, "_initialized"):
-            return
-        super().__init__()
-        if settings is None:
-            settings = self.config.devices
-            if settings is None:
-                return
+class BatteriesCommonSettings(DevicesBaseSettings):
+    """Battery devices base settings."""
 
-        # initialize devices
-        if settings.batteries is not None:
-            for battery_params in settings.batteries:
-                self.add_device(Battery(battery_params))
-        if settings.inverters is not None:
-            for inverter_params in settings.inverters:
-                self.add_device(Inverter(inverter_params))
-        if settings.home_appliances is not None:
-            for home_appliance_params in settings.home_appliances:
-                self.add_device(HomeAppliance(home_appliance_params))
+    capacity_wh: int = Field(
+        default=8000,
+        gt=0,
+        description="Capacity [Wh].",
+        examples=[8000],
+    )
 
-        self.post_setup()
+    charging_efficiency: float = Field(
+        default=0.88,
+        gt=0,
+        le=1,
+        description="Charging efficiency [0.01 ... 1.00].",
+        examples=[0.88],
+    )
 
-    def post_setup(self) -> None:
-        for device in self.devices.values():
-            device.post_setup()
+    discharging_efficiency: float = Field(
+        default=0.88,
+        gt=0,
+        le=1,
+        description="Discharge efficiency [0.01 ... 1.00].",
+        examples=[0.88],
+    )
+
+    levelized_cost_of_storage_kwh: float = Field(
+        default=0.0,
+        description="Levelized cost of storage (LCOS), the average lifetime cost of delivering one kWh [€/kWh].",
+        examples=[0.12],
+    )
+
+    max_charge_power_w: Optional[float] = Field(
+        default=5000,
+        gt=0,
+        description="Maximum charging power [W].",
+        examples=[5000],
+    )
+
+    min_charge_power_w: Optional[float] = Field(
+        default=50,
+        gt=0,
+        description="Minimum charging power [W].",
+        examples=[50],
+    )
+
+    charge_rates: Optional[NDArray[Shape["*"], float]] = Field(
+        default=BATTERY_DEFAULT_CHARGE_RATES,
+        description=(
+            "Charge rates as factor of maximum charging power [0.00 ... 1.00]. "
+            "None triggers fallback to default charge-rates."
+        ),
+        examples=[[0.0, 0.25, 0.5, 0.75, 1.0], None],
+    )
+
+    min_soc_percentage: int = Field(
+        default=0,
+        ge=0,
+        le=100,
+        description=(
+            "Minimum state of charge (SOC) as percentage of capacity [%]. "
+            "This is the target SoC for charging"
+        ),
+        examples=[10],
+    )
+
+    max_soc_percentage: int = Field(
+        default=100,
+        ge=0,
+        le=100,
+        description="Maximum state of charge (SOC) as percentage of capacity [%].",
+        examples=[100],
+    )
+
+    @field_validator("charge_rates", mode="before")
+    def validate_and_sort_charge_rates(cls, v: Any) -> NDArray[Shape["*"], float]:
+        # None means fallback to default values
+        if v is None:
+            return BATTERY_DEFAULT_CHARGE_RATES.copy()
+
+        # Convert to numpy array
+        if isinstance(v, str):
+            # Remove brackets and split by comma or whitespace
+            numbers = re.split(r"[,\s]+", v.strip("[]"))
+
+            # Filter out any empty strings and convert to floats
+            arr = np.array([float(x) for x in numbers if x])
+        else:
+            arr = np.array(v, dtype=float)
+
+        # Must not be empty
+        if arr.size == 0:
+            raise ValueError("charge_rates must contain at least one value.")
+
+        # Enforce bounds: 0.0 ≤ x ≤ 1.0
+        if (arr < 0.0).any() or (arr > 1.0).any():
+            raise ValueError("charge_rates must be within [0.0, 1.0].")
+
+        # Remove duplicates + sort
+        arr = np.unique(arr)
+        arr.sort()
+
+        return arr
+
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def measurement_key_soc_factor(self) -> str:
+        """Measurement key for the battery state of charge (SoC) as factor of total capacity [0.0 ... 1.0]."""
+        return f"{self.device_id}-soc-factor"
+
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def measurement_key_power_l1_w(self) -> str:
+        """Measurement key for the L1 power the battery is charged or discharged with [W]."""
+        return f"{self.device_id}-power-l1-w"
+
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def measurement_key_power_l2_w(self) -> str:
+        """Measurement key for the L2 power the battery is charged or discharged with [W]."""
+        return f"{self.device_id}-power-l2-w"
+
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def measurement_key_power_l3_w(self) -> str:
+        """Measurement key for the L3 power the battery is charged or discharged with [W]."""
+        return f"{self.device_id}-power-l3-w"
+
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def measurement_key_power_3_phase_sym_w(self) -> str:
+        """Measurement key for the symmetric 3 phase power the battery is charged or discharged with [W]."""
+        return f"{self.device_id}-power-3-phase-sym-w"
+
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def measurement_keys(self) -> Optional[list[str]]:
+        """Measurement keys for the battery stati that are measurements.
+
+        Battery SoC, power.
+        """
+        keys: list[str] = [
+            self.measurement_key_soc_factor,
+            self.measurement_key_power_l1_w,
+            self.measurement_key_power_l2_w,
+            self.measurement_key_power_l3_w,
+            self.measurement_key_power_3_phase_sym_w,
+        ]
+        return keys
 
 
-# Initialize the Devices simulation, it is a singleton.
-devices: Optional[Devices] = None
+class InverterCommonSettings(DevicesBaseSettings):
+    """Inverter devices base settings."""
+
+    max_power_w: Optional[float] = Field(
+        default=None,
+        gt=0,
+        description="Maximum power [W].",
+        examples=[10000],
+    )
+
+    battery_id: Optional[str] = Field(
+        default=None,
+        description="ID of battery controlled by this inverter.",
+        examples=[None, "battery1"],
+    )
+
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def measurement_keys(self) -> Optional[list[str]]:
+        """Measurement keys for the inverter stati that are measurements."""
+        keys: list[str] = []
+        return keys
 
 
-def get_devices() -> Devices:
-    global devices
-    # Fix circular import at runtime
-    if devices is None:
-        devices = Devices()
-    """Gets the EOS Devices simulation."""
-    return devices
+class HomeApplianceCommonSettings(DevicesBaseSettings):
+    """Home Appliance devices base settings."""
+
+    consumption_wh: int = Field(
+        gt=0,
+        description="Energy consumption [Wh].",
+        examples=[2000],
+    )
+
+    duration_h: int = Field(
+        gt=0,
+        le=24,
+        description="Usage duration in hours [0 ... 24].",
+        examples=[1],
+    )
+
+    time_windows: Optional[TimeWindowSequence] = Field(
+        default=None,
+        description="Sequence of allowed time windows. Defaults to optimization general time window.",
+        examples=[
+            {
+                "windows": [
+                    {"start_time": "10:00", "duration": "2 hours"},
+                ],
+            },
+        ],
+    )
+
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def measurement_keys(self) -> Optional[list[str]]:
+        """Measurement keys for the home appliance stati that are measurements."""
+        keys: list[str] = []
+        return keys
+
+
+class DevicesCommonSettings(SettingsBaseModel):
+    """Base configuration for devices simulation settings."""
+
+    batteries: Optional[list[BatteriesCommonSettings]] = Field(
+        default=None,
+        description="List of battery devices",
+        examples=[[{"device_id": "battery1", "capacity_wh": 8000}]],
+    )
+
+    max_batteries: Optional[int] = Field(
+        default=None,
+        ge=0,
+        description="Maximum number of batteries that can be set",
+        examples=[1, 2],
+    )
+
+    electric_vehicles: Optional[list[BatteriesCommonSettings]] = Field(
+        default=None,
+        description="List of electric vehicle devices",
+        examples=[[{"device_id": "battery1", "capacity_wh": 8000}]],
+    )
+
+    max_electric_vehicles: Optional[int] = Field(
+        default=None,
+        ge=0,
+        description="Maximum number of electric vehicles that can be set",
+        examples=[1, 2],
+    )
+
+    inverters: Optional[list[InverterCommonSettings]] = Field(
+        default=None, description="List of inverters", examples=[[]]
+    )
+
+    max_inverters: Optional[int] = Field(
+        default=None,
+        ge=0,
+        description="Maximum number of inverters that can be set",
+        examples=[1, 2],
+    )
+
+    home_appliances: Optional[list[HomeApplianceCommonSettings]] = Field(
+        default=None, description="List of home appliances", examples=[[]]
+    )
+
+    max_home_appliances: Optional[int] = Field(
+        default=None,
+        ge=0,
+        description="Maximum number of home_appliances that can be set",
+        examples=[1, 2],
+    )
+
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def measurement_keys(self) -> Optional[list[str]]:
+        """Return the measurement keys for the resource/ device stati that are measurements."""
+        keys: list[str] = []
+
+        if self.max_batteries and self.batteries:
+            for battery in self.batteries:
+                keys.extend(battery.measurement_keys)
+        if self.max_electric_vehicles and self.electric_vehicles:
+            for electric_vehicle in self.electric_vehicles:
+                keys.extend(electric_vehicle.measurement_keys)
+        return keys
+
+
+# Type used for indexing: (resource_id, optional actuator_id)
+class ResourceKey(PydanticBaseModel):
+    """Key identifying a resource and optionally an actuator."""
+
+    resource_id: str
+    actuator_id: Optional[str] = None
+
+    model_config = ConfigDict(frozen=True)
+
+    def __hash__(self) -> int:
+        """Returns a stable hash based on the resource_id and actuator_id.
+
+        Returns:
+            int: Hash value derived from the resource_id and actuator_id.
+        """
+        return hash(self.resource_id + self.actuator_id if self.actuator_id else "")
+
+    def as_tuple(self) -> tuple[str, Optional[str]]:
+        """Return the key as a tuple for internal dictionary indexing."""
+        return (self.resource_id, self.actuator_id)
+
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, ResourceKey):
+            return NotImplemented
+        return self.resource_id == other.resource_id and self.actuator_id == other.actuator_id
+
+
+class ResourceRegistry(SingletonMixin, ConfigMixin, PydanticBaseModel):
+    """Registry for collecting and retrieving device status reports for simulations.
+
+    Maintains the latest and optionally historical status reports for each resource.
+    """
+
+    keep_history: bool = False
+    history_size: int = 100
+
+    latest: dict[ResourceKey, ResourceStatus] = Field(
+        default_factory=dict,
+        description="Latest resource status that was reported per resource key.",
+        example=[],
+    )
+    history: dict[ResourceKey, list[tuple[DateTime, ResourceStatus]]] = Field(
+        default_factory=dict,
+        description="History of resource stati that were reported per resource key.",
+        example=[],
+    )
+
+    @model_validator(mode="after")
+    def _enforce_history_limits(self) -> "ResourceRegistry":
+        """Ensure history list lengths respect the history_size limit."""
+        if self.keep_history:
+            for key, records in self.history.items():
+                if len(records) > self.history_size:
+                    self.history[key] = records[-self.history_size :]
+        return self
+
+    def update_status(self, key: ResourceKey, status: ResourceStatus) -> None:
+        """Update the latest status and optionally store in history.
+
+        Args:
+            key (ResourceKey): Identifier for the resource.
+            status (ResourceStatus): Status report to store.
+        """
+        self.latest[key] = status
+        if self.keep_history:
+            timestamp = getattr(status, "transition_timestamp", None) or to_datetime()
+            self.history.setdefault(key, []).append((timestamp, status))
+            if len(self.history[key]) > self.history_size:
+                self.history[key] = self.history[key][-self.history_size :]
+
+    def status_latest(self, key: ResourceKey) -> Optional[ResourceStatus]:
+        """Retrieve the most recent status for a resource."""
+        return self.latest.get(key)
+
+    def status_history(self, key: ResourceKey) -> list[tuple[DateTime, ResourceStatus]]:
+        """Retrieve historical status reports for a resource."""
+        if not self.keep_history:
+            raise RuntimeError("History tracking is disabled.")
+        return self.history.get(key, [])
+
+    def status_exists(self, key: ResourceKey) -> bool:
+        """Check if a status report exists for the given resource.
+
+        Args:
+            key (ResourceKey): Identifier for the resource.
+        """
+        return key in self.latest
+
+    def save(self) -> None:
+        """Save the registry to file."""
+        # Make explicit cast to make mypy happy
+        cache_file = cast(
+            TextIO, CacheFileStore().create(key="resource_registry", mode="w+", suffix=".json")
+        )
+        cache_file.seek(0)
+        cache_file.write(self.model_dump_json(indent=4))
+        cache_file.truncate()  # Important to remove leftover data!
+
+    def load(self) -> None:
+        """Load registry state from file and update the current instance."""
+        cache_file = CacheFileStore().get(key="resource_registry")
+        if cache_file:
+            try:
+                cache_file.seek(0)
+                data = json.load(cache_file)
+                loaded = self.__class__.model_validate(data)
+
+                self.keep_history = loaded.keep_history
+                self.history_size = loaded.history_size
+                self.latest = loaded.latest
+                self.history = loaded.history
+            except Exception as e:
+                logger.error("Can not load resource registry: {}", e)
+
+
+def get_resource_registry() -> ResourceRegistry:
+    """Gets the EOS resource registry."""
+    return ResourceRegistry()

src/akkudoktoreos/devices/devicesabc.py

@@ -1,181 +1,131 @@
 """Abstract and base classes for devices."""
 
-from enum import Enum
-from typing import Optional, Type
+from enum import StrEnum
 
-from loguru import logger
-from pendulum import DateTime
-from pydantic import Field, computed_field
+from pydantic import Field
 
-from akkudoktoreos.core.coreabc import (
-    ConfigMixin,
-    DevicesMixin,
-    EnergyManagementSystemMixin,
-    PredictionMixin,
-)
-from akkudoktoreos.core.pydantic import ParametersBaseModel
-from akkudoktoreos.utils.datetimeutil import to_duration
+from akkudoktoreos.config.configabc import SettingsBaseModel
 
 
-class DeviceParameters(ParametersBaseModel):
-    device_id: str = Field(description="ID of device", examples="device1")
-    hours: Optional[int] = Field(
-        default=None,
-        gt=0,
-        description="Number of prediction hours. Defaults to global config prediction hours.",
-        examples=[None],
+class DevicesBaseSettings(SettingsBaseModel):
+    """Base devices setting."""
+
+    device_id: str = Field(
+        default="<unknown>",
+        description="ID of device",
+        examples=["battery1", "ev1", "inverter1", "dishwasher"],
     )
 
 
-class DeviceOptimizeResult(ParametersBaseModel):
-    device_id: str = Field(description="ID of device", examples=["device1"])
-    hours: int = Field(gt=0, description="Number of hours in the simulation.", examples=[24])
+class BatteryOperationMode(StrEnum):
+    """Battery Operation Mode.
 
+    Enumerates the operating modes of a battery in a home energy
+    management simulation. These modes require no direct awareness
+    of electricity prices or carbon intensity — higher-level
+    controllers or optimizers decide when to switch modes.
 
-class DeviceState(Enum):
-    UNINITIALIZED = 0
-    PREPARED = 1
-    INITIALIZED = 2
+    Modes
+    -----
+    - IDLE:
+        No charging or discharging.
 
+    - SELF_CONSUMPTION:
+        Charge from local surplus and discharge to meet local demand.
 
-class DevicesStartEndMixin(ConfigMixin, EnergyManagementSystemMixin):
-    """A mixin to manage start, end datetimes for devices data.
+    - NON_EXPORT:
+        Charge from on-site or local surplus with the goal of
+        minimizing or preventing energy export to the external grid.
+        Discharging to the grid is not allowed.
 
-    The starting datetime for devices data generation is provided by the energy management
-    system. Device data cannot be computed if this value is `None`.
+    - PEAK_SHAVING:
+        Discharge during local demand peaks to reduce grid draw.
+
+    - GRID_SUPPORT_EXPORT:
+        Discharge to support the upstream grid when commanded.
+
+    - GRID_SUPPORT_IMPORT:
+        Charge from the grid when instructed to absorb excess supply.
+
+    - FREQUENCY_REGULATION:
+        Perform fast bidirectional power adjustments based on grid
+        frequency deviations.
+
+    - RAMP_RATE_CONTROL:
+        Smooth changes in local net load or generation.
+
+    - RESERVE_BACKUP:
+        Maintain a minimum state of charge for emergency use.
+
+    - OUTAGE_SUPPLY:
+        Discharge to power critical loads during a grid outage.
+
+    - FORCED_CHARGE:
+        Override all other logic and charge regardless of conditions.
+
+    - FORCED_DISCHARGE:
+        Override all other logic and discharge regardless of conditions.
+
+    - FAULT:
+        Battery is unavailable due to fault or error state.
     """
 
-    # Computed field for end_datetime and keep_datetime
-    @computed_field  # type: ignore[prop-decorator]
-    @property
-    def end_datetime(self) -> Optional[DateTime]:
-        """Compute the end datetime based on the `start_datetime` and `hours`.
-
-        Ajusts the calculated end time if DST transitions occur within the prediction window.
-
-        Returns:
-            Optional[DateTime]: The calculated end datetime, or `None` if inputs are missing.
-        """
-        if self.ems.start_datetime and self.config.prediction.hours:
-            end_datetime = self.ems.start_datetime + to_duration(
-                f"{self.config.prediction.hours} hours"
-            )
-            dst_change = end_datetime.offset_hours - self.ems.start_datetime.offset_hours
-            logger.debug(
-                f"Pre: {self.ems.start_datetime}..{end_datetime}: DST change: {dst_change}"
-            )
-            if dst_change < 0:
-                end_datetime = end_datetime + to_duration(f"{abs(int(dst_change))} hours")
-            elif dst_change > 0:
-                end_datetime = end_datetime - to_duration(f"{abs(int(dst_change))} hours")
-            logger.debug(
-                f"Pst: {self.ems.start_datetime}..{end_datetime}: DST change: {dst_change}"
-            )
-            return end_datetime
-        return None
-
-    @computed_field  # type: ignore[prop-decorator]
-    @property
-    def total_hours(self) -> Optional[int]:
-        """Compute the hours from `start_datetime` to `end_datetime`.
-
-        Returns:
-            Optional[pendulum.period]: The duration hours, or `None` if either datetime is unavailable.
-        """
-        end_dt = self.end_datetime
-        if end_dt is None:
-            return None
-        duration = end_dt - self.ems.start_datetime
-        return int(duration.total_hours())
+    IDLE = "IDLE"
+    SELF_CONSUMPTION = "SELF_CONSUMPTION"
+    NON_EXPORT = "NON_EXPORT"
+    PEAK_SHAVING = "PEAK_SHAVING"
+    GRID_SUPPORT_EXPORT = "GRID_SUPPORT_EXPORT"
+    GRID_SUPPORT_IMPORT = "GRID_SUPPORT_IMPORT"
+    FREQUENCY_REGULATION = "FREQUENCY_REGULATION"
+    RAMP_RATE_CONTROL = "RAMP_RATE_CONTROL"
+    RESERVE_BACKUP = "RESERVE_BACKUP"
+    OUTAGE_SUPPLY = "OUTAGE_SUPPLY"
+    FORCED_CHARGE = "FORCED_CHARGE"
+    FORCED_DISCHARGE = "FORCED_DISCHARGE"
+    FAULT = "FAULT"
 
 
-class DeviceBase(DevicesStartEndMixin, PredictionMixin, DevicesMixin):
-    """Base class for device simulations.
+class ApplianceOperationMode(StrEnum):
+    """Appliance operation modes.
 
-    Enables access to EOS configuration data (attribute `config`), EOS prediction data (attribute
-    `prediction`) and EOS device registry (attribute `devices`).
+    Modes
+    -----
+    - OFF:
+        Stop or prevent any active operation of the appliance.
 
-    Behavior:
-        - Several initialization phases (setup, post_setup):
-            - setup: Initialize class attributes from DeviceParameters (pydantic input validation)
-            - post_setup: Set connections between devices
-        - NotImplemented:
-            - hooks during optimization
+    - RUN:
+        Start or continue normal operation of the appliance.
 
-    Notes:
-        - This class is base to concrete devices like battery, inverter, etc. that are used in optimization.
-        - Not a pydantic model for a low footprint during optimization.
+    - DEFER:
+        Postpone operation to a later time window based on
+        scheduling or optimization criteria.
+
+    - PAUSE:
+        Temporarily suspend an ongoing operation, keeping the
+        option to resume later.
+
+    - RESUME:
+        Continue an operation that was previously paused or
+        deferred.
+
+    - LIMIT_POWER:
+        Run the appliance under reduced power constraints,
+        for example in response to load-management or
+        demand-response signals.
+
+    - FORCED_RUN:
+        Start or maintain operation even if constraints or
+        optimization strategies would otherwise delay or limit it.
+
+    - FAULT:
+        Appliance is unavailable due to fault or error state.
     """
 
-    def __init__(self, parameters: Optional[DeviceParameters] = None):
-        self.device_id: str = "<invalid>"
-        self.parameters: Optional[DeviceParameters] = None
-        self.hours = -1
-        if self.total_hours is not None:
-            self.hours = self.total_hours
-
-        self.initialized = DeviceState.UNINITIALIZED
-
-        if parameters is not None:
-            self.setup(parameters)
-
-    def setup(self, parameters: DeviceParameters) -> None:
-        if self.initialized != DeviceState.UNINITIALIZED:
-            return
-
-        self.parameters = parameters
-        self.device_id = self.parameters.device_id
-
-        if self.parameters.hours is not None:
-            self.hours = self.parameters.hours
-        if self.hours < 0:
-            raise ValueError("hours is unset")
-
-        self._setup()
-
-        self.initialized = DeviceState.PREPARED
-
-    def post_setup(self) -> None:
-        if self.initialized.value >= DeviceState.INITIALIZED.value:
-            return
-
-        self._post_setup()
-        self.initialized = DeviceState.INITIALIZED
-
-    def _setup(self) -> None:
-        """Implement custom setup in derived device classes."""
-        pass
-
-    def _post_setup(self) -> None:
-        """Implement custom setup in derived device classes that is run when all devices are initialized."""
-        pass
-
-
-class DevicesBase(DevicesStartEndMixin, PredictionMixin):
-    """Base class for handling device data.
-
-    Enables access to EOS configuration data (attribute `config`) and EOS prediction data (attribute
-    `prediction`).
-    """
-
-    def __init__(self) -> None:
-        super().__init__()
-        self.devices: dict[str, "DeviceBase"] = dict()
-
-    def get_device_by_id(self, device_id: str) -> Optional["DeviceBase"]:
-        return self.devices.get(device_id)
-
-    def add_device(self, device: Optional["DeviceBase"]) -> None:
-        if device is None:
-            return
-        if device.device_id in self.devices:
-            raise ValueError(f"{device.device_id} already registered")
-        self.devices[device.device_id] = device
-
-    def remove_device(self, device: Type["DeviceBase"] | str) -> bool:
-        if isinstance(device, DeviceBase):
-            device = device.device_id
-        return self.devices.pop(device, None) is not None  # type: ignore[arg-type]
-
-    def reset(self) -> None:
-        self.devices = dict()
+    OFF = "OFF"
+    RUN = "RUN"
+    DEFER = "DEFER"
+    PAUSE = "PAUSE"
+    RESUME = "RESUME"
+    LIMIT_POWER = "LIMIT_POWER"
+    FORCED_RUN = "FORCED_RUN"
+    FAULT = "FAULT"

src/akkudoktoreos/devices/generic.py

@@ -1,79 +0,0 @@
-from typing import Optional
-
-import numpy as np
-from pydantic import Field
-
-from akkudoktoreos.devices.devicesabc import DeviceBase, DeviceParameters
-
-
-class HomeApplianceParameters(DeviceParameters):
-    """Home Appliance Device Simulation Configuration."""
-
-    device_id: str = Field(description="ID of home appliance", examples=["dishwasher"])
-    consumption_wh: int = Field(
-        gt=0,
-        description="An integer representing the energy consumption of a household device in watt-hours.",
-        examples=[2000],
-    )
-    duration_h: int = Field(
-        gt=0,
-        description="An integer representing the usage duration of a household device in hours.",
-        examples=[3],
-    )
-
-
-class HomeAppliance(DeviceBase):
-    def __init__(
-        self,
-        parameters: Optional[HomeApplianceParameters] = None,
-    ):
-        self.parameters: Optional[HomeApplianceParameters] = None
-        super().__init__(parameters)
-
-    def _setup(self) -> None:
-        if self.parameters is None:
-            raise ValueError(f"Parameters not set: {self.parameters}")
-        self.load_curve = np.zeros(self.hours)  # Initialize the load curve with zeros
-        self.duration_h = self.parameters.duration_h
-        self.consumption_wh = self.parameters.consumption_wh
-
-    def set_starting_time(self, start_hour: int, global_start_hour: int = 0) -> None:
-        """Sets the start time of the device and generates the corresponding load curve.
-
-        :param start_hour: The hour at which the device should start.
-        """
-        self.reset_load_curve()
-        # Check if the duration of use is within the available time frame
-        if start_hour + self.duration_h > self.hours:
-            raise ValueError("The duration of use exceeds the available time frame.")
-        if start_hour < global_start_hour:
-            raise ValueError("The start time is earlier than the available time frame.")
-
-        # Calculate power per hour based on total consumption and duration
-        power_per_hour = self.consumption_wh / self.duration_h  # Convert to watt-hours
-
-        # Set the power for the duration of use in the load curve array
-        self.load_curve[start_hour : start_hour + self.duration_h] = power_per_hour
-
-    def reset_load_curve(self) -> None:
-        """Resets the load curve."""
-        self.load_curve = np.zeros(self.hours)
-
-    def get_load_curve(self) -> np.ndarray:
-        """Returns the current load curve."""
-        return self.load_curve
-
-    def get_load_for_hour(self, hour: int) -> float:
-        """Returns the load for a specific hour.
-
-        :param hour: The hour for which the load is queried.
-        :return: The load in watts for the specified hour.
-        """
-        if hour < 0 or hour >= self.hours:
-            raise ValueError("The specified hour is outside the available time frame.")
-
-        return self.load_curve[hour]
-
-    def get_latest_starting_point(self) -> int:
-        """Returns the latest possible start time at which the device can still run completely."""
-        return self.hours - self.duration_h

src/akkudoktoreos/devices/genetic/battery.py

@@ -0,0 +1,280 @@
+from typing import Any, Iterator, Optional
+
+import numpy as np
+
+from akkudoktoreos.devices.devices import BATTERY_DEFAULT_CHARGE_RATES
+from akkudoktoreos.optimization.genetic.geneticdevices import (
+    BaseBatteryParameters,
+    SolarPanelBatteryParameters,
+)
+
+
+class Battery:
+    """Represents a battery device with methods to simulate energy charging and discharging."""
+
+    def __init__(self, parameters: BaseBatteryParameters, prediction_hours: int):
+        self.parameters = parameters
+        self.prediction_hours = prediction_hours
+        self._setup()
+
+    def _setup(self) -> None:
+        """Sets up the battery parameters based on provided parameters."""
+        self.capacity_wh = self.parameters.capacity_wh
+        self.initial_soc_percentage = self.parameters.initial_soc_percentage
+        self.charging_efficiency = self.parameters.charging_efficiency
+        self.discharging_efficiency = self.parameters.discharging_efficiency
+
+        # Charge rates, in case of None use default
+        self.charge_rates = BATTERY_DEFAULT_CHARGE_RATES
+        if self.parameters.charge_rates:
+            charge_rates = np.array(self.parameters.charge_rates, dtype=float)
+            charge_rates = np.unique(charge_rates)
+            charge_rates.sort()
+            self.charge_rates = charge_rates
+
+        # Only assign for storage battery
+        self.min_soc_percentage = (
+            self.parameters.min_soc_percentage
+            if isinstance(self.parameters, SolarPanelBatteryParameters)
+            else 0
+        )
+        self.max_soc_percentage = self.parameters.max_soc_percentage
+
+        # Initialize state of charge
+        if self.parameters.max_charge_power_w is not None:
+            self.max_charge_power_w = self.parameters.max_charge_power_w
+        else:
+            self.max_charge_power_w = self.capacity_wh  # TODO this should not be equal capacity_wh
+        self.discharge_array = np.full(self.prediction_hours, 0)
+        self.charge_array = np.full(self.prediction_hours, 0)
+        self.soc_wh = (self.initial_soc_percentage / 100) * self.capacity_wh
+        self.min_soc_wh = (self.min_soc_percentage / 100) * self.capacity_wh
+        self.max_soc_wh = (self.max_soc_percentage / 100) * self.capacity_wh
+
+    def _lower_charge_rates_desc(self, start_rate: float) -> Iterator[float]:
+        """Yield all charge rates lower than a given rate in descending order.
+
+        Args:
+            charge_rates (np.ndarray): Sorted 1D array of available charge rates.
+            start_rate (float): The reference charge rate.
+
+        Yields:
+            float: Charge rates lower than `start_rate`, in descending order.
+        """
+        charge_rates_fast = self.charge_rates
+
+        # Find the insertion index for start_rate (left-most position)
+        idx = np.searchsorted(charge_rates_fast, start_rate, side="left")
+
+        # Yield values before idx in reverse (descending)
+        return (charge_rates_fast[j] for j in range(idx - 1, -1, -1))
+
+    def to_dict(self) -> dict[str, Any]:
+        """Converts the object to a dictionary representation."""
+        return {
+            "device_id": self.parameters.device_id,
+            "capacity_wh": self.capacity_wh,
+            "initial_soc_percentage": self.initial_soc_percentage,
+            "soc_wh": self.soc_wh,
+            "hours": self.prediction_hours,
+            "discharge_array": self.discharge_array,
+            "charge_array": self.charge_array,
+            "charging_efficiency": self.charging_efficiency,
+            "discharging_efficiency": self.discharging_efficiency,
+            "max_charge_power_w": self.max_charge_power_w,
+        }
+
+    def reset(self) -> None:
+        """Resets the battery state to its initial values."""
+        self.soc_wh = (self.initial_soc_percentage / 100) * self.capacity_wh
+        self.soc_wh = min(max(self.soc_wh, self.min_soc_wh), self.max_soc_wh)
+        self.discharge_array = np.full(self.prediction_hours, 0)
+        self.charge_array = np.full(self.prediction_hours, 0)
+
+    def set_discharge_per_hour(self, discharge_array: np.ndarray) -> None:
+        """Sets the discharge values for each hour."""
+        if len(discharge_array) != self.prediction_hours:
+            raise ValueError(
+                f"Discharge array must have exactly {self.prediction_hours} elements. Got {len(discharge_array)} elements."
+            )
+        self.discharge_array = np.array(discharge_array)
+
+    def set_charge_per_hour(self, charge_array: np.ndarray) -> None:
+        """Sets the charge values for each hour."""
+        if len(charge_array) != self.prediction_hours:
+            raise ValueError(
+                f"Charge array must have exactly {self.prediction_hours} elements. Got {len(charge_array)} elements."
+            )
+        self.charge_array = np.array(charge_array)
+
+    def current_soc_percentage(self) -> float:
+        """Calculates the current state of charge in percentage."""
+        return (self.soc_wh / self.capacity_wh) * 100
+
+    def discharge_energy(self, wh: float, hour: int) -> tuple[float, float]:
+        """Discharge energy from the battery.
+
+        Discharge is limited by:
+        * Requested delivered energy
+        * Remaining energy above minimum SoC
+        * Maximum discharge power
+        * Discharge efficiency
+
+        Args:
+            wh (float): Requested delivered energy in watt-hours.
+            hour (int): Time index. If `self.discharge_array[hour] == 0`,
+                no discharge occurs.
+
+        Returns:
+            tuple[float, float]:
+                delivered_wh (float): Actual delivered energy [Wh].
+                losses_wh (float): Conversion losses [Wh].
+
+        """
+        if self.discharge_array[hour] == 0:
+            return 0.0, 0.0
+
+        # Raw extractable energy above minimum SoC
+        raw_available_wh = max(self.soc_wh - self.min_soc_wh, 0.0)
+
+        # Maximum raw discharge due to power limit
+        max_raw_wh = self.max_charge_power_w  # TODO rename to max_discharge_power_w
+
+        # Actual raw withdrawal (internal)
+        raw_withdrawal_wh = min(raw_available_wh, max_raw_wh)
+
+        # Convert raw to delivered
+        max_deliverable_wh = raw_withdrawal_wh * self.discharging_efficiency
+
+        # Cap by requested delivered energy
+        delivered_wh = min(wh, max_deliverable_wh)
+
+        # Effective raw withdrawal based on what is delivered
+        raw_used_wh = delivered_wh / self.discharging_efficiency
+
+        # Update SoC
+        self.soc_wh -= raw_used_wh
+        self.soc_wh = max(self.soc_wh, self.min_soc_wh)
+
+        # Losses
+        losses_wh = raw_used_wh - delivered_wh
+
+        return delivered_wh, losses_wh
+
+    def charge_energy(
+        self,
+        wh: Optional[float],
+        hour: int,
+        charge_factor: float = 0.0,
+    ) -> tuple[float, float]:
+        """Charge energy into the battery.
+
+        Two **exclusive** modes:
+
+        Mode 1:
+            - `wh is not None` and `charge_factor == 0`
+            → The raw requested charge energy is `wh` (pre-efficiency).
+            → If remaining capacity is insufficient, charging is automatically limited.
+            → No exception is raised due to capacity limits.
+
+        Mode 2:
+            - `wh is None` and `charge_factor > 0`
+            → The raw requested energy is `max_charge_power_w * charge_factor`.
+            → If the request exceeds remaining capacity, the algorithm tries to
+              find a lower charge_factor that is compatible. If such a charge factor
+              exists, this hour’s charge_factor is replaced.
+            → If no charge factor can accommodate charging, the request is ignored
+              (`(0.0, 0.0)` is returned) and a penalty is applied elsewhere.
+
+        Charging is constrained by:
+            • Available SoC headroom (max_soc_wh − soc_wh)
+            • max_charge_power_w
+            • charging_efficiency
+
+        Args:
+            wh (float | None):
+                Requested raw energy [Wh] before efficiency.
+                Must be provided only for Mode 1 (charge_factor must be 0).
+
+            hour (int):
+                Time index. If charging is disabled at this hour (charge_array[hour] == 0),
+                returns `(0.0, 0.0)`.
+
+            charge_factor (float):
+                Fraction (0–1) of max charge power.
+                Must be >0 only in Mode 2 (`wh is None`).
+
+        Returns:
+            tuple[float, float]:
+                stored_wh : float
+                    Energy stored after efficiency [Wh].
+                losses_wh : float
+                    Conversion losses [Wh].
+
+        Raises:
+            ValueError:
+                - If the mode is ambiguous (neither Mode 1 nor Mode 2).
+                - If the final new SoC would exceed capacity_wh.
+
+        Notes:
+            stored_wh = raw_input_wh * charging_efficiency
+            losses_wh = raw_input_wh − stored_wh
+        """
+        # Charging allowed in this hour?
+        if hour is not None and self.charge_array[hour] == 0:
+            return 0.0, 0.0
+
+        # Provide fast (3x..5x) local read access (vs. self.xxx) for repetitive read access
+        soc_wh_fast = self.soc_wh
+        max_charge_power_w_fast = self.max_charge_power_w
+        charging_efficiency_fast = self.charging_efficiency
+
+        # Decide mode & determine raw_request_wh and raw_charge_wh
+        if wh is not None and charge_factor == 0.0:  # mode 1
+            raw_request_wh = wh
+            raw_charge_wh = max(self.max_soc_wh - soc_wh_fast, 0.0) / charging_efficiency_fast
+        elif wh is None and charge_factor > 0.0:  # mode 2
+            raw_request_wh = max_charge_power_w_fast * charge_factor
+            raw_charge_wh = max(self.max_soc_wh - soc_wh_fast, 0.0) / charging_efficiency_fast
+            if raw_request_wh > raw_charge_wh:
+                # Use a lower charge factor
+                lower_charge_factors = self._lower_charge_rates_desc(charge_factor)
+                for charge_factor in lower_charge_factors:
+                    raw_request_wh = max_charge_power_w_fast * charge_factor
+                    if raw_request_wh <= raw_charge_wh:
+                        self.charge_array[hour] = charge_factor
+                        break
+                if raw_request_wh > raw_charge_wh:
+                    # ignore request - penalty for missing SoC will be applied
+                    self.charge_array[hour] = 0
+                    return 0.0, 0.0
+        else:
+            raise ValueError(
+                f"{self.parameters.device_id}: charge_energy must be called either "
+                "with wh != None and charge_factor == 0, or with wh == None and charge_factor > 0."
+            )
+
+        # Remaining capacity
+        max_raw_wh = min(raw_charge_wh, max_charge_power_w_fast)
+
+        # Actual raw intake
+        raw_input_wh = raw_request_wh if raw_request_wh < max_raw_wh else max_raw_wh
+
+        # Apply efficiency
+        stored_wh = raw_input_wh * charging_efficiency_fast
+        new_soc = soc_wh_fast + stored_wh
+
+        if new_soc > self.capacity_wh:
+            raise ValueError(
+                f"{self.parameters.device_id}: SoC {new_soc} Wh exceeds capacity {self.capacity_wh} Wh"
+            )
+
+        self.soc_wh = new_soc
+        losses_wh = raw_input_wh - stored_wh
+
+        return stored_wh, losses_wh
+
+    def current_energy_content(self) -> float:
+        """Returns the current usable energy in the battery."""
+        usable_energy = (self.soc_wh - self.min_soc_wh) * self.discharging_efficiency
+        return max(usable_energy, 0.0)

src/akkudoktoreos/devices/genetic/homeappliance.py

@@ -0,0 +1,105 @@
+import numpy as np
+
+from akkudoktoreos.optimization.genetic.geneticdevices import HomeApplianceParameters
+from akkudoktoreos.utils.datetimeutil import (
+    TimeWindow,
+    TimeWindowSequence,
+    to_datetime,
+    to_duration,
+    to_time,
+)
+
+
+class HomeAppliance:
+    def __init__(
+        self,
+        parameters: HomeApplianceParameters,
+        optimization_hours: int,
+        prediction_hours: int,
+    ):
+        self.parameters: HomeApplianceParameters = parameters
+        self.prediction_hours = prediction_hours
+        self._setup()
+
+    def _setup(self) -> None:
+        """Sets up the home appliance parameters based provided parameters."""
+        self.load_curve = np.zeros(self.prediction_hours)  # Initialize the load curve with zeros
+        self.duration_h = self.parameters.duration_h
+        self.consumption_wh = self.parameters.consumption_wh
+        # setup possible start times
+        if self.parameters.time_windows is None:
+            self.parameters.time_windows = TimeWindowSequence(
+                windows=[
+                    TimeWindow(
+                        start_time=to_time("00:00"),
+                        duration=to_duration(f"{self.prediction_hours} hours"),
+                    ),
+                ]
+            )
+        start_datetime = to_datetime().set(hour=0, minute=0, second=0)
+        duration = to_duration(f"{self.duration_h} hours")
+        self.start_allowed: list[bool] = []
+        for hour in range(0, self.prediction_hours):
+            self.start_allowed.append(
+                self.parameters.time_windows.contains(
+                    start_datetime.add(hours=hour), duration=duration
+                )
+            )
+        start_earliest = self.parameters.time_windows.earliest_start_time(duration, start_datetime)
+        if start_earliest:
+            self.start_earliest = start_earliest.hour
+        else:
+            self.start_earliest = 0
+        start_latest = self.parameters.time_windows.latest_start_time(duration, start_datetime)
+        if start_latest:
+            self.start_latest = start_latest.hour
+        else:
+            self.start_latest = 23
+
+    def set_starting_time(self, start_hour: int, global_start_hour: int = 0) -> int:
+        """Sets the start time of the device and generates the corresponding load curve.
+
+        :param start_hour: The hour at which the device should start.
+        """
+        if not self.start_allowed[start_hour]:
+            # It is not allowed (by the time windows) to start the application at this time
+            if global_start_hour <= self.start_latest:
+                # There is a time window left to start the appliance. Use it
+                start_hour = self.start_latest
+            else:
+                # There is no time window left to run the application
+                # Set the start into tomorrow
+                start_hour = self.start_earliest + 24
+
+        self.reset_load_curve()
+
+        # Calculate power per hour based on total consumption and duration
+        power_per_hour = self.consumption_wh / self.duration_h  # Convert to watt-hours
+
+        # Set the power for the duration of use in the load curve array
+        if start_hour < len(self.load_curve):
+            end_hour = min(start_hour + self.duration_h, self.prediction_hours)
+            self.load_curve[start_hour:end_hour] = power_per_hour
+
+        return start_hour
+
+    def reset_load_curve(self) -> None:
+        """Resets the load curve."""
+        self.load_curve = np.zeros(self.prediction_hours)
+
+    def get_load_curve(self) -> np.ndarray:
+        """Returns the current load curve."""
+        return self.load_curve
+
+    def get_load_for_hour(self, hour: int) -> float:
+        """Returns the load for a specific hour.
+
+        :param hour: The hour for which the load is queried.
+        :return: The load in watts for the specified hour.
+        """
+        if hour < 0 or hour >= self.prediction_hours:
+            raise ValueError(
+                f"The specified hour {hour} is outside the available time frame {self.prediction_hours}."
+            )
+
+        return self.load_curve[hour]

src/akkudoktoreos/devices/genetic/inverter.py

@@ -1,65 +1,32 @@
 from typing import Optional
 
 from loguru import logger
-from pydantic import Field
 
-from akkudoktoreos.devices.devicesabc import DeviceBase, DeviceParameters
+from akkudoktoreos.devices.genetic.battery import Battery
+from akkudoktoreos.optimization.genetic.geneticdevices import InverterParameters
 from akkudoktoreos.prediction.interpolator import get_eos_load_interpolator
 
 
-class InverterParameters(DeviceParameters):
-    """Inverter Device Simulation Configuration."""
-
-    device_id: str = Field(description="ID of inverter", examples=["inverter1"])
-    max_power_wh: float = Field(gt=0, examples=[10000])
-    battery_id: Optional[str] = Field(
-        default=None, description="ID of battery", examples=[None, "battery1"]
-    )
-
-
-class Inverter(DeviceBase):
+class Inverter:
     def __init__(
         self,
-        parameters: Optional[InverterParameters] = None,
+        parameters: InverterParameters,
+        battery: Optional[Battery] = None,
     ):
-        self.parameters: Optional[InverterParameters] = None
-        super().__init__(parameters)
-
-        self.scr_lookup: dict = {}
-
-    def _calculate_scr(self, consumption: float, generation: float) -> float:
-        """Check if the consumption and production is in the lookup table. If not, calculate and store the value."""
-        if consumption not in self.scr_lookup:
-            self.scr_lookup[consumption] = {}
-
-        if generation not in self.scr_lookup[consumption]:
-            scr = self.self_consumption_predictor.calculate_self_consumption(
-                consumption, generation
-            )
-            self.scr_lookup[consumption][generation] = scr
-            return scr
-
-        return self.scr_lookup[consumption][generation]
+        self.parameters: InverterParameters = parameters
+        self.battery: Optional[Battery] = battery
+        self._setup()
 
     def _setup(self) -> None:
-        if self.parameters is None:
-            raise ValueError(f"Parameters not set: {self.parameters}")
-        if self.parameters.battery_id is None:
-            # For the moment raise exception
-            # TODO: Make battery configurable by config
-            error_msg = "Battery for PV inverter is mandatory."
+        if self.battery and self.parameters.battery_id != self.battery.parameters.device_id:
+            error_msg = f"Battery ID mismatch - {self.parameters.battery_id} is configured; got {self.battery.parameters.device_id}."
             logger.error(error_msg)
-            raise NotImplementedError(error_msg)
+            raise ValueError(error_msg)
         self.self_consumption_predictor = get_eos_load_interpolator()
         self.max_power_wh = (
             self.parameters.max_power_wh
         )  # Maximum power that the inverter can handle
 
-    def _post_setup(self) -> None:
-        if self.parameters is None:
-            raise ValueError(f"Parameters not set: {self.parameters}")
-        self.battery = self.devices.get_device_by_id(self.parameters.battery_id)
-
     def process_energy(
         self, generation: float, consumption: float, hour: int
     ) -> tuple[float, float, float, float]:
@@ -76,8 +43,10 @@ class Inverter(DeviceBase):
                 grid_import = -remaining_power  # Negative indicates feeding into the grid
                 self_consumption = self.max_power_wh
             else:
-                # Calculate scr with lookup table
-                scr = self._calculate_scr(consumption, generation)
+                # Calculate scr using cached results per energy management/optimization run
+                scr = self.self_consumption_predictor.calculate_self_consumption(
+                    consumption, generation
+                )
 
                 # Remaining power after consumption
                 remaining_power = (generation - consumption) * scr  # EVQ
@@ -86,6 +55,7 @@ class Inverter(DeviceBase):
 
                 if remaining_load_evq > 0:
                     # Akku muss den Restverbrauch decken
+                    if self.battery:
                         from_battery, discharge_losses = self.battery.discharge_energy(
                             remaining_load_evq, hour
                         )
@@ -101,10 +71,13 @@ class Inverter(DeviceBase):
 
                 if remaining_power > 0:
                     # Load battery with excess energy
+                    if self.battery:
                         charged_energie, charge_losses = self.battery.charge_energy(
                             remaining_power, hour
                         )
                         remaining_surplus = remaining_power - (charged_energie + charge_losses)
+                    else:
+                        remaining_surplus = remaining_power
 
                     # Feed-in to the grid based on remaining capacity
                     if remaining_surplus > self.max_power_wh - consumption:
@@ -124,10 +97,13 @@ class Inverter(DeviceBase):
             available_ac_power = max(self.max_power_wh - generation, 0)
 
             # Discharge battery to cover shortfall, if possible
+            if self.battery:
                 battery_discharge, discharge_losses = self.battery.discharge_energy(
                     min(shortfall, available_ac_power), hour
                 )
                 losses += discharge_losses
+            else:
+                battery_discharge = 0
 
             # Draw remaining required power from the grid (discharge_losses are already substraved in the battery)
             grid_import = shortfall - battery_discharge

src/akkudoktoreos/devices/settings.py

@@ -1,24 +0,0 @@
-from typing import Optional
-
-from pydantic import Field
-
-from akkudoktoreos.config.configabc import SettingsBaseModel
-from akkudoktoreos.devices.battery import BaseBatteryParameters
-from akkudoktoreos.devices.generic import HomeApplianceParameters
-from akkudoktoreos.devices.inverter import InverterParameters
-
-
-class DevicesCommonSettings(SettingsBaseModel):
-    """Base configuration for devices simulation settings."""
-
-    batteries: Optional[list[BaseBatteryParameters]] = Field(
-        default=None,
-        description="List of battery/ev devices",
-        examples=[[{"device_id": "battery1", "capacity_wh": 8000}]],
-    )
-    inverters: Optional[list[InverterParameters]] = Field(
-        default=None, description="List of inverters", examples=[[]]
-    )
-    home_appliances: Optional[list[HomeApplianceParameters]] = Field(
-        default=None, description="List of home appliances", examples=[[]]
-    )

src/akkudoktoreos/measurement/measurement.py

@@ -6,90 +6,69 @@ data records for measurements.
 The measurements can be added programmatically or imported from a file or JSON string.
 """
 
-from typing import Any, ClassVar, List, Optional
+from typing import Any, Optional
 
 import numpy as np
 from loguru import logger
 from numpydantic import NDArray, Shape
-from pendulum import DateTime, Duration
 from pydantic import Field, computed_field
 
 from akkudoktoreos.config.configabc import SettingsBaseModel
 from akkudoktoreos.core.coreabc import SingletonMixin
 from akkudoktoreos.core.dataabc import DataImportMixin, DataRecord, DataSequence
-from akkudoktoreos.utils.datetimeutil import to_duration
+from akkudoktoreos.utils.datetimeutil import DateTime, Duration, to_duration
 
 
 class MeasurementCommonSettings(SettingsBaseModel):
     """Measurement Configuration."""
 
-    load0_name: Optional[str] = Field(
-        default=None, description="Name of the load0 source", examples=["Household", "Heat Pump"]
+    load_emr_keys: Optional[list[str]] = Field(
+        default=None,
+        description="The keys of the measurements that are energy meter readings of a load [kWh].",
+        examples=[["load0_emr"]],
     )
-    load1_name: Optional[str] = Field(
-        default=None, description="Name of the load1 source", examples=[None]
+
+    grid_export_emr_keys: Optional[list[str]] = Field(
+        default=None,
+        description="The keys of the measurements that are energy meter readings of energy export to grid [kWh].",
+        examples=[["grid_export_emr"]],
     )
-    load2_name: Optional[str] = Field(
-        default=None, description="Name of the load2 source", examples=[None]
+
+    grid_import_emr_keys: Optional[list[str]] = Field(
+        default=None,
+        description="The keys of the measurements that are energy meter readings of energy import from grid [kWh].",
+        examples=[["grid_import_emr"]],
     )
-    load3_name: Optional[str] = Field(
-        default=None, description="Name of the load3 source", examples=[None]
-    )
-    load4_name: Optional[str] = Field(
-        default=None, description="Name of the load4 source", examples=[None]
+
+    pv_production_emr_keys: Optional[list[str]] = Field(
+        default=None,
+        description="The keys of the measurements that are PV production energy meter readings [kWh].",
+        examples=[["pv1_emr"]],
     )
 
+    ## Computed fields
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def keys(self) -> list[str]:
+        """The keys of the measurements that can be stored."""
+        key_list = []
+        for key in self.__class__.model_fields.keys():
+            if key.endswith("_keys") and (value := getattr(self, key)):
+                key_list.extend(value)
+        return sorted(set(key_list))
+
 
 class MeasurementDataRecord(DataRecord):
-    """Represents a measurement data record containing various measurements at a specific datetime.
+    """Represents a measurement data record containing various measurements at a specific datetime."""
 
-    Attributes:
-        date_time (Optional[DateTime]): The datetime of the record.
-    """
-
-    # Single loads, to be aggregated to total load
-    load0_mr: Optional[float] = Field(
-        default=None, ge=0, description="Load0 meter reading [kWh]", examples=[40421]
-    )
-    load1_mr: Optional[float] = Field(
-        default=None, ge=0, description="Load1 meter reading [kWh]", examples=[None]
-    )
-    load2_mr: Optional[float] = Field(
-        default=None, ge=0, description="Load2 meter reading [kWh]", examples=[None]
-    )
-    load3_mr: Optional[float] = Field(
-        default=None, ge=0, description="Load3 meter reading [kWh]", examples=[None]
-    )
-    load4_mr: Optional[float] = Field(
-        default=None, ge=0, description="Load4 meter reading [kWh]", examples=[None]
-    )
-
-    max_loads: ClassVar[int] = 5  # Maximum number of loads that can be set
-
-    grid_export_mr: Optional[float] = Field(
-        default=None, ge=0, description="Export to grid meter reading [kWh]", examples=[1000]
-    )
-
-    grid_import_mr: Optional[float] = Field(
-        default=None, ge=0, description="Import from grid meter reading [kWh]", examples=[1000]
-    )
-
-    # Computed fields
-    @computed_field  # type: ignore[prop-decorator]
-    @property
-    def loads(self) -> List[str]:
-        """Compute a list of active loads."""
-        active_loads = []
-
-        # Loop through loadx
-        for i in range(self.max_loads):
-            load_attr = f"load{i}_mr"
-
-            # Check if either attribute is set and add to active loads
-            if getattr(self, load_attr, None):
-                active_loads.append(load_attr)
-
-        return active_loads
+    @classmethod
+    def configured_data_keys(cls) -> Optional[list[str]]:
+        """Return the keys for the configured field like data."""
+        keys = cls.config.measurement.keys
+        # Add measurment keys that are needed/ handled by the resource/ device simulations.
+        if cls.config.devices.measurement_keys:
+            keys.extend(cls.config.devices.measurement_keys)
+        return keys
 
 
 class Measurement(SingletonMixin, DataImportMixin, DataSequence):
@@ -98,14 +77,10 @@ class Measurement(SingletonMixin, DataImportMixin, DataSequence):
     Measurements can be provided programmatically or read from JSON string or file.
     """
 
-    records: List[MeasurementDataRecord] = Field(
-        default_factory=list, description="List of measurement data records"
+    records: list[MeasurementDataRecord] = Field(
+        default_factory=list, description="list of measurement data records"
     )
 
-    topics: ClassVar[List[str]] = [
-        "load",
-    ]
-
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         if hasattr(self, "_initialized"):
             return
@@ -141,34 +116,6 @@ class Measurement(SingletonMixin, DataImportMixin, DataSequence):
         # Return ceiling of division to include partial intervals
         return int(np.ceil(diff_seconds / interval_seconds))
 
-    def name_to_key(self, name: str, topic: str) -> Optional[str]:
-        """Provides measurement key for given name and topic."""
-        topic = topic.lower()
-
-        if topic not in self.topics:
-            return None
-
-        topic_keys = [
-            key for key in self.config.measurement.model_fields.keys() if key.startswith(topic)
-        ]
-        key = None
-        if topic == "load":
-            for config_key in topic_keys:
-                if (
-                    config_key.endswith("_name")
-                    and getattr(self.config.measurement, config_key) == name
-                ):
-                    key = topic + config_key[len(topic) : len(topic) + 1] + "_mr"
-                    break
-
-        if key is not None and key not in self.record_keys:
-            # Should never happen
-            error_msg = f"Key '{key}' not available."
-            logger.error(error_msg)
-            raise KeyError(error_msg)
-
-        return key
-
     def _energy_from_meter_readings(
         self,
         key: str,
@@ -253,12 +200,15 @@ class Measurement(SingletonMixin, DataImportMixin, DataSequence):
             end_datetime = self[-1].date_time
         size = self._interval_count(start_datetime, end_datetime, interval)
         load_total_array = np.zeros(size)
-        # Loop through load<x>_mr
-        for i in range(self.record_class().max_loads):
-            key = f"load{i}_mr"
+        # Loop through all loads
+        if isinstance(self.config.measurement.load_emr_keys, list):
+            for key in self.config.measurement.load_emr_keys:
                 # Calculate load per interval
                 load_array = self._energy_from_meter_readings(
-                key=key, start_datetime=start_datetime, end_datetime=end_datetime, interval=interval
+                    key=key,
+                    start_datetime=start_datetime,
+                    end_datetime=end_datetime,
+                    interval=interval,
                 )
                 # Add calculated load to total load
                 load_total_array += load_array

src/akkudoktoreos/optimization/genetic.py

@@ -1,677 +0,0 @@
-import random
-import time
-from typing import Any, Optional
-
-import numpy as np
-from deap import algorithms, base, creator, tools
-from loguru import logger
-from pydantic import Field, field_validator, model_validator
-from typing_extensions import Self
-
-from akkudoktoreos.core.coreabc import (
-    ConfigMixin,
-    DevicesMixin,
-    EnergyManagementSystemMixin,
-)
-from akkudoktoreos.core.ems import EnergyManagementParameters, SimulationResult
-from akkudoktoreos.core.pydantic import ParametersBaseModel
-from akkudoktoreos.devices.battery import (
-    Battery,
-    ElectricVehicleParameters,
-    ElectricVehicleResult,
-    SolarPanelBatteryParameters,
-)
-from akkudoktoreos.devices.generic import HomeAppliance, HomeApplianceParameters
-from akkudoktoreos.devices.inverter import Inverter, InverterParameters
-from akkudoktoreos.utils.utils import NumpyEncoder
-
-
-class OptimizationParameters(ParametersBaseModel):
-    ems: EnergyManagementParameters
-    pv_akku: Optional[SolarPanelBatteryParameters]
-    inverter: Optional[InverterParameters]
-    eauto: Optional[ElectricVehicleParameters]
-    dishwasher: Optional[HomeApplianceParameters] = None
-    temperature_forecast: Optional[list[Optional[float]]] = Field(
-        default=None,
-        description="An array of floats representing the temperature forecast in degrees Celsius for different time intervals.",
-    )
-    start_solution: Optional[list[float]] = Field(
-        default=None, description="Can be `null` or contain a previous solution (if available)."
-    )
-
-    @model_validator(mode="after")
-    def validate_list_length(self) -> Self:
-        arr_length = len(self.ems.pv_prognose_wh)
-        if self.temperature_forecast is not None and arr_length != len(self.temperature_forecast):
-            raise ValueError("Input lists have different lengths")
-        return self
-
-    @field_validator("start_solution")
-    def validate_start_solution(
-        cls, start_solution: Optional[list[float]]
-    ) -> Optional[list[float]]:
-        if start_solution is not None and len(start_solution) < 2:
-            raise ValueError("Requires at least two values.")
-        return start_solution
-
-
-class OptimizeResponse(ParametersBaseModel):
-    """**Note**: The first value of "Last_Wh_per_hour", "Netzeinspeisung_Wh_per_hour", and "Netzbezug_Wh_per_hour", will be set to null in the JSON output and represented as NaN or None in the corresponding classes' data returns. This approach is adopted to ensure that the current hour's processing remains unchanged."""
-
-    ac_charge: list[float] = Field(
-        description="Array with AC charging values as relative power (0-1), other values set to 0."
-    )
-    dc_charge: list[float] = Field(
-        description="Array with DC charging values as relative power (0-1), other values set to 0."
-    )
-    discharge_allowed: list[int] = Field(
-        description="Array with discharge values (1 for discharge, 0 otherwise)."
-    )
-    eautocharge_hours_float: Optional[list[float]] = Field(description="TBD")
-    result: SimulationResult
-    eauto_obj: Optional[ElectricVehicleResult]
-    start_solution: Optional[list[float]] = Field(
-        default=None,
-        description="An array of binary values (0 or 1) representing a possible starting solution for the simulation.",
-    )
-    washingstart: Optional[int] = Field(
-        default=None,
-        description="Can be `null` or contain an object representing the start of washing (if applicable).",
-    )
-
-    @field_validator(
-        "ac_charge",
-        "dc_charge",
-        "discharge_allowed",
-        mode="before",
-    )
-    def convert_numpy(cls, field: Any) -> Any:
-        return NumpyEncoder.convert_numpy(field)[0]
-
-    @field_validator(
-        "eauto_obj",
-        mode="before",
-    )
-    def convert_eauto(cls, field: Any) -> Any:
-        if isinstance(field, Battery):
-            return ElectricVehicleResult(**field.to_dict())
-        return field
-
-
-class optimization_problem(ConfigMixin, DevicesMixin, EnergyManagementSystemMixin):
-    def __init__(
-        self,
-        verbose: bool = False,
-        fixed_seed: Optional[int] = None,
-    ):
-        """Initialize the optimization problem with the required parameters."""
-        self.opti_param: dict[str, Any] = {}
-        self.fixed_eauto_hours = self.config.prediction.hours - self.config.optimization.hours
-        self.possible_charge_values = self.config.optimization.ev_available_charge_rates_percent
-        self.verbose = verbose
-        self.fix_seed = fixed_seed
-        self.optimize_ev = True
-        self.optimize_dc_charge = False
-        self.fitness_history: dict[str, Any] = {}
-
-        # Set a fixed seed for random operations if provided or in debug mode
-        if self.fix_seed is not None:
-            random.seed(self.fix_seed)
-        elif logger.level == "DEBUG":
-            self.fix_seed = random.randint(1, 100000000000)  # noqa: S311
-            random.seed(self.fix_seed)
-
-    def decode_charge_discharge(
-        self, discharge_hours_bin: np.ndarray
-    ) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
-        """Decode the input array into ac_charge, dc_charge, and discharge arrays."""
-        discharge_hours_bin_np = np.array(discharge_hours_bin)
-        len_ac = len(self.possible_charge_values)
-
-        # Categorization:
-        # Idle:       0 .. len_ac-1
-        # Discharge:  len_ac .. 2*len_ac - 1
-        # AC Charge:  2*len_ac .. 3*len_ac - 1
-        # DC optional: 3*len_ac (not allowed), 3*len_ac + 1 (allowed)
-
-        # Idle has no charge, Discharge has binary 1, AC Charge has corresponding values
-        # Idle states
-        idle_mask = (discharge_hours_bin_np >= 0) & (discharge_hours_bin_np < len_ac)
-
-        # Discharge states
-        discharge_mask = (discharge_hours_bin_np >= len_ac) & (discharge_hours_bin_np < 2 * len_ac)
-
-        # AC states
-        ac_mask = (discharge_hours_bin_np >= 2 * len_ac) & (discharge_hours_bin_np < 3 * len_ac)
-        ac_indices = (discharge_hours_bin_np[ac_mask] - 2 * len_ac).astype(int)
-
-        # DC states (if enabled)
-        if self.optimize_dc_charge:
-            dc_not_allowed_state = 3 * len_ac
-            dc_allowed_state = 3 * len_ac + 1
-            dc_charge = np.where(discharge_hours_bin_np == dc_allowed_state, 1, 0)
-        else:
-            dc_charge = np.ones_like(discharge_hours_bin_np, dtype=float)
-
-        # Generate the result arrays
-        discharge = np.zeros_like(discharge_hours_bin_np, dtype=int)
-        discharge[discharge_mask] = 1  # Set Discharge states to 1
-
-        ac_charge = np.zeros_like(discharge_hours_bin_np, dtype=float)
-        ac_charge[ac_mask] = [self.possible_charge_values[i] for i in ac_indices]
-
-        # Idle is just 0, already default.
-
-        return ac_charge, dc_charge, discharge
-
-    def mutate(self, individual: list[int]) -> tuple[list[int]]:
-        """Custom mutation function for the individual."""
-        # Calculate the number of states
-        len_ac = len(self.possible_charge_values)
-        if self.optimize_dc_charge:
-            total_states = 3 * len_ac + 2
-        else:
-            total_states = 3 * len_ac
-
-        # 1. Mutating the charge_discharge part
-        charge_discharge_part = individual[: self.config.prediction.hours]
-        (charge_discharge_mutated,) = self.toolbox.mutate_charge_discharge(charge_discharge_part)
-
-        # Instead of a fixed clamping to 0..8 or 0..6 dynamically:
-        charge_discharge_mutated = np.clip(charge_discharge_mutated, 0, total_states - 1)
-        individual[: self.config.prediction.hours] = charge_discharge_mutated
-
-        # 2. Mutating the EV charge part, if active
-        if self.optimize_ev:
-            ev_charge_part = individual[
-                self.config.prediction.hours : self.config.prediction.hours * 2
-            ]
-            (ev_charge_part_mutated,) = self.toolbox.mutate_ev_charge_index(ev_charge_part)
-            ev_charge_part_mutated[self.config.prediction.hours - self.fixed_eauto_hours :] = [
-                0
-            ] * self.fixed_eauto_hours
-            individual[self.config.prediction.hours : self.config.prediction.hours * 2] = (
-                ev_charge_part_mutated
-            )
-
-        # 3. Mutating the appliance start time, if applicable
-        if self.opti_param["home_appliance"] > 0:
-            appliance_part = [individual[-1]]
-            (appliance_part_mutated,) = self.toolbox.mutate_hour(appliance_part)
-            individual[-1] = appliance_part_mutated[0]
-
-        return (individual,)
-
-    # Method to create an individual based on the conditions
-    def create_individual(self) -> list[int]:
-        # Start with discharge states for the individual
-        individual_components = [
-            self.toolbox.attr_discharge_state() for _ in range(self.config.prediction.hours)
-        ]
-
-        # Add EV charge index values if optimize_ev is True
-        if self.optimize_ev:
-            individual_components += [
-                self.toolbox.attr_ev_charge_index() for _ in range(self.config.prediction.hours)
-            ]
-
-        # Add the start time of the household appliance if it's being optimized
-        if self.opti_param["home_appliance"] > 0:
-            individual_components += [self.toolbox.attr_int()]
-
-        return creator.Individual(individual_components)
-
-    def merge_individual(
-        self,
-        discharge_hours_bin: np.ndarray,
-        eautocharge_hours_index: Optional[np.ndarray],
-        washingstart_int: Optional[int],
-    ) -> list[int]:
-        """Merge the individual components back into a single solution list.
-
-        Parameters:
-            discharge_hours_bin (np.ndarray): Binary discharge hours.
-            eautocharge_hours_index (Optional[np.ndarray]): EV charge hours as integers, or None.
-            washingstart_int (Optional[int]): Dishwasher start time as integer, or None.
-
-        Returns:
-            list[int]: The merged individual solution as a list of integers.
-        """
-        # Start with the discharge hours
-        individual = discharge_hours_bin.tolist()
-
-        # Add EV charge hours if applicable
-        if self.optimize_ev and eautocharge_hours_index is not None:
-            individual.extend(eautocharge_hours_index.tolist())
-        elif self.optimize_ev:
-            # Falls optimize_ev aktiv ist, aber keine EV-Daten vorhanden sind, fügen wir Nullen hinzu
-            individual.extend([0] * self.config.prediction.hours)
-
-        # Add dishwasher start time if applicable
-        if self.opti_param.get("home_appliance", 0) > 0 and washingstart_int is not None:
-            individual.append(washingstart_int)
-        elif self.opti_param.get("home_appliance", 0) > 0:
-            # Falls ein Haushaltsgerät optimiert wird, aber kein Startzeitpunkt vorhanden ist
-            individual.append(0)
-
-        return individual
-
-    def split_individual(
-        self, individual: list[int]
-    ) -> tuple[np.ndarray, Optional[np.ndarray], Optional[int]]:
-        """Split the individual solution into its components.
-
-        Components:
-        1. Discharge hours (binary as int NumPy array),
-        2. Electric vehicle charge hours (float as int NumPy array, if applicable),
-        3. Dishwasher start time (integer if applicable).
-        """
-        # Discharge hours as a NumPy array of ints
-        discharge_hours_bin = np.array(individual[: self.config.prediction.hours], dtype=int)
-
-        # EV charge hours as a NumPy array of ints (if optimize_ev is True)
-        eautocharge_hours_index = (
-            # append ev charging states to individual
-            np.array(
-                individual[self.config.prediction.hours : self.config.prediction.hours * 2],
-                dtype=int,
-            )
-            if self.optimize_ev
-            else None
-        )
-
-        # Washing machine start time as an integer (if applicable)
-        washingstart_int = (
-            int(individual[-1])
-            if self.opti_param and self.opti_param.get("home_appliance", 0) > 0
-            else None
-        )
-
-        return discharge_hours_bin, eautocharge_hours_index, washingstart_int
-
-    def setup_deap_environment(self, opti_param: dict[str, Any], start_hour: int) -> None:
-        """Set up the DEAP environment with fitness and individual creation rules."""
-        self.opti_param = opti_param
-
-        # Remove existing definitions if any
-        for attr in ["FitnessMin", "Individual"]:
-            if attr in creator.__dict__:
-                del creator.__dict__[attr]
-
-        creator.create("FitnessMin", base.Fitness, weights=(-1.0,))
-        creator.create("Individual", list, fitness=creator.FitnessMin)
-
-        self.toolbox = base.Toolbox()
-        len_ac = len(self.possible_charge_values)
-
-        # Total number of states without DC:
-        # Idle: len_ac states
-        # Discharge: len_ac states
-        # AC-Charge: len_ac states
-        # Total without DC: 3 * len_ac
-
-        # With DC: + 2 states
-        if self.optimize_dc_charge:
-            total_states = 3 * len_ac + 2
-        else:
-            total_states = 3 * len_ac
-
-        # State space: 0 .. (total_states - 1)
-        self.toolbox.register("attr_discharge_state", random.randint, 0, total_states - 1)
-
-        # EV attributes
-        if self.optimize_ev:
-            self.toolbox.register(
-                "attr_ev_charge_index",
-                random.randint,
-                0,
-                len_ac - 1,
-            )
-
-        # Household appliance start time
-        self.toolbox.register("attr_int", random.randint, start_hour, 23)
-
-        self.toolbox.register("individual", self.create_individual)
-        self.toolbox.register("population", tools.initRepeat, list, self.toolbox.individual)
-        self.toolbox.register("mate", tools.cxTwoPoint)
-
-        # Mutation operator for charge/discharge states
-        self.toolbox.register(
-            "mutate_charge_discharge", tools.mutUniformInt, low=0, up=total_states - 1, indpb=0.2
-        )
-
-        # Mutation operator for EV states
-        self.toolbox.register(
-            "mutate_ev_charge_index",
-            tools.mutUniformInt,
-            low=0,
-            up=len_ac - 1,
-            indpb=0.2,
-        )
-
-        # Mutation for household appliance
-        self.toolbox.register("mutate_hour", tools.mutUniformInt, low=start_hour, up=23, indpb=0.2)
-
-        # Custom mutate function remains unchanged
-        self.toolbox.register("mutate", self.mutate)
-        self.toolbox.register("select", tools.selTournament, tournsize=3)
-
-    def evaluate_inner(self, individual: list[int]) -> dict[str, Any]:
-        """Simulates the energy management system (EMS) using the provided individual solution.
-
-        This is an internal function.
-        """
-        self.ems.reset()
-        discharge_hours_bin, eautocharge_hours_index, washingstart_int = self.split_individual(
-            individual
-        )
-        if self.opti_param.get("home_appliance", 0) > 0:
-            self.ems.set_home_appliance_start(
-                washingstart_int, global_start_hour=self.ems.start_datetime.hour
-            )
-
-        ac, dc, discharge = self.decode_charge_discharge(discharge_hours_bin)
-
-        self.ems.set_akku_discharge_hours(discharge)
-        # Set DC charge hours only if DC optimization is enabled
-        if self.optimize_dc_charge:
-            self.ems.set_akku_dc_charge_hours(dc)
-        self.ems.set_akku_ac_charge_hours(ac)
-
-        if eautocharge_hours_index is not None:
-            eautocharge_hours_float = np.array(
-                [self.possible_charge_values[i] for i in eautocharge_hours_index],
-                float,
-            )
-            self.ems.set_ev_charge_hours(eautocharge_hours_float)
-        else:
-            self.ems.set_ev_charge_hours(np.full(self.config.prediction.hours, 0))
-
-        return self.ems.simulate(self.ems.start_datetime.hour)
-
-    def evaluate(
-        self,
-        individual: list[int],
-        parameters: OptimizationParameters,
-        start_hour: int,
-        worst_case: bool,
-    ) -> tuple[float]:
-        """Evaluate the fitness of an individual solution based on the simulation results."""
-        try:
-            o = self.evaluate_inner(individual)
-        except Exception as e:
-            return (100000.0,)  # Return a high penalty in case of an exception
-
-        gesamtbilanz = o["Gesamtbilanz_Euro"] * (-1.0 if worst_case else 1.0)
-
-        discharge_hours_bin, eautocharge_hours_index, washingstart_int = self.split_individual(
-            individual
-        )
-
-        # EV 100% & charge not allowed
-        if self.optimize_ev:
-            eauto_soc_per_hour = np.array(o.get("EAuto_SoC_pro_Stunde", []))  # Beispielkey
-
-            if eauto_soc_per_hour is None or eautocharge_hours_index is None:
-                raise ValueError("eauto_soc_per_hour or eautocharge_hours_index is None")
-            min_length = min(eauto_soc_per_hour.size, eautocharge_hours_index.size)
-            eauto_soc_per_hour_tail = eauto_soc_per_hour[-min_length:]
-            eautocharge_hours_index_tail = eautocharge_hours_index[-min_length:]
-
-            # Mask
-            invalid_charge_mask = (eauto_soc_per_hour_tail == 100) & (
-                eautocharge_hours_index_tail > 0
-            )
-
-            if np.any(invalid_charge_mask):
-                invalid_indices = np.where(invalid_charge_mask)[0]
-                if len(invalid_indices) > 1:
-                    eautocharge_hours_index_tail[invalid_indices[1:]] = 0
-
-                eautocharge_hours_index[-min_length:] = eautocharge_hours_index_tail.tolist()
-
-                adjusted_individual = self.merge_individual(
-                    discharge_hours_bin, eautocharge_hours_index, washingstart_int
-                )
-
-                individual[:] = adjusted_individual
-
-        # New check: Activate discharge when battery SoC is 0
-        # battery_soc_per_hour = np.array(
-        #     o.get("akku_soc_pro_stunde", [])
-        # )  # Example key for battery SoC
-
-        # if battery_soc_per_hour is not None:
-        #     if battery_soc_per_hour is None or discharge_hours_bin is None:
-        #         raise ValueError("battery_soc_per_hour or discharge_hours_bin is None")
-        #     min_length = min(battery_soc_per_hour.size, discharge_hours_bin.size)
-        #     battery_soc_per_hour_tail = battery_soc_per_hour[-min_length:]
-        #     discharge_hours_bin_tail = discharge_hours_bin[-min_length:]
-        #     len_ac = len(self.config.optimization.ev_available_charge_rates_percent)
-
-        #     # # Find hours where battery SoC is 0
-        #     # zero_soc_mask = battery_soc_per_hour_tail == 0
-        #     # discharge_hours_bin_tail[zero_soc_mask] = (
-        #     #     len_ac + 2
-        #     # )  # Activate discharge for these hours
-
-        #     # When Battery SoC then set the Discharge randomly to 0 or 1. otherwise it's very unlikely to get a state where a battery can store energy for a longer time
-        #     # Find hours where battery SoC is 0
-        #     zero_soc_mask = battery_soc_per_hour_tail == 0
-        #     # discharge_hours_bin_tail[zero_soc_mask] = (
-        #     # len_ac + 2
-        #     # )  # Activate discharge for these hours
-        #     set_to_len_ac_plus_2 = np.random.rand() < 0.5  # True mit 50% Wahrscheinlichkeit
-
-        #     # Werte setzen basierend auf der zufälligen Entscheidung
-        #     value_to_set = len_ac + 2 if set_to_len_ac_plus_2 else 0
-        #     discharge_hours_bin_tail[zero_soc_mask] = value_to_set
-
-        #     # Merge the updated discharge_hours_bin back into the individual
-        #     adjusted_individual = self.merge_individual(
-        #         discharge_hours_bin, eautocharge_hours_index, washingstart_int
-        #     )
-        #     individual[:] = adjusted_individual
-
-        # More metrics
-        individual.extra_data = (  # type: ignore[attr-defined]
-            o["Gesamtbilanz_Euro"],
-            o["Gesamt_Verluste"],
-            parameters.eauto.min_soc_percentage - self.ems.ev.current_soc_percentage()
-            if parameters.eauto and self.ems.ev
-            else 0,
-        )
-
-        # Adjust total balance with battery value and penalties for unmet SOC
-        restwert_akku = (
-            self.ems.battery.current_energy_content() * parameters.ems.preis_euro_pro_wh_akku
-        )
-        gesamtbilanz += -restwert_akku
-
-        if self.optimize_ev:
-            gesamtbilanz += max(
-                0,
-                (
-                    parameters.eauto.min_soc_percentage - self.ems.ev.current_soc_percentage()
-                    if parameters.eauto and self.ems.ev
-                    else 0
-                )
-                * self.config.optimization.penalty,
-            )
-
-        return (gesamtbilanz,)
-
-    def optimize(
-        self, start_solution: Optional[list[float]] = None, ngen: int = 200
-    ) -> tuple[Any, dict[str, list[Any]]]:
-        """Run the optimization process using a genetic algorithm."""
-        population = self.toolbox.population(n=300)
-        hof = tools.HallOfFame(1)
-        stats = tools.Statistics(lambda ind: ind.fitness.values)
-        stats.register("min", np.min)
-        stats.register("avg", np.mean)
-        stats.register("max", np.max)
-
-        if self.verbose:
-            print("Start optimize:", start_solution)
-
-        # Insert the start solution into the population if provided
-        if start_solution is not None:
-            for _ in range(10):
-                population.insert(0, creator.Individual(start_solution))
-
-        # Run the evolutionary algorithm
-        pop, log = algorithms.eaMuPlusLambda(
-            population,
-            self.toolbox,
-            mu=100,
-            lambda_=150,
-            cxpb=0.6,
-            mutpb=0.4,
-            ngen=ngen,
-            stats=stats,
-            halloffame=hof,
-            verbose=self.verbose,
-        )
-
-        # Store fitness history
-        self.fitness_history = {
-            "gen": log.select("gen"),  # Generation numbers (X-axis)
-            "avg": log.select("avg"),  # Average fitness for each generation (Y-axis)
-            "max": log.select("max"),  # Maximum fitness for each generation (Y-axis)
-            "min": log.select("min"),  # Minimum fitness for each generation (Y-axis)
-        }
-
-        member: dict[str, list[float]] = {"bilanz": [], "verluste": [], "nebenbedingung": []}
-        for ind in population:
-            if hasattr(ind, "extra_data"):
-                extra_value1, extra_value2, extra_value3 = ind.extra_data
-                member["bilanz"].append(extra_value1)
-                member["verluste"].append(extra_value2)
-                member["nebenbedingung"].append(extra_value3)
-
-        return hof[0], member
-
-    def optimierung_ems(
-        self,
-        parameters: OptimizationParameters,
-        start_hour: Optional[int] = None,
-        worst_case: bool = False,
-        ngen: int = 400,
-    ) -> OptimizeResponse:
-        """Perform EMS (Energy Management System) optimization and visualize results."""
-        if start_hour is None:
-            start_hour = self.ems.start_datetime.hour
-
-        einspeiseverguetung_euro_pro_wh = np.full(
-            self.config.prediction.hours, parameters.ems.einspeiseverguetung_euro_pro_wh
-        )
-
-        # TODO: Refactor device setup phase out
-        self.devices.reset()
-
-        # Initialize PV and EV batteries
-        akku: Optional[Battery] = None
-        if parameters.pv_akku:
-            akku = Battery(parameters.pv_akku)
-            self.devices.add_device(akku)
-            akku.set_charge_per_hour(np.full(self.config.prediction.hours, 1))
-
-        eauto: Optional[Battery] = None
-        if parameters.eauto:
-            eauto = Battery(
-                parameters.eauto,
-            )
-            self.devices.add_device(eauto)
-            eauto.set_charge_per_hour(np.full(self.config.prediction.hours, 1))
-            self.optimize_ev = (
-                parameters.eauto.min_soc_percentage - parameters.eauto.initial_soc_percentage >= 0
-            )
-        else:
-            self.optimize_ev = False
-
-        # Initialize household appliance if applicable
-        dishwasher = (
-            HomeAppliance(
-                parameters=parameters.dishwasher,
-            )
-            if parameters.dishwasher is not None
-            else None
-        )
-        self.devices.add_device(dishwasher)
-
-        # Initialize the inverter and energy management system
-        inverter: Optional[Inverter] = None
-        if parameters.inverter:
-            inverter = Inverter(
-                parameters.inverter,
-            )
-            self.devices.add_device(inverter)
-
-        self.devices.post_setup()
-
-        self.ems.set_parameters(
-            parameters.ems,
-            inverter=inverter,
-            ev=eauto,
-            home_appliance=dishwasher,
-        )
-        self.ems.set_start_hour(start_hour)
-
-        # Setup the DEAP environment and optimization process
-        self.setup_deap_environment({"home_appliance": 1 if dishwasher else 0}, start_hour)
-        self.toolbox.register(
-            "evaluate",
-            lambda ind: self.evaluate(ind, parameters, start_hour, worst_case),
-        )
-
-        if self.verbose:
-            start_time = time.time()
-        start_solution, extra_data = self.optimize(parameters.start_solution, ngen=ngen)
-
-        if self.verbose:
-            elapsed_time = time.time() - start_time
-            print(f"Time evaluate inner: {elapsed_time:.4f} sec.")
-        # Perform final evaluation on the best solution
-        o = self.evaluate_inner(start_solution)
-        discharge_hours_bin, eautocharge_hours_index, washingstart_int = self.split_individual(
-            start_solution
-        )
-        eautocharge_hours_float = (
-            [self.possible_charge_values[i] for i in eautocharge_hours_index]
-            if eautocharge_hours_index is not None
-            else None
-        )
-
-        ac_charge, dc_charge, discharge = self.decode_charge_discharge(discharge_hours_bin)
-        # Visualize the results
-        visualize = {
-            "ac_charge": ac_charge.tolist(),
-            "dc_charge": dc_charge.tolist(),
-            "discharge_allowed": discharge.tolist(),
-            "eautocharge_hours_float": eautocharge_hours_float,
-            "result": o,
-            "eauto_obj": self.ems.ev.to_dict(),
-            "start_solution": start_solution,
-            "spuelstart": washingstart_int,
-            "extra_data": extra_data,
-            "fitness_history": self.fitness_history,
-            "fixed_seed": self.fix_seed,
-        }
-        from akkudoktoreos.utils.visualize import prepare_visualize
-
-        prepare_visualize(parameters, visualize, start_hour=start_hour)
-
-        return OptimizeResponse(
-            **{
-                "ac_charge": ac_charge,
-                "dc_charge": dc_charge,
-                "discharge_allowed": discharge,
-                "eautocharge_hours_float": eautocharge_hours_float,
-                "result": SimulationResult(**o),
-                "eauto_obj": self.ems.ev,
-                "start_solution": start_solution,
-                "washingstart": washingstart_int,
-            }
-        )

src/akkudoktoreos/optimization/genetic/geneticabc.py

@@ -0,0 +1,11 @@
+"""Genetic optimization algorithm abstract and base classes."""
+
+from pydantic import ConfigDict
+
+from akkudoktoreos.core.pydantic import PydanticBaseModel
+
+
+class GeneticParametersBaseModel(PydanticBaseModel):
+    """Pydantic base model for parameters for the GENETIC algorithm."""
+
+    model_config = ConfigDict(extra="forbid")

src/akkudoktoreos/optimization/genetic/geneticdevices.py

@@ -0,0 +1,132 @@
+"""Genetic optimization algorithm device interfaces/ parameters."""
+
+from typing import Optional
+
+from pydantic import Field
+
+from akkudoktoreos.optimization.genetic.geneticabc import GeneticParametersBaseModel
+from akkudoktoreos.utils.datetimeutil import TimeWindowSequence
+
+
+class DeviceParameters(GeneticParametersBaseModel):
+    device_id: str = Field(description="ID of device", examples="device1")
+    hours: Optional[int] = Field(
+        default=None,
+        gt=0,
+        description="Number of prediction hours. Defaults to global config prediction hours.",
+        examples=[None],
+    )
+
+
+def max_charging_power_field(description: Optional[str] = None) -> float:
+    if description is None:
+        description = "Maximum charging power in watts."
+    return Field(
+        default=5000,
+        gt=0,
+        description=description,
+    )
+
+
+def initial_soc_percentage_field(description: str) -> int:
+    return Field(default=0, ge=0, le=100, description=description, examples=[42])
+
+
+def discharging_efficiency_field(default_value: float) -> float:
+    return Field(
+        default=default_value,
+        gt=0,
+        le=1,
+        description="A float representing the discharge efficiency of the battery.",
+    )
+
+
+class BaseBatteryParameters(DeviceParameters):
+    """Battery Device Simulation Configuration."""
+
+    device_id: str = Field(description="ID of battery", examples=["battery1"])
+    capacity_wh: int = Field(
+        gt=0,
+        description="An integer representing the capacity of the battery in watt-hours.",
+        examples=[8000],
+    )
+    charging_efficiency: float = Field(
+        default=0.88,
+        gt=0,
+        le=1,
+        description="A float representing the charging efficiency of the battery.",
+    )
+    discharging_efficiency: float = discharging_efficiency_field(0.88)
+    max_charge_power_w: Optional[float] = max_charging_power_field()
+    initial_soc_percentage: int = initial_soc_percentage_field(
+        "An integer representing the state of charge of the battery at the **start** of the current hour (not the current state)."
+    )
+    min_soc_percentage: int = Field(
+        default=0,
+        ge=0,
+        le=100,
+        description="An integer representing the minimum state of charge (SOC) of the battery in percentage.",
+        examples=[10],
+    )
+    max_soc_percentage: int = Field(
+        default=100,
+        ge=0,
+        le=100,
+        description="An integer representing the maximum state of charge (SOC) of the battery in percentage.",
+    )
+    charge_rates: Optional[list[float]] = Field(
+        default=None,
+        description="Charge rates as factor of maximum charging power [0.00 ... 1.00]. None denotes all charge rates are available.",
+        examples=[[0.0, 0.25, 0.5, 0.75, 1.0], None],
+    )
+
+
+class SolarPanelBatteryParameters(BaseBatteryParameters):
+    """PV battery device simulation configuration."""
+
+    max_charge_power_w: Optional[float] = max_charging_power_field()
+
+
+class ElectricVehicleParameters(BaseBatteryParameters):
+    """Battery Electric Vehicle Device Simulation Configuration."""
+
+    device_id: str = Field(description="ID of electric vehicle", examples=["ev1"])
+    discharging_efficiency: float = discharging_efficiency_field(1.0)
+    initial_soc_percentage: int = initial_soc_percentage_field(
+        "An integer representing the current state of charge (SOC) of the battery in percentage."
+    )
+
+
+class HomeApplianceParameters(DeviceParameters):
+    """Home Appliance Device Simulation Configuration."""
+
+    device_id: str = Field(description="ID of home appliance", examples=["dishwasher"])
+    consumption_wh: int = Field(
+        gt=0,
+        description="An integer representing the energy consumption of a household device in watt-hours.",
+        examples=[2000],
+    )
+    duration_h: int = Field(
+        gt=0,
+        description="An integer representing the usage duration of a household device in hours.",
+        examples=[3],
+    )
+    time_windows: Optional[TimeWindowSequence] = Field(
+        default=None,
+        description="List of allowed time windows. Defaults to optimization general time window.",
+        examples=[
+            [
+                {"start_time": "10:00", "duration": "2 hours"},
+            ],
+        ],
+    )
+
+
+class InverterParameters(DeviceParameters):
+    """Inverter Device Simulation Configuration."""
+
+    device_id: str = Field(description="ID of inverter", examples=["inverter1"])
+    max_power_wh: float = Field(gt=0, examples=[10000])
+    battery_id: Optional[str] = Field(
+        default=None, description="ID of battery", examples=[None, "battery1"]
+    )

src/akkudoktoreos/optimization/genetic/geneticparams.py

@@ -0,0 +1,638 @@
+"""GENETIC algorithm paramters.
+
+This module defines the Pydantic-based configuration and input parameter models
+used in the energy optimization routines, including photovoltaic forecasts,
+electricity pricing, and system component parameters.
+
+It also provides a method to assemble these parameters from predictions,
+forecasts, and fallback defaults, preparing them for optimization runs.
+"""
+
+from typing import Optional, Union
+
+from loguru import logger
+from pydantic import Field, field_validator, model_validator
+from typing_extensions import Self
+
+from akkudoktoreos.core.coreabc import (
+    ConfigMixin,
+    MeasurementMixin,
+    PredictionMixin,
+)
+from akkudoktoreos.optimization.genetic.geneticabc import GeneticParametersBaseModel
+from akkudoktoreos.optimization.genetic.geneticdevices import (
+    ElectricVehicleParameters,
+    HomeApplianceParameters,
+    InverterParameters,
+    SolarPanelBatteryParameters,
+)
+from akkudoktoreos.utils.datetimeutil import to_duration
+
+# Do not import directly from akkudoktoreos.core.coreabc
+# EnergyManagementSystemMixin - Creates circular dependency with ems.py
+# StartMixin                  - Creates circular dependency with ems.py
+
+
+class GeneticEnergyManagementParameters(GeneticParametersBaseModel):
+    """Encapsulates energy-related forecasts and costs used in GENETIC optimization."""
+
+    pv_prognose_wh: list[float] = Field(
+        description="An array of floats representing the forecasted photovoltaic output in watts for different time intervals."
+    )
+    strompreis_euro_pro_wh: list[float] = Field(
+        description="An array of floats representing the electricity price in euros per watt-hour for different time intervals."
+    )
+    einspeiseverguetung_euro_pro_wh: Union[list[float], float] = Field(
+        description="A float or array of floats representing the feed-in compensation in euros per watt-hour."
+    )
+    preis_euro_pro_wh_akku: float = Field(
+        description="A float representing the cost of battery energy per watt-hour."
+    )
+    gesamtlast: list[float] = Field(
+        description="An array of floats representing the total load (consumption) in watts for different time intervals."
+    )
+
+    @model_validator(mode="after")
+    def validate_list_length(self) -> Self:
+        """Validate that all input lists are of the same length.
+
+        Raises:
+            ValueError: If input list lengths differ.
+        """
+        pv_prognose_length = len(self.pv_prognose_wh)
+        if (
+            pv_prognose_length != len(self.strompreis_euro_pro_wh)
+            or pv_prognose_length != len(self.gesamtlast)
+            or (
+                isinstance(self.einspeiseverguetung_euro_pro_wh, list)
+                and pv_prognose_length != len(self.einspeiseverguetung_euro_pro_wh)
+            )
+        ):
+            raise ValueError("Input lists have different lengths")
+        return self
+
+
+class GeneticOptimizationParameters(
+    ConfigMixin,
+    MeasurementMixin,
+    PredictionMixin,
+    # EnergyManagementSystemMixin, # Creates circular dependency with ems.py
+    # StartMixin,                  # Creates circular dependency with ems.py
+    GeneticParametersBaseModel,
+):
+    """Main parameter class for running the genetic energy optimization.
+
+    Collects all model and configuration parameters necessary to run the
+    optimization process, such as forecasts, pricing, battery and appliance models.
+    """
+
+    ems: GeneticEnergyManagementParameters
+    pv_akku: Optional[SolarPanelBatteryParameters]
+    inverter: Optional[InverterParameters]
+    eauto: Optional[ElectricVehicleParameters]
+    dishwasher: Optional[HomeApplianceParameters] = None
+    temperature_forecast: Optional[list[Optional[float]]] = Field(
+        default=None,
+        description="An array of floats representing the temperature forecast in degrees Celsius for different time intervals.",
+    )
+    start_solution: Optional[list[float]] = Field(
+        default=None, description="Can be `null` or contain a previous solution (if available)."
+    )
+
+    @model_validator(mode="after")
+    def validate_list_length(self) -> Self:
+        """Ensure that temperature forecast list matches the PV forecast length.
+
+        Raises:
+            ValueError: If list lengths mismatch.
+        """
+        arr_length = len(self.ems.pv_prognose_wh)
+        if self.temperature_forecast is not None and arr_length != len(self.temperature_forecast):
+            raise ValueError("Input lists have different lengths")
+        return self
+
+    @field_validator("start_solution")
+    def validate_start_solution(
+        cls, start_solution: Optional[list[float]]
+    ) -> Optional[list[float]]:
+        """Validate that the starting solution has at least two elements.
+
+        Args:
+            start_solution (list[float]): Optional list of solution values.
+
+        Returns:
+            list[float]: Validated list.
+
+        Raises:
+            ValueError: If the solution is too short.
+        """
+        if start_solution is not None and len(start_solution) < 2:
+            raise ValueError("Requires at least two values.")
+        return start_solution
+
+    @classmethod
+    def prepare(cls) -> "Optional[GeneticOptimizationParameters]":
+        """Prepare optimization parameters from config, forecast and measurement data.
+
+        Fills in values needed for optimization from available configuration, predictions and
+        measurements. If some data is missing, default or demo values are used.
+
+        Parameters start by definition of the genetic algorithm at hour 0 of the actual date
+        (not at start datetime of energy management run)
+
+        Returns:
+            GeneticOptimizationParameters: The fully prepared optimization parameters.
+
+        Raises:
+            ValueError: If required configuration values like start time are missing.
+        """
+        # Avoid circular dependency
+        from akkudoktoreos.core.ems import get_ems
+
+        ems = get_ems()
+
+        # The optimization paramters
+        oparams: "Optional[GeneticOptimizationParameters]" = None
+
+        # Check for run definitions
+        if ems.start_datetime is None:
+            error_msg = "Start datetime unknown."
+            logger.error(error_msg)
+            raise ValueError(error_msg)
+        # Check for general predictions conditions
+        if cls.config.general.latitude is None:
+            default_latitude = 52.52
+            logger.error(f"Latitude unknown - defaulting to {default_latitude}.")
+            cls.config.general.latitude = default_latitude
+        if cls.config.general.longitude is None:
+            default_longitude = 13.405
+            logger.error(f"Longitude unknown - defaulting to {default_longitude}.")
+            cls.config.general.longitude = default_longitude
+        if cls.config.prediction.hours is None:
+            logger.error("Prediction hours unknown - defaulting to 48 hours.")
+            cls.config.prediction.hours = 48
+        if cls.config.prediction.historic_hours is None:
+            logger.error("Prediction historic hours unknown - defaulting to 24 hours.")
+            cls.config.prediction.historic_hours = 24
+        # Check optimization definitions
+        if cls.config.optimization.horizon_hours is None:
+            logger.error("Optimization horizon unknown - defaulting to 24 hours.")
+            cls.config.optimization.horizon_hours = 24
+        if cls.config.optimization.interval is None:
+            logger.error("Optimization interval unknown - defaulting to 3600 seconds.")
+            cls.config.optimization.interval = 3600
+        if cls.config.optimization.interval != 3600:
+            logger.error(
+                "Optimization interval '{}' seconds not supported - forced to 3600 seconds."
+            )
+            cls.config.optimization.interval = 3600
+        # Check genetic algorithm definitions
+        if cls.config.optimization.genetic is None:
+            logger.error(
+                "Genetic optimization configuration not configured - defaulting to demo config."
+            )
+            cls.config.optimization.genetic = {
+                "individuals": 300,
+                "generations": 400,
+                "seed": None,
+                "penalties": {
+                    "ev_soc_miss": 10,
+                },
+            }
+        if cls.config.optimization.genetic.individuals is None:
+            logger.error("Genetic individuals unknown - defaulting to 300.")
+            cls.config.optimization.genetic.individuals = 300
+        if cls.config.optimization.genetic.generations is None:
+            logger.error("Genetic generations unknown - defaulting to 400.")
+            cls.config.optimization.genetic.generations = 400
+        if cls.config.optimization.genetic.penalties is None:
+            logger.error("Genetic penalties unknown - defaulting to demo config.")
+            cls.config.optimization.genetic.penalties = {"ev_soc_miss": 10}
+        if "ev_soc_miss" not in cls.config.optimization.genetic.penalties:
+            logger.error("ev_soc_miss penalty function parameter unknown - defaulting to 100.")
+            cls.config.optimization.genetic.penalties["ev_soc_miss"] = 10
+
+        # Get start solution from last run
+        start_solution = None
+        last_solution = ems.genetic_solution()
+        if last_solution and last_solution.start_solution:
+            start_solution = last_solution.start_solution
+
+        # Add forecast and device data
+        interval = to_duration(cls.config.optimization.interval)
+        power_to_energy_per_interval_factor = cls.config.optimization.interval / 3600
+        parameter_start_datetime = ems.start_datetime.set(hour=0, second=0, microsecond=0)
+        parameter_end_datetime = parameter_start_datetime.add(hours=cls.config.prediction.hours)
+        max_retries = 10
+
+        for attempt in range(1, max_retries + 1):
+            # Collect all the data for optimisation, but do not exceed max retries
+            if attempt > max_retries:
+                error_msg = f"Maximum retries {max_retries} for parameter collection exceeded. Parameter preparation attempt {attempt}."
+                logger.error(error_msg)
+                raise ValueError(error_msg)
+
+            # Assure predictions are uptodate
+            cls.prediction.update_data()
+
+            try:
+                pvforecast_ac_power = (
+                    cls.prediction.key_to_array(
+                        key="pvforecast_ac_power",
+                        start_datetime=parameter_start_datetime,
+                        end_datetime=parameter_end_datetime,
+                        interval=interval,
+                        fill_method="linear",
+                    )
+                    * power_to_energy_per_interval_factor
+                ).tolist()
+            except:
+                logger.exception(
+                    "No PV forecast data available - defaulting to demo data. Parameter preparation attempt {}.",
+                    attempt,
+                )
+                cls.config.merge_settings_from_dict(
+                    {
+                        "pvforecast": {
+                            "provider": "PVForecastAkkudoktor",
+                            "planes": [
+                                {
+                                    "peakpower": 5.0,
+                                    "surface_azimuth": 170,
+                                    "surface_tilt": 7,
+                                    "userhorizon": [20, 27, 22, 20],
+                                    "inverter_paco": 10000,
+                                },
+                                {
+                                    "peakpower": 4.8,
+                                    "surface_azimuth": 90,
+                                    "surface_tilt": 7,
+                                    "userhorizon": [30, 30, 30, 50],
+                                    "inverter_paco": 10000,
+                                },
+                                {
+                                    "peakpower": 1.4,
+                                    "surface_azimuth": 140,
+                                    "surface_tilt": 60,
+                                    "userhorizon": [60, 30, 0, 30],
+                                    "inverter_paco": 2000,
+                                },
+                                {
+                                    "peakpower": 1.6,
+                                    "surface_azimuth": 185,
+                                    "surface_tilt": 45,
+                                    "userhorizon": [45, 25, 30, 60],
+                                    "inverter_paco": 1400,
+                                },
+                            ],
+                        },
+                    }
+                )
+                # Retry
+                continue
+            try:
+                elecprice_marketprice_wh = cls.prediction.key_to_array(
+                    key="elecprice_marketprice_wh",
+                    start_datetime=parameter_start_datetime,
+                    end_datetime=parameter_end_datetime,
+                    interval=interval,
+                    fill_method="ffill",
+                ).tolist()
+            except:
+                logger.exception(
+                    "No Electricity Marketprice forecast data available - defaulting to demo data. Parameter preparation attempt {}.",
+                    attempt,
+                )
+                cls.config.elecprice.provider = "ElecPriceAkkudoktor"
+                # Retry
+                continue
+            try:
+                loadforecast_power_w = cls.prediction.key_to_array(
+                    key="loadforecast_power_w",
+                    start_datetime=parameter_start_datetime,
+                    end_datetime=parameter_end_datetime,
+                    interval=interval,
+                    fill_method="ffill",
+                ).tolist()
+            except:
+                logger.exception(
+                    "No Load forecast data available - defaulting to demo data. Parameter preparation attempt {}.",
+                    attempt,
+                )
+                cls.config.merge_settings_from_dict(
+                    {
+                        "load": {
+                            "provider": "LoadAkkudoktor",
+                            "provider_settings": {
+                                "LoadAkkudoktor": {
+                                    "loadakkudoktor_year_energy_kwh": "3000",
+                                },
+                            },
+                        },
+                    }
+                )
+                # Retry
+                continue
+            try:
+                feed_in_tariff_wh = cls.prediction.key_to_array(
+                    key="feed_in_tariff_wh",
+                    start_datetime=parameter_start_datetime,
+                    end_datetime=parameter_end_datetime,
+                    interval=interval,
+                    fill_method="ffill",
+                ).tolist()
+            except:
+                logger.exception(
+                    "No feed in tariff forecast data available - defaulting to demo data. Parameter preparation attempt {}.",
+                    attempt,
+                )
+                cls.config.merge_settings_from_dict(
+                    {
+                        "feedintariff": {
+                            "provider": "FeedInTariffFixed",
+                            "provider_settings": {
+                                "FeedInTariffFixed": {
+                                    "feed_in_tariff_kwh": 0.078,
+                                },
+                            },
+                        },
+                    }
+                )
+                # Retry
+                continue
+            try:
+                weather_temp_air = cls.prediction.key_to_array(
+                    key="weather_temp_air",
+                    start_datetime=parameter_start_datetime,
+                    end_datetime=parameter_end_datetime,
+                    interval=interval,
+                    fill_method="ffill",
+                ).tolist()
+            except:
+                logger.exception(
+                    "No weather forecast data available - defaulting to demo data. Parameter preparation attempt {}.",
+                    attempt,
+                )
+                cls.config.weather.provider = "BrightSky"
+                # Retry
+                continue
+
+            # Add device data
+
+            # Batteries
+            # ---------
+            if cls.config.devices.max_batteries is None:
+                logger.error("Number of battery devices not configured - defaulting to 1.")
+                cls.config.devices.max_batteries = 1
+            if cls.config.devices.max_batteries == 0:
+                battery_params = None
+                battery_lcos_kwh = 0
+            else:
+                if cls.config.devices.batteries is None:
+                    logger.error("No battery device data available - defaulting to demo data.")
+                    cls.config.devices.batteries = [{"device_id": "battery1", "capacity_wh": 8000}]
+                try:
+                    battery_config = cls.config.devices.batteries[0]
+                    battery_params = SolarPanelBatteryParameters(
+                        device_id=battery_config.device_id,
+                        capacity_wh=battery_config.capacity_wh,
+                        charging_efficiency=battery_config.charging_efficiency,
+                        discharging_efficiency=battery_config.discharging_efficiency,
+                        max_charge_power_w=battery_config.max_charge_power_w,
+                        min_soc_percentage=battery_config.min_soc_percentage,
+                        max_soc_percentage=battery_config.max_soc_percentage,
+                    )
+                except:
+                    logger.exception(
+                        "No battery device data available - defaulting to demo data. Parameter preparation attempt {}.",
+                        attempt,
+                    )
+                    cls.config.devices.batteries = [{"device_id": "battery1", "capacity_wh": 8000}]
+                    # Retry
+                    continue
+                # Levelized cost of ownership
+                if battery_config.levelized_cost_of_storage_kwh is None:
+                    logger.error(
+                        "No battery device LCOS data available - defaulting to 0 €/kWh. Parameter preparation attempt {}.",
+                        attempt,
+                    )
+                    battery_config.levelized_cost_of_storage_kwh = 0
+                battery_lcos_kwh = battery_config.levelized_cost_of_storage_kwh
+                # Initial SOC
+                try:
+                    initial_soc_factor = cls.measurement.key_to_value(
+                        key=battery_config.measurement_key_soc_factor,
+                        target_datetime=ems.start_datetime,
+                    )
+                    if initial_soc_factor > 1.0 or initial_soc_factor < 0.0:
+                        logger.error(
+                            f"Invalid battery initial SoC factor {initial_soc_factor} - defaulting to 0.0."
+                        )
+                        initial_soc_factor = 0.0
+                    # genetic parameter is 0..100 as int
+                    initial_soc_percentage = int(initial_soc_factor * 100)
+                except:
+                    initial_soc_percentage = None
+                if initial_soc_percentage is None:
+                    logger.error(
+                        f"No battery device SoC data (measurement key = '{battery_config.measurement_key_soc_factor}') available - defaulting to 0."
+                    )
+                    initial_soc_percentage = 0
+                battery_params.initial_soc_percentage = initial_soc_percentage
+
+            # Electric Vehicles
+            # -----------------
+            if cls.config.devices.max_electric_vehicles is None:
+                logger.error("Number of electric_vehicle devices not configured - defaulting to 1.")
+                cls.config.devices.max_electric_vehicles = 1
+            if cls.config.devices.max_electric_vehicles == 0:
+                electric_vehicle_params = None
+            else:
+                if cls.config.devices.electric_vehicles is None:
+                    logger.error(
+                        "No electric vehicle device data available - defaulting to demo data."
+                    )
+                    cls.config.devices.max_electric_vehicles = 1
+                    cls.config.devices.electric_vehicles = [
+                        {
+                            "device_id": "ev11",
+                            "capacity_wh": 50000,
+                            "charge_rates": [0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0],
+                            "min_soc_percentage": 70,
+                        }
+                    ]
+                try:
+                    electric_vehicle_config = cls.config.devices.electric_vehicles[0]
+                    electric_vehicle_params = ElectricVehicleParameters(
+                        device_id=electric_vehicle_config.device_id,
+                        capacity_wh=electric_vehicle_config.capacity_wh,
+                        charging_efficiency=electric_vehicle_config.charging_efficiency,
+                        discharging_efficiency=electric_vehicle_config.discharging_efficiency,
+                        charge_rates=electric_vehicle_config.charge_rates,
+                        max_charge_power_w=electric_vehicle_config.max_charge_power_w,
+                        min_soc_percentage=electric_vehicle_config.min_soc_percentage,
+                        max_soc_percentage=electric_vehicle_config.max_soc_percentage,
+                    )
+                except:
+                    logger.exception(
+                        "No electric_vehicle device data available - defaulting to demo data. Parameter preparation attempt {}.",
+                        attempt,
+                    )
+                    cls.config.devices.max_electric_vehicles = 1
+                    cls.config.devices.electric_vehicles = [
+                        {
+                            "device_id": "ev12",
+                            "capacity_wh": 50000,
+                            "charge_rates": [0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0],
+                            "min_soc_percentage": 70,
+                        }
+                    ]
+                    # Retry
+                    continue
+                # Initial SOC
+                try:
+                    initial_soc_factor = cls.measurement.key_to_value(
+                        key=electric_vehicle_config.measurement_key_soc_factor,
+                        target_datetime=ems.start_datetime,
+                    )
+                    if initial_soc_factor > 1.0 or initial_soc_factor < 0.0:
+                        logger.error(
+                            f"Invalid electric vehicle initial SoC factor {initial_soc_factor} - defaulting to 0.0."
+                        )
+                        initial_soc_factor = 0.0
+                    # genetic parameter is 0..100 as int
+                    initial_soc_percentage = int(initial_soc_factor * 100)
+                except:
+                    initial_soc_percentage = None
+                if initial_soc_percentage is None:
+                    logger.error(
+                        f"No electric vehicle device SoC data (measurement key = '{electric_vehicle_config.measurement_key_soc_factor}') available - defaulting to 0."
+                    )
+                    initial_soc_percentage = 0
+                electric_vehicle_params.initial_soc_percentage = initial_soc_percentage
+
+            # Inverters
+            # ---------
+            if cls.config.devices.max_inverters is None:
+                logger.error("Number of inverter devices not configured - defaulting to 1.")
+                cls.config.devices.max_inverters = 1
+            if cls.config.devices.max_inverters == 0:
+                inverter_params = None
+            else:
+                if cls.config.devices.inverters is None:
+                    logger.error("No inverter device data available - defaulting to demo data.")
+                    cls.config.devices.inverters = [
+                        {
+                            "device_id": "inverter1",
+                            "max_power_w": 10000,
+                            "battery_id": battery_config.device_id,
+                        }
+                    ]
+                try:
+                    inverter_config = cls.config.devices.inverters[0]
+                    inverter_params = InverterParameters(
+                        device_id=inverter_config.device_id,
+                        max_power_wh=inverter_config.max_power_w,
+                        battery_id=inverter_config.battery_id,
+                    )
+                except:
+                    logger.exception(
+                        "No inverter device data available - defaulting to demo data. Parameter preparation attempt {}.",
+                        attempt,
+                    )
+                    cls.config.devices.inverters = [
+                        {
+                            "device_id": "inverter1",
+                            "max_power_w": 10000,
+                            "battery_id": battery_config.device_id,
+                        }
+                    ]
+                    # Retry
+                    continue
+
+            # Home Appliances
+            # ---------------
+            if cls.config.devices.max_home_appliances is None:
+                logger.error("Number of home appliance devices not configured - defaulting to 1.")
+                cls.config.devices.max_home_appliances = 1
+            if cls.config.devices.max_home_appliances == 0:
+                home_appliance_params = None
+            else:
+                home_appliance_params = None
+                if cls.config.devices.home_appliances is None:
+                    logger.error(
+                        "No home appliance device data available - defaulting to demo data."
+                    )
+                    cls.config.devices.home_appliances = [
+                        {
+                            "device_id": "dishwasher1",
+                            "consumption_wh": 2000,
+                            "duration_h": 3.0,
+                            "time_windows": {
+                                "windows": [
+                                    {
+                                        "start_time": "08:00",
+                                        "duration": "5 hours",
+                                    },
+                                    {
+                                        "start_time": "15:00",
+                                        "duration": "3 hours",
+                                    },
+                                ],
+                            },
+                        }
+                    ]
+                try:
+                    home_appliance_config = cls.config.devices.home_appliances[0]
+                    home_appliance_params = HomeApplianceParameters(
+                        device_id=home_appliance_config.device_id,
+                        consumption_wh=home_appliance_config.consumption_wh,
+                        duration_h=home_appliance_config.duration_h,
+                        time_windows=home_appliance_config.time_windows,
+                    )
+                except:
+                    logger.exception(
+                        "No home appliance device data available - defaulting to demo data. Parameter preparation attempt {}.",
+                        attempt,
+                    )
+                    cls.config.devices.home_appliances = [
+                        {
+                            "device_id": "dishwasher1",
+                            "consumption_wh": 2000,
+                            "duration_h": 3.0,
+                            "time_windows": None,
+                        }
+                    ]
+                    # Retry
+                    continue
+
+            # We got all parameter data
+            try:
+                oparams = GeneticOptimizationParameters(
+                    ems=GeneticEnergyManagementParameters(
+                        pv_prognose_wh=pvforecast_ac_power,
+                        strompreis_euro_pro_wh=elecprice_marketprice_wh,
+                        einspeiseverguetung_euro_pro_wh=feed_in_tariff_wh,
+                        gesamtlast=loadforecast_power_w,
+                        preis_euro_pro_wh_akku=battery_lcos_kwh / 1000,
+                    ),
+                    temperature_forecast=weather_temp_air,
+                    pv_akku=battery_params,
+                    eauto=electric_vehicle_params,
+                    inverter=inverter_params,
+                    dishwasher=home_appliance_params,
+                    start_solution=start_solution,
+                )
+            except:
+                logger.exception(
+                    "Can not prepare optimization parameters - will retry. Parameter preparation attempt {}.",
+                    attempt,
+                )
+                oparams = None
+                # Retry
+                continue
+
+            # Parameters prepared
+            break
+
+        return oparams

src/akkudoktoreos/optimization/genetic/geneticsolution.py

@@ -0,0 +1,607 @@
+"""Genetic algorithm optimisation solution."""
+
+from typing import Any, Optional
+
+import pandas as pd
+from loguru import logger
+from pydantic import Field, field_validator
+
+from akkudoktoreos.core.coreabc import (
+    ConfigMixin,
+)
+from akkudoktoreos.core.emplan import (
+    DDBCInstruction,
+    EnergyManagementPlan,
+    FRBCInstruction,
+)
+from akkudoktoreos.core.pydantic import PydanticDateTimeDataFrame
+from akkudoktoreos.devices.devicesabc import (
+    ApplianceOperationMode,
+    BatteryOperationMode,
+)
+from akkudoktoreos.devices.genetic.battery import Battery
+from akkudoktoreos.optimization.genetic.geneticdevices import GeneticParametersBaseModel
+from akkudoktoreos.optimization.optimization import OptimizationSolution
+from akkudoktoreos.prediction.prediction import get_prediction
+from akkudoktoreos.utils.datetimeutil import to_datetime, to_duration
+from akkudoktoreos.utils.utils import NumpyEncoder
+
+
+class DeviceOptimizeResult(GeneticParametersBaseModel):
+    device_id: str = Field(description="ID of device", examples=["device1"])
+    hours: int = Field(gt=0, description="Number of hours in the simulation.", examples=[24])
+
+
+class ElectricVehicleResult(DeviceOptimizeResult):
+    """Result class containing information related to the electric vehicle's charging and discharging behavior."""
+
+    device_id: str = Field(description="ID of electric vehicle", examples=["ev1"])
+    charge_array: list[float] = Field(
+        description="Hourly charging status (0 for no charging, 1 for charging)."
+    )
+    discharge_array: list[int] = Field(
+        description="Hourly discharging status (0 for no discharging, 1 for discharging)."
+    )
+    discharging_efficiency: float = Field(description="The discharge efficiency as a float..")
+    capacity_wh: int = Field(description="Capacity of the EV’s battery in watt-hours.")
+    charging_efficiency: float = Field(description="Charging efficiency as a float..")
+    max_charge_power_w: int = Field(description="Maximum charging power in watts.")
+    soc_wh: float = Field(
+        description="State of charge of the battery in watt-hours at the start of the simulation."
+    )
+    initial_soc_percentage: int = Field(
+        description="State of charge at the start of the simulation in percentage."
+    )
+
+    @field_validator("discharge_array", "charge_array", mode="before")
+    def convert_numpy(cls, field: Any) -> Any:
+        return NumpyEncoder.convert_numpy(field)[0]
+
+
+class GeneticSimulationResult(GeneticParametersBaseModel):
+    """This object contains the results of the simulation and provides insights into various parameters over the entire forecast period."""
+
+    Last_Wh_pro_Stunde: list[float] = Field(description="TBD")
+    EAuto_SoC_pro_Stunde: list[float] = Field(
+        description="The state of charge of the EV for each hour."
+    )
+    Einnahmen_Euro_pro_Stunde: list[float] = Field(
+        description="The revenue from grid feed-in or other sources in euros per hour."
+    )
+    Gesamt_Verluste: float = Field(
+        description="The total losses in watt-hours over the entire period."
+    )
+    Gesamtbilanz_Euro: float = Field(
+        description="The total balance of revenues minus costs in euros."
+    )
+    Gesamteinnahmen_Euro: float = Field(description="The total revenues in euros.")
+    Gesamtkosten_Euro: float = Field(description="The total costs in euros.")
+    Home_appliance_wh_per_hour: list[Optional[float]] = Field(
+        description="The energy consumption of a household appliance in watt-hours per hour."
+    )
+    Kosten_Euro_pro_Stunde: list[float] = Field(description="The costs in euros per hour.")
+    Netzbezug_Wh_pro_Stunde: list[float] = Field(
+        description="The grid energy drawn in watt-hours per hour."
+    )
+    Netzeinspeisung_Wh_pro_Stunde: list[float] = Field(
+        description="The energy fed into the grid in watt-hours per hour."
+    )
+    Verluste_Pro_Stunde: list[float] = Field(description="The losses in watt-hours per hour.")
+    akku_soc_pro_stunde: list[float] = Field(
+        description="The state of charge of the battery (not the EV) in percentage per hour."
+    )
+    Electricity_price: list[float] = Field(
+        description="Used Electricity Price, including predictions"
+    )
+
+    @field_validator(
+        "Last_Wh_pro_Stunde",
+        "Netzeinspeisung_Wh_pro_Stunde",
+        "akku_soc_pro_stunde",
+        "Netzbezug_Wh_pro_Stunde",
+        "Kosten_Euro_pro_Stunde",
+        "Einnahmen_Euro_pro_Stunde",
+        "EAuto_SoC_pro_Stunde",
+        "Verluste_Pro_Stunde",
+        "Home_appliance_wh_per_hour",
+        "Electricity_price",
+        mode="before",
+    )
+    def convert_numpy(cls, field: Any) -> Any:
+        return NumpyEncoder.convert_numpy(field)[0]
+
+
+class GeneticSolution(ConfigMixin, GeneticParametersBaseModel):
+    """**Note**: The first value of "Last_Wh_per_hour", "Netzeinspeisung_Wh_per_hour", and "Netzbezug_Wh_per_hour", will be set to null in the JSON output and represented as NaN or None in the corresponding classes' data returns. This approach is adopted to ensure that the current hour's processing remains unchanged."""
+
+    ac_charge: list[float] = Field(
+        description="Array with AC charging values as relative power (0.0-1.0), other values set to 0."
+    )
+    dc_charge: list[float] = Field(
+        description="Array with DC charging values as relative power (0-1), other values set to 0."
+    )
+    discharge_allowed: list[int] = Field(
+        description="Array with discharge values (1 for discharge, 0 otherwise)."
+    )
+    eautocharge_hours_float: Optional[list[float]] = Field(description="TBD")
+    result: GeneticSimulationResult
+    eauto_obj: Optional[ElectricVehicleResult]
+    start_solution: Optional[list[float]] = Field(
+        default=None,
+        description="An array of binary values (0 or 1) representing a possible starting solution for the simulation.",
+    )
+    washingstart: Optional[int] = Field(
+        default=None,
+        description="Can be `null` or contain an object representing the start of washing (if applicable).",
+    )
+
+    @field_validator(
+        "ac_charge",
+        "dc_charge",
+        "discharge_allowed",
+        mode="before",
+    )
+    def convert_numpy(cls, field: Any) -> Any:
+        return NumpyEncoder.convert_numpy(field)[0]
+
+    @field_validator(
+        "eauto_obj",
+        mode="before",
+    )
+    def convert_eauto(cls, field: Any) -> Any:
+        if isinstance(field, Battery):
+            return ElectricVehicleResult(**field.to_dict())
+        return field
+
+    def _battery_operation_from_solution(
+        self,
+        ac_charge: float,
+        dc_charge: float,
+        discharge_allowed: bool,
+    ) -> tuple[BatteryOperationMode, float]:
+        """Maps low-level solution to a representative operation mode and factor.
+
+        Args:
+            ac_charge (float): Allowed AC-side charging power (relative units).
+            dc_charge (float): Allowed DC-side charging power (relative units).
+            discharge_allowed (bool): Whether discharging is permitted.
+
+        Returns:
+            tuple[BatteryOperationMode, float]:
+                A tuple containing:
+                - `BatteryOperationMode`: the representative high-level operation mode.
+                - `float`: the operation factor corresponding to the active signal.
+
+        Notes:
+            - The mapping prioritizes AC charge > DC charge > discharge.
+            - Multiple strategies can produce the same low-level signals; this function
+            returns a representative mode based on a defined priority order.
+        """
+        # (0,0,0) → Nothing allowed
+        if ac_charge <= 0.0 and dc_charge <= 0.0 and not discharge_allowed:
+            return BatteryOperationMode.IDLE, 1.0
+
+        # (0,0,1) → Discharge only
+        if ac_charge <= 0.0 and dc_charge <= 0.0 and discharge_allowed:
+            return BatteryOperationMode.PEAK_SHAVING, 1.0
+
+        # (ac>0,0,0) → AC charge only
+        if ac_charge > 0.0 and dc_charge <= 0.0 and not discharge_allowed:
+            return BatteryOperationMode.GRID_SUPPORT_IMPORT, ac_charge
+
+        # (0,dc>0,0) → DC charge only
+        if ac_charge <= 0.0 and dc_charge > 0.0 and not discharge_allowed:
+            return BatteryOperationMode.NON_EXPORT, dc_charge
+
+        # (ac>0,dc>0,0) → Both charge paths, no discharge
+        if ac_charge > 0.0 and dc_charge > 0.0 and not discharge_allowed:
+            return BatteryOperationMode.FORCED_CHARGE, ac_charge
+
+        # (ac>0,0,1) → AC charge + discharge - does not make sense
+        if ac_charge > 0.0 and dc_charge <= 0.0 and discharge_allowed:
+            raise ValueError(
+                f"Illegal state: ac_charge: {ac_charge} and discharge_allowed: {discharge_allowed}"
+            )
+
+        # (0,dc>0,1) → DC charge + discharge
+        if ac_charge <= 0.0 and dc_charge > 0.0 and discharge_allowed:
+            return BatteryOperationMode.SELF_CONSUMPTION, dc_charge
+
+        # (ac>0,dc>0,1) → Fully flexible - does not make sense
+        if ac_charge > 0.0 and dc_charge > 0.0 and discharge_allowed:
+            raise ValueError(
+                f"Illegal state: ac_charge: {ac_charge} and discharge_allowed: {discharge_allowed}"
+            )
+
+        # Fallback → safe idle
+        return BatteryOperationMode.IDLE, 1.0
+
+    def optimization_solution(self) -> OptimizationSolution:
+        """Provide the genetic solution as a general optimization solution.
+
+        The battery modes are controlled by the grid control triggers:
+        - ac_charge: charge from grid
+        - discharge_allowed: discharge to grid
+
+        The following battery modes are supported:
+        - SELF_CONSUMPTION:    ac_charge == 0 and discharge_allowed == 0
+        - GRID_SUPPORT_EXPORT: ac_charge == 0 and discharge_allowed == 1
+        - GRID_SUPPORT_IMPORT: ac_charge  > 0 and discharge_allowed == 0 or 1
+        """
+        from akkudoktoreos.core.ems import get_ems
+
+        start_datetime = get_ems().start_datetime
+        start_day_hour = start_datetime.in_timezone(self.config.general.timezone).hour
+        interval_hours = 1
+        power_to_energy_per_interval_factor = 1.0
+
+        # --- Create index based on list length and interval ---
+        # Ensure we only use the minimum of results and commands if differing
+        periods = min(len(self.result.Kosten_Euro_pro_Stunde), len(self.ac_charge) - start_day_hour)
+        time_index = pd.date_range(
+            start=start_datetime,
+            periods=periods,
+            freq=f"{interval_hours}h",
+        )
+        n_points = len(time_index)
+        end_datetime = start_datetime.add(hours=n_points)
+
+        # Fill solution into dataframe with correct column names
+        # - load_energy_wh: Load of all energy consumers in wh"
+        # - grid_energy_wh: Grid energy feed in (negative) or consumption (positive) in wh"
+        # - costs_amt: Costs in money amount"
+        # - revenue_amt: Revenue in money amount"
+        # - losses_energy_wh: Energy losses in wh"
+        # - <device-id>_<operation>_op_mode: Operation mode of the device (1.0 when active)."
+        # - <device-id>_<operation>_op_factor: Operation mode factor of the device."
+        # - <device-id>_soc_factor: State of charge of a battery/ electric vehicle device as factor of total capacity."
+        # - <device-id>_energy_wh: Energy consumption (positive) of a device in wh."
+
+        solution = pd.DataFrame(
+            {
+                "date_time": time_index,
+                # result starts at start_day_hour
+                "load_energy_wh": self.result.Last_Wh_pro_Stunde[:n_points],
+                "grid_feedin_energy_wh": self.result.Netzeinspeisung_Wh_pro_Stunde[:n_points],
+                "grid_consumption_energy_wh": self.result.Netzbezug_Wh_pro_Stunde[:n_points],
+                "costs_amt": self.result.Kosten_Euro_pro_Stunde[:n_points],
+                "revenue_amt": self.result.Einnahmen_Euro_pro_Stunde[:n_points],
+                "losses_energy_wh": self.result.Verluste_Pro_Stunde[:n_points],
+            },
+            index=time_index,
+        )
+
+        # Add battery data
+        solution["battery1_soc_factor"] = [
+            v / 100
+            for v in self.result.akku_soc_pro_stunde[:n_points]  # result starts at start_day_hour
+        ]
+        operation: dict[str, list[float]] = {
+            "genetic_ac_charge_factor": [],
+            "genetic_dc_charge_factor": [],
+            "genetic_discharge_allowed_factor": [],
+        }
+        # ac_charge, dc_charge, discharge_allowed start at hour 0 of start day
+        for hour_idx, rate in enumerate(self.ac_charge):
+            if hour_idx < start_day_hour:
+                continue
+            if hour_idx >= start_day_hour + n_points:
+                break
+            ac_charge_hour = self.ac_charge[hour_idx]
+            dc_charge_hour = self.dc_charge[hour_idx]
+            discharge_allowed_hour = bool(self.discharge_allowed[hour_idx])
+            operation_mode, operation_mode_factor = self._battery_operation_from_solution(
+                ac_charge_hour, dc_charge_hour, discharge_allowed_hour
+            )
+            operation["genetic_ac_charge_factor"].append(ac_charge_hour)
+            operation["genetic_dc_charge_factor"].append(dc_charge_hour)
+            operation["genetic_discharge_allowed_factor"].append(discharge_allowed_hour)
+            for mode in BatteryOperationMode:
+                mode_key = f"battery1_{mode.lower()}_op_mode"
+                factor_key = f"battery1_{mode.lower()}_op_factor"
+                if mode_key not in operation.keys():
+                    operation[mode_key] = []
+                    operation[factor_key] = []
+                if mode == operation_mode:
+                    operation[mode_key].append(1.0)
+                    operation[factor_key].append(operation_mode_factor)
+                else:
+                    operation[mode_key].append(0.0)
+                    operation[factor_key].append(0.0)
+        for key in operation.keys():
+            if len(operation[key]) != n_points:
+                error_msg = f"instruction {key} has invalid length {len(operation[key])} - expected {n_points}"
+                logger.error(error_msg)
+                raise ValueError(error_msg)
+            solution[key] = operation[key]
+
+        # Add EV battery solution
+        # eautocharge_hours_float start at hour 0 of start day
+        # result.EAuto_SoC_pro_Stunde start at start_datetime.hour
+        if self.eauto_obj:
+            if self.eautocharge_hours_float is None:
+                # Electric vehicle is full enough. No load times.
+                solution[f"{self.eauto_obj.device_id}_soc_factor"] = [
+                    self.eauto_obj.initial_soc_percentage / 100.0
+                ] * n_points
+                solution["genetic_ev_charge_factor"] = [0.0] * n_points
+                # operation modes
+                operation_mode = BatteryOperationMode.IDLE
+                for mode in BatteryOperationMode:
+                    mode_key = f"{self.eauto_obj.device_id}_{mode.lower()}_op_mode"
+                    factor_key = f"{self.eauto_obj.device_id}_{mode.lower()}_op_factor"
+                    if mode == operation_mode:
+                        solution[mode_key] = [1.0] * n_points
+                        solution[factor_key] = [1.0] * n_points
+                    else:
+                        solution[mode_key] = [0.0] * n_points
+                        solution[factor_key] = [0.0] * n_points
+            else:
+                solution[f"{self.eauto_obj.device_id}_soc_factor"] = [
+                    v / 100 for v in self.result.EAuto_SoC_pro_Stunde[:n_points]
+                ]
+                operation = {
+                    "genetic_ev_charge_factor": [],
+                }
+                for hour_idx, rate in enumerate(self.eautocharge_hours_float):
+                    if hour_idx < start_day_hour:
+                        continue
+                    if hour_idx >= start_day_hour + n_points:
+                        break
+                    operation["genetic_ev_charge_factor"].append(rate)
+                    operation_mode, operation_mode_factor = self._battery_operation_from_solution(
+                        rate, 0.0, False
+                    )
+                    for mode in BatteryOperationMode:
+                        mode_key = f"{self.eauto_obj.device_id}_{mode.lower()}_op_mode"
+                        factor_key = f"{self.eauto_obj.device_id}_{mode.lower()}_op_factor"
+                        if mode_key not in operation.keys():
+                            operation[mode_key] = []
+                            operation[factor_key] = []
+                        if mode == operation_mode:
+                            operation[mode_key].append(1.0)
+                            operation[factor_key].append(operation_mode_factor)
+                        else:
+                            operation[mode_key].append(0.0)
+                            operation[factor_key].append(0.0)
+                for key in operation.keys():
+                    if len(operation[key]) != n_points:
+                        error_msg = f"instruction {key} has invalid length {len(operation[key])} - expected {n_points}"
+                        logger.error(error_msg)
+                        raise ValueError(error_msg)
+                    solution[key] = operation[key]
+
+        # Add home appliance data
+        if self.washingstart:
+            # result starts at start_day_hour
+            solution["homeappliance1_energy_wh"] = self.result.Home_appliance_wh_per_hour[:n_points]
+
+        # Fill prediction into dataframe with correct column names
+        # - pvforecast_ac_energy_wh_energy_wh: PV energy prediction (positive) in wh
+        # - elec_price_amt_kwh: Electricity price prediction in money per kwh
+        # - weather_temp_air_celcius: Temperature in °C"
+        # - loadforecast_energy_wh: Load energy prediction in wh
+        # - loadakkudoktor_std_energy_wh: Load energy standard deviation prediction in wh
+        # - loadakkudoktor_mean_energy_wh: Load mean energy prediction in wh
+        prediction = pd.DataFrame(
+            {
+                "date_time": time_index,
+            },
+            index=time_index,
+        )
+        pred = get_prediction()
+
+        if "pvforecast_ac_power" in pred.record_keys:
+            prediction["pvforecast_ac_energy_wh"] = (
+                pred.key_to_array(
+                    key="pvforecast_ac_power",
+                    start_datetime=start_datetime,
+                    end_datetime=end_datetime,
+                    interval=to_duration(f"{interval_hours} hours"),
+                    fill_method="linear",
+                )
+                * power_to_energy_per_interval_factor
+            ).tolist()
+        if "pvforecast_dc_power" in pred.record_keys:
+            prediction["pvforecast_dc_energy_wh"] = (
+                pred.key_to_array(
+                    key="pvforecast_dc_power",
+                    start_datetime=start_datetime,
+                    end_datetime=end_datetime,
+                    interval=to_duration(f"{interval_hours} hours"),
+                    fill_method="linear",
+                )
+                * power_to_energy_per_interval_factor
+            ).tolist()
+        if "elecprice_marketprice_wh" in pred.record_keys:
+            prediction["elec_price_amt_kwh"] = (
+                pred.key_to_array(
+                    key="elecprice_marketprice_wh",
+                    start_datetime=start_datetime,
+                    end_datetime=end_datetime,
+                    interval=to_duration(f"{interval_hours} hours"),
+                    fill_method="ffill",
+                )
+                * 1000
+            ).tolist()
+        if "feed_in_tariff_wh" in pred.record_keys:
+            prediction["feed_in_tariff_amt_kwh"] = (
+                pred.key_to_array(
+                    key="feed_in_tariff_wh",
+                    start_datetime=start_datetime,
+                    end_datetime=end_datetime,
+                    interval=to_duration(f"{interval_hours} hours"),
+                    fill_method="linear",
+                )
+                * 1000
+            ).tolist()
+        if "weather_temp_air" in pred.record_keys:
+            prediction["weather_air_temp_celcius"] = pred.key_to_array(
+                key="weather_temp_air",
+                start_datetime=start_datetime,
+                end_datetime=end_datetime,
+                interval=to_duration(f"{interval_hours} hours"),
+                fill_method="linear",
+            ).tolist()
+        if "loadforecast_power_w" in pred.record_keys:
+            prediction["loadforecast_energy_wh"] = (
+                pred.key_to_array(
+                    key="loadforecast_power_w",
+                    start_datetime=start_datetime,
+                    end_datetime=end_datetime,
+                    interval=to_duration(f"{interval_hours} hours"),
+                    fill_method="linear",
+                )
+                * power_to_energy_per_interval_factor
+            ).tolist()
+        if "loadakkudoktor_std_power_w" in pred.record_keys:
+            prediction["loadakkudoktor_std_energy_wh"] = (
+                pred.key_to_array(
+                    key="loadakkudoktor_std_power_w",
+                    start_datetime=start_datetime,
+                    end_datetime=end_datetime,
+                    interval=to_duration(f"{interval_hours} hours"),
+                    fill_method="linear",
+                )
+                * power_to_energy_per_interval_factor
+            ).tolist()
+        if "loadakkudoktor_mean_power_w" in pred.record_keys:
+            prediction["loadakkudoktor_mean_energy_wh"] = (
+                pred.key_to_array(
+                    key="loadakkudoktor_mean_power_w",
+                    start_datetime=start_datetime,
+                    end_datetime=end_datetime,
+                    interval=to_duration(f"{interval_hours} hours"),
+                    fill_method="linear",
+                )
+                * power_to_energy_per_interval_factor
+            ).tolist()
+
+        optimization_solution = OptimizationSolution(
+            id=f"optimization-genetic@{to_datetime(as_string=True)}",
+            generated_at=to_datetime(),
+            comment="Optimization solution derived from GeneticSolution.",
+            valid_from=start_datetime,
+            valid_until=start_datetime.add(hours=self.config.optimization.horizon_hours),
+            total_losses_energy_wh=self.result.Gesamt_Verluste,
+            total_revenues_amt=self.result.Gesamteinnahmen_Euro,
+            total_costs_amt=self.result.Gesamtkosten_Euro,
+            fitness_score={
+                self.result.Gesamtkosten_Euro,
+            },
+            prediction=PydanticDateTimeDataFrame.from_dataframe(prediction),
+            solution=PydanticDateTimeDataFrame.from_dataframe(solution),
+        )
+
+        return optimization_solution
+
+    def energy_management_plan(self) -> EnergyManagementPlan:
+        """Provide the genetic solution as an energy management plan."""
+        from akkudoktoreos.core.ems import get_ems
+
+        start_datetime = get_ems().start_datetime
+        start_day_hour = start_datetime.in_timezone(self.config.general.timezone).hour
+        plan = EnergyManagementPlan(
+            id=f"plan-genetic@{to_datetime(as_string=True)}",
+            generated_at=to_datetime(),
+            instructions=[],
+            comment="Energy management plan derived from GeneticSolution.",
+        )
+
+        # Add battery instructions (fill rate based control)
+        last_operation_mode: Optional[str] = None
+        last_operation_mode_factor: Optional[float] = None
+        resource_id = "battery1"
+        # ac_charge, dc_charge, discharge_allowed start at hour 0 of start day
+        logger.debug("BAT: {} - {}", resource_id, self.ac_charge[start_day_hour:])
+        for hour_idx, rate in enumerate(self.ac_charge):
+            if hour_idx < start_day_hour:
+                continue
+            operation_mode, operation_mode_factor = self._battery_operation_from_solution(
+                self.ac_charge[hour_idx],
+                self.dc_charge[hour_idx],
+                bool(self.discharge_allowed[hour_idx]),
+            )
+            if (
+                operation_mode == last_operation_mode
+                and operation_mode_factor == last_operation_mode_factor
+            ):
+                # Skip, we already added the instruction
+                continue
+            last_operation_mode = operation_mode
+            last_operation_mode_factor = operation_mode_factor
+            execution_time = start_datetime.add(hours=hour_idx - start_day_hour)
+            plan.add_instruction(
+                FRBCInstruction(
+                    resource_id=resource_id,
+                    execution_time=execution_time,
+                    actuator_id=resource_id,
+                    operation_mode_id=operation_mode,
+                    operation_mode_factor=operation_mode_factor,
+                )
+            )
+
+        # Add EV battery instructions (fill rate based control)
+        # eautocharge_hours_float start at hour 0 of start day
+        if self.eauto_obj:
+            resource_id = self.eauto_obj.device_id
+            if self.eautocharge_hours_float is None:
+                # Electric vehicle is full enough. No load times.
+                logger.debug("EV: {} - SoC >= min, no optimization", resource_id)
+                plan.add_instruction(
+                    FRBCInstruction(
+                        resource_id=resource_id,
+                        execution_time=start_datetime,
+                        actuator_id=resource_id,
+                        operation_mode_id=BatteryOperationMode.IDLE,
+                        operation_mode_factor=1.0,
+                    )
+                )
+            else:
+                last_operation_mode = None
+                last_operation_mode_factor = None
+                logger.debug(
+                    "EV: {} - {}", resource_id, self.eautocharge_hours_float[start_day_hour:]
+                )
+                for hour_idx, rate in enumerate(self.eautocharge_hours_float):
+                    if hour_idx < start_day_hour:
+                        continue
+                    operation_mode, operation_mode_factor = self._battery_operation_from_solution(
+                        rate, 0.0, False
+                    )
+                    if (
+                        operation_mode == last_operation_mode
+                        and operation_mode_factor == last_operation_mode_factor
+                    ):
+                        # Skip, we already added the instruction
+                        continue
+                    last_operation_mode = operation_mode
+                    last_operation_mode_factor = operation_mode_factor
+                    execution_time = start_datetime.add(hours=hour_idx - start_day_hour)
+                    plan.add_instruction(
+                        FRBCInstruction(
+                            resource_id=resource_id,
+                            execution_time=execution_time,
+                            actuator_id=resource_id,
+                            operation_mode_id=operation_mode,
+                            operation_mode_factor=operation_mode_factor,
+                        )
+                    )
+
+        # Add home appliance instructions (demand driven based control)
+        if self.washingstart:
+            resource_id = "homeappliance1"
+            operation_mode = ApplianceOperationMode.RUN  # type: ignore[assignment]
+            operation_mode_factor = 1.0
+            execution_time = start_datetime.add(hours=self.washingstart - start_day_hour)
+            plan.add_instruction(
+                DDBCInstruction(
+                    resource_id=resource_id,
+                    execution_time=execution_time,
+                    actuator_id=resource_id,
+                    operation_mode_id=operation_mode,
+                    operation_mode_factor=operation_mode_factor,
+                )
+            )
+
+        return plan

src/akkudoktoreos/optimization/optimization.py

@@ -1,37 +1,141 @@
-from typing import List, Optional
+from typing import Optional, Union
 
-from pydantic import Field
+from pydantic import Field, model_validator
 
 from akkudoktoreos.config.configabc import SettingsBaseModel
+from akkudoktoreos.core.pydantic import (
+    PydanticBaseModel,
+    PydanticDateTimeDataFrame,
+)
+from akkudoktoreos.utils.datetimeutil import DateTime
+
+
+class GeneticCommonSettings(SettingsBaseModel):
+    """General Genetic Optimization Algorithm Configuration."""
+
+    individuals: Optional[int] = Field(
+        default=300,
+        ge=10,
+        description="Number of individuals (solutions) to generate for the (initial) generation [>= 10]. Defaults to 300.",
+        examples=[300],
+    )
+
+    generations: Optional[int] = Field(
+        default=400,
+        ge=10,
+        description="Number of generations to evaluate the optimal solution [>= 10]. Defaults to 400.",
+        examples=[400],
+    )
+
+    seed: Optional[int] = Field(
+        default=None,
+        ge=0,
+        description="Fixed seed for genetic algorithm. Defaults to 'None' which means random seed.",
+        examples=[None],
+    )
+
+    penalties: Optional[dict[str, Union[float, int, str]]] = Field(
+        default=None,
+        description="A dictionary of penalty function parameters consisting of a penalty function parameter name and the associated value.",
+        examples=[
+            {"ev_soc_miss": 10},
+        ],
+    )
 
 
 class OptimizationCommonSettings(SettingsBaseModel):
-    """General Optimization Configuration.
+    """General Optimization Configuration."""
 
-    Attributes:
-        hours (int): Number of hours for optimizations.
-    """
-
-    hours: Optional[int] = Field(
-        default=48, ge=0, description="Number of hours into the future for optimizations."
+    horizon_hours: Optional[int] = Field(
+        default=24,
+        ge=0,
+        description="The general time window within which the energy optimization goal shall be achieved [h]. Defaults to 24 hours.",
+        examples=[24],
     )
 
-    penalty: Optional[int] = Field(default=10, description="Penalty factor used in optimization.")
-
-    ev_available_charge_rates_percent: Optional[List[float]] = Field(
-        default=[
-            0.0,
-            6.0 / 16.0,
-            # 7.0 / 16.0,
-            8.0 / 16.0,
-            # 9.0 / 16.0,
-            10.0 / 16.0,
-            # 11.0 / 16.0,
-            12.0 / 16.0,
-            # 13.0 / 16.0,
-            14.0 / 16.0,
-            # 15.0 / 16.0,
-            1.0,
-        ],
-        description="Charge rates available for the EV in percent of maximum charge.",
+    interval: Optional[int] = Field(
+        default=3600,
+        ge=15 * 60,
+        le=60 * 60,
+        description="The optimization interval [sec].",
+        examples=[60 * 60, 15 * 60],
+    )
+
+    algorithm: Optional[str] = Field(
+        default="GENETIC",
+        description="The optimization algorithm.",
+        examples=["GENETIC"],
+    )
+
+    genetic: Optional[GeneticCommonSettings] = Field(
+        default=None,
+        description="Genetic optimization algorithm configuration.",
+        examples=[{"individuals": 400, "seed": None, "penalties": {"ev_soc_miss": 10}}],
+    )
+
+    @model_validator(mode="after")
+    def _enforce_algorithm_configuration(self) -> "OptimizationCommonSettings":
+        """Ensure algorithm default configuration is set."""
+        if self.algorithm is not None:
+            if self.algorithm.lower() == "genetic" and self.genetic is None:
+                self.genetic = GeneticCommonSettings()
+        return self
+
+
+class OptimizationSolution(PydanticBaseModel):
+    """General Optimization Solution."""
+
+    id: str = Field(..., description="Unique ID for the optimization solution.")
+
+    generated_at: DateTime = Field(..., description="Timestamp when the solution was generated.")
+
+    comment: Optional[str] = Field(
+        default=None, description="Optional comment or annotation for the solution."
+    )
+
+    valid_from: Optional[DateTime] = Field(
+        default=None, description="Start time of the optimization solution."
+    )
+
+    valid_until: Optional[DateTime] = Field(
+        default=None,
+        description="End time of the optimization solution.",
+    )
+
+    total_losses_energy_wh: float = Field(
+        description="The total losses in watt-hours over the entire period."
+    )
+
+    total_revenues_amt: float = Field(description="The total revenues [money amount].")
+
+    total_costs_amt: float = Field(description="The total costs [money amount].")
+
+    fitness_score: set[float] = Field(description="The fitness score as a set of fitness values.")
+
+    prediction: PydanticDateTimeDataFrame = Field(
+        description=(
+            "Datetime data frame with time series prediction data per optimization interval:"
+            "- pv_energy_wh: PV energy prediction (positive) in wh"
+            "- elec_price_amt_kwh: Electricity price prediction in money per kwh"
+            "- feed_in_tariff_amt_kwh: Feed in tariff prediction in money per kwh"
+            "- weather_temp_air_celcius: Temperature in °C"
+            "- loadforecast_energy_wh: Load mean energy prediction in wh"
+            "- loadakkudoktor_std_energy_wh: Load energy standard deviation prediction in wh"
+            "- loadakkudoktor_mean_energy_wh: Load mean energy prediction in wh"
+        )
+    )
+
+    solution: PydanticDateTimeDataFrame = Field(
+        description=(
+            "Datetime data frame with time series solution data per optimization interval:"
+            "- load_energy_wh: Load of all energy consumers in wh"
+            "- grid_energy_wh: Grid energy feed in (negative) or consumption (positive) in wh"
+            "- costs_amt: Costs in money amount"
+            "- revenue_amt: Revenue in money amount"
+            "- losses_energy_wh: Energy losses in wh"
+            "- <device-id>_operation_mode_id: Operation mode id of the device."
+            "- <device-id>_operation_mode_factor: Operation mode factor of the device."
+            "- <device-id>_soc_factor: State of charge of a battery/ electric vehicle device as factor of total capacity."
+            "- <device-id>_energy_wh: Energy consumption (positive) of a device in wh."
+        )
     )

src/akkudoktoreos/optimization/optimizationabc.py

@@ -2,11 +2,14 @@
 
 from pydantic import ConfigDict
 
-from akkudoktoreos.core.coreabc import ConfigMixin, PredictionMixin
-from akkudoktoreos.core.pydantic import PydanticBaseModel
+from akkudoktoreos.core.coreabc import (
+    ConfigMixin,
+    EnergyManagementSystemMixin,
+    PredictionMixin,
+)
 
 
-class OptimizationBase(ConfigMixin, PredictionMixin, PydanticBaseModel):
+class OptimizationBase(ConfigMixin, PredictionMixin, EnergyManagementSystemMixin):
     """Base class for handling optimization data.
 
     Enables access to EOS configuration data (attribute `config`) and EOS prediction data (attribute

src/akkudoktoreos/prediction/elecprice.py

@@ -17,6 +17,14 @@ elecprice_providers = [
 ]
 
 
+class ElecPriceCommonProviderSettings(SettingsBaseModel):
+    """Electricity Price Prediction Provider Configuration."""
+
+    ElecPriceImport: Optional[ElecPriceImportCommonSettings] = Field(
+        default=None, description="ElecPriceImport settings", examples=[None]
+    )
+
+
 class ElecPriceCommonSettings(SettingsBaseModel):
     """Electricity Price Prediction Configuration."""
 
@@ -26,7 +34,10 @@ class ElecPriceCommonSettings(SettingsBaseModel):
         examples=["ElecPriceAkkudoktor"],
     )
     charges_kwh: Optional[float] = Field(
-        default=None, ge=0, description="Electricity price charges (€/kWh).", examples=[0.21]
+        default=None,
+        ge=0,
+        description="Electricity price charges [€/kWh]. Will be added to variable market price.",
+        examples=[0.21],
     )
     vat_rate: Optional[float] = Field(
         default=1.19,
@@ -35,8 +46,15 @@ class ElecPriceCommonSettings(SettingsBaseModel):
         examples=[1.19],
     )
 
-    provider_settings: Optional[ElecPriceImportCommonSettings] = Field(
-        default=None, description="Provider settings", examples=[None]
+    provider_settings: ElecPriceCommonProviderSettings = Field(
+        default_factory=ElecPriceCommonProviderSettings,
+        description="Provider settings",
+        examples=[
+            # Example 1: Empty/default settings (all providers None)
+            {
+                "ElecPriceImport": None,
+            },
+        ],
     )
 
     # Validators

src/akkudoktoreos/prediction/elecpriceakkudoktor.py

@@ -102,10 +102,10 @@ class ElecPriceAkkudoktor(ElecPriceProvider):
             - add the file cache again.
         """
         source = "https://api.akkudoktor.net"
-        if not self.start_datetime:
-            raise ValueError(f"Start DateTime not set: {self.start_datetime}")
+        if not self.ems_start_datetime:
+            raise ValueError(f"Start DateTime not set: {self.ems_start_datetime}")
         # Try to take data from 5 weeks back for prediction
-        date = to_datetime(self.start_datetime - to_duration("35 days"), as_string="YYYY-MM-DD")
+        date = to_datetime(self.ems_start_datetime - to_duration("35 days"), as_string="YYYY-MM-DD")
         last_date = to_datetime(self.end_datetime, as_string="YYYY-MM-DD")
         url = f"{source}/prices?start={date}&end={last_date}&tz={self.config.general.timezone}"
         response = requests.get(url, timeout=10)
@@ -147,8 +147,8 @@ class ElecPriceAkkudoktor(ElecPriceProvider):
         """
         # Get Akkudoktor electricity price data
         akkudoktor_data = self._request_forecast(force_update=force_update)  # type: ignore
-        if not self.start_datetime:
-            raise ValueError(f"Start DateTime not set: {self.start_datetime}")
+        if not self.ems_start_datetime:
+            raise ValueError(f"Start DateTime not set: {self.ems_start_datetime}")
 
         # Assumption that all lists are the same length and are ordered chronologically
         # in ascending order and have the same timestamps.
@@ -186,13 +186,13 @@ class ElecPriceAkkudoktor(ElecPriceProvider):
         # some of our data is already in the future, so we need to predict less. If we got less data we increase the prediction hours
         needed_hours = int(
             self.config.prediction.hours
-            - ((highest_orig_datetime - self.start_datetime).total_seconds() // 3600)
+            - ((highest_orig_datetime - self.ems_start_datetime).total_seconds() // 3600)
         )
 
         if needed_hours <= 0:
             logger.warning(
-                f"No prediction needed. needed_hours={needed_hours}, hours={self.config.prediction.hours},highest_orig_datetime {highest_orig_datetime}, start_datetime {self.start_datetime}"
-            )  # this might keep data longer than self.start_datetime + self.config.prediction.hours in the records
+                f"No prediction needed. needed_hours={needed_hours}, hours={self.config.prediction.hours},highest_orig_datetime {highest_orig_datetime}, start_datetime {self.ems_start_datetime}"
+            )  # this might keep data longer than self.ems_start_datetime + self.config.prediction.hours in the records
             return
 
         if amount_datasets > 800:  # we do the full ets with seasons of 1 week

src/akkudoktoreos/prediction/elecpriceenergycharts.py

@@ -91,7 +91,7 @@ class ElecPriceEnergyCharts(ElecPriceProvider):
         if start_date is None:
             # Try to take data from 5 weeks back for prediction
             start_date = to_datetime(
-                self.start_datetime - to_duration("35 days"), as_string="YYYY-MM-DD"
+                self.ems_start_datetime - to_duration("35 days"), as_string="YYYY-MM-DD"
             )
 
         last_date = to_datetime(self.end_datetime, as_string="YYYY-MM-DD")
@@ -172,17 +172,17 @@ class ElecPriceEnergyCharts(ElecPriceProvider):
         hours_ahead = 23 if now.time() < pd.Timestamp("14:00").time() else 47
         end = midnight + pd.Timedelta(hours=hours_ahead)
 
-        if not self.start_datetime:
-            raise ValueError(f"Start DateTime not set: {self.start_datetime}")
+        if not self.ems_start_datetime:
+            raise ValueError(f"Start DateTime not set: {self.ems_start_datetime}")
 
         # Determine if update is needed and how many days
         past_days = 35
         if self.highest_orig_datetime:
             history_series = self.key_to_series(
-                key="elecprice_marketprice_wh", start_datetime=self.start_datetime
+                key="elecprice_marketprice_wh", start_datetime=self.ems_start_datetime
             )
             # If history lower, then start_datetime
-            if history_series.index.min() <= self.start_datetime:
+            if history_series.index.min() <= self.ems_start_datetime:
                 past_days = 0
 
             needs_update = end > self.highest_orig_datetime
@@ -195,7 +195,7 @@ class ElecPriceEnergyCharts(ElecPriceProvider):
             )
             # Set start_date try to take data from 5 weeks back for prediction
             start_date = to_datetime(
-                self.start_datetime - to_duration(f"{past_days} days"), as_string="YYYY-MM-DD"
+                self.ems_start_datetime - to_duration(f"{past_days} days"), as_string="YYYY-MM-DD"
             )
             # Get Energy-Charts electricity price data
             energy_charts_data = self._request_forecast(
@@ -227,13 +227,13 @@ class ElecPriceEnergyCharts(ElecPriceProvider):
         # some of our data is already in the future, so we need to predict less. If we got less data we increase the prediction hours
         needed_hours = int(
             self.config.prediction.hours
-            - ((self.highest_orig_datetime - self.start_datetime).total_seconds() // 3600)
+            - ((self.highest_orig_datetime - self.ems_start_datetime).total_seconds() // 3600)
         )
 
         if needed_hours <= 0:
             logger.warning(
-                f"No prediction needed. needed_hours={needed_hours}, hours={self.config.prediction.hours},highest_orig_datetime {self.highest_orig_datetime}, start_datetime {self.start_datetime}"
-            )  # this might keep data longer than self.start_datetime + self.config.prediction.hours in the records
+                f"No prediction needed. needed_hours={needed_hours}, hours={self.config.prediction.hours},highest_orig_datetime {self.highest_orig_datetime}, start_datetime {self.ems_start_datetime}"
+            )  # this might keep data longer than self.ems_start_datetime + self.config.prediction.hours in the records
             return
 
         if amount_datasets > 800:  # we do the full ets with seasons of 1 week

src/akkudoktoreos/prediction/elecpriceimport.py

@@ -61,15 +61,16 @@ class ElecPriceImport(ElecPriceProvider, PredictionImportProvider):
         return "ElecPriceImport"
 
     def _update_data(self, force_update: Optional[bool] = False) -> None:
-        if self.config.elecprice.provider_settings is None:
+        if self.config.elecprice.provider_settings.ElecPriceImport is None:
             logger.debug(f"{self.provider_id()} data update without provider settings.")
             return
-        if self.config.elecprice.provider_settings.import_file_path:
+        if self.config.elecprice.provider_settings.ElecPriceImport.import_file_path:
             self.import_from_file(
-                self.config.elecprice.provider_settings.import_file_path,
+                self.config.elecprice.provider_settings.ElecPriceImport.import_file_path,
                 key_prefix="elecprice",
             )
-        if self.config.elecprice.provider_settings.import_json:
+        if self.config.elecprice.provider_settings.ElecPriceImport.import_json:
             self.import_from_json(
-                self.config.elecprice.provider_settings.import_json, key_prefix="elecprice"
+                self.config.elecprice.provider_settings.ElecPriceImport.import_json,
+                key_prefix="elecprice",
             )

src/akkudoktoreos/prediction/feedintariff.py

@@ -0,0 +1,61 @@
+from typing import Optional
+
+from pydantic import Field, field_validator
+
+from akkudoktoreos.config.configabc import SettingsBaseModel
+from akkudoktoreos.prediction.feedintariffabc import FeedInTariffProvider
+from akkudoktoreos.prediction.feedintarifffixed import FeedInTariffFixedCommonSettings
+from akkudoktoreos.prediction.feedintariffimport import FeedInTariffImportCommonSettings
+from akkudoktoreos.prediction.prediction import get_prediction
+
+prediction_eos = get_prediction()
+
+# Valid feedintariff providers
+feedintariff_providers = [
+    provider.provider_id()
+    for provider in prediction_eos.providers
+    if isinstance(provider, FeedInTariffProvider)
+]
+
+
+class FeedInTariffCommonProviderSettings(SettingsBaseModel):
+    """Feed In Tariff Prediction Provider Configuration."""
+
+    FeedInTariffFixed: Optional[FeedInTariffFixedCommonSettings] = Field(
+        default=None, description="FeedInTariffFixed settings", examples=[None]
+    )
+    FeedInTariffImport: Optional[FeedInTariffImportCommonSettings] = Field(
+        default=None, description="FeedInTariffImport settings", examples=[None]
+    )
+
+
+class FeedInTariffCommonSettings(SettingsBaseModel):
+    """Feed In Tariff Prediction Configuration."""
+
+    provider: Optional[str] = Field(
+        default=None,
+        description="Feed in tariff provider id of provider to be used.",
+        examples=["FeedInTariffFixed", "FeedInTarifImport"],
+    )
+
+    provider_settings: FeedInTariffCommonProviderSettings = Field(
+        default_factory=FeedInTariffCommonProviderSettings,
+        description="Provider settings",
+        examples=[
+            # Example 1: Empty/default settings (all providers None)
+            {
+                "FeedInTariffFixed": None,
+                "FeedInTariffImport": None,
+            },
+        ],
+    )
+
+    # Validators
+    @field_validator("provider", mode="after")
+    @classmethod
+    def validate_provider(cls, value: Optional[str]) -> Optional[str]:
+        if value is None or value in feedintariff_providers:
+            return value
+        raise ValueError(
+            f"Provider '{value}' is not a valid feed in tariff provider: {feedintariff_providers}."
+        )

src/akkudoktoreos/prediction/feedintariffabc.py

@@ -0,0 +1,58 @@
+"""Abstract and base classes for feed in tariff predictions.
+
+Notes:
+    - Ensure appropriate API keys or configurations are set up if required by external data sources.
+"""
+
+from abc import abstractmethod
+from typing import List, Optional
+
+from pydantic import Field, computed_field
+
+from akkudoktoreos.prediction.predictionabc import PredictionProvider, PredictionRecord
+
+
+class FeedInTariffDataRecord(PredictionRecord):
+    """Represents a feed in tariff data record containing various price attributes at a specific datetime.
+
+    Attributes:
+        date_time (Optional[AwareDatetime]): The datetime of the record.
+
+    """
+
+    feed_in_tariff_wh: Optional[float] = Field(None, description="Feed in tariff per Wh (€/Wh)")
+
+    # Computed fields
+    @computed_field  # type: ignore[prop-decorator]
+    @property
+    def feed_in_tariff_kwh(self) -> Optional[float]:
+        """Feed in tariff per kWh (€/kWh).
+
+        Convenience attribute calculated from `feed_in_tariff_wh`.
+        """
+        if self.feed_in_tariff_wh is None:
+            return None
+        return self.feed_in_tariff_wh * 1000.0
+
+
+class FeedInTariffProvider(PredictionProvider):
+    """Abstract base class for feed in tariff providers.
+
+    FeedInTariffProvider is a thread-safe singleton, ensuring only one instance of this class is created.
+
+    Configuration variables:
+        feed in tariff_provider (str): Prediction provider for feed in tarif.
+    """
+
+    # overload
+    records: List[FeedInTariffDataRecord] = Field(
+        default_factory=list, description="List of FeedInTariffDataRecord records"
+    )
+
+    @classmethod
+    @abstractmethod
+    def provider_id(cls) -> str:
+        return "FeedInTariffProvider"
+
+    def enabled(self) -> bool:
+        return self.provider_id() == self.config.feedintariff.provider

src/akkudoktoreos/prediction/feedintarifffixed.py

@@ -0,0 +1,48 @@
+"""Provides feed in tariff data."""
+
+from typing import Optional
+
+from loguru import logger
+from pydantic import Field
+
+from akkudoktoreos.config.configabc import SettingsBaseModel
+from akkudoktoreos.prediction.feedintariffabc import FeedInTariffProvider
+from akkudoktoreos.utils.datetimeutil import to_datetime
+
+
+class FeedInTariffFixedCommonSettings(SettingsBaseModel):
+    """Common settings for elecprice fixed price."""
+
+    feed_in_tariff_kwh: Optional[float] = Field(
+        default=None,
+        ge=0,
+        description="Electricity price feed in tariff [€/kWH].",
+        examples=[0.078],
+    )
+
+
+class FeedInTariffFixed(FeedInTariffProvider):
+    """Fixed price feed in tariff data.
+
+    FeedInTariffFixed is a singleton-based class that retrieves elecprice data.
+    """
+
+    @classmethod
+    def provider_id(cls) -> str:
+        """Return the unique identifier for the FeedInTariffFixed provider."""
+        return "FeedInTariffFixed"
+
+    def _update_data(self, force_update: Optional[bool] = False) -> None:
+        error_msg = "Feed in tariff not provided"
+        try:
+            feed_in_tariff = (
+                self.config.feedintariff.provider_settings.FeedInTariffFixed.feed_in_tariff_kwh
+            )
+        except:
+            logger.exception(error_msg)
+            raise ValueError(error_msg)
+        if feed_in_tariff is None:
+            logger.error(error_msg)
+            raise ValueError(error_msg)
+        feed_in_tariff_wh = feed_in_tariff / 1000
+        self.update_value(to_datetime(), "feed_in_tariff_wh", feed_in_tariff_wh)

src/akkudoktoreos/prediction/feedintariffimport.py

@@ -0,0 +1,76 @@
+"""Retrieves feed in tariff forecast data from an import file.
+
+This module provides classes and mappings to manage feed in tariff data obtained from
+an import file. The data is mapped to the `FeedInTariffDataRecord` format, enabling consistent
+access to forecasted and historical feed in tariff 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.feedintariffabc import FeedInTariffProvider
+from akkudoktoreos.prediction.predictionabc import PredictionImportProvider
+
+
+class FeedInTariffImportCommonSettings(SettingsBaseModel):
+    """Common settings for feed in tariff data import from file or JSON string."""
+
+    import_file_path: Optional[Union[str, Path]] = Field(
+        default=None,
+        description="Path to the file to import feed in tariff data from.",
+        examples=[None, "/path/to/feedintariff.json"],
+    )
+    import_json: Optional[str] = Field(
+        default=None,
+        description="JSON string, dictionary of feed in tariff forecast value lists.",
+        examples=['{"fead_in_tariff_wh": [0.000078, 0.000078, 0.000023]}'],
+    )
+
+    # Validators
+    @field_validator("import_file_path", mode="after")
+    @classmethod
+    def validate_feedintariffimport_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 FeedInTariffImport(FeedInTariffProvider, PredictionImportProvider):
+    """Fetch Feed In Tariff data from import file or JSON string.
+
+    FeedInTariffImport is a singleton-based class that retrieves fedd in tariff forecast data
+    from a file or JSON string and maps it to `FeedInTariffDataRecord` 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 FeedInTariffImport provider."""
+        return "FeedInTariffImport"
+
+    def _update_data(self, force_update: Optional[bool] = False) -> None:
+        if self.config.feedintariff.provider_settings.FeedInTariffImport is None:
+            logger.debug(f"{self.provider_id()} data update without provider settings.")
+            return
+        if self.config.feedintariff.provider_settings.FeedInTariffImport.import_file_path:
+            self.import_from_file(
+                self.config.provider_settings.FeedInTariffImport.import_file_path,
+                key_prefix="feedintariff",
+            )
+        if self.config.feedintariff.provider_settings.FeedInTariffImport.import_json:
+            self.import_from_json(
+                self.config.feedintariff.provider_settings.FeedInTariffImport.import_json,
+                key_prefix="feedintariff",
+            )

src/akkudoktoreos/prediction/interpolator.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 import pickle
-from functools import lru_cache
 from pathlib import Path
 
 import numpy as np
 from scipy.interpolate import RegularGridInterpolator
 
+from akkudoktoreos.core.cache import cachemethod_energy_management
 from akkudoktoreos.core.coreabc import SingletonMixin
 
 
@@ -16,8 +16,7 @@ class SelfConsumptionProbabilityInterpolator:
         with open(self.filepath, "rb") as file:
             self.interpolator: RegularGridInterpolator = pickle.load(file)  # noqa: S301
 
-    @lru_cache(maxsize=128)
-    def generate_points(
+    def _generate_points(
         self, load_1h_power: float, pv_power: float
     ) -> tuple[np.ndarray, np.ndarray]:
         """Generate the grid points for interpolation."""
@@ -25,8 +24,20 @@ class SelfConsumptionProbabilityInterpolator:
         points = np.array([np.full_like(partial_loads, load_1h_power), partial_loads]).T
         return points, partial_loads
 
+    @cachemethod_energy_management
     def calculate_self_consumption(self, load_1h_power: float, pv_power: float) -> float:
-        points, partial_loads = self.generate_points(load_1h_power, pv_power)
+        """Calculate the PV self-consumption rate using RegularGridInterpolator.
+
+        The results are cached until the start of the next energy management run/ optimization.
+
+        Args:
+         - last_1h_power: 1h power levels (W).
+         - pv_power: Current PV power output (W).
+
+        Returns:
+         - Self-consumption rate as a float.
+        """
+        points, partial_loads = self._generate_points(load_1h_power, pv_power)
         probabilities = self.interpolator(points)
         return probabilities.sum()
 

src/akkudoktoreos/prediction/load.py

@@ -1,6 +1,6 @@
 """Load forecast module for load predictions."""
 
-from typing import Optional, Union
+from typing import Optional
 
 from pydantic import Field, field_validator
 
@@ -21,6 +21,20 @@ load_providers = [
 ]
 
 
+class LoadCommonProviderSettings(SettingsBaseModel):
+    """Load Prediction Provider Configuration."""
+
+    LoadAkkudoktor: Optional[LoadAkkudoktorCommonSettings] = Field(
+        default=None, description="LoadAkkudoktor settings", examples=[None]
+    )
+    LoadVrm: Optional[LoadVrmCommonSettings] = Field(
+        default=None, description="LoadVrm settings", examples=[None]
+    )
+    LoadImport: Optional[LoadImportCommonSettings] = Field(
+        default=None, description="LoadImport settings", examples=[None]
+    )
+
+
 class LoadCommonSettings(SettingsBaseModel):
     """Load Prediction Configuration."""
 
@@ -30,9 +44,18 @@ class LoadCommonSettings(SettingsBaseModel):
         examples=["LoadAkkudoktor"],
     )
 
-    provider_settings: Optional[
-        Union[LoadAkkudoktorCommonSettings, LoadVrmCommonSettings, LoadImportCommonSettings]
-    ] = Field(default=None, description="Provider settings", examples=[None])
+    provider_settings: LoadCommonProviderSettings = Field(
+        default_factory=LoadCommonProviderSettings,
+        description="Provider settings",
+        examples=[
+            # Example 1: Empty/default settings (all providers None)
+            {
+                "LoadAkkudoktor": None,
+                "LoadVrm": None,
+                "LoadImport": None,
+            },
+        ],
+    )
 
     # Validators
     @field_validator("provider", mode="after")

src/akkudoktoreos/prediction/loadabc.py

@@ -15,12 +15,8 @@ from akkudoktoreos.prediction.predictionabc import PredictionProvider, Predictio
 class LoadDataRecord(PredictionRecord):
     """Represents a load data record containing various load attributes at a specific datetime."""
 
-    load_mean: Optional[float] = Field(default=None, description="Predicted load mean value (W).")
-    load_std: Optional[float] = Field(
-        default=None, description="Predicted load standard deviation (W)."
-    )
-    load_mean_adjusted: Optional[float] = Field(
-        default=None, description="Predicted load mean value adjusted by load measurement (W)."
+    loadforecast_power_w: Optional[float] = Field(
+        default=None, description="Predicted load mean value (W)."
     )
 
 

src/akkudoktoreos/prediction/loadakkudoktor.py

@@ -7,26 +7,97 @@ from loguru import logger
 from pydantic import Field
 
 from akkudoktoreos.config.configabc import SettingsBaseModel
-from akkudoktoreos.prediction.loadabc import LoadProvider
+from akkudoktoreos.prediction.loadabc import LoadDataRecord, LoadProvider
 from akkudoktoreos.utils.datetimeutil import compare_datetimes, to_datetime, to_duration
 
 
 class LoadAkkudoktorCommonSettings(SettingsBaseModel):
     """Common settings for load data import from file."""
 
-    loadakkudoktor_year_energy: Optional[float] = Field(
+    loadakkudoktor_year_energy_kwh: Optional[float] = Field(
         default=None, description="Yearly energy consumption (kWh).", examples=[40421]
     )
 
 
+class LoadAkkudoktorDataRecord(LoadDataRecord):
+    """Represents a load data record with extra fields for LoadAkkudoktor."""
+
+    loadakkudoktor_mean_power_w: Optional[float] = Field(
+        default=None, description="Predicted load mean value (W)."
+    )
+
+    loadakkudoktor_std_power_w: Optional[float] = Field(
+        default=None, description="Predicted load standard deviation (W)."
+    )
+
+
 class LoadAkkudoktor(LoadProvider):
     """Fetch Load forecast data from Akkudoktor load profiles."""
 
+    records: list[LoadAkkudoktorDataRecord] = Field(
+        default_factory=list, description="List of LoadAkkudoktorDataRecord records"
+    )
+
     @classmethod
     def provider_id(cls) -> str:
         """Return the unique identifier for the LoadAkkudoktor provider."""
         return "LoadAkkudoktor"
 
+    def load_data(self) -> np.ndarray:
+        """Loads data from the Akkudoktor load file."""
+        load_file = self.config.package_root_path.joinpath("data/load_profiles.npz")
+        data_year_energy = None
+        try:
+            file_data = np.load(load_file)
+            profile_data = np.array(
+                list(zip(file_data["yearly_profiles"], file_data["yearly_profiles_std"]))
+            )
+            # Calculate values in W by relative profile data and yearly consumption given in kWh
+            data_year_energy = (
+                profile_data
+                * self.config.load.provider_settings.LoadAkkudoktor.loadakkudoktor_year_energy_kwh
+                * 1000
+            )
+        except FileNotFoundError:
+            error_msg = f"Error: File {load_file} not found."
+            logger.error(error_msg)
+            raise FileNotFoundError(error_msg)
+        except Exception as e:
+            error_msg = f"An error occurred while loading data: {e}"
+            logger.error(error_msg)
+            raise ValueError(error_msg)
+        return data_year_energy
+
+    def _update_data(self, force_update: Optional[bool] = False) -> None:
+        """Adds the load means and standard deviations."""
+        data_year_energy = self.load_data()
+        # We provide prediction starting at start of day, to be compatible to old system.
+        # End date for prediction is prediction hours from now.
+        date = self.ems_start_datetime.start_of("day")
+        end_date = self.ems_start_datetime.add(hours=self.config.prediction.hours)
+        while compare_datetimes(date, end_date).lt:
+            # Extract mean (index 0) and standard deviation (index 1) for the given day and hour
+            # Day indexing starts at 0, -1 because of that
+            hourly_stats = data_year_energy[date.day_of_year - 1, :, date.hour]
+            values = {
+                "loadforecast_power_w": hourly_stats[0],
+                "loadakkudoktor_mean_power_w": hourly_stats[0],
+                "loadakkudoktor_std_power_w": hourly_stats[1],
+            }
+            self.update_value(date, values)
+            date += to_duration("1 hour")
+        # We are working on fresh data (no cache), report update time
+        self.update_datetime = to_datetime(in_timezone=self.config.general.timezone)
+
+
+class LoadAkkudoktorAdjusted(LoadAkkudoktor):
+    """Fetch Load forecast data from Akkudoktor load profiles with adjustment by measurements."""
+
+    @classmethod
+    def provider_id(cls) -> str:
+        """Return the unique identifier for the LoadAkkudoktor provider."""
+        return "LoadAkkudoktorAdjusted"
+
     def _calculate_adjustment(self, data_year_energy: np.ndarray) -> tuple[np.ndarray, np.ndarray]:
         """Calculate weekday and week end adjustment from total load measurement data.
 
@@ -79,44 +150,21 @@ class LoadAkkudoktor(LoadProvider):
 
         return (weekday_adjust, weekend_adjust)
 
-    def load_data(self) -> np.ndarray:
-        """Loads data from the Akkudoktor load file."""
-        load_file = self.config.package_root_path.joinpath("data/load_profiles.npz")
-        data_year_energy = None
-        try:
-            file_data = np.load(load_file)
-            profile_data = np.array(
-                list(zip(file_data["yearly_profiles"], file_data["yearly_profiles_std"]))
-            )
-            # Calculate values in W by relative profile data and yearly consumption given in kWh
-            data_year_energy = (
-                profile_data * self.config.load.provider_settings.loadakkudoktor_year_energy * 1000
-            )
-        except FileNotFoundError:
-            error_msg = f"Error: File {load_file} not found."
-            logger.error(error_msg)
-            raise FileNotFoundError(error_msg)
-        except Exception as e:
-            error_msg = f"An error occurred while loading data: {e}"
-            logger.error(error_msg)
-            raise ValueError(error_msg)
-        return data_year_energy
-
     def _update_data(self, force_update: Optional[bool] = False) -> None:
         """Adds the load means and standard deviations."""
         data_year_energy = self.load_data()
         weekday_adjust, weekend_adjust = self._calculate_adjustment(data_year_energy)
         # We provide prediction starting at start of day, to be compatible to old system.
         # End date for prediction is prediction hours from now.
-        date = self.start_datetime.start_of("day")
-        end_date = self.start_datetime.add(hours=self.config.prediction.hours)
+        date = self.ems_start_datetime.start_of("day")
+        end_date = self.ems_start_datetime.add(hours=self.config.prediction.hours)
         while compare_datetimes(date, end_date).lt:
             # Extract mean (index 0) and standard deviation (index 1) for the given day and hour
             # Day indexing starts at 0, -1 because of that
             hourly_stats = data_year_energy[date.day_of_year - 1, :, date.hour]
             values = {
-                "load_mean": hourly_stats[0],
-                "load_std": hourly_stats[1],
+                "loadakkudoktor_mean_power_w": hourly_stats[0],
+                "loadakkudoktor_std_power_w": hourly_stats[1],
             }
             if date.day_of_week < 5:
                 # Monday to Friday (0..4)
@@ -124,7 +172,7 @@ class LoadAkkudoktor(LoadProvider):
             else:
                 # Saturday, Sunday (5, 6)
                 value_adjusted = hourly_stats[0] + weekend_adjust[date.hour]
-            values["load_mean_adjusted"] = max(0, value_adjusted)
+            values["loadforecast_power_w"] = max(0, value_adjusted)
             self.update_value(date, values)
             date += to_duration("1 hour")
         # We are working on fresh data (no cache), report update time

src/akkudoktoreos/prediction/loadimport.py

@@ -60,10 +60,14 @@ class LoadImport(LoadProvider, PredictionImportProvider):
         return "LoadImport"
 
     def _update_data(self, force_update: Optional[bool] = False) -> None:
-        if self.config.load.provider_settings is None:
+        if self.config.load.provider_settings.LoadImport is None:
             logger.debug(f"{self.provider_id()} data update without provider settings.")
             return
-        if self.config.load.provider_settings.import_file_path:
-            self.import_from_file(self.config.provider_settings.import_file_path, key_prefix="load")
-        if self.config.load.provider_settings.import_json:
-            self.import_from_json(self.config.load.provider_settings.import_json, key_prefix="load")
+        if self.config.load.provider_settings.LoadImport.import_file_path:
+            self.import_from_file(
+                self.config.provider_settings.LoadImport.import_file_path, key_prefix="load"
+            )
+        if self.config.load.provider_settings.LoadImport.import_json:
+            self.import_from_json(
+                self.config.load.provider_settings.LoadImport.import_json, key_prefix="load"
+            )

src/akkudoktoreos/prediction/loadvrm.py

@@ -4,13 +4,12 @@ from typing import Any, Optional, Union
 
 import requests
 from loguru import logger
-from pendulum import DateTime
 from pydantic import Field, ValidationError
 
 from akkudoktoreos.config.configabc import SettingsBaseModel
 from akkudoktoreos.core.pydantic import PydanticBaseModel
 from akkudoktoreos.prediction.loadabc import LoadProvider
-from akkudoktoreos.utils.datetimeutil import to_datetime
+from akkudoktoreos.utils.datetimeutil import DateTime, to_datetime
 
 
 class VrmForecastRecords(PydanticBaseModel):
@@ -57,8 +56,8 @@ class LoadVrm(LoadProvider):
     def _request_forecast(self, start_ts: int, end_ts: int) -> VrmForecastResponse:
         """Fetch forecast data from Victron VRM API."""
         base_url = "https://vrmapi.victronenergy.com/v2/installations"
-        installation_id = self.config.load.provider_settings.load_vrm_idsite
-        api_token = self.config.load.provider_settings.load_vrm_token
+        installation_id = self.config.load.provider_settings.LoadVrm.load_vrm_idsite
+        api_token = self.config.load.provider_settings.LoadVrm.load_vrm_token
 
         url = f"{base_url}/{installation_id}/stats?type=forecast&start={start_ts}&end={end_ts}&interval=hours"
         headers = {"X-Authorization": f"Token {api_token}", "Content-Type": "application/json"}
@@ -79,28 +78,28 @@ class LoadVrm(LoadProvider):
         return to_datetime(timestamp / 1000, in_timezone=self.config.general.timezone)
 
     def _update_data(self, force_update: Optional[bool] = False) -> None:
-        """Fetch and store VRM load forecast as load_mean and related values."""
-        start_date = self.start_datetime.start_of("day")
-        end_date = self.start_datetime.add(hours=self.config.prediction.hours)
+        """Fetch and store VRM load forecast as loadforecast_power_w and related values."""
+        start_date = self.ems_start_datetime.start_of("day")
+        end_date = self.ems_start_datetime.add(hours=self.config.prediction.hours)
         start_ts = int(start_date.timestamp())
         end_ts = int(end_date.timestamp())
 
         logger.info(f"Updating Load forecast from VRM: {start_date} to {end_date}")
         vrm_forecast_data = self._request_forecast(start_ts, end_ts)
 
-        load_mean_data = []
+        loadforecast_power_w_data = []
         for timestamp, value in vrm_forecast_data.records.vrm_consumption_fc:
             date = self._ts_to_datetime(timestamp)
             rounded_value = round(value, 2)
 
             self.update_value(
                 date,
-                {"load_mean": rounded_value, "load_std": 0.0, "load_mean_adjusted": rounded_value},
+                {"loadforecast_power_w": rounded_value},
             )
 
-            load_mean_data.append((date, rounded_value))
+            loadforecast_power_w_data.append((date, rounded_value))
 
-        logger.debug(f"Updated load_mean with {len(load_mean_data)} entries.")
+        logger.debug(f"Updated loadforecast_power_w with {len(loadforecast_power_w_data)} entries.")
         self.update_datetime = to_datetime(in_timezone=self.config.general.timezone)
 
 

src/akkudoktoreos/prediction/prediction.py

@@ -34,7 +34,12 @@ from akkudoktoreos.config.configabc import SettingsBaseModel
 from akkudoktoreos.prediction.elecpriceakkudoktor import ElecPriceAkkudoktor
 from akkudoktoreos.prediction.elecpriceenergycharts import ElecPriceEnergyCharts
 from akkudoktoreos.prediction.elecpriceimport import ElecPriceImport
-from akkudoktoreos.prediction.loadakkudoktor import LoadAkkudoktor
+from akkudoktoreos.prediction.feedintarifffixed import FeedInTariffFixed
+from akkudoktoreos.prediction.feedintariffimport import FeedInTariffImport
+from akkudoktoreos.prediction.loadakkudoktor import (
+    LoadAkkudoktor,
+    LoadAkkudoktorAdjusted,
+)
 from akkudoktoreos.prediction.loadimport import LoadImport
 from akkudoktoreos.prediction.loadvrm import LoadVrm
 from akkudoktoreos.prediction.predictionabc import PredictionContainer
@@ -67,6 +72,7 @@ class PredictionCommonSettings(SettingsBaseModel):
     hours: Optional[int] = Field(
         default=48, ge=0, description="Number of hours into the future for predictions"
     )
+
     historic_hours: Optional[int] = Field(
         default=48,
         ge=0,
@@ -88,7 +94,10 @@ class Prediction(PredictionContainer):
             ElecPriceAkkudoktor,
             ElecPriceEnergyCharts,
             ElecPriceImport,
+            FeedInTariffFixed,
+            FeedInTariffImport,
             LoadAkkudoktor,
+            LoadAkkudoktorAdjusted,
             LoadVrm,
             LoadImport,
             PVForecastAkkudoktor,
@@ -105,9 +114,12 @@ class Prediction(PredictionContainer):
 elecprice_akkudoktor = ElecPriceAkkudoktor()
 elecprice_energy_charts = ElecPriceEnergyCharts()
 elecprice_import = ElecPriceImport()
-load_akkudoktor = LoadAkkudoktor()
-load_vrm = LoadVrm()
-load_import = LoadImport()
+feedintariff_fixed = FeedInTariffFixed()
+feedintariff_import = FeedInTariffImport()
+loadforecast_akkudoktor = LoadAkkudoktor()
+loadforecast_akkudoktor_adjusted = LoadAkkudoktorAdjusted()
+loadforecast_vrm = LoadVrm()
+loadforecast_import = LoadImport()
 pvforecast_akkudoktor = PVForecastAkkudoktor()
 pvforecast_vrm = PVForecastVrm()
 pvforecast_import = PVForecastImport()
@@ -125,9 +137,12 @@ def get_prediction() -> Prediction:
             elecprice_akkudoktor,
             elecprice_energy_charts,
             elecprice_import,
-            load_akkudoktor,
-            load_vrm,
-            load_import,
+            feedintariff_fixed,
+            feedintariff_import,
+            loadforecast_akkudoktor,
+            loadforecast_akkudoktor_adjusted,
+            loadforecast_vrm,
+            loadforecast_import,
             pvforecast_akkudoktor,
             pvforecast_vrm,
             pvforecast_import,

src/akkudoktoreos/prediction/predictionabc.py

@@ -11,7 +11,6 @@ and manipulation of configuration and prediction data in a clear, scalable, and
 from typing import List, Optional
 
 from loguru import logger
-from pendulum import DateTime
 from pydantic import Field, computed_field
 
 from akkudoktoreos.core.coreabc import MeasurementMixin
@@ -23,7 +22,7 @@ from akkudoktoreos.core.dataabc import (
     DataRecord,
     DataSequence,
 )
-from akkudoktoreos.utils.datetimeutil import to_duration
+from akkudoktoreos.utils.datetimeutil import DateTime, to_duration
 
 
 class PredictionBase(DataBase, MeasurementMixin):
@@ -119,17 +118,21 @@ class PredictionStartEndKeepMixin(PredictionBase):
         Returns:
             Optional[DateTime]: The calculated end datetime, or `None` if inputs are missing.
         """
-        if self.start_datetime and self.config.prediction.hours:
-            end_datetime = self.start_datetime + to_duration(
+        if self.ems_start_datetime and self.config.prediction.hours:
+            end_datetime = self.ems_start_datetime + to_duration(
                 f"{self.config.prediction.hours} hours"
             )
-            dst_change = end_datetime.offset_hours - self.start_datetime.offset_hours
-            logger.debug(f"Pre: {self.start_datetime}..{end_datetime}: DST change: {dst_change}")
+            dst_change = end_datetime.offset_hours - self.ems_start_datetime.offset_hours
+            logger.debug(
+                f"Pre: {self.ems_start_datetime}..{end_datetime}: DST change: {dst_change}"
+            )
             if dst_change < 0:
                 end_datetime = end_datetime + to_duration(f"{abs(int(dst_change))} hours")
             elif dst_change > 0:
                 end_datetime = end_datetime - to_duration(f"{abs(int(dst_change))} hours")
-            logger.debug(f"Pst: {self.start_datetime}..{end_datetime}: DST change: {dst_change}")
+            logger.debug(
+                f"Pst: {self.ems_start_datetime}..{end_datetime}: DST change: {dst_change}"
+            )
             return end_datetime
         return None
 
@@ -141,7 +144,7 @@ class PredictionStartEndKeepMixin(PredictionBase):
         Returns:
             Optional[DateTime]: The calculated retention cutoff datetime, or `None` if inputs are missing.
         """
-        if self.start_datetime is None:
+        if self.ems_start_datetime is None:
             return None
         historic_hours = self.historic_hours_min()
         if (
@@ -149,7 +152,7 @@ class PredictionStartEndKeepMixin(PredictionBase):
             and self.config.prediction.historic_hours > historic_hours
         ):
             historic_hours = int(self.config.prediction.historic_hours)
-        return self.start_datetime - to_duration(f"{historic_hours} hours")
+        return self.ems_start_datetime - to_duration(f"{historic_hours} hours")
 
     @computed_field  # type: ignore[prop-decorator]
     @property
@@ -162,7 +165,7 @@ class PredictionStartEndKeepMixin(PredictionBase):
         end_dt = self.end_datetime
         if end_dt is None:
             return None
-        duration = end_dt - self.start_datetime
+        duration = end_dt - self.ems_start_datetime
         return int(duration.total_hours())
 
     @computed_field  # type: ignore[prop-decorator]
@@ -176,7 +179,7 @@ class PredictionStartEndKeepMixin(PredictionBase):
         keep_dt = self.keep_datetime
         if keep_dt is None:
             return None
-        duration = self.start_datetime - keep_dt
+        duration = self.ems_start_datetime - keep_dt
         return int(duration.total_hours())
 
 

src/akkudoktoreos/prediction/pvforecast.py

@@ -1,6 +1,6 @@
 """PV forecast module for PV power predictions."""
 
-from typing import Any, List, Optional, Self, Union
+from typing import Any, List, Optional, Self
 
 from pydantic import Field, computed_field, field_validator, model_validator
 
@@ -8,8 +8,7 @@ from akkudoktoreos.config.configabc import SettingsBaseModel
 from akkudoktoreos.prediction.prediction import get_prediction
 from akkudoktoreos.prediction.pvforecastabc import PVForecastProvider
 from akkudoktoreos.prediction.pvforecastimport import PVForecastImportCommonSettings
-from akkudoktoreos.prediction.pvforecastvrm import PVforecastVrmCommonSettings
-from akkudoktoreos.utils.docs import get_model_structure_from_examples
+from akkudoktoreos.prediction.pvforecastvrm import PVForecastVrmCommonSettings
 
 prediction_eos = get_prediction()
 
@@ -121,6 +120,17 @@ class PVForecastPlaneSetting(SettingsBaseModel):
         return pvtechchoice
 
 
+class PVForecastCommonProviderSettings(SettingsBaseModel):
+    """PV Forecast Provider Configuration."""
+
+    PVForecastImport: Optional[PVForecastImportCommonSettings] = Field(
+        default=None, description="PVForecastImport settings", examples=[None]
+    )
+    PVForecastVrm: Optional[PVForecastVrmCommonSettings] = Field(
+        default=None, description="PVForecastVrm settings", examples=[None]
+    )
+
+
 class PVForecastCommonSettings(SettingsBaseModel):
     """PV Forecast Configuration."""
 
@@ -135,20 +145,68 @@ class PVForecastCommonSettings(SettingsBaseModel):
         examples=["PVForecastAkkudoktor"],
     )
 
-    provider_settings: Optional[
-        Union[PVForecastImportCommonSettings, PVforecastVrmCommonSettings]
-    ] = Field(default=None, description="Provider settings", examples=[None])
+    provider_settings: PVForecastCommonProviderSettings = Field(
+        default_factory=PVForecastCommonProviderSettings,
+        description="Provider settings",
+        examples=[
+            # Example 1: Empty/default settings (all providers None)
+            {
+                "PVForecastImport": None,
+                "PVForecastVrm": None,
+            },
+        ],
+    )
 
     planes: Optional[list[PVForecastPlaneSetting]] = Field(
         default=None,
         description="Plane configuration.",
-        examples=[get_model_structure_from_examples(PVForecastPlaneSetting, True)],
+        examples=[
+            [
+                {
+                    "surface_tilt": 10.0,
+                    "surface_azimuth": 180.0,
+                    "userhorizon": [10.0, 20.0, 30.0],
+                    "peakpower": 5.0,
+                    "pvtechchoice": "crystSi",
+                    "mountingplace": "free",
+                    "loss": 14.0,
+                    "trackingtype": 0,
+                    "optimal_surface_tilt": False,
+                    "optimalangles": False,
+                    "albedo": None,
+                    "module_model": None,
+                    "inverter_model": None,
+                    "inverter_paco": 6000,
+                    "modules_per_string": 20,
+                    "strings_per_inverter": 2,
+                },
+                {
+                    "surface_tilt": 20.0,
+                    "surface_azimuth": 90.0,
+                    "userhorizon": [5.0, 15.0, 25.0],
+                    "peakpower": 3.5,
+                    "pvtechchoice": "crystSi",
+                    "mountingplace": "free",
+                    "loss": 14.0,
+                    "trackingtype": 1,
+                    "optimal_surface_tilt": False,
+                    "optimalangles": False,
+                    "albedo": None,
+                    "module_model": None,
+                    "inverter_model": None,
+                    "inverter_paco": 4000,
+                    "modules_per_string": 20,
+                    "strings_per_inverter": 2,
+                },
+            ]
+        ],
     )
 
     max_planes: Optional[int] = Field(
         default=0,
         ge=0,
         description="Maximum number of planes that can be set",
+        examples=[1, 2],
     )
 
     # Validators

src/akkudoktoreos/prediction/pvforecastakkudoktor.py

@@ -330,8 +330,8 @@ class PVForecastAkkudoktor(PVForecastProvider):
             logger.error(f"Akkudoktor schema change: {error_msg}")
             raise ValueError(error_msg)
 
-        if not self.start_datetime:
-            raise ValueError(f"Start DateTime not set: {self.start_datetime}")
+        if not self.ems_start_datetime:
+            raise ValueError(f"Start DateTime not set: {self.ems_start_datetime}")
 
         # Iterate over forecast data points
         for forecast_values in zip(*akkudoktor_data.values):
@@ -339,7 +339,7 @@ class PVForecastAkkudoktor(PVForecastProvider):
             dt = to_datetime(original_datetime, in_timezone=self.config.general.timezone)
 
             # Skip outdated forecast data
-            if compare_datetimes(dt, self.start_datetime.start_of("day")).lt:
+            if compare_datetimes(dt, self.ems_start_datetime.start_of("day")).lt:
                 continue
 
             sum_dc_power = sum(values.dcPower for values in forecast_values)
@@ -357,7 +357,7 @@ class PVForecastAkkudoktor(PVForecastProvider):
         if len(self) < self.config.prediction.hours:
             raise ValueError(
                 f"The forecast must cover at least {self.config.prediction.hours} hours, "
-                f"but only {len(self)} hours starting from {self.start_datetime} "
+                f"but only {len(self)} hours starting from {self.ems_start_datetime} "
                 f"were predicted."
             )
 

src/akkudoktoreos/prediction/pvforecastimport.py

@@ -61,16 +61,16 @@ class PVForecastImport(PVForecastProvider, PredictionImportProvider):
         return "PVForecastImport"
 
     def _update_data(self, force_update: Optional[bool] = False) -> None:
-        if self.config.pvforecast.provider_settings is None:
+        if self.config.pvforecast.provider_settings.PVForecastImport is None:
             logger.debug(f"{self.provider_id()} data update without provider settings.")
             return
-        if self.config.pvforecast.provider_settings.import_file_path is not None:
+        if self.config.pvforecast.provider_settings.PVForecastImport.import_file_path is not None:
             self.import_from_file(
-                self.config.pvforecast.provider_settings.import_file_path,
+                self.config.pvforecast.provider_settings.PVForecastImport.import_file_path,
                 key_prefix="pvforecast",
             )
-        if self.config.pvforecast.provider_settings.import_json is not None:
+        if self.config.pvforecast.provider_settings.PVForecastImport.import_json is not None:
             self.import_from_json(
-                self.config.pvforecast.provider_settings.import_json,
+                self.config.pvforecast.provider_settings.PVForecastImport.import_json,
                 key_prefix="pvforecast",
             )

src/akkudoktoreos/prediction/pvforecastvrm.py

@@ -4,13 +4,12 @@ from typing import Any, Optional, Union
 
 import requests
 from loguru import logger
-from pendulum import DateTime
 from pydantic import Field, ValidationError
 
 from akkudoktoreos.config.configabc import SettingsBaseModel
 from akkudoktoreos.core.pydantic import PydanticBaseModel
 from akkudoktoreos.prediction.pvforecastabc import PVForecastProvider
-from akkudoktoreos.utils.datetimeutil import to_datetime
+from akkudoktoreos.utils.datetimeutil import DateTime, to_datetime
 
 
 class VrmForecastRecords(PydanticBaseModel):
@@ -24,7 +23,7 @@ class VrmForecastResponse(PydanticBaseModel):
     totals: dict
 
 
-class PVforecastVrmCommonSettings(SettingsBaseModel):
+class PVForecastVrmCommonSettings(SettingsBaseModel):
     """Common settings for VRM API."""
 
     pvforecast_vrm_token: str = Field(
@@ -60,8 +59,8 @@ class PVForecastVrm(PVForecastProvider):
     def _request_forecast(self, start_ts: int, end_ts: int) -> VrmForecastResponse:
         """Fetch forecast data from Victron VRM API."""
         source = "https://vrmapi.victronenergy.com/v2/installations"
-        id_site = self.config.pvforecast.provider_settings.pvforecast_vrm_idsite
-        api_token = self.config.pvforecast.provider_settings.pvforecast_vrm_token
+        id_site = self.config.pvforecast.provider_settings.PVForecastVrm.pvforecast_vrm_idsite
+        api_token = self.config.pvforecast.provider_settings.PVForecastVrm.pvforecast_vrm_token
         headers = {"X-Authorization": f"Token {api_token}", "Content-Type": "application/json"}
         url = f"{source}/{id_site}/stats?type=forecast&start={start_ts}&end={end_ts}&interval=hours"
         logger.debug(f"Requesting VRM forecast: {url}")
@@ -82,8 +81,8 @@ class PVForecastVrm(PVForecastProvider):
 
     def _update_data(self, force_update: Optional[bool] = False) -> None:
         """Update forecast data in the PVForecastDataRecord format."""
-        start_date = self.start_datetime.start_of("day")
-        end_date = self.start_datetime.add(hours=self.config.prediction.hours)
+        start_date = self.ems_start_datetime.start_of("day")
+        end_date = self.ems_start_datetime.add(hours=self.config.prediction.hours)
         start_ts = int(start_date.timestamp())
         end_ts = int(end_date.timestamp())
 

src/akkudoktoreos/prediction/weather.py

@@ -19,6 +19,14 @@ weather_providers = [
 ]
 
 
+class WeatherCommonProviderSettings(SettingsBaseModel):
+    """Weather Forecast Provider Configuration."""
+
+    WeatherImport: Optional[WeatherImportCommonSettings] = Field(
+        default=None, description="WeatherImport settings", examples=[None]
+    )
+
+
 class WeatherCommonSettings(SettingsBaseModel):
     """Weather Forecast Configuration."""
 
@@ -28,8 +36,15 @@ class WeatherCommonSettings(SettingsBaseModel):
         examples=["WeatherImport"],
     )
 
-    provider_settings: Optional[WeatherImportCommonSettings] = Field(
-        default=None, description="Provider settings", examples=[None]
+    provider_settings: WeatherCommonProviderSettings = Field(
+        default_factory=WeatherCommonProviderSettings,
+        description="Provider settings",
+        examples=[
+            # Example 1: Empty/default settings (all providers None)
+            {
+                "WeatherImport": None,
+            },
+        ],
     )
 
     # Validators

src/akkudoktoreos/prediction/weatherbrightsky.py

@@ -94,7 +94,7 @@ class WeatherBrightSky(WeatherProvider):
             ValueError: If the API response does not include expected `weather` data.
         """
         source = "https://api.brightsky.dev"
-        date = to_datetime(self.start_datetime, as_string=True)
+        date = to_datetime(self.ems_start_datetime, as_string=True)
         last_date = to_datetime(self.end_datetime, as_string=True)
         response = requests.get(
             f"{source}/weather?lat={self.config.general.latitude}&lon={self.config.general.longitude}&date={date}&last_date={last_date}&tz={self.config.general.timezone}",
@@ -223,7 +223,7 @@ class WeatherBrightSky(WeatherProvider):
         assert key  # noqa: S101
         temperature = self.key_to_array(
             key=key,
-            start_datetime=self.start_datetime,
+            start_datetime=self.ems_start_datetime,
             end_datetime=self.end_datetime,
             interval=to_duration("1 hour"),
         )
@@ -236,7 +236,7 @@ class WeatherBrightSky(WeatherProvider):
         assert key  # noqa: S101
         humidity = self.key_to_array(
             key=key,
-            start_datetime=self.start_datetime,
+            start_datetime=self.ems_start_datetime,
             end_datetime=self.end_datetime,
             interval=to_duration("1 hour"),
         )
@@ -250,7 +250,10 @@ class WeatherBrightSky(WeatherProvider):
             data=data,
             index=pd.DatetimeIndex(
                 pd.date_range(
-                    start=self.start_datetime, end=self.end_datetime, freq="1h", inclusive="left"
+                    start=self.ems_start_datetime,
+                    end=self.end_datetime,
+                    freq="1h",
+                    inclusive="left",
                 )
             ),
         )

src/akkudoktoreos/prediction/weatherclearoutside.py

@@ -301,7 +301,8 @@ class WeatherClearOutside(WeatherProvider):
 
             # Converting the cloud cover into Irradiance (GHI, DNI, DHI)
             cloud_cover = pd.Series(
-                data=clearout_data["Total Clouds (% Sky Obscured)"], index=clearout_data["DateTime"]
+                data=clearout_data["Total Clouds (% Sky Obscured)"],
+                index=pd.to_datetime(clearout_data["DateTime"]),
             )
             ghi, dni, dhi = self.estimate_irradiance_from_cloud_cover(
                 self.config.general.latitude, self.config.general.longitude, cloud_cover

src/akkudoktoreos/prediction/weatherimport.py

@@ -61,14 +61,16 @@ class WeatherImport(WeatherProvider, PredictionImportProvider):
         return "WeatherImport"
 
     def _update_data(self, force_update: Optional[bool] = False) -> None:
-        if self.config.weather.provider_settings is None:
+        if self.config.weather.provider_settings.WeatherImport is None:
             logger.debug(f"{self.provider_id()} data update without provider settings.")
             return
-        if self.config.weather.provider_settings.import_file_path:
+        if self.config.weather.provider_settings.WeatherImport.import_file_path:
             self.import_from_file(
-                self.config.weather.provider_settings.import_file_path, key_prefix="weather"
+                self.config.weather.provider_settings.WeatherImport.import_file_path,
+                key_prefix="weather",
             )
-        if self.config.weather.provider_settings.import_json:
+        if self.config.weather.provider_settings.WeatherImport.import_json:
             self.import_from_json(
-                self.config.weather.provider_settings.import_json, key_prefix="weather"
+                self.config.weather.provider_settings.WeatherImport.import_json,
+                key_prefix="weather",
             )

src/akkudoktoreos/server/dash/about.py

@@ -2,9 +2,10 @@ from typing import Any
 
 from fasthtml.common import Div
 
+from akkudoktoreos.core.version import __version__
 from akkudoktoreos.server.dash.markdown import Markdown
 
-hello_md = """![Logo](/eosdash/assets/logo.png)
+about_md = f"""![Logo](/eosdash/assets/logo.png)
 
 # Akkudoktor EOSdash
 
@@ -17,8 +18,15 @@ electricity price data, this system enables forecasting and optimization of ener
 over a specified period.
 
 Documentation can be found at [Akkudoktor-EOS](https://akkudoktor-eos.readthedocs.io/en/latest/).
+
+## Version Information
+
+**Current Version:** {__version__}
+
+**License:** Apache License
+
 """
 
 
-def Hello(**kwargs: Any) -> Div:
-    return Markdown(hello_md, **kwargs)
+def About(**kwargs: Any) -> Div:
+    return Markdown(about_md, **kwargs)

src/akkudoktoreos/server/dash/admin.py

@@ -56,8 +56,107 @@ def AdminButton(*c: Any, cls: Optional[Union[str, tuple]] = None, **kwargs: Any)
     return Button(*c, submit=False, **kwargs)
 
 
-def AdminConfig(
+def AdminCache(
     eos_host: str, eos_port: Union[str, int], data: Optional[dict], config: Optional[dict[str, Any]]
+) -> tuple[str, Union[Card, list[Card]]]:
+    """Creates a cache management card.
+
+    Args:
+        eos_host (str): The hostname of the EOS server.
+        eos_port (Union[str, int]): The port of the EOS server.
+        data (Optional[dict]): Incoming data containing action and category for processing.
+
+    Returns:
+        tuple[str, Union[Card, list[Card]]]: A tuple containing the cache category label and the `Card` UI component.
+    """
+    server = f"http://{eos_host}:{eos_port}"
+    eos_hostname = "EOS server"
+    eosdash_hostname = "EOSdash server"
+
+    category = "cache"
+
+    if data and data.get("category", None) == category:
+        # This data is for us
+        if data["action"] == "clear":
+            # Clear all cache files
+            try:
+                result = requests.post(f"{server}/v1/admin/cache/clear", timeout=10)
+                result.raise_for_status()
+                status = Success(f"Cleared all cache files on '{eos_hostname}'")
+            except requests.exceptions.HTTPError as e:
+                detail = result.json()["detail"]
+                status = Error(f"Can not clear all cache files on '{eos_hostname}': {e}, {detail}")
+            except Exception as e:
+                status = Error(f"Can not clear all cache files on '{eos_hostname}': {e}")
+        elif data["action"] == "clear-expired":
+            # Clear expired cache files
+            try:
+                result = requests.post(f"{server}/v1/admin/cache/clear-expired", timeout=10)
+                result.raise_for_status()
+                status = Success(f"Cleared expired cache files on '{eos_hostname}'")
+            except requests.exceptions.HTTPError as e:
+                detail = result.json()["detail"]
+                status = Error(
+                    f"Can not clear expired cache files on '{eos_hostname}': {e}, {detail}"
+                )
+            except Exception as e:
+                status = Error(f"Can not clear expired cache files on '{eos_hostname}': {e}")
+
+    return (
+        category,
+        [
+            Card(
+                Details(
+                    Summary(
+                        Grid(
+                            DivHStacked(
+                                UkIcon(icon="play"),
+                                AdminButton(
+                                    "Clear all",
+                                    hx_post="/eosdash/admin",
+                                    hx_target="#page-content",
+                                    hx_swap="innerHTML",
+                                    hx_vals='{"category": "cache", "action": "clear"}',
+                                ),
+                                P(f"cache files on '{eos_hostname}'"),
+                            ),
+                        ),
+                        cls="list-none",
+                    ),
+                    P(f"Clear all cache files on '{eos_hostname}'."),
+                ),
+            ),
+            Card(
+                Details(
+                    Summary(
+                        Grid(
+                            DivHStacked(
+                                UkIcon(icon="play"),
+                                AdminButton(
+                                    "Clear expired",
+                                    hx_post="/eosdash/admin",
+                                    hx_target="#page-content",
+                                    hx_swap="innerHTML",
+                                    hx_vals='{"category": "cache", "action": "clear-expired"}',
+                                ),
+                                P(f"cache files on '{eos_hostname}'"),
+                            ),
+                        ),
+                        cls="list-none",
+                    ),
+                    P(f"Clear expired cache files on '{eos_hostname}'."),
+                ),
+            ),
+        ],
+    )
+
+
+def AdminConfig(
+    eos_host: str,
+    eos_port: Union[str, int],
+    data: Optional[dict],
+    config: Optional[dict[str, Any]],
+    config_backup: Optional[dict[str, dict[str, Any]]],
 ) -> tuple[str, Union[Card, list[Card]]]:
     """Creates a configuration management card with save-to-file functionality.
 
@@ -82,6 +181,8 @@ def AdminConfig(
             config_file_path = get_nested_value(config, ["general", "config_file_path"])
     except Exception as e:
         logger.debug(f"general.config_file_path: {e}")
+    # revert to backup
+    revert_to_backup_status = (None,)
     # export config file
     export_to_file_next_tag = to_datetime(as_string="YYYYMMDDHHmmss")
     export_to_file_status = (None,)
@@ -96,7 +197,7 @@ def AdminConfig(
                 result = requests.put(f"{server}/v1/config/file", timeout=10)
                 result.raise_for_status()
                 config_file_path = result.json()["general"]["config_file_path"]
-                status = Success(f"Saved to '{config_file_path}' on '{eos_hostname}'")
+                status = Success(f"Saved configuration to '{config_file_path}' on '{eos_hostname}'")
             except requests.exceptions.HTTPError as e:
                 detail = result.json()["detail"]
                 status = Error(
@@ -104,6 +205,45 @@ def AdminConfig(
                 )
             except Exception as e:
                 status = Error(f"Can not save actual config to file on '{eos_hostname}': {e}")
+        elif data["action"] == "revert_to_backup":
+            # Revert configuration to backup file
+            metadata = data.get("backup_metadata", None)
+            if metadata and config_backup:
+                date_time = metadata.split(" ")[0]
+                backup_id = None
+                for bkup_id, bkup_meta in config_backup.items():
+                    if bkup_meta.get("date_time") == date_time:
+                        backup_id = bkup_id
+                        break
+                if backup_id:
+                    try:
+                        result = requests.put(
+                            f"{server}/v1/config/revert",
+                            params={"backup_id": backup_id},
+                            timeout=10,
+                        )
+                        result.raise_for_status()
+                        config_file_path = result.json()["general"]["config_file_path"]
+                        revert_to_backup_status = Success(
+                            f"Reverted configuration to backup `{backup_id}` on '{eos_hostname}'"
+                        )
+                    except requests.exceptions.HTTPError as e:
+                        detail = result.json()["detail"]
+                        revert_to_backup_status = Error(
+                            f"Can not revert to backup `{backup_id}` on '{eos_hostname}': {e}, {detail}"
+                        )
+                    except Exception as e:
+                        revert_to_backup_status = Error(
+                            f"Can not revert to backup `{backup_id}` on '{eos_hostname}': {e}"
+                        )
+                else:
+                    revert_to_backup_status = Error(
+                        f"Can not revert to backup `{backup_id}` on '{eos_hostname}': Invalid backup datetime {date_time}"
+                    )
+            else:
+                revert_to_backup_status = Error(
+                    f"Can not revert to backup configuration on '{eos_hostname}': No backup selected"
+                )
         elif data["action"] == "export_to_file":
             # Export current configuration to file
             export_to_file_tag = data.get("export_to_file_tag", export_to_file_next_tag)
@@ -162,6 +302,13 @@ def AdminConfig(
 
     # Update for display, in case we added a new file before
     import_from_file_names = [f.name for f in list(export_import_directory.glob("*.json"))]
+    if config_backup is None:
+        revert_to_backup_metadata_list = ["Backup list not available"]
+    else:
+        revert_to_backup_metadata_list = [
+            f"{backup_meta['date_time']} {backup_meta['version']}"
+            for backup_id, backup_meta in config_backup.items()
+        ]
 
     return (
         category,
@@ -188,6 +335,33 @@ def AdminConfig(
                     P(f"Safe actual configuration to '{config_file_path}' on '{eos_hostname}'."),
                 ),
             ),
+            Card(
+                Details(
+                    Summary(
+                        Grid(
+                            DivHStacked(
+                                UkIcon(icon="play"),
+                                AdminButton(
+                                    "Revert to backup",
+                                    hx_post="/eosdash/admin",
+                                    hx_target="#page-content",
+                                    hx_swap="innerHTML",
+                                    hx_vals='js:{ "category": "configuration", "action": "revert_to_backup", "backup_metadata": document.querySelector("[name=\'selected_backup_metadata\']").value }',
+                                ),
+                                Select(
+                                    *Options(*revert_to_backup_metadata_list),
+                                    id="backup_metadata",
+                                    name="selected_backup_metadata",  # Name of hidden input field with selected value
+                                    placeholder="Select backup",
+                                ),
+                            ),
+                            revert_to_backup_status,
+                        ),
+                        cls="list-none",
+                    ),
+                    P(f"Revert configuration to backup on '{eosdash_hostname}'."),
+                ),
+            ),
             Card(
                 Details(
                     Summary(
@@ -269,7 +443,20 @@ def Admin(eos_host: str, eos_port: Union[str, int], data: Optional[dict] = None)
         result.raise_for_status()
         config = result.json()
     except requests.exceptions.HTTPError as e:
-        config = {}
+        detail = result.json()["detail"]
+        warning_msg = f"Can not retrieve configuration from {server}: {e}, {detail}"
+        logger.warning(warning_msg)
+        return Error(warning_msg)
+    except Exception as e:
+        warning_msg = f"Can not retrieve configuration from {server}: {e}"
+        logger.warning(warning_msg)
+        return Error(warning_msg)
+    # Get current configuration backups from server
+    try:
+        result = requests.get(f"{server}/v1/config/backup", timeout=10)
+        result.raise_for_status()
+        config_backup = result.json()
+    except requests.exceptions.HTTPError as e:
         detail = result.json()["detail"]
         warning_msg = f"Can not retrieve configuration from {server}: {e}, {detail}"
         logger.warning(warning_msg)
@@ -282,7 +469,8 @@ def Admin(eos_host: str, eos_port: Union[str, int], data: Optional[dict] = None)
     rows = []
     last_category = ""
     for category, admin in [
-        AdminConfig(eos_host, eos_port, data, config),
+        AdminCache(eos_host, eos_port, data, config),
+        AdminConfig(eos_host, eos_port, data, config, config_backup),
     ]:
         if category != last_category:
             rows.append(H3(category))

src/akkudoktoreos/server/dash/bokeh.py

@@ -1,33 +1,87 @@
 # Module taken from https://github.com/koaning/fh-altair
 # MIT license
-
 from typing import Optional
 
+import bokeh
 from bokeh.embed import components
 from bokeh.models import Plot
 from monsterui.franken import H4, Card, NotStr, Script
 
+bokeh_version = bokeh.__version__
+
 BokehJS = [
-    Script(src="https://cdn.bokeh.org/bokeh/release/bokeh-3.7.0.min.js", crossorigin="anonymous"),
     Script(
-        src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-3.7.0.min.js",
+        src=f"https://cdn.bokeh.org/bokeh/release/bokeh-{bokeh_version}.min.js",
         crossorigin="anonymous",
     ),
     Script(
-        src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-3.7.0.min.js", crossorigin="anonymous"
+        src=f"https://cdn.bokeh.org/bokeh/release/bokeh-widgets-{bokeh_version}.min.js",
+        crossorigin="anonymous",
     ),
     Script(
-        src="https://cdn.bokeh.org/bokeh/release/bokeh-gl-3.7.0.min.js", crossorigin="anonymous"
+        src=f"https://cdn.bokeh.org/bokeh/release/bokeh-tables-{bokeh_version}.min.js",
+        crossorigin="anonymous",
     ),
     Script(
-        src="https://cdn.bokeh.org/bokeh/release/bokeh-mathjax-3.7.0.min.js",
+        src=f"https://cdn.bokeh.org/bokeh/release/bokeh-gl-{bokeh_version}.min.js",
+        crossorigin="anonymous",
+    ),
+    Script(
+        src=f"https://cdn.bokeh.org/bokeh/release/bokeh-mathjax-{bokeh_version}.min.js",
         crossorigin="anonymous",
     ),
 ]
 
 
+def bokey_apply_theme_to_plot(plot: Plot, dark: bool) -> None:
+    """Apply a dark or light theme to a Bokeh plot.
+
+    This function modifies the appearance of a Bokeh `Plot` object in-place,
+    adjusting background, border, title, axis, and grid colors based on the
+    `dark` parameter.
+
+    Args:
+        plot (Plot): The Bokeh plot to style.
+        dark (bool): Whether to apply the dark theme (`True`) or light theme (`False`).
+
+    Notes:
+        - This only affects the plot passed in; it does not change other plots
+          in the same document.
+    """
+    if dark:
+        plot.background_fill_color = "#1e1e1e"
+        plot.border_fill_color = "#1e1e1e"
+        plot.title.text_color = "white"
+        for ax in plot.xaxis + plot.yaxis:
+            ax.axis_line_color = "white"
+            ax.major_tick_line_color = "white"
+            ax.major_label_text_color = "white"
+            ax.axis_label_text_color = "white"
+        # Grid lines
+        for grid in plot.renderers:
+            if hasattr(grid, "grid_line_color"):
+                grid.grid_line_color = "#333"
+        for grid in plot.xgrid + plot.ygrid:
+            grid.grid_line_color = "#333"
+    else:
+        plot.background_fill_color = "white"
+        plot.border_fill_color = "white"
+        plot.title.text_color = "black"
+        for ax in plot.xaxis + plot.yaxis:
+            ax.axis_line_color = "black"
+            ax.major_tick_line_color = "black"
+            ax.major_label_text_color = "black"
+            ax.axis_label_text_color = "black"
+        # Grid lines
+        for grid in plot.renderers:
+            if hasattr(grid, "grid_line_color"):
+                grid.grid_line_color = "#ddd"
+        for grid in plot.xgrid + plot.ygrid:
+            grid.grid_line_color = "#ddd"
+
+
 def Bokeh(plot: Plot, header: Optional[str] = None) -> Card:
-    """Converts an Bokeh plot to a FastHTML FT component."""
+    """Convert a Bokeh plot to a FastHTML FT component."""
     script, div = components(plot)
     if header:
         header = H4(header, cls="mt-2")

src/akkudoktoreos/server/dash/components.py

@@ -1,15 +1,13 @@
 from typing import Any, Optional, Union
 
-from fasthtml.common import H1, Div, Li
+from fasthtml.common import H1, Button, Div, Li
 from monsterui.daisy import (
     Alert,
     AlertT,
 )
 from monsterui.foundations import stringify
-from monsterui.franken import (
+from monsterui.franken import (  # Button, Does not pass hx_vals
     H3,
-    Button,
-    ButtonT,
     Card,
     Container,
     ContainerT,
@@ -246,7 +244,8 @@ def DashboardTrigger(*c: Any, cls: Optional[Union[str, tuple]] = None, **kwargs:
     Returns:
         Button: A styled `Button` component.
     """
-    new_cls = f"{ButtonT.primary}"
+    #   new_cls = f"{ButtonT.primary} uk-border-rounded uk-padding-small"
+    new_cls = "uk-btn uk-btn-primary uk-border-rounded uk-padding-medium"
     if cls:
         new_cls += f" {stringify(cls)}"
     kwargs["cls"] = new_cls
@@ -270,6 +269,7 @@ def DashboardTabs(dashboard_items: dict[str, str]) -> Card:
                 hx_get=f"{path}",
                 hx_target="#page-content",
                 hx_swap="innerHTML",
+                hx_vals='js:{ "dark": window.matchMedia("(prefers-color-scheme: dark)").matches }',
             ),
         )
         for menu, path in dashboard_items.items()
@@ -286,7 +286,9 @@ def DashboardContent(content: Any) -> Card:
     Returns:
         Card: A styled `Card` element containing the content.
     """
-    return Card(ScrollArea(Container(content, id="page-content"), cls="h-[75vh] w-full rounded-md"))
+    return Card(
+        ScrollArea(Container(content, id="page-content"), cls="h-[75vh] w-full rounded-md"),
+    )
 
 
 def Page(

src/akkudoktoreos/server/dash/data/democonfig.json

@@ -1,86 +0,0 @@
-{
-  "elecprice": {
-    "charges_kwh": 0.21,
-    "provider": "ElecPriceAkkudoktor"
-  },
-  "general": {
-    "latitude": 52.5,
-    "longitude": 13.4
-  },
-  "prediction": {
-    "historic_hours": 48,
-    "hours": 48
-  },
-  "load": {
-    "provider": "LoadAkkudoktor",
-    "provider_settings": {
-      "loadakkudoktor_year_energy": 20000
-    }
-  },
-  "optimization": {
-    "hours": 48
-  },
-  "pvforecast": {
-    "planes": [
-      {
-        "peakpower": 5.0,
-        "surface_azimuth": 170,
-        "surface_tilt": 7,
-        "userhorizon": [
-          20,
-          27,
-          22,
-          20
-        ],
-        "inverter_paco": 10000
-      },
-      {
-        "peakpower": 4.8,
-        "surface_azimuth": 90,
-        "surface_tilt": 7,
-        "userhorizon": [
-          30,
-          30,
-          30,
-          50
-        ],
-        "inverter_paco": 10000
-      },
-      {
-        "peakpower": 1.4,
-        "surface_azimuth": 140,
-        "surface_tilt": 60,
-        "userhorizon": [
-          60,
-          30,
-          0,
-          30
-        ],
-        "inverter_paco": 2000
-      },
-      {
-        "peakpower": 1.6,
-        "surface_azimuth": 185,
-        "surface_tilt": 45,
-        "userhorizon": [
-          45,
-          25,
-          30,
-          60
-        ],
-        "inverter_paco": 1400
-      }
-    ],
-    "provider": "PVForecastAkkudoktor"
-  },
-  "server": {
-    "startup_eosdash": true,
-    "host": "127.0.0.1",
-    "port": 8503,
-    "eosdash_host": "127.0.0.1",
-    "eosdash_port": 8504
-  },
-  "weather": {
-    "provider": "BrightSky"
-  }
-}

src/akkudoktoreos/server/dash/eosstatus.py

@@ -0,0 +1,13 @@
+# EOS server status information
+
+from typing import Optional
+
+from akkudoktoreos.config.config import SettingsEOS
+from akkudoktoreos.core.emplan import EnergyManagementPlan
+from akkudoktoreos.optimization.optimization import OptimizationSolution
+
+# The latest information from the EOS server
+eos_health: Optional[dict] = None
+eos_solution: Optional[OptimizationSolution] = None
+eos_plan: Optional[EnergyManagementPlan] = None
+eos_config: Optional[SettingsEOS] = None