wbfdm 1.46.4__py2.py3-none-any.whl → 1.46.5__py2.py3-none-any.whl

wbfdm/contrib/qa/sync/utils.py

@@ -114,7 +114,19 @@ def convert_data(data, parent_source: str | None = None) -> dict:
 def get_instrument_from_data(data, parent_source: str | None = None) -> Instrument | None:
     if len(data.keys()) == 0:
         return None
-    instrument = Instrument(**convert_data(data, parent_source))
+
+    defaults = convert_data(data, parent_source)
+    try:
+        instrument = Instrument.objects.get(source=defaults["source"], source_id=defaults["source_id"])
+        instrument.dl_parameters.update(
+            defaults.pop("dl_parameters")
+        )  # we need to update the existing dl parameters to not override its existing value
+        for k, v in defaults.items():
+            setattr(instrument, k, v)
+
+    except Instrument.DoesNotExist:
+        instrument = Instrument(**defaults)
+
     instrument.pre_save()
     instrument.computed_str = instrument.compute_str()
     if (
@@ -198,10 +210,7 @@ def update_or_create_item(
         source_id=external_id,
         defaults=defaults,
     )
-
-    for key, value in dl_parameters.items():
-        instrument.dl_parameters[key] = value
-
+    instrument.dl_parameters.update(dl_parameters)
     instrument.save()
 
     return instrument

wbfdm/filters/classifications.py

@@ -1,5 +1,6 @@
 from wbcore import filters as wb_filters
 
+from wbfdm.filters.utils import _get_default_classification_group_id
 from wbfdm.models import (
     Classification,
     ClassificationGroup,
@@ -88,6 +89,7 @@ class InstrumentClassificationThroughModelViewFilterSet(wb_filters.FilterSet):
         endpoint=ClassificationGroup.get_representation_endpoint(),
         value_key=ClassificationGroup.get_representation_value_key(),
         label_key=ClassificationGroup.get_representation_label_key(),
+        default=_get_default_classification_group_id,
     )
 
     class Meta:

wbfdm/filters/instruments.py

@@ -5,7 +5,7 @@ from psycopg.types.range import DateRange
 from wbcore import filters as wb_filters
 from wbcore.contrib.tags.filters import TagFilterMixin
 
-from wbfdm.filters.utils import get_earliest_date, get_latest_date
+from wbfdm.filters.utils import _get_default_classification_group_id, get_earliest_date, get_latest_date
 from wbfdm.models.instruments import (
     ClassificationGroup,
     Instrument,
@@ -13,7 +13,6 @@ from wbfdm.models.instruments import (
     InstrumentFavoriteGroup,
 )
 from wbfdm.models.instruments.classifications import Classification
-from wbfdm.preferences import get_default_classification_group
 
 
 def get_default_favorite_group(field, request, view):
@@ -156,12 +155,6 @@ class InstrumentFilterSet(TagFilterMixin, InstrumentFavoriteGroupFilterSet):
         hidden_fields = ["id__in", "is_managed", "is_security", "level"]
 
 
-def _get_default_classification_group_id(*args, **kwargs):
-    if group := get_default_classification_group():
-        return group.id
-    return None
-
-
 class BaseClassifiedInstrumentFilterSet(TagFilterMixin, wb_filters.FilterSet):
     classification_group = wb_filters.ModelChoiceFilter(
         label="Classification Group",
@@ -169,7 +162,7 @@ class BaseClassifiedInstrumentFilterSet(TagFilterMixin, wb_filters.FilterSet):
         endpoint=ClassificationGroup.get_representation_endpoint(),
         value_key=ClassificationGroup.get_representation_value_key(),
         label_key=ClassificationGroup.get_representation_label_key(),
-        default=_get_default_classification_group_id(),
+        default=_get_default_classification_group_id,
         method="fake_filter",
         required=True,
     )

wbfdm/filters/utils.py

@@ -4,7 +4,16 @@ from pandas.tseries.offsets import BDay, BMonthBegin, BMonthEnd
 from psycopg.types.range import DateRange
 from wbcore.utils.date import current_quarter_date_start
 
-from wbfdm.models import Instrument
+from wbfdm.models import Classification, Instrument
+from wbfdm.preferences import get_default_classification_group
+
+
+def _get_default_classification_group_id(field, request, view, **kwargs):
+    if classification_id := view.kwargs.get("classification_id", None):
+        return Classification.objects.get(id=classification_id).group.id
+    if group := get_default_classification_group():
+        return group.id
+    return None
 
 
 def get_earliest_date(field, request, view):

wbfdm/tasks.py

@@ -55,8 +55,8 @@ def update_of_investable_universe_data(
     for instrument in tqdm(instruments, total=instruments.count()):
         try:
             prices.extend(list(instrument.get_price_objects(start=start, end=end, clear=clear)))
-        except ConnectionError:
-            print(f"Connection error while processing instrument {instrument}")  # noqa
+        except Exception as e:
+            print(f"Connection error while processing instrument {instrument}: {str(e)}")  # noqa
     Instrument.bulk_save_instrument_prices(prices)
     investable_universe_updated.send(sender=Instrument, end_date=end)
     if with_background_tasks:

{wbfdm-1.46.4.dist-info → wbfdm-1.46.5.dist-info}/METADATA

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

@@ -6,7 +6,7 @@ wbfdm/jinja2.py,sha256=pkIC1U-0rf6vn0DDEUzZ8dPYiTGEPY8LBTRMi9wYiuc,199
 wbfdm/menu.py,sha256=c_uP0wIxboHvY0BfHbYPI9GI4F41UxSgREqbzcaxzHM,399
 wbfdm/preferences.py,sha256=8ghDcaapOMso1kjtNfKbSFykPUTxzqI5R77gM3BgiMs,927
 wbfdm/signals.py,sha256=PhAsFpQZF1YVe5UpedaRelUD_TVjemqRYm1HzV-bhmY,597
-wbfdm/tasks.py,sha256=Dmtk_DpXXniuXipob6G6d39PzFjML0s23mEqNH4ScCw,4202
+wbfdm/tasks.py,sha256=pYoBj2VQp5y2rZRDmWtd044UjVvp9Px4lwQwM4Nson4,4211
 wbfdm/urls.py,sha256=pDp9I0kktxicad8sXXEUT7402jZPMJNcE5R1doTlcMw,8887
 wbfdm/utils.py,sha256=4cWrCpqXxHIjtSlt4DDPFvmtaqXw_H0nqhM6sGuXx0o,1938
 wbfdm/admin/__init__.py,sha256=Z1VtH_gjD71K79KcD-2Q2Lu_p_7j0akMZj7gNxdz1CQ,1398
@@ -114,7 +114,7 @@ wbfdm/contrib/qa/jinja2/qa/sql/ibes/estimates.sql,sha256=OWgeogSFj7-OdXvJTvNsThN
 wbfdm/contrib/qa/jinja2/qa/sql/ibes/financials.sql,sha256=0jXNMdX8ixVRJ8YyvtoJRQ510pHFYEioMy7NTp5ecck,2582
 wbfdm/contrib/qa/sync/exchanges.py,sha256=831-0bqxq4LaHEkyvMGfEBkNFm5LyLCSpjZbPdTEF0A,3079
 wbfdm/contrib/qa/sync/instruments.py,sha256=8aTQVJ_cw1phe4FWikn79pjCfUijaTcwkdhQCtSXKH0,3156
-wbfdm/contrib/qa/sync/utils.py,sha256=TYZY3QB75POUmme1U71yo6WPzf4AXs4pWpFdI1Hq2GY,8936
+wbfdm/contrib/qa/sync/utils.py,sha256=1diZFEMQwjdGhfL6jv2xX7N_-TyO0Fwtnqw_3K5ykYI,9326
 wbfdm/dataloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/dataloaders/cache.py,sha256=K9BeVxT7p-BMvjurINt18bfrUDccp840uIjfDBLJRNk,4841
 wbfdm/dataloaders/protocols.py,sha256=8ibd-jAdlwu-JvRL2LqJMi5mOcWyWYh1Ll_wD4nPJxE,2994
@@ -134,13 +134,13 @@ wbfdm/figures/financials/__init__.py,sha256=6PcHUFJeTEtz9BweUlLANHHOshiNgqX1Wj3K
 wbfdm/figures/financials/financial_analysis_charts.py,sha256=YJ3JW8WiuP53Ow9YGT_TGpMGQtCyGMzORb5EEn86XSo,18396
 wbfdm/figures/financials/financials_charts.py,sha256=tKqBWvkLkDB2GGsPe5g4GR6d3tgnBY2LgRYdXamzBWQ,32717
 wbfdm/filters/__init__.py,sha256=skWeFdAcemysUeGEvIJ_cIxn-SXuJsUxAroTxq0N8Qo,926
-wbfdm/filters/classifications.py,sha256=80Ju6KiKsina1eIgeoafkHaL8xl9MS03q2U0Fo1X0Bc,3502
+wbfdm/filters/classifications.py,sha256=ylmYzP2ZYiEei5vr8BCn_8JNd-Bv7uYnyDhWLa_VrHM,3625
 wbfdm/filters/exchanges.py,sha256=84N4AQoCwgdnxTxmhMob5Yndfr5gy_DRQ_-m2ilVLVM,835
 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=EKJDhkgGvwXbu8ejxJgbGn0rma64cwltZhRT1t7pZnM,7695
-wbfdm/filters/utils.py,sha256=p5UsDWaJiHYKxm4WCu2EPfyqK4j2_lZte1uDCbPcxQg,1478
+wbfdm/filters/instruments.py,sha256=aRVzy8wtrmIXjmvDrMdpcfUYwb51c9TL-d3XbhLWqF4,7515
+wbfdm/filters/utils.py,sha256=6IpNoZ_yjRUCdpVXrj3kriTceAX-VGrS5NpZA2NgSmY,1870
 wbfdm/import_export/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/import_export/backends/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wbfdm/import_export/backends/cbinsights/__init__.py,sha256=PuBZjIZ4pZixX8QH7lVavhjjmlv4yV3Bp7zDW6NoZPc,45
@@ -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.4.dist-info/METADATA,sha256=5QHL84TqQw5pxZUdkOAREiwMOlinELQGGbdMFAVNfpY,737
-wbfdm-1.46.4.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.46.4.dist-info/RECORD,,
+wbfdm-1.46.5.dist-info/METADATA,sha256=d1__-NmqB3TXTjth9FRHfME4qX7hLSkse3XwBN5Ahmw,737
+wbfdm-1.46.5.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.46.5.dist-info/RECORD,,