wbfdm 1.55.7__py2.py3-none-any.whl → 1.55.9__py2.py3-none-any.whl

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/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/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/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/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/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/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():

{wbfdm-1.55.7.dist-info → wbfdm-1.55.9.dist-info}/METADATA

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

@@ -5,7 +5,7 @@ wbfdm/enums.py,sha256=5AuUouk5uuSNmRc6e-SiBu4FPmHVTN60ol9ftiuVrAc,33041
 wbfdm/jinja2.py,sha256=pkIC1U-0rf6vn0DDEUzZ8dPYiTGEPY8LBTRMi9wYiuc,199
 wbfdm/preferences.py,sha256=8ghDcaapOMso1kjtNfKbSFykPUTxzqI5R77gM3BgiMs,927
 wbfdm/signals.py,sha256=PhAsFpQZF1YVe5UpedaRelUD_TVjemqRYm1HzV-bhmY,597
-wbfdm/tasks.py,sha256=zGlzMl-kTWQjkFRRVbaHdcwIaPTgxOJ-ZpyvXmqidFk,4802
+wbfdm/tasks.py,sha256=Q7iuSgV8LdPoKxgyMmTg5qukxHrM5XW1k1H_zI958zU,5104
 wbfdm/urls.py,sha256=pDp9I0kktxicad8sXXEUT7402jZPMJNcE5R1doTlcMw,8887
 wbfdm/utils.py,sha256=4cWrCpqXxHIjtSlt4DDPFvmtaqXw_H0nqhM6sGuXx0o,1938
 wbfdm/admin/__init__.py,sha256=Z1VtH_gjD71K79KcD-2Q2Lu_p_7j0akMZj7gNxdz1CQ,1398
@@ -45,7 +45,7 @@ wbfdm/contrib/internal/dataloaders/market_data.py,sha256=QJx4DsGGN3yy0cjIRDEatt_
 wbfdm/contrib/metric/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/contrib/metric/apps.py,sha256=T-Na_lyFeLR8ebGvaW-mcjKFLqiZcsPXnUlOuVPOiWw,297
 wbfdm/contrib/metric/decorators.py,sha256=VPmyjEJaq5HqXOt_ZizqcXfRqSEXw4lanDmubUjb2GY,476
-wbfdm/contrib/metric/dispatch.py,sha256=io6p4EJf36OdnxZDTw-sRRKfr_q8TLYvIDGWCkb3hOM,915
+wbfdm/contrib/metric/dispatch.py,sha256=GdJoYRFiZXWwo3hZeNTDxOUwg7iniv63ddb-A-7Pc6w,1090
 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
@@ -54,7 +54,8 @@ wbfdm/contrib/metric/models.py,sha256=lI_ZmK7058GT_5ngC45UdXRc7ju-ULbcOtO5w_CMBw
 wbfdm/contrib/metric/orchestrators.py,sha256=YyVVKKm3Sl1zVr2mw9A7LSJs6YnmElbg1yESREF3lFk,3736
 wbfdm/contrib/metric/registry.py,sha256=SdZff6FIrtdbyAO0X0BpXndJAIhU6VVojNui_MEw7jI,3167
 wbfdm/contrib/metric/serializers.py,sha256=FqX2pgP4SL1oteVrnAWQezBOJD6JyTidLBEK72GMxrM,1636
-wbfdm/contrib/metric/tasks.py,sha256=x605TO-EmvqDjlQY3EjrUJ_9xUZ4tb84_XuQuI4-TAg,941
+wbfdm/contrib/metric/signals.py,sha256=qe-CGNZEc7csseiGgNbz8legvz0EM3e31k8kPQ19Zyw,417
+wbfdm/contrib/metric/tasks.py,sha256=yMgPvDSKUtJy6wFMGP8tdymO2vZGSaqIxKliGrrvzHE,907
 wbfdm/contrib/metric/urls.py,sha256=hAYOvH50S9k6EJdE_2DP6oCmt0WT314iaXRtNqQnRJo,459
 wbfdm/contrib/metric/admin/__init__.py,sha256=FW3qhfmS5tA4RNOv9Zse56dICDG7zgdHgBJ-MvT7VKM,125
 wbfdm/contrib/metric/admin/instruments.py,sha256=mPwwdwxeuo6nvyJ2_xolVdlpK05KMlzOPLaSlh1PtHE,419
@@ -84,7 +85,7 @@ wbfdm/contrib/metric/viewsets/configs/display.py,sha256=aZLy3wSCgJlfrS71qxjPfT56
 wbfdm/contrib/metric/viewsets/configs/menus.py,sha256=GJbDm3p6qeobet09kpQSSuJT3Bs14gYpXxQ1P16b5VM,422
 wbfdm/contrib/metric/viewsets/configs/utils.py,sha256=SREiSRS4faohL6lVxmeD3zJN8bb-C-PlANUr8AgpIkI,5009
 wbfdm/contrib/msci/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbfdm/contrib/msci/client.py,sha256=u8pcgwS1JRMz5dEdYrH_T1uhR6KTtBE4zK0Ritv8nTU,3609
+wbfdm/contrib/msci/client.py,sha256=XnPATwQKaPc48uvB_BnbxwZuoyQkA1kVNp_-48A0irY,3633
 wbfdm/contrib/msci/sync.py,sha256=StD2TliqxVnZ7YsITjYvdh7E95USS3_P9j8KgRlcDKY,2289
 wbfdm/contrib/msci/dataloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/contrib/msci/dataloaders/esg.py,sha256=VM2zprCC0q0CYSwGPA252czcVx9QpmxYv8FsLTKCGAI,4820
@@ -225,13 +226,14 @@ wbfdm/migrations/0029_alter_instrumentprice_volume.py,sha256=0UFUwEaBcqiWjKw6un1
 wbfdm/migrations/0030_alter_relatedinstrumentthroughmodel_related_type.py,sha256=10-89NB7-T7t3xFPpd4fYQkKejNR36UewIhe5_20QCo,565
 wbfdm/migrations/0031_exchange_apply_round_lot_size_and_more.py,sha256=MqcHxgJIt67BEuEYK8vnJHhx_cGFw9Ca9Az2EvsDy1o,863
 wbfdm/migrations/0032_alter_instrumentprice_outstanding_shares.py,sha256=uRgkf6j97kNaXAo0-_V3XzHNE59hvxSruJB18g53YwU,570
+wbfdm/migrations/0033_alter_controversy_review.py,sha256=A9npErIpE0QUEjqIqpxmO5GMi0VA2Id8whn1nswWXpU,445
 wbfdm/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/models/__init__.py,sha256=PWsLtlKJFDYycCohPbjsRLeWi1xaxEkZbaoUKo0yOBU,96
 wbfdm/models/fields.py,sha256=eQ_6EnDBMy0U7WzE2DsdXIXOJH5dFiIN2VbO2Svw4R0,3942
 wbfdm/models/fk_fields.py,sha256=XuOGN0Fnq4Hld9IcBKSpeSSrfAQD91B-HNYNVd69fAk,15041
 wbfdm/models/indicators.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/models/esg/__init__.py,sha256=FEYbRFSdfoWRsfKVxM-h6TLobj5P8bYQlZPG1iD9RMQ,29
-wbfdm/models/esg/controversies.py,sha256=OnswX0ZXdO37h-AWpr5aTJXhyT3MTwAOwt5ZV25t5BY,2950
+wbfdm/models/esg/controversies.py,sha256=ioAlytF3H_IKGtYfkDWyo7Xj6S4z7vvuyd5rgOed50s,2632
 wbfdm/models/exchanges/__init__.py,sha256=sScz2KX9fxhhmi4CEUssC8HCL4ENvrIqSSwk0_J7v-g,32
 wbfdm/models/exchanges/exchanges.py,sha256=RmM5shyyuxEGN2Y3JmeSWyU-SbpVARrvVFW72HtHwfg,7502
 wbfdm/models/instruments/__init__.py,sha256=OvEkECJaCubBQC7B9yUrx15V982labvegeGXyEASVno,636
@@ -362,6 +364,6 @@ wbfdm/viewsets/statements/__init__.py,sha256=odxtFYUDICPmz8WCE3nx93EvKZLSPBEI4d7
 wbfdm/viewsets/statements/statements.py,sha256=gA6RCI8-B__JwjEb6OZxpn8Y-9aF-YQ3HIQ7e1vfJMw,4304
 wbfdm/viewsets/technical_analysis/__init__.py,sha256=qtCIBg0uSiZeJq_1tEQFilnorMBkMe6uCMfqar6-cLE,77
 wbfdm/viewsets/technical_analysis/monthly_performances.py,sha256=O1j8CGfOranL74LqVvcf7jERaDIboEJZiBf_AbbVDQ8,3974
-wbfdm-1.55.7.dist-info/METADATA,sha256=9gaDPOFmD3ttp9ioIezRk2nePi7VlAtpTIWbh1Je34A,768
-wbfdm-1.55.7.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.55.7.dist-info/RECORD,,
+wbfdm-1.55.9.dist-info/METADATA,sha256=E3b45elSBbWIPyhnD0hVdM1Si0l7QDhYEiMXdHX4A2E,768
+wbfdm-1.55.9.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.55.9.dist-info/RECORD,,