wbfdm 1.48.0__py2.py3-none-any.whl → 1.49.1__py2.py3-none-any.whl

wbfdm/factories/instruments.py

@@ -2,7 +2,7 @@ import factory
 import rstr
 from slugify import slugify
 
-from wbfdm.models import Instrument, InstrumentType
+from wbfdm.models import Cash, Instrument, InstrumentType
 
 
 class InstrumentTypeFactory(factory.django.DjangoModelFactory):
@@ -52,9 +52,17 @@ class InstrumentFactory(factory.django.DjangoModelFactory):
         model = Instrument
 
 
-class CashFactory(InstrumentFactory):
+class CashFactory(factory.django.DjangoModelFactory):
     is_cash = True
-    instrument_type = factory.LazyAttribute(lambda o: InstrumentTypeFactory.create(name="Cash", key="cash"))
+    currency = factory.SubFactory("wbcore.contrib.currency.factories.CurrencyFactory")
+    name = factory.LazyAttribute(lambda o: o.currency.title)
+    instrument_type = factory.LazyAttribute(
+        lambda o: InstrumentType.objects.get_or_create(key="cash", defaults={"name": "Cash", "short_name": "Cash"})[0]
+    )
+
+    class Meta:
+        model = Cash
+        django_get_or_create = ("currency",)
 
 
 class EquityFactory(InstrumentFactory):

wbfdm/filters/instruments.py

@@ -6,6 +6,7 @@ from wbcore import filters as wb_filters
 from wbcore.contrib.tags.filters import TagFilterMixin
 
 from wbfdm.filters.utils import _get_default_classification_group_id, get_earliest_date, get_latest_date
+from wbfdm.models import InstrumentType
 from wbfdm.models.instruments import (
     ClassificationGroup,
     Instrument,
@@ -103,6 +104,14 @@ class InstrumentFilterSet(TagFilterMixin, InstrumentFavoriteGroupFilterSet):
     instrument_type__key = wb_filters.CharFilter(label="Instrument Type Key", hidden=True)
     instrument_type__is_classifiable = wb_filters.BooleanFilter(label="Instrument Type Classifiable", hidden=True)
 
+    instrument_type = wb_filters.ModelMultipleChoiceFilter(
+        label="Asset Classes",
+        queryset=InstrumentType.objects.all(),
+        endpoint=InstrumentType.get_representation_endpoint(),
+        value_key=InstrumentType.get_representation_value_key(),
+        label_key=InstrumentType.get_representation_label_key(),
+    )
+
     is_classifiable = wb_filters.BooleanFilter(label="Is Classifiable", method="filter_is_classifiable", hidden=True)
 
     def filter_is_classifiable(self, queryset, name, value):

wbfdm/models/instruments/instrument_requests.py

@@ -1,6 +1,7 @@
 from typing import Any, Dict, Optional
 
 from django.db import models
+from django.utils.translation import gettext_lazy as _
 from django_fsm import FSMField, transition
 from wbcore.contrib.authentication.models import User
 from wbcore.contrib.currency.models import Currency
@@ -112,7 +113,7 @@ class InstrumentRequest(WBModel):
 
     def can_approve(self):
         if self._check_already_existing_instrument():
-            return {"non_field_errors": "An instrument already exists with the proposed identifier"}
+            return {"non_field_errors": [_("An instrument already exists with the proposed identifier")]}
 
     @transition(
         field=status,
@@ -178,7 +179,7 @@ class InstrumentRequest(WBModel):
 
     def can_submit(self) -> Dict[str, Any]:
         if self._check_already_existing_instrument():
-            return {"non_field_errors": "An instrument already exists with the proposed identifier"}
+            return {"non_field_errors": [_("An instrument already exists with the proposed identifier")]}
 
     @classmethod
     def get_representation_endpoint(cls) -> str:

wbfdm/models/instruments/instruments.py

@@ -964,6 +964,10 @@ class CashManager(InstrumentManager):
 class Cash(Instrument):
     objects = CashManager()
 
+    def save(self, *args, **kwargs):
+        self.is_cash = True
+        super().save(*args, **kwargs)
+
     class Meta:
         proxy = True
 
@@ -971,7 +975,7 @@ class Cash(Instrument):
 @receiver(post_save, sender="currency.Currency")
 def create_cash_from_currency(sender, instance, created, raw, **kwargs):
     if created:
-        Instrument.objects.get_or_create(
+        Cash.objects.get_or_create(
             instrument_type=InstrumentType.CASH, currency=instance, defaults={"name": f"Cash {instance.key}"}
         )
 

{wbfdm-1.48.0.dist-info → wbfdm-1.49.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.48.0
+Version: 1.49.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.48.0.dist-info → wbfdm-1.49.1.dist-info}/RECORD

@@ -127,7 +127,7 @@ wbfdm/factories/controversies.py,sha256=GhuoEms1O7DIMVNAIbFEzD9DRv8j1MXIv0u1JK6P
 wbfdm/factories/exchanges.py,sha256=heJHQE59dCDFeDuScJJti4C_SsMsz3O0kmczpGYVNlQ,831
 wbfdm/factories/instrument_list.py,sha256=ypnrTLCl0XRfGj6y-3XJSQ2Wl5TULxZU0I3nF6svH3Y,743
 wbfdm/factories/instrument_prices.py,sha256=EjRFbMjP3pLrxoNsNqNo37FGjayIiV99bkQPVgZLj4I,3623
-wbfdm/factories/instruments.py,sha256=vM6VymnO0bIecEk-reT8l2TO8O5uHwPYnqVnPREXRKQ,2238
+wbfdm/factories/instruments.py,sha256=A4BP06Ma66uG6klsfkMjGfiP9WYh85OZPTRiXFxwUM0,2552
 wbfdm/factories/instruments_relationships.py,sha256=opGQMM3sHQV5F04nGPCCsRw8ux8vSQ78tHNJjIDPyUE,1138
 wbfdm/factories/options.py,sha256=nna8LgB_2-XNGm37--Edkdv1oc49oeKtr7f8tcIJPU4,2463
 wbfdm/figures/__init__.py,sha256=PDF_OWeTocmJIQozLxj_OjDUeUG7OYzcS2DLpe-ECEA,49
@@ -140,7 +140,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=aRVzy8wtrmIXjmvDrMdpcfUYwb51c9TL-d3XbhLWqF4,7515
+wbfdm/filters/instruments.py,sha256=RwdLzB-96iDmdTOHpb74UkyB4k-AfLBQ1KxhPpJWvyI,7893
 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
@@ -230,8 +230,8 @@ wbfdm/models/instruments/classifications.py,sha256=EeZ_P8f1F1NfjUmLf9fDMF0iPM73q
 wbfdm/models/instruments/instrument_lists.py,sha256=GxfFyfYxEcJS36LAarHja49TOM8ffhIivpZX2-tPtZg,4234
 wbfdm/models/instruments/instrument_prices.py,sha256=WCaFMZ9sF7xeGTp9jkq7TA8RfYHrwvTjujzqgCKj9SI,22070
 wbfdm/models/instruments/instrument_relationships.py,sha256=zpCZCnt5CqIg5bd6le_6TyirsSwGV2NaqTVKw3bd5vM,10660
-wbfdm/models/instruments/instrument_requests.py,sha256=wC07CEqQxMGfrnATyr56T6GWxXknai105G2WIw1i3xk,7767
-wbfdm/models/instruments/instruments.py,sha256=V0bBgDxeEXtuu5uUBd15g4FIPAboAC53WN-FMt35qxg,39475
+wbfdm/models/instruments/instrument_requests.py,sha256=XbpofRS8WHadHlTFjvXJyd0o7K9r2pzJtnpjVQZOLdI,7832
+wbfdm/models/instruments/instruments.py,sha256=jbk3rsTIddstWi6DfFPt_UHtthQb0BUtOZUwA2gocJA,39573
 wbfdm/models/instruments/options.py,sha256=hFprq7B5t4ctz8nVqzFsBEzftq_KDUSsSXl1zJyh7tE,7094
 wbfdm/models/instruments/private_equities.py,sha256=uzwZi8IkmCKAHVTxnuFya9tehx7kh57sTlTEi1ieDaM,2198
 wbfdm/models/instruments/querysets.py,sha256=c5Op5VxR0A0uRPGHmnLJ6b7d2X5Kb5IX5bnk7MUfTjA,6475
@@ -352,6 +352,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.48.0.dist-info/METADATA,sha256=KJ1lJdQO0zhzAmHcT-aydfJacAOzUwuZ4ziHs2-7s3A,737
-wbfdm-1.48.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.48.0.dist-info/RECORD,,
+wbfdm-1.49.1.dist-info/METADATA,sha256=CRBxSPPraUiOZsZ1eDYMa8pc5-A3n0uj-DoPAC8_bKk,737
+wbfdm-1.49.1.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.49.1.dist-info/RECORD,,