wbfdm 1.46.13__py2.py3-none-any.whl → 1.47.0__py2.py3-none-any.whl

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/models/instruments/querysets.py

@@ -128,28 +128,24 @@ class InstrumentQuerySet(QuerySet):
         )
         if not df.empty:
             df["valuation_date"] = pd.to_datetime(df["valuation_date"])
-            df = df.rename(columns={"valuation_date": "date"}).set_index(["instrument_id", "date"]).sort_index()
-            df = df.drop(columns=df.columns.difference(["calculated", "close", "market_capitalization", "volume"]))
-            df["calculated"] = False
-            idx = pd.MultiIndex.from_product(
-                [
-                    df.index.levels[0],
-                    pd.date_range(
-                        df.index.get_level_values("date").min(), df.index.get_level_values("date").max(), freq="B"
-                    ),
-                ],
-                names=["instrument_id", "date"],
+            df = df.rename(columns={"valuation_date": "date"})
+            df = df.drop(
+                columns=df.columns.difference(
+                    ["calculated", "close", "market_capitalization", "volume", "instrument_id", "date"]
+                )
             )
-            df = df.reindex(idx)
-            df[["close", "market_capitalization"]] = df[["close", "market_capitalization"]].astype(float).ffill()
-            df.volume = df.volume.astype(float).fillna(0)
-            df.calculated = df.calculated.astype(bool).fillna(
-                True
-            )  # we do not ffill calculated but set the to True to mark them as "estimated"/"not real"
-            df = df.reset_index("date").dropna(subset=["close"])
-            df = df.replace([np.inf, -np.inf, np.nan], None)
+            df["calculated"] = False
 
-            for instrument_id, dff in df.groupby(level=0):
+            for instrument_id, dff in df.groupby("instrument_id", group_keys=False, as_index=False):
+                dff = dff.drop(columns=["instrument_id"]).set_index("date").sort_index()
+                dff = dff.reindex(pd.date_range(dff.index.min(), dff.index.max(), freq="B"))
+                dff[["close", "market_capitalization"]] = dff[["close", "market_capitalization"]].astype(float).ffill()
+                dff.volume = dff.volume.astype(float).fillna(0)
+                dff.calculated = dff.calculated.astype(bool).fillna(
+                    True
+                )  # we do not ffill calculated but set the to True to mark them as "estimated"/"not real"
+                dff = dff.reset_index(names="date").dropna(subset=["close"])
+                dff = dff.replace([np.inf, -np.inf, np.nan], None)
                 instrument = self.get(id=instrument_id)
                 yield from filter(
                     lambda x: x, map(lambda row: _dict_to_object(instrument, row), dff.to_dict("records"))

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/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"],
+                        ),
                     },
                 ),
             ]

{wbfdm-1.46.13.dist-info → wbfdm-1.47.0.dist-info}/METADATA

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

@@ -102,7 +102,7 @@ wbfdm/contrib/qa/dataloaders/corporate_actions.py,sha256=lWT6klrTXKqxiko2HGrxHH8
 wbfdm/contrib/qa/dataloaders/financials.py,sha256=xUHpvhUkvmdPL_RyWCrs7XgChgTklX5qemmaXMedgkY,3475
 wbfdm/contrib/qa/dataloaders/market_data.py,sha256=M8l5Eadibe0BbABifcGW-T5S0fOE7O2E_7M8EvhYTso,6508
 wbfdm/contrib/qa/dataloaders/officers.py,sha256=vytlQJJxmn4Y5HfNh5mHJAvuIrrsQSkNO-sONyhxftY,2940
-wbfdm/contrib/qa/dataloaders/reporting_dates.py,sha256=Wu5nWeu-opbHTnBzKkud7qaMMPiXyCUMqqLi8xDYumE,2493
+wbfdm/contrib/qa/dataloaders/reporting_dates.py,sha256=q25ccB0pbGfLJLV1A1_AY1XYWJ_Fa10egY09L1J-C5A,2628
 wbfdm/contrib/qa/dataloaders/statements.py,sha256=hC6YErJcvBTmaAmzscgeC4sBK3lYE2U5eIKRIE9b_cs,10094
 wbfdm/contrib/qa/dataloaders/utils.py,sha256=E0qav459E7razVOvHKVt9ld_gteJ6eQ2oR4xN-CIOns,2941
 wbfdm/contrib/qa/jinja2/qa/sql/companies.sql,sha256=RzTkfVjBVOgyirgKxp2rnJdjsKl8d3YM-d2qdjHx9cw,3801
@@ -234,7 +234,7 @@ wbfdm/models/instruments/instrument_requests.py,sha256=wC07CEqQxMGfrnATyr56T6GWx
 wbfdm/models/instruments/instruments.py,sha256=V0bBgDxeEXtuu5uUBd15g4FIPAboAC53WN-FMt35qxg,39475
 wbfdm/models/instruments/options.py,sha256=hFprq7B5t4ctz8nVqzFsBEzftq_KDUSsSXl1zJyh7tE,7094
 wbfdm/models/instruments/private_equities.py,sha256=uzwZi8IkmCKAHVTxnuFya9tehx7kh57sTlTEi1ieDaM,2198
-wbfdm/models/instruments/querysets.py,sha256=7-hbYxfLAZQJO-e76SmYx6NjZ8q0tdR-4pAZyb-izas,6556
+wbfdm/models/instruments/querysets.py,sha256=c5Op5VxR0A0uRPGHmnLJ6b7d2X5Kb5IX5bnk7MUfTjA,6475
 wbfdm/models/instruments/utils.py,sha256=88jnWINSSC0OwH-mCEOPLZXuhBCtEsxBpSaZ38GteaE,1365
 wbfdm/models/instruments/llm/__init__.py,sha256=dSmxRmEWb0A4O_lUoWuRKt2mBtUuLCTPVVJqGyi_n40,52
 wbfdm/models/instruments/llm/create_instrument_news_relationships.py,sha256=Eza39rlkNJxpURroIsJLImKC6F-KtTmkdjHn1kv4F3Q,3439
@@ -252,7 +252,7 @@ wbfdm/serializers/instruments/instrument_lists.py,sha256=M9RnH-Iy095m5xgkVcPHfvK
 wbfdm/serializers/instruments/instrument_prices.py,sha256=de-IlwUJC6gSYVztuTmOXQK3r-Gjn8tVWaSCx0PXh_Q,2593
 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=0uxSmbg1CmsfkwLhDsgR9tKKd52R_T5AlnoouEE98W0,11535
+wbfdm/serializers/instruments/instruments.py,sha256=EX2T2fqYN1l8lzbgyl0cxFs2bDIf0ydGRAVWkB5ISzU,11831
 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
@@ -297,7 +297,7 @@ wbfdm/viewsets/configs/display/financial_summary.py,sha256=K8CPV9uy0wsK-yLQIDTqM
 wbfdm/viewsets/configs/display/instrument_lists.py,sha256=b0dq6py5Cn-_lONc1KXLoZydJ-LgOGpkB23QbLeQYBI,5124
 wbfdm/viewsets/configs/display/instrument_prices.py,sha256=QWDIPxWfgJjqHNB0cEShw1jH7zRkIYhJK9jhTE983EA,6940
 wbfdm/viewsets/configs/display/instrument_requests.py,sha256=CarX1MGe64roHZETm2N4HsEMssHVI5mWw2xTUBjgi-k,5129
-wbfdm/viewsets/configs/display/instruments.py,sha256=lX2neyAn3zu53ynL-_FYNCwtqyKqe6bw4udCjFGQDSQ,18200
+wbfdm/viewsets/configs/display/instruments.py,sha256=RxW7fsfnmVdJqrqENflTIcOLuXABAYUbbedzTI7Jkdg,17418
 wbfdm/viewsets/configs/display/instruments_relationships.py,sha256=BLAl2ZciWR5Waf3qPd1QQwdiupgIf_wGK6rmYe9byuY,2480
 wbfdm/viewsets/configs/display/monthly_performances.py,sha256=ESsGTLhPmmXz3YjEWNjwaOjA1RNzVDKtJt3JILL2MMc,2973
 wbfdm/viewsets/configs/display/officers.py,sha256=qUwN9HPSSlT85aUSFNY-30550P35j3RZCYqRPj_rFAs,654
@@ -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.46.13.dist-info/METADATA,sha256=MEHS76Tos0J-qwMLxwwUS3ih5p2u0xVEykz7PJ8LGfE,738
-wbfdm-1.46.13.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.46.13.dist-info/RECORD,,
+wbfdm-1.47.0.dist-info/METADATA,sha256=WynOeJW5JrmdmgNFbVqmWagCK878bGa8d-Myf5KQt3w,737
+wbfdm-1.47.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.47.0.dist-info/RECORD,,