wbportfolio 1.51.0__py2.py3-none-any.whl → 1.51.2rc1__py2.py3-none-any.whl

wbportfolio/analysis/claims.py

@@ -57,15 +57,15 @@ class ConsolidatedTradeSummary:
         self.pivot = pivot
         self.pivot_label = pivot_label
         self.queryset = self.queryset.annotate(
-            net_value=InstrumentPrice.subquery_closest_value(
-                "net_value", date_name="date", instrument_pk_name="product__pk", date_lookup="exact"
-            ),
-            fx_rate=CurrencyFXRates.get_fx_rates_subquery("date", lookup_expr="exact"),
-            aum=ExpressionWrapper(F("fx_rate") * F("net_value") * F("shares"), output_field=DecimalField()),
             internal_trade=F("trade__marked_as_internal"),
             date_considered=ExpressionWrapper(
                 Greatest("trade__transaction_date", "date") + 1, output_field=DateField()
             ),
+            net_value=InstrumentPrice.subquery_closest_value(
+                "net_value", date_name="date_considered", instrument_pk_name="product__pk", date_lookup="exact"
+            ),
+            fx_rate=CurrencyFXRates.get_fx_rates_subquery("date_considered", lookup_expr="exact"),
+            aum=ExpressionWrapper(F("fx_rate") * F("net_value") * F("shares"), output_field=DecimalField()),
         )
         self.queryset = Account.annotate_root_account_info(self.queryset)
 
@@ -154,7 +154,7 @@ class ConsolidatedTradeSummary:
     def get_aum_df(self) -> pd.DataFrame:
         df = self.df.copy().drop(columns=["internal_trade"])
         df.loc[df.date <= self.start_date, "sum_shares_start"] = df.shares
-        df.loc[df.date <= self.end_date, "sum_shares_end"] = df.shares
+        df.loc[df.date < self.end_date, "sum_shares_end"] = df.shares
         df = df.fillna(0)
         # Prepare dataframe
         df["sum_aum_start"] = df.sum_shares_start * df.price_start
@@ -190,7 +190,7 @@ class ConsolidatedTradeSummary:
             df.loc[df["aum"] < 0, "aum"] = 0
         elif only_negative:
             df.loc[df["aum"] > 0, "aum"] = 0
-        df = df[(df["date"] < self.end_date) & (df["date"] >= self.start_date)]
+        df = df[((df["date"] > self.start_date) & (df["date"] <= self.end_date))]
         df["date"] = pd.to_datetime(df["date"])
         df["period"] = "sum_nnm_" + df.date.dt.year.astype(str) + "-" + df.date.dt.month.map("{:02}".format)
         df = df[["id", "period", "aum"]].groupby(["id", "period"]).sum().reset_index()
@@ -228,12 +228,8 @@ class ConsolidatedTradeSummary:
                 ),
                 fill_value=0,
             )
-            df = df.reset_index().dropna()[["id", "date", "aum_sparkline"]]
-            return (
-                df.groupby("id")
-                .apply(lambda o: list(zip(o["date"].dt.strftime("%Y-%m-%d"), o["aum_sparkline"])))
-                .rename("aum_sparkline")
-            )
+            df = df.reset_index(level=1)[["date", "aum_sparkline"]].apply(tuple, axis=1).rename("aum_sparkline")
+            return df.groupby("id").apply(list)
         return pd.DataFrame()
 
     def get_initial_investment_date_df(self) -> pd.DataFrame:

wbportfolio/factories/portfolio_cash_targets.py

@@ -8,7 +8,7 @@ class PortfolioCashTargetFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = PortfolioCashTarget
 
-    valid_date = factory.Faker("date")
+    valid_date = factory.Faker("date_object")
     portfolio = factory.SubFactory(PortfolioFactory)
     min_target = factory.Faker("pydecimal", left_digits=0, right_digits=4, max_value=0.01)
     target = factory.Faker("pydecimal", left_digits=0, right_digits=4, max_value=0.01)

wbportfolio/factories/portfolio_swing_pricings.py

@@ -8,7 +8,7 @@ class PortfolioSwingPricingFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = PortfolioSwingPricing
 
-    valid_date = factory.Faker("date")
+    valid_date = factory.Faker("date_object")
     portfolio = factory.SubFactory(PortfolioFactory)
     negative_threshold = factory.Faker("pydecimal", left_digits=0, right_digits=4, min_value=-0.99, max_value=-0.01)
     negative_swing_factor = factory.Faker("pydecimal", left_digits=0, right_digits=4, min_value=-0.99, max_value=-0.01)

wbportfolio/locale/de/LC_MESSAGES/django.po

@@ -8,190 +8,189 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-05-20 09:31+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2025-05-30 11:37+0200\n"
+"PO-Revision-Date: 2025-05-30 09:40+0000\n"
+"Language-Team: German (https://app.transifex.com/stainly/teams/171242/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: wbportfolio/contrib/company_portfolio/configs/display.py:25
-#: wbportfolio/contrib/company_portfolio/configs/display.py:29
+
+#: contrib/company_portfolio/configs/display.py:25
+#: contrib/company_portfolio/configs/display.py:29
 msgid "AUM By Product"
 msgstr ""
 
-#: wbportfolio/contrib/company_portfolio/configs/display.py:44
-#: wbportfolio/contrib/company_portfolio/configs/display.py:48
+#: contrib/company_portfolio/configs/display.py:44
+#: contrib/company_portfolio/configs/display.py:48
 msgid "AUM"
 msgstr ""
 
-#: wbportfolio/contrib/company_portfolio/configs/display.py:84
-#: wbportfolio/contrib/company_portfolio/configs/display.py:88
+#: contrib/company_portfolio/configs/display.py:84
+#: contrib/company_portfolio/configs/display.py:88
 msgid "Asset Allocation"
 msgstr ""
 
-#: wbportfolio/contrib/company_portfolio/configs/display.py:103
-#: wbportfolio/contrib/company_portfolio/configs/display.py:107
+#: contrib/company_portfolio/configs/display.py:103
+#: contrib/company_portfolio/configs/display.py:107
 msgid "Geographic Focus"
 msgstr ""
 
-#: wbportfolio/contrib/company_portfolio/configs/display.py:124
+#: contrib/company_portfolio/configs/display.py:124
 msgid "Customer Information"
 msgstr ""
 
-#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:118
+#: models/reconciliations/account_reconciliation_lines.py:118
 msgid "The last share price of the product"
 msgstr ""
 
-#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:127
+#: models/reconciliations/account_reconciliation_lines.py:127
 msgid "The number of shares computed through the Workbench"
 msgstr ""
 
-#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:133
+#: models/reconciliations/account_reconciliation_lines.py:133
 msgid "The nominal value computed through the Workbench"
 msgstr ""
 
-#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:140
+#: models/reconciliations/account_reconciliation_lines.py:140
 msgid ""
 "The number of shares externally provided through the Account holder. "
 "Initially set to the number of shares computed through the Workbench"
 msgstr ""
 
-#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:148
+#: models/reconciliations/account_reconciliation_lines.py:148
 msgid ""
 "The nominal value externally provided through the Account holder. Initially "
 "set to the number of shares computed through the Workbench"
 msgstr ""
 
-#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:155
+#: models/reconciliations/account_reconciliation_lines.py:155
 msgid "Account Reconciliation (Product)"
 msgstr ""
 
-#: wbportfolio/models/reconciliations/account_reconciliation_lines.py:156
+#: models/reconciliations/account_reconciliation_lines.py:156
 msgid "Account Reconciliation (Products)"
 msgstr ""
 
-#: wbportfolio/models/reconciliations/reconciliations.py:19
+#: models/reconciliations/reconciliations.py:19
 msgid "Approved By"
 msgstr ""
 
-#: wbportfolio/models/reconciliations/reconciliations.py:22
+#: models/reconciliations/reconciliations.py:22
 msgid "Approved Timestamp"
 msgstr ""
 
-#: wbportfolio/models/transactions/claim.py:338
-#: wbportfolio/models/transactions/claim.py:341
-#: wbportfolio/models/transactions/claim.py:344
+#: models/transactions/claim.py:338 models/transactions/claim.py:341
+#: models/transactions/claim.py:344
 msgid "With this status, this has to be provided."
 msgstr ""
 
-#: wbportfolio/models/transactions/rebalancing.py:81
+#: models/transactions/rebalancing.py:81
 msgid "Evaluation Frequency"
 msgstr ""
 
-#: wbportfolio/models/transactions/rebalancing.py:82
+#: models/transactions/rebalancing.py:82
 msgid "The Evaluation Frequency in RRULE format"
 msgstr ""
 
-#: wbportfolio/models/transactions/trade_proposals.py:473
+#: models/transactions/trade_proposals.py:480
 msgid "All trades need to be draft before submitting"
 msgstr ""
 
-#: wbportfolio/models/transactions/trade_proposals.py:482
+#: models/transactions/trade_proposals.py:489
 msgid "There is no valid trade on this proposal"
 msgstr ""
 
-#: wbportfolio/models/transactions/trade_proposals.py:550
+#: models/transactions/trade_proposals.py:557
 msgid "The portfolio does not allow manual rebalanced"
 msgstr ""
 
-#: wbportfolio/models/transactions/trade_proposals.py:553
+#: models/transactions/trade_proposals.py:560
 msgid ""
 "At least one trade needs to be submitted to be able to approve this proposal"
 msgstr ""
 
-#: wbportfolio/models/transactions/trade_proposals.py:557
+#: models/transactions/trade_proposals.py:564
 msgid ""
 "The portfolio needs to be a model portfolio in order to approve this trade "
 "proposal manually"
 msgstr ""
 
-#: wbportfolio/models/transactions/trade_proposals.py:560
+#: models/transactions/trade_proposals.py:567
 msgid "The pre trades rules did not passed successfully"
 msgstr ""
 
-#: wbportfolio/models/transactions/trade_proposals.py:592
+#: models/transactions/trade_proposals.py:599
 msgid ""
 "At least one trade needs to be submitted to be able to deny this proposal"
 msgstr ""
 
-#: wbportfolio/models/transactions/trade_proposals.py:671
+#: models/transactions/trade_proposals.py:668
 msgid ""
 "The portfolio needs to be a model portfolio in order to revert this trade "
 "proposal manually"
 msgstr ""
 
-#: wbportfolio/models/transactions/trades.py:324
+#: models/transactions/trades.py:324
 msgid "Cannot execute a trade without a valid quote price"
 msgstr ""
 
-#: wbportfolio/models/transactions/trades.py:327
+#: models/transactions/trades.py:327
 msgid ""
 "The portfolio needs to be a model portfolio in order to execute this trade "
 "manually"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/portfolios.py:105
+#: viewsets/configs/display/portfolios.py:105
 msgid "Linked Instruments"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/portfolios.py:112
+#: viewsets/configs/display/portfolios.py:112
 msgid "Dependency Portfolios"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/portfolios.py:119
+#: viewsets/configs/display/portfolios.py:119
 msgid "Preferred Classification"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/products.py:26
-#: wbportfolio/viewsets/configs/display/products.py:156
+#: viewsets/configs/display/products.py:26
+#: viewsets/configs/display/products.py:156
 msgid "Information"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/products.py:62
+#: viewsets/configs/display/products.py:62
 msgid "Performance"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/products.py:144
+#: viewsets/configs/display/products.py:144
 msgid "Classifications"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/products.py:148
+#: viewsets/configs/display/products.py:148
 msgid "Fees"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/products.py:166
+#: viewsets/configs/display/products.py:166
 msgid "White Label Customers"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/products.py:170
+#: viewsets/configs/display/products.py:170
 msgid "Portfolios"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/products.py:173
+#: viewsets/configs/display/products.py:173
 msgid "Related Instruments"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/products.py:178
+#: viewsets/configs/display/products.py:178
 msgid "Index"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/products.py:180
+#: viewsets/configs/display/products.py:180
 msgid "Roles"
 msgstr ""
 
-#: wbportfolio/viewsets/configs/display/products.py:183
+#: viewsets/configs/display/products.py:183
 msgid "Preferred Classification per Instrument"
 msgstr ""

wbportfolio/locale/en/LC_MESSAGES/django.po

@@ -0,0 +1,195 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-30 11:37+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: contrib/company_portfolio/configs/display.py:25
+#: contrib/company_portfolio/configs/display.py:29
+msgid "AUM By Product"
+msgstr ""
+
+#: contrib/company_portfolio/configs/display.py:44
+#: contrib/company_portfolio/configs/display.py:48
+msgid "AUM"
+msgstr ""
+
+#: contrib/company_portfolio/configs/display.py:84
+#: contrib/company_portfolio/configs/display.py:88
+msgid "Asset Allocation"
+msgstr ""
+
+#: contrib/company_portfolio/configs/display.py:103
+#: contrib/company_portfolio/configs/display.py:107
+msgid "Geographic Focus"
+msgstr ""
+
+#: contrib/company_portfolio/configs/display.py:124
+msgid "Customer Information"
+msgstr ""
+
+#: models/reconciliations/account_reconciliation_lines.py:118
+msgid "The last share price of the product"
+msgstr ""
+
+#: models/reconciliations/account_reconciliation_lines.py:127
+msgid "The number of shares computed through the Workbench"
+msgstr ""
+
+#: models/reconciliations/account_reconciliation_lines.py:133
+msgid "The nominal value computed through the Workbench"
+msgstr ""
+
+#: models/reconciliations/account_reconciliation_lines.py:140
+msgid ""
+"The number of shares externally provided through the Account holder. "
+"Initially set to the number of shares computed through the Workbench"
+msgstr ""
+
+#: models/reconciliations/account_reconciliation_lines.py:148
+msgid ""
+"The nominal value externally provided through the Account holder. Initially "
+"set to the number of shares computed through the Workbench"
+msgstr ""
+
+#: models/reconciliations/account_reconciliation_lines.py:155
+msgid "Account Reconciliation (Product)"
+msgstr ""
+
+#: models/reconciliations/account_reconciliation_lines.py:156
+msgid "Account Reconciliation (Products)"
+msgstr ""
+
+#: models/reconciliations/reconciliations.py:19
+msgid "Approved By"
+msgstr ""
+
+#: models/reconciliations/reconciliations.py:22
+msgid "Approved Timestamp"
+msgstr ""
+
+#: models/transactions/claim.py:338 models/transactions/claim.py:341
+#: models/transactions/claim.py:344
+msgid "With this status, this has to be provided."
+msgstr ""
+
+#: models/transactions/rebalancing.py:81
+msgid "Evaluation Frequency"
+msgstr ""
+
+#: models/transactions/rebalancing.py:82
+msgid "The Evaluation Frequency in RRULE format"
+msgstr ""
+
+#: models/transactions/trade_proposals.py:480
+msgid "All trades need to be draft before submitting"
+msgstr ""
+
+#: models/transactions/trade_proposals.py:489
+msgid "There is no valid trade on this proposal"
+msgstr ""
+
+#: models/transactions/trade_proposals.py:557
+msgid "The portfolio does not allow manual rebalanced"
+msgstr ""
+
+#: models/transactions/trade_proposals.py:560
+msgid ""
+"At least one trade needs to be submitted to be able to approve this proposal"
+msgstr ""
+
+#: models/transactions/trade_proposals.py:564
+msgid ""
+"The portfolio needs to be a model portfolio in order to approve this trade "
+"proposal manually"
+msgstr ""
+
+#: models/transactions/trade_proposals.py:567
+msgid "The pre trades rules did not passed successfully"
+msgstr ""
+
+#: models/transactions/trade_proposals.py:599
+msgid ""
+"At least one trade needs to be submitted to be able to deny this proposal"
+msgstr ""
+
+#: models/transactions/trade_proposals.py:668
+msgid ""
+"The portfolio needs to be a model portfolio in order to revert this trade "
+"proposal manually"
+msgstr ""
+
+#: models/transactions/trades.py:324
+msgid "Cannot execute a trade without a valid quote price"
+msgstr ""
+
+#: models/transactions/trades.py:327
+msgid ""
+"The portfolio needs to be a model portfolio in order to execute this trade "
+"manually"
+msgstr ""
+
+#: viewsets/configs/display/portfolios.py:105
+msgid "Linked Instruments"
+msgstr ""
+
+#: viewsets/configs/display/portfolios.py:112
+msgid "Dependency Portfolios"
+msgstr ""
+
+#: viewsets/configs/display/portfolios.py:119
+msgid "Preferred Classification"
+msgstr ""
+
+#: viewsets/configs/display/products.py:26
+#: viewsets/configs/display/products.py:156
+msgid "Information"
+msgstr ""
+
+#: viewsets/configs/display/products.py:62
+msgid "Performance"
+msgstr ""
+
+#: viewsets/configs/display/products.py:144
+msgid "Classifications"
+msgstr ""
+
+#: viewsets/configs/display/products.py:148
+msgid "Fees"
+msgstr ""
+
+#: viewsets/configs/display/products.py:166
+msgid "White Label Customers"
+msgstr ""
+
+#: viewsets/configs/display/products.py:170
+msgid "Portfolios"
+msgstr ""
+
+#: viewsets/configs/display/products.py:173
+msgid "Related Instruments"
+msgstr ""
+
+#: viewsets/configs/display/products.py:178
+msgid "Index"
+msgstr ""
+
+#: viewsets/configs/display/products.py:180
+msgid "Roles"
+msgstr ""
+
+#: viewsets/configs/display/products.py:183
+msgid "Preferred Classification per Instrument"
+msgstr ""