wbfdm 1.50.12__py2.py3-none-any.whl → 1.50.14__py2.py3-none-any.whl

wbfdm/contrib/metric/backends/statistics.py

@@ -3,7 +3,7 @@ from datetime import date
 from typing import Generator
 
 import pandas as pd
-from django.db.models import Avg, Sum
+from django.db.models import Sum
 from wbcore.serializers.fields.number import DisplayMode
 
 from wbfdm.enums import Financial, PeriodType, SeriesType
@@ -21,7 +21,6 @@ STATISTICS_METRIC = MetricKey(
         MetricField(
             key="revenue_y_1",
             label="Revenue Y-1",
-            aggregate=Sum,
             list_display_kwargs={"show": "open"},
             decorators=[{"position": "left", "value": "{{currency_symbol}}"}],
             serializer_kwargs={"display_mode": DisplayMode.SHORTENED},
@@ -29,14 +28,12 @@ STATISTICS_METRIC = MetricKey(
         MetricField(
             key="revenue_y0",
             label="Revenue Y0",
-            aggregate=Sum,
             decorators=[{"position": "left", "value": "{{currency_symbol}}"}],
             serializer_kwargs={"display_mode": DisplayMode.SHORTENED},
         ),
         MetricField(
             key="revenue_y1",
             label="Revenue Y1",
-            aggregate=Sum,
             list_display_kwargs={"show": "open"},
             decorators=[{"position": "left", "value": "{{currency_symbol}}"}],
             serializer_kwargs={"display_mode": DisplayMode.SHORTENED},
@@ -44,20 +41,17 @@ STATISTICS_METRIC = MetricKey(
         MetricField(
             key="market_capitalization",
             label="Market Capitalization",
-            aggregate=Sum,
             decorators=[{"position": "left", "value": "{{currency_symbol}}"}],
             serializer_kwargs={"display_mode": DisplayMode.SHORTENED},
         ),
         MetricField(
             key="price",
             label="Price",
-            aggregate=Avg,
             decorators=[{"position": "left", "value": "{{currency_symbol}}"}],
         ),
         MetricField(
             key="volume_50d",
             label="Volume 50D",
-            aggregate=Avg,
             serializer_kwargs={"display_mode": DisplayMode.SHORTENED},
         ),
     ],
@@ -65,9 +59,49 @@ STATISTICS_METRIC = MetricKey(
 
 STATISTICS_METRIC_USD = MetricKey(
     key="statistic_usd",
-    label=STATISTICS_METRIC.label,
-    subfields=STATISTICS_METRIC.subfields,
-    additional_prefixes=STATISTICS_METRIC.additional_prefixes,
+    label="Statistic (USD)",
+    subfields=[
+        MetricField(
+            key="revenue_y_1",
+            label="Revenue Y-1",
+            aggregate=Sum,
+            list_display_kwargs={"show": "open"},
+            decorators=[{"position": "left", "value": "$"}],
+            serializer_kwargs={"display_mode": DisplayMode.SHORTENED},
+        ),
+        MetricField(
+            key="revenue_y0",
+            label="Revenue Y0",
+            aggregate=Sum,
+            decorators=[{"position": "left", "value": "$"}],
+            serializer_kwargs={"display_mode": DisplayMode.SHORTENED},
+        ),
+        MetricField(
+            key="revenue_y1",
+            label="Revenue Y1",
+            aggregate=Sum,
+            list_display_kwargs={"show": "open"},
+            decorators=[{"position": "left", "value": "$"}],
+            serializer_kwargs={"display_mode": DisplayMode.SHORTENED},
+        ),
+        MetricField(
+            key="market_capitalization",
+            label="Market Capitalization",
+            aggregate=Sum,
+            decorators=[{"position": "left", "value": "$"}],
+            serializer_kwargs={"display_mode": DisplayMode.SHORTENED},
+        ),
+        MetricField(
+            key="price",
+            label="Price",
+            decorators=[{"position": "left", "value": "{{currency_symbol}}"}],
+        ),
+        MetricField(
+            key="volume_50d",
+            label="Volume 50D",
+            serializer_kwargs={"display_mode": DisplayMode.SHORTENED},
+        ),
+    ],
 )
 
 

wbfdm/contrib/metric/filters.py

@@ -8,6 +8,16 @@ from .registry import backend_registry
 
 
 class InstrumentMetricFilterSet(filters.FilterSet):
+    parent_metric = filters.ModelChoiceFilter(
+        label="Parent",
+        queryset=InstrumentMetric.objects.all(),
+        endpoint=InstrumentMetric.get_representation_endpoint(),
+        value_key=InstrumentMetric.get_representation_value_key(),
+        label_key=InstrumentMetric.get_representation_label_key(),
+        hidden=True,
+    )
+    parent_metric__isnull = filters.BooleanFilter(field_name="parent_metric", lookup_expr="isnull", hidden=True)
+
     key = filters.ChoiceFilter(choices=backend_registry.get_choices(), label="Key")
     basket_content_type = filters.ModelChoiceFilter(
         queryset=ContentType.objects.all(),

wbfdm/filters/instruments.py

@@ -52,6 +52,7 @@ class InstrumentFilterSet(TagFilterMixin, InstrumentFavoriteGroupFilterSet):
         label_key=Instrument.get_representation_label_key(),
         hidden=True,
     )
+    parent__isnull = wb_filters.BooleanFilter(field_name="parent", lookup_expr="isnull", hidden=True)
 
     classifications = wb_filters.ModelChoiceFilter(
         label="Classification",

wbfdm/models/instruments/instrument_prices.py

@@ -340,6 +340,11 @@ class InstrumentPrice(
 
         if self.market_capitalization_consolidated is None:
             self.market_capitalization_consolidated = self.market_capitalization
+
+        # if the instrument is of type cash, we enforce the net value to 1
+        if self.instrument.is_cash or self.instrument.is_cash_equivalent:
+            self.net_value = Decimal("1")
+            self.gross_value = Decimal("1")
         super().save(*args, **kwargs)
 
     def __str__(self):

wbfdm/models/instruments/llm/create_instrument_news_relationships.py

@@ -61,7 +61,7 @@ def run_company_extraction_llm(title: str, description: str, *args) -> list[dict
             ],
             output_model=CompaniesModel,
             query={"title": title, "description": description},
-        )
+        )[0]
         if isinstance(res, CompaniesModel):
             instrument_ct = ContentType.objects.get_for_model(Instrument)
             for company in res.companies:
@@ -83,8 +83,8 @@ def run_company_extraction_llm(title: str, description: str, *args) -> list[dict
                         }
                     )
     except (
-        BadRequestErrors,
         ValidationError,
+        *BadRequestErrors,
     ):  # we silent bad request error because there is nothing we can do about it
         pass
     except tuple(APIStatusErrors) as e:  # for APIStatusError, we let celery retry it

wbfdm/viewsets/instruments/instruments.py

@@ -52,7 +52,7 @@ class InstrumentModelViewSet(InstrumentMetricMixin, viewsets.ModelViewSet):
     METRIC_SHOW_AGGREGATES = False
     filter_backends = (ObjectPermissionsFilter, DjangoFilterBackend, OrderingFilter, InstrumentSearchFilter)
 
-    queryset = Instrument.objects.annotate_all()
+    queryset = Instrument.objects.annotate_all().exclude(name="")
     serializer_class = InstrumentModelListSerializer
     ordering_fields = (
         "instrument_type",

{wbfdm-1.50.12.dist-info → wbfdm-1.50.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.50.12
+Version: 1.50.14
 Summary: The workbench module ensures rapid access to diverse financial data (market, fundamental, forecasts, ESG), with features for storing instruments, classifying them, and conducting financial analysis.
 Author-email: Christopher Wittlinger <c.wittlinger@stainly.com>
 Requires-Dist: roman==4.*

{wbfdm-1.50.12.dist-info → wbfdm-1.50.14.dist-info}/RECORD

@@ -3,7 +3,6 @@ wbfdm/apps.py,sha256=83jiPNQfxUbO7KYKBS5qo5SZNuz25Kmmy_txoVmIKG0,333
 wbfdm/dynamic_preferences_registry.py,sha256=tE9ZxlQDD7rqKM3GXjxyORQqDjf39GTENkOCZFt8Ixo,1299
 wbfdm/enums.py,sha256=5AuUouk5uuSNmRc6e-SiBu4FPmHVTN60ol9ftiuVrAc,33041
 wbfdm/jinja2.py,sha256=pkIC1U-0rf6vn0DDEUzZ8dPYiTGEPY8LBTRMi9wYiuc,199
-wbfdm/menu.py,sha256=c_uP0wIxboHvY0BfHbYPI9GI4F41UxSgREqbzcaxzHM,399
 wbfdm/preferences.py,sha256=8ghDcaapOMso1kjtNfKbSFykPUTxzqI5R77gM3BgiMs,927
 wbfdm/signals.py,sha256=PhAsFpQZF1YVe5UpedaRelUD_TVjemqRYm1HzV-bhmY,597
 wbfdm/tasks.py,sha256=rjbbDewuiDmfO54tBUwPiNV9AoDKnIx382riyExWwnI,4362
@@ -49,7 +48,7 @@ wbfdm/contrib/metric/dispatch.py,sha256=io6p4EJf36OdnxZDTw-sRRKfr_q8TLYvIDGWCkb3
 wbfdm/contrib/metric/dto.py,sha256=vS93tUvfusWdE7gUJsp320GwfwWpb8bGJDdrb1GB6M8,3413
 wbfdm/contrib/metric/exceptions.py,sha256=6IuEVde7aOyQaXHE817bCNdUw8LTI3sOSU9LiV3NZbM,200
 wbfdm/contrib/metric/factories.py,sha256=b6-3fSERbZGjGw6QC0k3hhSpyQKVy2MJoZzX4y3GPEo,1123
-wbfdm/contrib/metric/filters.py,sha256=TlWinXQWVw3DLRDxfDdpphZlep9thmlhsWpIfRA9qB8,967
+wbfdm/contrib/metric/filters.py,sha256=a6TAN-_EaRUhJ34JCFwFmEgj8uKZMNXFLOoMS2qvwZI,1427
 wbfdm/contrib/metric/models.py,sha256=lI_ZmK7058GT_5ngC45UdXRc7ju-ULbcOtO5w_CMBwU,7002
 wbfdm/contrib/metric/orchestrators.py,sha256=YyVVKKm3Sl1zVr2mw9A7LSJs6YnmElbg1yESREF3lFk,3736
 wbfdm/contrib/metric/registry.py,sha256=SdZff6FIrtdbyAO0X0BpXndJAIhU6VVojNui_MEw7jI,3167
@@ -62,7 +61,7 @@ wbfdm/contrib/metric/admin/metrics.py,sha256=SJU-5ona3npgRjTgDoHvo9aCztq-VMnIVvv
 wbfdm/contrib/metric/backends/__init__.py,sha256=Bl7bGEYVx38uiN2BS-0pr2WpIkbhUl7yPCEwt1W4tUg,128
 wbfdm/contrib/metric/backends/base.py,sha256=TTTcNHjuzGCnzoDBqYZOb-nT7fnuYjjp0D6ACqR5yXk,6765
 wbfdm/contrib/metric/backends/performances.py,sha256=yt9E7A_OEWQBQabf9bqt4Rc3S6oUXbSeM6NR1nYidtg,11642
-wbfdm/contrib/metric/backends/statistics.py,sha256=6DWMsFAZUaTA2v0VTBudx2QiX0E4umMEoyyqS3ZM3e4,6695
+wbfdm/contrib/metric/backends/statistics.py,sha256=GeU4QOVGcz_Iri_18ku7PqhDDfPEpZpQJssBtCL6RsE,7903
 wbfdm/contrib/metric/backends/utils.py,sha256=xpsDmoL2Jv9-KTuo-ay65D4m9Kf35jGc9cbeejhFLQU,131
 wbfdm/contrib/metric/migrations/0001_initial.py,sha256=EwXRJrG7zQYT1bD6jjaf1gZNfpd8f2gzta09GYqukiM,3403
 wbfdm/contrib/metric/migrations/0002_remove_instrumentmetric_unique_instrument_metric_and_more.py,sha256=xp6MACDohMSs4YfFbprCLa5G7zEuBhfZgpVXyMsZPWI,808
@@ -140,7 +139,7 @@ wbfdm/filters/exchanges.py,sha256=84N4AQoCwgdnxTxmhMob5Yndfr5gy_DRQ_-m2ilVLVM,83
 wbfdm/filters/financials.py,sha256=jdubT5xfFTMcwJSbC_z0WkF8KlO6eAxkaMS7-oQFFp0,2512
 wbfdm/filters/financials_analysis.py,sha256=aDA33RhKCOmA62GwuAr5xDK71T0racdyDUEaxOBp4Oc,4401
 wbfdm/filters/instrument_prices.py,sha256=Nt-fInhTM_LRwwmT3U-b0eWoxe-EYEdv77wLEHkZqUc,3710
-wbfdm/filters/instruments.py,sha256=u-aQIjAa90Ru7wdIoUr207Z39ThnDMBZoMEFqBDA1vc,7893
+wbfdm/filters/instruments.py,sha256=6UksQCDvMMdvQvixUHnM_oLeMqiFlBWtsKNQ_tAOXTA,7995
 wbfdm/filters/utils.py,sha256=6IpNoZ_yjRUCdpVXrj3kriTceAX-VGrS5NpZA2NgSmY,1870
 wbfdm/import_export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/import_export/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -228,7 +227,7 @@ wbfdm/models/exchanges/exchanges.py,sha256=FSxjEh3k2KLDJyJfzZg7iGUFZIxzQt__FYaDy
 wbfdm/models/instruments/__init__.py,sha256=OvEkECJaCubBQC7B9yUrx15V982labvegeGXyEASVno,636
 wbfdm/models/instruments/classifications.py,sha256=EeZ_P8f1F1NfjUmLf9fDMF0iPM73qxQoArUfvjuCwHg,10906
 wbfdm/models/instruments/instrument_lists.py,sha256=GxfFyfYxEcJS36LAarHja49TOM8ffhIivpZX2-tPtZg,4234
-wbfdm/models/instruments/instrument_prices.py,sha256=WCaFMZ9sF7xeGTp9jkq7TA8RfYHrwvTjujzqgCKj9SI,22070
+wbfdm/models/instruments/instrument_prices.py,sha256=4xDZ2ulwQ1grVuznchz3m3920LTmHkxWfiSLy-c2u0g,22306
 wbfdm/models/instruments/instrument_relationships.py,sha256=zpCZCnt5CqIg5bd6le_6TyirsSwGV2NaqTVKw3bd5vM,10660
 wbfdm/models/instruments/instrument_requests.py,sha256=XbpofRS8WHadHlTFjvXJyd0o7K9r2pzJtnpjVQZOLdI,7832
 wbfdm/models/instruments/instruments.py,sha256=Heyk5cBJJ7ZkoDuZnTuWxB7LMmp_BZb2feW_exs1oIA,40276
@@ -237,7 +236,7 @@ wbfdm/models/instruments/private_equities.py,sha256=uzwZi8IkmCKAHVTxnuFya9tehx7k
 wbfdm/models/instruments/querysets.py,sha256=c9fbHVvIRyaFU7jm_CM90lfIVzB8beOD8YII9-FqdT4,7191
 wbfdm/models/instruments/utils.py,sha256=88jnWINSSC0OwH-mCEOPLZXuhBCtEsxBpSaZ38GteaE,1365
 wbfdm/models/instruments/llm/__init__.py,sha256=dSmxRmEWb0A4O_lUoWuRKt2mBtUuLCTPVVJqGyi_n40,52
-wbfdm/models/instruments/llm/create_instrument_news_relationships.py,sha256=CVett-KGNio64xXN--dxw-frrUJfoD7vdfuw6hL8zg8,3805
+wbfdm/models/instruments/llm/create_instrument_news_relationships.py,sha256=f9MT-8cWYlexUfCkaOJa9erI9RaUNI-nqCEyf2tDkbA,3809
 wbfdm/models/instruments/mixin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/models/instruments/mixin/financials_computed.py,sha256=L5wjXDsR0maiwfOKP6KyWNJNH4nGOoAjSc_hDM7fsj0,35105
 wbfdm/models/instruments/mixin/financials_serializer_fields.py,sha256=-OkpcUt1rZmB3nUcO2vckpJdVm8IxRqkPDEgcPqqoRU,68886
@@ -345,13 +344,13 @@ wbfdm/viewsets/instruments/financials_analysis.py,sha256=xcVKR2H0P07NIyxFwPPPmVi
 wbfdm/viewsets/instruments/instrument_lists.py,sha256=hwwHDNpHjjffxw08N_1LtkL5Fdi8c1Om-PLz6pTu4Ok,2878
 wbfdm/viewsets/instruments/instrument_prices.py,sha256=WGUe5WUl9PqulWSPCZgWcBWCmgxtu4lhm-UeAa4ngyg,24008
 wbfdm/viewsets/instruments/instrument_requests.py,sha256=mmaARNl6ymDdlcLzcu16vVfFsunhtJkMw2r2NBfUp9U,1839
-wbfdm/viewsets/instruments/instruments.py,sha256=UtsLAxf7v_tdpmT16UWSUa834Yq2wYJXztiKrdsBrmw,4004
+wbfdm/viewsets/instruments/instruments.py,sha256=-UG8fceQumx06xmZ6tRnjFvFu_Jrjz5m83atMAMubVo,4021
 wbfdm/viewsets/instruments/instruments_relationships.py,sha256=D2Ym84zXBFegQC9nMThKSWqSAcWa0WvcS_GXxM2po68,11076
 wbfdm/viewsets/instruments/utils.py,sha256=kr5HwkSaWp-6GHVEQIb3CnIspDGSxfqghyOqg0oHO-A,1166
 wbfdm/viewsets/statements/__init__.py,sha256=odxtFYUDICPmz8WCE3nx93EvKZLSPBEI4d7pozcQz2A,47
 wbfdm/viewsets/statements/statements.py,sha256=kmtM0uZ3f7eJJe5gVmd-iVra9dHwTB9x12p7f5qTEx8,4084
 wbfdm/viewsets/technical_analysis/__init__.py,sha256=qtCIBg0uSiZeJq_1tEQFilnorMBkMe6uCMfqar6-cLE,77
 wbfdm/viewsets/technical_analysis/monthly_performances.py,sha256=O1j8CGfOranL74LqVvcf7jERaDIboEJZiBf_AbbVDQ8,3974
-wbfdm-1.50.12.dist-info/METADATA,sha256=l0PNqskq1ouUhzbYuHWsncTZk0LBQpb_zYSwk-YNI7I,738
-wbfdm-1.50.12.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.50.12.dist-info/RECORD,,
+wbfdm-1.50.14.dist-info/METADATA,sha256=iWHCoUnuFNL9eIQx8eH3shYE3IxxVUlULgXNL-I1nts,738
+wbfdm-1.50.14.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.50.14.dist-info/RECORD,,

wbfdm/menu.py

@@ -1,11 +0,0 @@
-from django.utils.translation import gettext as _
-from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
-
-INSTRUMENT_MENU_ITEM = MenuItem(
-    label=_("Instruments"),
-    endpoint="wbfdm:instrument-list",
-    permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["wbfdm.view_instrument"]
-    ),
-)