wbfdm 1.55.6__tar.gz → 1.55.8__tar.gz

{wbfdm-1.55.6 → wbfdm-1.55.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.55.6
+Version: 1.55.8
 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.55.6 → wbfdm-1.55.8}/wbfdm/contrib/metric/dispatch.py

@@ -2,6 +2,8 @@ from contextlib import suppress
 from datetime import date
 from typing import Any
 
+from wbfdm.contrib.metric.signals import instrument_metric_updated
+
 
 def compute_metrics(val_date: date, key: str | None = None, basket: Any | None = None, **kwargs):
     """
@@ -21,3 +23,4 @@ def compute_metrics(val_date: date, key: str | None = None, basket: Any | None =
     with suppress(KeyError):
         orchestrator = MetricOrchestrator(val_date, key=key, basket=basket, **kwargs)
         orchestrator.process()
+        instrument_metric_updated.send(sender=basket.__class__, basket=basket, key=key, val_date=val_date)

wbfdm-1.55.8/wbfdm/contrib/metric/signals.py

@@ -0,0 +1,7 @@
+from django.db.models.signals import ModelSignal
+
+# this signal is triggered whenever all instruments metrics are updated. Temporary solution until we rework the framework for more dynamicity
+
+instrument_metric_updated = ModelSignal(
+    use_caching=True
+)  # the sender model is the type model class being updated (e.g. Instrument), expect a "basket", "key" and "val_date" keyword argument (null if all are updated)

{wbfdm-1.55.6 → wbfdm-1.55.8}/wbfdm/contrib/metric/tasks.py

@@ -3,7 +3,7 @@ from datetime import date
 from celery import shared_task
 from django.contrib.contenttypes.models import ContentType
 
-from wbfdm.contrib.metric.orchestrators import MetricOrchestrator
+from wbfdm.contrib.metric.dispatch import compute_metrics
 
 
 @shared_task(queue="portfolio")
@@ -24,5 +24,4 @@ def compute_metrics_as_task(
     basket = None
     if basket_content_type_id and basket_id:
         basket = ContentType.objects.get(id=basket_content_type_id).get_object_for_this_type(pk=basket_id)
-    routine = MetricOrchestrator(val_date, key=key, basket=basket, **kwargs)
-    routine.process()
+    compute_metrics(val_date=val_date, key=key, basket=basket, **kwargs)

{wbfdm-1.55.6 → wbfdm-1.55.8}/wbfdm/contrib/msci/client.py

@@ -66,6 +66,7 @@ class MSCIClient:
     def controversies(self, identifiers: list[str], factors: list[str]) -> Generator[dict[str, str], None, None]:
         next_url = "https://api2.msci.com/esg/data/v2.0/issuers"
         offset = 0
+        limit = 100
         while next_url:
             with suppress(ConnectionError):
                 response = requests.post(
@@ -73,7 +74,7 @@ class MSCIClient:
                     json={
                         "issuer_identifier_list": identifiers,
                         "factor_name_list": factors,
-                        "limit": 100,
+                        "limit": limit,
                         "offset": offset,
                     },
                     headers={"AUTHORIZATION": f"Bearer {self.oauth_token}"},
@@ -87,6 +88,6 @@ class MSCIClient:
                         next_url = json_res["paging"]["links"]["next"]
                     except KeyError:
                         next_url = None
-                    offset += 100
+                    offset += limit
                     for row in json_res.get("result", {}).get("issuers", []):
                         yield row

{wbfdm-1.55.6 → wbfdm-1.55.8}/wbfdm/import_export/handlers/instrument.py

@@ -149,7 +149,7 @@ class InstrumentLookup:
                     exchange=exchange,
                     name=name,
                 )
-        if instrument and only_investable_universe and instrument.parent:
+        if instrument and only_investable_universe and not instrument.is_security and instrument.parent:
             instrument = instrument.parent
         return instrument
 

wbfdm-1.55.8/wbfdm/migrations/0033_alter_controversy_review.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.12 on 2025-09-08 11:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wbfdm', '0032_alter_instrumentprice_outstanding_shares'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='controversy',
+            name='review',
+            field=models.DateField(blank=True, null=True, verbose_name='Reviewed'),
+        ),
+    ]

{wbfdm-1.55.6 → wbfdm-1.55.8}/wbfdm/models/esg/controversies.py

@@ -8,7 +8,6 @@ from wbfdm.enums import (
     ESGControveryStatus,
     ESGControveryType,
 )
-from wbfdm.models.instruments.instruments import Instrument
 
 
 class Controversy(models.Model):
@@ -54,29 +53,23 @@ class Controversy(models.Model):
     direct_involvement = models.BooleanField(default=True, verbose_name="Direct Involvement")
     company_response = models.CharField(max_length=512, null=True, blank=True)
 
-    review = models.DateField(verbose_name="Reviewed")
+    review = models.DateField(verbose_name="Reviewed", null=True, blank=True)
     initiated = models.DateField(verbose_name="initiated", null=True, blank=True)
 
     @classmethod
-    def sync_from_dataloader(cls, controversy: dict[str, Any]) -> Self:
-        instrument = Instrument.objects.get(
-            pk=controversy["instrument_id"]
-        ).get_root()  # we link it only to root level
-
-        return cls.objects.update_or_create(
+    def dict_to_model(cls, controversy: dict[str, Any], instrument) -> Self:
+        return Controversy(
             external_id=controversy["id"],
-            defaults={
-                "instrument": instrument,
-                "headline": controversy["headline"],
-                "description": controversy["narrative"],
-                "source": controversy["source"],
-                "direct_involvement": controversy.get("direct_involvement", True),
-                "company_response": controversy["response"],
-                "review": controversy["review"],
-                "initiated": controversy["initiated"],
-                "flag": controversy["flag"],
-                "status": controversy["status"],
-                "type": controversy["type"],
-                "severity": controversy["assessment"],
-            },
-        )[0]
+            instrument=instrument,
+            headline=controversy["headline"],
+            description=controversy["narrative"],
+            source=controversy["source"],
+            direct_involvement=controversy.get("direct_involvement", True),
+            company_response=controversy["response"],
+            review=controversy["review"],
+            initiated=controversy["initiated"],
+            flag=controversy["flag"],
+            status=controversy["status"],
+            type=controversy["type"],
+            severity=controversy["assessment"],
+        )

{wbfdm-1.55.6 → wbfdm-1.55.8}/wbfdm/tasks.py

@@ -6,6 +6,7 @@ from django.db import transaction
 from django.db.models import ProtectedError, Q
 from pandas.tseries.offsets import BDay
 from tqdm import tqdm
+from wbcore.utils.cache import mapping
 
 from wbfdm.models import Instrument, InstrumentPrice
 from wbfdm.sync.runner import (  # noqa: F401
@@ -15,6 +16,7 @@ from wbfdm.sync.runner import (  # noqa: F401
     synchronize_instruments,
 )
 
+from .contrib.metric.signals import instrument_metric_updated
 from .signals import investable_universe_updated
 
 
@@ -71,6 +73,7 @@ def update_instrument_metrics_as_task():
     instruments = Instrument.active_objects.filter(is_investable_universe=True)
     for instrument in tqdm(instruments, total=instruments.count()):
         instrument.update_last_valuation_date()
+    instrument_metric_updated.send(sender=Instrument, basket=None, date=None, key=None)
 
 
 @shared_task(queue="portfolio")
@@ -92,6 +95,7 @@ def full_synchronization_as_task():
     for instrument in qs:
         with suppress(ProtectedError):
             instrument.delete()
+    mapping.cache_clear()  # we need to clear the mapping cache because we might have deleted parent instruments
     initialize_exchanges()
     initialize_instruments()
     with transaction.atomic():