wbportfolio 1.44.5__py2.py3-none-any.whl → 1.45.0__py2.py3-none-any.whl

wbportfolio/viewsets/configs/previews/portfolios.py

@@ -10,12 +10,7 @@ class PortfolioPreviewConfig(PreviewViewConfig):
     def get_display(self) -> Display:
         return create_simple_display(
             [
-                [
-                    "name",
-                    "name",
-                    "currency",
-                ],
-                [repeat_field(2, "portfolio_synchronization"), "last_synchronization"],
+                ["name", "currency", "updated_at"],
                 [repeat_field(3, "depends_on")],
             ]
         )

wbportfolio/viewsets/configs/titles/__init__.py

@@ -38,7 +38,7 @@ from .instrument_prices import (
     NominalProductTitleConfig,
 )
 
-from .portfolios import ModelPortfolioTitleConfig, PortfolioTitleConfig, DailyPortfolioCashFlowTitleConfig
+from .portfolios import PortfolioTitleConfig, DailyPortfolioCashFlowTitleConfig, PortfolioTreeGraphChartTitleConfig, TopDownPortfolioCompositionPandasTitleConfig
 from .positions import (
     AggregatedAssetPositionLiquidityTitleConfig,
     AssetPositionPandasTitleConfig,

wbportfolio/viewsets/configs/titles/assets.py

@@ -1,5 +1,6 @@
 from wbcore.metadata.configs.titles import TitleViewConfig
 from wbfdm.models import Instrument
+
 from wbportfolio.models import Portfolio
 
 

wbportfolio/viewsets/configs/titles/fees.py

@@ -1,4 +1,5 @@
 from wbcore.metadata.configs.titles import TitleViewConfig
+
 from wbportfolio.models import Portfolio
 
 

wbportfolio/viewsets/configs/titles/instrument_prices.py

@@ -1,4 +1,5 @@
 from wbcore.metadata.configs.titles import TitleViewConfig
+
 from wbportfolio.models import Product
 
 

wbportfolio/viewsets/configs/titles/portfolios.py

@@ -1,4 +1,5 @@
 from wbcore.metadata.configs.titles import TitleViewConfig
+
 from wbportfolio.models.portfolio import Portfolio
 
 
@@ -13,20 +14,21 @@ class PortfolioTitleConfig(TitleViewConfig):
         return "New Portfolio"
 
 
-class ModelPortfolioTitleConfig(TitleViewConfig):
-    def get_list_title(self):
-        return "Model Portfolios"
-
-    def get_instance_title(self):
-        return "Model Portfolio: {{ name }}"
-
-    def get_create_title(self):
-        return "New Model Portfolio"
-
-
 class DailyPortfolioCashFlowTitleConfig(TitleViewConfig):
     def get_list_title(self):
         if portfolio_id := self.view.kwargs.get("portfolio_id", None):
             portfolio = Portfolio.objects.get(id=portfolio_id)
             return f"{portfolio}: Daily Portfolio Cash Flow"
         return "Daily Portfolio Cash Flow"
+
+
+class PortfolioTreeGraphChartTitleConfig(TitleViewConfig):
+    def get_list_title(self):
+        portfolio = self.view.portfolio
+        return f"Tree Graph Chart for {portfolio}"
+
+
+class TopDownPortfolioCompositionPandasTitleConfig(TitleViewConfig):
+    def get_list_title(self):
+        portfolio = self.view.portfolio
+        return f"Top-Down Composition for {portfolio}"

wbportfolio/viewsets/configs/titles/roles.py

@@ -1,4 +1,5 @@
 from wbcore.metadata.configs.titles import TitleViewConfig
+
 from wbportfolio.models import Product
 
 

wbportfolio/viewsets/configs/titles/trades.py

@@ -1,5 +1,6 @@
 from wbcore.metadata.configs.titles import TitleViewConfig
 from wbfdm.models import Instrument
+
 from wbportfolio.models import Portfolio
 
 

wbportfolio/viewsets/configs/titles/transactions.py

@@ -1,4 +1,5 @@
 from wbcore.metadata.configs.titles import TitleViewConfig
+
 from wbportfolio.models import Portfolio
 
 

wbportfolio/viewsets/custodians.py

@@ -4,6 +4,7 @@ from rest_framework.decorators import action
 from rest_framework.response import Response
 from wbcore import viewsets
 from wbcore.permissions.permissions import InternalUserPermissionMixin
+
 from wbportfolio.filters import CustodianFilterSet
 from wbportfolio.models import Custodian
 from wbportfolio.serializers import (

wbportfolio/viewsets/esg.py

@@ -11,6 +11,7 @@ from wbcore.utils.strings import format_number
 from wbfdm.analysis.esg.enums import AggregationMethod, ESGAggregation
 from wbfdm.analysis.esg.esg_analysis import DataLoader
 from wbfdm.models import Instrument
+
 from wbportfolio.filters import ESGMetricAggregationPortfolioPandasFilterSet
 from wbportfolio.models import AssetPosition
 from wbportfolio.viewsets.configs import (

wbportfolio/viewsets/mixins.py

@@ -1,6 +1,7 @@
 from django.shortcuts import get_object_or_404
 from django.utils.functional import cached_property
 from wbfdm.models import Instrument
+
 from wbportfolio.models import Portfolio, PortfolioRole
 
 

wbportfolio/viewsets/portfolio_cash_flow.py

@@ -1,5 +1,6 @@
 from django.db.models import Case, F, Value, When
 from wbcore import viewsets
+
 from wbportfolio.models import DailyPortfolioCashFlow
 from wbportfolio.serializers import DailyPortfolioCashFlowModelSerializer
 from wbportfolio.viewsets.configs.display import DailyPortfolioCashFlowDisplayConfig

wbportfolio/viewsets/portfolio_cash_targets.py

@@ -1,4 +1,5 @@
 from wbcore import viewsets
+
 from wbportfolio.models import PortfolioCashTarget
 from wbportfolio.serializers import PortfolioCashTargetModelSerializer
 

wbportfolio/viewsets/portfolio_relationship.py

@@ -1,5 +1,6 @@
 from wbcore import viewsets
 from wbcore.permissions.permissions import InternalUserPermissionMixin
+
 from wbportfolio.models import (
     InstrumentPortfolioThroughModel,
     PortfolioInstrumentPreferredClassificationThroughModel,

wbportfolio/viewsets/portfolio_swing_pricing.py

@@ -1,4 +1,5 @@
 from wbcore import viewsets
+
 from wbportfolio.models.portfolio_swing_pricings import PortfolioSwingPricing
 from wbportfolio.serializers import PortfolioSwingPricingModelSerializer
 

wbportfolio/viewsets/portfolios.py

@@ -1,34 +1,41 @@
-from datetime import datetime
+from contextlib import suppress
+from datetime import date, datetime
 
+import pandas as pd
+from django.db.models import Q
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404
+from django.utils.dateparse import parse_date
+from django.utils.functional import cached_property
 from rest_framework.decorators import action
+from rest_framework.permissions import IsAdminUser
 from rest_framework.response import Response
+from rest_framework.reverse import reverse
 from wbcore import viewsets
 from wbcore.contrib.currency.models import Currency
+from wbcore.contrib.io.viewsets import ExportPandasAPIViewSet
+from wbcore.pandas import fields as pf
 from wbcore.permissions.permissions import InternalUserPermissionMixin
-from wbcore.utils.date import get_date_interval_from_request
-from wbportfolio.filters import PortfolioFilterSet
+from wbfdm.models import Instrument
+
+from wbportfolio.filters import PortfolioFilterSet, PortfolioTreeGraphChartFilterSet
 from wbportfolio.models import (
+    AssetPosition,
     Portfolio,
     PortfolioPortfolioThroughModel,
-    PortfolioSynchronization,
-    PriceComputation,
+    Rebalancer,
+    RebalancingModel,
     TradeProposal,
 )
-from wbportfolio.models.portfolio import resynchronize_history_as_task
+from wbportfolio.models.portfolio import batch_recompute_lookthrough_as_task
 from wbportfolio.serializers import (
-    ModelPortfolioModelSerializer,
     PortfolioModelSerializer,
     PortfolioPortfolioThroughModelSerializer,
     PortfolioRepresentationSerializer,
 )
 
+from ..models.graphs.portfolio import PortfolioGraph
 from .configs import (
-    ModelPortfolioButtonConfig,
-    ModelPortfolioDisplayConfig,
-    ModelPortfolioEndpointConfig,
-    ModelPortfolioTitleConfig,
     PortfolioButtonConfig,
     PortfolioDisplayConfig,
     PortfolioEndpointConfig,
@@ -36,6 +43,11 @@ from .configs import (
     PortfolioPortfolioThroughModelEndpointConfig,
     PortfolioPreviewConfig,
     PortfolioTitleConfig,
+    PortfolioTreeGraphChartEndpointConfig,
+    PortfolioTreeGraphChartTitleConfig,
+    TopDownPortfolioCompositionPandasDisplayConfig,
+    TopDownPortfolioCompositionPandasEndpointConfig,
+    TopDownPortfolioCompositionPandasTitleConfig,
 )
 from .mixins import UserPortfolioRequestPermissionMixin
 
@@ -70,75 +82,70 @@ class PortfolioModelViewSet(UserPortfolioRequestPermissionMixin, InternalUserPer
             .get_queryset()
             .select_related(
                 "currency",
-                "portfolio_synchronization",
             )
             .prefetch_related(
                 "depends_on",
-                "dependent_portfolios",
             )
         )
 
-    @action(detail=True, methods=["PATCH"])
+    @action(detail=True, methods=["POST"])
     def rebalance(self, request, pk=None):
-        if (date_str := request.POST.get("trade_date", None)) and (
-            model_portfolio_id := request.POST.get("model_portfolio", None)
-        ):
-            TradeProposal.objects.create(
-                portfolio=Portfolio.objects.get(id=pk),
-                model_portfolio=Portfolio.objects.get(id=model_portfolio_id),
-                trade_date=datetime.strptime(date_str, "%Y-%m-%d"),
+        if date_str := request.POST.get("trade_date", None):
+            trade_date = datetime.strptime(date_str, "%Y-%m-%d")
+            trade_proposal, _ = TradeProposal.objects.get_or_create(portfolio_id=pk, trade_date=trade_date)
+            trade_proposal.reset_trades()
+            return Response(
+                {"endpoint": reverse("wbportfolio:tradeproposal-detail", args=[trade_proposal.id], request=request)}
             )
-            return Response({"send": True})
         raise HttpResponse("Bad Request", status=400)
 
-    @action(detail=True, methods=["PATCH"])
-    def resynchronize(self, request, pk=None):
-        if request.user.has_perm("wbportfolio.administrate_instrument"):
-            portfolio = get_object_or_404(Portfolio, pk=pk)
-            instrument = request.GET.get("instrument", None)
-            start, end = get_date_interval_from_request(request, request_type="POST")
-            resynchronize_history_as_task.delay(portfolio.id, start, end, instrument_id=instrument)
-            return Response({"send": True})
-        return HttpResponse("Unauthorized", status=401)
-
-
-class ModelPortfolioModelViewSet(PortfolioModelViewSet):
-    serializer_class = ModelPortfolioModelSerializer
-    endpoint_config_class = ModelPortfolioEndpointConfig
-    display_config_class = ModelPortfolioDisplayConfig
-    title_config_class = ModelPortfolioTitleConfig
-    button_config_class = ModelPortfolioButtonConfig
-
     @action(detail=False, methods=["POST"])
     def createmodelportfolio(self, request, pk=None):
         if self.is_portfolio_manager:
             name = request.POST["name"]
             currency_id = request.POST["currency"]
             currency = Currency.objects.get(id=currency_id)
-            portfolio_synchronization_id = request.POST.get("portfolio_synchronization", None)
-            price_computation_id = request.POST.get("price_computation", None)
-            portfolio_synchronization = (
-                PortfolioSynchronization.objects.get(id=portfolio_synchronization_id)
-                if portfolio_synchronization_id
-                else None
-            )
-            create_index = request.POST.get("create_index", "false") == "true"
             index_parameters = {}
-            if create_index:
-                index_parameters["price_computation"] = (
-                    PriceComputation.objects.get(id=price_computation_id) if price_computation_id else None
-                )
-            Portfolio.create_model_portfolio(
-                name, currency, portfolio_synchronization=portfolio_synchronization, index_parameters=index_parameters
-            )
+            Portfolio.create_model_portfolio(name, currency, index_parameters=index_parameters)
             return Response({"send": True})
         raise HttpResponse("Unauthorized", status=403)
 
-    def get_queryset(self):
-        model_portfolios = PortfolioPortfolioThroughModel.objects.filter(
-            type=PortfolioPortfolioThroughModel.Type.MODEL
-        ).values("dependency_portfolio")
-        return super().get_queryset().filter(id__in=model_portfolios)
+    @action(detail=True, methods=["POST"])
+    def attachrebalancer(self, request, pk=None):
+        try:
+            activation_date = datetime.strptime(request.POST["activation_date"], "%Y-%m-%d")
+            rebalancing_model = get_object_or_404(RebalancingModel, pk=request.POST["rebalancing_model"])
+            frequency = request.POST["frequency"]
+            approve_trade_proposal_automatically = (
+                request.POST.get("approve_trade_proposal_automatically", "false") == "true"
+            )
+
+            rebalancer, _ = Rebalancer.objects.update_or_create(
+                portfolio=self.get_object(),
+                defaults={
+                    "rebalancing_model": rebalancing_model,
+                    "frequency": frequency,
+                    "activation_date": activation_date,
+                    "approve_trade_proposal_automatically": approve_trade_proposal_automatically,
+                },
+            )
+            return Response(
+                {"endpoint": reverse("wbportfolio:rebalancer-detail", args=[rebalancer.id], request=request)}
+            )
+        except KeyError:
+            return HttpResponse("Bad arguments", status=400)
+
+    @action(detail=True, methods=["POST"], permission_classes=[IsAdminUser])
+    def recomputelookthrough(self, request, pk=None):
+        portfolio = self.get_object()
+        if portfolio.is_lookthrough:
+            with suppress(KeyError):
+                start = datetime.strptime(request.POST["start"], "%Y-%m-%d")
+                end = datetime.strptime(request.POST["end"], "%Y-%m-%d")
+                batch_recompute_lookthrough_as_task.delay(portfolio.id, start, end)
+            return HttpResponse("Ok", status=200)
+
+        return HttpResponse("Bad arguments", status=400)
 
 
 class PortfolioPortfolioThroughModelViewSet(InternalUserPermissionMixin, viewsets.ModelViewSet):
@@ -151,4 +158,164 @@ class PortfolioPortfolioThroughModelViewSet(InternalUserPermissionMixin, viewset
     endpoint_config_class = PortfolioPortfolioThroughModelEndpointConfig
 
     def get_queryset(self):
-        return super().get_queryset().filter(portfolio=self.kwargs["portfolio_id"])
+        return (
+            super()
+            .get_queryset()
+            .filter(Q(portfolio=self.kwargs["portfolio_id"]) | Q(dependency_portfolio=self.kwargs["portfolio_id"]))
+        )
+
+
+class PortfolioTreeGraphChartViewSet(UserPortfolioRequestPermissionMixin, viewsets.HTMLViewSet):
+    filterset_class = PortfolioTreeGraphChartFilterSet
+    IDENTIFIER = "wbportfolio:portfolio-treegraphchart"
+    queryset = Portfolio.objects.all()
+
+    title_config_class = PortfolioTreeGraphChartTitleConfig
+    endpoint_config_class = PortfolioTreeGraphChartEndpointConfig
+
+    def get_queryset(self):
+        return super().get_queryset().filter(id=self.kwargs["portfolio_id"])
+
+    @cached_property
+    def val_date(self) -> date:
+        return parse_date(self.request.GET["date"])
+
+    def get_html(self, queryset) -> str:
+        portfolio_graph = PortfolioGraph(self.portfolio, self.val_date)
+        return portfolio_graph.to_svg()
+
+
+class TopDownPortfolioCompositionPandasAPIView(UserPortfolioRequestPermissionMixin, ExportPandasAPIViewSet):
+    IDENTIFIER = "wbportfolio:topdowncomposition"
+    queryset = Portfolio.objects.all()
+
+    display_config_class = TopDownPortfolioCompositionPandasDisplayConfig
+    title_config_class = TopDownPortfolioCompositionPandasTitleConfig
+    endpoint_config_class = TopDownPortfolioCompositionPandasEndpointConfig
+
+    pandas_fields = pf.PandasFields(
+        fields=[
+            pf.PKField(key="id", label="ID"),
+            pf.CharField(key="_group_key", label="Group Key"),
+            pf.IntegerField(key="parent_row_id", label="Parent Row"),
+            pf.CharField(key="instrument", label="Instrument"),
+            pf.FloatField(key="effective_weights", label="Effective Weights", precision=2, percent=True),
+            pf.FloatField(key="rebalancing_weights", label="Rebalancing Weights", precision=2, percent=True),
+        ]
+    )
+
+    @cached_property
+    def composition_portfolio(self) -> Portfolio | None:
+        return self.portfolio.composition_portfolio or self.portfolio
+
+    @cached_property
+    def last_rebalancing_date(self) -> date | None:
+        if self.composition_portfolio:
+            with suppress(TradeProposal.DoesNotExist):
+                return (
+                    self.composition_portfolio.trade_proposals.filter(trade_date__lte=self.last_effective_date)
+                    .latest("trade_date")
+                    .trade_date
+                )
+
+    @cached_property
+    def last_effective_date(self) -> date | None:
+        if self.composition_portfolio:
+            with suppress(AssetPosition.DoesNotExist):
+                return self.composition_portfolio.assets.latest("date").date
+
+    def get_dataframe(self, request, queryset, **kwargs):
+        df = pd.DataFrame(columns=["id", "parent_row_id", "instrument", "effective_weights", "rebalancing_weights"])
+
+        def _get_parent_instrument_id(portfolio):
+            with suppress(AttributeError):
+                return portfolio.instruments.first().id
+
+        if (
+            self.has_portfolio_access
+            and self.composition_portfolio
+            and self.last_rebalancing_date
+            and self.last_effective_date
+        ):
+            tree_positions_effective_date_df = (
+                pd.DataFrame(
+                    map(
+                        lambda x: {
+                            "instrument": x.underlying_instrument.id,
+                            "parent_instrument": _get_parent_instrument_id(
+                                getattr(x, "parent_portfolio", "portfolio")
+                            ),
+                            "effective_weights": x.weighting,
+                        },
+                        self.composition_portfolio.get_positions(
+                            self.last_effective_date, with_intermediary_position=True
+                        ),
+                    ),
+                    columns=["instrument", "parent_instrument", "effective_weights"],
+                )
+                .groupby(["parent_instrument", "instrument"])
+                .sum()
+            )
+            tree_positions_rebalancing_date_df = (
+                pd.DataFrame(
+                    map(
+                        lambda x: {
+                            "instrument": x.underlying_instrument.id,
+                            "parent_instrument": _get_parent_instrument_id(
+                                getattr(x, "parent_portfolio", "portfolio")
+                            ),
+                            "rebalancing_weights": x.weighting,
+                        },
+                        self.composition_portfolio.get_positions(
+                            self.last_rebalancing_date, with_intermediary_position=True
+                        ),
+                    ),
+                    columns=["instrument", "parent_instrument", "rebalancing_weights"],
+                )
+                .groupby(["parent_instrument", "instrument"])
+                .sum()
+            )
+
+            df = pd.concat(
+                [tree_positions_effective_date_df, tree_positions_rebalancing_date_df], axis=1
+            ).reset_index()
+
+            if not df["parent_instrument"].isnull().any():
+                df = pd.concat(
+                    [
+                        pd.DataFrame(
+                            [
+                                {
+                                    "instrument": self.portfolio.instruments.first().id,
+                                    "parent_instrument": None,
+                                    "effective_weights": 1.0,
+                                    "rebalancing_weights": 1.0,
+                                }
+                            ]
+                        ),
+                        df,
+                    ],
+                    ignore_index=True,
+                )
+
+            df = df.reset_index(names="id")
+
+            def _get_parent_id(x):
+                dff = df.loc[df["instrument"] == x, "id"]
+                if not dff.empty:
+                    return dff.iloc[0]
+                return None
+
+            def _get_group_key(x):
+                return str(int(x)) if not df.loc[df["parent_row_id"] == x, :].empty else None
+
+            df["parent_row_id"] = df["parent_instrument"].apply(lambda x: _get_parent_id(x))
+            df["_group_key"] = df["id"].apply(lambda x: _get_group_key(x))
+            df = df.drop(columns=["parent_instrument"])
+        return df
+
+    def manipulate_dataframe(self, df):
+        df["instrument"] = df["instrument"].map(
+            dict(Instrument.objects.filter(id__in=df["instrument"]).values_list("id", "name_repr"))
+        )
+        return df

wbportfolio/viewsets/positions.py

@@ -10,7 +10,8 @@ from wbcore.pandas import fields as pf
 from wbcore.permissions.permissions import InternalUserPermissionMixin
 from wbcore.serializers import decorator
 from wbcore.utils.strings import format_number
-from wbfdm.models import Classification, ClassificationGroup, Instrument
+from wbfdm.models import Classification, ClassificationGroup, Instrument, InstrumentType
+
 from wbportfolio.filters import (
     AggregatedAssetPositionLiquidityFilter,
     AssetPositionPandasFilter,
@@ -212,7 +213,7 @@ class AggregatedAssetPositionLiquidityPandasView(InternalUserPermissionMixin, Ex
 
         # Take the liquidity query for the two dates.
         qs_assets = queryset.filter(
-            underlying_security_instrument_type_key="equity",
+            underlying_instrument__instrument_type=InstrumentType.EQUITY,
             date__in=[historic_date, compared_date],
         ).values(
             "date",

wbportfolio/viewsets/product_groups.py

@@ -1,5 +1,6 @@
 from wbcore import viewsets
 from wbfdm.viewsets.configs.buttons.instruments import InstrumentButtonViewConfig
+
 from wbportfolio.models import ProductGroup
 from wbportfolio.serializers import (
     ProductGroupModelSerializer,

wbportfolio/viewsets/product_performance.py

@@ -24,6 +24,7 @@ from wbcore.permissions.permissions import InternalUserPermissionMixin
 from wbcore.utils.date import get_date_interval_from_request
 from wbcore.utils.strings import format_number
 from wbfdm.models import Instrument, InstrumentPrice, RelatedInstrumentThroughModel
+
 from wbportfolio.filters import (
     PerformanceComparisonFilter,
     PerformancePandasFilter,

wbportfolio/viewsets/products.py

@@ -36,6 +36,7 @@ from wbcore.utils.strings import format_number
 from wbfdm.contrib.metric.backends.performances import PERFORMANCE_METRIC
 from wbfdm.contrib.metric.viewsets.mixins import InstrumentMetricMixin
 from wbfdm.models import Instrument, InstrumentPrice
+
 from wbportfolio import serializers
 from wbportfolio.filters import (
     BaseProductFilterSet,

wbportfolio/viewsets/reconciliations.py

@@ -11,6 +11,7 @@ from rest_framework.response import Response
 from wbcore import viewsets
 from wbcore.contrib.notifications.dispatch import send_notification
 from wbcore.utils.strings import format_number
+
 from wbportfolio.models import AccountReconciliation, AccountReconciliationLine
 from wbportfolio.models.reconciliations.account_reconciliation_lines import (
     AccountReconciliationLineQuerySet,

wbportfolio/viewsets/registers.py

@@ -1,5 +1,6 @@
 from wbcore import viewsets
 from wbcore.permissions.permissions import InternalUserPermissionMixin
+
 from wbportfolio.models import Register
 from wbportfolio.serializers import (
     RegisterModelSerializer,

wbportfolio/viewsets/roles.py

@@ -1,5 +1,6 @@
 from wbcore import viewsets
 from wbcore.permissions.permissions import InternalUserPermissionMixin
+
 from wbportfolio.filters import PortfolioRoleFilterSet
 from wbportfolio.models import PortfolioRole
 from wbportfolio.serializers import (

wbportfolio/viewsets/signals.py

@@ -6,6 +6,7 @@ from rest_framework.reverse import reverse
 from wbcore.contrib.icons import WBIcon
 from wbcore.metadata.configs import buttons as bt
 from wbcore.signals.instance_buttons import add_instance_button
+
 from wbportfolio.viewsets.products import ProductModelViewSet
 
 

wbportfolio/viewsets/transactions/__init__.py

@@ -17,6 +17,7 @@ from .fees import (
     FeesModelViewSet,
     FeesPortfolioModelViewSet,
 )
+from .rebalancing import RebalancingModelRepresentationViewSet, RebalancerRepresentationViewSet, RebalancerModelViewSet
 from .trade_proposals import (
     TradeProposalModelViewSet,
     TradeProposalPortfolioModelViewSet,

wbportfolio/viewsets/transactions/claim.py

@@ -43,6 +43,7 @@ from wbcore.utils.strings import format_number
 from wbcrm.models.accounts import Account
 from wbfdm.models import ClassificationGroup, InstrumentPrice
 from wbfdm.preferences import get_default_classification_group
+
 from wbportfolio.analysis.claims import ConsolidatedTradeSummary
 from wbportfolio.filters import (
     ClaimFilter,
@@ -51,9 +52,9 @@ from wbportfolio.filters import (
     CustomerAPIFilter,
     CustomerClaimFilter,
     CustomerClaimGroupByFilter,
+    DistributionNNMChartFilter,
     NegativeTermimalAccountPerProductFilterSet,
     ProfitAndLossPandasFilter,
-    DistributionNNMChartFilter,
 )
 from wbportfolio.models import Product, Trade
 from wbportfolio.models.transactions.claim import Claim, ClaimGroupbyChoice

wbportfolio/viewsets/transactions/fees.py

@@ -8,6 +8,7 @@ from wbcore.pandas import fields as pf
 from wbcore.permissions.permissions import InternalUserPermissionMixin
 from wbcore.serializers import decorator
 from wbcore.utils.strings import format_number
+
 from wbportfolio.filters import FeesAggregatedFilter, FeesFilter, FeesPortfolioFilterSet
 from wbportfolio.models import Fees
 from wbportfolio.serializers import FeesModelSerializer

wbportfolio/viewsets/transactions/mixins.py

@@ -2,6 +2,7 @@ from datetime import date, datetime
 
 from django.http import HttpRequest
 from django.utils.functional import cached_property
+
 from wbportfolio.models.transactions.claim import Claim