wbportfolio 1.50.0__py2.py3-none-any.whl → 1.50.1__py2.py3-none-any.whl

wbportfolio/models/asset.py

@@ -185,8 +185,8 @@ class AssetPositionIterator:
         return dict(self._weights)
 
     def __iter__(self):
-        # return an iterable excluding the position without a valid weighting
-        yield from filter(lambda a: a.weighting, self.positions.values())
+        # return an iterable excluding the position with a null weight if the portfolio is manageable (otherwise, we assume the 0-weight position is valid)
+        yield from filter(lambda a: not a.portfolio.is_manageable or a.weighting, self.positions.values())
 
     def __getitem__(self, item: tuple[date, Instrument]) -> float:
         return self._weights[item[0]][item[1].id]

wbportfolio/models/transactions/trade_proposals.py

@@ -524,7 +524,7 @@ class TradeProposal(CloneMixin, RiskCheckMixin, WBModel):
 
         for trade in self.trades.all():
             with suppress(ValueError):
-                asset = trade.to_asset()
+                asset = trade.get_asset()
                 # we add the corresponding asset only if it is not the cache position (already included in estimated_cash_position)
                 if asset.underlying_quote != estimated_cash_position.underlying_quote:
                     assets.append(asset)

wbportfolio/models/transactions/trades.py

@@ -299,31 +299,9 @@ class Trade(ShareMixin, Transaction, OrderedModel, WBModel):
             )
         },
     )
-    def to_asset(self) -> AssetPosition:
-        last_underlying_quote_price = self.last_underlying_quote_price
-        if not last_underlying_quote_price:
-            raise ValueError("No price found")
-        asset = AssetPosition(
-            underlying_quote=self.underlying_instrument,
-            portfolio_created=None,
-            portfolio=self.portfolio,
-            date=self.transaction_date,
-            initial_currency_fx_rate=self.currency_fx_rate,
-            weighting=self._target_weight,
-            initial_price=self.last_underlying_quote_price.net_value,
-            initial_shares=None,
-            underlying_quote_price=self.last_underlying_quote_price,
-            asset_valuation_date=self.transaction_date,
-            currency=self.currency,
-            is_estimated=False,
-        )
-        asset.set_weighting(self._target_weight)
-        asset.pre_save()
-        return asset
-
     def execute(self, **kwargs):
         with suppress(ValueError):
-            asset = self.to_asset()
+            asset = self.get_asset()
             AssetPosition.unannotated_objects.update_or_create(
                 underlying_quote=asset.underlying_quote,
                 portfolio_created=asset.portfolio_created,
@@ -570,6 +548,28 @@ class Trade(ShareMixin, Transaction, OrderedModel, WBModel):
 
         """
 
+    def get_asset(self) -> AssetPosition:
+        last_underlying_quote_price = self.last_underlying_quote_price
+        if not last_underlying_quote_price:
+            raise ValueError("No price found")
+        asset = AssetPosition(
+            underlying_quote=self.underlying_instrument,
+            portfolio_created=None,
+            portfolio=self.portfolio,
+            date=self.transaction_date,
+            initial_currency_fx_rate=self.currency_fx_rate,
+            weighting=self._target_weight,
+            initial_price=self.last_underlying_quote_price.net_value,
+            initial_shares=None,
+            underlying_quote_price=self.last_underlying_quote_price,
+            asset_valuation_date=self.transaction_date,
+            currency=self.currency,
+            is_estimated=False,
+        )
+        asset.set_weighting(self._target_weight)
+        asset.pre_save()
+        return asset
+
     def delete(self, **kwargs):
         pre_collection.send(sender=self.__class__, instance=self)
         super().delete(**kwargs)

{wbportfolio-1.50.0.dist-info → wbportfolio-1.50.1.dist-info}/METADATA

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

{wbportfolio-1.50.0.dist-info → wbportfolio-1.50.1.dist-info}/RECORD

@@ -245,7 +245,7 @@ wbportfolio/migrations/0076_alter_dividendtransaction_price_and_more.py,sha256=4
 wbportfolio/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/models/__init__.py,sha256=IIS_PNRxyX2Dcvyk1bcQOUzFt0B9SPC0WlM88CXqj04,881
 wbportfolio/models/adjustments.py,sha256=osXWkJZOiansPWYPyHtl7Z121zDWi7u1YMtrBQtbHVo,10272
-wbportfolio/models/asset.py,sha256=-bw8AoIIBy68je1vnGXYbkb7Vdp_mRBNJixd0qnCWxA,45153
+wbportfolio/models/asset.py,sha256=wwAWW2vl21nJS7RVswjvB1PAZRjJ1VzCyLF4fb7R0Gw,45264
 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
@@ -276,8 +276,8 @@ wbportfolio/models/transactions/dividends.py,sha256=92-jG8bZN9nU9oDubpu-UDH43Ri7
 wbportfolio/models/transactions/expiry.py,sha256=vnNHdcC1hf2HP4rAbmoGgOfagBYKNFytqOwzOI0MlVI,144
 wbportfolio/models/transactions/fees.py,sha256=ffvqo8I4A0l5rLi00jJ6sGot0jmnkoxaNsbDzdPLwCg,5712
 wbportfolio/models/transactions/rebalancing.py,sha256=obzgewWKOD4kJbCoF5fhtfDk502QkbrjPKh8T9KDGew,7355
-wbportfolio/models/transactions/trade_proposals.py,sha256=eWT_pTFLQ_4Eq8jVEfWhfewPVQ1Mx2viD0gAIosCNqI,30540
-wbportfolio/models/transactions/trades.py,sha256=1kCgNXWeKvkRtoe8W7vjfzvpYIDwuU0jvgyCJY-IABc,28917
+wbportfolio/models/transactions/trade_proposals.py,sha256=qUuCftA7iPLprSVSM7Opkf4hgWxhE-WivRkVWIaFzBw,30541
+wbportfolio/models/transactions/trades.py,sha256=4qA0cEff_hcV3kMnmJKXr0wSThpKhhm0HbzHbspBuxw,28919
 wbportfolio/models/transactions/transactions.py,sha256=fWoDf0TSV0L0gLUDOQpCRLzjMt1H4MUvUHGEaMsilCc,7027
 wbportfolio/pms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/pms/typing.py,sha256=b2pBWYt1E8ok-Kqm0lEFIakSnWJ6Ib57z-VX3C3gkQc,6081
@@ -521,7 +521,7 @@ wbportfolio/viewsets/transactions/rebalancing.py,sha256=6rIrdK0rtKL1afJ-tYfAGdQV
 wbportfolio/viewsets/transactions/trade_proposals.py,sha256=iQpC_Thbj56SmM05vPRsF1JZguGBDaTUH3I-_iCHCV0,5958
 wbportfolio/viewsets/transactions/trades.py,sha256=-yJ4j8NJTu2VWyhCq5BXGNND_925Ietoxx9k07SLVh0,21634
 wbportfolio/viewsets/transactions/transactions.py,sha256=ixDp-nsNA8t_A06rBCT19hOMJHy0iRmdz1XKdV1OwAs,4450
-wbportfolio-1.50.0.dist-info/METADATA,sha256=NdlRGICQMfP56DoEYZOoiqLUhXqMOOjg1Rnrxl2KzVQ,734
-wbportfolio-1.50.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.50.0.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.50.0.dist-info/RECORD,,
+wbportfolio-1.50.1.dist-info/METADATA,sha256=Yi-dunYxBzs9RvSKEaW9q4m6NkFz9WvbeNf9gWUSJfY,734
+wbportfolio-1.50.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.50.1.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.50.1.dist-info/RECORD,,