wbfdm 1.54.23__tar.gz → 1.55.0__tar.gz

{wbfdm-1.54.23 → wbfdm-1.55.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wbfdm
-Version: 1.54.23
+Version: 1.55.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.54.23 → wbfdm-1.55.0}/wbfdm/contrib/qa/dataloaders/statements.py

@@ -239,6 +239,9 @@ class RKDStatementsDataloader(StatementsProtocol, Dataloader):
     ) -> Iterator[StatementDataDict]:
         lookup = {k: v for k, v in self.entities.values_list("dl_parameters__statements__parameters", "id")}
         sql = reported_sql if data_type is DataType.REPORTED else standardized_sql
+        if financials is None:
+            financials = []
+        external_codes = [RKDFinancial[fin.name].value for fin in financials if fin in RKDFinancial]
         query, bind_params = JinjaSql(param_style="format").prepare_query(
             sql,
             {
@@ -249,7 +252,7 @@ class RKDStatementsDataloader(StatementsProtocol, Dataloader):
                 "from_date": from_date,
                 "to_date": to_date,
                 "period_type": period_type.value,
-                "external_codes": [RKDFinancial[fin.name].value for fin in financials or []],
+                "external_codes": external_codes,
             },
         )
         with connections["qa"].cursor() as cursor:
@@ -263,6 +266,10 @@ class RKDStatementsDataloader(StatementsProtocol, Dataloader):
                 # sometime we get None for the year. We default to the period end date year then
                 row["year"] = int(row["year"] or row["period_end_date"].year)
                 row["instrument_id"] = lookup[row["external_identifier"]]
+
                 if financials:
-                    row["financial"] = Financial[RKDFinancial(row["external_code"]).name].value
+                    try:
+                        row["financial"] = Financial[RKDFinancial(row["external_code"]).name].value
+                    except (ValueError, KeyError):
+                        continue
                 yield row

{wbfdm-1.54.23 → wbfdm-1.55.0}/wbfdm/factories/instruments.py

@@ -21,7 +21,7 @@ class InstrumentFactory(factory.django.DjangoModelFactory):
     instrument_type = factory.SubFactory(InstrumentTypeFactory)
     inception_date = factory.Faker("past_date")
     delisted_date = None
-    currency = factory.SubFactory("wbcore.contrib.currency.factories.CurrencyFactory")
+    currency = factory.SubFactory("wbcore.contrib.currency.factories.CurrencyUSDFactory")
     country = factory.SubFactory("wbcore.contrib.geography.factories.CountryFactory")
     exchange = factory.SubFactory("wbfdm.factories.exchanges.ExchangeFactory")
 
@@ -54,7 +54,7 @@ class InstrumentFactory(factory.django.DjangoModelFactory):
 
 class CashFactory(factory.django.DjangoModelFactory):
     is_cash = True
-    currency = factory.SubFactory("wbcore.contrib.currency.factories.CurrencyFactory")
+    currency = factory.SubFactory("wbcore.contrib.currency.factories.CurrencyUSDFactory")
     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]

{wbfdm-1.54.23 → wbfdm-1.55.0}/wbfdm/models/instruments/querysets.py

@@ -200,7 +200,7 @@ class InstrumentQuerySet(QuerySet):
         padded_from_date = from_date - timedelta(days=15)
         padded_to_date = to_date + timedelta(days=3)
         logger.info(
-            f"Loading returns from {from_date:%Y-%m-%d} (padded to {padded_from_date:%Y-%m-%d}) to {to_date:%Y-%m-%d} (padded to {padded_to_date:%Y-%m-%d})"
+            f"Loading returns from {from_date:%Y-%m-%d} (padded to {padded_from_date:%Y-%m-%d}) to {to_date:%Y-%m-%d} (padded to {padded_to_date:%Y-%m-%d}) for {self.count()} instruments"
         )
 
         if use_dl:
@@ -248,13 +248,12 @@ class InstrumentQuerySet(QuerySet):
                 (df.index <= pd.Timestamp(to_date)) & (df.index >= pd.Timestamp(from_date))
             ]  # ensure the returned df corresponds to requested date range
             prices_df = df["close"]
-
             if "fx_rate" in df.columns:
                 fx_rate_df = df["fx_rate"].fillna(1.0)
             else:
                 fx_rate_df = pd.DataFrame(np.ones(prices_df.shape), index=prices_df.index, columns=prices_df.columns)
             returns = prices_to_returns(fx_rate_df * prices_df, drop_inceptions_nan=False, fill_nan=True)
-            return {ts.date(): row for ts, row in prices_df.to_dict("index").items()}, returns.replace(
-                [np.inf, -np.inf, np.nan], 0
-            )
+            return {
+                ts.date(): row for ts, row in prices_df.replace([np.nan], None).to_dict("index").items()
+            }, returns.replace([np.inf, -np.inf, np.nan], 0)
         return {}, pd.DataFrame()