wbfdm 1.50.13__tar.gz → 1.50.15__tar.gz

{wbfdm-1.50.13 → wbfdm-1.50.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.50.13
+Version: 1.50.15
 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 → wbfdm-1.50.15}/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-1.50.13 → wbfdm-1.50.15}/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-1.50.13 → wbfdm-1.50.15}/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: