wbfdm 1.46.1__py2.py3-none-any.whl → 1.46.3__py2.py3-none-any.whl

wbfdm/contrib/qa/dataloaders/market_data.py

@@ -68,6 +68,10 @@ class DatastreamMarketDataDataloader(MarketDataProtocol, Dataloader):
         fx_code = pk.Table("DS2FxCode")
         fx = pk.Table("DS2FxRate")
 
+        quotes = pk.Table("DS2CtryQtInfo")
+        securities = pk.Table("DS2Security")
+        securities2 = pk.Table("DS2Security", alias="securities2")
+
         mapping, create_mapping_table = create_table(
             "#ds2infoexchcode", Column("InfoCode", SqlTypes.INTEGER), Column("ExchIntCode", SqlTypes.INTEGER)
         )
@@ -83,8 +87,14 @@ class DatastreamMarketDataDataloader(MarketDataProtocol, Dataloader):
                 fn.Cast(pricing.MarketDate, SqlTypes.DATE).as_("valuation_date"),
                 ValueWrapper("qa-ds2").as_("source"),
             )
+            .join(quotes)
+            .on_field("InfoCode")
+            .join(securities)
+            .on(quotes.DsSecCode == securities.DsSecCode)
+            .join(securities2)
+            .on((securities2.DsCmpyCode == securities.DsCmpyCode) & securities2.IsMajorSec == "Y")
             .left_join(market_val)
-            .on((pricing.InfoCode == market_val.InfoCode) & (pricing.MarketDate == market_val.ValDate))
+            .on((securities2.PrimQtInfoCode == market_val.InfoCode) & (pricing.MarketDate == market_val.ValDate))
             # We join on _codes, which removes all instruments not in _codes - implicit where
             .join(mapping)
             .on((pricing.InfoCode == mapping.InfoCode) & (pricing.ExchIntCode == mapping.ExchIntCode))

wbfdm/filters/instruments.py

@@ -140,6 +140,8 @@ class InstrumentFilterSet(TagFilterMixin, InstrumentFavoriteGroupFilterSet):
             "instrument_type": ["exact"],
             "isin": ["exact"],
             "ticker": ["exact"],
+            "refinitiv_mnemonic_code": ["exact"],
+            "refinitiv_identifier_code": ["exact"],
             "currency": ["exact"],
             # "related_instruments": ["exact"], # I don't think this filter is necessary
             "country": ["exact"],

wbfdm/import_export/resources/instruments.py

@@ -1,18 +1,11 @@
-import magic
-from django.apps import apps
 from django.db.models import Q
 from import_export import fields
-from import_export.formats.base_formats import CSV
-from import_export.results import RowResult
-from import_export.signals import post_import
 from import_export.widgets import CharWidget, ForeignKeyWidget, ManyToManyWidget
-from rest_framework.reverse import reverse
 from wbcore.contrib.currency.models import Currency
 from wbcore.contrib.geography.import_export.resources.geography import (
     CountryForeignKeyWidget,
 )
 from wbcore.contrib.io.resources import FilterModelResource
-from wbcore.contrib.notifications.dispatch import send_notification
 
 from wbfdm.models import Exchange, Instrument, InstrumentClassificationThroughModel
 
@@ -128,50 +121,3 @@ class InstrumentResource(FilterModelResource):
         )
         export_order = fields
         model = Instrument
-
-
-# This parser satisfy the import source framework interface. The generic logic will probably need to move the io module to avoid repetition
-def parse(import_source):
-    input_format = CSV(encoding="utf-8-sig")
-
-    file_stream = import_source.file.read()
-    if input_format.CONTENT_TYPE == magic.from_buffer(file_stream, mime=True):
-        dataset = input_format.create_dataset(file_stream)
-
-        model = apps.get_model(import_source.parser_handler.handler)
-        result = InstrumentResource().import_data(
-            dataset,
-            dry_run=False,
-            file_name=import_source.file.name,
-            user=import_source.creator,
-            rollback_on_validation_errors=True,
-        )
-        import_source.file.close()
-        post_import.send(sender=None, model=model)
-        success_message = """
-        {} import finished:
-        * new {}
-        * updated {}
-        * skipped {}
-        * failed {}
-        * deleted {}
-        * invalid {}
-        """.format(
-            model._meta.verbose_name_plural,
-            result.totals[RowResult.IMPORT_TYPE_NEW],
-            result.totals[RowResult.IMPORT_TYPE_UPDATE],
-            result.totals[RowResult.IMPORT_TYPE_SKIP],
-            result.totals[RowResult.IMPORT_TYPE_ERROR],
-            result.totals[RowResult.IMPORT_TYPE_DELETE],
-            result.totals[RowResult.IMPORT_TYPE_INVALID],
-        )
-        import_source.log = success_message
-        import_source.save()
-        if import_source.creator:
-            send_notification(
-                code="io.import_done",
-                name="Your import is done",
-                body=success_message,
-                user=import_source.creator,
-                endpoint=reverse(f"{model.get_base_endpoint()}-list") if hasattr(model, "get_base_endpoint") else None,
-            )

wbfdm/models/instruments/mixin/instruments.py

@@ -299,4 +299,5 @@ class InstrumentPMSMixin:
                 "calculated",
                 "volume_50d",
             ],
+            batch_size=1000,
         )

wbfdm/serializers/instruments/instruments.py

@@ -154,6 +154,7 @@ class InstrumentModelListSerializer(
             "currency_symbol",
             "isin",
             "refinitiv_identifier_code",
+            "refinitiv_mnemonic_code",
             "ticker",
             "_classifications",
             "classifications",

wbfdm/viewsets/configs/buttons/instruments.py

@@ -9,6 +9,8 @@ from wbfdm.models import Instrument
 
 
 class ChildrenInstrumentModelViewConfig(ButtonViewConfig):
+    SHOW_INLINE = True
+
     def get_custom_buttons(self) -> set:
         with suppress(Instrument.DoesNotExist):
             instrument = Instrument.objects.get(id=self.view.kwargs.get("instrument_id"))

wbfdm/viewsets/configs/display/instruments.py

@@ -77,6 +77,8 @@ class InstrumentDisplayConfig(DisplayViewConfig):
                         dp.Field(key="exchange", label=_("Exchange"), show="open"),
                         dp.Field(key="isin", label=_("ISIN")),
                         dp.Field(key="ticker", label=_("Ticker")),
+                        dp.Field(key="refinitiv_identifier_code", label=_("RIC")),
+                        dp.Field(key="refinitiv_mnemonic_code", label=_("Refinitiv Mnemonic")),
                         dp.Field(key="description", label=_("Description"), show="open"),
                         dp.Field(key="currency", label=_("Currency"), show="open"),
                         dp.Field(key="country", label=_("Country"), show="open"),

{wbfdm-1.46.1.dist-info → wbfdm-1.46.3.dist-info}/METADATA

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

@@ -99,7 +99,7 @@ wbfdm/contrib/qa/dataloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 wbfdm/contrib/qa/dataloaders/adjustments.py,sha256=DQEexOLA7WyBB1dZJHQd-6zbzyEIURgSSgS7bJRvXzQ,2980
 wbfdm/contrib/qa/dataloaders/corporate_actions.py,sha256=lWT6klrTXKqxiko2HGrxHH8E2C00FJS-AOX3IhglRrI,2912
 wbfdm/contrib/qa/dataloaders/financials.py,sha256=xUHpvhUkvmdPL_RyWCrs7XgChgTklX5qemmaXMedgkY,3475
-wbfdm/contrib/qa/dataloaders/market_data.py,sha256=nsjLDs9JYcT0RfhzaEzTGh6GiLyHP512kHmMpwI1Dk8,5856
+wbfdm/contrib/qa/dataloaders/market_data.py,sha256=QmsqAJG5EZPXwEHPLsj-Nu0ZROpA-GVq0KvyvfcuTk0,6300
 wbfdm/contrib/qa/dataloaders/officers.py,sha256=vytlQJJxmn4Y5HfNh5mHJAvuIrrsQSkNO-sONyhxftY,2940
 wbfdm/contrib/qa/dataloaders/reporting_dates.py,sha256=Wu5nWeu-opbHTnBzKkud7qaMMPiXyCUMqqLi8xDYumE,2493
 wbfdm/contrib/qa/dataloaders/statements.py,sha256=hC6YErJcvBTmaAmzscgeC4sBK3lYE2U5eIKRIE9b_cs,10094
@@ -139,7 +139,7 @@ wbfdm/filters/exchanges.py,sha256=84N4AQoCwgdnxTxmhMob5Yndfr5gy_DRQ_-m2ilVLVM,83
 wbfdm/filters/financials.py,sha256=mYb2nvZo3UWtN7pWQQcug0YMgQ6uEIlDR5GhwID_Um0,2539
 wbfdm/filters/financials_analysis.py,sha256=EiWMWZ9cc3Pm7ySTKRHlM2XmB2NDFBIGKdAWNwDhJ3A,4087
 wbfdm/filters/instrument_prices.py,sha256=_yDyKWwaUIVvsSCJAitILtLdhzschVpkuyi8X8QHpAs,3647
-wbfdm/filters/instruments.py,sha256=1H17OjIn5Qrgd9Vx4FvwkUj_V6INHs1SRDrfmdYhRpY,7593
+wbfdm/filters/instruments.py,sha256=EKJDhkgGvwXbu8ejxJgbGn0rma64cwltZhRT1t7pZnM,7695
 wbfdm/filters/utils.py,sha256=p5UsDWaJiHYKxm4WCu2EPfyqK4j2_lZte1uDCbPcxQg,1478
 wbfdm/import_export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/import_export/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -183,7 +183,7 @@ wbfdm/import_export/parsers/refinitiv/utils.py,sha256=i1NVzlbontbn19y7kTGnMnP7rU
 wbfdm/import_export/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/import_export/resources/classification.py,sha256=Ngvh7luGyYr-gcFJD7rch9LVt-3C4tnueKST3imgBmU,1051
 wbfdm/import_export/resources/instrument_prices.py,sha256=01Sc-4crwiqAnQI0-ir5RdfsdLS69Uq5hbVtVbEVYso,937
-wbfdm/import_export/resources/instruments.py,sha256=0WROpBgozcguKcjUcMIVFeQehviMCPcAmPpysPaJ20w,6698
+wbfdm/import_export/resources/instruments.py,sha256=KK4Vw58-SqbYOpKxH7X0uxsR_H5cUftDnCyrIVKmYIU,4580
 wbfdm/management/__init__.py,sha256=u9-xEgneYh3DvuHceeAMt8mihGXZGp6WIwVxve-6GHA,1265
 wbfdm/migrations/0001_initial.py,sha256=xbAuv-HTzqa8krqSpjRokVptqY8raGrHjwDvKjep4Cw,2742
 wbfdm/migrations/0002_rename_statements_instrumentlookup_financials_and_more.py,sha256=XnIajiZeR6bEvzRZ4TczoE-3xoVJMUQj3hOSC3FOtMM,5441
@@ -239,7 +239,7 @@ wbfdm/models/instruments/llm/create_instrument_news_relationships.py,sha256=Eza3
 wbfdm/models/instruments/mixin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/models/instruments/mixin/financials_computed.py,sha256=L5wjXDsR0maiwfOKP6KyWNJNH4nGOoAjSc_hDM7fsj0,35105
 wbfdm/models/instruments/mixin/financials_serializer_fields.py,sha256=Au3P9LqByh5LGyv8w_miJamtHiEerOGZQhM1NzrfECM,68768
-wbfdm/models/instruments/mixin/instruments.py,sha256=dDARcZiOZ2OvzZgViq8Hm-oKWDJVDUshuBvF_iV-HRY,15133
+wbfdm/models/instruments/mixin/instruments.py,sha256=bT4bpNTgFHtmFhd33CpHczgT2K3bIb8U7khmrVejLyU,15162
 wbfdm/serializers/__init__.py,sha256=AXb03RKHo6B0ts_IQOvx89n9wKG8pxiumYv9cr4EhvA,197
 wbfdm/serializers/esg.py,sha256=epoX8cjkPuVv45aW-Jf85-rSO_ZrSnXcTxMcadKdC-I,1086
 wbfdm/serializers/exchanges.py,sha256=vi5kFadYRQo-6CV2b56nrABpt80LPtjZumJVaBE4bcc,1175
@@ -250,7 +250,7 @@ wbfdm/serializers/instruments/instrument_lists.py,sha256=M9RnH-Iy095m5xgkVcPHfvK
 wbfdm/serializers/instruments/instrument_prices.py,sha256=de-IlwUJC6gSYVztuTmOXQK3r-Gjn8tVWaSCx0PXh_Q,2593
 wbfdm/serializers/instruments/instrument_relationships.py,sha256=3hChFzdekoPtMYolEhWafcb9nTLPmx6WGEq_Hgck8jA,6454
 wbfdm/serializers/instruments/instrument_requests.py,sha256=Sl4gfkUu63zk4o2iGFVE59wx1rKkLUG6SPYCE7Dqrs4,2176
-wbfdm/serializers/instruments/instruments.py,sha256=HPrIvaabkXIgiegnR6xJKyl5HhX-ozvEyfzOAHQbh-E,11496
+wbfdm/serializers/instruments/instruments.py,sha256=0uxSmbg1CmsfkwLhDsgR9tKKd52R_T5AlnoouEE98W0,11535
 wbfdm/serializers/instruments/mixins.py,sha256=kxvjgi6zgAeIDkryDm3x3VYtiwP-rk4mcI825RsVXWM,4394
 wbfdm/sync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/sync/abstract.py,sha256=u1zjHT0ZJabUZpy3_EUCTtEig0p5Fuhlx69O9BsV_Gs,849
@@ -286,7 +286,7 @@ wbfdm/viewsets/configs/buttons/__init__.py,sha256=anGBjblMGGvyAUblYbnpmUulXQaulG
 wbfdm/viewsets/configs/buttons/classifications.py,sha256=sxfwIItdNGoJ1slnbKmWbxgN5nYq3fzVEUfeNFLebII,823
 wbfdm/viewsets/configs/buttons/exchanges.py,sha256=2swv3ORAaYF525mXRpp_3zmEl760FJSKYZfsR1ai8KM,255
 wbfdm/viewsets/configs/buttons/instrument_prices.py,sha256=Tvbbwl8FmXU7vZdhe9n0ICfYO1QkUlw7pD4WSfdSxp0,1873
-wbfdm/viewsets/configs/buttons/instruments.py,sha256=i5jpVpuJblRs_hsa3RJomQWdXTBFRtiyqYIvMpSFCv0,12306
+wbfdm/viewsets/configs/buttons/instruments.py,sha256=EhNxOu4WNMLwGGnThUjgu8uQa-oSKAmTBk0V7znnlO0,12330
 wbfdm/viewsets/configs/display/__init__.py,sha256=9ogNTPHvsuxPf53snrEGFhEPFqcO1sth5PkPBrqAfng,1024
 wbfdm/viewsets/configs/display/classifications.py,sha256=xolaLg6WDG7Dtwd3gQXWElmyH10GgaT03tL3a3PhKfE,5206
 wbfdm/viewsets/configs/display/esg.py,sha256=NcBZDxkIsGd-APYt4yJRNJjfmbmkC0O-H1q7fg_bBcU,3640
@@ -295,7 +295,7 @@ wbfdm/viewsets/configs/display/financial_summary.py,sha256=K8CPV9uy0wsK-yLQIDTqM
 wbfdm/viewsets/configs/display/instrument_lists.py,sha256=b0dq6py5Cn-_lONc1KXLoZydJ-LgOGpkB23QbLeQYBI,5124
 wbfdm/viewsets/configs/display/instrument_prices.py,sha256=QWDIPxWfgJjqHNB0cEShw1jH7zRkIYhJK9jhTE983EA,6940
 wbfdm/viewsets/configs/display/instrument_requests.py,sha256=CarX1MGe64roHZETm2N4HsEMssHVI5mWw2xTUBjgi-k,5129
-wbfdm/viewsets/configs/display/instruments.py,sha256=ajniHnmBO-oPmaNc6VqCQPz7bQafNwg-hqKzS_LAbHQ,18021
+wbfdm/viewsets/configs/display/instruments.py,sha256=lX2neyAn3zu53ynL-_FYNCwtqyKqe6bw4udCjFGQDSQ,18200
 wbfdm/viewsets/configs/display/instruments_relationships.py,sha256=BLAl2ZciWR5Waf3qPd1QQwdiupgIf_wGK6rmYe9byuY,2480
 wbfdm/viewsets/configs/display/monthly_performances.py,sha256=ESsGTLhPmmXz3YjEWNjwaOjA1RNzVDKtJt3JILL2MMc,2973
 wbfdm/viewsets/configs/display/officers.py,sha256=qUwN9HPSSlT85aUSFNY-30550P35j3RZCYqRPj_rFAs,654
@@ -350,6 +350,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.46.1.dist-info/METADATA,sha256=kbrltbfufSLxYjSaTur8Xe94y5ZATv9KXRjI6AHD9FA,737
-wbfdm-1.46.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.46.1.dist-info/RECORD,,
+wbfdm-1.46.3.dist-info/METADATA,sha256=j6SZfgbuA581w5GErurpLGXuu_ChUqIkZhQJe4tA1_w,737
+wbfdm-1.46.3.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.46.3.dist-info/RECORD,,