toolsos 0.2.3__tar.gz → 0.2.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: toolsos
-Version: 0.2.3
+Version: 0.2.5
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek
@@ -63,5 +63,12 @@ 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
+- first update twine: py -m pip install --upgrade twine
 - upload to pypi: twine upload dist/* --skip-existing
+
+## Install to local enviroment for testing
+
+- python -m venv local (maak een lokale venv aan)
+- local\Scripts\activate (activeer de venv)
+- pip install -e . (installer toolsos)
+- pip install -r local_requirements.txt (installeer de benodigde dependencies)

{toolsos-0.2.3 → toolsos-0.2.5}/README.md

@@ -34,5 +34,12 @@ 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
+- first update twine: py -m pip install --upgrade twine
 - upload to pypi: twine upload dist/* --skip-existing
+
+## Install to local enviroment for testing
+
+- python -m venv local (maak een lokale venv aan)
+- local\Scripts\activate (activeer de venv)
+- pip install -e . (installer toolsos)
+- pip install -r local_requirements.txt (installeer de benodigde dependencies)

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

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

{toolsos-0.2.3 → toolsos-0.2.5}/src/toolsos/cbs_tools.py

@@ -2,8 +2,9 @@ from __future__ import annotations
 
 import json
 import pickle
+from datetime import datetime
 from pathlib import Path
-from typing import TYPE_CHECKING, Iterator, Optional, Any
+from typing import TYPE_CHECKING, Any, Iterator, Optional
 
 import pandas as pd
 import pyarrow as pa
@@ -14,18 +15,27 @@ if TYPE_CHECKING:
     import pyreadstat
 
 
+def get_batch_size(path, memory_limit):
+    df, _ = prs.read_sav(path, row_limit=1000)
+
+    # memory in megabytes
+    mem_size = df.memory_usage().sum() / 1_000_000
+
+    # The amount of blocks (of a thousand rows fit in the memory_limit)
+    n_blocks = memory_limit / mem_size
+
+    # Calculate the number of rows that fit within the memory limit
+    return round(n_blocks * 1000)
+
+
 class SavToParquet:
     def __init__(
-        self,
-        file: str,
-        folder_out: str,
-        chunksize: Optional[int] = None,
-        verbose: bool = False,
+        self, file: str, folder_out: str, verbose: bool = False, memory_limit=10_000
     ) -> None:
         self.file = file
         self.folder_out = folder_out
         self.verbose = verbose
-        self.chunksize = 5_000_000 if not chunksize else chunksize
+        self.memory_limit = memory_limit
 
     @property
     def path_out(self) -> str:
@@ -33,20 +43,27 @@ class SavToParquet:
 
     @property
     def chunks(self) -> Iterator[tuple["pyreadstat.metadata_container", pd.DataFrame]]:
-        return prs.read_file_in_chunks(
-            prs.read_sav, self.file, chunksize=self.chunksize
-        )
 
-    def get_meta(self) -> Iterator:
-        return prs.read_sav(self.file, row_limit=10)
+        chunksize = get_batch_size(self.file, self.memory_limit)
+
+        if self.verbose:
+            print(f"Reading file in blocks of {chunksize} rows")
+            print("One such block should fit within the memory limit")
+
+        return prs.read_file_in_chunks(prs.read_sav, self.file, chunksize=chunksize)
 
     def write_meta_to_json(self) -> None:
         json_path = self.path_out.replace(".parquet", "_meta.json")
 
         meta_dict = {}
-        for attr in dir(self.meta):
-            if not attr.startswith("__"):
-                meta_dict[attr] = getattr(self.meta, attr)
+        for attr_name in dir(self.meta):
+            if not attr_name.startswith("__"):
+                attr = getattr(self.meta, attr_name)
+
+                if isinstance(attr, datetime):
+                    attr = attr.strftime("%Y-%m-%d %H:%M:%S")
+
+                meta_dict[attr_name] = attr
 
         with open(json_path, "w") as file:
             json.dump(meta_dict, file)
@@ -58,10 +75,12 @@ class SavToParquet:
             pickle.dump(self.meta, file)
 
     def write_to_parquet(self) -> None:
-        meta_df, self.meta = self.get_meta()
-        schema = table = pa.Table.from_pandas(meta_df).schema
 
         print("Writing table")
+
+        line1, self.meta = prs.read_sav(self.file, row_limit=1)
+        schema = pa.Table.from_pandas(line1).schema
+
         with pq.ParquetWriter(self.path_out, schema) as writer:
             for idx, (df, _) in enumerate(self.chunks):
                 if self.verbose:

{toolsos-0.2.3 → toolsos-0.2.5}/src/toolsos/database/database_connection.py

@@ -2,8 +2,10 @@ from __future__ import annotations
 
 import getpass
 import json
+import os
 import subprocess
 from json import JSONDecodeError
+from pathlib import Path
 from typing import Optional
 
 import keyring
@@ -99,18 +101,55 @@ def get_azure_access_token():
         subprocess.run("az login", shell=True)
 
 
-if __name__ == "__main__":
-    ...
-    # Examples
+def get_token_from_pgpass() -> None:
+    p = Path(os.getenv("APPDATA")) / "postgresql" / "pgpass.conf"
+    with open(p) as f:
+        token = f.readline().split(":")[4]
 
-    # Get database connection settings from yaml
-    engine_strings = get_db_connection_strings(
-        "src/toolsos/database/database_config.yml"
-    )
-    print(engine_strings.ruimte_analyse222)
+    return token
 
-    # Get database connection settings from yaml and reset password
-    engine_strings = get_db_connection_strings(
-        "src/toolsos/database/database_config.yml", reset_pw=["ruimte_analyse222"]
-    )
-    print(engine_strings.ruimte_analyse222)
+
+def write_pgpass(
+    host: str, port: str, database: str, user: str, path: str | None = None
+) -> None:
+    password = get_azure_access_token()
+    conn_string = f"{host}:{port}:{database}:{user}:{password}"
+
+    if not path:
+        if os.name == "nt":
+            path = Path(os.getenv("APPDATA")) / "postgresql" / "pgpass.conf"
+        else:
+            path = Path("$home/.pgpass")
+
+    if not path.parent.exists():
+        path.parent.mkdir()
+
+    with open(path, "w") as f:
+        f.write(conn_string)
+
+    if os.name != "nt":
+        path.chmod("0600")
+
+
+def write_multiple_pgpass(conn_details, path: str | None = None):
+    password = get_azure_access_token()
+
+    conn_strings = []
+    for c in conn_details:
+        c_string = f'{c["host"]}:{c["port"]}:{c["database"]}:{c["user"]}:{password}'
+        conn_strings.append(c_string)
+
+    if not path:
+        if os.name == "nt":
+            path = Path(os.getenv("APPDATA")) / "postgresql" / "pgpass.conf"
+        else:
+            path = Path("$home/.pgpass")
+
+    if not path.parent.exists():
+        path.parent.mkdir()
+
+    with open(path, "w") as f:
+        f.writelines(line + "\n" for line in conn_strings)
+
+    if os.name != "nt":
+        path.chmod("0600")

{toolsos-0.2.3 → toolsos-0.2.5}/src/toolsos/geo.py

@@ -17,7 +17,7 @@ def get_geo_json(
     Returns:
         dict[str, str]: geo json containg of the desired level and year
     """
-    base_url = "https://gitlab.com/os-amsterdam/datavisualisatie-onderzoek-en-statistiek/-/raw/main/geo/"
+    base_url = "https://gitlab.com/os-amsterdam/datavisualisatie-onderzoek-en-statistiek/-/raw/main/public/geo/"
 
     if mra:
         level = f"{level}-mra"

{toolsos-0.2.3 → toolsos-0.2.5}/src/toolsos/huisstijl/graphs/bargraph.py

@@ -1,4 +1,5 @@
 import plotly.express as px
+
 from .styler import BaseStyle
 
 basestyle = BaseStyle()
@@ -14,6 +15,7 @@ def bar(
     barmode=None,
     width=750,
     height=490,
+    font="Amsterdam Sans",
     **kwargs,
 ):
     fig = px.bar(
@@ -21,7 +23,7 @@ def bar(
         x=x,
         y=y,
         color=color,
-        template=basestyle.get_base_template("bar", orientation=orientation),
+        template=basestyle.get_base_template("bar", orientation=orientation, font=font),
         width=width,
         color_discrete_sequence=color_discrete_sequence,
         height=height,
@@ -43,6 +45,7 @@ def stacked_single(
     color: str = None,
     color_discrete_sequence: list = None,
     orientation="v",
+    font="Amsterdam Sans",
     **kwargs,
 ):
     fig = bar(
@@ -53,6 +56,7 @@ def stacked_single(
         color_discrete_sequence=color_discrete_sequence,
         barmode="relative",
         orientation=orientation,
+        font=font,
         **kwargs,
     )
 
@@ -71,6 +75,7 @@ def stacked_multiple(
     color: str = None,
     color_discrete_sequence: list = None,
     orientation="v",
+    font="Amsterdam Sans",
     **kwargs,
 ):
     fig = bar(
@@ -81,6 +86,7 @@ def stacked_multiple(
         color_discrete_sequence=color_discrete_sequence,
         barmode="stack",
         orientation=orientation,
+        font=font,
         **kwargs,
     )
 
@@ -94,6 +100,7 @@ def grouped(
     color: str = None,
     color_discrete_sequence: list = None,
     orientation="v",
+    font="Amsterdam Sans",
     **kwargs,
 ):
     fig = bar(
@@ -104,6 +111,7 @@ def grouped(
         color_discrete_sequence=color_discrete_sequence,
         barmode="group",
         orientation=orientation,
+        font=font,
         **kwargs,
     )
 
@@ -116,6 +124,7 @@ def single(
     y: str,
     color_discrete_sequence: list = None,
     orientation="v",
+    font="Amsterdam Sans",
     **kwargs,
 ):
     fig = bar(
@@ -124,6 +133,7 @@ def single(
         y=y,
         color_discrete_sequence=color_discrete_sequence,
         orientation=orientation,
+        font=font,
         **kwargs,
     )
 

{toolsos-0.2.3 → toolsos-0.2.5}/src/toolsos/huisstijl/graphs/graph_styles.py

@@ -16,8 +16,10 @@ STYLE_OLD = {
 
 STYLE_NEW = {
     "font_bold": {"family": "Amsterdam Sans ExtraBold, Corbel", "size": 15},
+    "font_bold_corbel": {"family": "Corbel Bold", "size": 15},
     "font": {"family": "Amsterdam Sans, Corbel", "size": 15},
-    "axis_font": {"family": font, "size": 15},
+    "font_corbel": {"family": "Corbel", "size": 15},
+    "axis_font": {"family": "Amsterdam Sans ExtraBold, Corbel", "size": 15},
     "plot_bgcolor": "#FFFFFF",
     "gridline_color": "#dbdbdb",
     "gridline_width": 0.75,

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

@@ -13,6 +13,7 @@ def line(
     width=750,
     height=490,
     color_discrete_sequence=None,
+    font="Amsterdam Sans",
     **kwargs,
 ):
     fig = px.line(
@@ -23,7 +24,7 @@ def line(
         width=width,
         height=height,
         color_discrete_sequence=color_discrete_sequence,
-        template=BaseStyle().get_base_template(graph_type="line"),
+        template=BaseStyle().get_base_template(graph_type="line", font=font),
         **kwargs,
     )
 

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

@@ -14,6 +14,7 @@ def pie(
     height=490,
     text_format: str = None,
     color_discrete_sequence=None,
+    font="Amsterdam Sans",
     **kwargs,
 ):
     fig = px.pie(
@@ -23,7 +24,7 @@ def pie(
         width=width,
         height=height,
         hole=hole,
-        template=BaseStyle().get_base_template(),
+        template=BaseStyle().get_base_template(font=font),
         color_discrete_sequence=color_discrete_sequence,
         **kwargs,
     )

{toolsos-0.2.3 → toolsos-0.2.5}/src/toolsos/huisstijl/graphs/styler.py

@@ -109,7 +109,6 @@ class BaseStyle:
                 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"],
@@ -121,29 +120,37 @@ class BaseStyle:
             "showgrid": self.style["showgrid"],
         }
 
-    def _get_base_template_layout(self):
+    def _get_base_template_layout(self, font):
+        if font == "Amsterdam Sans":
+            font_ = self.style["font"]
+            font_bold_ = self.style["font_bold"]
+        elif font == "Corbel":
+            font_ = self.style["font_corbel"]
+            font_bold_ = self.style["font_bold_corbel"]
+        else:
+            raise ValueError("Font should be 'Amsterdam Sans' or 'Corbel'")
+
         return go.layout.Template(
             layout={
-                # "font": self.styles["font_bold"],
                 "xaxis": {
-                    "tickfont": self.style["font_bold"],
+                    "tickfont": font_bold_,
                 },
                 "yaxis": {
-                    "tickfont": {
-                        "family": self.style["axis_font"]["family"],
-                        "size": self.style["axis_font"]["size"],
-                    },
+                    "tickfont": font_bold_,
                 },
-                "legend": {"font": self.style["font"]},
+                "legend": {"font": 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"],
+                "separators": ",",
+                "font": font_bold_,
             }
         )
 
     def get_base_template(
-        self, graph_type: str = None, orientation: str = None, colors: str = None
+        self,
+        graph_type: str = None,
+        orientation: str = None,
+        colors: str = None,
+        font: str = "Amsterdam Sans",
     ):
         """[summary]
 
@@ -158,7 +165,7 @@ class BaseStyle:
         Returns:
             [type]: [description]
         """
-        base_template = self._get_base_template_layout()
+        base_template = self._get_base_template_layout(font)
         axis_format = self._get_axis_format()
 
         if graph_type == "bar":

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

@@ -56,6 +56,8 @@ def cols_to_str(df: pd.DataFrame) -> pd.DataFrame:
     Returns:
         pd.DataFrame: Dataframe with column names as strings
     """
+
+    # Multiindex columns are always strings and therefore can't be casted as string
     if df.columns.nlevels == 1:
         df.columns = df.columns.astype(str)
 
@@ -379,6 +381,7 @@ def write_to_worksheet(
     source: str | None = None,
     col_filter: bool | None = None,
     col_widths: list | None = None,
+    min_column_width: int | 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
@@ -423,7 +426,7 @@ def write_to_worksheet(
         _insert_source(ws, source, arr)
 
     if col_widths:
-        _set_column_widths(ws, col_widths)
+        _set_column_widths(ws, col_widths, min_column_width)
 
     if title:
         _insert_title(ws, title)
@@ -432,9 +435,16 @@ def write_to_worksheet(
         _merge_cells(ws, cells_to_merge, title)
 
 
-def _set_column_widths(ws: Any, col_widths: list[int]) -> None:
+def _set_column_widths(
+    ws: Any, col_widths: list[int], min_column_width: int | None
+) -> None:
     for idx, col_width in enumerate(col_widths):
         col_letter = get_column_letter(idx + 1)
+
+        if min_column_width:
+            if col_width < min_column_width:
+                col_width = min_column_width
+
         ws.column_dimensions[col_letter].width = col_width
 
 
@@ -493,6 +503,7 @@ def write_table(
     blue_border_row_ids: int | list[int] | None = None,
     number_format: str = "0.0",
     autofit_columns: str | None = "column_names",
+    min_column_width: int | None = None,
     col_filter: bool | None = False,
     style: str = "old",
     combine_multiindex: bool | int = False,
@@ -508,9 +519,6 @@ def write_table(
         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,
@@ -534,6 +542,7 @@ def write_table(
             blue_border_row_ids=blue_border_row_ids,
             number_format=number_format,
             autofit_columns=autofit_columns,
+            min_column_width=min_column_width,
             col_filter=col_filter,
             combine_multiindex=combine_multiindex,
             column_names_to_string=column_names_to_string,
@@ -582,6 +591,7 @@ def format_worksheet(
     blue_border_row_ids: int | list[int] | None = None,
     number_format: str = "0.0",
     autofit_columns: str | None = "column_names",
+    min_column_width: int | None = None,
     col_filter: bool | None = False,
     combine_multiindex: bool | int = False,
     column_names_to_string: bool = True,
@@ -607,6 +617,9 @@ 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:
+        df = cols_to_str(df)
+
     arr = df_to_array(df)
 
     blue_rows = []
@@ -711,4 +724,5 @@ def format_worksheet(
         col_filter=col_filter,
         col_widths=col_widths,
         cells_to_merge=cells_to_merge,
+        min_column_width=min_column_width,
     )

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: toolsos
-Version: 0.2.3
+Version: 0.2.5
 Summary: OS tools
 Author-email: OS <d.schmitz@amsterdam.nl>
 Keywords: tools,Onderzoek & Statistiek
@@ -63,5 +63,12 @@ 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
+- first update twine: py -m pip install --upgrade twine
 - upload to pypi: twine upload dist/* --skip-existing
+
+## Install to local enviroment for testing
+
+- python -m venv local (maak een lokale venv aan)
+- local\Scripts\activate (activeer de venv)
+- pip install -e . (installer toolsos)
+- pip install -r local_requirements.txt (installeer de benodigde dependencies)