ssb-dash-framework 0.2.2__tar.gz → 0.3.0a0__tar.gz

{ssb_dash_framework-0.2.2 → ssb_dash_framework-0.3.0a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ssb-dash-framework
-Version: 0.2.2
+Version: 0.3.0a0
 Summary: SSB Dash Framework
 License-Expression: GPL-3.0
 License-File: LICENSE
@@ -27,7 +27,7 @@ Requires-Dist: ipykernel (>=6.29.5,<7.0.0)
 Requires-Dist: mpmath (>=1.3.0)
 Requires-Dist: orjson (>=3.10.16,<4.0.0)
 Requires-Dist: pandas (>=2.3.1,<3.0.0)
-Requires-Dist: psycopg2-binary (>=2.9.10,<3.0.0)
+Requires-Dist: psycopg[pool] (>=3.3.3,<4.0.0)
 Requires-Dist: rpy2 (>=3.6.4,<4.0.0)
 Requires-Dist: rwrapr (>=0.9.1,<0.10.0)
 Requires-Dist: sqlalchemy (>=2.0.43,<3.0.0)

{ssb_dash_framework-0.2.2 → ssb_dash_framework-0.3.0a0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ssb-dash-framework"
-version = "0.2.2"
+version = "0.3.0a0"
 description = "SSB Dash Framework"
 authors = [{ name = "Magnus Theodor Engh", email = "dor@ssb.no" }]
 license = "GPL-3.0"
@@ -14,7 +14,6 @@ dependencies = [
     "mpmath>=1.3.0", # Pimemorizer uses this
     "orjson (>=3.10.16,<4.0.0)",
     "ipykernel (>=6.29.5,<7.0.0)",
-    "psycopg2-binary (>=2.9.10,<3.0.0)",
     "geopandas (>=1.1.1,<2.0.0)",
     "ssb-eimerdb (>=0.2.6,<0.3.0)",
     "sqlalchemy (>=2.0.43,<3.0.0)",
@@ -27,6 +26,7 @@ dependencies = [
     "dash-bootstrap-templates (>=2.1.0,<3.0.0)",
     "duckdb (==1.3.2)",
     "ssb-poc-statlog-model (>=1.0.0,<2.0.0)",
+    "psycopg[pool] (>=3.3.3,<4.0.0)",
 ]
 
 [project.urls]

{ssb_dash_framework-0.2.2 → ssb_dash_framework-0.3.0a0}/src/ssb_dash_framework/__init__.py

@@ -39,6 +39,9 @@ from .modules import FreeSearchWindow
 from .modules import HBMethod
 from .modules import HBMethodWindow
 from .modules import MacroModule
+from .modules import MacroModuleConsolidated
+from .modules import MacroModuleConsolidatedTab
+from .modules import MacroModuleConsolidatedWindow
 from .modules import MacroModuleTab
 from .modules import MacroModuleWindow
 from .modules import MapDisplay
@@ -73,6 +76,8 @@ from .utils import DebugInspector
 from .utils import DemoDataCreator
 from .utils import TabImplementation
 from .utils import WindowImplementation
+from .utils import _get_connection_callable
+from .utils import _get_connection_object
 from .utils import _get_kostra_r
 from .utils import active_no_duplicates_refnr_list
 from .utils import conn_is_ibis
@@ -80,9 +85,13 @@ from .utils import create_alert
 from .utils import create_database
 from .utils import create_database_engine
 from .utils import enable_app_logging
+from .utils import get_connection
 from .utils import hb_method
 from .utils import ibis_filter_with_dict
 from .utils import module_validator
+from .utils import set_connection
+from .utils import set_eimerdb_connection
+from .utils import set_postgres_connection
 from .utils import sidebar_button
 
 # from .utils import th_error
@@ -130,6 +139,9 @@ __all__ = [
     "HBMethod",
     "HBMethodWindow",
     "MacroModule",
+    "MacroModuleConsolidated",
+    "MacroModuleConsolidatedTab",
+    "MacroModuleConsolidatedWindow",
     "MacroModuleTab",
     "MacroModuleWindow",
     "MapDisplay",
@@ -157,6 +169,8 @@ __all__ = [
     "VisualizationBuilder",
     "VisualizationBuilderWindow",
     "WindowImplementation",
+    "_get_connection_callable",
+    "_get_connection_object",
     "active_no_duplicates_refnr_list",
     "app_setup",
     "apply_edits",
@@ -166,12 +180,16 @@ __all__ = [
     "create_database_engine",
     "enable_app_logging",
     "export_from_parqueteditor",
+    "get_connection",
     "get_export_log_path",
     "get_log_path",
     "ibis_filter_with_dict",
     "main_layout",
     "module_validator",
     "register_control",
+    "set_connection",
+    "set_eimerdb_connection",
+    "set_postgres_connection",
     "set_variables",
     "sidebar_button",
     #    "hb_method",

{ssb_dash_framework-0.2.2 → ssb_dash_framework-0.3.0a0}/src/ssb_dash_framework/assets/dashAgGridFunctions.js

@@ -4,7 +4,7 @@ window.dashAgGridFunctions = window.dashAgGridFunctions || {};
 window.dashAgGridFunctions.MacroModule = {
 
     // === Function formatHeatmapValue (Format values based on row type) ===
-    formatHeatmapValue(params, isPercentage) {
+    formatHeatmapValue(params, tallvisning) {
         const value = params.value;
 
         if (value === null || value === undefined) {
@@ -20,7 +20,7 @@ window.dashAgGridFunctions.MacroModule = {
         }
 
         // Regular cells - format as percentage or number
-        if (isPercentage) {
+        if (tallvisning === 1) {
             return value.toLocaleString('nb-NO', {
                 style: 'percent',
                 minimumFractionDigits: 1,

{ssb_dash_framework-0.2.2 → ssb_dash_framework-0.3.0a0}/src/ssb_dash_framework/assets/stylesheet.css

@@ -239,7 +239,7 @@ Altinn Editor Support Tables
 }
 
 .hjelpetabeller-modal .modal-content {
-    height: 70vh !important;
+    height: 80vh !important;
     overflow: hidden;
 }
 

{ssb_dash_framework-0.2.2 → ssb_dash_framework-0.3.0a0}/src/ssb_dash_framework/control/control_framework_base.py

@@ -4,12 +4,13 @@ from collections.abc import Callable
 from typing import Any
 from typing import ClassVar
 
-import ibis
 import pandas as pd
 from eimerdb import EimerDBInstance
 from ibis import _
+from psycopg_pool import ConnectionPool
 
-from ..utils.core_query_functions import conn_is_ibis
+from ..utils.config_tools.connection import _get_connection_object
+from ..utils.config_tools.connection import get_connection
 from ..utils.core_query_functions import ibis_filter_with_dict
 
 logger = logging.getLogger(__name__)
@@ -120,9 +121,8 @@ class ControlFrameworkBase:  # TODO: Add some common control methods here for ea
                 self,
                 time_units,
                 applies_to_subset,
-                conn,
             ) -> None:
-                super().__init__(time_units, applies_to_subset, conn)
+                super().__init__(time_units, applies_to_subset)
     """
 
     _required_kontroller_columns: ClassVar[list[str]] = [
@@ -142,21 +142,18 @@ class ControlFrameworkBase:  # TODO: Add some common control methods here for ea
         self,
         time_units: list[str],
         applies_to_subset: dict[str, Any],
-        conn: object,
     ) -> None:
         """Initialize the control framework.
 
         Args:
             time_units: Time units that exists in the dataset.
             applies_to_subset: Subset to execute controls on.
-            conn: Database connection object.
         """
         self.time_units = time_units
         self.applies_to_subset = applies_to_subset
         for key, value in self.applies_to_subset.items():
             if not isinstance(value, list):
                 self.applies_to_subset[key] = [value]
-        self.conn = conn
 
         self._required_kontroller_columns = [
             *self.time_units,
@@ -223,14 +220,14 @@ class ControlFrameworkBase:  # TODO: Add some common control methods here for ea
             logger.debug("No new control to register, ending here.")
             return None
         logger.debug(f"Rows to register:\n{rows_to_register}")
-        if isinstance(self.conn, EimerDBInstance):
-            self.conn.insert("kontroller", rows_to_register)
-        elif conn_is_ibis(self.conn):
-            conn = self.conn
-            conn.insert("kontroller", rows_to_register)
+        connection_object = _get_connection_object()
+        if isinstance(connection_object, EimerDBInstance):
+            connection_object.insert("kontroller", rows_to_register)
+        elif isinstance(connection_object, ConnectionPool):
+            connection_object.insert("kontroller", rows_to_register)
         else:
             raise NotImplementedError(
-                f"Connection type '{type(self.conn)}' is currently not implemented."
+                f"Connection type '{type(connection_object)}' is currently not implemented."
             )
         logger.info(f"Done inserting {control}")
 
@@ -245,33 +242,13 @@ class ControlFrameworkBase:  # TODO: Add some common control methods here for ea
     def get_current_kontroller(self) -> pd.DataFrame | None:
         """Gets the current contents of the 'kontroller' table."""
         logger.info("Getting current contents of table 'kontroller'")
-        if isinstance(self.conn, EimerDBInstance):
-            conn = ibis.polars.connect()
-            try:
-                kontroller = self.conn.query(
-                    "SELECT * FROM kontroller"
-                )  # maybe add something like this?partition_select=self.applies_to_subset
-                conn.create_table("kontroller", kontroller)
-            except (
-                ValueError
-            ) as e:  # TODO permanently fix this. Error caused by running .query on eimerdb table with no contents.
-                if str(e) == "max() arg is an empty sequence":
-                    logger.warning(
-                        "Did not find any contents in 'kontroller', starting from scratch."
-                    )
-                    return None
-        elif conn_is_ibis(self.conn):
-            conn = self.conn
-        else:
-            raise NotImplementedError(
-                f"Connection type '{type(self.conn)}' is currently not implemented."
-            )
-        kontroller = conn.table("kontroller")
-        kontroller = kontroller.filter(
-            ibis_filter_with_dict(self.applies_to_subset)
-        ).to_pandas()
-        logger.debug(f"Kontroller data to return:\n{kontroller}")
-        return kontroller
+        with get_connection(necessary_tables=["kontroller"]) as conn:
+            kontroller = conn.table("kontroller")
+            kontroller = kontroller.filter(
+                ibis_filter_with_dict(self.applies_to_subset)
+            ).to_pandas()
+            logger.debug(f"Kontroller data to return:\n{kontroller}")
+            return kontroller
 
     def execute_controls(self) -> None:
         """Executes all control methods found in the class."""
@@ -391,47 +368,20 @@ class ControlFrameworkBase:  # TODO: Add some common control methods here for ea
 
         Returns:
             pd.DataFrame containing the current kontrollutslag table for all controls or just the specified one or None if table empty.
-
-        Raises:
-            NotImplementedError: If connection is not EimerDBInstance or Ibis connection.
-            ValueError: If the query fails for reasons other than an empty 'kontrollutslag' table.
         """
         logger.info("Getting current kontrollutslag.")
-        if isinstance(self.conn, EimerDBInstance):
-            conn = ibis.polars.connect()
-            try:
-                kontrollutslag = self.conn.query(
-                    "SELECT * FROM kontrollutslag"
-                )  # maybe add something like this?partition_select=self.applies_to_subset
-                conn.create_table("kontrollutslag", kontrollutslag)
-            except (
-                ValueError
-            ) as e:  # TODO permanently fix this. Error caused by running .query on eimerdb table with no contents.
-                if str(e) == "max() arg is an empty sequence":
-                    logger.warning(
-                        "Did not find any contents in 'kontrollutslag', starting from scratch."
-                    )
-                    return None
-                else:
-                    raise e
-
-        elif conn_is_ibis(self.conn):
-            conn = self.conn
-        else:
-            raise NotImplementedError(
-                f"Connection type '{type(self.conn)}' is currently not implemented."
+        with get_connection(necessary_tables=["kontrollutslag"]) as conn:
+            kontrollutslag = conn.table("kontrollutslag")
+            kontrollutslag = kontrollutslag.filter(
+                ibis_filter_with_dict(self.applies_to_subset)
             )
-        kontrollutslag = conn.table("kontrollutslag")
-        kontrollutslag = kontrollutslag.filter(
-            ibis_filter_with_dict(self.applies_to_subset)
-        )
-        if specific_control:
-            kontrollutslag = kontrollutslag.filter(_.kontrollid == specific_control)
-        kontrollutslag = kontrollutslag.to_pandas()
-        logger.debug(
-            f"Existing kontrollutslag\nAmount:{kontrollutslag['utslag'].value_counts()}\nData:\n{kontrollutslag}"
-        )
-        return kontrollutslag
+            if specific_control:
+                kontrollutslag = kontrollutslag.filter(_.kontrollid == specific_control)
+            kontrollutslag = kontrollutslag.to_pandas()
+            logger.debug(
+                f"Existing kontrollutslag\nAmount:{kontrollutslag['utslag'].value_counts()}\nData:\n{kontrollutslag}"
+            )
+            return kontrollutslag
 
     def insert_new_records(self, control_results: pd.DataFrame) -> None:
         """Inserts new records that are not found in the current contents of the 'kontrollutslag' table."""
@@ -471,14 +421,14 @@ class ControlFrameworkBase:  # TODO: Add some common control methods here for ea
             return None
         # Now to insert new rows into the table.
         logger.debug(f"Inserting {control_results.shape[0]} new rows.")
-        if isinstance(self.conn, EimerDBInstance):
-            self.conn.insert("kontrollutslag", control_results)
-        elif conn_is_ibis(self.conn):
-            conn = self.conn
-            conn.insert("kontrollutslag", control_results)
+        connection_object = _get_connection_object()
+        if isinstance(connection_object, EimerDBInstance):
+            connection_object.insert("kontrollutslag", control_results)
+        elif isinstance(connection_object, ConnectionPool):
+            connection_object.insert("kontrollutslag", control_results)
         else:
             raise NotImplementedError(
-                f"Connection type '{type(self.conn)}' is currently not implemented."
+                f"Connection type '{type(connection_object)}' is currently not implemented."
             )
         logger.debug("Finished inserting new rows.")
 
@@ -546,15 +496,18 @@ class ControlFrameworkBase:  # TODO: Add some common control methods here for ea
         logger.info(f"Updating {changed.shape[0]} rows.")
         logger.debug(f"Rows to update:\n{changed}")
         update_query = self.generate_update_query(changed)
-        if isinstance(self.conn, EimerDBInstance):
-            self.conn.query(update_query)
-        elif conn_is_ibis(self.conn):
-            conn = self.conn
-            conn.raw_sql(update_query)  # type: ignore[attr-defined]
+
+        connection_object = _get_connection_object()
+        if isinstance(connection_object, EimerDBInstance):
+            connection_object.query(update_query)
+        elif isinstance(connection_object, ConnectionPool):
+            with get_connection() as conn:
+                conn.raw_sql(update_query)
         else:
             raise NotImplementedError(
-                f"Connection type '{type(self.conn)}' is currently not implemented."
+                f"Connection type '{type(connection_object)}' is currently not implemented."
             )
+
         logger.debug("Finished updating kontrollutslag.")
 
     def generate_update_query(self, df_updates: pd.DataFrame) -> str:

{ssb_dash_framework-0.2.2 → ssb_dash_framework-0.3.0a0}/src/ssb_dash_framework/modules/__init__.py

@@ -45,6 +45,9 @@ from .hb_method import HBMethodWindow
 from .macro_module import MacroModule
 from .macro_module import MacroModuleTab
 from .macro_module import MacroModuleWindow
+from .macro_module_consolidated import MacroModuleConsolidated
+from .macro_module_consolidated import MacroModuleConsolidatedTab
+from .macro_module_consolidated import MacroModuleConsolidatedWindow
 from .nspek import Naeringsspesifikasjon
 from .nspek import NaeringsspesifikasjonTab
 from .nspek import NaeringsspesifikasjonWindow
@@ -101,6 +104,9 @@ __all__ = [
     "MacroModule",
     "MacroModuleTab",
     "MacroModuleWindow",
+    "MacroModuleConsolidated",
+    "MacroModuleConsolidatedTab",
+    "MacroModuleConsolidatedWindow",
     "MapDisplay",
     "MapDisplayTab",
     "MapDisplayWindow",