wbfdm 1.50.6__tar.gz → 1.50.8__tar.gz

{wbfdm-1.50.6 → wbfdm-1.50.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.50.6
+Version: 1.50.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.50.6 → wbfdm-1.50.8}/wbfdm/models/instruments/instruments.py

@@ -594,22 +594,19 @@ class Instrument(ComplexToStringMixin, TagModelMixin, ImportMixin, InstrumentPMS
 
     @property
     def identifier_repr(self) -> str:
-        identifier_repr = ""
-        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"]
+        identifiers = []
+        if self.is_security:
+            identifier_labels = ["ticker", "refinitiv_identifier_code", "refinitiv_mnemonic_code"]
         else:
-            identifiers = ["refinitiv_mnemonic_code"]
-        for identifier in identifiers:
-            if v := getattr(self, identifier, None):
-                identifier_repr = v
+            identifier_labels = ["refinitiv_mnemonic_code"]
+        for label in identifier_labels:
+            if v := getattr(self, label, None):
+                identifiers.append(v)
                 break
         if self.isin and self.is_security:
-            identifier_repr += f" - {self.isin}"
+            identifiers.append(self.isin)
 
-        return identifier_repr.replace(":", "-")
+        return " - ".join(identifiers).replace(":", "-")
 
     @property
     def valuations(self):
@@ -705,7 +702,7 @@ class Instrument(ComplexToStringMixin, TagModelMixin, ImportMixin, InstrumentPMS
             self.is_primary = not self.parent or (self.exchange is not None and self.parent.exchange == self.exchange)
         super().save(*args, **kwargs)
 
-    def compute_str(self):
+    def get_compute_str(self):
         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:
@@ -718,6 +715,9 @@ class Instrument(ComplexToStringMixin, TagModelMixin, ImportMixin, InstrumentPMS
                 repr += f" ({str(self.exchange)})"
         return repr
 
+    def compute_str(self):
+        return self.get_compute_str()
+
     def is_active_at_date(self, today: date) -> bool:
         return (
             self.inception_date is not None