pandas-plots 0.12.18__tar.gz → 0.12.20__tar.gz

{pandas_plots-0.12.18/src/pandas_plots.egg-info → pandas_plots-0.12.20}/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pandas-plots
-Version: 0.12.18
+Version: 0.12.20
 Summary: A collection of helper for table handling and visualization
 Home-page: https://github.com/smeisegeier/pandas-plots
 Author: smeisegeier
 Author-email: dexterDSDo@googlemail.com
-License: MIT License
+License: MIT
 Project-URL: Documentation, https://github.com/smeisegeier/pandas-plots
 Project-URL: Source Code, https://github.com/smeisegeier/pandas-plots
 Project-URL: Bug Tracker, https://github.com/smeisegeier/pandas-plots/issues
@@ -32,6 +32,7 @@ Requires-Dist: duckdb>=1.0.0
 Requires-Dist: kaleido>=0.2.0
 Requires-Dist: nbformat>=4.2.0
 Requires-Dist: dataframe_image>=0.2.6
+Dynamic: license-file
 
 # pandas-plots
 

{pandas_plots-0.12.18 → pandas_plots-0.12.20}/setup.cfg

@@ -1,12 +1,12 @@
 [metadata]
 name = pandas-plots
-version = 0.12.18
+version = 0.12.20
 author = smeisegeier
 author_email = dexterDSDo@googlemail.com
 description = A collection of helper for table handling and visualization
 long_description = file: README.md
 long_description_content_type = text/markdown
-license = MIT License
+license = MIT
 license_files = LICENSE
 url = https://github.com/smeisegeier/pandas-plots
 project_urls = 

{pandas_plots-0.12.18 → pandas_plots-0.12.20}/src/pandas_plots/hlp.py

@@ -522,33 +522,45 @@ def find_cols(all_cols: list[str], stubs: list[str] = None) -> list[str]:
 # * extend objects to enable chaining
 pd.DataFrame.find_cols = find_cols
 
-def add_measures_to_pyg_config(json_path: str, nodes: list[tuple[str, str]]) -> None:
+
+def add_measures_to_pyg_config(json_path: str, nodes: list[tuple[str, str]] = [("cnt_tum", "count(distinct z_tum_id)")], strict: bool = False) -> None:
     """
-    Reads a pygwalker json config file, adds new measures from given nodes if not already present, and writes back to the file.
+    Reads a pygwalker JSON config file, adds new measures from given nodes if not already present, and writes back to the file.
 
     Parameters
     ----------
     json_path : `str`
-        The path to the pyg_json config file.
-    nodes : `list[tuple[str, str]]`
-        A list of tuples, where the first element in the tuple is the name of the measure and the second element is the SQL expression that defines the measure.
+        The path to the pygwalker JSON config file.
+    nodes : `list[tuple[str, str]]`, optional
+        A list of tuples, where the first element in the tuple is the name of the measure and the second element is the SQL expression that defines the measure. Default is `[('cnt_tum', 'count(distinct z_tum_id)')]`.
+    strict : `bool`, optional
+        If True, raises an error if the file does not exist or if JSON parsing fails. If False, the function exits silently in such cases. Default is False.
 
     Returns
     -------
     None
-    
+
     Example
     -------
-    `node = [("cnt_tum", "count(distinct z_tum_id)")]`
+    `add_measures_to_pyg_config('config.json', [('cnt_tum', 'count(distinct z_tum_id)')], strict=True)`
     """
-    
-    with open(json_path, "r", encoding="utf-8") as file:
-        config = json.load(file)
+    if not os.path.exists(json_path):
+        if strict:
+            raise FileNotFoundError(f"File not found: {json_path}")
+        return
+
+    try:
+        with open(json_path, "r", encoding="utf-8") as file:
+            config = json.load(file)
+    except json.JSONDecodeError:
+        if strict:
+            raise
+        return
 
     for node in nodes:
         fid = uuid.uuid4().hex
         
-        # Define the measure
+        # * Define the measure
         new_json_node = {
             "analyticType": "measure",
             "fid": f"{fid}",
@@ -563,13 +575,13 @@ def add_measures_to_pyg_config(json_path: str, nodes: list[tuple[str, str]]) ->
             }
         }
 
-        # Get the measures list
-        measures = config["config"][0]["encodings"]["measures"]
+        # * Get the measures list
+        measures = config.get("config", [{}])[0].get("encodings", {}).get("measures", [])
 
-        # Ensure the measure is present
+        # * Ensure the measure is present
         if not any(measure.get("name") == node[0] for measure in measures):
             measures.append(new_json_node)
 
-    # Write the updated JSON back to the file
+    # * Write the updated JSON back to the file
     with open(json_path, "w", encoding="utf-8") as file:
         json.dump(config, file, indent=2)

{pandas_plots-0.12.18 → pandas_plots-0.12.20}/src/pandas_plots/pls.py

@@ -340,7 +340,7 @@ def plot_stacked_bars(
     _title_str_top_index = f"TOP{top_n_index} " if top_n_index > 0 else ""
     _title_str_top_color = f"TOP{top_n_color} " if top_n_color > 0 else ""
     _title_str_null = f", NULL excluded" if dropna else ""
-    _title_str_n = f", n={n:_}"
+    _title_str_n = f", n={len(df):_} ({n:_})"
 
     _df = df.copy().assign(facet=None)
     _df.columns = (
@@ -653,7 +653,7 @@ def plot_bars(
 
     # * title str n
     _title_str_n = (
-        f", n={n:_}" if not use_ci else f", n={n_len:_}<br><sub>ci(95) on means<sub>"
+        f", n={n_len:_} ({n:_})" if not use_ci else f", n={n_len:_})<br><sub>ci(95) on means<sub>"
     )
 
     # * title str na
@@ -1325,6 +1325,8 @@ def plot_facet_stacked_bars(
         df["value"] = 1
     elif df.shape[1] == 4:
         df.columns = ["index", "col", "facet", "value"]
+    
+    n = df["value"].sum()
 
     aggregated_df = aggregate_data(
         df,
@@ -1427,7 +1429,7 @@ def plot_facet_stacked_bars(
     else:
         axis_details.append(f"[{original_column_names[2]}]")
 
-    title = f"{caption} {', '.join(axis_details)}, n = {original_rows:_}"
+    title = f"{caption} {', '.join(axis_details)}, n = {original_rows:_} ({n:_})"
     template = "plotly_dark" if os.getenv("THEME") == "dark" else "plotly"
     
     fig.update_layout(

{pandas_plots-0.12.18 → pandas_plots-0.12.20/src/pandas_plots.egg-info}/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pandas-plots
-Version: 0.12.18
+Version: 0.12.20
 Summary: A collection of helper for table handling and visualization
 Home-page: https://github.com/smeisegeier/pandas-plots
 Author: smeisegeier
 Author-email: dexterDSDo@googlemail.com
-License: MIT License
+License: MIT
 Project-URL: Documentation, https://github.com/smeisegeier/pandas-plots
 Project-URL: Source Code, https://github.com/smeisegeier/pandas-plots
 Project-URL: Bug Tracker, https://github.com/smeisegeier/pandas-plots/issues
@@ -32,6 +32,7 @@ Requires-Dist: duckdb>=1.0.0
 Requires-Dist: kaleido>=0.2.0
 Requires-Dist: nbformat>=4.2.0
 Requires-Dist: dataframe_image>=0.2.6
+Dynamic: license-file
 
 # pandas-plots