Merge pull request #57 from dsgrid/eh/view-bugfixes

View Bugfixes

Author: elainethale

.pre-commit-config.yaml

@@ -8,3 +8,11 @@ repos:
       args: [ --fix ]
     # Run the formatter.
     - id: ruff-format
+- repo: local
+  hooks:
+    - id: mypy
+      name: mypy
+      entry: mypy
+      language: system
+      pass_filenames: false
+      stages: [pre-push]

docs/how_tos/compare_scenarios.md

@@ -16,8 +16,8 @@ client = APIClient(project)
 ## Query Multiple Scenarios
 
 ```python
-baseline = client.get_total_consumption(scenario="baseline")
-high_growth = client.get_total_consumption(scenario="high_growth")
+baseline = client.get_annual_electricity_consumption(scenarios=["baseline"])
+high_growth = client.get_annual_electricity_consumption(scenarios=["high_growth"])
 ```
 
 ## Calculate Differences
@@ -27,7 +27,7 @@ import pandas as pd
 
 comparison = pd.merge(
     baseline, high_growth,
-    on=["geography", "model_year"],
+    on=["year"],
     suffixes=("_baseline", "_high_growth")
 )
 comparison["difference"] = (
@@ -45,9 +45,8 @@ import plotly.express as px
 
 fig = px.scatter(
     comparison,
-    x="model_year",
-    y="pct_change",
-    color="geography",
+    x="year",
+    y="pct_difference",
     title="Consumption Change: High Growth vs Baseline"
 )
 fig.show()

docs/how_tos/customize_palette.md

@@ -14,11 +14,14 @@ Create consistent colors for visualizations.
 
 ## Preview a Palette
 
+Launch the dashboard and open the Settings panel to preview and edit palette
+colors:
+
 ```{eval-rst}
 
 .. code-block:: console
 
-   $ stride palette view my_project
+   $ stride view my_project
 ```
 
 ## Create a Custom Palette

pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
 ]
 dependencies = [
     "click",
-    "dash>=3.2.0",
+    "dash>=4.0.0, <5",
     "dash-bootstrap-components>=2.0.3",
     "dbt-core >= 1.10.5, < 2",
     "dbt-duckdb",

src/stride/api/__init__.py

@@ -566,7 +566,7 @@ def get_annual_peak_demand(
                 t.scenario,
                 t.model_year as year,
                 t.{group_col},
-                t.value
+                SUM(t.value) as value
             FROM energy_projection t
             INNER JOIN peak_hours p ON
                 t.scenario = p.scenario
@@ -576,6 +576,7 @@ def get_annual_peak_demand(
             WHERE t.geography = ?
             AND t.scenario = ANY(?)
             AND t.model_year = ANY(?)
+            GROUP BY t.scenario, t.model_year, t.{group_col}
             ORDER BY {scenario_order}, t.model_year, t.{group_col}
             """
             params = [
@@ -1177,17 +1178,28 @@ def get_time_series_comparison(
                     group_col = "metric"
                 else:  # group_by == "Sector"
                     group_col = "sector"
+                group_time_period_calc = f"ROW_NUMBER() OVER (PARTITION BY scenario, model_year, {group_col} ORDER BY timestamp)"
                 sql = f"""
+                WITH hourly_totals AS (
+                    SELECT
+                        scenario,
+                        model_year,
+                        timestamp,
+                        {group_col},
+                        SUM(value) as value
+                    FROM energy_projection
+                    WHERE geography = ?
+                        AND scenario = ?
+                        AND model_year = ANY(?)
+                    GROUP BY scenario, model_year, timestamp, {group_col}
+                )
                 SELECT
                     scenario,
                     model_year as year,
-                    {time_period_calc} as time_period,
+                    {group_time_period_calc} as time_period,
                     {group_col},
                     value
-                FROM energy_projection
-                WHERE geography = ?
-                    AND scenario = ?
-                    AND model_year = ANY(?)
+                FROM hourly_totals
                 ORDER BY scenario, model_year, timestamp, {group_col}
                 """
                 params: list[Any] = [self.project_country, scenario, years]
@@ -1238,31 +1250,50 @@ def get_time_series_comparison(
                 else:  # group_by == "Sector"
                     group_col = "sector"
                 sql = f"""
+                WITH hourly_totals AS (
+                    SELECT
+                        scenario,
+                        model_year,
+                        timestamp,
+                        {group_col},
+                        SUM(value) as value
+                    FROM energy_projection
+                    WHERE geography = ?
+                        AND scenario = ?
+                        AND model_year = ANY(?)
+                    GROUP BY scenario, model_year, timestamp, {group_col}
+                )
                 SELECT
                     scenario,
                     model_year as year,
                     {time_period_calc} as time_period,
                     {group_col},
                     AVG(value) as value
-                FROM energy_projection
-                WHERE geography = ?
-                    AND scenario = ?
-                    AND model_year = ANY(?)
+                FROM hourly_totals
                 GROUP BY scenario, model_year, {time_period_calc}, {group_col}
                 ORDER BY scenario, model_year, time_period, {group_col}
                 """
                 params = [self.project_country, scenario, years]
             else:
                 sql = f"""
+                WITH hourly_totals AS (
+                    SELECT
+                        scenario,
+                        model_year,
+                        timestamp,
+                        SUM(value) as value
+                    FROM energy_projection
+                    WHERE geography = ?
+                        AND scenario = ?
+                        AND model_year = ANY(?)
+                    GROUP BY scenario, model_year, timestamp
+                )
                 SELECT
                     scenario,
                     model_year as year,
                     {time_period_calc} as time_period,
                     AVG(value) as value
-                FROM energy_projection
-                WHERE geography = ?
-                    AND scenario = ?
-                    AND model_year = ANY(?)
+                FROM hourly_totals
                 GROUP BY scenario, model_year, {time_period_calc}
                 ORDER BY scenario, model_year, time_period
                 """