emhass 0.13.0__tar.gz → 0.13.1__tar.gz

{emhass-0.13.0 → emhass-0.13.1}/.gitignore

@@ -47,6 +47,8 @@ MANIFEST
 
 # Local session data 
 data/actionLogs.txt
+data/debug-*.csv
+data/cached-open-meteo-forecast.json
 data/entities/*.json
 
 # PyInstaller

{emhass-0.13.0 → emhass-0.13.1}/PKG-INFO

@@ -1,18 +1,25 @@
 Metadata-Version: 2.4
 Name: emhass
-Version: 0.13.0
+Version: 0.13.1
 Summary: An Energy Management System for Home Assistant
 Project-URL: Homepage, https://github.com/davidusb-geek/emhass
+Project-URL: Source, https://github.com/davidusb-geek/emhass
+Project-URL: Issues, https://github.com/davidusb-geek/emhass/issues
+Project-URL: Documentation, https://emhass.readthedocs.io/en/latest/
+Project-URL: Community, https://community.home-assistant.io/t/emhass-an-energy-management-for-home-assistant
 Author-email: David HERNANDEZ <davidusb@gmail.com>
-License-Expression: MIT
+License: MIT
 License-File: LICENSE
 Keywords: energy,hass,management,optimization
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Classifier: Topic :: Software Development :: Build Tools
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: <3.13,>=3.10
 Requires-Dist: flask>=3.1.0
 Requires-Dist: gunicorn>=23.0.0
@@ -30,6 +37,8 @@ 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: dev
+Requires-Dist: ruff; extra == 'dev'
 Provides-Extra: docs
 Requires-Dist: myst-parser; extra == 'docs'
 Requires-Dist: sphinx; extra == 'docs'

emhass-0.13.1/pyproject.toml

@@ -0,0 +1,104 @@
+[project]
+name = "emhass"
+version = "0.13.1"
+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 = { text = "MIT" }
+keywords = ["energy", "management", "optimization", "hass"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "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",
+    "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",
+]
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+
+[tool.uv.workspace]
+members = ["emhass"]
+
+[tool.uv.sources]
+emhass = { workspace = true }
+
+[tool.uv]
+default-groups = "all"
+package = true
+
+[project.optional-dependencies]
+docs = ["sphinx", "sphinx-rtd-theme", "myst-parser"]
+test = ["requests-mock", "pytest", "coverage", "snakeviz", "ruff", "tabulate", "hatchling"]
+dev = ["ruff"]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/emhass"]
+package-data = { "emhass" = [
+    "templates/*",
+    "static/*",
+    "img/*",
+    "data/cec_modules.pbz2",
+    "data/cec_inverters.pbz2",
+    "data/associations.csv",
+    "data/config_defaults.json"]}
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "src/emhass/templates/",
+    "src/emhass/static/",
+    "src/emhass/img/",
+    "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"
+Source = "https://github.com/davidusb-geek/emhass"
+Issues = "https://github.com/davidusb-geek/emhass/issues"
+Documentation = "https://emhass.readthedocs.io/en/latest/"
+Community = "https://community.home-assistant.io/t/emhass-an-energy-management-for-home-assistant" 
+
+[tool.ruff.lint]
+select = ["E", "W", "F", "I", "C", "B", "Q", "UP", "YTT", "PYI"]
+ignore = ["E501", "B008", "B905", "C901"] 
+
+[dependency-groups]
+dev = [
+    "emhass",
+]
+
+[tool.ruff]
+target-version = "py311" 
+src = ["src", "tests"]

{emhass-0.13.0 → emhass-0.13.1/src}/emhass/data/associations.csv

@@ -38,6 +38,7 @@ optim_conf,prod_sell_price,photovoltaic_production_sell_price
 optim_conf,set_total_pv_sell,set_total_pv_sell
 optim_conf,lp_solver,lp_solver
 optim_conf,lp_solver_path,lp_solver_path
+optim_conf,lp_solver_timeout,lp_solver_timeout
 optim_conf,set_nocharge_from_grid,set_nocharge_from_grid
 optim_conf,set_nodischarge_to_grid,set_nodischarge_to_grid
 optim_conf,set_battery_dynamic,set_battery_dynamic
@@ -46,6 +47,7 @@ optim_conf,battery_dynamic_min,battery_dynamic_min
 optim_conf,weight_battery_discharge,weight_battery_discharge
 optim_conf,weight_battery_charge,weight_battery_charge
 optim_conf,weather_forecast_method,weather_forecast_method
+optim_conf,open_meteo_cache_max_age,open_meteo_cache_max_age
 optim_conf,def_start_timestep,start_timesteps_of_each_deferrable_load,list_start_timesteps_of_each_deferrable_load
 optim_conf,def_end_timestep,end_timesteps_of_each_deferrable_load,list_end_timesteps_of_each_deferrable_load
 optim_conf,list_hp_periods,load_peak_hour_periods

{emhass-0.13.0 → emhass-0.13.1/src}/emhass/data/config_defaults.json

@@ -9,13 +9,14 @@
   "set_total_pv_sell": false,
   "lp_solver": "default",
   "lp_solver_path": "empty",
+  "lp_solver_timeout": 45,
   "set_nocharge_from_grid": false,
   "set_nodischarge_to_grid": true,
   "set_battery_dynamic": false,
   "battery_dynamic_max": 0.9,
   "battery_dynamic_min": -0.9,
-  "weight_battery_discharge": 1.0,
-  "weight_battery_charge": 1.0,
+  "weight_battery_discharge": 0.0,
+  "weight_battery_charge": 0.0,
   "sensor_power_photovoltaics": "sensor.power_photovoltaics",
   "sensor_power_photovoltaics_forecast": "sensor.p_pv_forecast",
   "sensor_power_load_no_var_loads": "sensor.power_load_no_var_loads",
@@ -43,6 +44,7 @@
     0
   ],
   "weather_forecast_method": "open-meteo",
+  "open_meteo_cache_max_age": 30,
   "load_forecast_method": "naive",
   "delta_forecast_daily": 1,
   "load_cost_forecast_method": "hp_hc_periods",
@@ -123,4 +125,4 @@
   "battery_minimum_state_of_charge": 0.3,
   "battery_maximum_state_of_charge": 0.9,
   "battery_target_state_of_charge": 0.6
-}
+}

{emhass-0.13.0 → emhass-0.13.1/src}/emhass/static/data/param_definitions.json

@@ -138,6 +138,12 @@
       "input": "text",
       "default_value": "/usr/bin/cbc"
     },
+    "lp_solver_timeout": {
+      "friendly_name": "Linear programming solver timeout",
+      "Description": "Set the maximum time (in seconds) for the LP solver. Defaults to 45.",
+      "input": "int",
+      "default_value": 45
+    },
     "weather_forecast_method": {
       "friendly_name": "Weather forecast method",
       "Description": "This will define the weather forecast method that will be used. options are 'open-meteo', 'Solcast', 'solar.forecast' (forecast.solar) and 'csv' to load a CSV file. When loading a CSV file this will be directly considered as the PV power forecast in Watts.",
@@ -150,6 +156,12 @@
       ],
       "default_value": "open-meteo"
     },
+    "open_meteo_cache_max_age": {
+      "friendly_name": "Open-Meteo Cache Max Age",
+      "Description": "The maximum age, in minutes, of the cached open-meteo json response, after which a new version will be fetched from Open-Meteo. Defaults to 30.",
+      "input": "int",
+      "default_value": 30
+    },
     "maximum_power_from_grid": {
       "friendly_name": "Max power from grid",
       "Description": "The maximum power that can be supplied by the utility grid in Watts (consumption). Defaults to 9000.",