zero division fix and updated hooks (#23)

authored by: Oscar

Author: Molier

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
   // "postStartCommand": "",
   "workspaceMount": "source=${localWorkspaceFolder},target=/workspaces/${localWorkspaceFolderBasename},type=bind,consistency=cached",
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
-  "remoteUser": "root",
+  "remoteUser": "vscode",
   "customizations": {
     "vscode": {
       "extensions": [

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.5.5
+    rev: v0.12.10
     hooks:
       # Run the linter.
       - id: ruff
@@ -12,13 +12,13 @@ repos:
         types_or: [python, pyi, jupyter]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.16.0
+    rev: v3.20.0
     hooks:
       - id: pyupgrade
         args: [--py311-plus]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v6.0.0
     hooks:
       - id: mixed-line-ending
         args: [--fix=lf] # Force LF line endings
@@ -29,7 +29,7 @@ repos:
 
   - repo: https://github.com/astral-sh/uv-pre-commit
     # uv version.
-    rev: 0.6.16
+    rev: 0.8.13
     hooks:
       - id: uv-export
         args:

openenergyid/baseload/analysis.py

@@ -163,11 +163,13 @@ def analyze(self, power_lf: pl.LazyFrame, reporting_granularity: str = "1h") ->
                         pl.col("total_consumption_in_kilowatthour")
                         - pl.col("consumption_due_to_baseload_in_kilowatthour")
                     ).alias("consumption_not_due_to_baseload_in_kilowatthour"),
-                    # What fraction of total energy was from baseload
-                    (
+                    pl.when(pl.col("total_consumption_in_kilowatthour") != 0)
+                    .then(
                         pl.col("consumption_due_to_baseload_in_kilowatthour")
                         / pl.col("total_consumption_in_kilowatthour")
-                    ).alias("baseload_ratio"),
+                    )
+                    .otherwise(None)
+                    .alias("baseload_ratio"),
                 ]
             )
         )

openenergyid/mvlr/mvlr.py

@@ -206,9 +206,9 @@ def _do_analysis_no_cross_validation(self):
 
     def _do_analysis_cross_validation(self):
         """Find the best model (fit) based on cross-valiation (leave one out)"""
-        assert (
-            len(self.data) < 15
-        ), "Cross-validation is not implemented if your sample contains more than 15 datapoints"
+        assert len(self.data) < 15, (
+            "Cross-validation is not implemented if your sample contains more than 15 datapoints"
+        )
 
         # initialization: first model is the mean, but compute cv correctly.
         errors = []

pyproject.toml

@@ -43,6 +43,9 @@ dev = [
     "ipykernel>=6.29.5",
     "jupyter>=1.1.1",
     "matplotlib>=3.10.3",
+    "notebook>=7.4.3",
+    "pandoc>=2.4",
+    "pip>=25.1.1",
     "plotly>=6.1.2",
     "pyarrow>=20.0.0",
     "pyinstrument>=5.0.2",

requirements-dev.txt

@@ -269,6 +269,7 @@ pandas==2.2.3
     #   statsmodels
 pandera==0.24.0
     # via openenergyid
+pandoc==2.4
 pandocfilters==1.5.1
     # via nbconvert
 parso==0.8.4
@@ -279,11 +280,16 @@ pexpect==4.9.0 ; sys_platform != 'emscripten' and sys_platform != 'win32'
     # via ipython
 pillow==11.2.1
     # via matplotlib
+pip==25.1.1
 platformdirs==4.3.8
     # via jupyter-core
 plotly==6.1.2
 pluggy==1.6.0
     # via pytest
+plumbum==1.9.0
+    # via pandoc
+ply==3.11
+    # via pandoc
 polars==1.30.0
     # via pandera
 prometheus-client==0.22.1
@@ -340,7 +346,9 @@ pytz==2025.2
     #   pandas
     #   pvlib
 pywin32==310 ; platform_python_implementation != 'PyPy' and sys_platform == 'win32'
-    # via jupyter-core
+    # via
+    #   jupyter-core
+    #   plumbum
 pywinpty==2.0.15 ; os_name == 'nt'
     # via
     #   jupyter-server