wbfdm 1.50.6__py2.py3-none-any.whl → 1.50.7__py2.py3-none-any.whl

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

{wbfdm-1.50.6.dist-info → wbfdm-1.50.7.dist-info}/METADATA

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

@@ -231,7 +231,7 @@ 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=fXsYow-aLMJ8jFiFRJsoERDD0ouNsXMwoina0SkOAcI,40427
+wbfdm/models/instruments/instruments.py,sha256=Heyk5cBJJ7ZkoDuZnTuWxB7LMmp_BZb2feW_exs1oIA,40276
 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
@@ -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.50.6.dist-info/METADATA,sha256=IU7xZoNPg-rIJVXApGKWCf_8AlbVRfierCeYrRUf554,737
-wbfdm-1.50.6.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.50.6.dist-info/RECORD,,
+wbfdm-1.50.7.dist-info/METADATA,sha256=9UrsrlKQIHXGC3MCMbZgyw86lyMoQwcvApFlYre1olk,737
+wbfdm-1.50.7.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.50.7.dist-info/RECORD,,