mirror of
https://github.com/Akkudoktor-EOS/EOS.git
synced 2026-01-01 00:06:18 +00:00
Adapters for Home Assistant and NodeRED integration are added. Akkudoktor-EOS can now be run as Home Assistant add-on and standalone. As Home Assistant add-on EOS uses ingress to fully integrate the EOSdash dashboard in Home Assistant. The fix includes several bug fixes that are not directly related to the adapter implementation but are necessary to keep EOS running properly and to test and document the changes. * fix: development version scheme The development versioning scheme is adaptet to fit to docker and home assistant expectations. The new scheme is x.y.z and x.y.z.dev<hash>. Hash is only digits as expected by home assistant. Development version is appended by .dev as expected by docker. * fix: use mean value in interval on resampling for array When downsampling data use the mean value of all values within the new sampling interval. * fix: default battery ev soc and appliance wh Make the genetic simulation return default values for the battery SoC, electric vehicle SoC and appliance load if these assets are not used. * fix: import json string Strip outer quotes from JSON strings on import to be compliant to json.loads() expectation. * fix: default interval definition for import data Default interval must be defined in lowercase human definition to be accepted by pendulum. * fix: clearoutside schema change * feat: add adapters for integrations Adapters for Home Assistant and NodeRED integration are added. Akkudoktor-EOS can now be run as Home Assistant add-on and standalone. As Home Assistant add-on EOS uses ingress to fully integrate the EOSdash dashboard in Home Assistant. * feat: allow eos to be started with root permissions and drop priviledges Home assistant starts all add-ons with root permissions. Eos now drops root permissions if an applicable user is defined by paramter --run_as_user. The docker image defines the user eos to be used. * feat: make eos supervise and monitor EOSdash Eos now not only starts EOSdash but also monitors EOSdash during runtime and restarts EOSdash on fault. EOSdash logging is captured by EOS and forwarded to the EOS log to provide better visibility. * feat: add duration to string conversion Make to_duration to also return the duration as string on request. * chore: Use info logging to report missing optimization parameters In parameter preparation for automatic optimization an error was logged for missing paramters. Log is now down using the info level. * chore: make EOSdash use the EOS data directory for file import/ export EOSdash use the EOS data directory for file import/ export by default. This allows to use the configuration import/ export function also within docker images. * chore: improve EOSdash config tab display Improve display of JSON code and add more forms for config value update. * chore: make docker image file system layout similar to home assistant Only use /data directory for persistent data. This is handled as a docker volume. The /data volume is mapped to ~/.local/share/net.akkudoktor.eos if using docker compose. * chore: add home assistant add-on development environment Add VSCode devcontainer and task definition for home assistant add-on development. * chore: improve documentation
195 lines
7.6 KiB
Makefile
195 lines
7.6 KiB
Makefile
# Define the targets
|
|
.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 prepare-version test-version
|
|
|
|
# - Take VERSION from version.py
|
|
VERSION := $(shell python3 scripts/get_version.py)
|
|
|
|
# Default target
|
|
all: help
|
|
|
|
# Target to display help information
|
|
help:
|
|
@echo "Available targets:"
|
|
@echo " venv - Set up a Python 3 virtual environment."
|
|
@echo " pip - Install dependencies from requirements.txt."
|
|
@echo " pip-dev - Install dependencies from requirements-dev.txt."
|
|
@echo " format - Format source code."
|
|
@echo " gitlint - Lint last commit message."
|
|
@echo " mypy - Run mypy."
|
|
@echo " install - Install EOS in editable form (development mode) into virtual environment."
|
|
@echo " docker-run - Run entire setup on docker"
|
|
@echo " docker-build - Rebuild docker image"
|
|
@echo " docs - Generate HTML documentation (in build/docs/html/)."
|
|
@echo " read-docs - Read HTML documentation in your browser."
|
|
@echo " gen-docs - Generate openapi.json and docs/_generated/*."
|
|
@echo " clean-docs - Remove generated documentation."
|
|
@echo " run - Run EOS production server in virtual environment."
|
|
@echo " run-dev - Run EOS development server in virtual environment (automatically reloads)."
|
|
@echo " run-dash - Run EOSdash production server in virtual environment."
|
|
@echo " run-dash-dev - Run EOSdash development server in virtual environment (automatically reloads)."
|
|
@echo " test - Run tests."
|
|
@echo " test-finalize - Run all tests (e.g. to finalize a commit)."
|
|
@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 " prepare-version - Prepare a version defined in setup.py."
|
|
|
|
# Target to set up a Python 3 virtual environment
|
|
venv:
|
|
python3 -m venv .venv
|
|
@PYVER=$$(./.venv/bin/python --version) && \
|
|
echo "Virtual environment created in '.venv' with $$PYVER. Activate it using 'source .venv/bin/activate'."
|
|
|
|
# Target to install dependencies from requirements.txt
|
|
pip: venv
|
|
.venv/bin/pip install --upgrade pip
|
|
.venv/bin/pip install -r requirements.txt
|
|
@echo "Dependencies installed from requirements.txt."
|
|
|
|
# Target to install dependencies from requirements.txt
|
|
pip-dev: pip
|
|
.venv/bin/pip install -r requirements-dev.txt
|
|
@echo "Dependencies installed from requirements-dev.txt."
|
|
|
|
# Target to create a version.txt
|
|
version-txt:
|
|
echo "$(VERSION)" > version.txt
|
|
|
|
# Target to install EOS in editable form (development mode) into virtual environment.
|
|
install: pip-dev version-txt
|
|
.venv/bin/pip install build
|
|
.venv/bin/pip install -e .
|
|
@echo "EOS installed in editable form (development mode)."
|
|
|
|
# Target to create a distribution.
|
|
dist: pip
|
|
.venv/bin/pip install build
|
|
.venv/bin/python -m build --wheel
|
|
@echo "Distribution created (see dist/)."
|
|
|
|
# Target to generate documentation
|
|
gen-docs: pip-dev version-txt
|
|
.venv/bin/pip install -e .
|
|
.venv/bin/python ./scripts/generate_config_md.py --output-file docs/_generated/config.md
|
|
.venv/bin/python ./scripts/generate_openapi_md.py --output-file docs/_generated/openapi.md
|
|
.venv/bin/python ./scripts/generate_openapi.py --output-file openapi.json
|
|
@echo "Documentation generated to openapi.json and docs/_generated."
|
|
|
|
# Target to build HTML documentation
|
|
docs: pip-dev
|
|
.venv/bin/pytest --finalize tests/test_docsphinx.py
|
|
@echo "Documentation build to build/docs/html/."
|
|
|
|
# Target to read the HTML documentation
|
|
read-docs:
|
|
@echo "Read the documentation in your browser"
|
|
.venv/bin/pytest --finalize tests/test_docsphinx.py
|
|
.venv/bin/python -m webbrowser build/docs/html/index.html
|
|
|
|
# Clean Python bytecode
|
|
clean-bytecode:
|
|
find . -type d -name "__pycache__" -exec rm -r {} +
|
|
find . -type f -name "*.pyc" -delete
|
|
|
|
# Clean target to remove generated documentation and documentation artefacts
|
|
clean-docs:
|
|
@echo "Searching and deleting all '_autosum' directories in docs..."
|
|
@find docs -type d -name '_autosummary' -exec rm -rf {} +;
|
|
@echo "Cleaning docs build directories"
|
|
rm -rf build/docs
|
|
|
|
# Clean target to remove generated documentation, distribution and virtual environment
|
|
clean: clean-docs
|
|
@echo "Cleaning virtual env, distribution and build directories"
|
|
rm -rf build .venv
|
|
@echo "Deletion complete."
|
|
|
|
run:
|
|
@echo "Starting EOS production server, please wait..."
|
|
.venv/bin/python -m akkudoktoreos.server.eos --startup_eosdash true
|
|
|
|
run-dev:
|
|
@echo "Starting EOS development server, please wait..."
|
|
.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..."
|
|
.venv/bin/python -m akkudoktoreos.server.eosdash
|
|
|
|
run-dash-dev:
|
|
@echo "Starting EOSdash development server, please wait..."
|
|
.venv/bin/python -m akkudoktoreos.server.eosdash --host localhost --port 8504 --log_level DEBUG --reload true
|
|
|
|
# Target to setup tests.
|
|
test-setup: pip-dev
|
|
@echo "Setup tests"
|
|
|
|
# Target to run tests.
|
|
test:
|
|
@echo "Running tests..."
|
|
.venv/bin/pytest -vs --cov src --cov-report term-missing
|
|
|
|
# Target to run tests as done by CI on Github.
|
|
test-ci:
|
|
@echo "Running tests as CI..."
|
|
.venv/bin/pytest --finalize --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-finalize:
|
|
@echo "Running all tests..."
|
|
.venv/bin/pytest --finalize
|
|
|
|
# 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 latest commit messages
|
|
gitlint:
|
|
.venv/bin/cz check --rev-range main..HEAD
|
|
|
|
# Target to format code.
|
|
mypy:
|
|
.venv/bin/mypy
|
|
|
|
# Run entire setup on docker
|
|
docker-run:
|
|
@echo "Build and run EOS docker container locally."
|
|
@echo "Persistent data (and config) in ${HOME}/.local/share/net.akkudoktor.eos"
|
|
@docker pull python:3.13.9-slim
|
|
@docker compose up --remove-orphans
|
|
|
|
docker-build:
|
|
@echo "Build EOS docker container locally."
|
|
@echo "Persistent data (and config) in ${HOME}/.local/share/net.akkudoktor.eos"
|
|
@docker pull python:3.13.9-slim
|
|
@docker compose build
|
|
|
|
# Propagete version info to all version files
|
|
# Take UPDATE_FILES from GitHub action bump-version.yml
|
|
UPDATE_FILES := $(shell sed -n 's/^[[:space:]]*UPDATE_FILES[[:space:]]*=[[:space:]]*"\([^"]*\)".*/\1/p' \
|
|
.github/workflows/bump-version.yml)
|
|
prepare-version: #pip-dev
|
|
@echo "Update version to $(VERSION) from version.py in files $(UPDATE_FILES) and doc"
|
|
.venv/bin/python ./scripts/update_version.py $(VERSION) $(UPDATE_FILES)
|
|
.venv/bin/python ./scripts/convert_lightweight_tags.py
|
|
.venv/bin/python ./scripts/generate_config_md.py --output-file docs/_generated/config.md
|
|
.venv/bin/python ./scripts/generate_openapi_md.py --output-file docs/_generated/openapi.md
|
|
.venv/bin/python ./scripts/generate_openapi.py --output-file openapi.json
|
|
.venv/bin/pytest -vv --finalize tests/test_version.py
|
|
|
|
test-version:
|
|
echo "Test version information to be correctly set in all version files"
|
|
.venv/bin/pytest -vv tests/test_version.py
|