Merge branch 'master' into fix/remove-3.8

Author: justinpolygon

polygon/modelclass.py

@@ -2,16 +2,16 @@
 import typing
 from dataclasses import dataclass
 
-
 _T = typing.TypeVar("_T")
 
 
 def modelclass(cls: typing.Type[_T]) -> typing.Type[_T]:
     cls = dataclass(cls)
+    type_hints = typing.get_type_hints(cls)
     attributes = [
         a
-        for a in cls.__dict__["__annotations__"].keys()
-        if not a.startswith("__") and not inspect.isroutine(a)
+        for a in type_hints.keys()
+        if not a.startswith("__") and not inspect.isroutine(getattr(cls, a, None))
     ]
 
     def init(self, *args, **kwargs):

polygon/websocket/models/__init__.py

@@ -42,6 +42,30 @@ def from_dict(cls, data: Dict[str, Any]) -> "FromDictProtocol":
         "T": FuturesTrade,
         "Q": FuturesQuote,
     },
+    Market.FuturesCME: {
+        "A": FuturesAgg,
+        "AM": FuturesAgg,
+        "T": FuturesTrade,
+        "Q": FuturesQuote,
+    },
+    Market.FuturesCBOT: {
+        "A": FuturesAgg,
+        "AM": FuturesAgg,
+        "T": FuturesTrade,
+        "Q": FuturesQuote,
+    },
+    Market.FuturesNYMEX: {
+        "A": FuturesAgg,
+        "AM": FuturesAgg,
+        "T": FuturesTrade,
+        "Q": FuturesQuote,
+    },
+    Market.FuturesCOMEX: {
+        "A": FuturesAgg,
+        "AM": FuturesAgg,
+        "T": FuturesTrade,
+        "Q": FuturesQuote,
+    },
     Market.Crypto: {
         "XA": CurrencyAgg,
         "XAS": CurrencyAgg,

polygon/websocket/models/common.py

@@ -28,7 +28,11 @@ class Market(Enum):
     Forex = "forex"
     Crypto = "crypto"
     Indices = "indices"
-    Futures = "futures"
+    Futures = "futures"  # CME, CBOT, NYMEX, and COMEX
+    FuturesCME = "futures/cme"
+    FuturesCBOT = "futures/cbot"
+    FuturesNYMEX = "futures/nymex"
+    FuturesCOMEX = "futures/comex"
 
 
 class EventType(Enum):