wbfdm 1.50.0__tar.gz → 1.50.2__tar.gz

{wbfdm-1.50.0 → wbfdm-1.50.2}/PKG-INFO

@@ -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 → wbfdm-1.50.2}/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-1.50.0 → wbfdm-1.50.2}/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-1.50.0 → wbfdm-1.50.2}/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-1.50.0 → wbfdm-1.50.2}/wbfdm/serializers/instruments/__init__.py

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

{wbfdm-1.50.0 → wbfdm-1.50.2}/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-1.50.0 → wbfdm-1.50.2}/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-1.50.0 → wbfdm-1.50.2}/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