wbfdm 1.50.13__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/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:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.50.13
+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.13.dist-info → wbfdm-1.50.14.dist-info}/RECORD

@@ -61,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
@@ -227,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
@@ -236,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=sUCkxHBAlTa_Fl2WpSVMiWBrDbva5rh04dlm9wjSz8Q,3806
+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
@@ -351,6 +351,6 @@ wbfdm/viewsets/statements/__init__.py,sha256=odxtFYUDICPmz8WCE3nx93EvKZLSPBEI4d7
 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.13.dist-info/METADATA,sha256=kuGj2qXFbTImsJ6kkvgbIvm6y4TASTPKsvflNEbrz20,738
-wbfdm-1.50.13.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.50.13.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,,