toolsos 0.1.4__tar.gz → 0.2.1__tar.gz

{toolsos-0.1.4 → toolsos-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: toolsos
-Version: 0.1.4
+Version: 0.2.1
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek
@@ -64,4 +64,4 @@ Instructions on building a package can be found [here](https://packaging.python.
 - make a pypi account
 - ask to be added as collaborator to toolsos
 - first update twine: py -m pip install --upgrade twin
-- upload to pypi: twine upload dist/*
+- upload to pypi: twine upload dist/* --skip-existing

{toolsos-0.1.4 → toolsos-0.2.1}/README.md

@@ -35,4 +35,4 @@ Instructions on building a package can be found [here](https://packaging.python.
 - make a pypi account
 - ask to be added as collaborator to toolsos
 - first update twine: py -m pip install --upgrade twin
-- upload to pypi: twine upload dist/*
+- upload to pypi: twine upload dist/* --skip-existing

{toolsos-0.1.4 → toolsos-0.2.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "toolsos"
-version = "0.1.4"
+version = "0.2.1"
 description = "OS tools"
 readme = "README.md"
 authors = [{ name = "OS", email = "d.schmitz@amsterdam.nl" }]

{toolsos-0.1.4/src/toolsos → toolsos-0.2.1/src/toolsos/database}/database_connection.py

@@ -33,7 +33,7 @@ def get_db_connection_strings(
     for dbname, params in db_info.items():
         flush = dbname in reset_pw if reset_pw else False
 
-        if params["pw"] == "acces_token":
+        if params["password"] == "access_token":
             pw = get_azure_access_token()
         else:
             pw = get_pw_from_keyring(dbname=dbname, user=params["user"], reset_pw=flush)
@@ -104,11 +104,13 @@ if __name__ == "__main__":
     # Examples
 
     # Get database connection settings from yaml
-    # engine_strings = get_db_connection_strings("python/database_config.yml")
-    # print(engine_strings.ruimte_analyse222)
+    engine_strings = get_db_connection_strings(
+        "src/toolsos/database/database_config.yml"
+    )
+    print(engine_strings.ruimte_analyse222)
 
     # Get database connection settings from yaml and reset password
-    # engine_strings = get_db_connection_strings(
-    #     "python/database_config.yml", reset_pw=["ruimte_analyse222"]
-    # )
-    # print(engine_strings.ruimte_analyse222)
+    engine_strings = get_db_connection_strings(
+        "src/toolsos/database/database_config.yml", reset_pw=["ruimte_analyse222"]
+    )
+    print(engine_strings.ruimte_analyse222)

toolsos-0.2.1/src/toolsos/huisstijl/graphs/graph_styles.py

@@ -0,0 +1,30 @@
+font = "Amsterdam Sans ExtraBold, Corbel"
+# font = "Arial"
+
+STYLE_OLD = {
+    "font": {"family": "Corbel", "size": 15},
+    "plot_bgcolor": "#FFFFFF",
+    "gridline_color": "#E8E8E8",
+    "gridlinewidth": 0.75,
+    "showline": True,
+    "showgrid": False,
+    "zerolinecolor": "#E8E8E8",
+    "gridcolor": "#E8E8E8",
+    "separators": ",",
+}
+
+
+STYLE_NEW = {
+    "font_bold": {"family": "Amsterdam Sans ExtraBold, Corbel", "size": 15},
+    "font": {"family": "Amsterdam Sans, Corbel", "size": 15},
+    "axis_font": {"family": font, "size": 15},
+    "plot_bgcolor": "#FFFFFF",
+    "gridline_color": "#dbdbdb",
+    "gridline_width": 0.75,
+    "showline": True,
+    "showgrid": False,
+    "zerolinecolor": "#dbdbdb",
+    "gridcolor": "#dbdbdb",
+    "gridlinecolor": "#dbdbdb",
+    "separators": ",",
+}

{toolsos-0.1.4 → toolsos-0.2.1}/src/toolsos/huisstijl/graphs/linegraph.py

@@ -1,6 +1,6 @@
 import plotly.express as px
-from .styler import BaseStyle
 
+from .styler import BaseStyle
 
 basestyle = BaseStyle()
 
@@ -17,4 +17,8 @@ def line(data, x, y, color: None, width=750, height=490, **kwargs):
         **kwargs,
     )
 
+    fig.update_layout(
+        dict(xaxis_title_text="", yaxis_title_text="", legend_title_text="")
+    )
+
     return fig

toolsos-0.2.1/src/toolsos/huisstijl/graphs/styler.py

@@ -0,0 +1,182 @@
+import json
+
+import plotly.graph_objects as go
+import requests
+from requests import ConnectionError
+
+from .graph_styles import STYLE_NEW
+
+# class BaseStyle:
+#     style_url = (
+#         "https://raw.githubusercontent.com/jbosga-ams/oistyle/main/base_style.json"
+#     )
+
+#     def __init__(self):
+#         self.grab_styling()
+
+#     def grab_styling(self, style_path: str = None):
+#         if not style_path:
+#             try:
+#                 res = requests.get(self.style_url).json()
+#             except ConnectionError:
+#                 print("Failed grabbing basestyle from the interwebs")
+#                 # Add option to manually provide json file
+#         else:
+#             res = json.loads()
+
+#         for k, v in res.items():
+#             setattr(self, k, v)
+
+#         self.font = "Amsterdam Sans ExtraBold, Corbel"
+
+#     def _get_axis_format(self):
+#         self.gridline_color = "#dbdbdb"  # Jorren vragen om deze aan te passen
+
+#         return {
+#             "zerolinecolor": self.gridline_color,
+#             "gridcolor": self.gridline_color,
+#             "gridwidth": self.gridline_width,
+#             "showline": True,
+#             "linewidth": self.gridline_width,
+#             "linecolor": self.gridline_color,
+#             #             "mirror": True,
+#             "showgrid": False,
+#         }
+
+#     def _get_base_template_layout(self):
+#         return go.layout.Template(
+#             layout={
+#                 "font": {"family": self.font, "size": self.font_size},
+#                 "plot_bgcolor": self.plot_bgcolor,
+#                 "colorway": self.colors["darkblue_lightblue_gradient_5"],
+#                 "separators": ",",  # Jorren vragen om deze toe te voegen
+#             }
+#         )
+
+#     def get_base_template(
+#         self, graph_type: str = None, orientation: str = None, colors: str = None
+#     ):
+#         """[summary]
+
+#         Args:
+#             graph_type (str, optional): Pick 'bar', 'line' or 'bar'. Defaults to None.
+#             orientation (str, optional): [description]. Pick horizontal ('h') or vertical 'v'. Defaults to None.
+#             colors (str, optional): Set basecolors. Defaults to None.
+
+#         Raises:
+#             ValueError: [description]
+
+#         Returns:
+#             [type]: [description]
+#         """
+#         base_template = self._get_base_template_layout()
+#         axis_format = self._get_axis_format()
+
+#         if graph_type == "bar":
+#             if orientation in ["v", "vertical"]:
+#                 base_template.layout.xaxis.update(axis_format)
+#                 base_template.layout.yaxis.update(zeroline=False)
+#             elif orientation in ["h", "horizontal"]:
+#                 base_template.layout.yaxis.update(axis_format)
+#                 base_template.layout.xaxis.update(zeroline=False)
+#             else:
+#                 raise ValueError(
+#                     "Orientation ('v'/'vertical' or 'h'/'horizontal') should be supplied with graph_type=='bar'"
+#                 )
+
+#         elif graph_type == "line":
+#             base_template.layout.xaxis.update(axis_format)
+
+#         if colors:
+#             base_template.layout.update({"colorway": colors})
+
+#         return base_template
+
+#     def get_ois_colors(self, colorscale):
+#         colorscale = self.colors.get(colorscale, [])
+#         if not colorscale:
+#             raise Exception(f"Kies uit {self.colors.keys()}")
+
+#         return colorscale
+
+
+class BaseStyle:
+    def __init__(self, style_path=None):
+        if style_path is None:
+            self.style = STYLE_NEW
+        else:
+            with open(style_path) as file:
+                self.style = json.load(file)
+
+    def _get_axis_format(self):
+        self.gridline_color = "#dbdbdb"  # Jorren vragen om deze aan te passen
+
+        return {
+            "zerolinecolor": self.style["gridline_color"],
+            "gridcolor": self.style["gridline_color"],
+            "gridwidth": self.style["gridline_width"],
+            "showline": True,
+            "linewidth": self.style["gridline_width"],
+            "linecolor": self.style["gridline_color"],
+            "showgrid": self.style["showgrid"],
+        }
+
+    def _get_base_template_layout(self):
+        return go.layout.Template(
+            layout={
+                # "font": self.styles["font_bold"],
+                "xaxis": {
+                    "tickfont": self.style["font_bold"],
+                },
+                "yaxis": {
+                    "tickfont": {
+                        "family": self.style["axis_font"]["family"],
+                        "size": self.style["axis_font"]["size"],
+                    },
+                },
+                "legend": {"font": self.style["font"]},
+                "plot_bgcolor": self.style["plot_bgcolor"],
+                # "colorway": self.colors["darkblue_lightblue_gradient_5"],
+                "separators": ",",  # Jorren vragen om deze toe te voegen
+                "font": self.style["font_bold"],
+            }
+        )
+
+    def get_base_template(
+        self, graph_type: str = None, orientation: str = None, colors: str = None
+    ):
+        """[summary]
+
+        Args:
+            graph_type (str, optional): Pick 'bar', 'line' or 'bar'. Defaults to None.
+            orientation (str, optional): [description]. Pick horizontal ('h') or vertical 'v'. Defaults to None.
+            colors (str, optional): Set basecolors. Defaults to None.
+
+        Raises:
+            ValueError: [description]
+
+        Returns:
+            [type]: [description]
+        """
+        base_template = self._get_base_template_layout()
+        axis_format = self._get_axis_format()
+
+        if graph_type == "bar":
+            if orientation in ["v", "vertical"]:
+                base_template.layout.xaxis.update(axis_format)
+                base_template.layout.yaxis.update(zeroline=False)
+            elif orientation in ["h", "horizontal"]:
+                base_template.layout.yaxis.update(axis_format)
+                base_template.layout.xaxis.update(zeroline=False)
+            else:
+                raise ValueError(
+                    "Orientation ('v'/'vertical' or 'h'/'horizontal') should be supplied with graph_type=='bar'"
+                )
+
+        elif graph_type == "line":
+            base_template.layout.xaxis.update(axis_format)
+
+        if colors:
+            base_template.layout.update({"colorway": colors})
+
+        return base_template

toolsos-0.2.1/src/toolsos/huisstijl/tables/table_helpers.py

@@ -0,0 +1,6 @@
+import pandas as pd
+
+
+def remove_underscores_from_columns(df: pd.DataFrame) -> pd.DataFrame:
+    df.columns = df.columns.str.replace("_", " ")
+    return df

{toolsos-0.1.4 → toolsos-0.2.1}/src/toolsos/huisstijl/tables/tables.py

@@ -46,6 +46,36 @@ def set_global_style(style: str) -> None:
         STYLES = STYLE_NEW
 
 
+def cols_to_str(df: pd.DataFrame) -> pd.DataFrame:
+    """Change column names in to string. Multiindex column names are nog changed because
+    these are always strings
+
+    Args:
+        df (pd.DataFrame): Dataframe
+
+    Returns:
+        pd.DataFrame: Dataframe with column names as strings
+    """
+    if df.columns.nlevels == 1:
+        df.columns = df.columns.astype(str)
+
+    return df
+
+
+def get_max_col_widths(data: pd.DataFrame | np.ndarray) -> list[float]:
+    col_widths = []
+    if isinstance(data, pd.DataFrame):
+        for col in zip(*flatten_multiindex_columns(data)):
+            col_widths.append(max(len(e) for e in col))
+    else:
+        for col in zip(*data):
+            col_widths.append(max(len(str(e)) for e in col))
+
+    col_widths = [col_width * 1.13 for col_width in col_widths]
+
+    return col_widths
+
+
 def flatten_multiindex_columns(df):
     column_multi = []
     for level in range(df.columns.nlevels):
@@ -67,20 +97,32 @@ def df_to_array(df: pd.DataFrame) -> np.ndarray:
     return np.vstack([column_names, df.to_numpy()])
 
 
-def get_cells_to_merge(df, n_levels=1):
-    levels = flatten_multiindex_columns(df)
-    levels = levels[0:n_levels]
+def get_cells_to_merge(df: pd.DataFrame) -> dict[int : list[int, int]]:
+    """Pandas dataframes sometimes have mutliindex columns. For all but the last level
+    a dictionary is created to merge the cells. The last level isn't merged because these
+    are these contain unique column names
+
+    Args:
+        df (pd.DataFrame): Pandas dataframe. If the dataframe has multicolumn indices
+        a dictionary containg the cells to merge is returned
 
-    merge_cells = []
-    start_col = 1
+    Returns:
+        dict[int: list[int, int]]: Dictionary containg the cells to merge
+    """
+    levels = flatten_multiindex_columns(df)[:-1]
 
-    for level in levels:
+    cells_to_merge = {}
+    for level_idx, level in enumerate(levels):
+        start_col = 1
+        start_col = 1
+        merge_cells = []
         for _, val in groupby(level):
             val = list(val)
             merge_cells.append([start_col, start_col + len(val) - 1])
             start_col += len(val)
+        cells_to_merge[level_idx] = merge_cells
 
-    return merge_cells
+    return cells_to_merge
 
 
 def get_fmt_table(arr: np.ndarray) -> Fmt:
@@ -336,7 +378,7 @@ def write_worksheet(
     title: str | None = None,
     source: str | None = None,
     col_filter: bool | None = None,
-    autofit_columns: bool | None = None,
+    col_widths: list | None = None,
     cells_to_merge: list[list[int]] | None = None,
 ) -> None:
     """Writing data to worksheet. Used for writing values to cells and formatting the cells
@@ -377,51 +419,54 @@ def write_worksheet(
         filters = ws.auto_filter
         filters.ref = f"A1:{excel_style(len(fmt), len(fmt[0]))}"
 
-    if autofit_columns:
-        _autofit_columns(ws)
-
     if source:
         _insert_source(ws, source, arr)
 
+    if col_widths:
+        _set_column_widths(ws, col_widths)
+
     if title:
         _insert_title(ws, title)
 
     if cells_to_merge:
-        _merge_cells(ws, cells_to_merge)
-
+        _merge_cells(ws, cells_to_merge, title)
 
-# def _set_column_width(ws: Any, column_widths: list) -> None:
-#     for i, column_number in enumerate(range(ws.max_column)):
-#         column_letter = get_column_letter(column_letter)
-#         column_width = column_widths[i]
-#         ws.column_dimensions[column_letter].width = column_width
 
+def _set_column_widths(ws: Any, col_widths: list[int]) -> None:
+    for idx, col_width in enumerate(col_widths):
+        col_letter = get_column_letter(idx + 1)
+        ws.column_dimensions[col_letter].width = col_width
 
-def _autofit_columns(ws: Any) -> None:
-    column_letters = tuple(
-        get_column_letter(col_number + 1) for col_number in range(ws.max_column)
-    )
-    for column_letter in column_letters:
-        ws.column_dimensions[column_letter].auto_fit = True
 
+def _merge_cells(ws, cells_to_merge, title: str | None = None) -> None:
+    add = 0
+    if title:
+        add = 1
 
-def _merge_cells(ws, cells_to_merge):
-    for start, stop in cells_to_merge:
-        cell = ws.cell(1, start)
-        cell.alignment = Alignment(horizontal="left")
-        ws.merge_cells(start_row=1, end_row=1, start_column=start, end_column=stop)
+    for row_idx, merge in cells_to_merge.items():
+        row_idx = row_idx + add
+        for start, stop in merge:
+            cell = ws.cell(row_idx + 1, start)
+            cell.alignment = Alignment(horizontal="center")
+            ws.merge_cells(
+                start_row=row_idx + 1,
+                end_row=row_idx + 1,
+                start_column=start,
+                end_column=stop,
+            )
 
 
 def _insert_source(ws, source, arr):
     height, width = arr.shape
-    cell = ws.cell(width, height + 1, source)
-    cell.font = Font(**STYLES["calibri"]["font"])
+    cell = ws.cell(height + 1, width, source)
     cell.alignment = Alignment(horizontal="right")
+    cell.font = Font(**STYLES["calibri"]["font"])
 
 
 def _insert_title(ws: Any, title: str) -> None:
     ws.insert_rows(0)
     cell = ws.cell(1, 1, title)
+    cell.alignment = Alignment(horizontal="left")
     for t, kwa in STYLES["title_bold"].items():
         setattr(cell, t, LOOKUP[t](**kwa))
 
@@ -447,10 +492,11 @@ def write_table(
     blue_border: bool | None = True,
     blue_border_row_ids: int | list[int] | None = None,
     number_format: str = "0.0",
-    autofit_columns: bool | None = False,
+    autofit_columns: str | None = "column_names",
     col_filter: bool | None = False,
     style: str = "old",
-    combine_multiindex_cols: bool | int = False,
+    combine_multiindex: bool | int = False,
+    column_names_to_string: bool = True,
 ):
     """_summary_
 
@@ -484,6 +530,9 @@ def write_table(
         data = {"Sheet1": data}
 
     for sheet_name, df in data.items():
+        if column_names_to_string == True:
+            df = cols_to_str(df)
+
         arr = df_to_array(df)
 
         blue_rows = []
@@ -495,6 +544,7 @@ def write_table(
         p_ids = []
         cells_to_merge = []
         title_tbl = None
+        title_src = None
 
         if isinstance(header_row, int):
             blue_rows.extend(list(range(0, header_row + 1)))
@@ -505,6 +555,12 @@ def write_table(
             elif isinstance(title, dict):
                 title_tbl = title.get(sheet_name)
 
+        if source:
+            if isinstance(source, str):
+                title_src = source
+            elif isinstance(title, dict):
+                title_src = source.get(sheet_name)
+
         if right_align_ids:
             r_align_ids.extend(right_align_ids)
 
@@ -546,9 +602,16 @@ def write_table(
         if blue_border_row_ids:
             blue_border_ids.extend(blue_border_row_ids)
 
-        if combine_multiindex_cols:
+        if combine_multiindex:
             cells_to_merge = get_cells_to_merge(df)
 
+        if autofit_columns == "column_names":
+            col_widths = get_max_col_widths(df)
+        elif autofit_columns == "all_data":
+            col_widths = get_max_col_widths(arr)
+        else:
+            col_widths = None
+
         ws = wb.create_sheet(sheet_name)
 
         fmt = cell_formatting(
@@ -570,9 +633,9 @@ def write_table(
             arr=arr,
             fmt=fmt,
             title=title_tbl,
-            source=source,
+            source=title_src,
             col_filter=col_filter,
-            autofit_columns=autofit_columns,
+            col_widths=col_widths,
             cells_to_merge=cells_to_merge,
         )
 

{toolsos-0.1.4 → toolsos-0.2.1}/src/toolsos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: toolsos
-Version: 0.1.4
+Version: 0.2.1
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek
@@ -64,4 +64,4 @@ Instructions on building a package can be found [here](https://packaging.python.
 - make a pypi account
 - ask to be added as collaborator to toolsos
 - first update twine: py -m pip install --upgrade twin
-- upload to pypi: twine upload dist/*
+- upload to pypi: twine upload dist/* --skip-existing

{toolsos-0.1.4 → toolsos-0.2.1}/src/toolsos.egg-info/SOURCES.txt

@@ -3,8 +3,6 @@ pyproject.toml
 src/toolsos/__init__.py
 src/toolsos/cbs_tools.py
 src/toolsos/create_tables.py
-src/toolsos/database_connection.py
-src/toolsos/database_transfer.py
 src/toolsos/download.py
 src/toolsos/geo.py
 src/toolsos/helpers.py
@@ -14,6 +12,8 @@ src/toolsos.egg-info/SOURCES.txt
 src/toolsos.egg-info/dependency_links.txt
 src/toolsos.egg-info/requires.txt
 src/toolsos.egg-info/top_level.txt
+src/toolsos/database/database_connection.py
+src/toolsos/database/database_transfer.py
 src/toolsos/huisstijl/__init__.py
 src/toolsos/huisstijl/colors.py
 src/toolsos/huisstijl/graphs/__init__.py
@@ -23,5 +23,6 @@ src/toolsos/huisstijl/graphs/linegraph.py
 src/toolsos/huisstijl/graphs/piegraph.py
 src/toolsos/huisstijl/graphs/styler.py
 src/toolsos/huisstijl/tables/__init__.py
+src/toolsos/huisstijl/tables/table_helpers.py
 src/toolsos/huisstijl/tables/table_styles.py
 src/toolsos/huisstijl/tables/tables.py

toolsos-0.1.4/src/toolsos/huisstijl/graphs/graph_styles.py

@@ -1,24 +0,0 @@
-STYLE_OLD = {
-    "font": {"family": "Corbel", "font_size": 15},
-    "plot_bgcolor": "#FFFFFF",
-    "gridline_color": "#E8E8E8",
-    "gridlinewidth": 0.75,
-    "showline": True,
-    "showgrid": False,
-    "zerolinecolor": "#E8E8E8",
-    "gridcolor": "#E8E8E8",
-    "separators": ",",
-}
-
-
-STYLE_NEW = {
-    "font": "Amsterdam Sans ExtraBold, Corbel",
-    "font_size": 15,
-    "plot_bgcolor": "#FFFFFF",
-    "gridline_color": "#E8E8E8",
-    "gridlinewidth": 0.75,
-    "showline": True,
-    "showgrid": False,
-    "zerolinecolor": "#E8E8E8",
-    "gridcolor": "#E8E8E8",
-}

toolsos-0.1.4/src/toolsos/huisstijl/graphs/styler.py

@@ -1,103 +0,0 @@
-import json
-
-import plotly.graph_objects as go
-import requests
-from requests import ConnectionError
-
-
-class BaseStyle:
-    style_url = (
-        "https://raw.githubusercontent.com/jbosga-ams/oistyle/main/base_style.json"
-    )
-
-    def __init__(self):
-        self.grab_styling()
-
-    def grab_styling(self, style_path: str = None):
-        if not style_path:
-            try:
-                res = requests.get(self.style_url).json()
-            except ConnectionError:
-                print("Failed grabbing basestyle from the interwebs")
-                # Add option to manually provide json file
-        else:
-            res = json.loads()
-
-        for k, v in res.items():
-            setattr(self, k, v)
-
-        self.font = "Amsterdam Sans ExtraBold, Corbel"
-
-    def _get_axis_format(self):
-        self.gridline_color = "#dbdbdb"  # Jorren vragen om deze aan te passen
-
-        return {
-            "zerolinecolor": self.gridline_color,
-            "gridcolor": self.gridline_color,
-            "gridwidth": self.gridline_width,
-            "showline": True,
-            "linewidth": self.gridline_width,
-            "linecolor": self.gridline_color,
-            #             "mirror": True,
-            "showgrid": False,
-        }
-
-    def _get_base_template_layout(self):
-        return go.layout.Template(
-            layout={
-                "font": {"family": self.font, "size": self.font_size},
-                "plot_bgcolor": self.plot_bgcolor,
-                "colorway": self.colors["darkblue_lightblue_gradient_5"],
-                "separators": ",",  # Jorren vragen om deze toe te voegen
-            }
-        )
-
-    def get_base_template(
-        self, graph_type: str = None, orientation: str = None, colors: str = None
-    ):
-        """[summary]
-
-        Args:
-            graph_type (str, optional): Pick 'bar', 'line' or 'bar'. Defaults to None.
-            orientation (str, optional): [description]. Pick horizontal ('h') or vertical 'v'. Defaults to None.
-            colors (str, optional): Set basecolors. Defaults to None.
-
-        Raises:
-            ValueError: [description]
-
-        Returns:
-            [type]: [description]
-        """
-        base_template = self._get_base_template_layout()
-        axis_format = self._get_axis_format()
-
-        if graph_type == "bar":
-            if orientation in ["v", "vertical"]:
-                base_template.layout.xaxis.update(axis_format)
-                base_template.layout.yaxis.update(zeroline=False)
-            elif orientation in ["h", "horizontal"]:
-                base_template.layout.yaxis.update(axis_format)
-                base_template.layout.xaxis.update(zeroline=False)
-            else:
-                raise ValueError(
-                    "Orientation ('v'/'vertical' or 'h'/'horizontal') should be supplied with graph_type=='bar'"
-                )
-
-        elif graph_type == "line":
-            base_template.layout.xaxis.update(axis_format)
-
-        if colors:
-            base_template.layout.update({"colorway": colors})
-
-        return base_template
-
-    def get_ois_colors(self, colorscale):
-        colorscale = self.colors.get(colorscale, [])
-        if not colorscale:
-            raise Exception(f"Kies uit {self.colors.keys()}")
-
-        return colorscale
-
-
-class Basestyle2:
-    def __init__(self, style): ...