wbportfolio 1.46.14__py2.py3-none-any.whl → 1.47.1__py2.py3-none-any.whl

wbportfolio/models/portfolio.py

@@ -85,33 +85,38 @@ class PositionDictConverter:
             self.fx_rates[currency][val_date] = fx_rate
             return fx_rate
 
-    def dict_to_model(self, val_date: date, instrument_id: int, weighting: float) -> AssetPosition:
+    def dict_to_model(self, val_date: date, instrument_id: int, weighting: float) -> AssetPosition | None:
         underlying_quote = self._get_instrument(instrument_id)
         currency_fx_rate_portfolio_to_usd = self._get_fx_rate(val_date, self.portfolio.currency)
         currency_fx_rate_instrument_to_usd = self._get_fx_rate(val_date, underlying_quote.currency)
-        position = AssetPosition(
-            underlying_quote=underlying_quote,
-            weighting=weighting,
-            date=val_date,
-            asset_valuation_date=val_date,
-            is_estimated=True,
-            portfolio=self.portfolio,
-            currency=underlying_quote.currency,
-            initial_price=self.prices.loc[pd.Timestamp(val_date), instrument_id],
-            currency_fx_rate_portfolio_to_usd=currency_fx_rate_portfolio_to_usd,
-            currency_fx_rate_instrument_to_usd=currency_fx_rate_instrument_to_usd,
-            initial_currency_fx_rate=None,
-            underlying_quote_price=None,
-            underlying_instrument=None,
-        )
-        position.pre_save(
-            infer_underlying_quote_price=self.infer_underlying_quote_price
-        )  # inferring underlying quote price is potentially very slow for big dataset of positions, it's not very needed for model portfolio so we disable it
-        return position
+        initial_price = self.prices.loc[pd.Timestamp(val_date), instrument_id]
+        # if we cannot find a price for the instrument, we return an empty position
+        if initial_price is not None:
+            position = AssetPosition(
+                underlying_quote=underlying_quote,
+                weighting=weighting,
+                date=val_date,
+                asset_valuation_date=val_date,
+                is_estimated=True,
+                portfolio=self.portfolio,
+                currency=underlying_quote.currency,
+                initial_price=self.prices.loc[pd.Timestamp(val_date), instrument_id],
+                currency_fx_rate_portfolio_to_usd=currency_fx_rate_portfolio_to_usd,
+                currency_fx_rate_instrument_to_usd=currency_fx_rate_instrument_to_usd,
+                initial_currency_fx_rate=None,
+                underlying_quote_price=None,
+                underlying_instrument=None,
+            )
+            position.pre_save(
+                infer_underlying_quote_price=self.infer_underlying_quote_price
+            )  # inferring underlying quote price is potentially very slow for big dataset of positions, it's not very needed for model portfolio so we disable it
+            return position
 
     def convert(self, positions: dict[date, dict[int, float]]) -> Iterable[AssetPosition]:
         for val_date, weights in positions.items():
-            yield from map(lambda row: self.dict_to_model(val_date, row[0], row[1]), weights.items())
+            yield from filter(
+                lambda x: x, map(lambda row: self.dict_to_model(val_date, row[0], row[1]), weights.items())
+            )
 
 
 class DefaultPortfolioQueryset(QuerySet):
@@ -371,9 +376,8 @@ class Portfolio(DeleteToDisableMixin, WBModel):
             The instantiated analytic portfolio
         """
         weights = self.get_weights(val_date)
-        instrument_ids = weights.keys()
         return_date = (val_date + BDay(1)).date()
-        returns, prices = self.get_returns(instrument_ids, (val_date - BDay(2)).date(), return_date, **kwargs)
+        returns, prices = self.get_returns((val_date - BDay(2)).date(), return_date, **kwargs)
         if pd.Timestamp(return_date) not in returns.index:
             raise InvalidAnalyticPortfolio()
         returns = returns.fillna(0)  # not sure this is what we want
@@ -753,7 +757,7 @@ class Portfolio(DeleteToDisableMixin, WBModel):
         next_trade_proposal = None
         rebalancing_date = None
         logger.info(f"compute next weights in batch for {self} from {start_date:%Y-%m-%d} to {end_date:%Y-%m-%d}")
-        returns, prices = self.get_returns(weights.keys(), (start_date - BDay(3)).date(), end_date, ffill_returns=True)
+        returns, prices = self.get_returns((start_date - BDay(3)).date(), end_date, ffill_returns=True)
         for to_date_ts in pd.date_range(start_date + timedelta(days=1), end_date, freq="B"):
             to_date = to_date_ts.date()
             logger.info(f"Processing {to_date:%Y-%m-%d}")
@@ -767,7 +771,6 @@ class Portfolio(DeleteToDisableMixin, WBModel):
                 positions[to_date] = weights
             except KeyError:  # if no return for that date, we break and continue
                 break
-
         positions_generator = PositionDictConverter(self, prices)
         positions = list(positions_generator.convert(positions))
         self.bulk_create_positions(positions, delete_leftovers=True, compute_metrics=False, evaluate_rebalancer=False)
@@ -1003,7 +1006,6 @@ class Portfolio(DeleteToDisableMixin, WBModel):
 
     def get_returns(
         self,
-        instruments: Iterable,
         from_date: date,
         to_date: date,
         ffill_returns: bool = True,
@@ -1013,13 +1015,17 @@ class Portfolio(DeleteToDisableMixin, WBModel):
         Utility methods to get instrument returns for a given date range
 
         Args:
-            instruments: instrument to get the returns from
             from_date: date range lower bound
             to_date: date range upper bound
 
         Returns:
             Return a tuple of the returns and the last prices series for conveniance
         """
+        instruments = list(
+            self.assets.filter(date__gte=from_date, date__lte=to_date)
+            .values_list("underlying_quote", flat=True)
+            .distinct("underlying_quote")
+        )
         prices = InstrumentPrice.objects.filter(
             instrument__in=instruments, date__gte=from_date, date__lte=to_date
         ).annotate(
@@ -1044,7 +1050,7 @@ class Portfolio(DeleteToDisableMixin, WBModel):
         if ffill_returns:
             prices_df = prices_df.ffill()
         returns = prices_to_returns(prices_df, drop_inceptions_nan=False, fill_nan=ffill_returns)
-        return returns.replace([np.inf, -np.inf, np.nan], 0), prices_df
+        return returns.replace([np.inf, -np.inf, np.nan], 0), prices_df.replace([np.inf, -np.inf, np.nan], None)
 
     @classmethod
     def get_contribution_df(

wbportfolio/tests/models/test_portfolios.py

@@ -1118,7 +1118,7 @@ class TestPortfolioModel(PortfolioTestMixin):
         res = list(Portfolio.objects.all().to_dependency_iterator(weekday))
         assert res == [index_portfolio, dependency_portfolio, dependant_portfolio, undependant_portfolio]
 
-    def test_get_returns(self, instrument_factory, instrument_price_factory, portfolio):
+    def test_get_returns(self, instrument_factory, instrument_price_factory, asset_position_factory, portfolio):
         v1 = date(2025, 1, 1)
         v2 = date(2025, 1, 2)
         v3 = date(2025, 1, 3)
@@ -1129,17 +1129,17 @@ class TestPortfolioModel(PortfolioTestMixin):
         i11 = instrument_price_factory.create(date=v1, instrument=i1)
         i12 = instrument_price_factory.create(date=v2, instrument=i1)
         i13 = instrument_price_factory.create(date=v3, instrument=i1)
+        asset_position_factory.create(date=v1, portfolio=portfolio, underlying_instrument=i1)
+        asset_position_factory.create(date=v3, portfolio=portfolio, underlying_instrument=i2)
         i11.refresh_from_db()
         i12.refresh_from_db()
         i13.refresh_from_db()
-        returns, _ = portfolio.get_returns(
-            [i1.id, i2.id], from_date=v1, to_date=v3, convert_to_portfolio_currency=False
-        )
+        returns, _ = portfolio.get_returns(from_date=v1, to_date=v3, convert_to_portfolio_currency=False)
 
         expected_returns = pd.DataFrame(
-            [[i12.net_value / i11.net_value - 1], [i13.net_value / i12.net_value - 1]],
+            [[i12.net_value / i11.net_value - 1, 0.0], [i13.net_value / i12.net_value - 1, 0.0]],
             index=[v2, v3],
-            columns=[i1.id],
+            columns=[i1.id, i2.id],
             dtype="float64",
         )
         expected_returns.index = pd.to_datetime(expected_returns.index)

wbportfolio/viewsets/configs/menu/portfolios.py

@@ -1,11 +1,9 @@
 from wbcore.menus import ItemPermission, MenuItem
 
-from wbportfolio.permissions import is_portfolio_manager
-
 PortfolioMenuItem = MenuItem(
     label="Portfolios",
     endpoint="wbportfolio:portfolio-list",
-    permission=ItemPermission(method=is_portfolio_manager, permissions=["wbportfolio.view_portfolio"]),
+    permission=ItemPermission(permissions=["wbportfolio.view_portfolio"]),
 )
 
 
@@ -13,5 +11,5 @@ ModelPortfolioMenuItem = MenuItem(
     label="Managed Portfolios",
     endpoint="wbportfolio:portfolio-list",
     endpoint_get_parameters={"is_manageable": True},
-    permission=ItemPermission(method=is_portfolio_manager, permissions=["wbportfolio.view_portfolio"]),
+    permission=ItemPermission(permissions=["wbportfolio.view_portfolio"]),
 )

wbportfolio/viewsets/transactions/trades.py

@@ -411,7 +411,7 @@ class TradeTradeProposalModelViewSet(
         return TradeTradeProposalModelSerializer
 
     def add_messages(self, request, queryset=None, paginated_queryset=None, instance=None, initial=False):
-        if queryset is not None:
+        if queryset is not None and queryset.exists():
             total_target_weight = queryset.aggregate(c=Sum(F("target_weight")))["c"] or Decimal(0)
             if round(total_target_weight, 3) != 1:
                 warning(request, "The total target weight does not equals to 1")

{wbportfolio-1.46.14.dist-info → wbportfolio-1.47.1.dist-info}/METADATA

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

{wbportfolio-1.46.14.dist-info → wbportfolio-1.47.1.dist-info}/RECORD

@@ -247,7 +247,7 @@ wbportfolio/models/asset.py,sha256=TEOsSlbog6Yw0PZiMxjnCccp6ApXAAJNd3BIx_wU7D8,3
 wbportfolio/models/custodians.py,sha256=owTiS2Vm5CRKzh9M_P9GOVg-s-ndQ9UvRmw3yZP7cw0,3815
 wbportfolio/models/exceptions.py,sha256=3ix0tWUO-O6jpz8f07XIwycw2x3JFRoWzjwil8FVA2Q,52
 wbportfolio/models/indexes.py,sha256=iLYF2gzNzX4GLj_Nh3fybUcAQ1TslnT0wgQ6mN164QI,728
-wbportfolio/models/portfolio.py,sha256=xDT-XL7ZtAN9JD5BXOv6l98fnvu_YXqXbO-ZCTipWWg,58028
+wbportfolio/models/portfolio.py,sha256=rpo5jUTbwrlD_Zx9_LYTy5XNgk73PTRX3yn7j8AG9DE,58447
 wbportfolio/models/portfolio_cash_flow.py,sha256=2blPiXSw7dbhUVd-7LcxDBb4v0SheNOdvRK3MFYiChA,7273
 wbportfolio/models/portfolio_cash_targets.py,sha256=WmgG-etPisZsh2yaFQpz7EkpvAudKBEzqPsO715w52U,1498
 wbportfolio/models/portfolio_relationship.py,sha256=mMb18UMRWg9kx_9uIPkMktwORuXXLjKdgRPQQvB6fVE,5486
@@ -372,7 +372,7 @@ wbportfolio/tests/models/test_merge.py,sha256=sdsjiZsmR6vsUKwTa5kkvL6QTeAZqtd_EP
 wbportfolio/tests/models/test_portfolio_cash_flow.py,sha256=X8dsXexsb1b0lBiuGzu40ps_Az_1UmmKT0eo1vbXH94,5792
 wbportfolio/tests/models/test_portfolio_cash_targets.py,sha256=q8QWAwt-kKRkLC0E05GyRhF_TTQXIi8bdHjXVU0fCV0,965
 wbportfolio/tests/models/test_portfolio_swing_pricings.py,sha256=kr2AOcQkyg2pX3ULjU-o9ye-NVpjMrrfoe-DVbYCbjs,1656
-wbportfolio/tests/models/test_portfolios.py,sha256=ZXFqvCI2ozJmVTPmhtAEVaBaTz2BW73re1afsmKXJNc,52003
+wbportfolio/tests/models/test_portfolios.py,sha256=idIUT2kc6Fte-bzwOS9NtOYRVnwTBijSo7deHkRon_k,52194
 wbportfolio/tests/models/test_product_groups.py,sha256=AcdxhurV-n_bBuUsfD1GqVtwLFcs7VI2CRrwzsIUWbU,3337
 wbportfolio/tests/models/test_products.py,sha256=5YYmQreFnaKLbWmrSib103wgLalqn8u01Fnh3A0XMz8,8217
 wbportfolio/tests/models/test_roles.py,sha256=4Cn7WyrA2ztJNeWLk5cy9kYo5XLWMbFSvo1O-9JYxeA,3323
@@ -480,7 +480,7 @@ wbportfolio/viewsets/configs/menu/custodians.py,sha256=W01URxeqDzcu--5R51QCBzbhS
 wbportfolio/viewsets/configs/menu/fees.py,sha256=iYAMzavfTKSYo6CBzVrSggxl7kKwE1h_jHGCgV4pYm8,499
 wbportfolio/viewsets/configs/menu/instrument_prices.py,sha256=9bYMHq7AoPnaqdZ_6w3sEpk4X8Ptr_RnTlwxoE8lVow,358
 wbportfolio/viewsets/configs/menu/portfolio_cash_flow.py,sha256=JqTtceY6cH0fldMMT4AbEtrG855LWSJn4SG45-2-xec,343
-wbportfolio/viewsets/configs/menu/portfolios.py,sha256=R3Ppz_Q1jpkig0O2js-gonPyvwAEWz7n66JvjNlIS-A,583
+wbportfolio/viewsets/configs/menu/portfolios.py,sha256=ezR5a1gwAbjsdNV9YsfZ-c1f_oRFHpFhRQlU2x-VPV8,467
 wbportfolio/viewsets/configs/menu/positions.py,sha256=ejq6ZMcaYptogh8UMX-jwRdxXi8I2MsCcanYJanxesI,608
 wbportfolio/viewsets/configs/menu/product_groups.py,sha256=c8DK7nW81NCMCdktLyiFmWlIJ7M0q15D_vfrDaREM4U,367
 wbportfolio/viewsets/configs/menu/product_performance.py,sha256=aZ72NGMVuRmARwUB4Z3fGtk15_2RVzw9DzW-rYUbc6k,947
@@ -516,9 +516,9 @@ wbportfolio/viewsets/transactions/fees.py,sha256=7VUXIogmRrXCz_D9tvDiiTae0t5j09W
 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=gXdJJ00D6UavZfBczvZQb5cYPQlU6-xOg_-TnMBzEO0,4742
-wbportfolio/viewsets/transactions/trades.py,sha256=mo5b1wFm0twvGVp-CYnzpGLYMqPcHN8GjH4G_WwFFwc,16237
+wbportfolio/viewsets/transactions/trades.py,sha256=E0QV6oPohOgeVWzNT6xfWOFvTB4KoP2DzDYnGtm3Hz0,16259
 wbportfolio/viewsets/transactions/transactions.py,sha256=ixDp-nsNA8t_A06rBCT19hOMJHy0iRmdz1XKdV1OwAs,4450
-wbportfolio-1.46.14.dist-info/METADATA,sha256=q0SRunfArVhuy4pL69WWm4X8C_Qoc7zIz4jL0wTEmyE,735
-wbportfolio-1.46.14.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.46.14.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.46.14.dist-info/RECORD,,
+wbportfolio-1.47.1.dist-info/METADATA,sha256=vtVwamOZDhra4lfIxs9TrSKi-uf9devn_BUlO9ZruD8,734
+wbportfolio-1.47.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.47.1.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.47.1.dist-info/RECORD,,