tesorotools-python 0.0.30__tar.gz → 0.0.31__tar.gz

{tesorotools_python-0.0.30 → tesorotools_python-0.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tesorotools-python
-Version: 0.0.30
+Version: 0.0.31
 Requires-Python: >=3.13
 Requires-Dist: babel>=2.17
 Requires-Dist: eikon>=1.1

{tesorotools_python-0.0.30 → tesorotools_python-0.0.31}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "tesorotools-python"
 requires-python = ">=3.13"
-version = "0.0.30"
+version = "0.0.31"
 dependencies = [
     # database and ORM
     "psycopg[binary]>=3.1",

{tesorotools_python-0.0.30 → tesorotools_python-0.0.31}/src/tesorotools/artists/line_plot.py

@@ -102,11 +102,17 @@ def annotate_last_values(
     *,
     decimals: int,
     units: str,
+    labels: dict[str, str] | None = None,
     series_styles: dict[str, dict[str, Any]] | None = None,
     annotate_color: str | None = None,
 ) -> None:
     """Label the last non-NaN value of each column on the right.
 
+    ``plot_data.columns`` and ``series_styles`` keys must be
+    canonical series IDs.  ``labels`` maps each ID to the
+    Matplotlib line label used when the axes were drawn; if
+    omitted, the ID itself is used as the line label.
+
     Colour priority (highest first): ``annotate_color``
     (global override), ``series_styles[col]['color']``,
     the Matplotlib line colour.
@@ -120,6 +126,7 @@ def annotate_last_values(
     if fig is None:
         return
     styles = series_styles or {}
+    label_map = labels or {}
 
     lines_by_label = {str(line.get_label()): line for line in ax.lines}
     entries: list[tuple[Any, float, str, Any]] = []
@@ -136,7 +143,7 @@ def annotate_last_values(
             if override is not None:
                 color = override
             else:
-                line = lines_by_label.get(col)
+                line = lines_by_label.get(label_map.get(col, col))
                 color = line.get_color() if line is not None else "black"
         entries.append((last_date, last_val, col, color))
 
@@ -454,7 +461,6 @@ class LinePlot:
         plot_data: pd.DataFrame = self.data.loc[
             slice(start_date, end_date), self.series.keys()
         ]
-        plot_data = plot_data.rename(columns=self.series)
 
         plot_data = plot_data * self.scale
 
@@ -468,12 +474,10 @@ class LinePlot:
             **fig_kw
         )
         ax = fig.add_subplot()
-        if self.series_styles:
-            for col in plot_data.columns:
-                style = self.series_styles.get(col, {})
-                plot_data[col].plot(ax=ax, label=col, **style)
-        else:
-            plot_data.plot(ax=ax)
+        styles = self.series_styles
+        for col in plot_data.columns:
+            style = styles.get(col, {}) if styles else {}
+            plot_data[col].plot(ax=ax, label=self.series[col], **style)
 
         assert self.format is not None
         if self.annotate:
@@ -482,6 +486,7 @@ class LinePlot:
                 plot_data,
                 decimals=self.format.decimals,
                 units=self.format.units,
+                labels=self.series,
                 series_styles=self.series_styles,
                 annotate_color=self.annotate_color,
             )
@@ -497,7 +502,7 @@ class LinePlot:
             style_baseline(ax, reference, **AX_CONFIG["baseline"])
 
         if self.legend is not None:
-            labels = list(plot_data.columns)
+            labels = [self.series[c] for c in plot_data.columns]
             ncol = (
                 self.legend.ncol
                 if self.legend.ncol is not None

{tesorotools_python-0.0.30 → tesorotools_python-0.0.31}/src/tesorotools/artists/stacked.py

@@ -84,7 +84,8 @@ class StackedAreaPlot:
             else self.data.index.max()
         )
 
-        plot_data = self.data.loc[start:end, list(self.series.keys())].dropna()
+        plot_data = self.data.loc[start:end, list(self.series.keys())]
+        plot_data = plot_data.dropna(how="all").fillna(0)
         plot_data = plot_data * self.scale
 
         fig_kw = dict(FIG_CONFIG)
@@ -211,7 +212,8 @@ class StackedBarPlot:
             else self.data.index.max()
         )
         all_cols = list(self.series.keys()) + list(self.overlay_series.keys())
-        plot_data = self.data.loc[start:end, all_cols].dropna()
+        plot_data = self.data.loc[start:end, all_cols]
+        plot_data = plot_data.dropna(how="all").fillna(0)
         return plot_data * self.scale
 
     def _format_xticks(

{tesorotools_python-0.0.30 → tesorotools_python-0.0.31}/src/tesorotools/pipeline/rules.py

@@ -45,6 +45,21 @@ def sum_rule(output: str, sources: list[str]) -> TransformationRule:
     )
 
 
+def mean_rule(output: str, sources: list[str]) -> TransformationRule:
+    """Row-wise arithmetic mean of multiple columns.
+
+    Equivalent to ``=AVERAGE(...)`` in Excel: NaN components
+    are skipped (not treated as zero), so a row with any
+    non-NaN value yields the mean of whatever is present.
+    A row of all NaN yields NaN.
+    """
+    return TransformationRule(
+        output_name=output,
+        dependencies=list(sources),
+        compute=lambda df, cols=list(sources): df[cols].mean(axis=1),
+    )
+
+
 def ratio_rule(
     output: str, numerator: str, denominator: str
 ) -> TransformationRule:
@@ -333,6 +348,7 @@ FACTORIES: dict[
 ] = {
     "scale": scale_rule,
     "sum": sum_rule,
+    "mean": mean_rule,
     "ratio": ratio_rule,
     "difference": difference_rule,
     "inverse": inverse_rule,