Simplify schema and error handling

core/exchanges/oanda.py

@@ -1,35 +1,16 @@
 from oandapyV20 import API
-from oandapyV20.endpoints import accounts, orders, positions, trades
-from pydantic import ValidationError
+from oandapyV20.endpoints import accounts, positions
 
 from core.exchanges import BaseExchange
-from core.lib.schemas import oanda_s
-
-OANDA_SCHEMA_MAPPING = {"OpenPositions": oanda_s.OpenPositions}
 
 
 class OANDAExchange(BaseExchange):
-    def call(self, method, request):
+    def call_method(self, request):
         self.client.request(request)
         response = request.response
         if isinstance(response, list):
             response = {"itemlist": response}
-        if method not in self.schema:
-            self.log.error(f"Method cannot be validated: {method}")
-            self.log.debug(f"Response: {response}")
-            return (False, f"Method cannot be validated: {method}")
-        try:
-            # Return a dict of the validated response
-            response_valid = self.schema[method](**response).dict()
-            # Convert the response to a format that we can use
-            response_converted = self.convert_spec(response_valid, method)
-            return (True, response_converted)
-        except ValidationError as e:
-            self.log.error(f"Could not validate response: {e}")
-            return (False, e)
-
-    def set_schema(self):
-        self.schema = OANDA_SCHEMA_MAPPING
+        return response
 
     def connect(self):
         self.client = API(access_token=self.account.api_secret)
@@ -51,9 +32,9 @@ class OANDAExchange(BaseExchange):
 
     def post_trade(self, trade):
         raise NotImplementedError
-        r = orders.OrderCreate(accountID, data=data)
-        self.client.request(r)
-        return r.response
+        # r = orders.OrderCreate(accountID, data=data)
+        # self.client.request(r)
+        # return r.response
 
     def get_trade(self, trade_id):
         r = accounts.TradeDetails(accountID=self.account_id, tradeID=trade_id)
@@ -62,11 +43,11 @@ class OANDAExchange(BaseExchange):
 
     def update_trade(self, trade):
         raise NotImplementedError
-        r = orders.OrderReplace(
-            accountID=self.account_id, orderID=trade.order_id, data=data
-        )
-        self.client.request(r)
-        return r.response
+        # r = orders.OrderReplace(
+        #     accountID=self.account_id, orderID=trade.order_id, data=data
+        # )
+        # self.client.request(r)
+        # return r.response
 
     def cancel_trade(self, trade_id):
         raise NotImplementedError
@@ -79,9 +60,7 @@ class OANDAExchange(BaseExchange):
     def get_all_positions(self):
         items = []
         r = positions.OpenPositions(accountID=self.account_id)
-        success, response = self.call("OpenPositions", r)
-        if not success:
-            return (success, response)
+        response = self.call(r)
 
         print("Positions", response)
         for item in response["itemlist"]:
@@ -89,4 +68,4 @@ class OANDAExchange(BaseExchange):
             item["account_id"] = self.account.id
             item["unrealized_pl"] = float(item["unrealized_pl"])
             items.append(item)
-        return (True, items)
+        return items