emhass 0.12.4__tar.gz → 0.12.5__tar.gz

{emhass-0.12.4 → emhass-0.12.5}/.gitignore

@@ -11,6 +11,7 @@ secrets_emhass.yaml
 .vscode/launch.json
 .vscode/settings.json
 .vscode/tasks.json
+.devcontainer/devcontainer.json
 *.pkl
 **/app
 

{emhass-0.12.4 → emhass-0.12.5}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: emhass
-Version: 0.12.4
+Version: 0.12.5
 Summary: An Energy Management System for Home Assistant
 Project-URL: Homepage, https://github.com/davidusb-geek/emhass
 Author-email: David HERNANDEZ <davidusb@gmail.com>
-License: MIT
+License-Expression: MIT
 License-File: LICENSE
 Keywords: energy,hass,management,optimization
 Classifier: Development Status :: 5 - Production/Stable
@@ -13,23 +13,23 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Build Tools
-Requires-Python: <3.12,>=3.10
+Requires-Python: <3.13,>=3.10
 Requires-Dist: beautifulsoup4>=4.12.3
 Requires-Dist: flask>=3.1.0
 Requires-Dist: gunicorn>=23.0.0
 Requires-Dist: h5py>=3.12.1
 Requires-Dist: numpy<2.3.0,>=2.0.0
-Requires-Dist: pandas>=2.1.1
-Requires-Dist: plotly>=6.0.0rc0
-Requires-Dist: protobuf>=5.29.1
+Requires-Dist: pandas>=2.2.0
+Requires-Dist: plotly>=6.0.0
+Requires-Dist: protobuf>=5.29.3
 Requires-Dist: pulp>=2.8.0
-Requires-Dist: pvlib>=0.10.3
-Requires-Dist: pytz>=2023.4
-Requires-Dist: pyyaml>=6.0.1
-Requires-Dist: requests>=2.25.1
-Requires-Dist: scipy>=1.14.0
-Requires-Dist: skforecast>=0.9.0
-Requires-Dist: tables>=3.9.1
+Requires-Dist: pvlib>=0.11.0
+Requires-Dist: pytz>=2024.2
+Requires-Dist: pyyaml>=6.0.2
+Requires-Dist: requests>=2.32.2
+Requires-Dist: scipy>=1.15.0
+Requires-Dist: skforecast>=0.14.0
+Requires-Dist: tables>=3.10.0
 Requires-Dist: waitress>=3.0.2
 Provides-Extra: docs
 Requires-Dist: myst-parser; extra == 'docs'
@@ -37,6 +37,7 @@ Requires-Dist: sphinx; extra == 'docs'
 Requires-Dist: sphinx-rtd-theme; extra == 'docs'
 Provides-Extra: test
 Requires-Dist: coverage; extra == 'test'
+Requires-Dist: hatchling; extra == 'test'
 Requires-Dist: pytest; extra == 'test'
 Requires-Dist: requests-mock; extra == 'test'
 Requires-Dist: ruff; extra == 'test'
@@ -59,9 +60,6 @@ Description-Content-Type: text/markdown
   <a style="text-decoration:none" href="https://github.com/davidusb-geek/emhass/actions">
     <img alt="EMHASS GitHub Workflow Status" src="https://github.com/davidusb-geek/emhass/actions/workflows/publish_docker.yaml/badge.svg?event=release">
   </a>
-  <a hstyle="text-decoration:none" ref="https://codecov.io/github/davidusb-geek/emhass" >
-    <img src="https://codecov.io/github/davidusb-geek/emhass/branch/master/graph/badge.svg?token=BW7KSCHN90"/>
-  </a>
   <a style="text-decoration:none" href="https://github.com/davidusb-geek/emhass/blob/master/LICENSE">
     <img alt="GitHub" src="https://img.shields.io/github/license/davidusb-geek/emhass">
   </a>
@@ -74,6 +72,25 @@ Description-Content-Type: text/markdown
   <a style="text-decoration:none" href="https://emhass.readthedocs.io/en/latest/">
     <img alt="Read the Docs" src="https://img.shields.io/readthedocs/emhass">
   </a>
+    <a hstyle="text-decoration:none" ref="https://codecov.io/github/davidusb-geek/emhass" >
+    <img src="https://codecov.io/github/davidusb-geek/emhass/branch/master/graph/badge.svg?token=BW7KSCHN90"/>
+  </a>
+  <a hstyle="text-decoration:none" ref="https://github.com/davidusb-geek/emhass/actions/workflows/codeql.yml" >
+    <img src="https://github.com/davidusb-geek/emhass/actions/workflows/codeql.yml/badge.svg?branch=master&event=schedule"/>
+  </a>
+  <a style="text-decoration:none" href=https://sonarcloud.io/summary/new_code?id=davidusb-geek_emhass">
+    <img alt="SonarQube security rating" src="https://sonarcloud.io/api/project_badges/measure?project=davidusb-geek_emhass&metric=security_rating">
+  </a>
+  <a style="text-decoration:none" href=https://sonarcloud.io/summary/new_code?id=davidusb-geek_emhass">
+    <img alt="SonarQube security Vulnerabilities" src="https://sonarcloud.io/api/project_badges/measure?project=davidusb-geek_emhass&metric=vulnerabilities">
+  </a>
+  <a style="text-decoration:none" href=https://sonarcloud.io/summary/new_code?id=davidusb-geek_emhass">
+    <img alt="SonarQube reliability" src="https://sonarcloud.io/api/project_badges/measure?project=davidusb-geek_emhass&metric=reliability_rating">
+  </a>
+  <a style="text-decoration:none" href=https://sonarcloud.io/summary/new_code?id=davidusb-geek_emhass">
+    <img alt="SonarQube bugs" src="https://sonarcloud.io/api/project_badges/measure?project=davidusb-geek_emhass&metric=bugs">
+  </a>
+  
 </p>
 
 <div align="center">
@@ -638,7 +655,7 @@ curl -i -H 'Content-Type:application/json' -X POST -d '{"pv_power_forecast":[0,
 ```
 *Example with :`operating_hours_of_each_deferrable_load`, `start_timesteps_of_each_deferrable_load`, `end_timesteps_of_each_deferrable_load`.*
 ```bash
-curl -i -H 'Content-Type:application/json' -X POST -d '{"pv_power_forecast":[0, 70, 141.22, 246.18, 513.5, 753.27, 1049.89, 1797.93, 1697.3, 3078.93], "prediction_horizon":10, "soc_init":0.5,"soc_final":0.6,'operating_hours_of_each_deferrable_load':[1,3],'start_timesteps_of_each_deferrable_load':[0,3],'end_timesteps_of_each_deferrable_load':[0,6]}' http://localhost:5000/action/naive-mpc-optim
+curl -i -H 'Content-Type:application/json' -X POST -d '{"pv_power_forecast":[0, 70, 141.22, 246.18, 513.5, 753.27, 1049.89, 1797.93, 1697.3, 3078.93], "prediction_horizon":10, "soc_init":0.5,"soc_final":0.6,"operating_hours_of_each_deferrable_load":[1,3],"start_timesteps_of_each_deferrable_load":[0,3],"end_timesteps_of_each_deferrable_load":[0,6]}' http://localhost:5000/action/naive-mpc-optim
 ```
 
 ## A machine learning forecaster

{emhass-0.12.4 → emhass-0.12.5}/README.md

@@ -13,9 +13,6 @@
   <a style="text-decoration:none" href="https://github.com/davidusb-geek/emhass/actions">
     <img alt="EMHASS GitHub Workflow Status" src="https://github.com/davidusb-geek/emhass/actions/workflows/publish_docker.yaml/badge.svg?event=release">
   </a>
-  <a hstyle="text-decoration:none" ref="https://codecov.io/github/davidusb-geek/emhass" >
-    <img src="https://codecov.io/github/davidusb-geek/emhass/branch/master/graph/badge.svg?token=BW7KSCHN90"/>
-  </a>
   <a style="text-decoration:none" href="https://github.com/davidusb-geek/emhass/blob/master/LICENSE">
     <img alt="GitHub" src="https://img.shields.io/github/license/davidusb-geek/emhass">
   </a>
@@ -28,6 +25,25 @@
   <a style="text-decoration:none" href="https://emhass.readthedocs.io/en/latest/">
     <img alt="Read the Docs" src="https://img.shields.io/readthedocs/emhass">
   </a>
+    <a hstyle="text-decoration:none" ref="https://codecov.io/github/davidusb-geek/emhass" >
+    <img src="https://codecov.io/github/davidusb-geek/emhass/branch/master/graph/badge.svg?token=BW7KSCHN90"/>
+  </a>
+  <a hstyle="text-decoration:none" ref="https://github.com/davidusb-geek/emhass/actions/workflows/codeql.yml" >
+    <img src="https://github.com/davidusb-geek/emhass/actions/workflows/codeql.yml/badge.svg?branch=master&event=schedule"/>
+  </a>
+  <a style="text-decoration:none" href=https://sonarcloud.io/summary/new_code?id=davidusb-geek_emhass">
+    <img alt="SonarQube security rating" src="https://sonarcloud.io/api/project_badges/measure?project=davidusb-geek_emhass&metric=security_rating">
+  </a>
+  <a style="text-decoration:none" href=https://sonarcloud.io/summary/new_code?id=davidusb-geek_emhass">
+    <img alt="SonarQube security Vulnerabilities" src="https://sonarcloud.io/api/project_badges/measure?project=davidusb-geek_emhass&metric=vulnerabilities">
+  </a>
+  <a style="text-decoration:none" href=https://sonarcloud.io/summary/new_code?id=davidusb-geek_emhass">
+    <img alt="SonarQube reliability" src="https://sonarcloud.io/api/project_badges/measure?project=davidusb-geek_emhass&metric=reliability_rating">
+  </a>
+  <a style="text-decoration:none" href=https://sonarcloud.io/summary/new_code?id=davidusb-geek_emhass">
+    <img alt="SonarQube bugs" src="https://sonarcloud.io/api/project_badges/measure?project=davidusb-geek_emhass&metric=bugs">
+  </a>
+  
 </p>
 
 <div align="center">
@@ -592,7 +608,7 @@ curl -i -H 'Content-Type:application/json' -X POST -d '{"pv_power_forecast":[0,
 ```
 *Example with :`operating_hours_of_each_deferrable_load`, `start_timesteps_of_each_deferrable_load`, `end_timesteps_of_each_deferrable_load`.*
 ```bash
-curl -i -H 'Content-Type:application/json' -X POST -d '{"pv_power_forecast":[0, 70, 141.22, 246.18, 513.5, 753.27, 1049.89, 1797.93, 1697.3, 3078.93], "prediction_horizon":10, "soc_init":0.5,"soc_final":0.6,'operating_hours_of_each_deferrable_load':[1,3],'start_timesteps_of_each_deferrable_load':[0,3],'end_timesteps_of_each_deferrable_load':[0,6]}' http://localhost:5000/action/naive-mpc-optim
+curl -i -H 'Content-Type:application/json' -X POST -d '{"pv_power_forecast":[0, 70, 141.22, 246.18, 513.5, 753.27, 1049.89, 1797.93, 1697.3, 3078.93], "prediction_horizon":10, "soc_init":0.5,"soc_final":0.6,"operating_hours_of_each_deferrable_load":[1,3],"start_timesteps_of_each_deferrable_load":[0,3],"end_timesteps_of_each_deferrable_load":[0,6]}' http://localhost:5000/action/naive-mpc-optim
 ```
 
 ## A machine learning forecaster

emhass-0.12.5/pyproject.toml

@@ -0,0 +1,84 @@
+[build-system]
+# These are the assumed default build requirements from pip:
+# https://pip.pypa.io/en/stable/reference/pip/#pep-517-and-518-support
+requires = ["hatchling>=1.27.0"]
+build-backend = "hatchling.build"
+
+[tool.uv.workspace]
+members = ["emhass"]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/emhass"]
+
+[project]
+name = "emhass"
+version = "0.12.5"
+description = "An Energy Management System for Home Assistant"
+readme = "README.md"
+requires-python = ">=3.10, <3.13"
+authors = [{ name = "David HERNANDEZ", email = "davidusb@gmail.com" }]
+license = "MIT"
+keywords = ["energy", "management", "optimization", "hass"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Topic :: Software Development :: Build Tools",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3.11",
+    "Operating System :: OS Independent",
+]
+dependencies = [
+    "numpy>=2.0.0, <2.3.0",
+    "scipy>=1.15.0",
+    "pandas>=2.2.0",
+    "pvlib>=0.11.0",
+    "protobuf>=5.29.3",
+    "pytz>=2024.2",
+    "requests>=2.32.2",
+    "beautifulsoup4>=4.12.3",
+    "h5py>=3.12.1",
+    "pulp>=2.8.0",
+    "pyyaml>=6.0.2",
+    "tables>=3.10.0",
+    "skforecast>=0.14.0",
+    "flask>=3.1.0",
+    "waitress>=3.0.2",
+    "plotly>=6.0.0",
+    "gunicorn>=23.0.0",
+]
+
+[project.optional-dependencies]
+docs = ["sphinx", "sphinx-rtd-theme", "myst-parser"]
+# can add "mypy"
+test = ["requests_mock", "pytest", "coverage", "snakeviz", "ruff", "tabulate", "hatchling"]
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "/src/emhass/templates/index.html",
+    "/src/emhass/templates/template.html",
+    "/src/emhass/templates/configuration.html",
+    "/src/emhass/static/advanced.html",
+    "/src/emhass/static/basic.html",
+    "/src/emhass/static/script.js",
+    "/src/emhass/static/configuration_script.js",
+    "/src/emhass/static/style.css",
+    "/src/emhass/static/configuration_list.html",
+    "/src/emhass/static/img/emhass_icon.png",
+    "/src/emhass/static/img/emhass_logo_short.svg",
+    "/src/emhass/static/img/feather-sprite.svg",
+    "/src/emhass/static/data/param_definitions.json",
+    "/src/emhass/data/cec_modules.pbz2",
+    "/src/emhass/data/cec_inverters.pbz2",
+    "/src/emhass/data/associations.csv",
+    "/src/emhass/data/config_defaults.json"
+]
+
+[project.scripts]
+emhass = "emhass.command_line:main"
+
+[project.urls]
+Homepage = "https://github.com/davidusb-geek/emhass"
+
+#strict is strict
+#[tool.mypy]
+#strict =  true

emhass-0.12.4/.devcontainer/devcontainer.json

@@ -1,49 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/python
-{
-	"name": "EMHASS",
-	"build": {
-		"dockerfile": "../Dockerfile",
-		"context": "../",
-		"args": { "TARGETARCH": "amd64"}
-	},
-	"features": {
-		"ghcr.io/devcontainers/features/common-utils:2": {
-			"installBash": "true",
-			"configureBashAsDefaultShell": "true"
-		}
-		// "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
-	},
-	//"appPort": ["5000:5000"] //used to access app from external device (User discretion advised)
-
-
-	// Security issue, may be needed for Podman
-	// "runArgs": [
-	// 	"--userns=keep-id",
-	// 	"--pid=host"
-	// ],
-	// "remoteUser": "root",
-	// "containerUser": "root",
-
-
-	"customizations": {
-		// Configure properties specific to VS Code.
-		"vscode": {
-		  // Add the IDs of extensions you want installed when the container is created.
-		  "extensions": ["ms-python.debugpy", "ms-python.python","charliermarsh.ruff"],
-		  "settings": {
-			"[python]": {
-			  "editor.formatOnSave": true,
-			  "editor.codeActionsOnSave": {
-				"source.fixAll": "explicit",
-				"source.organizeImports": "explicit"
-			  },
-			  "editor.defaultFormatter": "charliermarsh.ruff"
-			}
-		  }
-		}
-	  },
-
-	"postCreateCommand": [ "uv", "pip", "install", "--cache-dir", ".cache", "--verbose", ".[test]" ]
-	  
-}

emhass-0.12.4/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Home Assistant installation type**
- - Home Assistant OS
- - Home Assistant Supervised
- - Home Assistant Core
-
-**Your hardware**
-- OS: HA OS, Windows, Linux, etc
-- Architecture: amd64, armhf, armv7, aarch64
-
-**EMHASS installation type**
- - Add-on, Docker Standalone, Legacy Python virtual environment
-
-**Additional context**
-Add any other context about the problem here.

emhass-0.12.4/.github/dependabot.yml

@@ -1,17 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: "pip"
-    directory: "/" 
-    schedule:
-      interval: "weekly"
-
-  # Enable version updates for Docker
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: "weekly"

emhass-0.12.4/.github/workflows/codecov.yaml

@@ -1,38 +0,0 @@
-name: CodeCov
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-jobs:
-  run:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-    env:
-      OS: ${{ matrix.os }}
-      PYTHON: '3.11'
-    steps:
-    - uses: actions/checkout@master
-    - name: Install uv
-        uses: astral-sh/setup-uv@v5
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version-file: ".python-version"
-    - name: Generate Report
-      run: |
-        uv venv
-        uv pip install .[test]
-        coverage run -m --source=emhass unittest
-        coverage report
-        coverage xml
-    - name: Upload coverage reports to Codecov
-      run: |
-        # Replace `linux` below with the appropriate OS
-        # Options are `alpine`, `linux`, `macos`, `windows`
-        curl -Os https://uploader.codecov.io/latest/linux/codecov
-        chmod +x codecov
-        ./codecov -t ${CODECOV_TOKEN}

emhass-0.12.4/.github/workflows/codeql.yml

@@ -1,55 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  pull_request:
-    branches: [ "master" ]
-  schedule:
-    - cron: '22 3 * * 2'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'python' , 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:${{matrix.language}}"

emhass-0.12.4/.github/workflows/docker-build-test.yaml

@@ -1,87 +0,0 @@
-#This action test builds EMHASS Docker images, in each architecture.
-name: "Test Building Docker Image"
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-  workflow_dispatch:
-
-permissions:
-  actions: read
-  security-events: write
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          [
-            { target_arch: amd64, os_version: debian },
-            { target_arch: armv7, os_version: debian },
-            { target_arch: armhf, os_version: raspbian },
-            { target_arch: aarch64, os_version: debian },
-          ]
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v4
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          platforms: ${{ matrix.platform.buildx }}
-          build-args: |
-            TARGETARCH=${{ matrix.platform.target_arch }}
-            os_version=${{ matrix.platform.os_version }}
-          load: true
-      - name: Test Image #Assume Docker fail with FileNotFound secrets_emhass.yaml error
-        run: docker run --rm -it ${{ steps.build.outputs.imageid }} | grep -q secrets_emhass.yaml && echo 0 || echo 1
-      # Google OSV-Scanner
-      # Extract Debian and Python packadge list stored in Image
-      - name: Export Debian package list
-        run: mkdir OSV && docker run --rm --entrypoint '/bin/cat' ${{ steps.build.outputs.imageid }} /var/lib/dpkg/status >> ./OSV/${{ matrix.platform.target_arch }}.status
-      - name: Export Python package list
-        run: docker run --rm --entrypoint '/bin/cat' ${{ steps.build.outputs.imageid }} uv.lock >> ./OSV/${{ matrix.platform.target_arch }}.lock
-      - name: Upload package list as digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.platform.target_arch }}-packages
-          path: ./OSV/*
-          if-no-files-found: error
-          retention-days: 1
-
-  osv-scan:
-    needs:
-      - build
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          [
-            { target_arch: amd64 },
-            { target_arch: armv7 },
-            { target_arch: armhf },
-            { target_arch: aarch64 }
-          ]
-    # Check Docker image debian and python packages list for known vulnerabilities
-    uses: "geoderp/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v0.0.1"
-    with:
-      download-artifact: "${{ matrix.platform.target_arch }}-packages"
-      matrix-property: "${{ matrix.platform.target_arch }}-"
-      fail-on-vuln: false
-      scan-args: |-
-        --lockfile=dpkg-status:./${{ matrix.platform.target_arch }}.status
-        --lockfile=poetry.lock:./${{matrix.platform.target_arch }}.lock
-    permissions:
-      security-events: write
-      contents: read
-      actions: read