wbfdm 1.49.1__py2.py3-none-any.whl → 1.49.3__py2.py3-none-any.whl

wbfdm/contrib/dsws/dataloaders/market_data.py

@@ -75,6 +75,8 @@ class DSWSMarketDataDataloader(MarketDataProtocol, Dataloader):
                         parameters["end"] = to_date.strftime("%Y-%m-%d")
                 for chunked_identifiers in client.get_chunked_list(identifiers, len(fields)):
                     df = client.get_timeserie_df(chunked_identifiers, fields, **parameters)
+                    if exact_date:
+                        df = df[df["Dates"] == exact_date]
                     for row in df.to_dict("records"):
                         jsondate = row["Dates"].date()
                         external_id = row["Instrument"]

wbfdm/contrib/qa/dataloaders/market_data.py

@@ -118,7 +118,7 @@ class DatastreamMarketDataDataloader(MarketDataProtocol, Dataloader):
 
         # if market cap or shares outstanding are required we need to join with an additional table
         if MarketData.MARKET_CAPITALIZATION in values or MarketData.SHARES_OUTSTANDING in values:
-            query = query.join(market_val).on(
+            query = query.left_join(market_val).on(
                 (pricing.InfoCode == market_val.InfoCode) & (pricing.MarketDate == market_val.MarketDate)
             )
 

wbfdm/models/instruments/instruments.py

@@ -130,6 +130,9 @@ class InstrumentManager(TreeManager):
     def annotate_all(self):
         return self.get_queryset().annotate_all()
 
+    def filter_active_at_date(self, val_date: date):
+        return self.get_queryset().filter_active_at_date(val_date)
+
 
 class SecurityInstrumentManager(InstrumentManager):
     def get_queryset(self) -> InstrumentQuerySet:
@@ -142,19 +145,8 @@ class ClassifiableInstrumentManager(InstrumentManager):
 
 
 class ActiveInstrumentManager(InstrumentManager):
-    def get_queryset_at_date(self, val_date: date):
-        return (
-            super()
-            .get_queryset()
-            .filter(
-                (models.Q(delisted_date__isnull=True) | models.Q(delisted_date__gte=val_date))
-                & models.Q(inception_date__isnull=False)
-                & models.Q(inception_date__lte=val_date)
-            )
-        )
-
     def get_queryset(self):
-        return self.get_queryset_at_date(date.today())
+        return super().get_queryset().filter_active_at_date(date.today())
 
 
 class InvestableUniverseManager(InstrumentManager):
@@ -579,6 +571,18 @@ class Instrument(ComplexToStringMixin, TagModelMixin, ImportMixin, InstrumentPMS
         if favorite_classification := self.classifications.filter(group=get_default_classification_group()).first():
             return favorite_classification
 
+    def get_primary_quote(self):
+        if self.children.exists():
+            # we try the primary children first, then the first children within the investable universe and we fallback to the first children otherwise
+            try:
+                instrument = self.children.get(is_primary=True)
+            except Instrument.DoesNotExist:
+                instrument = self.children.filter(is_investable_universe=True).first()
+                if not instrument:
+                    instrument = self.children.first()
+            return instrument.get_primary_quote()
+        return self
+
     @property
     def active(self) -> bool:
         today = date.today()

wbfdm/models/instruments/querysets.py

@@ -10,6 +10,7 @@ from django.db.models import (
     ExpressionWrapper,
     F,
     OuterRef,
+    Q,
     QuerySet,
     Subquery,
 )
@@ -20,6 +21,12 @@ from wbfdm.enums import MarketData
 
 
 class InstrumentQuerySet(QuerySet):
+    def filter_active_at_date(self, val_date: date):
+        return self.filter(
+            (Q(delisted_date__isnull=True) | Q(delisted_date__gte=val_date))
+            & (Q(inception_date__isnull=True) | Q(inception_date__lte=val_date))
+        )
+
     def annotate_classification_for_group(
         self, classification_group, classification_height: int = 0, **kwargs
     ) -> QuerySet:

wbfdm/viewsets/configs/display/instrument_lists.py

@@ -2,7 +2,7 @@ from typing import Optional
 
 from django.utils.translation import gettext as _
 from wbcore.contrib.color.enums import WBColor
-from wbcore.enums import Operator
+from wbcore.enums import Operator, Unit
 from wbcore.metadata.configs import display as dp
 from wbcore.metadata.configs.display.instance_display import (
     Display,
@@ -82,16 +82,17 @@ class InstrumentListThroughModelDisplayConfig(dp.DisplayViewConfig):
     def get_list_display(self) -> Optional[dp.ListDisplay]:
         fields = []
         if self.view.kwargs.get("instrument_id", None):
-            fields = [dp.Field(key="instrument_list", label="Instrument List")]
-        if self.view.kwargs.get("instrument_list_id", None):
-            fields = [dp.Field(key="instrument", label="Instrument")]
+            fields = [dp.Field(key="instrument_list", label="Instrument List", width=Unit.PIXEL(250))]
+        elif self.view.kwargs.get("instrument_list_id", None):
+            fields = [
+                dp.Field(key="instrument", label="Instrument", width=Unit.PIXEL(300)),
+                dp.Field(key="instrument_str", label="Instrument Scraped", width=Unit.PIXEL(300)),
+            ]
         fields.extend(
             [
-                dp.Field(key="instrument_str", label="Instrument Scraped"),
-                dp.Field(key="from_date", label="From Date"),
-                dp.Field(key="to_date", label="To Date"),
-                dp.Field(key="comment", label="Comment"),
-                dp.Field(key="validated", label="Validated"),
+                dp.Field(key="from_date", label="From Date", width=Unit.PIXEL(125)),
+                dp.Field(key="to_date", label="To Date", width=Unit.PIXEL(125)),
+                dp.Field(key="comment", label="Comment", width=Unit.PIXEL(350)),
             ]
         )
         return dp.ListDisplay(

wbfdm/viewsets/configs/display/instruments.py

@@ -219,7 +219,7 @@ class InstrumentDisplayConfig(DisplayViewConfig):
                     ),
                 ),
                 Page(
-                    title="Additional Informations",
+                    title="Classifications & Lists",
                     layouts={
                         default(): Layout(
                             grid_template_areas=[

{wbfdm-1.49.1.dist-info → wbfdm-1.49.3.dist-info}/METADATA

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

@@ -38,7 +38,7 @@ wbfdm/backends/dto.py,sha256=5IdeGVsrk8trEi9rqtq-zisqiEDE_VLBP8RxlfZZnjk,596
 wbfdm/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/contrib/dsws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/contrib/dsws/client.py,sha256=C598w5P85kvX7_gR0Yf-WHRLj77HqztUhofBMl3JWAE,14508
-wbfdm/contrib/dsws/dataloaders/market_data.py,sha256=TVL0Vzmg8hDzjbqBWx1342dvT_qC5gVp8E4i3hVcivA,6003
+wbfdm/contrib/dsws/dataloaders/market_data.py,sha256=7Vj64nLqJAA3BiNeJPr3uLnnZ5kFOY2XGyAAJRL7vOk,6097
 wbfdm/contrib/internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/contrib/internal/dataloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/contrib/internal/dataloaders/market_data.py,sha256=aoWSMamtnMbejYZrHzr37dQCG40nuA3fNBQNOyqhceQ,3260
@@ -100,7 +100,7 @@ wbfdm/contrib/qa/dataloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 wbfdm/contrib/qa/dataloaders/adjustments.py,sha256=DQEexOLA7WyBB1dZJHQd-6zbzyEIURgSSgS7bJRvXzQ,2980
 wbfdm/contrib/qa/dataloaders/corporate_actions.py,sha256=lWT6klrTXKqxiko2HGrxHH8E2C00FJS-AOX3IhglRrI,2912
 wbfdm/contrib/qa/dataloaders/financials.py,sha256=xUHpvhUkvmdPL_RyWCrs7XgChgTklX5qemmaXMedgkY,3475
-wbfdm/contrib/qa/dataloaders/market_data.py,sha256=M8l5Eadibe0BbABifcGW-T5S0fOE7O2E_7M8EvhYTso,6508
+wbfdm/contrib/qa/dataloaders/market_data.py,sha256=FSQ50viiaiwlZ6pudXZN4eLJuKBDDW_My3x1XjFrkZs,6513
 wbfdm/contrib/qa/dataloaders/officers.py,sha256=vytlQJJxmn4Y5HfNh5mHJAvuIrrsQSkNO-sONyhxftY,2940
 wbfdm/contrib/qa/dataloaders/reporting_dates.py,sha256=q25ccB0pbGfLJLV1A1_AY1XYWJ_Fa10egY09L1J-C5A,2628
 wbfdm/contrib/qa/dataloaders/statements.py,sha256=hC6YErJcvBTmaAmzscgeC4sBK3lYE2U5eIKRIE9b_cs,10094
@@ -231,10 +231,10 @@ wbfdm/models/instruments/instrument_lists.py,sha256=GxfFyfYxEcJS36LAarHja49TOM8f
 wbfdm/models/instruments/instrument_prices.py,sha256=WCaFMZ9sF7xeGTp9jkq7TA8RfYHrwvTjujzqgCKj9SI,22070
 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=jbk3rsTIddstWi6DfFPt_UHtthQb0BUtOZUwA2gocJA,39573
+wbfdm/models/instruments/instruments.py,sha256=T0Ey5tMbUnA8DMroY1c959hOL9bI-CwTZnq5XhxCmi4,39934
 wbfdm/models/instruments/options.py,sha256=hFprq7B5t4ctz8nVqzFsBEzftq_KDUSsSXl1zJyh7tE,7094
 wbfdm/models/instruments/private_equities.py,sha256=uzwZi8IkmCKAHVTxnuFya9tehx7kh57sTlTEi1ieDaM,2198
-wbfdm/models/instruments/querysets.py,sha256=c5Op5VxR0A0uRPGHmnLJ6b7d2X5Kb5IX5bnk7MUfTjA,6475
+wbfdm/models/instruments/querysets.py,sha256=gL-uC5MfsX58RInK64Pok49tqeZhZY7xKPvPiwmraSQ,6732
 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=Eza39rlkNJxpURroIsJLImKC6F-KtTmkdjHn1kv4F3Q,3439
@@ -294,10 +294,10 @@ wbfdm/viewsets/configs/display/classifications.py,sha256=xolaLg6WDG7Dtwd3gQXWElm
 wbfdm/viewsets/configs/display/esg.py,sha256=NcBZDxkIsGd-APYt4yJRNJjfmbmkC0O-H1q7fg_bBcU,3640
 wbfdm/viewsets/configs/display/exchanges.py,sha256=uo-rh_20FjreGmqAiPbU0zTZ-I2CoV0bBC4uxX4hQbs,1946
 wbfdm/viewsets/configs/display/financial_summary.py,sha256=K8CPV9uy0wsK-yLQIDTqMAXTb-W1-pUp6OCMwii7jYo,4738
-wbfdm/viewsets/configs/display/instrument_lists.py,sha256=b0dq6py5Cn-_lONc1KXLoZydJ-LgOGpkB23QbLeQYBI,5124
+wbfdm/viewsets/configs/display/instrument_lists.py,sha256=UF_M41sBDDxGLDlKxLdAHqo8S1iHJfvIwZbLuoeaGuA,5239
 wbfdm/viewsets/configs/display/instrument_prices.py,sha256=QWDIPxWfgJjqHNB0cEShw1jH7zRkIYhJK9jhTE983EA,6940
 wbfdm/viewsets/configs/display/instrument_requests.py,sha256=CarX1MGe64roHZETm2N4HsEMssHVI5mWw2xTUBjgi-k,5129
-wbfdm/viewsets/configs/display/instruments.py,sha256=RxW7fsfnmVdJqrqENflTIcOLuXABAYUbbedzTI7Jkdg,17418
+wbfdm/viewsets/configs/display/instruments.py,sha256=6mypy-px8dl5b9-_vabsY-r3SLuGqwDAEW_N8n8aC9A,17418
 wbfdm/viewsets/configs/display/instruments_relationships.py,sha256=BLAl2ZciWR5Waf3qPd1QQwdiupgIf_wGK6rmYe9byuY,2480
 wbfdm/viewsets/configs/display/monthly_performances.py,sha256=ESsGTLhPmmXz3YjEWNjwaOjA1RNzVDKtJt3JILL2MMc,2973
 wbfdm/viewsets/configs/display/officers.py,sha256=qUwN9HPSSlT85aUSFNY-30550P35j3RZCYqRPj_rFAs,654
@@ -352,6 +352,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.49.1.dist-info/METADATA,sha256=CRBxSPPraUiOZsZ1eDYMa8pc5-A3n0uj-DoPAC8_bKk,737
-wbfdm-1.49.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.49.1.dist-info/RECORD,,
+wbfdm-1.49.3.dist-info/METADATA,sha256=2YCn-n0JG3nzg5cQU8_k_mjDX0IZPLwPOgi4E3cD5h4,737
+wbfdm-1.49.3.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.49.3.dist-info/RECORD,,