wbfdm 1.45.0__py2.py3-none-any.whl → 1.46.0__py2.py3-none-any.whl

wbfdm/import_export/handlers/instrument.py

@@ -67,7 +67,6 @@ class InstrumentLookup:
             "refinitiv_mnemonic_code",
             "sedol",
             "cusip",
-            "ticker",
             "identifier",
         ]:
             if identifier := identifiers.get(identifier_key, None):
@@ -79,7 +78,6 @@ class InstrumentLookup:
                         identifier = identifier.upper()
                     instrument = instruments.get(**{identifier_key: identifier})
                     break
-
         if not instrument and not exact_lookup:
             if instrument_type:
                 if isinstance(instrument_type, str):  # in case we receive a key as instrument type
@@ -103,14 +101,15 @@ class InstrumentLookup:
                         conditions.append(Q(old_isins__contains=[field_value]))
             if conditions:
                 instruments = instruments.filter(reduce(operator.or_, conditions))
-            if currency or exchange:
-                instruments_tmp = instruments
-                if exchange:
-                    instruments_tmp = instruments_tmp.filter(exchange=exchange)
-                if currency:
-                    instruments_tmp = instruments_tmp.filter(currency=currency)
-                if instruments_tmp.count() >= 1:
+
+            if currency:  # 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))

wbfdm/serializers/instruments/__init__.py

@@ -19,6 +19,7 @@ from .instrument_relationships import (
     RelatedInstrumentThroughInstrumentModelSerializer,
     InstrumentFavoriteGroupRepresentationSerializer,
     InstrumentFavoriteGroupModelSerializer,
+    ReadOnlyInstrumentFavoriteGroupModelSerializer,
     InstrumentClassificationThroughModelSerializer,
 )
 from .instrument_requests import InstrumentRequestRepresentationSerializer, InstrumentRequestModelSerializer

wbfdm/serializers/instruments/instrument_relationships.py

@@ -35,16 +35,8 @@ class InstrumentFavoriteGroupModelSerializer(wb_serializers.ModelSerializer):
     owner = wb_serializers.PrimaryKeyRelatedField(
         queryset=lambda: Person.objects.filter_only_internal(),
         default=wb_serializers.CurrentUserDefault("profile"),
-        read_only=lambda view: not view.request.user.is_superuser,
     )
     _owner = PersonRepresentationSerializer(source="owner")
-    public = wb_serializers.BooleanField(read_only=True)
-
-    # @wb_serializers.register_only_instance_resource()
-    # def instruments(self, instance, request, user, **kwargs):
-    #     if instance.instruments.exists():
-    #         return {"instruments": reverse("wbfdm:favoritegroup-instrument-list", args=[instance.id], request=request)}
-    #     return dict()
 
     def validate(self, data):
         if not data.get("owner", None):
@@ -66,6 +58,11 @@ class InstrumentFavoriteGroupModelSerializer(wb_serializers.ModelSerializer):
         )
 
 
+class ReadOnlyInstrumentFavoriteGroupModelSerializer(InstrumentFavoriteGroupModelSerializer):
+    class Meta(InstrumentFavoriteGroupModelSerializer.Meta):
+        read_only_fields = InstrumentFavoriteGroupModelSerializer.Meta.fields
+
+
 class RelatedInstrumentThroughInstrumentModelSerializer(wb_serializers.ModelSerializer):
     _related_instrument = InvestableInstrumentRepresentationSerializer(source="related_instrument")
     _instrument = InvestableInstrumentRepresentationSerializer(source="instrument")

wbfdm/serializers/instruments/instruments.py

@@ -129,7 +129,6 @@ class InstrumentModelListSerializer(
             "instrument_type",
             "old_isins",
             "inception_date",
-            "delisted_date",
             "country",
             "is_active",
             "parent",

wbfdm/viewsets/configs/endpoints/__init__.py

@@ -36,6 +36,7 @@ from .instrument_prices import (
 from .instruments_relationships import (
     ClassifiedInstrumentEndpointConfig,
     RelatedInstrumentThroughInstrumentEndpointConfig,
+    InstrumentFavoriteGroupEndpointConfig
 )
 from .exchanges import ExchangeEndpointConfig
 from .esg import InstrumentESGPAIEndpointViewConfig, InstrumentESGControversiesEndpointViewConfig

wbfdm/viewsets/configs/endpoints/instruments_relationships.py

@@ -29,3 +29,13 @@ class ClassifiedInstrumentEndpointConfig(EndpointViewConfig):
 
     def get_delete_endpoint(self, **kwargs):
         return None
+
+
+class InstrumentFavoriteGroupEndpointConfig(EndpointViewConfig):
+    def get_update_endpoint(self, **kwargs):
+        if self.view.is_owner:
+            return self.get_instance_endpoint(**kwargs)
+        return None
+
+    def get_delete_endpoint(self, **kwargs):
+        return self.get_update_endpoint(**kwargs)

wbfdm/viewsets/instruments/instruments_relationships.py

@@ -29,6 +29,7 @@ from wbfdm.serializers import (
     InstrumentClassificationRelatedInstrumentRepresentationSerializer,
     InstrumentFavoriteGroupModelSerializer,
     InstrumentFavoriteGroupRepresentationSerializer,
+    ReadOnlyInstrumentFavoriteGroupModelSerializer,
     RelatedInstrumentThroughInstrumentModelSerializer,
 )
 from wbfdm.viewsets.configs.display import ClassifiedInstrumentDisplayConfig
@@ -39,6 +40,7 @@ from ..configs import (
     ClassificationInstrumentRelatedInstrumentEndpointConfig,
     ClassifiedInstrumentEndpointConfig,
     InstrumentFavoriteGroupDisplayConfig,
+    InstrumentFavoriteGroupEndpointConfig,
     InstrumentFavoriteGroupTitleConfig,
     RelatedInstrumentThroughInstrumentDisplayConfig,
     RelatedInstrumentThroughInstrumentEndpointConfig,
@@ -91,6 +93,20 @@ class InstrumentFavoriteGroupModelViewSet(InternalUserPermissionMixin, viewsets.
 
     display_config_class = InstrumentFavoriteGroupDisplayConfig
     title_config_class = InstrumentFavoriteGroupTitleConfig
+    endpoint_config_class = InstrumentFavoriteGroupEndpointConfig
+
+    @cached_property
+    def is_owner(self) -> bool:
+        try:
+            group = InstrumentFavoriteGroup.objects.get(id=self.kwargs["pk"])
+            return group.owner == self.request.user.profile
+        except (KeyError, InstrumentFavoriteGroup.DoesNotExist):
+            return False
+
+    def get_serializer_class(self):
+        if self.is_owner:
+            return InstrumentFavoriteGroupModelSerializer
+        return ReadOnlyInstrumentFavoriteGroupModelSerializer
 
     def get_queryset(self):
         qs = InstrumentFavoriteGroup.objects.all()

{wbfdm-1.45.0.dist-info → wbfdm-1.46.0.dist-info}/METADATA

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

@@ -162,7 +162,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=yG8V4C2TGhJdKwTeuMfaG1lzJ3MjNaV632KTe0nuym8,7348
 wbfdm/import_export/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wbfdm/import_export/handlers/instrument.py,sha256=5ITIM90p0Dhe9-UA8zPU2xZdIsx7t4I3xst4NDxYcng,11547
+wbfdm/import_export/handlers/instrument.py,sha256=ccY5zcsL8SwR9-PzhFjfHpnvA4DzZ-8FoErEzmCMG3g,11463
 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=DtqqdOMEA-u3jWVjmxRPKJ8miENj_t1k2DzAZEoOtXU,2384
@@ -244,13 +244,13 @@ wbfdm/serializers/__init__.py,sha256=AXb03RKHo6B0ts_IQOvx89n9wKG8pxiumYv9cr4EhvA
 wbfdm/serializers/esg.py,sha256=epoX8cjkPuVv45aW-Jf85-rSO_ZrSnXcTxMcadKdC-I,1086
 wbfdm/serializers/exchanges.py,sha256=vi5kFadYRQo-6CV2b56nrABpt80LPtjZumJVaBE4bcc,1175
 wbfdm/serializers/officers.py,sha256=yrBJqnwxS5Eq0aGcRKe0FbEYEvDFpZlb8gzgfU9pRyk,473
-wbfdm/serializers/instruments/__init__.py,sha256=fOhGE_NJx62PTsMPd8A15eGUM2ret2RI1w15-B_uW8A,1610
+wbfdm/serializers/instruments/__init__.py,sha256=7WX6P7Fzyc_E59CpJ1RBAPptIOPXOHn9FScvGY8qWjo,1662
 wbfdm/serializers/instruments/classifications.py,sha256=DsrKkF0lFBTtNrVs0vhjkjjlK8mDSbGfvQODarYPbDA,5669
 wbfdm/serializers/instruments/instrument_lists.py,sha256=M9RnH-Iy095m5xgkVcPHfvKiyHgCy8kIIN9cdqOf20I,1916
 wbfdm/serializers/instruments/instrument_prices.py,sha256=de-IlwUJC6gSYVztuTmOXQK3r-Gjn8tVWaSCx0PXh_Q,2593
-wbfdm/serializers/instruments/instrument_relationships.py,sha256=9vGn04ba8LO_eht80d7riGyH7v_DfRcqFaJYwsEAG9U,6654
+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=iuotwMCNFhsqm_R1-HAYqT10hWSc59RT4_7rYPa2tuI,11525
+wbfdm/serializers/instruments/instruments.py,sha256=HPrIvaabkXIgiegnR6xJKyl5HhX-ozvEyfzOAHQbh-E,11496
 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
@@ -302,7 +302,7 @@ wbfdm/viewsets/configs/display/officers.py,sha256=qUwN9HPSSlT85aUSFNY-30550P35j3
 wbfdm/viewsets/configs/display/prices.py,sha256=09PVAbrgxE7vkZjYaloNqi2Jot2iyRjHILcJPsVj5gI,890
 wbfdm/viewsets/configs/display/statement_with_estimates.py,sha256=pW11SmOpL5Frzc1iRmKLHFWUySNCUt8BB1akm6kVsEg,4206
 wbfdm/viewsets/configs/display/statements.py,sha256=p7QwzGGxydHPf_igzvDworIjm4nm6vi6qxDxRQhv-_w,1715
-wbfdm/viewsets/configs/endpoints/__init__.py,sha256=gYhYOYk21ZkkNGKi5hFPSOglvSc8HR3PF0uWt-jJJy8,1841
+wbfdm/viewsets/configs/endpoints/__init__.py,sha256=0NqyqxbeF-CBlju7lvhNvcgT6dF9pQqYHF4eNGBeZaI,1883
 wbfdm/viewsets/configs/endpoints/classifications.py,sha256=eXejc-o0HEZDzve27qrJRLDnizio4xvqNNLPgCnfCnU,2818
 wbfdm/viewsets/configs/endpoints/esg.py,sha256=1StqRjZIFP0lqY3ukGdxb_5wS0sDkszwMcjR2o1HrHA,636
 wbfdm/viewsets/configs/endpoints/exchanges.py,sha256=4LzoOBuQ-s7szKF9I3f60IYkpe_vsDvq7Kao_FEQr1A,193
@@ -311,7 +311,7 @@ wbfdm/viewsets/configs/endpoints/instrument_lists.py,sha256=YOqoi2wRm98kOp8vC0Yl
 wbfdm/viewsets/configs/endpoints/instrument_prices.py,sha256=7ko4ZnqD6PhOXZhbZY8GKtI58WFfp2Vj5rNex5dxCQQ,1858
 wbfdm/viewsets/configs/endpoints/instrument_requests.py,sha256=Ij6TdGm8_qOFrK4JODK-NatU__eRjwmhRgMIA40niWQ,729
 wbfdm/viewsets/configs/endpoints/instruments.py,sha256=7RFObP62oqF43yJOLmgGx3uxOl3Orw_tleua_vUu6HU,477
-wbfdm/viewsets/configs/endpoints/instruments_relationships.py,sha256=KpDVDWYuKUqFQWvQehAicYmwl9QZO4ilMqJUxfnvELo,927
+wbfdm/viewsets/configs/endpoints/instruments_relationships.py,sha256=kHjxVBezH3Lx-8qQcBQmcX83A8PF-P4HPo2YDun5cak,1242
 wbfdm/viewsets/configs/endpoints/statements.py,sha256=k2lHhUrXbG_ZyJTdCIl30fogwLvkVQp6diekMcDtOVo,172
 wbfdm/viewsets/configs/menus/__init__.py,sha256=0WuymiOTvTSjbRZj5nevwRHO9WivKwfXq9LqLAgOQCI,401
 wbfdm/viewsets/configs/menus/classifications.py,sha256=gaXfKPlQHPzKIA5LsI4J7fDDWauuhAeDYzV55xukkC8,648
@@ -344,12 +344,12 @@ wbfdm/viewsets/instruments/instrument_lists.py,sha256=hwwHDNpHjjffxw08N_1LtkL5Fd
 wbfdm/viewsets/instruments/instrument_prices.py,sha256=WGUe5WUl9PqulWSPCZgWcBWCmgxtu4lhm-UeAa4ngyg,24008
 wbfdm/viewsets/instruments/instrument_requests.py,sha256=mmaARNl6ymDdlcLzcu16vVfFsunhtJkMw2r2NBfUp9U,1839
 wbfdm/viewsets/instruments/instruments.py,sha256=eI0sP0B1wN8ImuACP_OIbv4n1IZQ5iT5zJyrFm9t8E4,3867
-wbfdm/viewsets/instruments/instruments_relationships.py,sha256=imCFfHQqdGzlbFpDMH4okDORSAlC7HqU9_dRkEWQUGQ,10437
+wbfdm/viewsets/instruments/instruments_relationships.py,sha256=D2Ym84zXBFegQC9nMThKSWqSAcWa0WvcS_GXxM2po68,11076
 wbfdm/viewsets/instruments/utils.py,sha256=SQAdQSgYwUwhlFBbYkZd1VMDmtfoj9XLj1RGBUzzre8,1144
 wbfdm/viewsets/statements/__init__.py,sha256=odxtFYUDICPmz8WCE3nx93EvKZLSPBEI4d7pozcQz2A,47
 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.45.0.dist-info/METADATA,sha256=d0f1whFCM6FDtdj7BR8Bp9jeyyGGoJ7keV96fJPN_7o,737
-wbfdm-1.45.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.45.0.dist-info/RECORD,,
+wbfdm-1.46.0.dist-info/METADATA,sha256=m39LzxWJx6f8zcJN6T3brXQrYiLCJZNFp6E-mxt0z_k,737
+wbfdm-1.46.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.46.0.dist-info/RECORD,,