wbreport 1.49.5__py2.py3-none-any.whl → 1.60.1__py2.py3-none-any.whl

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/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/filters.py

@@ -4,13 +4,22 @@ from wbreport.models import Report, ReportVersion
 
 
 class ReportFilterSet(wb_filters.FilterSet):
-    is_active = wb_filters.BooleanFilter(default=True)
+    is_active = wb_filters.BooleanFilter(initial=True)
+
+    parent_report = wb_filters.ModelChoiceFilter(
+        label="Parent",
+        queryset=Report.objects.all(),
+        endpoint=Report.get_representation_endpoint(),
+        value_key=Report.get_representation_value_key(),
+        label_key=Report.get_representation_label_key(),
+        hidden=True,
+    )
+    parent_report__isnull = wb_filters.BooleanFilter(field_name="parent_report", lookup_expr="isnull", hidden=True)
 
     class Meta:
         model = Report
         fields = {
             "category": ["exact"],
-            "parent_report": ["exact", "isnull"],
             "permission_type": ["exact"],
             "base_color": ["exact"],
             "mailing_list": ["exact"],
@@ -18,7 +27,7 @@ class ReportFilterSet(wb_filters.FilterSet):
 
 
 class ReportVersionFilterSet(wb_filters.FilterSet):
-    disabled = wb_filters.BooleanFilter(method="boolean_is_disabled", default=False)
+    disabled = wb_filters.BooleanFilter(method="boolean_is_disabled", initial=False)
 
     def boolean_is_disabled(self, queryset, name, value):
         if value is True:

wbreport/mixins.py

@@ -2,13 +2,11 @@ from datetime import date
 from io import BytesIO
 from typing import Any, Dict
 
-from django.contrib.auth import get_user_model
 from django.template.loader import get_template
+from wbcore.contrib.authentication.models.users import User
 
 from wbreport.models import Report, ReportVersion
 
-User = get_user_model()
-
 
 class ReportMixin:
     HTML_TEMPLATE_FILE = ""

wbreport/models.py

@@ -8,7 +8,6 @@ from typing import Any, Dict, List, Optional
 from celery import shared_task
 from colorfield.fields import ColorField
 from django.conf import settings
-from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.core.serializers.json import DjangoJSONEncoder
@@ -22,14 +21,14 @@ from guardian.shortcuts import get_objects_for_user
 from mptt.models import MPTTModel, TreeForeignKey
 from ordered_model.models import OrderedModel
 from rest_framework.reverse import reverse
+from wbcore.contrib.authentication.models.users import User
 from wbcore.contrib.guardian.models.mixins import PermissionObjectModelMixin
 from wbcore.contrib.notifications.dispatch import send_notification
 from wbcore.contrib.notifications.utils import create_notification_type
 from wbcore.models import WBModel
+from wbcore.workers import Queue
 from wbmailing.models import MailTemplate, MassMail
 
-User = get_user_model()
-
 
 class ReportAsset(models.Model):
     """
@@ -112,9 +111,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)
@@ -612,16 +611,18 @@ class ReportVersion(models.Model):
             **kwargs: Divers keyword arguments to be injected in the get_context function
         """
         if not self.lock or force_context_update:
-            if silent:
-                try:
-                    self.context = self.get_context(**kwargs)
-                    self.disabled = False
-                except Exception as e:
-                    print(f"Error while updating Context for snap {self.id} {e}")  # noqa: T201
-                    self.disabled = True
-            else:
-                self.context = self.get_context(**kwargs)
-            self.context = self.report.report_class.serialize_context(self.context)
+            context = {}
+            try:
+                context = self.get_context(**kwargs)
+                self.disabled = False
+            except Exception as e:
+                self.comment = f"Error while updating this version context: {e}"
+                self.disabled = True
+                if not silent:
+                    raise e
+            context = self.report.report_class.serialize_context(context)
+            if context:
+                self.context = context
             self.save()
 
     def generate_file(self) -> BytesIO:
@@ -674,6 +675,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"
@@ -696,7 +701,7 @@ def generate_version_context_if_null(sender, instance, created, raw, **kwargs):
         update_context_as_task.apply_async((instance.id,), countdown=30)
 
 
-@shared_task()
+@shared_task(queue=Queue.DEFAULT.value)
 def generate_next_reports_as_task(report_id, parameters=None, user=None, comment=None, max_depth_only=False):
     """
     Trigger the Report generate_next_reports as a task
@@ -712,7 +717,7 @@ def generate_next_reports_as_task(report_id, parameters=None, user=None, comment
         )
 
 
-@shared_task()
+@shared_task(queue=Queue.DEFAULT.value)
 def bulk_create_child_reports_as_task(report_id, start_parameters, end_parameters, user=None):
     """
     Trigger the Report generate_next_reports as a task
@@ -728,16 +733,17 @@ def bulk_create_child_reports_as_task(report_id, start_parameters, end_parameter
         )
 
 
-@shared_task()
-def update_context_as_task(report_version_id, user=None, comment=None):
+@shared_task(queue=Queue.DEFAULT.value)
+def update_context_as_task(
+    report_version_id: int, user: User | None = None, comment: str | None = None, force_context_update: bool = False
+):
     """
     Trigger the Report Version update_report_context as a task
     """
     version = ReportVersion.objects.get(id=report_version_id)
     if comment:
         version.comment = comment
-        version.save()
-    version.update_context()
+    version.update_context(force_context_update=force_context_update)
     if user:
         send_notification(
             code="wbreport.report.background_task",
@@ -747,7 +753,7 @@ def update_context_as_task(report_version_id, user=None, comment=None):
         )
 
 
-@shared_task()
+@shared_task(queue=Queue.DEFAULT.value)
 def update_version_context_as_task(report_id, parameters=None, user=None):
     """
     Trigger the Report Version update_report_context as a task
@@ -756,7 +762,7 @@ def update_version_context_as_task(report_id, parameters=None, user=None):
         models.Q(is_active=True) & (models.Q(id=report_id) | models.Q(parent_report=report_id))
     ).distinct():
         print(  # noqa: T201
-            f'Updating context for report {str(report)} and version parameters {parameters if parameters else "{all}"}'
+            f"Updating context for report {str(report)} and version parameters {parameters if parameters else '{all}'}"
         )
         versions = report.versions.filter(disabled=False)
         if parameters:
@@ -772,7 +778,7 @@ def update_version_context_as_task(report_id, parameters=None, user=None):
         )
 
 
-@shared_task()
+@shared_task(queue=Queue.HIGH_PRIORITY.value)
 def set_primary_report_version_as_task(report_id, parameters=None, user=None):
     """
     Trigger the Report set_primary_versions as a task

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/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/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/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/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/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/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/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/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/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/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/serializers.py

@@ -1,10 +1,10 @@
 from rest_framework.reverse import reverse
 from wbcore import serializers as wb_serializers
-from wbcore.content_type.serializers import (
+from wbcore.contrib.authentication.authentication import inject_short_lived_token
+from wbcore.contrib.content_type.serializers import (
     ContentTypeRepresentationSerializer,
     DynamicObjectIDRepresentationSerializer,
 )
-from wbcore.contrib.authentication.authentication import inject_short_lived_token
 from wbmailing.serializers import MailingListRepresentationSerializer
 
 from .models import Report, ReportCategory, ReportClass, ReportVersion
@@ -48,6 +48,7 @@ class ReportCategoryModelSerializer(wb_serializers.ModelSerializer):
 class ReportVersionModelSerializer(wb_serializers.ModelSerializer):
     _report = ReportRepresentationSerializer(source="report")
     parameters = wb_serializers.JSONTableField()
+    parameters_repr = wb_serializers.CharField(read_only=True)
 
     @wb_serializers.register_resource()
     def version_resources(self, instance, request, user):
@@ -65,8 +66,6 @@ class ReportVersionModelSerializer(wb_serializers.ModelSerializer):
                 res["send_email"] = reverse("report:reportversion-sendemail", args=[instance.id], request=request)
         return res
 
-    from wbcore.contrib.authentication.authentication import TokenAuthentication
-
     @wb_serializers.register_resource()
     @inject_short_lived_token(view_name="public_report:report_version")
     def public_html_resources(self, instance, request, user):
@@ -86,8 +85,10 @@ class ReportVersionModelSerializer(wb_serializers.ModelSerializer):
             "update_date",
             "is_primary",
             "disabled",
+            "lock",
             "lookup",
             "parameters",
+            "parameters_repr",
             "comment",
             "report",
             "_report",
@@ -114,7 +115,7 @@ class ReportModelSerializer(wb_serializers.ModelSerializer):
         res = {}
         if instance.is_accessible(user):
             res["versions"] = reverse("wbreport:report-version-list", args=[instance.id], request=request)
-            res["reports"] = f'{reverse("wbreport:report-list", args=[], request=request)}?parent_report={instance.id}'
+            res["reports"] = f"{reverse('wbreport:report-list', args=[], request=request)}?parent_report={instance.id}"
             if instance.child_reports.exists():
                 res["bundle_versions"] = reverse("wbreport:report-bundletreport", args=[instance.id], request=request)
 

wbreport/tasks.py

@@ -8,11 +8,12 @@ from django.template.loader import get_template
 from slugify import slugify
 from wbcore.contrib.authentication.models import User
 from wbcore.utils.html import convert_html2text
+from wbcore.workers import Queue
 
 from wbreport.models import Report, ReportVersion
 
 
-@shared_task()
+@shared_task(queue=Queue.BACKGROUND.value)
 def generate_and_send_current_report_file(user_id, parent_report_id, parameters=None):
     zip_buffer = BytesIO()
     parent_report = Report.objects.get(id=parent_report_id)

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/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/viewsets/configs/buttons.py

@@ -14,6 +14,19 @@ class CommentSerializer(wb_serializers.Serializer):
     comment = wb_serializers.TextField(default="")
 
 
+class GenerateNextReportSerializer(CommentSerializer):
+    max_depth_only = wb_serializers.BooleanField(default=False)
+    start_date = wb_serializers.DateField()
+    end_date = wb_serializers.DateField()
+
+
+class UpdateContextSerializer(CommentSerializer):
+    override_lock = wb_serializers.BooleanField(
+        default=False,
+        help_text="Enable this option to force context updates even when the report version is locked. (Warning: this operation may overwrite existing data.)",
+    )
+
+
 class ReportButtonConfig(ButtonViewConfig):
     def get_custom_list_instance_buttons(self):
         return {
@@ -46,6 +59,9 @@ class ReportButtonConfig(ButtonViewConfig):
         class ParametersSerializer(wb_serializers.Serializer):
             parameters = wb_serializers.JSONTableField(default=default_parameters, label="Version Parameters")
 
+        class ContextUpdateSerializer(UpdateContextSerializer, ParametersSerializer):
+            pass
+
         class StartEndParametersSerializer(wb_serializers.Serializer):
             start_parameters = wb_serializers.JSONTableField(
                 default=earliest_parent_parameters, label="Start Parameters"
@@ -53,11 +69,6 @@ class ReportButtonConfig(ButtonViewConfig):
             end_parameters = wb_serializers.JSONTableField(default=latest_parent_paremeters, label="End Parameters")
             comment = wb_serializers.TextField(default="")
 
-        class GenerateNextReportSerializer(CommentSerializer):
-            max_depth_only = wb_serializers.BooleanField(default=False)
-            start_date = wb_serializers.DateField()
-            end_date = wb_serializers.DateField()
-
         return self.get_custom_list_instance_buttons() | {
             bt.DropDownButton(
                 label="Utility",
@@ -76,7 +87,9 @@ class ReportButtonConfig(ButtonViewConfig):
                         serializer=GenerateNextReportSerializer,
                         action_label="Generate Next Report",
                         title="Generate Report to Next Iteration",
-                        instance_display=create_simple_display([["start_date"], ["end_date"], ["max_depth_only"]]),
+                        instance_display=create_simple_display(
+                            [["start_date", "end_date"], ["max_depth_only", "max_depth_only"]]
+                        ),
                     ),
                     bt.ActionButton(
                         method=RequestType.PATCH,
@@ -84,15 +97,14 @@ class ReportButtonConfig(ButtonViewConfig):
                         key="update_versions_context",
                         label="Regenerate context",
                         icon=WBIcon.REGENERATE.icon,
-                        serializer=ParametersSerializer,
+                        serializer=ContextUpdateSerializer,
                         description_fields="""
                         <p> Do you want to regenerate this report's versions?</p>
-                        <p> If parameters is unset, it will recompute all report's versions</p>
                         <p> Note: This action takes few minute?</p>
                         """,
                         action_label="Regenerate versions context",
                         title="Regenerate versions context",
-                        instance_display=create_simple_display([["all_versions"], ["parameters"]]),
+                        instance_display=create_simple_display([["comment"], ["parameters"], ["override_lock"]]),
                     ),
                     bt.ActionButton(
                         method=RequestType.PATCH,
@@ -164,14 +176,15 @@ class ReportVersionButtonConfig(ButtonViewConfig):
                 icon=WBIcon.SAVE.icon,
             ),
             bt.ActionButton(
-                method=RequestType.GET,
+                method=RequestType.PATCH,
                 identifiers=("wbreport:reportversion",),
                 key="update_context",
                 label="Update Context",
                 description_fields="""
                 <p>Update and actualize context</p>
                 """,
-                serializer=CommentSerializer,
+                instance_display=create_simple_display([["comment"], ["override_lock"]]),
+                serializer=UpdateContextSerializer,
                 icon=WBIcon.REGENERATE.icon,
                 action_label="Update Context",
                 title="Update Context",

wbreport/viewsets/configs/displays.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
 from rest_framework.reverse import reverse
+from wbcore.enums import Unit
 from wbcore.metadata.configs import display as dp
 from wbcore.metadata.configs.display.instance_display import Display
 from wbcore.metadata.configs.display.instance_display.shortcuts import (
@@ -39,13 +40,12 @@ class ReportDisplayConfig(DisplayViewConfig):
             ],
             tree=True,
             # tree_group_lookup="id_repr",
-            tree_group_pinned="left",
             tree_group_field="title",
-            tree_group_label="Title",
             tree_group_level_options=[
                 dp.TreeGroupLevelOption(
                     filter_key="parent_report",
                     filter_depth=1,
+                    filter_blacklist=["parent_report__isnull"],
                     list_endpoint=reverse(
                         "wbreport:report-list",
                         args=[],
@@ -76,16 +76,25 @@ class ReportDisplayConfig(DisplayViewConfig):
 class ReportVersionDisplayConfig(DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         return dp.ListDisplay(
-            fields=(
+            fields=[
                 dp.Field(key="uuid", label="UUID"),
                 dp.Field(key="lookup", label="Lookup"),
                 dp.Field(key="title", label="Title"),
                 dp.Field(key="version_date", label="Date"),
                 dp.Field(key="report", label="Report"),
-                dp.Field(key="is_primary", label="Is Primary"),
-                dp.Field(key="disabled", label="Disabled"),
-                dp.Field(key="parameters", label="Parameters"),
-            )
+                dp.Field(key="comment", label="Comment"),
+                dp.Field(
+                    key=None,
+                    label="Information",
+                    open_by_default=False,
+                    children=[
+                        dp.Field(key="is_primary", label="Primary", width=Unit.PIXEL(100)),
+                        dp.Field(key="disabled", label="Disabled", width=Unit.PIXEL(100)),
+                        dp.Field(key="lock", label="Lock", width=Unit.PIXEL(100), show="open"),
+                        dp.Field(key="parameters_repr", label="Parameters", show="open"),
+                    ],
+                ),
+            ]
         )
 
     def get_instance_display(self) -> Display:
@@ -102,15 +111,22 @@ class ReportVersionDisplayConfig(DisplayViewConfig):
 class ReportVersionReportDisplayConfig(ReportVersionDisplayConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         return dp.ListDisplay(
-            fields=(
+            fields=[
                 dp.Field(key="uuid", label="UUID"),
                 dp.Field(key="lookup", label="Lookup"),
                 dp.Field(key="title", label="Title"),
                 dp.Field(key="version_date", label="Date"),
-                dp.Field(key="report", label="Report"),
-                dp.Field(key="is_primary", label="Is Primary"),
-                dp.Field(key="disabled", label="Disabled"),
-                dp.Field(key="parameters", label="Parameters"),
                 dp.Field(key="comment", label="Comment"),
-            )
+                dp.Field(
+                    key=None,
+                    label="Information",
+                    open_by_default=False,
+                    children=[
+                        dp.Field(key="is_primary", label="Primary", width=Unit.PIXEL(100)),
+                        dp.Field(key="disabled", label="Disabled", width=Unit.PIXEL(100)),
+                        dp.Field(key="lock", label="Lock", width=Unit.PIXEL(100), show="open"),
+                        dp.Field(key="parameters_repr", label="Parameters", show="open"),
+                    ],
+                ),
+            ]
         )

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

wbreport/viewsets/viewsets.py

@@ -1,6 +1,7 @@
 import json
 
-from django.db.models import Case, Exists, F, IntegerField, OuterRef, When
+from django.db.models import Case, Exists, F, IntegerField, OuterRef, TextField, When
+from django.db.models.functions import Cast
 from django.http import FileResponse, HttpResponse
 from django.shortcuts import get_object_or_404, render
 from django.views.decorators.cache import cache_page
@@ -76,7 +77,7 @@ def report(request, namespace):
         {
             "title": "Report Unavailable",
             "header": "Report Unavailable",
-            "description": "If you thing this report should be enabled, please " "contact a system administrator",
+            "description": "If you thing this report should be enabled, please contact a system administrator",
         },
         status=status.HTTP_403_FORBIDDEN,
     )
@@ -116,7 +117,7 @@ def report_version(request, lookup):
         {
             "title": "Report Unavailable",
             "header": "Report Unavailable",
-            "description": "If you thing this report should be enabled, please " "contact a system administrator",
+            "description": "If you thing this report should be enabled, please contact a system administrator",
         },
         status=status.HTTP_403_FORBIDDEN,
     )
@@ -271,7 +272,7 @@ class ReportVersionModelViewSet(viewsets.ModelViewSet):
     title_config_class = ReportVersionTitleConfig
     button_config_class = ReportVersionButtonConfig
 
-    queryset = ReportVersion.objects.all()
+    queryset = ReportVersion.objects.annotate(parameters_repr=Cast("parameters", TextField()))
 
     @action(detail=True, methods=["GET"], permission_classes=[IsAuthenticated])
     def sendemail(self, request, pk=None):
@@ -281,9 +282,12 @@ class ReportVersionModelViewSet(viewsets.ModelViewSet):
             return Response({}, status=status.HTTP_200_OK)
         return Response({}, status=status.HTTP_404_NOT_FOUND)
 
-    @action(detail=True, methods=["GET"], permission_classes=[IsAuthenticated])
+    @action(detail=True, methods=["PATCH"], permission_classes=[IsAuthenticated])
     def updatecontext(self, request, pk=None):
-        update_context_as_task.delay(pk, request.user, comment=request.GET.get("comment", ""))
+        comment = request.data.get("comment", "")
+        override_lock = request.data.get("override_lock", "false").lower() == "true"
+
+        update_context_as_task.delay(pk, request.user, comment=comment, force_context_update=override_lock)
         return Response({}, status=status.HTTP_200_OK)
 
     @action(

{wbreport-1.49.5.dist-info → wbreport-1.60.1.dist-info}/METADATA

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

{wbreport-1.49.5.dist-info → wbreport-1.60.1.dist-info}/RECORD

@@ -2,19 +2,19 @@ wbreport/__init__.py,sha256=J-j-u0itpEFT6irdmWmixQqYMadNl1X91TxUmoiLHMI,22
 wbreport/admin.py,sha256=tQPq0BKzXZ7I3aOE0FaGyjuKs37TiT56s7OT0mDfOXo,2364
 wbreport/apps.py,sha256=4z2N25hswEAlsJsntASC5iOWUwsqMCL99-gvqBlPGFY,148
 wbreport/dynamic_preferences_registry.py,sha256=nGT-fS5vN-BSVNyGcJ81ORjiXlOngePRN9hipB9olPw,508
-wbreport/filters.py,sha256=2onemO-Vpeqi7gXqxZWAmQg-5TT9Vyt3iJX32sLfhwU,1147
-wbreport/mixins.py,sha256=bAfMvfPL4YEGfEM8fsX-B_JDnN1spcefOhZU-g30080,5521
-wbreport/models.py,sha256=cRKgmdbb2cKRr04jkTtwv6kmRc5fd8CcIUENKlGIegQ,29595
-wbreport/serializers.py,sha256=k1hrtd8QodqRkM1Ol9MsLjk0n_XZU8qGLRR62EHJCXM,7236
-wbreport/tasks.py,sha256=O1mcYdOlqnj0lA7K52OszA7OBLClMhuzRm6ZiTcXAOY,2271
+wbreport/filters.py,sha256=Q92qUs0_4NvpqWqbs8_D9OLD81herHLuWcZ1sdneZgw,1523
+wbreport/mixins.py,sha256=fXVwHAi6OSsOZcrrvSmQAdOHh3V_bzk0FJehBTB0xFw,5509
+wbreport/models.py,sha256=XVr4NZtSRqkk7vA_WaPloUBMA8JvyB5u2wUm5MrxzNg,29930
+wbreport/serializers.py,sha256=SpQW-Y-63x71DupbUONcRD4ufgm99KZ4qJqijutM2_M,7276
+wbreport/tasks.py,sha256=8Cwb-eKHMmW520fW5m4Xf2t3TSnG_crlB-4MBaLCqlI,2332
 wbreport/urls.py,sha256=yoIFuuwPCRRjOM0VzMznyMmMQXbSVfdk1l12xZJ7Ecs,1463
 wbreport/urls_public.py,sha256=oc_gBiKvLqWkSDAm_0yitWgpfEnlh3_hGUugkLrLCLs,370
 wbreport/defaults/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbreport/defaults/factsheets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbreport/defaults/factsheets/base.py,sha256=9dIylgXoUSXdHcspCGm3-TJ8Kei38tJ_6ew3gHoM9M4,41090
+wbreport/defaults/factsheets/base.py,sha256=CliFS0MpfweN8a7GpWcxeerzICgpiDym9G_doPmB3GE,41166
 wbreport/defaults/factsheets/menu.py,sha256=NTcUuViV4Q-qkffoA7wMSyxnE4mWPysu3KTKWxFmMCM,4580
 wbreport/defaults/factsheets/mixins.py,sha256=E0RvxmUpvpG7B7YngBPXJ35eD3nwNandJFzLjj1rNRI,1267
-wbreport/defaults/factsheets/multitheme.py,sha256=LHM7tceWP9SJ9E8ChtD7eAq21uWMPdLBolnmgYBDTaw,38488
+wbreport/defaults/factsheets/multitheme.py,sha256=OrJEmgcS8vACAk9l0cM_L9D_uOTbZClezGWfM-WLF7Y,38562
 wbreport/factories/__init__.py,sha256=jyD1_R-xc2JPZIaSwtE7zYATdL9NIXIDqTwjLw1MolA,170
 wbreport/factories/data_classes.py,sha256=Ms9bqG370OQTmE3Kxvt9xay-6lfTnqEA3Sx7zCQKWXw,1487
 wbreport/factories/reports.py,sha256=nGWa_fS78XGUbS8E35rGl3IJySHLB81ggq-3JllPOx4,2286
@@ -30,41 +30,41 @@ wbreport/migrations/0014_alter_reportcategory_options_and_more.py,sha256=52ot6Ck
 wbreport/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbreport/pdf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbreport/pdf/charts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbreport/pdf/charts/legend.py,sha256=D-_-ZLDF7q7KlYLiNYVXHWLs4I-LgV8Ce8lk1sLfbPU,461
-wbreport/pdf/charts/pie.py,sha256=EcWTDOv1ZD5Az6MnBt_w5pBXusPBB3zTHlpguBPNjfU,4287
-wbreport/pdf/charts/timeseries.py,sha256=dN2N66qg9S3bW9OV8q-Vms3wFxUHhLMnaUnymzTNeWY,2381
-wbreport/pdf/flowables/risk.py,sha256=KdE5RQU0kPUqZX6mpvqITVxpLFu1uDeA2C5lrtSA0mY,3443
-wbreport/pdf/flowables/textboxes.py,sha256=BMzlva7WBD5UZ5DD1cwWV5ZPragt61YaJquikDYk7eU,4369
+wbreport/pdf/charts/legend.py,sha256=g_yAnI6zuMn11pXOphReWiKA1PPIEJ6NzKeeKLHx4t0,481
+wbreport/pdf/charts/pie.py,sha256=QzsP18-s1IKXyiUT8sHi-wjivqEUKkxy42qMVaJP-fk,4288
+wbreport/pdf/charts/timeseries.py,sha256=O1MCneh6hPJD6jVyJfytGL3WdYx9WaQ-vfO66lCjgUI,2395
+wbreport/pdf/flowables/risk.py,sha256=jmqdqDjk21Ob5qQA0GxSv_DPrUTCyGaAmJuGq0PIYcA,3499
+wbreport/pdf/flowables/textboxes.py,sha256=WIdqFyGG_kb_rO1OvB88QISPB36Zi3rTxjqBkGKeINY,4425
 wbreport/pdf/flowables/themes.py,sha256=Y5LcgSTJDhIZM3uIWAPY68HVMhTY9aY9PDwWsG5_IVk,6548
 wbreport/pdf/sandbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbreport/pdf/sandbox/run.py,sha256=Vkzp_xVVJHctToS49Uef2Mnpb_5KUOWPxNdTFHOqri8,584
 wbreport/pdf/sandbox/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbreport/pdf/sandbox/templates/basic_factsheet.py,sha256=w_PpPS8rbirkrodgXs538_xOw6aNKGr4GGuVn_XGPPU,33967
-wbreport/pdf/sandbox/templates/fund_factsheet.py,sha256=aGf5CfUHAp-kGJfU8tZ3TnEO26re4Sny_G2QCFte4gk,31054
-wbreport/pdf/sandbox/templates/long_industry_exposure_factsheet.py,sha256=TnOz_NJLhX7ZT1amnbPkyee719dYug688JGSzVGRaMQ,32684
-wbreport/pdf/sandbox/templates/multistrat_factsheet.py,sha256=8-WU-r7x6Yq5v1ml2mUT7e33SUYk7IzKMNXFWuE7Y2k,31481
+wbreport/pdf/sandbox/templates/basic_factsheet.py,sha256=1bU6nPg8TI6QTtqmCn7FO9cio2vrsQ32OtViDa-Okqw,34100
+wbreport/pdf/sandbox/templates/fund_factsheet.py,sha256=WHYMKnTaUW1UtLW4-QeWlRhdHfgP0FasRZWJKB9Riyk,31157
+wbreport/pdf/sandbox/templates/long_industry_exposure_factsheet.py,sha256=nZgy_NUR7JT22jFyBzZnr800T4EkHzErcgLAr9C6_-s,32803
+wbreport/pdf/sandbox/templates/multistrat_factsheet.py,sha256=WR_zlgfNQom257U2b12GIeKY6dM17Or6k1H9Jupeo1Q,31572
 wbreport/pdf/sandbox/templates/testfile.pdf,sha256=eV55RNFdqxqYzre6mg8EWZoL_cbc_lwPjyTGt1pr1AI,144012
 wbreport/pdf/tables/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbreport/pdf/tables/aggregated_tables.py,sha256=rYikFswLMcaTpW7Em5B5oE1WSItQjkW_MJJTsumRpq8,4763
-wbreport/pdf/tables/data_tables.py,sha256=snJlyMMRz4YSR4gcXeIdQR38h-IkOQiO0A5jx5lF45o,2241
+wbreport/pdf/tables/aggregated_tables.py,sha256=ARQD3i2hbclx-IdUUNytePbIWQVMHEb0qRPYlZBjG-E,4811
+wbreport/pdf/tables/data_tables.py,sha256=c3YZsTgOlcupNAPBpZQIxR89bgyk5PgZvyJCucy7KAw,2297
 wbreport/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbreport/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbreport/templatetags/portfolio_tags.py,sha256=N2MC_6iFcUAFDH5Wx5rD1-PVK_Ltq4VPIoq7WL4aXGQ,900
 wbreport/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbreport/tests/conftest.py,sha256=oMidAuP41_yxMubUDUpqcsW_YslEq_CyPmfD11CUPhY,745
-wbreport/tests/test_models.py,sha256=nCBcCLBylZsFMSgkU6mm4iQdoPVRuS42taCI0pb6Gx4,11292
-wbreport/tests/test_tasks.py,sha256=icRtEyAtKfhxyx_oN6cYtkUA4QMaGwEpdKKhc07OPKc,762
+wbreport/tests/test_models.py,sha256=jJ_Am79tf8gX7lUpheV9dhe-rZu7UlOSG5dE3RGcqU8,11293
+wbreport/tests/test_tasks.py,sha256=_u2Ns4w8aHTXrMscodv4lOPhrgV2EkVwMhnEttkwcLM,763
 wbreport/tests/test_viewsets.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbreport/tests/tests.py,sha256=j2A1uu5DtGu2w056j0S4O7u2OxylldMPCmr7bbSOvfk,282
 wbreport/viewsets/__init__.py,sha256=iEgYvZsLxQ3Hhf1hwHVdSD7Dm1OZK1Z6qhvTADqs-oc,322
-wbreport/viewsets/viewsets.py,sha256=IDHm-38_i-hcwODz9v6zUXQBUQq2rYqHLXICEUqsx-8,13746
+wbreport/viewsets/viewsets.py,sha256=NAk5rdBn8NYPEx94AH8hGthDN1HtjmpG2w7OskSWlNg,13998
 wbreport/viewsets/configs/__init__.py,sha256=WDvXbmGKD6_DP3nongBzL6lOHYwz5JC0gWtS1C2N4FY,535
-wbreport/viewsets/configs/buttons.py,sha256=jJYCTpE9mT1VF6zdrGipenw2fZPE2P5_wbitz4R-XAw,8912
-wbreport/viewsets/configs/displays.py,sha256=py3Wcut9uKmer7LV-ftIi0xU97PFctJT-yKZmdgc8qk,4897
-wbreport/viewsets/configs/endpoints.py,sha256=LdGFUYMNUHt6qBORnu4IR8Vn2qIIv2Q2TLOs0-cGH0g,1060
+wbreport/viewsets/configs/buttons.py,sha256=e2B3UNMysLWwS4k5HiHrnVVAdABstzAwc0R9oR8mTNk,9364
+wbreport/viewsets/configs/displays.py,sha256=No-JZ9JC-wtFGqsrNk7_NX5I3RaHWZkG2hJuuwlPkGs,5705
+wbreport/viewsets/configs/endpoints.py,sha256=2k2aPoAo4Nq8czbYWLqz2hBbdgPAOk91GSUCt7twA_E,651
 wbreport/viewsets/configs/menus.py,sha256=trDZsdjXip8KQ4SY1uIudZWFqwb3rQHIRSU36dzRzy0,269
 wbreport/viewsets/configs/titles.py,sha256=bAfruj40yHrSUPzuJ7WGlfJDl7NXXKSaTqITPNn4eJA,783
-wbreport-1.49.5.dist-info/METADATA,sha256=Y3UMiV8gCxtSuGX25dSGQOb7E7CYBPAaOM61IrAu0e4,186
-wbreport-1.49.5.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbreport-1.49.5.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbreport-1.49.5.dist-info/RECORD,,
+wbreport-1.60.1.dist-info/METADATA,sha256=o8ekY77q4ZL5VKh8XZkxywjHnj3Rk0gC-EKXqq6xidk,186
+wbreport-1.60.1.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+wbreport-1.60.1.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbreport-1.60.1.dist-info/RECORD,,

{wbreport-1.49.5.dist-info → wbreport-1.60.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any