wbfdm 1.52.5__tar.gz → 1.52.6__tar.gz

{wbfdm-1.52.5 → wbfdm-1.52.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.52.5
+Version: 1.52.6
 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.52.5 → wbfdm-1.52.6}/wbfdm/admin/instruments.py

@@ -50,8 +50,8 @@ class InstrumentModelAdmin(admin.ModelAdmin):
             {
                 "fields": (
                     ("name", "name_repr", "computed_str"),
-                    ("parent", "instrument_type"),
-                    ("is_cash", "is_security", "is_managed", "is_investable_universe", "is_primary"),
+                    ("parent", "instrument_type", "is_primary"),
+                    ("is_cash", "is_security", "is_managed", "is_cash_equivalent", "is_investable_universe"),
                     ("inception_date", "delisted_date"),
                     ("primary_url", "additional_urls"),
                     (

{wbfdm-1.52.5 → wbfdm-1.52.6}/wbfdm/import_export/handlers/instrument.py

@@ -55,8 +55,10 @@ class InstrumentLookup:
         instrument = None
 
         # We need to lookup ticker because some provider gives us ticker with or without space in it
+        exchange_lookup = {}
         if only_investable_universe:
             instruments = self.model.objects.filter(is_investable_universe=True)
+            exchange_lookup = {"exchange": exchange} if exchange else {"is_primary": True}
         else:
             instruments = self.model.objects.filter(is_security=True)
 
@@ -76,8 +78,14 @@ class InstrumentLookup:
                         identifier_key != "refinitiv_identifier_code"
                     ):  # RIC cannot be uppercased because its symbology implies meaning for lowercase characters
                         identifier = identifier.upper()
-                    instrument = instruments.get(**{identifier_key: identifier})
-                    break
+                    # we try to lookup the instrument with the unique identifier
+                    try:
+                        instrument = instruments.get(**{identifier_key: identifier})
+                        break
+                    # if this return a multiple object exception, we assume there is at least one with the exchange provided or primary
+                    except MultipleObjectsReturned:
+                        instrument = instruments.get(**{identifier_key: identifier}, **exchange_lookup)
+                        break
         if not instrument and not exact_lookup:
             if instrument_type:
                 if isinstance(instrument_type, str):  # in case we receive a key as instrument type
@@ -109,7 +117,6 @@ class InstrumentLookup:
                 instruments_tmp = instruments.filter(exchange=exchange)
                 if instruments_tmp.exists():
                     instruments = instruments_tmp
-
             # last chance
             if name and instruments.count() > 1:
                 instruments = instruments.annotate(similarity_score=TrigramSimilarity("name", name))