wbfdm 1.55.10rc0__py2.py3-none-any.whl → 1.56.1__py2.py3-none-any.whl

wbfdm/contrib/qa/dataloaders/market_data.py

@@ -39,7 +39,7 @@ class DS2MarketData(Enum):
 
 
 class DatastreamMarketDataDataloader(MarketDataProtocol, Dataloader):
-    def market_data(
+    def market_data(  # noqa: C901
         self,
         values: list[MarketData] | None = None,
         from_date: date | None = None,

wbfdm/contrib/qa/sync/utils.py

@@ -148,12 +148,15 @@ def _delist_existing_duplicates(instrument: Instrument) -> None:
 
     for identifier_field in unique_identifiers:
         if identifier := getattr(instrument, identifier_field):
-            with suppress(Instrument.DoesNotExist):
-                duplicate = Instrument.objects.get(
-                    is_security=True, delisted_date__isnull=True, **{identifier_field: identifier}
-                )
-                duplicate.delisted_date = date.today() - timedelta(days=1)
-                duplicate.save()
+            if instrument.delisted_date:  # if delisted, we unset the identifier that can lead to constraint error
+                setattr(instrument, identifier_field, None)
+            else:
+                with suppress(Instrument.DoesNotExist):
+                    duplicate = Instrument.objects.get(
+                        is_security=True, delisted_date__isnull=True, **{identifier_field: identifier}
+                    )
+                    duplicate.delisted_date = date.today() - timedelta(days=1)
+                    duplicate.save()
 
 
 def _save_single_instrument(instrument: Instrument) -> None:
@@ -211,7 +214,7 @@ def _bulk_create_instruments_chunk(instruments: list[Instrument], update_unique_
         )
     except IntegrityError:
         # we caught an integrity error on the bulk save, so we try to save one by one
-        logger.info(
+        logger.error(
             "we detected an integrity error while bulk saving instruments. We save them one by one and delist the already existing instrument from the db if we can. "
         )
         for instrument in instruments:
@@ -290,7 +293,7 @@ def trigger_partial_update(
     else:
         with connections["qa"].cursor() as cursor:
             cursor.execute(
-                "SELECT MAX(last_user_update) FROM sys.dm_db_index_usage_stats WHERE OBJECT_NAME(object_id) = %S'",
+                "SELECT MAX(last_user_update) FROM sys.dm_db_index_usage_stats WHERE OBJECT_NAME(object_id) = %s'",
                 (table_change_name,),
             )
             max_last_updated_qa = (

wbfdm/filters/instrument_prices.py

@@ -26,7 +26,6 @@ class FakeDateRange(wb_filters.FilterSet):
 
 class InstrumentPriceFilterSet(wb_filters.FilterSet):
     date = wb_filters.FinancialPerformanceDateRangeFilter(
-        method=wb_filters.DateRangeFilter.base_date_range_filter_method,
         label="Date Range",
         required=True,
         clearable=False,

wbfdm/import_export/handlers/instrument.py

@@ -46,7 +46,7 @@ class InstrumentLookup:
         cache_key = self._get_cache_key(**kwargs)
         self.cache[cache_key] = instrument
 
-    def _lookup_security(
+    def _lookup_security(  # noqa: C901
         self,
         instrument_type=None,
         currency=None,
@@ -57,7 +57,6 @@ class InstrumentLookup:
         **identifiers,
     ):
         identifiers = {k: v for k, v in identifiers.items() if v is not None}
-
         instrument = None
 
         # We need to lookup ticker because some provider gives us ticker with or without space in it
@@ -113,33 +112,41 @@ class InstrumentLookup:
                     conditions.append(Q(**{f"{field}": field_value}))
                     if field == "isin":
                         conditions.append(Q(old_isins__contains=[field_value]))
+                    if field == "ticker":
+                        conditions.append(Q(ticker__regex=rf"^{field_value}([A-Za-z]?|\.?[A-Za-z])$"))
+                        conditions.append(Q(refinitiv_mnemonic_code=f"@{field_value}"))
+
             if conditions:
                 instruments = instruments.filter(reduce(operator.or_, conditions))
-
-            if currency:  # if currency is provides, we use it as validator
+            if (
+                currency and instruments.filter(currency=currency).exists()
+            ):  # if currency is provides, we use it as validator
                 instruments = instruments.filter(currency=currency)
-
             if exchange:
                 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))
                 if instruments.filter(similarity_score__gt=self.trigram_similarity_min_score).count() == 1:
                     instruments = instruments.filter(similarity_score__gt=self.trigram_similarity_min_score)
+
             if instruments.count() == 1:
                 instrument = instruments.first()
-            elif instrument_type and identifiers:
+            elif instrument_type and (name or identifiers):
                 # if instrument type was provided but we still didn't find the security, we try without the instrument type in case it was mislabeled
                 instrument = self._lookup_security(
                     only_investable_universe=only_investable_universe,
                     exact_lookup=exact_lookup,
                     currency=currency,
                     exchange=exchange,
+                    name=name,
                     **identifiers,
                 )
-            if not instrument and name and identifiers:
+            if not instrument and identifiers:
+                identifiers.pop(list(identifiers.keys())[0])
                 # Sometime, identifier provided emptied the queryset of possible instruments. In a last chance approach, we try to only look for security with the given name
                 instrument = self._lookup_security(
                     only_investable_universe=only_investable_universe,
@@ -148,6 +155,7 @@ class InstrumentLookup:
                     currency=currency,
                     exchange=exchange,
                     name=name,
+                    **identifiers,
                 )
         if instrument and only_investable_universe and not instrument.is_security and instrument.parent:
             instrument = instrument.parent

wbfdm/models/instruments/instruments.py

@@ -671,11 +671,11 @@ class Instrument(ComplexToStringMixin, TagModelMixin, ImportMixin, InstrumentPMS
             raise ValidationError("An instrument in the investable universe cannot have children")
         return self
 
-    def pre_save(self):
+    def pre_save(self):  # noqa: C901
         if self.instrument_type:
             self.is_security = self.instrument_type.is_security
-        if self.delisted_date:
-            self.is_security = False
+        # if self.delisted_date:
+        #     self.is_security = False
         if not self.name_repr:
             self.name_repr = self.name
         if not self.founded_year and self.inception_date:

wbfdm/viewsets/financial_analysis/statement_with_estimates.py

@@ -139,7 +139,7 @@ class StatementWithEstimatesPandasViewSet(InstrumentMixin, ExportPandasAPIViewSe
         return self.df.columns
 
     def get_ordering_fields(self):
-        return self.columns
+        return [x for x in self.columns if x != "progress"]
 
     @cached_property
     def year_columns(self):

wbfdm/viewsets/instruments/financials_analysis.py

@@ -118,7 +118,7 @@ class ValuationRatiosChartView(InstrumentMixin, viewsets.ChartViewSet):
     filterset_class = FinancialAnalysisValuationRatiosFilterSet
     LIST_DOCUMENTATION = "wbfdm/markdown/documentation/financial_analysis_instrument_ratios.md"
 
-    def get_plotly(self, queryset):
+    def get_plotly(self, queryset):  # noqa: C901
         # Set plotly as the default plotting lib
         pd.options.plotting.backend = "plotly"
 

{wbfdm-1.55.10rc0.dist-info → wbfdm-1.56.1.dist-info}/METADATA

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

@@ -102,7 +102,7 @@ wbfdm/contrib/qa/dataloaders/adjustments.py,sha256=YAYAiCm71QjPt5dZwzezgCQpm5zRW
 wbfdm/contrib/qa/dataloaders/corporate_actions.py,sha256=NWk8OCem9niwY5mJCIR11_Wq2gVBbtcrAZedTpzQDYc,2964
 wbfdm/contrib/qa/dataloaders/financials.py,sha256=xUHpvhUkvmdPL_RyWCrs7XgChgTklX5qemmaXMedgkY,3475
 wbfdm/contrib/qa/dataloaders/fx_rates.py,sha256=IYkUV8_8Vmvm4_K9xJpz7VaTgjQUz0y4pb3KyaoiqCM,1985
-wbfdm/contrib/qa/dataloaders/market_data.py,sha256=HS_vVGY7FxZOUl9zSIDRDv_h4MvDwhLpH8VS2a1H8Bg,7995
+wbfdm/contrib/qa/dataloaders/market_data.py,sha256=whb3xE0A36xly2_bCImgesgYjETOwTYB1DVDXBRz2UI,8009
 wbfdm/contrib/qa/dataloaders/officers.py,sha256=s3kW3sgsXuGE0T-TaZwxrF3YrUN-2v-_hN4ugupryic,2944
 wbfdm/contrib/qa/dataloaders/reporting_dates.py,sha256=q25ccB0pbGfLJLV1A1_AY1XYWJ_Fa10egY09L1J-C5A,2628
 wbfdm/contrib/qa/dataloaders/statements.py,sha256=6k8dDwJPLY6XE3G5ZA03_4wRvT7XduRsro4lzuAWCvM,10337
@@ -117,7 +117,7 @@ wbfdm/contrib/qa/jinja2/qa/sql/ibes/estimates.sql,sha256=OWgeogSFj7-OdXvJTvNsThN
 wbfdm/contrib/qa/jinja2/qa/sql/ibes/financials.sql,sha256=i8esPCG_ARiXlfSKajqBRH0jiXT_efOvw3No6zEvwn4,2612
 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=OcukNGyC1S1LZvLt1us5ZejxHcgBRRwLMqs0TWgCztA,11986
+wbfdm/contrib/qa/sync/utils.py,sha256=CwcUJoCjLBY7brx4KdgNw2JdVw9dklvt8JMaWCfnnQ0,12204
 wbfdm/dataloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/dataloaders/cache.py,sha256=K9BeVxT7p-BMvjurINt18bfrUDccp840uIjfDBLJRNk,4841
 wbfdm/dataloaders/protocols.py,sha256=QLa0y890gwnTeDGTnM58iNEYxugzj9Q9bmIRoapzc_0,3211
@@ -141,7 +141,7 @@ wbfdm/filters/classifications.py,sha256=8tKTAPwMzOIXkGWa4ez1layLBAlkDtdG53-75Rg0
 wbfdm/filters/exchanges.py,sha256=84N4AQoCwgdnxTxmhMob5Yndfr5gy_DRQ_-m2ilVLVM,835
 wbfdm/filters/financials.py,sha256=jdubT5xfFTMcwJSbC_z0WkF8KlO6eAxkaMS7-oQFFp0,2512
 wbfdm/filters/financials_analysis.py,sha256=aDA33RhKCOmA62GwuAr5xDK71T0racdyDUEaxOBp4Oc,4401
-wbfdm/filters/instrument_prices.py,sha256=Nt-fInhTM_LRwwmT3U-b0eWoxe-EYEdv77wLEHkZqUc,3710
+wbfdm/filters/instrument_prices.py,sha256=R1K8xrvOgPB4m3tWItz_3TMUw7a7UeKe4D3h28xe_3w,3637
 wbfdm/filters/instruments.py,sha256=giL1QaJqGPRV1BBzmsPjxgCOCPuSNT5HkO27Q0kF-i4,7967
 wbfdm/filters/utils.py,sha256=6IpNoZ_yjRUCdpVXrj3kriTceAX-VGrS5NpZA2NgSmY,1870
 wbfdm/import_export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -165,7 +165,7 @@ wbfdm/import_export/backends/refinitiv/mixin.py,sha256=DlNHOWOO71PgY0umaZd0Nbbjs
 wbfdm/import_export/backends/refinitiv/utils/__init__.py,sha256=Rz38xsLAHEyEwIuJksejYExEznlPJb9tRzwJ7JG9L1s,35
 wbfdm/import_export/backends/refinitiv/utils/controller.py,sha256=SCmVSyHo-NHDL1mzneS_Gl4JYrvEUhahOQfBmNSKnI8,7354
 wbfdm/import_export/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbfdm/import_export/handlers/instrument.py,sha256=bAnar0Row9Km5NGRV0eddQ2cWvzeQsMHHSWjDqYAufc,12676
+wbfdm/import_export/handlers/instrument.py,sha256=BeDhlwoMXLREH7wno7mcpaAKj4Vg0SpHEKiIr0dgTl0,13134
 wbfdm/import_export/handlers/instrument_list.py,sha256=mZRfpJFi6BhhrjH2qaFEPqqCK2ybg-DQm43Uck7G9_w,4864
 wbfdm/import_export/handlers/instrument_price.py,sha256=RbNTo78zZuttzlVFKxJrHcW7DRfcsta7QDEI8OiiDrA,3498
 wbfdm/import_export/handlers/option.py,sha256=MPzluMPJ3Yu7Ahmw9BA7-ssAbvPDdyca_rC-YVhU8bY,2378
@@ -242,7 +242,7 @@ wbfdm/models/instruments/instrument_lists.py,sha256=GxfFyfYxEcJS36LAarHja49TOM8f
 wbfdm/models/instruments/instrument_prices.py,sha256=K7oMIz76WSrLmpNwcabThvtrP6WpBZZnrE9CHB5-UPQ,22345
 wbfdm/models/instruments/instrument_relationships.py,sha256=orBZY46jDvPfgkXakBRiByib5M_Iyeyelzg3CZWozSM,10777
 wbfdm/models/instruments/instrument_requests.py,sha256=XbpofRS8WHadHlTFjvXJyd0o7K9r2pzJtnpjVQZOLdI,7832
-wbfdm/models/instruments/instruments.py,sha256=NIAZLH0ArrlkJ2t9cf1J2nA3TPwcILQwIF5AzadQycs,44533
+wbfdm/models/instruments/instruments.py,sha256=TbSOdQOzIcuS1KdPlFnpQmbrdv6NNzieQ26m-OoV-3Y,44551
 wbfdm/models/instruments/options.py,sha256=AW6mwvVL8IN9K6dEApJsGgDz7T8SBIxQrJvQZ804oas,7286
 wbfdm/models/instruments/private_equities.py,sha256=-MYXLLvcOO3JVvSpT2H_HxbQzZasipPUQyUgwoaW5xw,2275
 wbfdm/models/instruments/querysets.py,sha256=7r3pXNlpROkYgKc6gQH07RNeWX6jGeBAPUabUevE6Jo,11587
@@ -350,10 +350,10 @@ wbfdm/viewsets/financial_analysis/__init__.py,sha256=cTTcvGnhz2Ep9RpkyUyTOpjTXJz
 wbfdm/viewsets/financial_analysis/financial_metric_analysis.py,sha256=ISG53diS2LcjxH7Fex1wsMGHTHoRdLDHwLDKn3qA4UE,3328
 wbfdm/viewsets/financial_analysis/financial_ratio_analysis.py,sha256=szq78oFKCxVjUkCVzsU7Ditq0qQlwcrnvnXVIao18Ic,3122
 wbfdm/viewsets/financial_analysis/financial_summary.py,sha256=MWz5Nip5ePKkHX3W7bYJRvzY_hCvSsHmKd0gvvPtXL8,9245
-wbfdm/viewsets/financial_analysis/statement_with_estimates.py,sha256=wnBxS3b0Hsl2IfNU7WCOcRndNW8JckWDmGrgHrBmhWE,6216
+wbfdm/viewsets/financial_analysis/statement_with_estimates.py,sha256=rhGxXFjTcDZ9zq0e9Djh2x9p7iBZUQ9Al-mdAvg2bBI,6248
 wbfdm/viewsets/instruments/__init__.py,sha256=uydDdU6oZ6W2lgFkr3-cU7WZU7TeokXAA1J0xEgiLD0,2826
 wbfdm/viewsets/instruments/classifications.py,sha256=CMRTeI6hUClXzZUr7PeRWBXhT9fMiPiu-FvNP_jUQkM,11947
-wbfdm/viewsets/instruments/financials_analysis.py,sha256=eWJI1oKxFFHw0X5THFL6IemhcHZAauyNc5yD4aQpO58,29074
+wbfdm/viewsets/instruments/financials_analysis.py,sha256=bobhqY23m83v53BJIe8mWz99ZpaT7u4Y6zgPS9-ozBs,29088
 wbfdm/viewsets/instruments/instrument_lists.py,sha256=hwwHDNpHjjffxw08N_1LtkL5Fdi8c1Om-PLz6pTu4Ok,2878
 wbfdm/viewsets/instruments/instrument_prices.py,sha256=9mdNPU1D6ZFS5Bf0U1d3c6ZlYSCjrNMWv6Vhas3D8Ns,24075
 wbfdm/viewsets/instruments/instrument_requests.py,sha256=mmaARNl6ymDdlcLzcu16vVfFsunhtJkMw2r2NBfUp9U,1839
@@ -364,6 +364,6 @@ wbfdm/viewsets/statements/__init__.py,sha256=odxtFYUDICPmz8WCE3nx93EvKZLSPBEI4d7
 wbfdm/viewsets/statements/statements.py,sha256=gA6RCI8-B__JwjEb6OZxpn8Y-9aF-YQ3HIQ7e1vfJMw,4304
 wbfdm/viewsets/technical_analysis/__init__.py,sha256=qtCIBg0uSiZeJq_1tEQFilnorMBkMe6uCMfqar6-cLE,77
 wbfdm/viewsets/technical_analysis/monthly_performances.py,sha256=O1j8CGfOranL74LqVvcf7jERaDIboEJZiBf_AbbVDQ8,3974
-wbfdm-1.55.10rc0.dist-info/METADATA,sha256=0uOFbPkv-nVIC7jk_YD3QoHVF_S1cE3Koi2unpPWiqA,772
-wbfdm-1.55.10rc0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.55.10rc0.dist-info/RECORD,,
+wbfdm-1.56.1.dist-info/METADATA,sha256=1amTw1NVPFrkD5-cfIQg7dYw5VmkqfEgLy_PFrz546c,768
+wbfdm-1.56.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.56.1.dist-info/RECORD,,