wbportfolio 1.46.5__py2.py3-none-any.whl → 1.46.7__py2.py3-none-any.whl

wbportfolio/import_export/handlers/trade.py

@@ -144,7 +144,9 @@ class TradeImportHandler(ImportExportHandler):
 
     def _get_history(self, history: Dict[str, Any]) -> models.QuerySet:
         if trade_proposal_id := history.get("trade_proposal_id"):
-            trades = self.model.objects.filter(trade_proposal_id=trade_proposal_id)
+            # if a trade proposal is provided, we delete the existing history first as otherwise, it would mess with the target weight computation
+            self.model.objects.filter(trade_proposal_id=trade_proposal_id).delete()
+            trades = self.model.objects.none()
         else:
             trades = self.model.objects.filter(
                 exclude_from_history=False,

wbportfolio/models/transactions/trade_proposals.py

@@ -184,14 +184,21 @@ class TradeProposal(RiskCheckMixin, WBModel):
         service = TradingService(self.trade_date, trades_batch=self._build_dto())
         service.normalize()
         leftovers_trades = self.trades.all()
-        for _, trade in service.trades_batch.trades_map.items():
+        total_target_weight = Decimal("0.0")
+        for underlying_instrument_id, trade_dto in service.trades_batch.trades_map.items():
             with suppress(Trade.DoesNotExist):
-                trade = Trade.objects.get(id=trade.id)
-                trade.weighting = trade.delta_weight
+                trade = self.trades.get(underlying_instrument_id=underlying_instrument_id)
+                trade.weighting = round(trade_dto.delta_weight, 6)
                 trade.shares = self.estimate_shares(trade)
                 trade.save()
+                total_target_weight += trade._target_weight
                 leftovers_trades = leftovers_trades.exclude(id=trade.id)
         leftovers_trades.delete()
+        # we handle quantization error due to the decimal max digits. In that case, we take the biggest trade (highest weight) and we remove the quantization error
+        if quantize_error := (total_target_weight - Decimal("1.0")):
+            biggest_trade = self.trades.latest("weighting")
+            biggest_trade.weighting -= quantize_error
+            biggest_trade.save()
 
     def _get_target_portfolio(self, **kwargs) -> PortfolioDTO:
         if self.rebalancing_model:

wbportfolio/models/transactions/trades.py

@@ -406,7 +406,7 @@ class Trade(ShareMixin, Transaction, OrderedModel, WBModel):
         except Product.DoesNotExist:
             return None
 
-    @cached_property
+    @property
     @admin.display(description="Last Effective Date")
     def _last_effective_date(self) -> date:
         if hasattr(self, "last_effective_date"):
@@ -420,7 +420,7 @@ class Trade(ShareMixin, Transaction, OrderedModel, WBModel):
         ).exists():
             return assets.latest("date").date
 
-    @cached_property
+    @property
     @admin.display(description="Effective Weight")
     def _effective_weight(self) -> Decimal:
         return getattr(
@@ -434,7 +434,7 @@ class Trade(ShareMixin, Transaction, OrderedModel, WBModel):
             or Decimal(0),
         )
 
-    @cached_property
+    @property
     @admin.display(description="Effective Shares")
     def _effective_shares(self) -> Decimal:
         return getattr(
@@ -448,12 +448,12 @@ class Trade(ShareMixin, Transaction, OrderedModel, WBModel):
             or Decimal(0),
         )
 
-    @cached_property
+    @property
     @admin.display(description="Target Weight")
     def _target_weight(self) -> Decimal:
         return getattr(self, "target_weight", self._effective_weight + self.weighting)
 
-    @cached_property
+    @property
     @admin.display(description="Target Shares")
     def _target_shares(self) -> Decimal:
         return getattr(self, "target_shares", self._effective_shares + self.shares)
@@ -483,6 +483,11 @@ class Trade(ShareMixin, Transaction, OrderedModel, WBModel):
         ]
         # notification_email_template = "portfolio/email/trade_notification.html"
 
+    def __init__(self, *args, target_weight: Decimal | None = None, **kwargs):
+        super().__init__(*args, **kwargs)
+        if target_weight is not None:  # if target weight is provided, we guess the corresponding weighting
+            self.weighting = Decimal(target_weight) - self._effective_weight
+
     def save(self, *args, **kwargs):
         if self.trade_proposal:
             self.portfolio = self.trade_proposal.portfolio

wbportfolio/pms/typing.py

@@ -4,7 +4,6 @@ from decimal import Decimal
 
 import pandas as pd
 from django.core.exceptions import ValidationError
-from django.utils.functional import cached_property
 
 
 @dataclass(frozen=True)
@@ -60,11 +59,11 @@ class Portfolio:
                 positions_map[pos.underlying_instrument] = pos
         object.__setattr__(self, "positions_map", positions_map)
 
-    @cached_property
+    @property
     def total_weight(self):
         return round(sum([pos.weighting for pos in self.positions]), 6)
 
-    @cached_property
+    @property
     def total_shares(self):
         return sum([pos.target_shares for pos in self.positions if pos.target_shares is not None])
 
@@ -108,7 +107,7 @@ class Trade:
             },
         )
 
-    @cached_property
+    @property
     def delta_weight(self) -> Decimal:
         return self.target_weight - self.effective_weight
 
@@ -141,15 +140,15 @@ class TradeBatch:
                 trade_map[trade.underlying_instrument] = trade
         object.__setattr__(self, "trades_map", trade_map)
 
-    @cached_property
+    @property
     def total_target_weight(self) -> Decimal:
         return round(sum([trade.target_weight for trade in self.trades]), 6)
 
-    @cached_property
+    @property
     def total_effective_weight(self) -> Decimal:
         return round(sum([trade.effective_weight for trade in self.trades]), 6)
 
-    @cached_property
+    @property
     def totat_abs_delta_weight(self) -> Decimal:
         return sum([abs(trade.delta_weight) for trade in self.trades])
 

wbportfolio/rebalancing/models/market_capitalization_weighted.py

@@ -26,21 +26,22 @@ class MarketCapitalizationRebalancing(AbstractRebalancingModel):
         self.market_cap_df = pd.DataFrame(
             instruments.dl.market_data(
                 values=[MarketData.MARKET_CAPITALIZATION],
-                from_date=self.last_effective_date,
-                to_date=self.trade_date,
+                exact_date=self.last_effective_date,
                 target_currency=self.TARGET_CURRENCY,
             )
         )
         self.exchange_df = pd.DataFrame(
             instruments.values_list("id", "exchange"), columns=["id", "exchange"]
         ).set_index("id")
+        instrument_ids = list(instruments.values_list("id", flat=True))
         try:
-            self.market_cap_df = self.market_cap_df[
-                ["valuation_date", "market_capitalization", "instrument_id"]
-            ].pivot_table(index="valuation_date", columns="instrument_id", values="market_capitalization")
-            # self.market_cap_df = df.iloc[-1, :].transpose()
+            self.market_cap_df = (
+                self.market_cap_df[["market_capitalization", "instrument_id"]]
+                .set_index("instrument_id")["market_capitalization"]
+                .reindex(instrument_ids)
+            )
         except (IndexError, KeyError):
-            self.market_cap_df = pd.DataFrame()
+            self.market_cap_df = pd.Series(dtype="float64", index=instrument_ids)
 
     def _get_instruments(
         self,
@@ -90,11 +91,8 @@ class MarketCapitalizationRebalancing(AbstractRebalancingModel):
 
     def is_valid(self) -> bool:
         if not self.market_cap_df.empty:
-            trade_date_mktp_cap = (
-                self.market_cap_df.loc[self.trade_date, :].transpose().rename("market_capitalization")
-            )
             df = pd.concat(
-                [trade_date_mktp_cap, self.exchange_df], axis=1
+                [self.market_cap_df, self.exchange_df], axis=1
             )  # if we are missing any market cap for not-delisted instrument, we consider the rebalancing not valid
             df = df.groupby("exchange", dropna=False)["market_capitalization"].any()
             missing_exchanges = Exchange.objects.filter(id__in=df[~df].index.to_list())
@@ -109,10 +107,9 @@ class MarketCapitalizationRebalancing(AbstractRebalancingModel):
 
     def get_target_portfolio(self) -> Portfolio:
         positions = []
-        market_cap_df = self.market_cap_df.ffill().loc[self.trade_date, :].transpose()
-        total_market_cap = market_cap_df.sum()
+        total_market_cap = self.market_cap_df.sum()
 
-        for underlying_instrument, market_cap in market_cap_df.to_dict().items():
+        for underlying_instrument, market_cap in self.market_cap_df.to_dict().items():
             positions.append(
                 Position(
                     underlying_instrument=underlying_instrument,

wbportfolio/serializers/transactions/trade_proposals.py

@@ -56,6 +56,8 @@ class TradeProposalModelSerializer(wb_serializers.ModelSerializer):
             res["replay"] = reverse("wbportfolio:tradeproposal-replay", args=[instance.id], request=request)
         if instance.status == TradeProposal.Status.DRAFT:
             res["reset"] = reverse("wbportfolio:tradeproposal-reset", args=[instance.id], request=request)
+            res["normalize"] = reverse("wbportfolio:tradeproposal-normalize", args=[instance.id], request=request)
+            res["deleteall"] = reverse("wbportfolio:tradeproposal-deleteall", args=[instance.id], request=request)
         res["trades"] = reverse(
             "wbportfolio:tradeproposal-trade-list",
             args=[instance.id],

wbportfolio/tests/rebalancing/test_models.py

@@ -139,20 +139,19 @@ class TestMarketCapitalizationRebalancing:
         i1 = instrument_factory()
         i2 = instrument_factory()
         instrument_price_factory.create(instrument=i1, date=last_effective_date)
-        instrument_price_factory.create(instrument=i1, date=weekday)
-        instrument_price_factory.create(instrument=i2, date=last_effective_date)  # weekday is ffill
+        instrument_price_factory.create(instrument=i2, date=last_effective_date)
         return MarketCapitalizationRebalancing(portfolio, weekday, last_effective_date, instrument_ids=[i1.id, i2.id])
 
     def test_is_valid(self, portfolio, weekday, model, instrument_factory, instrument_price_factory):
-        assert not model.is_valid()
-        i2 = model.market_cap_df.columns[1]
-        model.market_cap_df.loc[weekday, i2] = 1000  # some value
         assert model.is_valid()
+        i2 = model.market_cap_df.index[1]
+        model.market_cap_df.loc[i2] = None  # some value
+        assert not model.is_valid()
 
     def test_get_target_portfolio(self, portfolio, weekday, model, asset_position_factory):
-        i1 = model.market_cap_df.columns[0]
-        i2 = model.market_cap_df.columns[1]
-        mkt12 = InstrumentPrice.objects.get(instrument_id=i1, date=model.trade_date).market_capitalization
+        i1 = model.market_cap_df.index[0]
+        i2 = model.market_cap_df.index[1]
+        mkt12 = InstrumentPrice.objects.get(instrument_id=i1, date=model.last_effective_date).market_capitalization
         mkt21 = InstrumentPrice.objects.get(instrument_id=i2, date=model.last_effective_date).market_capitalization
 
         target_portfolio = model.get_target_portfolio()

wbportfolio/viewsets/assets.py

@@ -546,7 +546,7 @@ class CompositionModelPortfolioPandasView(
                     )
                 )
             )
-        df = pd.DataFrame(rows)
+        df = pd.DataFrame(rows, columns=["underlying_instrument", "weighting", "shares", "portfolio"])
         df = df.pivot_table(
             index="underlying_instrument",
             columns=["portfolio"],

wbportfolio/viewsets/configs/buttons/__init__.py

@@ -16,8 +16,7 @@ from .registers import RegisterButtonConfig
 from .trades import (
     TradeButtonConfig,
     TradeInstrumentButtonConfig,
-    TradeProposalButtonConfig,
-    TradeTradeProposalButtonConfig,
 )
+from .trade_proposals import TradeProposalButtonConfig
 from .reconciliations import AccountReconciliationButtonViewConfig, AccountReconciliationLineButtonViewConfig
 from .signals import *

wbportfolio/viewsets/configs/buttons/trade_proposals.py

@@ -7,18 +7,59 @@ from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 class TradeProposalButtonConfig(ButtonViewConfig):
     def get_custom_list_instance_buttons(self):
         return {
-            bt.ActionButton(
-                method=RequestType.PATCH,
-                identifiers=("wbportfolio:tradeproposal",),
-                key="replay",
-                icon=WBIcon.SYNCHRONIZE.icon,
-                label="Replay Trades",
-                description_fields="""
-                <p>Replay Trades. It will recompute all assets positions until next trade proposal day (or today otherwise) </p>
-                """,
-                action_label="Replay Trade",
-                title="Replay Trade",
-            )
+            bt.DropDownButton(
+                label="Tools",
+                buttons=(
+                    bt.ActionButton(
+                        method=RequestType.PATCH,
+                        identifiers=("wbportfolio:tradeproposal",),
+                        key="replay",
+                        icon=WBIcon.SYNCHRONIZE.icon,
+                        label="Replay Trades",
+                        description_fields="""
+                        <p>Replay Trades. It will recompute all assets positions until next trade proposal day (or today otherwise) </p>
+                        """,
+                        action_label="Replay Trade",
+                        title="Replay Trade",
+                    ),
+                    bt.ActionButton(
+                        method=RequestType.PATCH,
+                        identifiers=("wbportfolio:tradeproposal",),
+                        key="reset",
+                        icon=WBIcon.REGENERATE.icon,
+                        label="Reset Trades",
+                        description_fields="""
+                            <p>Delete and recreate initial trades to from its associated model portfolio</p>
+                            """,
+                        action_label="Reset Trades",
+                        title="Reset Trades",
+                    ),
+                    bt.ActionButton(
+                        method=RequestType.PATCH,
+                        identifiers=("wbportfolio:tradeproposal",),
+                        key="normalize",
+                        icon=WBIcon.EDIT.icon,
+                        label="Normalize Trades",
+                        description_fields="""
+                            <p>Make sure all trades normalize to a total target weight of 100%</p>
+                            """,
+                        action_label="Normalize Trades",
+                        title="Normalize Trades",
+                    ),
+                    bt.ActionButton(
+                        method=RequestType.PATCH,
+                        identifiers=("wbportfolio:tradeproposal",),
+                        key="deleteall",
+                        icon=WBIcon.DELETE.icon,
+                        label="Delete All Trades",
+                        description_fields="""
+                    <p>Delete all trades from this trade proposal?</p>
+                    """,
+                        action_label="Delete All Trades",
+                        title="Delete All Trades",
+                    ),
+                ),
+            ),
         }
 
     def get_custom_instance_buttons(self):

wbportfolio/viewsets/configs/buttons/trades.py

@@ -1,12 +1,9 @@
 from rest_framework.reverse import reverse
 from wbcore.contrib.icons import WBIcon
-from wbcore.enums import RequestType
 from wbcore.metadata.configs import buttons as bt
 from wbcore.metadata.configs.buttons.view_config import ButtonViewConfig
 from wbfdm.models import Instrument
 
-from wbportfolio.models import TradeProposal
-
 
 class TradeButtonConfig(ButtonViewConfig):
     def get_custom_list_instance_buttons(self):
@@ -61,85 +58,3 @@ class TradeInstrumentButtonConfig(TradeButtonConfig):
                     )
                 )
         return res
-
-
-class TradeTradeProposalButtonConfig(ButtonViewConfig):
-    def get_custom_buttons(self):
-        if trade_proposal_id := self.view.kwargs.get("trade_proposal_id", None):
-            trade_proposal = TradeProposal.objects.get(id=trade_proposal_id)
-            if trade_proposal.status == TradeProposal.Status.DRAFT:
-                return {
-                    bt.DropDownButton(
-                        label="Tools",
-                        buttons=(
-                            bt.ActionButton(
-                                method=RequestType.PATCH,
-                                identifiers=("wbportfolio:tradeproposal",),
-                                endpoint=reverse(
-                                    "wbportfolio:tradeproposal-reset", args=[trade_proposal_id], request=self.request
-                                ),
-                                icon=WBIcon.REGENERATE.icon,
-                                label="Reset Trade",
-                                description_fields="""
-                                        <p>Delete and recreate initial trades to from its associated model portfolio</p>
-                                        """,
-                                action_label="Reset Trade",
-                                title="Reset Trade",
-                            ),
-                            bt.ActionButton(
-                                method=RequestType.PATCH,
-                                identifiers=("wbportfolio:tradeproposal",),
-                                endpoint=reverse(
-                                    "wbportfolio:tradeproposal-normalize",
-                                    args=[trade_proposal_id],
-                                    request=self.request,
-                                ),
-                                icon=WBIcon.EDIT.icon,
-                                label="Normalize Trades",
-                                description_fields="""
-                                        <p>Make sure all trades normalize to a total target weight of 100%</p>
-                                        """,
-                                action_label="Normalize Trades",
-                                title="Normalize Trades",
-                            ),
-                            bt.ActionButton(
-                                method=RequestType.PATCH,
-                                identifiers=("wbportfolio:tradeproposal",),
-                                endpoint=reverse(
-                                    "wbportfolio:tradeproposal-deleteall",
-                                    args=[trade_proposal_id],
-                                    request=self.request,
-                                ),
-                                icon=WBIcon.DELETE.icon,
-                                label="Delete All Trades",
-                                description_fields="""
-                                <p>Delete all trades from this trade proposal?</p>
-                                """,
-                                action_label="Delete All Trades",
-                                title="Delete All Trades",
-                            ),
-                        ),
-                    )
-                }
-        return {}
-
-
-class TradeProposalButtonConfig(ButtonViewConfig):
-    def get_custom_list_instance_buttons(self):
-        return {
-            bt.ActionButton(
-                method=RequestType.PATCH,
-                identifiers=("wbportfolio:tradeproposal",),
-                key="replay",
-                icon=WBIcon.SYNCHRONIZE.icon,
-                label="Replay Trades",
-                description_fields="""
-                <p>Replay Trades. It will recompute all assets positions until next trade proposal day (or today otherwise) </p>
-                """,
-                action_label="Replay Trade",
-                title="Replay Trade",
-            )
-        }
-
-    def get_custom_instance_buttons(self):
-        return self.get_custom_list_instance_buttons()

wbportfolio/viewsets/transactions/trade_proposals.py

@@ -4,6 +4,7 @@ from datetime import date
 from django.shortcuts import get_object_or_404
 from django.utils.functional import cached_property
 from pandas._libs.tslibs.offsets import BDay
+from rest_framework import status
 from rest_framework.decorators import action
 from rest_framework.response import Response
 from wbcompliance.viewsets.risk_management.mixins import RiskCheckViewSetMixin
@@ -78,6 +79,7 @@ class TradeProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
         if trade_proposal.status == TradeProposal.Status.DRAFT:
             trade_proposal.reset_trades()
             return Response({"send": True})
+        return Response({"status": "Trade proposal is not Draft"}, status=status.HTTP_400_BAD_REQUEST)
 
     @action(detail=True, methods=["PATCH"])
     def normalize(self, request, pk=None):
@@ -85,6 +87,7 @@ class TradeProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
         if trade_proposal.status == TradeProposal.Status.DRAFT:
             trade_proposal.normalize_trades()
             return Response({"send": True})
+        return Response({"status": "Trade proposal is not Draft"}, status=status.HTTP_400_BAD_REQUEST)
 
     @action(detail=True, methods=["PATCH"])
     def replay(self, request, pk=None):
@@ -92,6 +95,7 @@ class TradeProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
         if trade_proposal.portfolio.is_manageable:
             replay_as_task.delay(trade_proposal.id)
             return Response({"send": True})
+        return Response({"status": "Trade proposal is not Draft"}, status=status.HTTP_400_BAD_REQUEST)
 
     @action(detail=True, methods=["PATCH"])
     def deleteall(self, request, pk=None):
@@ -99,6 +103,7 @@ class TradeProposalModelViewSet(CloneMixin, RiskCheckViewSetMixin, InternalUserP
         if trade_proposal.status == TradeProposal.Status.DRAFT:
             trade_proposal.trades.all().delete()
             return Response({"send": True})
+        return Response({"status": "Trade proposal is not Draft"}, status=status.HTTP_400_BAD_REQUEST)
 
 
 class TradeProposalPortfolioModelViewSet(UserPortfolioRequestPermissionMixin, TradeProposalModelViewSet):

wbportfolio/viewsets/transactions/trades.py

@@ -63,7 +63,6 @@ from ..configs import (
     TradePortfolioEndpointConfig,
     TradePortfolioTitleConfig,
     TradeTitleConfig,
-    TradeTradeProposalButtonConfig,
     TradeTradeProposalDisplayConfig,
     TradeTradeProposalEndpointConfig,
 )
@@ -376,7 +375,6 @@ class TradeTradeProposalModelViewSet(
     display_config_class = TradeTradeProposalDisplayConfig
     endpoint_config_class = TradeTradeProposalEndpointConfig
     serializer_class = TradeTradeProposalModelSerializer
-    button_config_class = TradeTradeProposalButtonConfig
 
     @cached_property
     def trade_proposal(self):

{wbportfolio-1.46.5.dist-info → wbportfolio-1.46.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbportfolio
-Version: 1.46.5
+Version: 1.46.7
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 License-File: LICENSE
 Requires-Dist: cryptography==3.4.*

{wbportfolio-1.46.5.dist-info → wbportfolio-1.46.7.dist-info}/RECORD

@@ -115,7 +115,7 @@ wbportfolio/import_export/handlers/dividend.py,sha256=tftdVdAzNpKSSvouOtvJfzWL36
 wbportfolio/import_export/handlers/fees.py,sha256=XYH752IkNGYhhhwatp8nYa1zG1-YZFDkYW15dyQgOIg,2824
 wbportfolio/import_export/handlers/portfolio_cash_flow.py,sha256=2ODaquuC83RfmNwmQ-8TdhiASObfIems_B1g0yqaYTs,2733
 wbportfolio/import_export/handlers/register.py,sha256=sYyXkE8b1DPZ5monxylZn0kjxLVdNYYZR-p61dwEoDM,2271
-wbportfolio/import_export/handlers/trade.py,sha256=Wvj7aFzc4UXYU5dZSxqBkA9hBozHiKzwGSmF6g2-Zss,10635
+wbportfolio/import_export/handlers/trade.py,sha256=DArRPXWjH2YhqPGtbZw7Nyt3JjQNEltx1RyQ3-4FzKs,10829
 wbportfolio/import_export/parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/import_export/parsers/default_mapping.py,sha256=KrO-X5CvQCeQoBYzFDxavoQGriyUSeI2QDx5ar_zo7A,1405
 wbportfolio/import_export/parsers/jpmorgan/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -273,11 +273,11 @@ wbportfolio/models/transactions/dividends.py,sha256=naL5xeDQfUBf5KyGt7y-tTcHL22n
 wbportfolio/models/transactions/expiry.py,sha256=vnNHdcC1hf2HP4rAbmoGgOfagBYKNFytqOwzOI0MlVI,144
 wbportfolio/models/transactions/fees.py,sha256=ffvqo8I4A0l5rLi00jJ6sGot0jmnkoxaNsbDzdPLwCg,5712
 wbportfolio/models/transactions/rebalancing.py,sha256=vEYdYhog9jiPw_xQd_XQunNzcpHZ8Zk18kQhsN4HuhA,6596
-wbportfolio/models/transactions/trade_proposals.py,sha256=tpxg6EJ8Z6sB7VJ39GVLH-sBVJ9_ypUOqaUE0T5Rvhk,20804
-wbportfolio/models/transactions/trades.py,sha256=7IAC9eDx-ouKGn1RPR_Ggd5XjLgr3rE4xBn_ub0o1TE,27589
+wbportfolio/models/transactions/trade_proposals.py,sha256=gsvgEI5yqmFb_bCN4FsgfyQqslMXLQlzTe3G7odwTCA,21366
+wbportfolio/models/transactions/trades.py,sha256=gbXvxiyh8bvg6ldyd8qBwRPv4t0Tf5cbZXBnZXPIomc,27861
 wbportfolio/models/transactions/transactions.py,sha256=4THsE4xqdigZAwWKYfTNRLPJlkmAmsgE70Ribp9Lnrk,7127
 wbportfolio/pms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbportfolio/pms/typing.py,sha256=lRWh9alcstZzwA04hFSPZfOFbCjaVPWtUpWnurnsh8c,6014
+wbportfolio/pms/typing.py,sha256=WKP5tYyYt7DbMo25VM99V4IAM9oDSIPZyR3yXCzeZEA,5920
 wbportfolio/pms/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/pms/analytics/portfolio.py,sha256=93hcHEuBOPi534El2HVCIyjs9MBQMX7dIZ97JIpNV1c,1535
 wbportfolio/pms/statistics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -289,7 +289,7 @@ wbportfolio/rebalancing/decorators.py,sha256=JhQ2vkcIuGBTGvNmpkQerdw2-vLq-RAb0KA
 wbportfolio/rebalancing/models/__init__.py,sha256=AQjG7Tu5vlmhqncVoYOjpBKU2UIvgo9FuP2_jD2w-UI,232
 wbportfolio/rebalancing/models/composite.py,sha256=XAjJqLRNsV-MuBKrat3THEfAWs6PXQNSO0g8k8MtBXo,1157
 wbportfolio/rebalancing/models/equally_weighted.py,sha256=U29MOHJMQMIg7Y7W_8t5K3nXjaznzt4ArIxQSiv0Xok,863
-wbportfolio/rebalancing/models/market_capitalization_weighted.py,sha256=RskXZ41iSK9g4SSYJRNv0hX6z9Ol73nJY2N7A3IxCLw,5051
+wbportfolio/rebalancing/models/market_capitalization_weighted.py,sha256=RTEVAwOh7ec5MqCFYd-9lSNv4eNhchD1aAyEnJeyZwQ,4825
 wbportfolio/rebalancing/models/model_portfolio.py,sha256=XQdvs03-0M9YUnL4DidwZC4E6k-ANCNcZ--T_aaOXTQ,1233
 wbportfolio/reports/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/reports/monthly_position_report.py,sha256=e7BzjDd6eseUOwLwQJXKvWErQ58YnCsznHU2VtR6izM,2981
@@ -339,7 +339,7 @@ wbportfolio/serializers/transactions/claim.py,sha256=kC4E2RZRrpd9i8tGfoiV-gpWDk3
 wbportfolio/serializers/transactions/dividends.py,sha256=EULwKDumHBv4r2HsdEGZMZGFaye4dRUNNyXg6-wZXzc,520
 wbportfolio/serializers/transactions/expiry.py,sha256=K3XOSbCyef-xRzOjCr4Qg_YFJ_JuuiJ9u6tDS86l0hg,477
 wbportfolio/serializers/transactions/fees.py,sha256=uPmSWuCeoV2bwVS6RmEz3a0VRBWJHIQr0WhklYc1UAI,1068
-wbportfolio/serializers/transactions/trade_proposals.py,sha256=h8Ub69YPEhds1fC0dcbvXmSmpszor0WWxsodUeJmPVY,3414
+wbportfolio/serializers/transactions/trade_proposals.py,sha256=2-GLD70swYlLVEIiWWTNcgN83EbPtLyFSO9wKBwjUm4,3644
 wbportfolio/serializers/transactions/trades.py,sha256=pONV5NSqrXUnoTEoAxovnnQqu37cZGuB33TYvIOK3rE,10009
 wbportfolio/serializers/transactions/transactions.py,sha256=O137zeCndK-nxIWSRLEj7bXbBZDGa4d6qK6pJIIYK3g,4170
 wbportfolio/static/wbportfolio/css/macro_review.css,sha256=FAVVO8nModxwPXcTKpcfzVxBGPZGJVK1Xn-0dkSfGyc,233
@@ -385,7 +385,7 @@ wbportfolio/tests/models/transactions/test_trades.py,sha256=z0CCZjB648ECDSEdwmzq
 wbportfolio/tests/pms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/tests/pms/test_analytics.py,sha256=FrvVsV_uUiTgmRUfsaB-_sGzY30CqknbOY2DvmwR_70,1141
 wbportfolio/tests/rebalancing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbportfolio/tests/rebalancing/test_models.py,sha256=00VGrz_UZtYSqpTg2J0XCt-zInOAvYSNezad8KKxNnw,7660
+wbportfolio/tests/rebalancing/test_models.py,sha256=wdlCfc6YxVT0oLxr45Q-LPKy4LjGbylkdxcfZozS0Fk,7565
 wbportfolio/tests/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/tests/serializers/test_claims.py,sha256=vQrg73xQXRFEgvx3KI9ivFre_wpBFzdO0p0J13PkvdY,582
 wbportfolio/tests/viewsets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -396,7 +396,7 @@ wbportfolio/tests/viewsets/transactions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 wbportfolio/tests/viewsets/transactions/test_claims.py,sha256=QEZfMAW07dyoZ63t2umSwGOqvaTULfYfbN_F4ZoSAcw,6368
 wbportfolio/viewsets/__init__.py,sha256=3kUaQ66ybvROwejd3bEcSt4XKzfOlPDaeoStMvlz7qY,2294
 wbportfolio/viewsets/adjustments.py,sha256=5hWCjxSgUIsrPOmJKoDYK3gywdMTI0aYDorEj1FXRVc,1429
-wbportfolio/viewsets/assets.py,sha256=ac_hAyTiRLE_4FHCPvemgZaeEH10s7J2ZLfXykKDY1o,22663
+wbportfolio/viewsets/assets.py,sha256=vwfrJaws7aVOUd-4FTlZVahpiMGgIEt1rcUumvWIKss,22734
 wbportfolio/viewsets/assets_and_net_new_money_progression.py,sha256=Jl4vEQP4N2OFL5IGBXoKcj-0qaPviU0I8npvQLw4Io0,4464
 wbportfolio/viewsets/custodians.py,sha256=CTFqkqVP1R3AV7lhdvcdICxB5DfwDYCyikNSI5kbYEo,2322
 wbportfolio/viewsets/esg.py,sha256=27MxxdXQH3Cq_1UEYmcrF7htUOg6i81fUpbVQXAAKJI,6985
@@ -417,7 +417,7 @@ wbportfolio/viewsets/signals.py,sha256=URxNz-7tKNBgvaFIE3FItfao3Md0dKQN_eVFwxxiE
 wbportfolio/viewsets/charts/__init__.py,sha256=mNSpDrsqK-afRxGBfEsfgupUc20xU-JW08FpxIyudok,71
 wbportfolio/viewsets/charts/assets.py,sha256=rZM4Ul0ZXVr7uz3SU44J5IYU7-FivjDgR1it_4ewk2o,10547
 wbportfolio/viewsets/configs/__init__.py,sha256=K5opfVQvgGwSyw3XwDGkv3lo5i9jBxOJXYhLqyCdfeQ,137
-wbportfolio/viewsets/configs/buttons/__init__.py,sha256=eqcRU3oH_iaQlCH_meJhG35-q6ZOGBGWPHNZ2ElsJb8,858
+wbportfolio/viewsets/configs/buttons/__init__.py,sha256=99WAr_tftIXJbQPINkwy8xKI509d1zlatDeGu0zHMjU,846
 wbportfolio/viewsets/configs/buttons/adjustments.py,sha256=sUY_3vxqP0kuqs8i5hklfboZI6QiAOrmu30eb29Xupo,492
 wbportfolio/viewsets/configs/buttons/assets.py,sha256=6HqSyUpczK66iL0Jg8BbvAJuci3jm8OsB9p9Nt_o14Q,5680
 wbportfolio/viewsets/configs/buttons/claims.py,sha256=G1GFK1jQyR9M0dyXthYA6krG2JFvHhc3D7pFh6IUQ30,3684
@@ -429,8 +429,8 @@ wbportfolio/viewsets/configs/buttons/products.py,sha256=HfMQjpgGAgvTDLEFQRwbHE82
 wbportfolio/viewsets/configs/buttons/reconciliations.py,sha256=lw4r22GHpqKPUF1MrB6P9dOkL-FHe5iiBJ0--f8D74E,3145
 wbportfolio/viewsets/configs/buttons/registers.py,sha256=aS89TsYHql83k-NHojOrLDqtBpnpsUUO8x63PiMfrXM,445
 wbportfolio/viewsets/configs/buttons/signals.py,sha256=6sKBQI_eDvZuZR5bUUwvur5R67A3oChAGxPfayWUelE,2739
-wbportfolio/viewsets/configs/buttons/trade_proposals.py,sha256=6fOFeDQYp_vgc9-bEw5POMTg7-_MUiaUP2hQv5vMC9s,959
-wbportfolio/viewsets/configs/buttons/trades.py,sha256=bM-TKxFJ05zBRRRItx6b42pwTFRB8qlPoFwjOYIJK4M,6404
+wbportfolio/viewsets/configs/buttons/trade_proposals.py,sha256=eZBfYk5ZhancCVcu7bvRKPGBKTl_tGlgz6BZrGPpPxQ,2953
+wbportfolio/viewsets/configs/buttons/trades.py,sha256=X2B1l0iEIdHb3ZMf9rLVoiX_H8lSyLD12wopgumOIX4,2318
 wbportfolio/viewsets/configs/display/__init__.py,sha256=SmazY-YEp-Xf8G08Uz1-CzePZRCRtHrziRMIYYIGpCk,2176
 wbportfolio/viewsets/configs/display/adjustments.py,sha256=jIOEc23OCYBguLaZRlZxC916kocYT35ZV9Jsiocs9nk,3334
 wbportfolio/viewsets/configs/display/assets.py,sha256=8yLAXyrZLl7L1m1rhBnkh4uaqVpSQJhRVkcM7_AHBsc,10943
@@ -514,10 +514,10 @@ wbportfolio/viewsets/transactions/claim.py,sha256=m_Fy4J_QZSve1VlR_sPQrVBDopgCqq
 wbportfolio/viewsets/transactions/fees.py,sha256=7VUXIogmRrXCz_D9tvDiiTae0t5j09W9zPUzxXzBGTE,7031
 wbportfolio/viewsets/transactions/mixins.py,sha256=WipvJoi5hylkpD0y9VATe30WAcwIHUIroVkK10FYw7k,636
 wbportfolio/viewsets/transactions/rebalancing.py,sha256=6rIrdK0rtKL1afJ-tYfAGdQVTN2MH1kG_yCeVkmyK8k,1263
-wbportfolio/viewsets/transactions/trade_proposals.py,sha256=fYTvvRk7k5xsBzbIgJvU4I4OrllF0VkhlrekD4GVgDk,4296
-wbportfolio/viewsets/transactions/trades.py,sha256=wdtEWN1V5wsmesR3mRxPmTJUIAmDmqaNsfIhOB57kqY,16330
+wbportfolio/viewsets/transactions/trade_proposals.py,sha256=gXdJJ00D6UavZfBczvZQb5cYPQlU6-xOg_-TnMBzEO0,4742
+wbportfolio/viewsets/transactions/trades.py,sha256=mo5b1wFm0twvGVp-CYnzpGLYMqPcHN8GjH4G_WwFFwc,16237
 wbportfolio/viewsets/transactions/transactions.py,sha256=ixDp-nsNA8t_A06rBCT19hOMJHy0iRmdz1XKdV1OwAs,4450
-wbportfolio-1.46.5.dist-info/METADATA,sha256=uhGKIh1jRNfdf699MnvWNcKT4X5XUDkk8e3NWtmf91o,734
-wbportfolio-1.46.5.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.46.5.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.46.5.dist-info/RECORD,,
+wbportfolio-1.46.7.dist-info/METADATA,sha256=nAZz3VADXG2Z3fYmWJ3oqXrVIQa1HAaUtMQpX3e-V68,734
+wbportfolio-1.46.7.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.46.7.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.46.7.dist-info/RECORD,,