wbfdm 1.46.3__tar.gz → 1.46.5__tar.gz

{wbfdm-1.46.3 → wbfdm-1.46.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.46.3
+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.3 → wbfdm-1.46.5}/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-1.46.3 → wbfdm-1.46.5}/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-1.46.3 → wbfdm-1.46.5}/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-1.46.3 → wbfdm-1.46.5}/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-1.46.3 → wbfdm-1.46.5}/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: