wbfdm 1.45.0__tar.gz → 1.46.0__tar.gz

{wbfdm-1.45.0 → wbfdm-1.46.0}/PKG-INFO

@@ -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 → wbfdm-1.46.0}/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-1.45.0 → wbfdm-1.46.0}/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-1.45.0 → wbfdm-1.46.0}/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-1.45.0 → wbfdm-1.46.0}/wbfdm/serializers/instruments/instruments.py

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

{wbfdm-1.45.0 → wbfdm-1.46.0}/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-1.45.0 → wbfdm-1.46.0}/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-1.45.0 → wbfdm-1.46.0}/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()