wbfdm 1.49.5__py2.py3-none-any.whl → 1.59.4__py2.py3-none-any.whl

wbfdm/viewsets/configs/display/instrument_prices.py

@@ -37,70 +37,6 @@ perf_formatting_rules_bold = [
     ),
 ]
 
-instrument_formatting_rules = [
-    dp.Formatting(
-        column="instrument_vs_benchmark",
-        formatting_rules=[
-            dp.FormattingRule(
-                style={"color": WBColor.GREEN_DARK.value},
-                condition=("==", True),
-            ),
-            dp.FormattingRule(
-                style={"color": WBColor.RED_DARK.value},
-                condition=("==", False),
-            ),
-        ],
-    ),
-]
-
-benchmark_formatting_rules = [
-    dp.Formatting(
-        column="instrument_vs_benchmark",
-        formatting_rules=[
-            dp.FormattingRule(
-                style={"color": WBColor.GREEN_DARK.value},
-                condition=("==", False),
-            ),
-            dp.FormattingRule(
-                style={"color": WBColor.RED_DARK.value},
-                condition=("==", True),
-            ),
-        ],
-    ),
-]
-
-instrument_one_year_formatting_rules = [
-    dp.Formatting(
-        column="instrument_vs_benchmark_one_year",
-        formatting_rules=[
-            dp.FormattingRule(
-                style={"color": WBColor.GREEN_DARK.value},
-                condition=("==", True),
-            ),
-            dp.FormattingRule(
-                style={"color": WBColor.RED_DARK.value},
-                condition=("==", False),
-            ),
-        ],
-    ),
-]
-
-benchmark_one_year_formatting_rules = [
-    dp.Formatting(
-        column="instrument_vs_benchmark_one_year",
-        formatting_rules=[
-            dp.FormattingRule(
-                style={"color": WBColor.GREEN_DARK.value},
-                condition=("==", False),
-            ),
-            dp.FormattingRule(
-                style={"color": WBColor.RED_DARK.value},
-                condition=("==", True),
-            ),
-        ],
-    ),
-]
-
 
 class InstrumentPriceDisplayConfig(DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
@@ -170,19 +106,15 @@ class FinancialStatisticsInstrumentPandasDisplayConfig(DisplayViewConfig):
                         ),
                     ],
                 ),
-                dp.Field(
-                    key="instrument_statistics", label="Instrument", formatting_rules=instrument_formatting_rules
-                ),
-                dp.Field(key="benchmark_statistics", label="Benchmark", formatting_rules=benchmark_formatting_rules),
+                dp.Field(key="instrument_statistics", label="Instrument"),
+                dp.Field(key="benchmark_statistics", label="Benchmark"),
                 dp.Field(
                     key="instrument_one_year",
                     label="Instrument - One Year",
-                    formatting_rules=instrument_one_year_formatting_rules,
                 ),
                 dp.Field(
                     key="benchmark_one_year",
                     label="Benchmark - One Year",
-                    formatting_rules=benchmark_one_year_formatting_rules,
                 ),
             ]
         )

wbfdm/viewsets/configs/display/instruments.py

@@ -67,13 +67,14 @@ class InstrumentDisplayConfig(DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         return dp.ListDisplay(
             fields=[
+                dp.Field(key="name", label=_("Name"), pinned="left"),
                 dp.Field(
                     key=None,
                     label=_("Information"),
                     open_by_default=False,
                     children=[
                         dp.Field(key="instrument_type", label=_("Instrument Type"), show="open"),
-                        dp.Field(key="exchange", label=_("Exchange"), show="open"),
+                        dp.Field(key="exchange", label=_("Exchange")),
                         dp.Field(key="isin", label=_("ISIN")),
                         dp.Field(key="ticker", label=_("Ticker")),
                         dp.Field(key="refinitiv_identifier_code", label=_("RIC")),
@@ -100,14 +101,12 @@ class InstrumentDisplayConfig(DisplayViewConfig):
                 get_statistic_field(),
             ],
             tree=True,
-            tree_group_pinned="left",
             tree_group_field="name",
-            tree_group_label="Name",
             tree_group_level_options=[
                 dp.TreeGroupLevelOption(
                     filter_key="parent",
                     filter_depth=1,
-                    # lookup="id_repr",
+                    filter_blacklist=["parent__isnull"],
                     list_endpoint=reverse(
                         "wbfdm:instrument-list",
                         args=[],

wbfdm/viewsets/configs/display/instruments_relationships.py

@@ -52,7 +52,9 @@ class ClassifiedInstrumentDisplayConfig(DisplayViewConfig):
         if group := self.view.classification_group:
             fields = [dp.Field(key="instrument", label="Instrument")]
             level_representations = group.get_levels_representation()
-            for key, label in zip(reversed(group.get_fields_names(sep="_")), reversed(level_representations[1:])):
+            for key, label in zip(
+                reversed(group.get_fields_names(sep="_")), reversed(level_representations[1:]), strict=False
+            ):
                 fields.append(
                     dp.Field(key=f"classification_{key}", label=label),
                 )

wbfdm/viewsets/configs/display/prices.py

@@ -17,5 +17,6 @@ class InstrumentPriceDisplayConfig(DisplayViewConfig):
                 dp.Field(key="volume", label=_("Volume")),
                 dp.Field(key="outstanding_shares", label=_("Oustanding Shares")),
                 dp.Field(key="market_capitalization", label=_("Market Cap.")),
+                dp.Field(key="market_capitalization_consolidated", label=_("Market Cap. (Consolidated)")),
             ],
         )

wbfdm/viewsets/configs/display/statement_with_estimates.py

@@ -70,6 +70,7 @@ class StatementWithEstimatesDisplayViewConfig(DisplayViewConfig):
 
         return dp.ListDisplay(
             fields=[
+                dp.Field(key="financial", label="Financial", pinned="left"),
                 dp.Field(key="progress", label="Yearly Trend", pinned="left"),
                 *map(generate_year_field, self.view.year_columns),
             ],
@@ -87,8 +88,6 @@ class StatementWithEstimatesDisplayViewConfig(DisplayViewConfig):
             # ],
             tree=True,
             tree_group_field="financial",
-            tree_group_label="Financial",
-            tree_group_pinned="left",
             tree_group_level_options=[
                 dp.TreeGroupLevelOption(
                     list_endpoint=reverse(

wbfdm/viewsets/configs/endpoints/classifications.py

@@ -28,23 +28,11 @@ class ClassificationTreeChartEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
 
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbfdm:classificationgroup-treechart-list", args=[self.view.kwargs["group_id"]], request=self.request
-        )
-
 
 class ClassificationIcicleChartEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
 
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbfdm:classificationgroup-iciclechart-list",
-            args=[self.view.kwargs["group_id"]],
-            request=self.request,
-        )
-
 
 class InstrumentClassificationThroughEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):

wbfdm/viewsets/configs/endpoints/instrument_prices.py

@@ -6,9 +6,6 @@ class InstrumentPriceInstrumentEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
         return None
 
-    def get_list_endpoint(self, **kwargs):
-        return reverse("wbfdm:instrument-price-list", [self.view.kwargs["instrument_id"]], request=self.request)
-
 
 class InstrumentPriceStatisticsInstrumentEndpointConfig(EndpointViewConfig):
     def get_endpoint(self, **kwargs):
@@ -20,32 +17,16 @@ class InstrumentPriceStatisticsInstrumentEndpointConfig(EndpointViewConfig):
 
 
 class MonthlyPerformancesInstrumentEndpointConfig(InstrumentPriceInstrumentEndpointConfig):
-    def get_list_endpoint(self, **kwargs):
-        return reverse("wbfdm:monthly_performances-list", [self.view.kwargs["instrument_id"]], request=self.request)
+    pass
 
 
 class FinancialStatisticsInstrumentEndpointConfig(InstrumentPriceInstrumentEndpointConfig):
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbfdm:instrument-financialstatistics-list",
-            [self.view.kwargs["instrument_id"]],
-            request=self.request,
-        )
+    pass
 
 
 class InstrumentPriceInstrumentDistributionReturnsChartEndpointConfig(EndpointViewConfig):
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbfdm:instrument-distributionreturnschart-list",
-            args=[self.view.kwargs["instrument_id"]],
-            request=self.request,
-        )
+    pass
 
 
 class BestAndWorstReturnsInstrumentEndpointConfig(EndpointViewConfig):
-    def get_list_endpoint(self, **kwargs):
-        return reverse(
-            "wbfdm:instrument-bestandworstreturns-list",
-            [self.view.kwargs["instrument_id"]],
-            request=self.request,
-        )
+    pass

wbfdm/viewsets/configs/titles/instrument_prices.py

@@ -31,7 +31,8 @@ class MonthlyPerformancesInstrumentTitleConfig(TitleViewConfig):
 
 class InstrumentTitleConfigMixin(TitleViewConfig):
     def get_list_title(self):
-        assert self.message, "No message has been set"
+        if not self.message:
+            raise AssertionError("No message has been set")
         instrument = Instrument.objects.get(id=self.view.kwargs["instrument_id"])
         return f"{self.message} {str(instrument)}"
 

wbfdm/viewsets/esg.py

@@ -66,8 +66,8 @@ class InstrumentESGPAIViewSet(InstrumentMixin, ExportPandasAPIViewSet):
     def get_dataframe(self, request, queryset, **kwargs):
         df = pd.DataFrame(queryset.dl.esg(values=list(ESG))).reset_index()
         if not df.empty:
-            ESG_mapping = ESG.mapping()
+            esg_mapping = ESG.mapping()
             df[["section", "asi", "metric", "factor"]] = pd.DataFrame(
-                df.factor_code.map(ESG_mapping).tolist(), index=df.index
+                df.factor_code.map(esg_mapping).tolist(), index=df.index
             )
         return df

wbfdm/viewsets/financial_analysis/financial_metric_analysis.py

@@ -48,8 +48,8 @@ class FinancialMetricAnalysisPandasViewSet(InstrumentMixin, ExportPandasAPIViewS
         if group_keys := request.GET.get("group_keys"):
             try:
                 financial = Financial(group_keys.lower())
-            except ValueError:
-                raise ParseError()
+            except ValueError as e:
+                raise ParseError() from e
             df, self._estimate_mapping, self._columns = financial_metric_estimate_analysis(
                 queryset.first().id, financial
             )

wbfdm/viewsets/financial_analysis/financial_ratio_analysis.py

@@ -43,7 +43,7 @@ class ValuationRatioChartViewSet(InstrumentMixin, viewsets.TimeSeriesChartViewSe
         fig = go.Figure()
         colors = iter(px.colors.qualitative.T10)
 
-        for ratio, color in zip(ratios, colors):
+        for ratio, color in zip(ratios, colors, strict=False):
             with suppress(AttributeError):
                 series = getattr(df, ratio.value)
 

wbfdm/viewsets/financial_analysis/financial_summary.py

@@ -97,10 +97,10 @@ class FinancialSummary(InstrumentMixin, ExportPandasAPIViewSet):
 
             # Adjust the columns to be in a different format
             df.index = df.index.map(lambda x: x.strftime("%b/%y"))
-            MAX_ROW = 8
-            if df.shape[0] > MAX_ROW:
+            max_row = 8
+            if df.shape[0] > max_row:
                 df = df.iloc[1:]  # remove first row
-                df = df.iloc[0 : min([df.shape[0], MAX_ROW])]  # keep only 8 row maximum
+                df = df.iloc[0 : min([df.shape[0], max_row])]  # keep only 8 row maximum
 
             self._estimate_columns = df["estimate"].to_dict()
             df = df.drop(columns=["estimate"], errors="ignore")
@@ -190,7 +190,7 @@ class FinancialSummary(InstrumentMixin, ExportPandasAPIViewSet):
         return getattr(self, "_estimate_columns", {})
 
     @cached_property
-    def FINANCIAL_VALUES(self) -> list[Financial]:
+    def FINANCIAL_VALUES(self) -> list[Financial]:  # noqa
         return [
             Financial.REVENUE,  # SAL
             Financial.GROSS_PROFIT,  # GRI
@@ -216,7 +216,7 @@ class FinancialSummary(InstrumentMixin, ExportPandasAPIViewSet):
         ]
 
     @cached_property
-    def FIELDS(self) -> list[str]:
+    def FIELDS(self) -> list[str]:  # noqa
         return [
             "revenue",
             "revenue_growth",
@@ -240,7 +240,7 @@ class FinancialSummary(InstrumentMixin, ExportPandasAPIViewSet):
         ]
 
     @property
-    def LABELS(self) -> list[str]:
+    def LABELS(self) -> list[str]:  # noqa
         currency_key = self.instrument.currency.key if self.instrument.currency else "N.A."
         return [
             f"in {currency_key} MN",

wbfdm/viewsets/financial_analysis/statement_with_estimates.py

@@ -63,7 +63,7 @@ class StatementWithEstimatesPandasViewSet(InstrumentMixin, ExportPandasAPIViewSe
                 pf.CharField(key="financial", label="Financial"),
                 pf.CharField(key="_group_key", label="Group Key"),
                 pf.JsonField(key="_overwrites", label="Overwrites"),
-                pf.SparklineField(key="progress", label="Yearly Trend"),
+                pf.SparklineField(key="progress", label="Yearly Trend", dimension="double"),
             ]
         )
 
@@ -76,7 +76,11 @@ class StatementWithEstimatesPandasViewSet(InstrumentMixin, ExportPandasAPIViewSe
 
         year_columns = list(filter(lambda col: "Y" in col, df.columns))
         if year_columns:
-            df["progress"] = df[year_columns].replace([np.inf, -np.inf, np.nan], None).apply(list, axis=1)
+            df["progress"] = (
+                df[year_columns]
+                .replace([np.inf, -np.inf, np.nan], None)
+                .apply(lambda x: list(x.to_dict().items()), axis=1)
+            )
 
         self.extra_cache_kwargs["_estimate_mapping"] = financial_analysis_result.estimated_mapping
         self.extra_cache_kwargs["_columns"] = df.columns
@@ -135,7 +139,7 @@ class StatementWithEstimatesPandasViewSet(InstrumentMixin, ExportPandasAPIViewSe
         return self.df.columns
 
     def get_ordering_fields(self):
-        return self.columns
+        return [x for x in self.columns if x != "progress"]
 
     @cached_property
     def year_columns(self):

wbfdm/viewsets/instruments/financials_analysis.py

@@ -118,7 +118,7 @@ class ValuationRatiosChartView(InstrumentMixin, viewsets.ChartViewSet):
     filterset_class = FinancialAnalysisValuationRatiosFilterSet
     LIST_DOCUMENTATION = "wbfdm/markdown/documentation/financial_analysis_instrument_ratios.md"
 
-    def get_plotly(self, queryset):
+    def get_plotly(self, queryset):  # noqa: C901
         # Set plotly as the default plotting lib
         pd.options.plotting.backend = "plotly"
 
@@ -297,7 +297,7 @@ class ValuationRatiosChartView(InstrumentMixin, viewsets.ChartViewSet):
 
                 fig = go.Figure()
                 dates = []
-                for index, single_date in enumerate(daterange(date1, date2)):
+                for single_date in daterange(date1, date2):
                     ratio_trace = ratios[
                         (ratios["datetxt"] == single_date.strftime("%Y-%m-%d")) & (ratios[z_axis] > 0)
                     ]
@@ -424,16 +424,13 @@ class ValuationRatiosChartView(InstrumentMixin, viewsets.ChartViewSet):
             if not ranges:
                 fig = make_subplots(specs=[[{"secondary_y": True}]])
 
-                for index, plot in enumerate(
-                    [
-                        ("pe", "#ff6361", VariableChoices.PE.chart_label, VariableChoices.PE, False),
-                        ("peg", "#ffa600", VariableChoices.PEG.chart_label, VariableChoices.PEG, True),
-                        ("ps", "#58508d", VariableChoices.PS.chart_label, VariableChoices.PS, False),
-                        ("evebitda", "#003f5c", VariableChoices.EVEBITDA.chart_label, VariableChoices.EVEBITDA, False),
-                        ("pfcf", "#bc5090", VariableChoices.PFCF.chart_label, VariableChoices.PFCF, False),
-                    ],
-                    start=1,
-                ):
+                for plot in [
+                    ("pe", "#ff6361", VariableChoices.PE.chart_label, VariableChoices.PE, False),
+                    ("peg", "#ffa600", VariableChoices.PEG.chart_label, VariableChoices.PEG, True),
+                    ("ps", "#58508d", VariableChoices.PS.chart_label, VariableChoices.PS, False),
+                    ("evebitda", "#003f5c", VariableChoices.EVEBITDA.chart_label, VariableChoices.EVEBITDA, False),
+                    ("pfcf", "#bc5090", VariableChoices.PFCF.chart_label, VariableChoices.PFCF, False),
+                ]:
                     fig.add_trace(
                         go.Scatter(
                             x=ratios["date"],

wbfdm/viewsets/instruments/instrument_prices.py

@@ -174,22 +174,22 @@ class InstrumentPriceInstrumentStatisticsChartView(InstrumentMixin, viewsets.Cha
 
         if self.instrument.related_instruments.count() > 0:
             reference = self.instrument.related_instruments.first().name_repr
-            risk = self.instrument.primary_risk_instrument.name_repr
             df = pd.DataFrame(queryset.values("date", "sharpe_ratio", "correlation", "beta")).replace(
                 [np.inf, -np.inf], np.nan
             )
 
             if not df.empty:
                 df = df.set_index("date").sort_index().dropna()
-                fig.add_trace(
-                    go.Scatter(
-                        x=df.index,
-                        y=df.sharpe_ratio,
-                        mode="lines",
-                        name=f"Sharpe Ratio ({risk})",
-                        hovertemplate=get_hovertemplate_timeserie(currency=""),
+                if risk_instrument := self.instrument.primary_risk_instrument:
+                    fig.add_trace(
+                        go.Scatter(
+                            x=df.index,
+                            y=df.sharpe_ratio,
+                            mode="lines",
+                            name=f"Sharpe Ratio ({risk_instrument.name_repr})",
+                            hovertemplate=get_hovertemplate_timeserie(currency=""),
+                        )
                     )
-                )
                 fig.add_trace(
                     go.Scatter(
                         x=df.index,

wbfdm/viewsets/instruments/instruments.py

@@ -2,6 +2,7 @@ from django.db.models import Case, Exists, F, IntegerField, OuterRef, When
 from rest_framework.filters import OrderingFilter
 from wbcore import viewsets
 from wbcore.contrib.guardian.filters import ObjectPermissionsFilter
+from wbcore.pagination import LimitOffsetPagination
 from wbcore.viewsets.mixins import DjangoFilterBackend
 
 from wbfdm.contrib.metric.backends.performances import PERFORMANCE_METRIC
@@ -35,23 +36,23 @@ class InstrumentTypeRepresentationViewSet(viewsets.RepresentationViewSet):
 
 
 class InstrumentRepresentationViewSet(viewsets.RepresentationViewSet):
-    filter_backends = (InstrumentSearchFilter, ObjectPermissionsFilter, DjangoFilterBackend, OrderingFilter)
-
+    filter_backends = (ObjectPermissionsFilter, DjangoFilterBackend, OrderingFilter, InstrumentSearchFilter)
+    pagination_class = LimitOffsetPagination
     queryset = Instrument.objects.annotate_base_data().exclude(name="")
     serializer_class = InstrumentRepresentationSerializer
-    search_fields = ("name", "name_repr", "isin", "ticker")
+    search_fields = ("name", "name_repr", "isin", "ticker", "computed_str")
 
     filterset_class = InstrumentFilterSet
     ordering_fields = ("title", "ticker")
-    ordering = ["-search_rank"]
+    ordering = ["name_repr"]
 
 
 class InstrumentModelViewSet(InstrumentMetricMixin, viewsets.ModelViewSet):
     METRIC_KEYS = (PERFORMANCE_METRIC, STATISTICS_METRIC)
     METRIC_SHOW_AGGREGATES = False
-    filter_backends = (InstrumentSearchFilter, ObjectPermissionsFilter, DjangoFilterBackend, OrderingFilter)
+    filter_backends = (ObjectPermissionsFilter, DjangoFilterBackend, OrderingFilter, InstrumentSearchFilter)
 
-    queryset = Instrument.objects.annotate_all()
+    queryset = Instrument.objects.annotate_all().exclude(name="")
     serializer_class = InstrumentModelListSerializer
     ordering_fields = (
         "instrument_type",
@@ -70,7 +71,7 @@ class InstrumentModelViewSet(InstrumentMetricMixin, viewsets.ModelViewSet):
         "refinitiv_identifier_code",
         "refinitiv_mnemonic_code",
     )
-    ordering = ["-search_rank"]
+    ordering = ["name_repr"]
 
     def get_serializer_class(self):
         if self.get_action() in ["list", "list-metadata"]:
@@ -102,6 +103,7 @@ class InstrumentModelViewSet(InstrumentMetricMixin, viewsets.ModelViewSet):
 
 class ChildrenInstrumentModelViewSet(InstrumentMixin, InstrumentModelViewSet):
     button_config_class = ChildrenInstrumentModelViewConfig
+    ordering = ("-is_primary", "computed_str")
 
     def get_queryset(self):
         return super().get_queryset().filter(parent=self.instrument)

wbfdm/viewsets/instruments/utils.py

@@ -12,7 +12,7 @@ class InstrumentSearchFilter:
         if search := request.GET.get("search", None):
             min_search_rank = self.get_min_search_rank(view)
             query = SearchQuery(search, search_type="phrase")
-            queryset = (
+            return (
                 queryset.annotate(search_rank=Coalesce(SearchRank(F("search_vector"), query), Value(-1.0)))
                 .filter(
                     (Q(search_vector=query) & Q(search_rank__gte=min_search_rank))
@@ -22,6 +22,6 @@ class InstrumentSearchFilter:
                 )
                 .order_by("-search_rank")
             ).distinct()
-        else:
-            queryset = queryset.annotate(search_rank=Value(-1.0))
+        elif "parent" in request.GET:
+            return queryset.order_by("-is_primary", "computed_str")
         return queryset

wbfdm/viewsets/market_data.py

@@ -150,7 +150,7 @@ class MarketDataChartViewSet(InstrumentMixin, viewsets.TimeSeriesChartViewSet):
         )
         fig.update_xaxes(rangebreaks=[{"pattern": "day of week", "bounds": [6, 1]}])
 
-        for i, d in enumerate(fig.data):
+        for d in fig.data:
             with suppress(AttributeError, IndexError, ValueError):  # Either Candlestick or OHCL
                 if (y := d.y[-1]) is not None:
                     text_value = (

wbfdm/viewsets/prices.py

@@ -34,6 +34,11 @@ class InstrumentPriceViewSet(InstrumentMixin, ExportPandasAPIViewSet):
             pf.FloatField(
                 key="market_capitalization", label="market_capitalization", display_mode=DisplayMode.SHORTENED
             ),
+            pf.FloatField(
+                key="market_capitalization_consolidated",
+                label="market_capitalization_consolidated",
+                display_mode=DisplayMode.SHORTENED,
+            ),
         )
     )
     permission_classes = []

wbfdm/viewsets/statements/statements.py

@@ -53,8 +53,12 @@ class StatementPandasViewSet(InstrumentMixin, ExportPandasAPIViewSet):
                 pf.PKField(key="external_ordering", label="ID"),
                 pf.CharField(key="external_code", label="Code"),
                 pf.CharField(key="external_description", label="Description"),
-                pf.SparklineField(key="progress", label="Yearly Trend"),
-                *[pf.FloatField(key=field, label=field, display_mode=DisplayMode.SHORTENED) for field in self.columns],
+                pf.SparklineField(key="progress", label="Yearly Trend", dimension="double"),
+                *[
+                    pf.FloatField(key=field, label=field, display_mode=DisplayMode.SHORTENED)
+                    for field in self.columns
+                    if field not in ["external_ordering", "external_code", "external_description", "progress"]
+                ],
             ]
         )
 
@@ -83,7 +87,7 @@ class StatementPandasViewSet(InstrumentMixin, ExportPandasAPIViewSet):
     def manipulate_dataframe(self, df):
         if not df.empty:
             if year_cols := [col for col in df.columns if isinstance(col, str) and "Y" in col]:
-                df["progress"] = df[year_cols].fillna(0).apply(list, axis=1)
+                df["progress"] = df[year_cols].fillna(0).apply(lambda x: list(x.to_dict().items()), axis=1)
         return df
 
     @cached_property

{wbfdm-1.49.5.dist-info → wbfdm-1.59.4.dist-info}/METADATA

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.49.5
+Version: 1.59.4
 Summary: The workbench module ensures rapid access to diverse financial data (market, fundamental, forecasts, ESG), with features for storing instruments, classifying them, and conducting financial analysis.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: roman==4.*
+Requires-Dist: ruptures==1.1.*
 Requires-Dist: sentry-sdk==2.*
 Requires-Dist: stockstats==0.6.*
 Requires-Dist: wbcore