minor bot update, update tests

Author: sgerodes

src/three_commas/model/generated_models.py

@@ -9,12 +9,8 @@ class IndexEntity(ThreeCommasModel):
     total: int
     page: int
 
-    def parsed(self, parsed: bool) -> IndexEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
@@ -31,12 +27,8 @@ class MarketplaceBotEntity(ThreeCommasModel):
     copies: int
     is_favorite: bool
 
-    def parsed(self, parsed: bool) -> MarketplaceBotEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
@@ -46,12 +38,8 @@ class MarketplaceItem(ThreeCommasModel):
     name: str
     icon_url: str
 
-    def parsed(self, parsed: bool) -> MarketplaceItem:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
@@ -61,38 +49,26 @@ class Profit(ThreeCommasModel):
     amount: float
     chart_data: list
 
-    def parsed(self, parsed: bool) -> Profit:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
 
 class PongEntity(ThreeCommasModel):
     pong: str
 
-    def parsed(self, parsed: bool) -> PongEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
 
 class TimeEntity(ThreeCommasModel):
     server_time: int
 
-    def parsed(self, parsed: bool) -> TimeEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
@@ -150,9 +126,6 @@ class BotEntity(ThreeCommasModel):
     start_order_type: str
     active_deals_usd_profit: Union[str, float]
 
-    def parsed(self, parsed: bool) -> BotEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
         'created_at': DatetimeParser,
         'updated_at': DatetimeParser,
@@ -170,7 +143,6 @@ def parsed(self, parsed: bool) -> BotEntity:
         'finished_deals_count': IntParser,
         'active_deals_usd_profit': FloatParser,
     }
-
     _name_proxy = {
         'deletable': 'deletable?',
     }
@@ -230,9 +202,6 @@ class AccountEntity(ThreeCommasModel):
     market_code: str
     address: str
 
-    def parsed(self, parsed: bool) -> AccountEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
         'created_at': DatetimeParser,
         'updated_at': DatetimeParser,
@@ -249,7 +218,6 @@ def parsed(self, parsed: bool) -> AccountEntity:
         'total_btc_profit': FloatParser,
         'total_usd_profit': FloatParser,
     }
-
     _name_proxy = {
     }
 
@@ -283,12 +251,8 @@ class GridBotEntity(ThreeCommasModel):
     investment_quote_currency: str
     grid_lines: None
 
-    def parsed(self, parsed: bool) -> GridBotEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
@@ -298,12 +262,8 @@ class GridLineEntity(ThreeCommasModel):
     side: str
     order_placed: bool
 
-    def parsed(self, parsed: bool) -> GridLineEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
@@ -314,12 +274,8 @@ class GridBotProfitsEntity(ThreeCommasModel):
     usd_profit: str
     created_at: str
 
-    def parsed(self, parsed: bool) -> GridBotProfitsEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
@@ -398,9 +354,6 @@ class DealEntity(ThreeCommasModel):
     reserved_quote_funds: Union[float, float]
     reserved_base_funds: float
 
-    def parsed(self, parsed: bool) -> DealEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
         'created_at': DatetimeParser,
         'updated_at': DatetimeParser,
@@ -434,7 +387,6 @@ def parsed(self, parsed: bool) -> DealEntity:
         'trailing_max_price': FloatParser,
         'reserved_quote_funds': FloatParser,
     }
-
     _name_proxy = {
         'finished': 'finished?',
         'cancellable': 'cancellable?',
@@ -460,12 +412,8 @@ class SmartTradeV2Entity(ThreeCommasModel):
     margin: dict
     is_position_not_filled: bool
 
-    def parsed(self, parsed: bool) -> SmartTradeV2Entity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
@@ -488,12 +436,8 @@ class TakeProfitStep(ThreeCommasModel):
     margin: dict
     is_position_not_filled: bool
 
-    def parsed(self, parsed: bool) -> TakeProfitStep:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
@@ -510,12 +454,8 @@ class BotDealsStatsEntity(ThreeCommasModel):
     active_deals_usd_profit: str
     active_deals_btc_profit: str
 
-    def parsed(self, parsed: bool) -> BotDealsStatsEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 
@@ -529,12 +469,8 @@ class LooseAccountEntity(ThreeCommasModel):
     is_deleted: bool
     is_locked: bool
 
-    def parsed(self, parsed: bool) -> LooseAccountEntity:
-        return ParsedProxy(model=self, parsed=parsed)
-
     _parse_map = {
     }
-
     _name_proxy = {
     }
 

src/three_commas/model/models.py

@@ -125,21 +125,15 @@ def wrapper(*args, parsed: bool = True, **kwargs):
 
 
 class ThreeCommasDict(dict):
-    def __init__(self, d: dict = None):
-        if d is None:
+    def __init__(self, *args, **kwargs):
+        if not args and not kwargs or (args and args[0] is None):
             return
-        super().__init__(d)
-
-    @classmethod
-    def of(cls, d: dict) -> Union[None, cls]:
-        if d is None:
-            return None
-        return cls(d)
+        super().__init__(*args, **kwargs)
 
     @classmethod
     def of_list(cls, list_of_d: List[dict]) -> List[cls]:
         if list_of_d is None:
-            return None
+            return list()
         return [cls(d) for d in list_of_d]
 
     def __repr__(self):
@@ -176,6 +170,11 @@ def __setattr__(self, name, value):
         else:
             self[name] = value
 
+    TP = TypeVar('TP')
+
+    def parsed(self: TP, parsed: bool) -> TP:
+        return ParsedProxy(model=self, parsed=parsed)
+
 
 class ParsedProxy:
     MODEL_KEY = '_model'