Fix broken from_dict methods (#206)

* from_dict should use camelCase in these instances

* update tests to reflect from_dict change

Co-authored-by: Darcy Linde <{[email protected]}>

Author: Darcy-Linde

polygon/rest/models/markets.py

@@ -53,14 +53,14 @@ class MarketStatus:
     @staticmethod
     def from_dict(d):
         return MarketStatus(
-            after_hours=d.get("after_hours", None),
+            after_hours=d.get("afterHours", None),
             currencies=None
             if "currencies" not in d
             else MarketCurrencies.from_dict(d["currencies"]),
-            early_hours=d.get("early_hours", None),
+            early_hours=d.get("earlyHours", None),
             exchanges=None
             if "exchanges" not in d
             else MarketExchanges.from_dict(d["exchanges"]),
             market=d.get("market", None),
-            server_time=d.get("server_time", None),
+            server_time=d.get("serverTime", None),
         )

polygon/rest/models/snapshot.py

@@ -47,16 +47,16 @@ def from_dict(d):
         return TickerSnapshot(
             day=None if "day" not in d else Agg.from_dict(d["day"]),
             last_quote=None
-            if "last_quote" not in d
-            else LastQuote.from_dict(d["last_quote"]),
+            if "lastQuote" not in d
+            else LastQuote.from_dict(d["lastQuote"]),
             last_trade=None
-            if "last_trade" not in d
-            else LastTrade.from_dict(d["last_trade"]),
+            if "lastTrade" not in d
+            else LastTrade.from_dict(d["lastTrade"]),
             min=None if "min" not in d else MinuteSnapshot.from_dict(d["min"]),
-            prev_day=None if "prev_day" not in d else Agg.from_dict(d["prev_day"]),
+            prev_day=None if "prevDay" not in d else Agg.from_dict(d["prevDay"]),
             ticker=d.get("ticker", None),
-            todays_change=d.get("todays_change", None),
-            todays_change_percent=d.get("todays_change_percent", None),
+            todays_change=d.get("todaysChange", None),
+            todays_change_percent=d.get("todaysChangePerc", None),
             updated=d.get("updated", None),
         )
 
@@ -207,8 +207,8 @@ def from_dict(d):
             asks=None
             if "asks" not in d
             else [OrderBookQuote.from_dict(o) for o in d["asks"]],
-            bid_count=d.get("bid_count", None),
-            ask_count=d.get("ask_count", None),
+            bid_count=d.get("bidCount", None),
+            ask_count=d.get("askCount", None),
             spread=d.get("spread", None),
             updated=d.get("updated", None),
         )

test_rest/test_markets.py

@@ -129,13 +129,13 @@ def test_get_market_holidays(self):
     def test_get_market_status(self):
         status = self.c.get_market_status()
         expected = MarketStatus(
-            after_hours=None,
+            after_hours=True,
             currencies=MarketCurrencies(crypto="open", fx="open"),
-            early_hours=None,
+            early_hours=False,
             exchanges=MarketExchanges(
                 nasdaq="extended-hours", nyse="extended-hours", otc="extended-hours"
             ),
             market="extended-hours",
-            server_time=None,
+            server_time="2022-04-28T16:48:08-04:00",
         )
         self.assertEqual(status, expected)

test_rest/test_snapshots.py

@@ -4,6 +4,8 @@
     SnapshotTickerFullBook,
     Agg,
     MinuteSnapshot,
+    LastQuote,
+    LastTrade,
     OrderBookQuote,
     UnderlyingAsset,
     LastQuoteOptionContractSnapshot,
@@ -29,8 +31,37 @@ def test_get_snapshot_all(self):
                     timestamp=None,
                     transactions=None,
                 ),
-                last_quote=None,
-                last_trade=None,
+                last_quote=LastQuote(
+                    ticker=None,
+                    trf_timestamp=None,
+                    sequence_number=None,
+                    sip_timestamp=1605192959994246100,
+                    participant_timestamp=None,
+                    ask_price=20.6,
+                    ask_size=22,
+                    ask_exchange=None,
+                    conditions=None,
+                    indicators=None,
+                    bid_price=20.5,
+                    bid_size=13,
+                    bid_exchange=None,
+                    tape=None,
+                ),
+                last_trade=LastTrade(
+                    ticker=None,
+                    trf_timestamp=None,
+                    sequence_number=None,
+                    sip_timestamp=1605192894630916600,
+                    participant_timestamp=None,
+                    conditions=[14, 41],
+                    correction=None,
+                    id="71675577320245",
+                    price=20.506,
+                    trf_id=None,
+                    size=2416,
+                    exchange=4,
+                    tape=None,
+                ),
                 min=MinuteSnapshot(
                     accumulated_volume=37216,
                     open=20.506,
@@ -40,10 +71,19 @@ def test_get_snapshot_all(self):
                     volume=5000,
                     vwap=20.5105,
                 ),
-                prev_day=None,
+                prev_day=Agg(
+                    open=20.79,
+                    high=21,
+                    low=20.5,
+                    close=20.63,
+                    volume=292738,
+                    vwap=20.6939,
+                    timestamp=None,
+                    transactions=None,
+                ),
                 ticker="BCAT",
-                todays_change=None,
-                todays_change_percent=None,
+                todays_change=-0.124,
+                todays_change_percent=-0.601,
                 updated=1605192894630916600,
             )
         ]
@@ -62,8 +102,37 @@ def test_get_snapshot_ticker(self):
                 timestamp=None,
                 transactions=None,
             ),
-            last_quote=None,
-            last_trade=None,
+            last_quote=LastQuote(
+                ticker=None,
+                trf_timestamp=None,
+                sequence_number=None,
+                sip_timestamp=1651251948407646487,
+                participant_timestamp=None,
+                ask_price=159.99,
+                ask_size=5,
+                ask_exchange=None,
+                conditions=None,
+                indicators=None,
+                bid_price=159.98,
+                bid_size=3,
+                bid_exchange=None,
+                tape=None,
+            ),
+            last_trade=LastTrade(
+                ticker=None,
+                trf_timestamp=None,
+                sequence_number=None,
+                sip_timestamp=1651251948294080343,
+                participant_timestamp=None,
+                conditions=None,
+                correction=None,
+                id="121351",
+                price=159.99,
+                trf_id=None,
+                size=200,
+                exchange=12,
+                tape=None,
+            ),
             min=MinuteSnapshot(
                 accumulated_volume=68834255,
                 open=160.71,
@@ -73,10 +142,19 @@ def test_get_snapshot_ticker(self):
                 volume=197226,
                 vwap=160.5259,
             ),
-            prev_day=None,
+            prev_day=Agg(
+                open=159.25,
+                high=164.515,
+                low=158.93,
+                close=163.64,
+                volume=130149192,
+                vwap=161.8622,
+                timestamp=None,
+                transactions=None,
+            ),
             ticker="AAPL",
-            todays_change=None,
-            todays_change_percent=None,
+            todays_change=-3.65,
+            todays_change_percent=-2.231,
             updated=1651251948294080343,
         )
         self.assertEqual(snapshots, expected)
@@ -146,8 +224,8 @@ def test_get_snapshot_crypto_book(self):
                 OrderBookQuote(price=11454, exchange_shares={"2": 1}),
                 OrderBookQuote(price=11455, exchange_shares={"2": 1}),
             ],
-            bid_count=None,
-            ask_count=None,
+            bid_count=694.951789670001,
+            ask_count=593.1412981600005,
             spread=-4849.17,
             updated=1605295074162,
         )