refactor: orderstatus to args

fix: dacite conversion to dataclass in websocket classes

Author: Insmael

cryptomarket/args.py

@@ -52,6 +52,15 @@ class Side(Checker):
     SELL = 'sell'
 
 
+class OrderStatus(Checker):
+    NEW = 'new'
+    SUSPENDED = 'suspended'
+    PARTIALLY_FILLED = 'partiallyFilled'
+    FILLED = 'filled'
+    CANCELED = 'canceled'
+    EXPIRED = 'expired'
+
+
 class OrderType(Checker):
     LIMIT = 'limit'
     MARKET = 'market'

cryptomarket/dataclasses/order.py

@@ -2,19 +2,10 @@
 from enum import Enum
 from typing import List, Optional
 
-from cryptomarket.args import ContingencyType, OrderType, Side, TimeInForce
+from cryptomarket.args import ContingencyType, OrderStatus, OrderType, Side, TimeInForce
 from cryptomarket.dataclasses.tradeOfOrder import TradeOfOrder
 
 
-class OrderStatus(str, Enum):
-    NEW = 'new'
-    SUSPENDED = 'suspended'
-    PARTIALLY_FILLED = 'partiallyFilled'
-    FILLED = 'filled'
-    CANCELED = 'canceled'
-    EXPIRED = 'expired'
-
-
 @dataclass
 class Order:
     id: int

cryptomarket/dataclasses/report.py

@@ -27,7 +27,7 @@ class Report:
     type: OrderType
     time_in_force: TimeInForce
     quantity: str
-    cum_quantity: str
+    quantity_cumulative: str
     post_only: bool
     created_at: str
     updated_at: str

cryptomarket/websockets/client_base.py

@@ -114,7 +114,8 @@ def _handle_response(self, response):
 
         if 'error' in response:
             callback(CryptomarketAPIException.from_dict(response), None)
-        elif 'result' in response:
+            return
+        if 'result' in response:
             result = response['result']
             if type(result) == dict and 'data' in result:
                 callback(None, result['data'])

cryptomarket/websockets/trading_client.py

@@ -1,6 +1,7 @@
+from enum import Enum
 from typing import Callable, List, Optional, Union
 
-from dacite import from_dict
+from dacite import Config, DaciteError, from_dict
 from typing_extensions import Literal
 
 import cryptomarket.args as args
@@ -220,7 +221,8 @@ def intercept_response(err, response):
                 if err:
                     callback(err, None)
                     return
-                callback(None, from_dict(data_class=Report, data=response))
+                callback(None, from_dict(data_class=Report,
+                         data=response, config=Config(cast=[Enum])))
         else:
             intercept_response = None
         self._send_by_id(
@@ -285,7 +287,7 @@ def intercept_response(err, response):
                 if err:
                     callback(err, None)
                     return
-                reports = [from_dict(data_class=Report, data=report)
+                reports = [from_dict(data_class=Report, data=report, config=Config(cast=[Enum]))
                            for report in response]
                 callback(None, reports)
         else:
@@ -313,7 +315,8 @@ def intercept_result(err, response):
                 if err:
                     callback(err, None)
                     return
-                callback(None, from_dict(data_class=Report, data=response))
+                callback(None, from_dict(data_class=Report,
+                         data=response, config=Config(cast=[Enum])))
         else:
             intercept_result = None
         self._send_by_id('spot_cancel_order',
@@ -347,7 +350,8 @@ def intercept_result(err, response):
                 if err:
                     callback(err, None)
                     return
-                callback(None, from_dict(data_class=Report, data=response))
+                callback(None, from_dict(data_class=Report,
+                         data=response, config=Config(cast=[Enum])))
         else:
             intercept_result = None
         self._send_by_id('spot_replace_order',
@@ -369,7 +373,7 @@ def intercept_result(err, response):
                 if err:
                     callback(err, None)
                     return
-                reports = [from_dict(data_class=Report, data=report)
+                reports = [from_dict(data_class=Report, data=report, config=Config(cast=[Enum]))
                            for report in response]
                 callback(None, reports)
         else:

cryptomarket/websockets/wallet_client.py

@@ -1,6 +1,7 @@
+from enum import Enum
 from typing import Callable, List, Optional, Union
 
-from dacite import from_dict
+from dacite import Config, from_dict
 from typing_extensions import Literal
 
 import cryptomarket.args as args
@@ -67,7 +68,8 @@ def subscribe_to_transactions(
         :param result_callback: A callable of two arguments, takes either a CryptomarketAPIException, or the result of the subscription. True if successful
         """
         def intercept_feed(feed, feed_type):
-            callback(from_dict(data_class=Transaction, data=feed))
+            callback(from_dict(data_class=Transaction,
+                     data=feed, config=Config(cast=[Enum])))
         self._send_subscription(
             'subscribe_transactions', callback=intercept_feed, result_callback=result_callback)
 
@@ -233,7 +235,7 @@ def intercept_response(err, response):
             if err is not None:
                 callback(err, None)
                 return
-            transactions = [from_dict(data_class=Transaction, data=transaction)
+            transactions = [from_dict(data_class=Transaction, data=transaction, config=Config(cast=[Enum]))
                             for transaction in response]
             callback(None, transactions)
         self._send_by_id(