toolsos 0.2.1__tar.gz → 0.2.3__tar.gz

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: toolsos
-Version: 0.2.1
+Version: 0.2.3
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.11
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"

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

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "toolsos"
-version = "0.2.1"
+version = "0.2.3"
 description = "OS tools"
 readme = "README.md"
 authors = [{ name = "OS", email = "d.schmitz@amsterdam.nl" }]
@@ -25,7 +25,7 @@ keywords = ["tools", "Onderzoek & Statistiek"]
 # use pip install "toolsos[all]" to pip install with al dependencies
 
 dependencies = []
-requires-python = ">=3.11"
+requires-python = ">=3.10"
 
 [project.optional-dependencies]
 dev = [

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

@@ -5,7 +5,16 @@ from .styler import BaseStyle
 basestyle = BaseStyle()
 
 
-def line(data, x, y, color: None, width=750, height=490, **kwargs):
+def line(
+    data,
+    x,
+    y,
+    color: None,
+    width=750,
+    height=490,
+    color_discrete_sequence=None,
+    **kwargs,
+):
     fig = px.line(
         data_frame=data,
         x=x,
@@ -13,6 +22,7 @@ def line(data, x, y, color: None, width=750, height=490, **kwargs):
         color=color,
         width=width,
         height=height,
+        color_discrete_sequence=color_discrete_sequence,
         template=BaseStyle().get_base_template(graph_type="line"),
         **kwargs,
     )

{toolsos-0.2.1 → toolsos-0.2.3}/src/toolsos/huisstijl/graphs/piegraph.py

@@ -1,4 +1,5 @@
 import plotly.express as px
+
 from .styler import BaseStyle
 
 basestyle = BaseStyle()
@@ -12,6 +13,7 @@ def pie(
     width=750,
     height=490,
     text_format: str = None,
+    color_discrete_sequence=None,
     **kwargs,
 ):
     fig = px.pie(
@@ -22,6 +24,7 @@ def pie(
         height=height,
         hole=hole,
         template=BaseStyle().get_base_template(),
+        color_discrete_sequence=color_discrete_sequence,
         **kwargs,
     )
 

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

@@ -0,0 +1,76 @@
+from pathlib import Path
+
+import pandas as pd
+import win32com.client as win32
+
+
+def remove_underscores_from_columns(df: pd.DataFrame) -> pd.DataFrame:
+    df.columns = df.columns.str.replace("_", " ")
+    return df
+
+
+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"]
+
+
+def combine_excel_files(out_path: str, files: list[str] = None, overwrite: bool = True):
+    out_path = Path(out_path)
+
+    if overwrite:
+        if out_path.exists():
+            out_path.unlink()
+
+    # INITIALIZE EXCEL COM APP
+    try:
+        xlapp = win32.gencache.EnsureDispatch("Excel.Application")
+
+        # constants
+        xlPasteValues = -4163
+        lPasteFormats = -4122
+        xlWorkbookDefault = 51
+
+        # create new workbook
+        new_wb = xlapp.Workbooks.Add()
+        new_wb.SaveAs(Filename=str(out_path), FileFormat=xlWorkbookDefault)
+
+        dup_count = 1
+
+        for wb in files:
+            xlwb = xlapp.Workbooks.Open(wb)
+
+            for xlsh in xlwb.Worksheets:
+                new_sh = new_wb.Worksheets.Add()
+
+                try:
+                    new_sh.Name = xlsh.Name
+
+                # Ugly non defined exception. Be aware that this wil caputre
+                except Exception as e:
+                    new_sh.Name = f"{xlsh.Name}_{dup_count}"
+                    dup_count += 1
+
+                new_wb.Save()
+                new_sh.Move(After=new_wb.Worksheets(new_wb.Worksheets.Count))
+
+                xlsh.Cells.Copy(new_sh.Cells)
+                new_sh = None
+
+            xlwb.Close(True)
+            xlwb = None
+
+        # remove default blad1
+        new_wb.Worksheets("Blad1").Delete()
+        new_wb.Save()
+
+    except Exception as e:
+        print(e)
+
+    # RELEASE RESOURCES
+    finally:
+        xlsh = None
+        new_sh = None
+        xlwb = None
+        new_wb = None
+        xlapp.Quit()
+        xlapp = None
+        xlwb = None

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

@@ -371,7 +371,7 @@ def cell_formatting(
     return fmt
 
 
-def write_worksheet(
+def write_to_worksheet(
     ws: Any,
     arr: np.ndarray,
     fmt: Fmt,
@@ -497,6 +497,94 @@ def write_table(
     style: str = "old",
     combine_multiindex: bool | int = False,
     column_names_to_string: bool = True,
+):
+    wb = Workbook()
+    # Empty sheet is created on Workbook creation
+    del wb["Sheet"]
+
+    set_global_style(style)
+
+    if not isinstance(data, dict):
+        data = {"Sheet1": data}
+
+    for sheet_name, df in data.items():
+        if column_names_to_string == True:
+            df = cols_to_str(df)
+
+        format_worksheet(
+            wb=wb,
+            df=df,
+            sheet_name=sheet_name,
+            header_row=header_row,
+            title=title,
+            source=source,
+            total_row=total_row,
+            light_blue_row_ids=light_blue_row_ids,
+            total_col=total_col,
+            right_align_ids=right_align_ids,
+            right_align_pattern=right_align_pattern,
+            right_align_numeric=right_align_numeric,
+            left_align_ids=left_align_ids,
+            left_align_pattern=left_align_pattern,
+            left_align_string=left_align_string,
+            perc_ids=perc_ids,
+            perc_pattern=perc_pattern,
+            perc_col_format=perc_col_format,
+            blue_border=blue_border,
+            blue_border_row_ids=blue_border_row_ids,
+            number_format=number_format,
+            autofit_columns=autofit_columns,
+            col_filter=col_filter,
+            combine_multiindex=combine_multiindex,
+            column_names_to_string=column_names_to_string,
+        )
+
+    wb.save(file)
+
+
+def write_table_from_dict(
+    file,
+    write_info,
+    style: str = "old",
+):
+    wb = Workbook()
+    # Empty sheet is created on Workbook creation
+    del wb["Sheet"]
+
+    set_global_style(style)
+
+    for sheet in write_info:
+        format_worksheet(wb=wb, **sheet)
+
+    wb.save(file)
+
+
+def format_worksheet(
+    wb: Any,
+    df: pd.DataFrame,
+    sheet_name: str,
+    header_row: int = 0,
+    title: str | dict[str, str] | None = None,
+    source: str | None = None,
+    total_row: bool | None = None,
+    light_blue_row_ids: int | list[int] | None = None,
+    total_col: bool | None = None,
+    right_align_ids: list | None = None,
+    right_align_pattern: str | None = None,
+    right_align_numeric: bool | None = True,
+    left_align_ids: list | None = None,
+    left_align_pattern: str | None = None,
+    left_align_string: bool | None = True,
+    perc_ids: list | None = None,
+    perc_pattern: str | None = None,
+    perc_col_format: str | None = None,
+    blue_border: bool | None = True,
+    blue_border_row_ids: int | list[int] | None = None,
+    number_format: str = "0.0",
+    autofit_columns: str | None = "column_names",
+    col_filter: bool | None = False,
+    combine_multiindex: bool | int = False,
+    column_names_to_string: bool = True,
 ):
     """_summary_
 
@@ -519,124 +607,108 @@ def write_table(
         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.
     """
+    arr = df_to_array(df)
+
+    blue_rows = []
+    light_blue_rows = []
+    light_blue_cols = []
+    blue_border_ids = []
+    r_align_ids = []
+    l_align_ids = []
+    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)))
 
-    wb = Workbook()
-    # Empty sheet is created on Workbook creation
-    del wb["Sheet"]
-
-    set_global_style(style)
-
-    if not isinstance(data, dict):
-        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 = []
-        light_blue_rows = []
-        light_blue_cols = []
-        blue_border_ids = []
-        r_align_ids = []
-        l_align_ids = []
-        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)))
-
-        if title:
-            if isinstance(title, str):
-                title_tbl = title
-            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)
+    if title:
+        if isinstance(title, str):
+            title_tbl = title
+        elif isinstance(title, dict):
+            title_tbl = title.get(sheet_name)
 
-        if right_align_pattern:
-            r_align_ids.extend(get_cols_id_with_pattern(df, right_align_pattern))
+    if source:
+        if isinstance(source, str):
+            title_src = source
+        elif isinstance(title, dict):
+            title_src = source.get(sheet_name)
 
-        if right_align_numeric:
-            r_align_ids.extend(get_numeric_col_ids(df))
+    if right_align_ids:
+        r_align_ids.extend(right_align_ids)
 
-        if left_align_ids:
-            r_align_ids.extend(left_align_ids)
+    if right_align_pattern:
+        r_align_ids.extend(get_cols_id_with_pattern(df, right_align_pattern))
 
-        if left_align_pattern:
-            l_align_ids.extend(get_cols_id_with_pattern(df, left_align_pattern))
+    if right_align_numeric:
+        r_align_ids.extend(get_numeric_col_ids(df))
 
-        if left_align_string:
-            l_align_ids.extend(get_string_cols_ids(df))
+    if left_align_ids:
+        r_align_ids.extend(left_align_ids)
 
-        if perc_ids:
-            p_ids.extend(perc_ids)
+    if left_align_pattern:
+        l_align_ids.extend(get_cols_id_with_pattern(df, left_align_pattern))
 
-        if perc_pattern:
-            r_id = get_cols_id_with_pattern(df, perc_pattern)
-            p_ids.extend(r_id)
-            r_align_ids.extend(r_id)
+    if left_align_string:
+        l_align_ids.extend(get_string_cols_ids(df))
 
-        if total_row:
-            light_blue_rows.append(arr.shape[0] - 1)
+    if perc_ids:
+        p_ids.extend(perc_ids)
 
-        if light_blue_row_ids:
-            light_blue_rows.extend(light_blue_row_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)
 
-        if total_col:
-            light_blue_cols.append(arr.shape[1] - 1)
+    if total_row:
+        light_blue_rows.append(arr.shape[0] - 1)
 
-        if blue_border:
-            blue_border_ids.append(arr.shape[0] - 1)
+    if light_blue_row_ids:
+        light_blue_rows.extend(light_blue_row_ids)
 
-        if blue_border_row_ids:
-            blue_border_ids.extend(blue_border_row_ids)
+    if total_col:
+        light_blue_cols.append(arr.shape[1] - 1)
 
-        if combine_multiindex:
-            cells_to_merge = get_cells_to_merge(df)
+    if blue_border:
+        blue_border_ids.append(arr.shape[0] - 1)
 
-        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(
-            arr=arr,
-            default_format=STYLES["calibri"],
-            blue_row_ids=blue_rows,
-            light_blue_row_ids=light_blue_rows,
-            light_blue_col_ids=light_blue_cols,
-            left_align_ids=l_align_ids,
-            right_align_ids=r_align_ids,
-            perc_col_ids=p_ids,
-            perc_col_format=perc_col_format,
-            number_format=number_format,
-            blue_border_ids=blue_border_ids,
-        )
+    if blue_border_row_ids:
+        blue_border_ids.extend(blue_border_row_ids)
 
-        write_worksheet(
-            ws=ws,
-            arr=arr,
-            fmt=fmt,
-            title=title_tbl,
-            source=title_src,
-            col_filter=col_filter,
-            col_widths=col_widths,
-            cells_to_merge=cells_to_merge,
-        )
+    if combine_multiindex:
+        cells_to_merge = get_cells_to_merge(df)
 
-    wb.save(file)
+    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(
+        arr=arr,
+        default_format=STYLES["calibri"],
+        blue_row_ids=blue_rows,
+        light_blue_row_ids=light_blue_rows,
+        light_blue_col_ids=light_blue_cols,
+        left_align_ids=l_align_ids,
+        right_align_ids=r_align_ids,
+        perc_col_ids=p_ids,
+        perc_col_format=perc_col_format,
+        number_format=number_format,
+        blue_border_ids=blue_border_ids,
+    )
+
+    write_to_worksheet(
+        ws=ws,
+        arr=arr,
+        fmt=fmt,
+        title=title_tbl,
+        source=title_src,
+        col_filter=col_filter,
+        col_widths=col_widths,
+        cells_to_merge=cells_to_merge,
+    )

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

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: toolsos
-Version: 0.2.1
+Version: 0.2.3
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.11
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"

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

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