toolsos 0.2.2__tar.gz → 0.2.4__tar.gz

{toolsos-0.2.2 → toolsos-0.2.4}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: toolsos
-Version: 0.2.2
+Version: 0.2.4
 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.2 → toolsos-0.2.4}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "toolsos"
-version = "0.2.2"
+version = "0.2.4"
 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.2 → toolsos-0.2.4}/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,6 +101,63 @@ def get_azure_access_token():
         subprocess.run("az login", shell=True)
 
 
+def get_token_from_pgpass() -> None:
+    p = Path(os.getenv("APPDATA")) / "postgresql" / "pgpass.conf"
+    with open(p) as f:
+        token = f.readline().split(":")[4]
+
+    return token
+
+
+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")
+
+
+# Writing connection settings to pgpass.conf
+
+
 if __name__ == "__main__":
     ...
     # Examples

{toolsos-0.2.2 → toolsos-0.2.4}/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.2 → toolsos-0.2.4}/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.2 → toolsos-0.2.4}/src/toolsos/huisstijl/graphs/linegraph.py

@@ -5,7 +5,17 @@ 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,
+    font="Amsterdam Sans",
+    **kwargs,
+):
     fig = px.line(
         data_frame=data,
         x=x,
@@ -13,7 +23,8 @@ def line(data, x, y, color: None, width=750, height=490, **kwargs):
         color=color,
         width=width,
         height=height,
-        template=BaseStyle().get_base_template(graph_type="line"),
+        color_discrete_sequence=color_discrete_sequence,
+        template=BaseStyle().get_base_template(graph_type="line", font=font),
         **kwargs,
     )
 

{toolsos-0.2.2 → toolsos-0.2.4}/src/toolsos/huisstijl/graphs/piegraph.py

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

{toolsos-0.2.2 → toolsos-0.2.4}/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.2 → toolsos-0.2.4}/src/toolsos/huisstijl/tables/tables.py

@@ -379,6 +379,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 +424,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 +433,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 +501,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 +517,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 +540,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 +589,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 +615,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 +722,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.2 → toolsos-0.2.4}/src/toolsos.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: toolsos
-Version: 0.2.2
+Version: 0.2.4
 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"