wbfdm 1.50.0__py2.py3-none-any.whl → 1.50.2__py2.py3-none-any.whl

wbfdm/contrib/qa/sync/exchanges.py

@@ -32,7 +32,8 @@ class QAExchangeSync(Sync[Exchange]):
 
     def update_or_create_item(self, external_id: int) -> Exchange:
         defaults = self.get_item(external_id)
-        defaults["country_id"] = mapping(Geography.countries, "code_2").get(defaults["country_id"])
+        if country_id := defaults.get("country_id"):
+            defaults["country_id"] = mapping(Geography.countries, "code_2").get(country_id)
         exchange, _ = Exchange.objects.update_or_create(
             source=self.SOURCE,
             source_id=external_id,

wbfdm/models/exchanges/exchanges.py

@@ -175,9 +175,9 @@ class Exchange(WBModel):
     def __str__(self) -> str:
         repr = self.identifier_repr
         if self.name:
-            repr = f"{self.name} ({self.identifier_repr})"
+            repr = f"{self.name} - {self.identifier_repr}"
         elif self.mic_name:
-            repr = f"{self.mic_name} ({self.identifier_repr})"
+            repr = f"{self.mic_name} - {self.identifier_repr}"
         return repr
 
     class Meta:
@@ -215,7 +215,7 @@ class Exchange(WBModel):
 
     @classmethod
     def get_representation_label_key(cls):
-        return "{{name}} ({{mic_code}})"
+        return "{{name}}"
 
     @property
     def time_zone(self):

wbfdm/models/instruments/instruments.py

@@ -598,12 +598,17 @@ class Instrument(ComplexToStringMixin, TagModelMixin, ImportMixin, InstrumentPMS
         if self.instrument_type and self.instrument_type.key == "product":
             # Then we prioritize ISIN over ticker
             identifiers = ["isin", "ticker", "refinitiv_identifier_code", "refinitiv_mnemonic_code"]
+        elif self.is_security:
+            identifiers = ["ticker", "refinitiv_identifier_code", "refinitiv_mnemonic_code"]
         else:
-            identifiers = ["ticker", "isin", "refinitiv_identifier_code", "refinitiv_mnemonic_code"]
+            identifiers = ["refinitiv_mnemonic_code"]
         for identifier in identifiers:
             if v := getattr(self, identifier, None):
                 identifier_repr = v
                 break
+        if self.isin and self.is_security:
+            identifier_repr += f" - {self.isin}"
+
         return identifier_repr.replace(":", "-")
 
     @property
@@ -701,13 +706,16 @@ class Instrument(ComplexToStringMixin, TagModelMixin, ImportMixin, InstrumentPMS
         super().save(*args, **kwargs)
 
     def compute_str(self):
-        repr = self.name_repr  # we follow bloomberg instrument representation format
-        if self.instrument_type:
+        repr = self.name_repr or self.name or ""
+        repr = repr.title()  # we follow bloomberg instrument representation format
+        if self.instrument_type and self.is_security:
             repr += f" {self.instrument_type.short_name}"
-        if self.identifier_repr:
-            repr += f" - {self.identifier_repr}"
-        if self.exchange:
-            repr += f" ({str(self.exchange)})"
+        if self.is_security or not self.level == 0:
+            if self.identifier_repr:
+                repr += f" - {self.identifier_repr}"
+            # if the object has an exchange and is not a security nor a company (a quote then), we append the exchange representation
+            if self.exchange and self.parent is not None and not self.is_security:
+                repr += f" ({str(self.exchange)})"
         return repr
 
     def is_active_at_date(self, today: date) -> bool:

wbfdm/serializers/instruments/__init__.py

@@ -4,6 +4,7 @@ from .instruments import (
     InstrumentRepresentationSerializer,
     InstrumentTypeRepresentationSerializer,
     InvestableUniverseRepresentationSerializer,
+    CompanyRepresentationSerializer,
     ClassifiableInstrumentRepresentationSerializer,
     SecurityRepresentationSerializer,
     InvestableInstrumentRepresentationSerializer,

wbfdm/serializers/instruments/instruments.py

@@ -51,6 +51,13 @@ class ClassifiableInstrumentRepresentationSerializer(InstrumentRepresentationSer
         return filter_params
 
 
+class CompanyRepresentationSerializer(InstrumentRepresentationSerializer):
+    def get_filter_params(self, request):
+        filter_params = super().get_filter_params(request)
+        filter_params["level"] = 0
+        return filter_params
+
+
 class SecurityRepresentationSerializer(InstrumentRepresentationSerializer):
     def get_filter_params(self, request):
         filter_params = super().get_filter_params(request)

wbfdm/viewsets/instruments/instruments.py

@@ -2,6 +2,7 @@ from django.db.models import Case, Exists, F, IntegerField, OuterRef, When
 from rest_framework.filters import OrderingFilter
 from wbcore import viewsets
 from wbcore.contrib.guardian.filters import ObjectPermissionsFilter
+from wbcore.pagination import LimitOffsetPagination
 from wbcore.viewsets.mixins import DjangoFilterBackend
 
 from wbfdm.contrib.metric.backends.performances import PERFORMANCE_METRIC
@@ -35,21 +36,21 @@ class InstrumentTypeRepresentationViewSet(viewsets.RepresentationViewSet):
 
 
 class InstrumentRepresentationViewSet(viewsets.RepresentationViewSet):
-    filter_backends = (InstrumentSearchFilter, ObjectPermissionsFilter, DjangoFilterBackend, OrderingFilter)
-
+    filter_backends = (ObjectPermissionsFilter, DjangoFilterBackend, OrderingFilter, InstrumentSearchFilter)
+    pagination_class = LimitOffsetPagination
     queryset = Instrument.objects.annotate_base_data().exclude(name="")
     serializer_class = InstrumentRepresentationSerializer
     search_fields = ("name", "name_repr", "isin", "ticker")
 
     filterset_class = InstrumentFilterSet
     ordering_fields = ("title", "ticker")
-    ordering = ["-search_rank"]
+    ordering = ["name_repr"]
 
 
 class InstrumentModelViewSet(InstrumentMetricMixin, viewsets.ModelViewSet):
     METRIC_KEYS = (PERFORMANCE_METRIC, STATISTICS_METRIC)
     METRIC_SHOW_AGGREGATES = False
-    filter_backends = (InstrumentSearchFilter, ObjectPermissionsFilter, DjangoFilterBackend, OrderingFilter)
+    filter_backends = (ObjectPermissionsFilter, DjangoFilterBackend, OrderingFilter, InstrumentSearchFilter)
 
     queryset = Instrument.objects.annotate_all()
     serializer_class = InstrumentModelListSerializer
@@ -70,7 +71,7 @@ class InstrumentModelViewSet(InstrumentMetricMixin, viewsets.ModelViewSet):
         "refinitiv_identifier_code",
         "refinitiv_mnemonic_code",
     )
-    ordering = ["-search_rank"]
+    ordering = ["name_repr"]
 
     def get_serializer_class(self):
         if self.get_action() in ["list", "list-metadata"]:
@@ -102,6 +103,7 @@ class InstrumentModelViewSet(InstrumentMetricMixin, viewsets.ModelViewSet):
 
 class ChildrenInstrumentModelViewSet(InstrumentMixin, InstrumentModelViewSet):
     button_config_class = ChildrenInstrumentModelViewConfig
+    ordering = ("-is_primary", "computed_str")
 
     def get_queryset(self):
         return super().get_queryset().filter(parent=self.instrument)

wbfdm/viewsets/instruments/utils.py

@@ -12,7 +12,7 @@ class InstrumentSearchFilter:
         if search := request.GET.get("search", None):
             min_search_rank = self.get_min_search_rank(view)
             query = SearchQuery(search, search_type="phrase")
-            queryset = (
+            return (
                 queryset.annotate(search_rank=Coalesce(SearchRank(F("search_vector"), query), Value(-1.0)))
                 .filter(
                     (Q(search_vector=query) & Q(search_rank__gte=min_search_rank))
@@ -22,6 +22,6 @@ class InstrumentSearchFilter:
                 )
                 .order_by("-search_rank")
             ).distinct()
-        else:
-            queryset = queryset.annotate(search_rank=Value(-1.0))
+        elif "parent" in request.GET:
+            return queryset.order_by("-is_primary", "computed_str")
         return queryset

{wbfdm-1.50.0.dist-info → wbfdm-1.50.2.dist-info}/METADATA

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

@@ -113,7 +113,7 @@ wbfdm/contrib/qa/jinja2/qa/sql/ibes/calendarized.sql,sha256=w2vi0lgNDDMoFB07bNv4
 wbfdm/contrib/qa/jinja2/qa/sql/ibes/complete.sql,sha256=bkF1h7FcLdeXmmKy2W4rdnBZw9xRVIo_Cu1sVobU-RM,328
 wbfdm/contrib/qa/jinja2/qa/sql/ibes/estimates.sql,sha256=OWgeogSFj7-OdXvJTvNsThNBz-7kxtygKYvS7dkU3aw,156
 wbfdm/contrib/qa/jinja2/qa/sql/ibes/financials.sql,sha256=0jXNMdX8ixVRJ8YyvtoJRQ510pHFYEioMy7NTp5ecck,2582
-wbfdm/contrib/qa/sync/exchanges.py,sha256=831-0bqxq4LaHEkyvMGfEBkNFm5LyLCSpjZbPdTEF0A,3079
+wbfdm/contrib/qa/sync/exchanges.py,sha256=XU7dj-rQzMlDku9lnmAACaTRoxx8pFSyr5kCK79cYAc,3124
 wbfdm/contrib/qa/sync/instruments.py,sha256=8aTQVJ_cw1phe4FWikn79pjCfUijaTcwkdhQCtSXKH0,3156
 wbfdm/contrib/qa/sync/utils.py,sha256=1diZFEMQwjdGhfL6jv2xX7N_-TyO0Fwtnqw_3K5ykYI,9326
 wbfdm/dataloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -224,14 +224,14 @@ 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/exchanges/__init__.py,sha256=sScz2KX9fxhhmi4CEUssC8HCL4ENvrIqSSwk0_J7v-g,32
-wbfdm/models/exchanges/exchanges.py,sha256=j-C22QPZEg-Mb6KCer7RRMVOcP1mprTc380zFtGJlhs,7272
+wbfdm/models/exchanges/exchanges.py,sha256=FSxjEh3k2KLDJyJfzZg7iGUFZIxzQt__FYaDyPA66D0,7257
 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_relationships.py,sha256=zpCZCnt5CqIg5bd6le_6TyirsSwGV2NaqTVKw3bd5vM,10660
 wbfdm/models/instruments/instrument_requests.py,sha256=XbpofRS8WHadHlTFjvXJyd0o7K9r2pzJtnpjVQZOLdI,7832
-wbfdm/models/instruments/instruments.py,sha256=T0Ey5tMbUnA8DMroY1c959hOL9bI-CwTZnq5XhxCmi4,39934
+wbfdm/models/instruments/instruments.py,sha256=fXsYow-aLMJ8jFiFRJsoERDD0ouNsXMwoina0SkOAcI,40427
 wbfdm/models/instruments/options.py,sha256=hFprq7B5t4ctz8nVqzFsBEzftq_KDUSsSXl1zJyh7tE,7094
 wbfdm/models/instruments/private_equities.py,sha256=uzwZi8IkmCKAHVTxnuFya9tehx7kh57sTlTEi1ieDaM,2198
 wbfdm/models/instruments/querysets.py,sha256=c9fbHVvIRyaFU7jm_CM90lfIVzB8beOD8YII9-FqdT4,7191
@@ -246,13 +246,13 @@ wbfdm/serializers/__init__.py,sha256=AXb03RKHo6B0ts_IQOvx89n9wKG8pxiumYv9cr4EhvA
 wbfdm/serializers/esg.py,sha256=epoX8cjkPuVv45aW-Jf85-rSO_ZrSnXcTxMcadKdC-I,1086
 wbfdm/serializers/exchanges.py,sha256=vi5kFadYRQo-6CV2b56nrABpt80LPtjZumJVaBE4bcc,1175
 wbfdm/serializers/officers.py,sha256=yrBJqnwxS5Eq0aGcRKe0FbEYEvDFpZlb8gzgfU9pRyk,473
-wbfdm/serializers/instruments/__init__.py,sha256=7WX6P7Fzyc_E59CpJ1RBAPptIOPXOHn9FScvGY8qWjo,1662
+wbfdm/serializers/instruments/__init__.py,sha256=bLgyuwpGN5Vq2PO5ueErXWHDInPy_191kieaV0_MAI4,1699
 wbfdm/serializers/instruments/classifications.py,sha256=DsrKkF0lFBTtNrVs0vhjkjjlK8mDSbGfvQODarYPbDA,5669
 wbfdm/serializers/instruments/instrument_lists.py,sha256=M9RnH-Iy095m5xgkVcPHfvKiyHgCy8kIIN9cdqOf20I,1916
 wbfdm/serializers/instruments/instrument_prices.py,sha256=de-IlwUJC6gSYVztuTmOXQK3r-Gjn8tVWaSCx0PXh_Q,2593
 wbfdm/serializers/instruments/instrument_relationships.py,sha256=3hChFzdekoPtMYolEhWafcb9nTLPmx6WGEq_Hgck8jA,6454
 wbfdm/serializers/instruments/instrument_requests.py,sha256=Sl4gfkUu63zk4o2iGFVE59wx1rKkLUG6SPYCE7Dqrs4,2176
-wbfdm/serializers/instruments/instruments.py,sha256=EX2T2fqYN1l8lzbgyl0cxFs2bDIf0ydGRAVWkB5ISzU,11831
+wbfdm/serializers/instruments/instruments.py,sha256=hrCNjOzd3R1c9XRcrO-lmizQmOJDA-p-Hw40eZYzyL0,12073
 wbfdm/serializers/instruments/mixins.py,sha256=qcznDMwPu8VbeAF7IArNyNcrdpjJJffNn07ifoIqM10,4396
 wbfdm/sync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/sync/abstract.py,sha256=u1zjHT0ZJabUZpy3_EUCTtEig0p5Fuhlx69O9BsV_Gs,849
@@ -345,13 +345,13 @@ wbfdm/viewsets/instruments/financials_analysis.py,sha256=xcVKR2H0P07NIyxFwPPPmVi
 wbfdm/viewsets/instruments/instrument_lists.py,sha256=hwwHDNpHjjffxw08N_1LtkL5Fdi8c1Om-PLz6pTu4Ok,2878
 wbfdm/viewsets/instruments/instrument_prices.py,sha256=WGUe5WUl9PqulWSPCZgWcBWCmgxtu4lhm-UeAa4ngyg,24008
 wbfdm/viewsets/instruments/instrument_requests.py,sha256=mmaARNl6ymDdlcLzcu16vVfFsunhtJkMw2r2NBfUp9U,1839
-wbfdm/viewsets/instruments/instruments.py,sha256=eI0sP0B1wN8ImuACP_OIbv4n1IZQ5iT5zJyrFm9t8E4,3867
+wbfdm/viewsets/instruments/instruments.py,sha256=UtsLAxf7v_tdpmT16UWSUa834Yq2wYJXztiKrdsBrmw,4004
 wbfdm/viewsets/instruments/instruments_relationships.py,sha256=D2Ym84zXBFegQC9nMThKSWqSAcWa0WvcS_GXxM2po68,11076
-wbfdm/viewsets/instruments/utils.py,sha256=SQAdQSgYwUwhlFBbYkZd1VMDmtfoj9XLj1RGBUzzre8,1144
+wbfdm/viewsets/instruments/utils.py,sha256=kr5HwkSaWp-6GHVEQIb3CnIspDGSxfqghyOqg0oHO-A,1166
 wbfdm/viewsets/statements/__init__.py,sha256=odxtFYUDICPmz8WCE3nx93EvKZLSPBEI4d7pozcQz2A,47
 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.0.dist-info/METADATA,sha256=4keXBSdPU5RJhz98q04zYSIicl4cVxFJPXOTUTJkbcw,737
-wbfdm-1.50.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.50.0.dist-info/RECORD,,
+wbfdm-1.50.2.dist-info/METADATA,sha256=BKdLuzNfsUz7PdiQnrcBBncwKE8UcbhCPOlBvntgvic,737
+wbfdm-1.50.2.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.50.2.dist-info/RECORD,,