frequenz-cs-reporting 0.2.10__tar.gz → 0.4.0__tar.gz

{frequenz_cs_reporting-0.2.10 → frequenz_cs_reporting-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frequenz-cs-reporting
-Version: 0.2.10
+Version: 0.4.0
 Summary: Streamlit Library for reporting and solar monitoring
 Author-email: Frequenz Energy-as-a-Service GmbH <floss@frequenz.com>
 License-Expression: MIT
@@ -20,7 +20,7 @@ Requires-Python: <4,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: css-inline>=0.17.0
-Requires-Dist: frequenz-lib-notebooks<0.16.0,>=0.14.7
+Requires-Dist: frequenz-lib-notebooks<0.17.0,>=0.16.0
 Requires-Dist: matplotlib>=3.10.6
 Requires-Dist: numpy>=2.3.2
 Requires-Dist: pandas>=2.3.2
@@ -38,7 +38,7 @@ Requires-Dist: flake8==7.3.0; extra == "dev-flake8"
 Requires-Dist: flake8-datetimez==20.10.0; extra == "dev-flake8"
 Requires-Dist: flake8-docstrings==1.7.0; extra == "dev-flake8"
 Requires-Dist: flake8-pyproject==1.2.4; extra == "dev-flake8"
-Requires-Dist: pydoclint==0.8.6; extra == "dev-flake8"
+Requires-Dist: pydoclint==0.9.0; extra == "dev-flake8"
 Requires-Dist: pydocstyle==6.3.0; extra == "dev-flake8"
 Provides-Extra: dev-formatting
 Requires-Dist: black==26.5.1; extra == "dev-formatting"
@@ -52,7 +52,7 @@ Requires-Dist: mkdocs-literate-nav==0.6.3; extra == "dev-mkdocs"
 Requires-Dist: mkdocs-macros-plugin==1.5.0; extra == "dev-mkdocs"
 Requires-Dist: mkdocs-material==9.7.6; extra == "dev-mkdocs"
 Requires-Dist: mkdocstrings[python]==1.0.4; extra == "dev-mkdocs"
-Requires-Dist: mkdocstrings-python==2.0.4; extra == "dev-mkdocs"
+Requires-Dist: mkdocstrings-python==2.0.5; extra == "dev-mkdocs"
 Requires-Dist: frequenz-repo-config[lib]==0.18.0; extra == "dev-mkdocs"
 Provides-Extra: dev-mypy
 Requires-Dist: mypy==2.1.0; extra == "dev-mypy"
@@ -66,7 +66,7 @@ Requires-Dist: frequenz-repo-config[lib]==0.18.0; extra == "dev-noxfile"
 Provides-Extra: dev-pylint
 Requires-Dist: frequenz-cs-reporting[dev-mkdocs,dev-noxfile,dev-pytest]; extra == "dev-pylint"
 Provides-Extra: dev-pytest
-Requires-Dist: pytest==9.1.0; extra == "dev-pytest"
+Requires-Dist: pytest==9.1.1; extra == "dev-pytest"
 Requires-Dist: pylint==4.0.6; extra == "dev-pytest"
 Requires-Dist: frequenz-repo-config[extra-lint-examples]==0.18.0; extra == "dev-pytest"
 Requires-Dist: pytest-mock==3.15.1; extra == "dev-pytest"

{frequenz_cs_reporting-0.2.10 → frequenz_cs_reporting-0.4.0}/RELEASE_NOTES.md

@@ -4,11 +4,14 @@
 
 ## Upgrading
 
+- Updating the minimum frequenz-lib-notebooks requirement to v0.16.0
 
 ## New Features
 
 - Update the radio button navigation for streamlit in deepnote.
 - Add KWK aliases in the line plot.
 - Update the KPIs to german format.
+`- Replace the solar monitoring `Produktionsstatistiken` table with the
+  `MicrogridOverviewDashboard` view from `frequenz.lib.notebooks`.
 
 ## Bug Fixes

{frequenz_cs_reporting-0.2.10 → frequenz_cs_reporting-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@
 [build-system]
 requires = [
   "setuptools == 82.0.1",
-  "setuptools_scm[toml] == 10.0.5",
+  "setuptools_scm[toml] == 10.2.0",
   "frequenz-repo-config[lib] == 0.18.0",
 ]
 build-backend = "setuptools.build_meta"
@@ -29,7 +29,7 @@ requires-python = ">= 3.11, < 4"
 
 dependencies = [
     "css-inline>=0.17.0",
-    "frequenz-lib-notebooks>=0.14.7,<0.16.0",
+    "frequenz-lib-notebooks>=0.16.0,<0.17.0",
     "matplotlib>=3.10.6",
     "numpy>=2.3.2",
     "pandas>=2.3.2",
@@ -54,7 +54,7 @@ dev-flake8 = [
   "flake8-datetimez == 20.10.0",
   "flake8-docstrings == 1.7.0",
   "flake8-pyproject == 1.2.4",  # For reading the flake8 config from pyproject.toml
-  "pydoclint == 0.8.6",
+  "pydoclint == 0.9.0",
   "pydocstyle == 6.3.0",
 ]
 dev-formatting = ["black == 26.5.1", "isort == 8.0.1"]
@@ -67,7 +67,7 @@ dev-mkdocs = [
   "mkdocs-macros-plugin == 1.5.0",
   "mkdocs-material == 9.7.6",
   "mkdocstrings[python] == 1.0.4",
-  "mkdocstrings-python == 2.0.4",
+  "mkdocstrings-python == 2.0.5",
   "frequenz-repo-config[lib] == 0.18.0",
 ]
 dev-mypy = [
@@ -88,7 +88,7 @@ dev-pylint = [
   "frequenz-cs-reporting[dev-mkdocs,dev-noxfile,dev-pytest]",
 ]
 dev-pytest = [
-  "pytest == 9.1.0",
+  "pytest == 9.1.1",
   "pylint == 4.0.6",       # We need this to check for the examples
   "frequenz-repo-config[extra-lint-examples] == 0.18.0",
   "pytest-mock == 3.15.1",

{frequenz_cs_reporting-0.2.10 → frequenz_cs_reporting-0.4.0}/src/frequenz/cs_reporting/components/plot_charts.py

@@ -135,6 +135,9 @@ def plot_percentage_bar(
 
     fig = go.Figure()
     for label, value, pct in seg_with_pct:
+        formatted_value = (
+            f"{value:,.0f}".replace(",", "X").replace(".", ",").replace("X", ".")
+        )
         fig.add_trace(
             go.Bar(
                 x=[pct],
@@ -153,11 +156,11 @@ def plot_percentage_bar(
                     "color": "#ffffff",
                     "family": "Inter, sans-serif",
                 },
-                customdata=[value],
+                hovertext=[formatted_value],
                 hovertemplate=(
                     f"<b>{label}</b><br>"
                     "Anteil: %{x:.1f}%<br>"
-                    "Energie: %{customdata[0]:,.0f} kWh"
+                    "Energie: %{hovertext} kWh"
                     "<extra></extra>"
                 ),
             )

{frequenz_cs_reporting-0.2.10 → frequenz_cs_reporting-0.4.0}/src/frequenz/cs_reporting/views/dashboard.py

@@ -147,7 +147,6 @@ def build_master_df(
         for c in component_types
         if pd.to_numeric(raw_df[c], errors="coerce").fillna(0).sum() != 0
     ]
-
     master_df = create_energy_report_df(raw_df, component_types, mcfg, mapper)
     return master_df
 
@@ -193,4 +192,4 @@ def render_dashboard(
     # --- Tables section---
     st.markdown('<div id="data-export-section"></div>', unsafe_allow_html=True)
     _section_divider("Datentabellen")
-    sections.render_data_tabs(master_df, tables)
+    sections.render_data_tabs(master_df, tables, mapper)

{frequenz_cs_reporting-0.2.10 → frequenz_cs_reporting-0.4.0}/src/frequenz/cs_reporting/views/solar_results.py

@@ -6,12 +6,15 @@
 from __future__ import annotations
 
 import base64
+import math
 from io import BytesIO
 from typing import Any
 
 import matplotlib.pyplot as plt
 import streamlit as st
-from frequenz.lib.notebooks.solar.maintenance.plot_styles import style_table
+from frequenz.lib.notebooks.solar.maintenance.microgrid_dashboard import (
+    MicrogridOverviewDashboard,
+)
 from frequenz.lib.notebooks.solar.maintenance.solar_maintenance_app import (
     SolarAnalysisData,
 )
@@ -19,10 +22,10 @@ from matplotlib.figure import Figure
 
 
 def _render_production_table(plot_data: SolarAnalysisData) -> None:
-    """Render the production statistics table, if available.
+    """Render the production statistics dashboard, if available.
 
-    Displays a styled, horizontally scrollable HTML table containing production
-    statistics derived from the solar analysis data. If no production table is
+    Displays the production statistics using the card-based microgrid overview
+    dashboard provided by ``frequenz.lib.notebooks``. If no production table is
     present or it is empty, the function returns without rendering anything.
 
     Args:
@@ -30,35 +33,26 @@ def _render_production_table(plot_data: SolarAnalysisData) -> None:
             ``production_table_view`` attribute with tabular production statistics.
 
     Returns:
-        None. The table is rendered directly in the Streamlit UI.
+        None. The dashboard is rendered directly in the Streamlit UI.
     """
     table_view = getattr(plot_data, "production_table_view", None)
     if table_view is None or table_view.empty:
         return
 
     st.markdown("#### Produktionsstatistiken")
-    styled = style_table(table_view)
-
-    # ---- Dynamic height calculation ----
-    row_height = 55
-    header_height = 75
-    max_height = 600
-
-    height = min(header_height + len(table_view) * row_height, max_height)
-
-    scrollable_html = (
-        "<style>"
-        "table { min-width: 1200px; } "
-        "thead th, tbody td { min-width: 150px; } "
-        "thead th:first-child, tbody td:first-child { "
-        "width: 60px; min-width: 60px; max-width: 80px; }"
-        "</style>"
-        "<div style='overflow-x: auto;'>"
-        f"{styled.data}"
-        "</div>"
+    dashboard = MicrogridOverviewDashboard(table_view, 1)
+    dashboard_html = dashboard.to_html().replace(
+        "justify-content: center;",
+        "justify-content: flex-start;",
     )
 
-    st.components.v1.html(scrollable_html, height=height, scrolling=True)
+    # The notebook implementation uses IPython display(). In Streamlit we need
+    # the same generated HTML rendered through the component API instead.
+    cards_per_row = 2
+    estimated_rows = max(1, math.ceil(len(table_view) / cards_per_row))
+    height = min(140 + estimated_rows * 430, 1600)
+
+    st.components.v1.html(dashboard_html, height=height, scrolling=True)
 
 
 def _ensure_card_styles() -> None:

{frequenz_cs_reporting-0.2.10 → frequenz_cs_reporting-0.4.0}/src/frequenz/cs_reporting/views/table_renderers.py

@@ -7,10 +7,16 @@ from __future__ import annotations
 
 import pandas as pd
 import streamlit as st
+from frequenz.lib.notebooks.reporting.utils.column_mapper import ColumnMapper
 
 from frequenz.cs_reporting.components import tables
 from frequenz.cs_reporting.constants import TablesResult
 
+_MASTER_DF_DISPLAY_RENAMES = {
+    "production_self_use": "Eigenverbrauch",
+    "production_self_usage": "Eigenverbrauch Share",
+}
+
 
 def _round_numeric_columns(df: pd.DataFrame) -> pd.DataFrame:
     """Return a copy of `df` with number columns rounded to three decimals."""
@@ -147,11 +153,12 @@ def render_table_section(
         st.info(empty_info)
 
 
-def render_master_df(master_df: pd.DataFrame) -> None:
+def render_master_df(master_df: pd.DataFrame, mapper: ColumnMapper) -> None:
     """Render the combined master dataframe in an AgGrid table.
 
     Args:
         master_df: Processed master dataframe to display.
+        mapper: Column mapper for converting canonical names to standard display labels.
 
     Returns:
         Streamlit components are rendered directly.
@@ -159,7 +166,9 @@ def render_master_df(master_df: pd.DataFrame) -> None:
     if master_df is not None and not master_df.empty:
         header_cols = st.columns([10, 1])
         header_cols[0].caption("Standardized master dataframe")
-        display_df = _round_numeric_columns(master_df)
+        display_df = _round_numeric_columns(
+            mapper.to_display(master_df).rename(columns=_MASTER_DF_DISPLAY_RENAMES)
+        )
         master_csv = display_df.to_csv(index=False, sep=";", decimal=",").encode(
             "utf-8"
         )
@@ -179,12 +188,15 @@ def render_master_df(master_df: pd.DataFrame) -> None:
         st.info("Master-DF nicht verfügbar (keine MicrogridConfig).")
 
 
-def render_data_tabs(master_df: pd.DataFrame, tables_dict: TablesResult) -> None:
+def render_data_tabs(
+    master_df: pd.DataFrame, tables_dict: TablesResult, mapper: ColumnMapper
+) -> None:
     """Render tabbed data tables for overview and component analyses.
 
     Args:
         master_df: Processed master dataframe.
         tables_dict: Mapping of table names to dataframes for each analysis.
+        mapper: Column mapper for standardizing Gesamt-Datensatz column names.
 
     Returns:
         Streamlit components are rendered directly.
@@ -219,4 +231,4 @@ def render_data_tabs(master_df: pd.DataFrame, tables_dict: TablesResult) -> None
 
     if include_master:
         with tabs[-1]:
-            render_master_df(master_df)
+            render_master_df(master_df, mapper)

{frequenz_cs_reporting-0.2.10 → frequenz_cs_reporting-0.4.0}/src/frequenz_cs_reporting.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: frequenz-cs-reporting
-Version: 0.2.10
+Version: 0.4.0
 Summary: Streamlit Library for reporting and solar monitoring
 Author-email: Frequenz Energy-as-a-Service GmbH <floss@frequenz.com>
 License-Expression: MIT
@@ -20,7 +20,7 @@ Requires-Python: <4,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: css-inline>=0.17.0
-Requires-Dist: frequenz-lib-notebooks<0.16.0,>=0.14.7
+Requires-Dist: frequenz-lib-notebooks<0.17.0,>=0.16.0
 Requires-Dist: matplotlib>=3.10.6
 Requires-Dist: numpy>=2.3.2
 Requires-Dist: pandas>=2.3.2
@@ -38,7 +38,7 @@ Requires-Dist: flake8==7.3.0; extra == "dev-flake8"
 Requires-Dist: flake8-datetimez==20.10.0; extra == "dev-flake8"
 Requires-Dist: flake8-docstrings==1.7.0; extra == "dev-flake8"
 Requires-Dist: flake8-pyproject==1.2.4; extra == "dev-flake8"
-Requires-Dist: pydoclint==0.8.6; extra == "dev-flake8"
+Requires-Dist: pydoclint==0.9.0; extra == "dev-flake8"
 Requires-Dist: pydocstyle==6.3.0; extra == "dev-flake8"
 Provides-Extra: dev-formatting
 Requires-Dist: black==26.5.1; extra == "dev-formatting"
@@ -52,7 +52,7 @@ Requires-Dist: mkdocs-literate-nav==0.6.3; extra == "dev-mkdocs"
 Requires-Dist: mkdocs-macros-plugin==1.5.0; extra == "dev-mkdocs"
 Requires-Dist: mkdocs-material==9.7.6; extra == "dev-mkdocs"
 Requires-Dist: mkdocstrings[python]==1.0.4; extra == "dev-mkdocs"
-Requires-Dist: mkdocstrings-python==2.0.4; extra == "dev-mkdocs"
+Requires-Dist: mkdocstrings-python==2.0.5; extra == "dev-mkdocs"
 Requires-Dist: frequenz-repo-config[lib]==0.18.0; extra == "dev-mkdocs"
 Provides-Extra: dev-mypy
 Requires-Dist: mypy==2.1.0; extra == "dev-mypy"
@@ -66,7 +66,7 @@ Requires-Dist: frequenz-repo-config[lib]==0.18.0; extra == "dev-noxfile"
 Provides-Extra: dev-pylint
 Requires-Dist: frequenz-cs-reporting[dev-mkdocs,dev-noxfile,dev-pytest]; extra == "dev-pylint"
 Provides-Extra: dev-pytest
-Requires-Dist: pytest==9.1.0; extra == "dev-pytest"
+Requires-Dist: pytest==9.1.1; extra == "dev-pytest"
 Requires-Dist: pylint==4.0.6; extra == "dev-pytest"
 Requires-Dist: frequenz-repo-config[extra-lint-examples]==0.18.0; extra == "dev-pytest"
 Requires-Dist: pytest-mock==3.15.1; extra == "dev-pytest"

{frequenz_cs_reporting-0.2.10 → frequenz_cs_reporting-0.4.0}/src/frequenz_cs_reporting.egg-info/SOURCES.txt

@@ -57,5 +57,7 @@ src/frequenz_cs_reporting.egg-info/PKG-INFO
 src/frequenz_cs_reporting.egg-info/SOURCES.txt
 src/frequenz_cs_reporting.egg-info/dependency_links.txt
 src/frequenz_cs_reporting.egg-info/requires.txt
+src/frequenz_cs_reporting.egg-info/scm_file_list.json
+src/frequenz_cs_reporting.egg-info/scm_version.json
 src/frequenz_cs_reporting.egg-info/top_level.txt
 toml_directory/__init__.py

{frequenz_cs_reporting-0.2.10 → frequenz_cs_reporting-0.4.0}/src/frequenz_cs_reporting.egg-info/requires.txt

@@ -1,5 +1,5 @@
 css-inline>=0.17.0
-frequenz-lib-notebooks<0.16.0,>=0.14.7
+frequenz-lib-notebooks<0.17.0,>=0.16.0
 matplotlib>=3.10.6
 numpy>=2.3.2
 pandas>=2.3.2
@@ -21,7 +21,7 @@ flake8==7.3.0
 flake8-datetimez==20.10.0
 flake8-docstrings==1.7.0
 flake8-pyproject==1.2.4
-pydoclint==0.8.6
+pydoclint==0.9.0
 pydocstyle==6.3.0
 
 [dev-formatting]
@@ -37,7 +37,7 @@ mkdocs-literate-nav==0.6.3
 mkdocs-macros-plugin==1.5.0
 mkdocs-material==9.7.6
 mkdocstrings[python]==1.0.4
-mkdocstrings-python==2.0.4
+mkdocstrings-python==2.0.5
 frequenz-repo-config[lib]==0.18.0
 
 [dev-mypy]
@@ -55,7 +55,7 @@ frequenz-repo-config[lib]==0.18.0
 frequenz-cs-reporting[dev-mkdocs,dev-noxfile,dev-pytest]
 
 [dev-pytest]
-pytest==9.1.0
+pytest==9.1.1
 pylint==4.0.6
 frequenz-repo-config[extra-lint-examples]==0.18.0
 pytest-mock==3.15.1

frequenz_cs_reporting-0.4.0/src/frequenz_cs_reporting.egg-info/scm_file_list.json

@@ -0,0 +1,93 @@
+{
+  "files": [
+    ".gitignore",
+    "README.md",
+    "CONTRIBUTING.md",
+    ".editorconfig",
+    ".cookiecutter-replay.json",
+    "Dockerfile",
+    "pyproject.toml",
+    "MANIFEST.in",
+    "app.py",
+    "RELEASE_NOTES.md",
+    "LICENSE",
+    "mkdocs.yml",
+    "CODEOWNERS",
+    "noxfile.py",
+    "toml_directory/__init__.py",
+    "src/frequenz/cs_reporting/conftest.py",
+    "src/frequenz/cs_reporting/ui_resources.py",
+    "src/frequenz/cs_reporting/constants.py",
+    "src/frequenz/cs_reporting/py.typed",
+    "src/frequenz/cs_reporting/__init__.py",
+    "src/frequenz/cs_reporting/services/solar_workflow.py",
+    "src/frequenz/cs_reporting/services/client_factory.py",
+    "src/frequenz/cs_reporting/services/data_service.py",
+    "src/frequenz/cs_reporting/services/__init__.py",
+    "src/frequenz/cs_reporting/utils/env.py",
+    "src/frequenz/cs_reporting/utils/time.py",
+    "src/frequenz/cs_reporting/utils/__init__.py",
+    "src/frequenz/cs_reporting/templates/home_footer.html",
+    "src/frequenz/cs_reporting/templates/home_feature_grid.html",
+    "src/frequenz/cs_reporting/templates/home_feature_item.html",
+    "src/frequenz/cs_reporting/templates/home_hero.html",
+    "src/frequenz/cs_reporting/templates/home_stats.html",
+    "src/frequenz/cs_reporting/templates/home_logo.html",
+    "src/frequenz/cs_reporting/templates/home_stat_item.html",
+    "src/frequenz/cs_reporting/templates/dashboard_section_divider.html",
+    "src/frequenz/cs_reporting/styles/dashboard.css",
+    "src/frequenz/cs_reporting/styles/home.css",
+    "src/frequenz/cs_reporting/styles/plot_card.css",
+    "src/frequenz/cs_reporting/styles/kpi.css",
+    "src/frequenz/cs_reporting/components/sidebar_inputs.py",
+    "src/frequenz/cs_reporting/components/tables.py",
+    "src/frequenz/cs_reporting/components/ui.py",
+    "src/frequenz/cs_reporting/components/inputs.py",
+    "src/frequenz/cs_reporting/components/plot_charts.py",
+    "src/frequenz/cs_reporting/components/__init__.py",
+    "src/frequenz/cs_reporting/app_pages/home.py",
+    "src/frequenz/cs_reporting/app_pages/reporting.py",
+    "src/frequenz/cs_reporting/app_pages/solar.py",
+    "src/frequenz/cs_reporting/app_pages/__init__.py",
+    "src/frequenz/cs_reporting/assets/neustrom_logo.png",
+    "src/frequenz/cs_reporting/assets/neustrom_background.png",
+    "src/frequenz/cs_reporting/assets/__init__.py",
+    "src/frequenz/cs_reporting/rep_cs_core/config.py",
+    "src/frequenz/cs_reporting/rep_cs_core/page_spec.py",
+    "src/frequenz/cs_reporting/rep_cs_core/__init__.py",
+    "src/frequenz/cs_reporting/views/plot_renderers.py",
+    "src/frequenz/cs_reporting/views/metric_renderers.py",
+    "src/frequenz/cs_reporting/views/table_renderers.py",
+    "src/frequenz/cs_reporting/views/sections.py",
+    "src/frequenz/cs_reporting/views/solar_results.py",
+    "src/frequenz/cs_reporting/views/dashboard.py",
+    "src/frequenz/cs_reporting/views/__init__.py",
+    ".github/labeler.yml",
+    ".github/dependabot.yml",
+    ".github/keylabeler.yml",
+    ".github/RELEASE_NOTES.template.md",
+    ".github/workflows/isort-migration.yaml",
+    ".github/workflows/labeler.yml",
+    ".github/workflows/repo-config-migration.yaml",
+    ".github/workflows/ci-pr.yaml",
+    ".github/workflows/ci.yaml",
+    ".github/workflows/black-migration.yaml",
+    ".github/workflows/dco-merge-queue.yml",
+    ".github/workflows/release-notes-check.yml",
+    ".github/workflows/auto-dependabot.yaml",
+    ".github/workflows/release.yaml",
+    ".github/ISSUE_TEMPLATE/config.yml",
+    ".github/ISSUE_TEMPLATE/feature.yml",
+    ".github/ISSUE_TEMPLATE/bug.yml",
+    ".streamlit/config.toml",
+    "tests/test_frequenz_cs_reporting.py",
+    "docs/SUMMARY.md",
+    "docs/CONTRIBUTING.md",
+    "docs/index.md",
+    "docs/_img/logo.png",
+    "docs/_css/mkdocstrings.css",
+    "docs/_css/style.css",
+    "docs/_scripts/mkdocstrings_autoapi.py",
+    "docs/_overrides/main.html"
+  ]
+}

frequenz_cs_reporting-0.4.0/src/frequenz_cs_reporting.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.4.0",
+  "distance": 0,
+  "node": "gb14bb5bb0041b0254d8584079fc930047d8d1fca",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-17"
+}