wbreport 1.50.14__tar.gz → 1.58.3__tar.gz

{wbreport-1.50.14 → wbreport-1.58.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbreport
-Version: 1.50.14
+Version: 1.58.3
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 License-File: LICENSE
 Requires-Dist: wbcore

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/defaults/factsheets/base.py

@@ -22,7 +22,6 @@ from reportlab.platypus import (
     Flowable,
     NextPageTemplate,
     PageTemplate,
-    Paragraph,
     Spacer,
     Table,
     TableStyle,
@@ -33,6 +32,7 @@ from wbcore.utils.figures import (
     get_horizontal_barplot,
     get_piechart,
 )
+from wbcore.utils.reportlab import FormattedParagraph as Paragraph
 from wbportfolio.models.products import InvestmentIndex
 
 from wbreport.mixins import ReportMixin
@@ -199,7 +199,7 @@ class ReportClass(FactsheetReportMixin, ReportMixin):
         return template.render(context)
 
     @classmethod
-    def generate_file(cls, context):
+    def generate_file(cls, context):  # noqa: C901
         debug = False
         # Product Data
         # Main Feature table as dictionary
@@ -446,7 +446,7 @@ class ReportClass(FactsheetReportMixin, ReportMixin):
         # Price Timeseries Chart
         elements.append(
             get_timeseries_chart(
-                data=[list(zip(prices.index, prices.net_value))],
+                data=[list(zip(prices.index, prices.net_value, strict=False))],
                 width=CONTENT_WIDTH_PAGE1_LEFT - CONTENT_OFFSET,
                 height=4.34 * cm,
                 color=c_product,
@@ -467,7 +467,7 @@ class ReportClass(FactsheetReportMixin, ReportMixin):
                     "<strong>Top 3 Contributors</strong>",
                     "<strong>Bottom 3 Contributors</strong>",
                 ],
-                data=list(zip(top_3_holdings, top_3_contributors, bottom_3_contributors)),
+                data=list(zip(top_3_holdings, top_3_contributors, bottom_3_contributors, strict=False)),
                 width=CONTENT_WIDTH_PAGE1_LEFT,
                 header_row_height=0.85 * cm,
                 data_row_height=0.39 * cm,
@@ -636,7 +636,7 @@ class ReportClass(FactsheetReportMixin, ReportMixin):
 
             data = list()
             categories = list()
-            for index, row in enumerate(df.itertuples()):
+            for row in df.itertuples():
                 data.append(row.weighting * 100)
                 categories.append(f"{row.aggregated_title} ({row.weighting * 100:.1f}%)")
 

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/defaults/factsheets/multitheme.py

@@ -21,7 +21,6 @@ from reportlab.platypus import (
     BaseDocTemplate,
     NextPageTemplate,
     PageTemplate,
-    Paragraph,
     Spacer,
     Table,
     TableStyle,
@@ -32,6 +31,7 @@ from wbcore.utils.figures import (
     get_horizontal_barplot,
     get_piechart,
 )
+from wbcore.utils.reportlab import FormattedParagraph as Paragraph
 from wbportfolio.models.products import InvestmentIndex
 
 from wbreport.mixins import ReportMixin
@@ -199,7 +199,7 @@ class ReportClass(FactsheetReportMixin, ReportMixin):
         return template.render(context)
 
     @classmethod
-    def generate_file(cls, context):
+    def generate_file(cls, context):  # noqa: C901
         debug = False
 
         main_features_dict = context["information_table"]["Main Features"]
@@ -450,7 +450,7 @@ class ReportClass(FactsheetReportMixin, ReportMixin):
         # Price Timeseries Chart
         elements.append(
             get_timeseries_chart(
-                data=[list(zip(prices.index, prices.net_value))],
+                data=[list(zip(prices.index, prices.net_value, strict=False))],
                 width=CONTENT_WIDTH_PAGE1_LEFT - CONTENT_OFFSET,
                 height=4.34 * cm,
                 color=c_product,
@@ -471,7 +471,7 @@ class ReportClass(FactsheetReportMixin, ReportMixin):
                     "<strong>Top 3 Contributors</strong>",
                     "<strong>Bottom 3 Contributors</strong>",
                 ],
-                data=list(zip(top_3_holdings, top_3_contributors, bottom_3_contributors)),
+                data=list(zip(top_3_holdings, top_3_contributors, bottom_3_contributors, strict=False)),
                 width=CONTENT_WIDTH_PAGE1_LEFT,
                 header_row_height=0.85 * cm,
                 data_row_height=0.39 * cm,
@@ -639,7 +639,7 @@ class ReportClass(FactsheetReportMixin, ReportMixin):
 
             data = list()
             categories = list()
-            for index, row in enumerate(df.itertuples()):
+            for row in df.itertuples:
                 data.append(row.weighting * 100)
                 categories.append(f"{row.aggregated_title} ({row.weighting * 100:.1f}%)")
 

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/models.py

@@ -112,9 +112,9 @@ class ReportClass(WBModel):
         """
         if (len(args) == 3 and (class_path := args[2])) or (class_path := kwargs.get("class_path", None)):
             try:
-                if ReportClassModule := getattr(importlib.import_module(class_path), "ReportClass", None):
+                if class_module := getattr(importlib.import_module(class_path), "ReportClass", None):
                     for method in self.REPORT_CLASS_DEFAULT_METHODS:
-                        setattr(self, method, getattr(ReportClassModule, method))
+                        setattr(self, method, getattr(class_module, method))
             except ModuleNotFoundError:
                 for method in self.REPORT_CLASS_DEFAULT_METHODS:
                     setattr(self, method, lambda *a, **k: None)
@@ -674,6 +674,10 @@ class ReportVersion(models.Model):
         mass_mail.send()
         mass_mail.save()
 
+    @classmethod
+    def get_endpoint_basename(cls) -> str:
+        return "wbreport:reportversion"
+
     @classmethod
     def get_representation_endpoint(cls) -> str:
         return "wbreport:reportversionrepresentation-list"

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/pdf/charts/legend.py

@@ -4,7 +4,7 @@ from reportlab.lib.colors import transparent
 
 
 class CustomLegend(Legend):
-    def _defaultSwatch(self, x, thisy, dx, dy, fillColor, strokeWidth, strokeColor):
+    def _defaultSwatch(self, x, thisy, dx, dy, fillColor, strokeWidth, strokeColor):  # noqa: N803, N802
         return Circle(
             x,
             thisy + dx / 2,

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/pdf/charts/pie.py

@@ -2,6 +2,7 @@ from reportlab.graphics.charts.piecharts import Pie
 from reportlab.graphics.shapes import Drawing
 from reportlab.lib import colors
 from reportlab.lib.units import cm
+
 from wbreport.pdf.charts.legend import CustomLegend
 
 

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/pdf/charts/timeseries.py

@@ -17,7 +17,7 @@ class LogScaleTimeSeriesPlot(LinePlot):
         super().__init__()
 
         class CustomYAxis(LogYValueAxis):
-            def _calcTickPositions(self):
+            def _calcTickPositions(self):  # noqa: N802
                 return self._calcStepAndTickPositions()[1]
 
         self.xValueAxis = NormalDateXValueAxis()

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/pdf/flowables/risk.py

@@ -1,7 +1,8 @@
 from reportlab.lib.colors import HexColor, black, white
 from reportlab.lib.units import cm
 from reportlab.pdfbase.pdfmetrics import stringWidth
-from reportlab.platypus import Flowable, Paragraph
+from reportlab.platypus import Flowable
+from wbcore.utils.reportlab import FormattedParagraph as Paragraph
 
 
 class RiskScale(Flowable):

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/pdf/flowables/textboxes.py

@@ -2,8 +2,9 @@ from reportlab.graphics import renderPDF
 from reportlab.lib.colors import black
 from reportlab.lib.units import cm
 from reportlab.pdfbase.pdfmetrics import stringWidth
-from reportlab.platypus import Flowable, Image, Paragraph, Table, TableStyle
+from reportlab.platypus import Flowable, Image, Table, TableStyle
 from svglib.svglib import svg2rlg
+from wbcore.utils.reportlab import FormattedParagraph as Paragraph
 
 
 class TextBox(Flowable):

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/pdf/sandbox/templates/basic_factsheet.py

@@ -22,7 +22,6 @@ from reportlab.platypus import (
     Image,
     NextPageTemplate,
     PageTemplate,
-    Paragraph,
     Spacer,
     Table,
     TableStyle,
@@ -30,6 +29,8 @@ from reportlab.platypus import (
 from reportlab.platypus.flowables import KeepTogether, TopPadder
 from reportlab.platypus.frames import Frame
 from svglib.svglib import svg2rlg
+from wbcore.utils.reportlab import FormattedParagraph as Paragraph
+
 from wbreport.models import ReportAsset
 from wbreport.pdf.charts.pie import (
     get_pie_chart_horizontal,
@@ -43,7 +44,7 @@ from wbreport.pdf.tables.aggregated_tables import get_simple_aggregated_table
 from wbreport.pdf.tables.data_tables import get_simple_data_table
 
 
-def generate_report(context):
+def generate_report(context):  # noqa: C901
     debug = False
     ### Product Data ###
     # Main Feature table as dictionary
@@ -121,7 +122,7 @@ def generate_report(context):
     s_base_small_justified = ParagraphStyle(
         name="s_base_small_justified", parent=s_base, fontSize=6.5, leading=7, alignment=TA_JUSTIFY
     )
-    s_base_small_justified_indent = ParagraphStyle(
+    s_base_small_justified_indent = ParagraphStyle(  # noqa: F841
         name="s_base_small_justified_indent", parent=s_base_small_justified, leftIndent=CONTENT_OFFSET
     )
     s_base_indent = ParagraphStyle(name="s_description", parent=s_base, spaceBefore=8, leftIndent=CONTENT_OFFSET)
@@ -135,7 +136,7 @@ def generate_report(context):
     s_table_medium_leading = ParagraphStyle(name="s_table_medium_leading", parent=s_table_medium, leading=13.9)
     s_table_large = ParagraphStyle(name="s_table_large", parent=s_table_medium, fontSize=11, leading=11)
     s_table_large_center = ParagraphStyle(name="s_table_large", parent=s_table_large, alignment=TA_CENTER)
-    s_table_large_center_padding = ParagraphStyle(
+    s_table_large_center_padding = ParagraphStyle(  # noqa: F841
         name="s_table_large", parent=s_table_large_center, spaceBefore=20, spaceAfter=20
     )
     s_table_center = ParagraphStyle(
@@ -278,7 +279,7 @@ def generate_report(context):
         )
         return title_table
 
-    def impress(l):
+    def impress(elements):
         style = s_table_headline_2
         table_data = [
             [
@@ -306,7 +307,7 @@ def generate_report(context):
                 ]
             )
         )
-        l.append(KeepTogether(TopPadder(t)))
+        elements.append(KeepTogether(TopPadder(t)))
 
     # Description
     elements.append(generate_title(general_data["title"]))
@@ -334,7 +335,7 @@ def generate_report(context):
     # Price Timeseries Chart
     elements.append(
         get_timeseries_chart(
-            data=[list(zip(prices.index, prices.net_value))],
+            data=[list(zip(prices.index, prices.net_value, strict=False))],
             width=CONTENT_WIDTH_PAGE1_LEFT - CONTENT_OFFSET,
             height=4.34 * cm,
             color=c_product,
@@ -355,7 +356,7 @@ def generate_report(context):
                 "<strong>Top 3 Contributors</strong>",
                 "<strong>Bottom 3 Contributors</strong>",
             ],
-            data=list(zip(top_3_holdings, top_3_contributors, bottom_3_contributors)),
+            data=list(zip(top_3_holdings, top_3_contributors, bottom_3_contributors, strict=False)),
             width=CONTENT_WIDTH_PAGE1_LEFT,
             header_row_height=0.85 * cm,
             data_row_height=0.39 * cm,
@@ -557,7 +558,7 @@ def generate_report(context):
 
         data = list()
         categories = list()
-        for index, row in enumerate(df.itertuples()):
+        for row in df.itertuples():
             data.append(row.weighting * 100)
             categories.append(f"{row.aggregated_title} ({row.weighting*100:.1f}%)")
 
@@ -834,7 +835,7 @@ def generate_report(context):
 
     last_row_height = right_height - liquid_height - 0.85 * cm
 
-    last_height = min(
+    last_height = min(  # noqa: F841
         max(industry_height - liquid_height + 6, 3.564 * cm), max_available_height - liquid_height
     )  # 6 because of the drawn string
 

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/pdf/sandbox/templates/fund_factsheet.py

@@ -21,7 +21,6 @@ from reportlab.platypus import (
     BaseDocTemplate,
     Image,
     PageTemplate,
-    Paragraph,
     Spacer,
     Table,
     TableStyle,
@@ -29,6 +28,8 @@ from reportlab.platypus import (
 from reportlab.platypus.flowables import KeepTogether, TopPadder
 from reportlab.platypus.frames import Frame
 from svglib.svglib import svg2rlg
+from wbcore.utils.reportlab import FormattedParagraph as Paragraph
+
 from wbreport.models import ReportAsset
 from wbreport.pdf.charts.pie import (
     get_pie_chart_horizontal,
@@ -44,12 +45,12 @@ from wbreport.pdf.tables.aggregated_tables import (
 from wbreport.pdf.tables.data_tables import get_simple_data_table
 
 
-def generate_report(context):
+def generate_report(context):  # noqa: C901
     debug = False
 
     main_features_dict_tmp = context["information_table"]
     main_features_dict = {}
-    for k, v in main_features_dict_tmp.items():
+    for v in main_features_dict_tmp.values():
         main_features_dict.update(v)
     # Monthly returns table as dataframe, None is no value
     monthly_returns = context["monthly_returns"]
@@ -129,7 +130,7 @@ def generate_report(context):
     s_base_small_justified = ParagraphStyle(
         name="s_base_small_justified", parent=s_base, fontSize=6.5, leading=7, alignment=TA_JUSTIFY
     )
-    s_base_small_justified_indent = ParagraphStyle(
+    s_base_small_justified_indent = ParagraphStyle(  # noqa: F841
         name="s_base_small_justified_indent", parent=s_base_small_justified, leftIndent=CONTENT_OFFSET
     )
     s_base_indent = ParagraphStyle(name="s_description", parent=s_base, spaceBefore=8, leftIndent=CONTENT_OFFSET)
@@ -143,7 +144,7 @@ def generate_report(context):
     s_table_medium_leading = ParagraphStyle(name="s_table_medium_leading", parent=s_table_medium, leading=13.9)
     s_table_large = ParagraphStyle(name="s_table_large", parent=s_table_medium, fontSize=11, leading=11)
     s_table_large_center = ParagraphStyle(name="s_table_large", parent=s_table_large, alignment=TA_CENTER)
-    s_table_large_center_padding = ParagraphStyle(
+    s_table_large_center_padding = ParagraphStyle(  # noqa: F841
         name="s_table_large", parent=s_table_large_center, spaceBefore=20, spaceAfter=20
     )
     s_table_center = ParagraphStyle(
@@ -284,7 +285,7 @@ def generate_report(context):
         )
         return title_table
 
-    def impress(l):
+    def impress(elements):
         style = s_table_headline_2
         table_data = [
             [
@@ -312,7 +313,7 @@ def generate_report(context):
                 ]
             )
         )
-        l.append(KeepTogether(TopPadder(t)))
+        elements.append(KeepTogether(TopPadder(t)))
 
     # Description
     elements.append(generate_title(general_data["title"]))
@@ -347,7 +348,7 @@ def generate_report(context):
     # Price Timeseries Chart
     elements.append(
         get_timeseries_chart(
-            data=[list(zip(prices.index, prices.net_value))],
+            data=[list(zip(prices.index, prices.net_value, strict=False))],
             width=CONTENT_WIDTH_PAGE1_LEFT - CONTENT_OFFSET,
             height=4.34 * cm,
             color=c_product,
@@ -567,7 +568,7 @@ def generate_report(context):
 
         data = list()
         categories = list()
-        for index, row in enumerate(df.itertuples()):
+        for row in df.itertuples():
             data.append(row.weighting * 100)
             categories.append(f"{row.aggregated_title} ({row.weighting*100:.1f}%)")
 

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/pdf/sandbox/templates/long_industry_exposure_factsheet.py

@@ -22,7 +22,6 @@ from reportlab.platypus import (
     Image,
     NextPageTemplate,
     PageTemplate,
-    Paragraph,
     Spacer,
     Table,
     TableStyle,
@@ -30,6 +29,8 @@ from reportlab.platypus import (
 from reportlab.platypus.flowables import KeepTogether, TopPadder
 from reportlab.platypus.frames import Frame
 from svglib.svglib import svg2rlg
+from wbcore.utils.reportlab import FormattedParagraph as Paragraph
+
 from wbreport.models import ReportAsset
 from wbreport.pdf.charts.pie import (
     get_pie_chart_horizontal,
@@ -42,7 +43,7 @@ from wbreport.pdf.tables.aggregated_tables import get_simple_aggregated_table
 from wbreport.pdf.tables.data_tables import get_simple_data_table
 
 
-def generate_report(context):
+def generate_report(context):  # noqa: C901
     debug = False
     ### Product Data ###
     # Main Feature table as dictionary
@@ -120,7 +121,7 @@ def generate_report(context):
     s_base_small_justified = ParagraphStyle(
         name="s_base_small_justified", parent=s_base, fontSize=6.5, leading=7, alignment=TA_JUSTIFY
     )
-    s_base_small_justified_indent = ParagraphStyle(
+    s_base_small_justified_indent = ParagraphStyle(  # noqa: F841
         name="s_base_small_justified_indent", parent=s_base_small_justified, leftIndent=CONTENT_OFFSET
     )
     s_base_indent = ParagraphStyle(name="s_description", parent=s_base, spaceBefore=8, leftIndent=CONTENT_OFFSET)
@@ -134,7 +135,7 @@ def generate_report(context):
     s_table_medium_leading = ParagraphStyle(name="s_table_medium_leading", parent=s_table_medium, leading=13.9)
     s_table_large = ParagraphStyle(name="s_table_large", parent=s_table_medium, fontSize=11, leading=11)
     s_table_large_center = ParagraphStyle(name="s_table_large", parent=s_table_large, alignment=TA_CENTER)
-    s_table_large_center_padding = ParagraphStyle(
+    s_table_large_center_padding = ParagraphStyle(  # noqa: F841
         name="s_table_large", parent=s_table_large_center, spaceBefore=20, spaceAfter=20
     )
     s_table_center = ParagraphStyle(
@@ -277,7 +278,7 @@ def generate_report(context):
         )
         return title_table
 
-    def impress(l):
+    def impress(elements):
         style = s_table_headline_2
         table_data = [
             [
@@ -305,7 +306,7 @@ def generate_report(context):
                 ]
             )
         )
-        l.append(KeepTogether(TopPadder(t)))
+        elements.append(KeepTogether(TopPadder(t)))
 
     ############################
     ## Page 1: BEGINING
@@ -337,7 +338,7 @@ def generate_report(context):
     # Price Timeseries Chart
     elements.append(
         get_timeseries_chart(
-            data=[list(zip(prices.index, prices.net_value))],
+            data=[list(zip(prices.index, prices.net_value, strict=False))],
             width=CONTENT_WIDTH_PAGE1_LEFT - CONTENT_OFFSET,
             height=4.34 * cm,
             color=c_product,
@@ -358,7 +359,7 @@ def generate_report(context):
                 "<strong>Top 3 Contributors</strong>",
                 "<strong>Bottom 3 Contributors</strong>",
             ],
-            data=list(zip(top_3_holdings, top_3_contributors, bottom_3_contributors)),
+            data=list(zip(top_3_holdings, top_3_contributors, bottom_3_contributors, strict=False)),
             width=CONTENT_WIDTH_PAGE1_LEFT,
             header_row_height=0.85 * cm,
             data_row_height=0.39 * cm,
@@ -559,7 +560,7 @@ def generate_report(context):
 
         data = list()
         categories = list()
-        for index, row in enumerate(df.itertuples()):
+        for row in df.itertuples():
             data.append(row.weighting * 100)
             categories.append(f"{row.aggregated_title} ({row.weighting*100:.1f}%)")
 

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/pdf/sandbox/templates/multistrat_factsheet.py

@@ -21,7 +21,6 @@ from reportlab.platypus import (
     Image,
     NextPageTemplate,
     PageTemplate,
-    Paragraph,
     Spacer,
     Table,
     TableStyle,
@@ -29,6 +28,8 @@ from reportlab.platypus import (
 from reportlab.platypus.flowables import KeepTogether, TopPadder
 from reportlab.platypus.frames import Frame
 from svglib.svglib import svg2rlg
+from wbcore.utils.reportlab import FormattedParagraph as Paragraph
+
 from wbreport.models import ReportAsset
 from wbreport.pdf.charts.pie import (
     get_pie_chart_horizontal,
@@ -42,7 +43,7 @@ from wbreport.pdf.tables.aggregated_tables import get_simple_aggregated_table
 from wbreport.pdf.tables.data_tables import get_simple_data_table
 
 
-def generate_report(context):
+def generate_report(context):  # noqa: C901
     debug = False
 
     main_features_dict = context["information_table"]["Main Features"]
@@ -133,7 +134,7 @@ def generate_report(context):
     s_table_medium = ParagraphStyle(name="s_table_medium", parent=s_table_base, fontSize=9, leading=8)
     s_table_medium_leading = ParagraphStyle(name="s_table_medium_leading", parent=s_table_medium, leading=13.9)
     s_table_large = ParagraphStyle(name="s_table_large", parent=s_table_medium, fontSize=11, leading=11)
-    s_table_large_center = ParagraphStyle(name="s_table_large", parent=s_table_large, alignment=TA_CENTER)
+    s_table_large_center = ParagraphStyle(name="s_table_large", parent=s_table_large, alignment=TA_CENTER)  # noqa: F841
     s_table_center = ParagraphStyle(
         name="s_table_center",
         parent=s_table_base,
@@ -330,7 +331,7 @@ def generate_report(context):
     # Price Timeseries Chart
     elements.append(
         get_timeseries_chart(
-            data=[list(zip(prices.index, prices.net_value))],
+            data=[list(zip(prices.index, prices.net_value, strict=False))],
             width=CONTENT_WIDTH_PAGE1_LEFT - CONTENT_OFFSET,
             height=4.34 * cm,
             color=c_product,
@@ -351,7 +352,7 @@ def generate_report(context):
                 "<strong>Top 3 Contributors</strong>",
                 "<strong>Bottom 3 Contributors</strong>",
             ],
-            data=list(zip(top_3_holdings, top_3_contributors, bottom_3_contributors)),
+            data=list(zip(top_3_holdings, top_3_contributors, bottom_3_contributors, strict=False)),
             width=CONTENT_WIDTH_PAGE1_LEFT,
             header_row_height=0.85 * cm,
             data_row_height=0.39 * cm,
@@ -553,7 +554,7 @@ def generate_report(context):
 
         data = list()
         categories = list()
-        for index, row in enumerate(df.itertuples()):
+        for row in df.itertuples():
             data.append(row.weighting * 100)
             categories.append(f"{row.aggregated_title} ({row.weighting*100:.1f}%)")
 

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/pdf/tables/aggregated_tables.py

@@ -2,7 +2,8 @@ import numpy as np
 from reportlab.lib.colors import grey
 from reportlab.lib.enums import TA_CENTER
 from reportlab.lib.styles import ParagraphStyle
-from reportlab.platypus import Paragraph, Spacer, Table, TableStyle
+from reportlab.platypus import Spacer, Table, TableStyle
+from wbcore.utils.reportlab import FormattedParagraph as Paragraph
 
 
 def get_simple_aggregated_table(
@@ -37,7 +38,7 @@ def get_simple_aggregated_table(
 
         table_row.append(Paragraph(str(year), style=row_style))
 
-        for month, element in row.items():
+        for _, element in row.items():
             if element.get("performance", None) is None:
                 table_row.append(Spacer(width=0, height=0))
             else:
@@ -110,7 +111,7 @@ def get_fund_table(
     table_data.append(table_row)
 
     # Generate table
-    for index, row in df.iterrows():
+    for _, row in df.iterrows():
         table_row = list()
 
         for value in row:

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/pdf/tables/data_tables.py

@@ -1,5 +1,6 @@
 from reportlab.lib.units import cm
-from reportlab.platypus import Paragraph, Spacer, Table, TableStyle
+from reportlab.platypus import Spacer, Table, TableStyle
+from wbcore.utils.reportlab import FormattedParagraph as Paragraph
 
 
 def get_simple_data_table(

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/tests/test_models.py

@@ -4,6 +4,7 @@ import pytest
 from django.test import override_settings
 from faker import Faker
 from wbmailing.models import MassMail
+
 from wbreport.models import ReportVersion
 
 fake = Faker()

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/tests/test_tasks.py

@@ -2,6 +2,7 @@ import pytest
 from django.core import mail
 from django.test import override_settings
 from wbcore.contrib.authentication.factories import SuperUserFactory
+
 from wbreport.tasks import generate_and_send_current_report_file
 
 

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/viewsets/configs/displays.py

@@ -44,6 +44,7 @@ class ReportDisplayConfig(DisplayViewConfig):
                 dp.TreeGroupLevelOption(
                     filter_key="parent_report",
                     filter_depth=1,
+                    filter_blacklist=["parent_report__isnull"],
                     list_endpoint=reverse(
                         "wbreport:report-list",
                         args=[],

{wbreport-1.50.14 → wbreport-1.58.3}/wbreport/viewsets/configs/endpoints.py

@@ -6,12 +6,9 @@ class ReportVersionEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
 
-    def get_list_endpoint(self, **kwargs):
+    def get_instance_endpoint(self, **kwargs):
         return reverse("wbreport:reportversion-list", request=self.request)
 
-    def get_instance_endpoint(self):
-        return self.get_list_endpoint()
-
 
 class ReportEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
@@ -19,12 +16,8 @@ class ReportEndpointConfig(EndpointViewConfig):
 
 
 class ReportVersionReportEndpointConfig(EndpointViewConfig):
-    def get_list_endpoint(self, **kwargs):
-        return reverse("wbreport:report-version-list", args=[self.view.kwargs["report_id"]], request=self.request)
+    pass
 
 
 class ReportVersionReportHTMEndpointConfig(EndpointViewConfig):
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbreport:reportversion-rawhtml-list", args=[self.view.kwargs["report_version_id"]], request=self.request
-        )
+    pass