toolsos 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

toolsos/geo.py

@@ -105,7 +105,7 @@ def get_geo_name_code(level: str, year: int, mra: bool = False) -> dict[str, str
     Returns:
         dict[str, str]: _description_
     """
-    json = get_geo_json(level=level, year=year)
+    json = get_geo_json(level=level, year=year, mra=mra)
     name_code = extract_name_code_table(json)
     return name_code
 

toolsos/huisstijl/graphs/bargraph.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 import plotly.express as px
 
 from .styler import BaseStyle
@@ -9,13 +11,13 @@ def bar(
     data,
     x: str,
     y: str,
-    color: str = None,
-    color_discrete_sequence: list = None,
-    orientation: str = None,
-    barmode=None,
-    width=750,
-    height=490,
-    font="Amsterdam Sans",
+    color: Optional[str] = None,
+    color_discrete_sequence: Optional[list[str]] = None,
+    orientation: Optional[str] = None,
+    barmode: Optional[str] = None,
+    width: int = 750,
+    height: int = 490,
+    font: str = "Amsterdam Sans",
     **kwargs,
 ):
     fig = px.bar(
@@ -42,10 +44,10 @@ def stacked_single(
     data,
     x: str,
     y: str,
-    color: str = None,
-    color_discrete_sequence: list = None,
-    orientation="v",
-    font="Amsterdam Sans",
+    color: Optional[str] = None,
+    color_discrete_sequence: Optional[list[str]] = None,
+    orientation: str = "v",
+    font: str = "Amsterdam Sans",
     **kwargs,
 ):
     fig = bar(
@@ -133,6 +135,7 @@ def single(
         y=y,
         color_discrete_sequence=color_discrete_sequence,
         orientation=orientation,
+        barmode="relative",
         font=font,
         **kwargs,
     )

toolsos/huisstijl/maps/choropleth.py

@@ -1,7 +1,8 @@
-from typing import Any, Iterable, Optional
+from typing import TYPE_CHECKING, Any, Iterable, Optional
 
 import geopandas as gpd
 import matplotlib.pyplot as plt
+from matplotlib import axis
 from matplotlib.colors import ListedColormap
 from matplotlib.patches import Patch
 
@@ -10,15 +11,19 @@ def plot_choropleth(
     gdf: gpd.GeoDataFrame,
     column: str,
     colors: Iterable[str],
-    column_label: Optional[str] = False,
-    column_label_kwargs: Any = None,
+    column_label: Optional[bool] = False,
+    column_label_kwargs: Optional[dict[Any]] = None,
     legend_title: Optional[str] = None,
     edgecolor: str = "grey",
     figsize: tuple[int, int] = (10, 8),
-    bbox_to_anchor: tuple[int, int] = (-0.05, 0),
+    bbox_to_anchor: tuple[float, int] = (-0.05, 0),
+    ax: Optional[axis.Axis] = None,
 ):
+    _ax = ax
+
     # plotten
-    fig, ax = plt.subplots(figsize=figsize)
+    if not ax:
+        fig, ax = plt.subplots(figsize=figsize)
 
     gdf.plot(
         column=column,
@@ -29,7 +34,17 @@ def plot_choropleth(
         linewidth=0.2,
     )
 
-    labels = gdf["categorieen"].cat.categories
+    try:
+        labels = gdf[column].cat.categories
+    except AttributeError:
+        plt.close("all")
+        raise Exception(
+            """
+                The column provided should be an categorical column. Use pd.Categorical(df[column])
+                to turn the column into a Categorical column. If the order of the legend is important
+                provide the levels and set ordered=True
+            """
+        )
 
     if not column_label_kwargs:
         column_label_kwargs = {}
@@ -49,10 +64,7 @@ def plot_choropleth(
             )
 
     # Create custom legend using the 'colors' and 'labels' variables, with a grey border
-    legend_elements = [
-        Patch(facecolor=color, label=label, edgecolor="#b0b0b0")
-        for color, label in zip(colors, labels)
-    ]
+    legend_elements = _build_legend(colors, labels)
 
     # Move the legend to the bottom left outside the plot
     ax.legend(
@@ -69,4 +81,12 @@ def plot_choropleth(
     # laten zien
     plt.tight_layout()
 
-    return fig, ax
+    if not _ax:
+        return fig, ax
+
+
+def _build_legend(colors, labels):
+    return [
+        Patch(facecolor=color, label=label, edgecolor="#b0b0b0")
+        for color, label in zip(colors, labels)
+    ]

toolsos/huisstijl/tables/table_helpers.py

@@ -10,7 +10,7 @@ def remove_underscores_from_columns(df: pd.DataFrame) -> pd.DataFrame:
 
 
 def get_excel_files_from_folder(folder: str) -> list[str]:
-    return [str(f.resolve()) for f in Path("to_merge").glob("*") if f.suffix == ".xlsx"]
+    return [str(f.resolve()) for f in Path(folder).glob("*") if f.suffix == ".xlsx"]
 
 
 def combine_excel_files(out_path: str, files: list[str] = None, overwrite: bool = True):

toolsos/huisstijl/tables/tables.py

@@ -1,7 +1,4 @@
-import functools
-import json
 import re
-import warnings
 from itertools import groupby
 from typing import Any, Callable, Dict
 
@@ -21,7 +18,6 @@ LOOKUP: dict[str, Callable] = {
     "border": Border,
     "protection": Protection,
     "side": Side,
-    "border": Border,
 }
 
 LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -79,7 +75,7 @@ def get_max_col_widths(data: pd.DataFrame | np.ndarray) -> list[float]:
     return col_widths
 
 
-def flatten_multiindex_columns(df):
+def flatten_multiindex_columns(df: pd.DataFrame) -> list:
     column_multi = []
     for level in range(df.columns.nlevels):
         column_multi.append(df.columns.get_level_values(level))
@@ -253,7 +249,6 @@ def set_style_col(
     for col_idx in col_idxs:
         for row_idx, _ in enumerate(fmt):
             if row_idx not in exlude_row_ids:
-
                 update_format(fmt, row_idx, col_idx, mapping)
 
     return fmt
@@ -323,6 +318,8 @@ def cell_formatting(
     right_align_ids: int | list | None = None,
     perc_col_ids: int | list | None = None,
     perc_col_format: str | None = None,
+    float_col_ids: int | list | None = None,
+    float_col_format: str | None = None,
     blue_border_ids: bool | None = None,
     number_format: str | None = None,
 ):
@@ -375,6 +372,13 @@ def cell_formatting(
             fmt, perc_col_ids, {"number_format": {"format": perc_col_format}}
         )
 
+    if float_col_ids:
+        if not float_col_format:
+            float_col_format = "0.00"
+        fmt = set_style_col(
+            fmt, float_col_ids, {"number_format": {"format": float_col_format}}
+        )
+
     if blue_border_ids:
         fmt = set_style_row(fmt, blue_border_ids, STYLES["blue_border_bottom"])
 
@@ -507,6 +511,9 @@ def write_table(
     perc_ids: list | None = None,
     perc_pattern: str | None = None,
     perc_col_format: str | None = None,
+    float_ids: list | None = None,
+    float_pattern: str | None = None,
+    float_col_format: str | None = None,
     blue_border: bool | None = True,
     blue_border_row_ids: int | list[int] | None = None,
     number_format: str = "0.0",
@@ -518,6 +525,39 @@ def write_table(
     combine_multiindex: bool | int = False,
     column_names_to_string: bool = True,
 ):
+    """_summary_
+
+    Args:
+        data (pd.DataFrame | dict[pd.DataFrame]): dataframe or dicts with dataframes
+        file (str): destination file path
+        header_row (int, optional): Id of header row. Defaults to 0.
+        header_row (int): Set the number of rows to be dark blue (zero-indexed). Defaults to 0 (top row)
+        title (str): Set the title above the table. In the case of multiple tables provide a dict in
+        which te keys correspond to the sheet name. Defaults to none
+        source (str | None, optional): Descriptiopn to be added underneath the table. Defaults to None.
+        total_row (bool, optional): Color bottom row blue
+        light_blue_row_ids (int | list[int] | None, optional): Row to be formatted light_blue. Defaults to None.
+        total_col (bool, optional): Color last column blue.
+        right_align_ids (list, optional): The ids of the columns to right align. Defaults to None
+        right_align_pattern (str, optional): Pattern of columns to right align. Defaults to None.
+        right_align_numeric (bool, optional): Right align numeric columns. Defaults to True.
+        left_align_ids (list, optional): The ids of the columns to left align. Defaults to None.
+        left_align_pattern (str, optional): Pattern of columns to left align. Defaults to None.
+        left_align_string (bool, optional): Left align string columns. Defaults to True.
+        perc_ids (list, optional): The ids of the columns to format as percentage. Defaults to None.
+        perc_pattern (str, optional): The pattern of columns to format as percentage. Defaults to None.
+        perc_col_format (str, optional): The formatting string of percentage columns. Defaults to None.
+        blue_border (bool | None, optional): _description_. Defaults to True.
+        blue_border_row_ids (int | list[int] | None, optional): _description_. Defaults to None.
+        number_format (str, optional): _description_. Defaults to "0.0".
+        autofit_columns (str | None, optional): _description_. Defaults to None.
+        column_widths (list[int] | None, optional): _description_. Defaults to None.
+        min_column_width (int | None, optional): _description_. Defaults to None.
+        col_filter (bool, optional): Set filter on columns. Defaults to False.
+        style (str, optional): _description_. Defaults to "old".
+        combine_multiindex (bool | int, optional): _description_. Defaults to False.
+        column_names_to_string (bool, optional): _description_. Defaults to True.
+    """
     wb = Workbook()
     # Empty sheet is created on Workbook creation
     del wb["Sheet"]
@@ -547,6 +587,9 @@ def write_table(
             perc_ids=perc_ids,
             perc_pattern=perc_pattern,
             perc_col_format=perc_col_format,
+            float_ids=float_ids,
+            float_pattern=float_pattern,
+            float_col_format=float_col_format,
             blue_border=blue_border,
             blue_border_row_ids=blue_border_row_ids,
             number_format=number_format,
@@ -597,6 +640,9 @@ def format_worksheet(
     perc_ids: list | None = None,
     perc_pattern: str | None = None,
     perc_col_format: str | None = None,
+    float_ids: list | None = None,
+    float_pattern: str | None = None,
+    float_col_format: str | None = None,
     blue_border: bool | None = True,
     blue_border_row_ids: int | list[int] | None = None,
     number_format: str = "0.0",
@@ -628,7 +674,7 @@ def format_worksheet(
         perc_col_format (str, optional): The formatting string of percentage columns. Defaults to None.
         col_filter (bool, optional): Set filter on columns. Defaults to False.
     """
-    if column_names_to_string == True:
+    if column_names_to_string:
         df = cols_to_str(df)
 
     arr = df_to_array(df)
@@ -640,6 +686,7 @@ def format_worksheet(
     r_align_ids = []
     l_align_ids = []
     p_ids = []
+    f_ids = []
     cells_to_merge = []
     title_tbl = None
     title_src = None
@@ -681,9 +728,17 @@ def format_worksheet(
         p_ids.extend(perc_ids)
 
     if perc_pattern:
-        r_id = get_cols_id_with_pattern(df, perc_pattern)
-        p_ids.extend(r_id)
-        r_align_ids.extend(r_id)
+        pr_id = get_cols_id_with_pattern(df, perc_pattern)
+        p_ids.extend(pr_id)
+        r_align_ids.extend(pr_id)
+
+    if float_ids:
+        p_ids.extend(perc_ids)
+
+    if float_pattern:
+        fr_id = get_cols_id_with_pattern(df, float_pattern)
+        f_ids.extend(fr_id)
+        r_align_ids.extend(fr_id)
 
     if total_row:
         light_blue_rows.append(arr.shape[0] - 1)
@@ -729,6 +784,8 @@ def format_worksheet(
         right_align_ids=r_align_ids,
         perc_col_ids=p_ids,
         perc_col_format=perc_col_format,
+        float_col_ids=f_ids,
+        float_col_format=float_col_format,
         number_format=number_format,
         blue_border_ids=blue_border_ids,
     )

{toolsos-0.3.0.dist-info → toolsos-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: toolsos
-Version: 0.3.0
+Version: 0.3.2
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek
@@ -27,6 +27,7 @@ Requires-Dist: pyyaml; extra == "all"
 Requires-Dist: requests; extra == "all"
 Requires-Dist: sqlalchemy; extra == "all"
 Requires-Dist: geopandas; extra == "all"
+Requires-Dist: ipykernel; extra == "all"
 
 # Tools Onderzoek & Statistiek
 

{toolsos-0.3.0.dist-info → toolsos-0.3.2.dist-info}/RECORD

@@ -2,7 +2,7 @@ toolsos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolsos/cbs_tools.py,sha256=361cogk0aIU4D4BKHaa7YSOBh64t5C3zrHlqtWx0iIc,3465
 toolsos/create_tables.py,sha256=43FHK3EERjumBtnGhngIdtthZzcc_Qi37lJ1MgATzBg,908
 toolsos/download.py,sha256=88hehmPL5m5d1nrcJjltuh4xrCItF5EYHaZdHOcSt-g,2652
-toolsos/geo.py,sha256=YM877U6s7PVKi1kySQrENDbJxR1_bOnK3tyid0uszj0,3484
+toolsos/geo.py,sha256=nxIU62po7bexK3ZEC8p2ad65jCqKNMowA3CjU3Ad17w,3493
 toolsos/helpers.py,sha256=U4MNRj8pz2iKOTMOzuRg-PdgIBBb21sedWYDWfstvWU,1319
 toolsos/polars_helpers.py,sha256=P3RHLQFeDL7-9U_Q1n4ma_NSkdYAiker4pnc57uluHw,770
 toolsos/database/database_connection.py,sha256=HCP8H_-iE2BOOQDp9v1HOgfUSX45XS-aqw7Nzf8drAU,4359
@@ -10,18 +10,18 @@ toolsos/database/database_transfer.py,sha256=1ghq5VEtKyOdCKdM45uOyrZSoXMuWsdC35R
 toolsos/huisstijl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 toolsos/huisstijl/colors.py,sha256=lSCHCdSjge5cGfLfAObd6mV6TaXq3QGImLOmoGJpGkw,1484
 toolsos/huisstijl/graphs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-toolsos/huisstijl/graphs/bargraph.py,sha256=HYl01_euh23iDYSUhnAzYAXS0DhDpg9eLRjJEpeR6iU,2815
+toolsos/huisstijl/graphs/bargraph.py,sha256=-NfQ1Eo3SMJb4nAZCVdWSiEHI17SAmOSbyCHfujfKLg,2987
 toolsos/huisstijl/graphs/graph_styles.py,sha256=Z9LLH7j8ODTsYMYK0rslacphuiRDcq5_IpSjEEiK2VY,975
 toolsos/huisstijl/graphs/linegraph.py,sha256=dMUarRe31SXaY78OCXLy-PgnU8LlVJ9KkzKaHhDtuuI,698
 toolsos/huisstijl/graphs/piegraph.py,sha256=aEFiEM-9QuhBOjKHSXVuE5bTh-8uucq4FP6O8Vk1vZI,703
 toolsos/huisstijl/graphs/styler.py,sha256=-uZ7pjY1G39XvmaGHQd31gPRxjxmJGhYZk8xhy2JUWc,6623
 toolsos/huisstijl/maps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-toolsos/huisstijl/maps/choropleth.py,sha256=HbcXeeSNryGDT6vzCC7v1r6cYb-rQ7q5HqqpQo4PaUE,1899
+toolsos/huisstijl/maps/choropleth.py,sha256=2B2Av5hQXkuFHR-TDcDndSmksji-mIwGoqq_JDMwO6w,2531
 toolsos/huisstijl/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-toolsos/huisstijl/tables/table_helpers.py,sha256=jsQ6lw93sxtGJGrUn8X2_LyA2vYYnytngpUI5A_wpWQ,2037
+toolsos/huisstijl/tables/table_helpers.py,sha256=Q1VuaEHl__K0xFQOeucihN212joTkxhcNbS6wKZaMew,2033
 toolsos/huisstijl/tables/table_styles.py,sha256=oYU6GJcfqlKpZof5PUjPsA7woJ3Tew78CHPyT0_jY6w,1343
-toolsos/huisstijl/tables/tables.py,sha256=yeHiZd4EuOoeb_CeRE74xM1r1j6gCMNM1-I3Lpd2tyQ,24728
-toolsos-0.3.0.dist-info/METADATA,sha256=zhUnPEX1TH0w6IWFuPCBZdDLSur9OsFUSt1nh1--tRA,2725
-toolsos-0.3.0.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-toolsos-0.3.0.dist-info/top_level.txt,sha256=2ClEjUBbtfDQ8oPwvWRy1Sz2nrkLCXlg0mHaMdCWia0,8
-toolsos-0.3.0.dist-info/RECORD,,
+toolsos/huisstijl/tables/tables.py,sha256=ChxgXgGLc_AwZPJv4hRDd8gQk_Mo7B-Ei70wvffZaHs,28193
+toolsos-0.3.2.dist-info/METADATA,sha256=P7JqzftUYMnEryQ_audfJdoLRT3KbCOrbn1nhrlJIV4,2767
+toolsos-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+toolsos-0.3.2.dist-info/top_level.txt,sha256=2ClEjUBbtfDQ8oPwvWRy1Sz2nrkLCXlg0mHaMdCWia0,8
+toolsos-0.3.2.dist-info/RECORD,,

{toolsos-0.3.0.dist-info → toolsos-0.3.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.1)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any