wbfdm 1.55.3__py2.py3-none-any.whl → 1.55.5__py2.py3-none-any.whl

wbfdm/contrib/qa/dataloaders/fx_rates.py

@@ -32,7 +32,11 @@ class DatastreamFXRatesDataloader(FXRateProtocol, Dataloader):
             .join(fx_code)
             .on(fx_rate.ExRateIntCode == fx_code.ExRateIntCode)
             .where((fx_rate.ExRateDate >= from_date) & (fx_rate.ExRateDate <= to_date + timedelta(days=1)))
-            .where((fx_code.ToCurrCode == target_currency) & fx_code.FromCurrCode.isin(currencies))
+            .where(
+                (fx_code.ToCurrCode == target_currency)
+                & (fx_code.FromCurrCode.isin(currencies))
+                & (fx_code.RateTypeCode == "SPOT")
+            )
             .orderby(fx_rate.ExRateDate, order=Order.desc)
             .select(
                 fn.Cast(fx_rate.ExRateDate, SqlTypes.DATE).as_("fx_date"),

wbfdm/contrib/qa/dataloaders/market_data.py

@@ -170,7 +170,10 @@ class DatastreamMarketDataDataloader(MarketDataProtocol, Dataloader):
                     row["outstanding_shares"] = (row["market_capitalization"] / row["close"]) if row["close"] else None
                 if target_currency:
                     try:
-                        fx_rate = fx_rates[f'{row["currency"]}{target_currency}'][row["valuation_date"]] or 1.0
+                        if target_currency == row["currency"]:
+                            fx_rate = 1.0
+                        else:
+                            fx_rate = fx_rates[f'{row["currency"]}{target_currency}'][row["valuation_date"]] or 1.0
                         if apply_fx_rate:
                             for e in MarketData:
                                 if e != MarketData.SHARES_OUTSTANDING and e.value in row and row[e.value]:

{wbfdm-1.55.3.dist-info → wbfdm-1.55.5.dist-info}/METADATA

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

@@ -100,8 +100,8 @@ wbfdm/contrib/qa/dataloaders/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 wbfdm/contrib/qa/dataloaders/adjustments.py,sha256=DQEexOLA7WyBB1dZJHQd-6zbzyEIURgSSgS7bJRvXzQ,2980
 wbfdm/contrib/qa/dataloaders/corporate_actions.py,sha256=lWT6klrTXKqxiko2HGrxHH8E2C00FJS-AOX3IhglRrI,2912
 wbfdm/contrib/qa/dataloaders/financials.py,sha256=xUHpvhUkvmdPL_RyWCrs7XgChgTklX5qemmaXMedgkY,3475
-wbfdm/contrib/qa/dataloaders/fx_rates.py,sha256=d4zvIWZuCbLtDE1TaAbBmvySc6uUD0OCzpOO8Iz7pfM,1886
-wbfdm/contrib/qa/dataloaders/market_data.py,sha256=lEekvs7dcTa46C-2yGbpLw03PtrSjuZYYRDBQUr1SG4,7863
+wbfdm/contrib/qa/dataloaders/fx_rates.py,sha256=IYkUV8_8Vmvm4_K9xJpz7VaTgjQUz0y4pb3KyaoiqCM,1985
+wbfdm/contrib/qa/dataloaders/market_data.py,sha256=-HvEcJr-D37uWomnCegrhjDAsyxJsEKUayUAIlqjm24,8002
 wbfdm/contrib/qa/dataloaders/officers.py,sha256=vytlQJJxmn4Y5HfNh5mHJAvuIrrsQSkNO-sONyhxftY,2940
 wbfdm/contrib/qa/dataloaders/reporting_dates.py,sha256=q25ccB0pbGfLJLV1A1_AY1XYWJ_Fa10egY09L1J-C5A,2628
 wbfdm/contrib/qa/dataloaders/statements.py,sha256=6k8dDwJPLY6XE3G5ZA03_4wRvT7XduRsro4lzuAWCvM,10337
@@ -362,6 +362,6 @@ wbfdm/viewsets/statements/__init__.py,sha256=odxtFYUDICPmz8WCE3nx93EvKZLSPBEI4d7
 wbfdm/viewsets/statements/statements.py,sha256=gA6RCI8-B__JwjEb6OZxpn8Y-9aF-YQ3HIQ7e1vfJMw,4304
 wbfdm/viewsets/technical_analysis/__init__.py,sha256=qtCIBg0uSiZeJq_1tEQFilnorMBkMe6uCMfqar6-cLE,77
 wbfdm/viewsets/technical_analysis/monthly_performances.py,sha256=O1j8CGfOranL74LqVvcf7jERaDIboEJZiBf_AbbVDQ8,3974
-wbfdm-1.55.3.dist-info/METADATA,sha256=sKPjJCGm_R5FKQxuIyr_0tg1YDGGncg4eo6kpCUvJF4,768
-wbfdm-1.55.3.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-wbfdm-1.55.3.dist-info/RECORD,,
+wbfdm-1.55.5.dist-info/METADATA,sha256=eiRCemxe43h8H6U7eMbN_WF4jL5xJc8Wl-VzFxabwI0,768
+wbfdm-1.55.5.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
+wbfdm-1.55.5.dist-info/RECORD,,