wbportfolio 1.50.7__py2.py3-none-any.whl → 1.50.9__py2.py3-none-any.whl

wbportfolio/models/llm/wbcrm/analyze_relationship.py

@@ -1,5 +1,4 @@
-import json
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 from django.db.models import F, FloatField, Sum
 from django.db.models.functions import Cast, ExtractYear
@@ -11,7 +10,7 @@ if TYPE_CHECKING:
     from wbcrm.models import Account
 
 
-def get_holding_prompt(account: "Account") -> list["BaseMessage"]:
+def get_holding_prompt(account: "Account") -> tuple[list["BaseMessage"], dict[str, Any]]:
     from wbportfolio.models import Product
     from wbportfolio.models.transactions.claim import Claim
 
@@ -23,19 +22,21 @@ def get_holding_prompt(account: "Account") -> list["BaseMessage"]:
 
     performances = {}
     for product_id, product_name in products:
-        performances[product_name] = Instrument.extract_annual_performance_df(
-            Product.objects.get(id=product_id).get_prices_df()
-        ).to_dict()
+        performances[product_name] = (
+            Instrument.extract_annual_performance_df(Product.objects.get(id=product_id).get_prices_df())
+            .set_index("year")["performance"]
+            .to_dict()
+        )
 
     return [
         SystemMessage(
             "The following products are held by the account holder. Analyze their performances and check correlations between the holdings and their performances/interactions."
         ),
-        HumanMessage(json.dumps(performances)),
-    ]
+        HumanMessage("Performances per product ISIN per year: {performances}"),
+    ], {"performances": performances}
 
 
-def get_performances_prompt(account: "Account") -> list["BaseMessage"]:
+def get_performances_prompt(account: "Account") -> tuple[list["BaseMessage"], dict[str, Any]]:
     from wbportfolio.models.transactions.claim import Claim
 
     holdings = (
@@ -48,11 +49,11 @@ def get_performances_prompt(account: "Account") -> list["BaseMessage"]:
             product_isin=F("product__isin"),
         )
         .values("product_name", "product_isin", "sum_shares", "year")
-    )
+    ).order_by("year", "product")
 
     return [
         SystemMessage(
             "The following holdings (subscriptions/redemptions) have been found for this account. Please include this data in the analysis and check if there is any correlation between the holding data and the interactions."
         ),
-        HumanMessage(json.dumps(list(holdings.order_by("year", "product")))),
-    ]
+        HumanMessage("List of holdings for the account: {holdings}"),
+    ], {"holdings": list(holdings)}

wbportfolio/models/products.py

@@ -34,11 +34,11 @@ from wbcrm.models.accounts import Account
 from wbfdm.models.instruments.instrument_prices import InstrumentPrice
 from wbfdm.models.instruments.instruments import InstrumentManager, InstrumentType
 
-from wbportfolio.models.llm.wbcrm.analyze_relationship import get_holding_prompt
 from wbportfolio.models.portfolio_relationship import InstrumentPortfolioThroughModel
 
 from ..preferences import get_product_termination_notice_period
 from . import PortfolioRole
+from .llm.wbcrm.analyze_relationship import get_holding_prompt
 from .mixins.instruments import PMSInstrument, PMSInstrumentAbstractModel
 
 

wbportfolio/models/signals.py

@@ -1,3 +1,6 @@
+from contextlib import suppress
+
+from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.dispatch import receiver
 from wbfdm.models import Instrument, InstrumentType
@@ -6,10 +9,11 @@ from wbportfolio.models import InstrumentPortfolioThroughModel, Product, Product
 
 
 def _compute_str(instrument):
-    if instrument.instrument_type == InstrumentType.PRODUCT_GROUP:
-        return ProductGroup.objects.get(id=instrument.id).compute_str()
-    elif instrument.instrument_type == InstrumentType.PRODUCT:
-        return Product.objects.get(id=instrument.id).compute_str()
+    with suppress(ObjectDoesNotExist):
+        if instrument.instrument_type == InstrumentType.PRODUCT_GROUP:
+            return ProductGroup.objects.get(id=instrument.id).compute_str()
+        elif instrument.instrument_type == InstrumentType.PRODUCT:
+            return Product.objects.get(id=instrument.id).compute_str()
     return instrument.get_compute_str()
 
 

wbportfolio/models/transactions/claim.py

@@ -35,9 +35,8 @@ from wbcrm.models import AccountRole
 from wbcrm.models.accounts import Account
 from wbfdm.models.instruments.instrument_prices import InstrumentPrice
 
-from wbportfolio.models.llm.wbcrm.analyze_relationship import get_performances_prompt
-
 from ..custodians import Custodian
+from ..llm.wbcrm.analyze_relationship import get_performances_prompt
 from ..roles import PortfolioRole
 from .trades import Trade
 

{wbportfolio-1.50.7.dist-info → wbportfolio-1.50.9.dist-info}/METADATA

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

{wbportfolio-1.50.7.dist-info → wbportfolio-1.50.9.dist-info}/RECORD

@@ -255,15 +255,15 @@ wbportfolio/models/portfolio_cash_targets.py,sha256=WmgG-etPisZsh2yaFQpz7EkpvAud
 wbportfolio/models/portfolio_relationship.py,sha256=ZGECiPZiLdlk4uSamOrEfuzO0hduK6OMKJLUSnh5_kc,5190
 wbportfolio/models/portfolio_swing_pricings.py,sha256=_LqYC1VRjnnFFmVqFPRdnbgYsVxocMVpClTk2dnooig,1778
 wbportfolio/models/product_groups.py,sha256=qoT8qv6tRdD6zmNDxsHO6dtnWw1-TRnyS5NqOq_gwhI,7901
-wbportfolio/models/products.py,sha256=5z9OMLVS0ps6aOJbG3JE7gKTf3PlbC4rXIPpv55dD1A,22863
+wbportfolio/models/products.py,sha256=CkI7SBKWXgMkIcaGijZ-ghc_pPq075YjNgH-LWk1XCc,22845
 wbportfolio/models/registers.py,sha256=qA6T33t4gxFYnabQFBMd90WGIr6wxxirDLKDFqjOfok,4667
 wbportfolio/models/roles.py,sha256=wF5Atp0xsJxDrYjmFw9XHgEOe_4C-lm4pppeYdymOrA,7343
-wbportfolio/models/signals.py,sha256=yDKg2ingDBFQY1oOFpDrMU2C2c0f2aIgRul5UEBqhIs,899
+wbportfolio/models/signals.py,sha256=jZKC43nIqVdLapwo3getIMSqPUwbK5M36MmvA50jY24,1041
 wbportfolio/models/utils.py,sha256=iBdMjRCvr6aOL0nLgfSCWUKe0h39h3IGmUbYo6l9t6w,394
 wbportfolio/models/graphs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/models/graphs/portfolio.py,sha256=NwkehWvTcyTYrKO5ku3eNNaYLuBwuLdSbTEuugGuSIU,6541
 wbportfolio/models/graphs/utils.py,sha256=1AMpEE9mDuUZ82XgN2irxjCW1-LmziROhKevEBo0mJE,2347
-wbportfolio/models/llm/wbcrm/analyze_relationship.py,sha256=_y2Myc-M2hXQDkRGXvzsM0ZNC31dmxSHHz5BKMtymww,2106
+wbportfolio/models/llm/wbcrm/analyze_relationship.py,sha256=etKdmt9m6Ra5u7EA9t98RVSqFKpbFd4iwBVaH9T26M8,2320
 wbportfolio/models/mixins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbportfolio/models/mixins/instruments.py,sha256=SgBreTpa_X3uyCWo7t8B0VaTtl49IjmBMe4Pab6TjAM,6796
 wbportfolio/models/mixins/liquidity_stress_test.py,sha256=whkzjtbOyl_ncNyaQBORb_Z_rDgcvfdTYPgqPolu7dA,58865
@@ -272,7 +272,7 @@ wbportfolio/models/reconciliations/account_reconciliation_lines.py,sha256=QP6M7h
 wbportfolio/models/reconciliations/account_reconciliations.py,sha256=_teOTNePxua9C894auy8CvdOFsmUnQiOM2_TZAHvzY4,3955
 wbportfolio/models/reconciliations/reconciliations.py,sha256=kF-BNhUoT4TCn1RIgPSkdEk1iX4NQeZlGGFd_ZulAZU,686
 wbportfolio/models/transactions/__init__.py,sha256=R-4fHylrUf3773kGSEt09vtYj3LUlia5yf7rxHXjvHA,295
-wbportfolio/models/transactions/claim.py,sha256=hcx_tJ9luf2-s1qqsUZXtoDEuxFyty2A1rXSDkljoQo,25890
+wbportfolio/models/transactions/claim.py,sha256=XUSephKt-VkILe2i-Sd9aoVxB-50PJANCPIDLa_dKl4,25872
 wbportfolio/models/transactions/dividends.py,sha256=92-jG8bZN9nU9oDubpu-UDH43Ri7kVjhqE_esOSmOzo,471
 wbportfolio/models/transactions/expiry.py,sha256=vnNHdcC1hf2HP4rAbmoGgOfagBYKNFytqOwzOI0MlVI,144
 wbportfolio/models/transactions/fees.py,sha256=ffvqo8I4A0l5rLi00jJ6sGot0jmnkoxaNsbDzdPLwCg,5712
@@ -522,7 +522,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.7.dist-info/METADATA,sha256=_3QdVIySIlzglfZnVOyVWrGDA7tv9HcUPA6Sy-iT4XY,702
-wbportfolio-1.50.7.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbportfolio-1.50.7.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
-wbportfolio-1.50.7.dist-info/RECORD,,
+wbportfolio-1.50.9.dist-info/METADATA,sha256=ykBmDv1llZ2irZi3thH6lVehwGjZPNVasF7jU4Z06_A,702
+wbportfolio-1.50.9.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbportfolio-1.50.9.dist-info/licenses/LICENSE,sha256=jvfVH0SY8_YMHlsJHKe_OajiscQDz4lpTlqT6x24sVw,172
+wbportfolio-1.50.9.dist-info/RECORD,,