wbfdm 1.46.14__tar.gz → 1.47.0__tar.gz

{wbfdm-1.46.14 → wbfdm-1.47.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.46.14
+Version: 1.47.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.46.14 → wbfdm-1.47.0}/wbfdm/contrib/qa/dataloaders/reporting_dates.py

@@ -1,3 +1,4 @@
+from itertools import batched
 from typing import Iterator
 
 from django.db import connections
@@ -49,20 +50,20 @@ class IbesReportingDateDataloader(ReportDateProtocol, Dataloader):
                 AND rp.rn = 1
             {% endif %}
         """
-
-        query, bind_params = JinjaSql(param_style="format").prepare_query(
-            sql,
-            {
-                "instruments": lookup.keys(),
-                "only_next": only_next,
-            },
-        )
-        with connections["qa"].cursor() as cursor:
-            cursor.execute(
-                query,
-                bind_params,
+        for batch in batched(lookup.keys(), 500):
+            query, bind_params = JinjaSql(param_style="format").prepare_query(
+                sql,
+                {
+                    "instruments": batch,
+                    "only_next": only_next,
+                },
             )
-            for row in dictfetchall(cursor):
-                row["instrument_id"] = lookup[row["external_id"]]
-                row["interim"] = bool(row["interim"])
-                yield row
+            with connections["qa"].cursor() as cursor:
+                cursor.execute(
+                    query,
+                    bind_params,
+                )
+                for row in dictfetchall(cursor):
+                    row["instrument_id"] = lookup[row["external_id"]]
+                    row["interim"] = bool(row["interim"])
+                    yield row

{wbfdm-1.46.14 → wbfdm-1.47.0}/wbfdm/serializers/instruments/instruments.py

@@ -1,6 +1,7 @@
 from typing import TYPE_CHECKING, Type
 
 from django.contrib.auth import get_user_model
+from django.contrib.contenttypes.models import ContentType
 from rest_framework.reverse import reverse
 from wbcore import serializers
 from wbcore.contrib.currency.models import Currency
@@ -248,8 +249,12 @@ class InstrumentModelSerializer(InstrumentAdditionalResourcesMixin, InstrumentMo
         return res
 
     @serializers.register_only_instance_resource()
-    def register_children(self, instance, request, user, **kwargs):
-        return {"children": reverse("wbfdm:instrument-children-list", args=[instance.id], request=request)}
+    def instance_resource(self, instance, request, user, **kwargs):
+        content_type = ContentType.objects.get_for_model(instance)
+        return {
+            "children": reverse("wbfdm:instrument-children-list", args=[instance.id], request=request),
+            "news": f'{reverse("wbnews:newsrelationship-list", args=[], request=request)}?content_type={content_type.id}&object_id={instance.id}',
+        }
 
     @serializers.register_resource()
     def register_market_data(self, instance, request, user, **kwargs):

{wbfdm-1.46.14 → wbfdm-1.47.0}/wbfdm/viewsets/configs/display/instruments.py

@@ -6,7 +6,6 @@ from dynamic_preferences.registries import global_preferences_registry
 from rest_framework.reverse import reverse
 from wbcore.metadata.configs import display as dp
 from wbcore.metadata.configs.display import DisplayViewConfig
-from wbcore.metadata.configs.display.instance_display import Section
 from wbcore.metadata.configs.display.instance_display.layouts.inlines import Inline
 from wbcore.metadata.configs.display.instance_display.layouts.layouts import Layout
 from wbcore.metadata.configs.display.instance_display.pages import Page
@@ -329,39 +328,29 @@ class InstrumentDisplayConfig(DisplayViewConfig):
                     },
                 ),
                 Page(
-                    title="Hierarchy",
+                    title=_("Hierarchy"),
                     layouts={
                         default(): Layout(
-                            grid_template_areas=[
-                                ["children"],
+                            grid_template_areas=[["children"]],
+                            inlines=[Inline(key="children", endpoint="children")],
+                            grid_template_columns=[
+                                "minmax(min-content, 1fr)",
                             ],
-                            grid_template_rows=["auto"],
-                            sections=[
-                                Section(
-                                    key="children",
-                                    title="Hierarchy",
-                                    display=Display(
-                                        pages=[
-                                            Page(
-                                                layouts={
-                                                    default(): Layout(
-                                                        grid_template_areas=[["children"]],
-                                                        grid_template_rows=["850px"],
-                                                        inlines=[
-                                                            Inline(
-                                                                key="children",
-                                                                endpoint="children",
-                                                            )
-                                                        ],
-                                                    )
-                                                }
-                                            )
-                                        ]
-                                    ),
-                                    collapsed=False,
-                                )
+                            grid_template_rows=["1fr"],
+                        ),
+                    },
+                ),
+                Page(
+                    title=_("News"),
+                    layouts={
+                        default(): Layout(
+                            grid_template_areas=[["news"]],
+                            inlines=[Inline(key="news", endpoint="news")],
+                            grid_template_columns=[
+                                "minmax(min-content, 1fr)",
                             ],
-                        )
+                            grid_template_rows=["1fr"],
+                        ),
                     },
                 ),
             ]