tesorotools-python 0.0.14__tar.gz → 0.0.15__tar.gz

{tesorotools_python-0.0.14 → tesorotools_python-0.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tesorotools-python
-Version: 0.0.14
+Version: 0.0.15
 Requires-Dist: babel
 Requires-Dist: eikon
 Requires-Dist: lseg-data

{tesorotools_python-0.0.14 → tesorotools_python-0.0.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tesorotools-python"
-version = "0.0.14"
+version = "0.0.15"
 dependencies = ["psycopg2", "SQLAlchemy", "pandas", "matplotlib", "pyarrow", "python-docx", "openpyxl", "PyYAML", "babel", "eikon", "lseg-data"]
 
 [build-system]

{tesorotools_python-0.0.14 → tesorotools_python-0.0.15}/tesorotools/convert.py

@@ -37,13 +37,19 @@ def cheap_convert(old_file: Path) -> pd.DataFrame:
     trimmed = old.loc[(slice(None), "no", "absolute", "value"), :].copy()
 
     old = old.loc[
-        (slice(None), ["day", "mtd", "week", "year"], slice(None), slice(None)),
+        (
+            slice(None),
+            ["day", "mtd", "week", "year", "tariff_crisis"],
+            slice(None),
+            slice(None),
+        ),
         :,
     ]
     old.index = index_replace("day", "bday", old.index)
     old.index = index_replace("week", "ftd", old.index)
     old.index = index_replace("year", "ytd", old.index)
     old.index = index_replace("roll_var", "roll_std", old.index)
+    old.index = index_replace("tariff_crisis", "2025-04-02", old.index)
 
     trimmed.index = index_replace("absolute", "no", trimmed.index)
 
@@ -52,7 +58,7 @@ def cheap_convert(old_file: Path) -> pd.DataFrame:
 
 
 if __name__ == "__main__":
-    preprocess = False
+    preprocess = True
     barh_config_dicts = read_config(Path("examples") / "barh_plots.yaml")
     line_config_dicts = read_config(Path("examples") / "line_plots.yaml")
     type_config_dicts = read_config(Path("examples") / "type_curves.yaml")
@@ -81,7 +87,7 @@ if __name__ == "__main__":
             independent_full_df,
             dependent_trimmed_df,
             offsets_config,
-            force_trim=True,
+            # force_trim=True,
         )
         full_df.to_feather("derivates.feather")
 

{tesorotools_python-0.0.14 → tesorotools_python-0.0.15}/tesorotools/render/__init__.py

@@ -1,7 +1,9 @@
 from tesorotools.render.content.images import Image, Images
 from tesorotools.render.content.section import Section
+from tesorotools.render.content.subtitle import Subtitle
 from tesorotools.render.content.table import Table
 from tesorotools.render.content.text import Text
+from tesorotools.render.content.title import Title
 from tesorotools.render.report import Report
 from tesorotools.utils.template import TemplateLoader
 
@@ -11,3 +13,5 @@ TemplateLoader.add_constructor("!image", Image.from_yaml)
 TemplateLoader.add_constructor("!images", Images.from_yaml)
 TemplateLoader.add_constructor("!table", Table.from_yaml)
 TemplateLoader.add_constructor("!text", Text.from_yaml)
+TemplateLoader.add_constructor("!title", Title.from_yaml)
+TemplateLoader.add_constructor("!subtitle", Subtitle.from_yaml)

tesorotools_python-0.0.14/tesorotools/render/introduction.py → tesorotools_python-0.0.15/tesorotools/render/content/subtitle.py

@@ -3,18 +3,22 @@ from typing import Any, Self
 
 from babel.dates import format_datetime
 from docx.document import Document
+from yaml import MappingNode
 
+from tesorotools.utils.config import TemplateLoader
 
-class Introduction:
+
+class Subtitle:
     def __init__(self, date_time: datetime | None = None) -> None:
         if date_time is None:
             date_time: datetime = datetime.now()
         self._date_time: datetime = date_time
 
     @classmethod
-    def from_dict(cls, introduction_cfg: dict[str, Any]) -> Self:
+    def from_yaml(cls, loader: TemplateLoader, node: MappingNode) -> Self:
+        subtitle_cfg: dict[str, Any] = loader.construct_mapping(node, deep=True)
         # parse date
-        date_cfg: str | date | None = introduction_cfg.get("date", None)
+        date_cfg: str | date | None = subtitle_cfg.get("date", None)
         if date_cfg is None:
             date_time: datetime = datetime.now()
         elif isinstance(date_cfg, date):
@@ -23,7 +27,7 @@ class Introduction:
             date_time: datetime = datetime.strptime(date_cfg, "%Y-%m-%d")
 
         # parse hour
-        hour_cfg: str | None = introduction_cfg.get("hour", None)
+        hour_cfg: str | None = subtitle_cfg.get("hour", None)
         if hour_cfg is not None:
             hour_str, minute_str = hour_cfg.split(sep=":")
             date_time = date_time.replace(

{tesorotools_python-0.0.14 → tesorotools_python-0.0.15}/tesorotools/render/content/table.py

@@ -4,12 +4,12 @@ from typing import Any, Self
 import numpy as np
 import pandas as pd
 from docx.document import Document
-from docx.enum.table import WD_ALIGN_VERTICAL
+from docx.enum.table import WD_ALIGN_VERTICAL, WD_TABLE_ALIGNMENT
 from docx.enum.text import WD_ALIGN_PARAGRAPH
 from docx.oxml import OxmlElement, parse_xml
 from docx.oxml.ns import nsdecls, qn
 from docx.shared import Inches, Pt, RGBColor
-from docx.table import Table
+from docx.table import Table as TableDocx
 from docx.table import _Cell as TableCell
 from yaml import MappingNode
 
@@ -69,7 +69,7 @@ def _style_horizontal_blocks_header(cell: TableCell):
     cell.paragraphs[0].runs[0].font.size = Pt(12)
 
 
-def _horizontal_blocks_header(columns: pd.MultiIndex, table_docx: Table):
+def _horizontal_blocks_header(columns: pd.MultiIndex, table_docx: TableDocx):
     column_counter: int = 1
     blocks: list[str] = list(columns.get_level_values(level=0).unique())
     for block in blocks:
@@ -92,7 +92,7 @@ def _style_column_names(cell: TableCell):
 
 
 def _fill_column_names(
-    table: pd.DataFrame, table_docx: Table, horizontal: bool
+    table: pd.DataFrame, table_docx: TableDocx, horizontal: bool
 ):
     if horizontal:
         start_row: int = 1
@@ -115,13 +115,13 @@ def _style_index_names(cell: TableCell):
 
 
 def _fill_index_names(
-    index: pd.Index | pd.MultiIndex, table_docx: Table, horizontal: bool
+    index: pd.Index | pd.MultiIndex, table_docx: TableDocx, horizontal: bool
 ):
     start_row: int = 2 if horizontal else 1
 
     index_names: pd.Index = (
         index
-        if (horizontal or isinstance(index, pd.Index))
+        if (horizontal or (not isinstance(index, pd.MultiIndex)))
         else index.get_level_values(level=1)
     )
 
@@ -132,7 +132,7 @@ def _fill_index_names(
 
 
 # we only separate blocks in vertically stacked tables
-def _separate_blocks(index: pd.MultiIndex, table_docx: Table):
+def _separate_blocks(index: pd.MultiIndex, table_docx: TableDocx):
     blocks: list[str] = list(index.get_level_values(level=0).unique())
     previous_rows = 0
     for block in blocks[:-1]:
@@ -186,7 +186,7 @@ def _fill_content(
     table: pd.DataFrame,
     color_table: pd.DataFrame,
     shade_table: pd.DataFrame,
-    table_docx: Table,
+    table_docx: TableDocx,
     horizontal: bool,
 ):
     start_row: int = 2 if horizontal else 1
@@ -209,7 +209,7 @@ def _fill_content(
         _style_content(cell)
 
 
-def _style_table(table_docx: Table):
+def _style_table(table_docx: TableDocx):
     table_docx.style = RENDER_CONFIG.get("style", None)
     table_docx.autofit = RENDER_CONFIG["autofit"]
 
@@ -221,10 +221,10 @@ def render_table(
     document: Document,
     block_sep: bool,
     **kwargs,
-) -> Table:
+) -> TableDocx:
 
     horizontal: bool = isinstance(table.columns, pd.MultiIndex)
-    table_docx: Table = document.add_table(
+    table_docx: TableDocx = document.add_table(
         rows=len(table.index) + table.columns.nlevels,
         cols=len(table.columns) + 1,
     )
@@ -237,6 +237,7 @@ def render_table(
     if block_sep:
         _separate_blocks(table.index, table_docx)
     _fill_content(table, color_table, shade_table, table_docx, horizontal)
+    table_docx.alignment = WD_TABLE_ALIGNMENT.CENTER
     return document
 
 
@@ -274,7 +275,15 @@ class Table:
         table_cfg: dict[str, Any] = loader.construct_mapping(node, deep=True)
         root_path: Path = loader.imports["table"]
         file_prefix: str = table_cfg.pop("id")
-        data_file: Path = root_path / f"{file_prefix}_data.feather"
+
+        # the data file has an optional "_data" suffix
+        # if a file with the suffix exists, it will be preferred
+        data_file_suffix: Path = root_path / f"{file_prefix}_data.feather"
+        if data_file_suffix.exists():
+            data_file: Path = data_file_suffix
+        else:
+            data_file: Path = root_path / f"{file_prefix}.feather"
+
         color_file: Path = root_path / f"{file_prefix}_color.feather"
         shade_file: Path = root_path / f"{file_prefix}_shade.feather"
         return cls(

tesorotools_python-0.0.14/tesorotools/render/headline.py → tesorotools_python-0.0.15/tesorotools/render/content/title.py

@@ -1,9 +1,12 @@
 from typing import Any, Self
 
 from docx.document import Document
+from yaml import MappingNode
 
+from tesorotools.utils.config import TemplateLoader
 
-class HeadLine:
+
+class Title:
     def __init__(
         self, title: str | None = None, comment: str | None = None
     ) -> None:
@@ -11,9 +14,10 @@ class HeadLine:
         self._comment: str = "" if comment is None else comment
 
     @classmethod
-    def from_dict(cls, headline_cfg: dict[str, Any]) -> Self:
-        title: str | None = headline_cfg.get("title", None)
-        comment: str | None = headline_cfg.get("comment", None)
+    def from_yaml(cls, loader: TemplateLoader, node: MappingNode) -> Self:
+        title_cfg: dict[str, Any] = loader.construct_mapping(node, deep=True)
+        title: str | None = title_cfg.get("title", None)
+        comment: str | None = title_cfg.get("comment", None)
         return cls(title, comment)
 
     def render(self, document: Document) -> Document:
@@ -31,10 +35,6 @@ class HeadLine:
     def title(self) -> str:
         return self._title
 
-    @title.setter
-    def title(self, title) -> None:
-        self._title = title
-
     @property
     def comment(self) -> str:
         return self._comment

{tesorotools_python-0.0.14 → tesorotools_python-0.0.15}/tesorotools/render/report.py

@@ -4,6 +4,7 @@ from docx.document import Document
 from yaml import Loader, MappingNode
 
 from tesorotools.render.content.content import Content
+from tesorotools.render.content.title import Title
 
 
 class Report:
@@ -25,5 +26,6 @@ class Report:
         document._body.clear_content()
         for _, content in self.contents.items():
             content.render(document)
-            document.add_paragraph()
+            if not isinstance(content, Title):
+                document.add_paragraph()
         return document