From 5b2bb2fd692b36b1b9c29402cd116d7220df0d20 Mon Sep 17 00:00:00 2001 From: Sourcery AI <> Date: Mon, 14 Mar 2022 20:02:34 +0000 Subject: [PATCH] 'Refactored by Sourcery' --- looptrader/basetypes/Broker/tdaBroker.py | 32 +++++++------------ .../Strategy/singlebydeltastrategy.py | 5 +-- .../Strategy/spreadsbydeltastrategy.py | 24 ++++---------- 3 files changed, 21 insertions(+), 40 deletions(-) diff --git a/looptrader/basetypes/Broker/tdaBroker.py b/looptrader/basetypes/Broker/tdaBroker.py index 72d08cc..5c202b1 100644 --- a/looptrader/basetypes/Broker/tdaBroker.py +++ b/looptrader/basetypes/Broker/tdaBroker.py @@ -100,10 +100,9 @@ def get_account( ) except Exception: logger.exception( - "Failed to get Account {}. Attempt #{}".format( - self.account_number, attempt - ) + f"Failed to get Account {self.account_number}. Attempt #{attempt}" ) + if attempt == self.maxretries - 1: return None @@ -128,9 +127,7 @@ def get_order( account=self.account_number, order_id=str(request.orderid) ) except Exception: - logger.exception( - "Failed to read order {}.".format(str(request.orderid)) - ) + logger.exception(f"Failed to read order {str(request.orderid)}.") if attempt == self.maxretries - 1: return None @@ -161,7 +158,7 @@ def get_option_chain( optionchainobj.query_parameters = optionchainrequest if not optionchainobj.validate_chain(): - logger.exception("Chain Validation Failed. {}".format(optionchainobj)) + logger.exception(f"Chain Validation Failed. {optionchainobj}") return None for attempt in range(self.maxretries): @@ -172,9 +169,7 @@ def get_option_chain( raise BaseException("Option Chain Status Response = FAILED") except Exception: - logger.exception( - "Failed to get Options Chain. Attempt #{}".format(attempt) - ) + logger.exception(f"Failed to get Options Chain. Attempt #{attempt}") if attempt == self.maxretries - 1: return None @@ -206,9 +201,7 @@ def get_quote( quotes = self.getsession().get_quotes(request.instruments) break except Exception: - logger.exception( - "Failed to get quotes. Attempt #{}".format(attempt), - ) + logger.exception(f"Failed to get quotes. Attempt #{attempt}") if attempt == self.maxretries - 1: return None @@ -252,10 +245,9 @@ def get_market_hours( break except Exception: logger.exception( - "Failed to get market hours for {} on {}. Attempt #{}".format( - markets, request.datetime, attempt - ), + f"Failed to get market hours for {markets} on {request.datetime}. Attempt #{attempt}" ) + if attempt == self.maxretries - 1: return None @@ -423,14 +415,14 @@ def place_order( response = baseRR.PlaceOrderResponseMessage() # Log the Order - logger.info("Your order being placed is: {} ".format(orderrequest)) + logger.info(f"Your order being placed is: {orderrequest} ") # Place the Order try: orderresponse = self.getsession().place_order( account=self.account_number, order=orderrequest ) - logger.info("Order {} Placed".format(orderresponse["order_id"])) + logger.info(f'Order {orderresponse["order_id"]} Placed') except Exception: logger.exception("Failed to place order.") return None @@ -468,7 +460,7 @@ def cancel_order( order_id=str(request.orderid), ) except Exception: - logger.exception("Failed to cancel order {}.".format(str(request.orderid))) + logger.exception(f"Failed to cancel order {str(request.orderid)}.") return None response = baseRR.CancelOrderResponseMessage() @@ -727,7 +719,7 @@ def translate_account_position_instrument( if strike_match is not None: accountposition.strikeprice = float(strike_match.group()) elif accountposition.assettype == "OPTION": - logger.error("No strike price found for {}".format(symbol)) + logger.error(f"No strike price found for {symbol}") # Map the other fields accountposition.description = instrument.get("description", str) diff --git a/looptrader/basetypes/Strategy/singlebydeltastrategy.py b/looptrader/basetypes/Strategy/singlebydeltastrategy.py index 289a4d4..14476c0 100644 --- a/looptrader/basetypes/Strategy/singlebydeltastrategy.py +++ b/looptrader/basetypes/Strategy/singlebydeltastrategy.py @@ -492,8 +492,9 @@ def build_leg( def cancel_order(self, order_id: int): # Build Request cancelorderrequest = baseRR.CancelOrderRequestMessage( - self.strategy_id, int(order_id) + self.strategy_id, order_id ) + # Send Request self.mediator.cancel_order(cancelorderrequest) @@ -773,7 +774,7 @@ def get_best_strike_and_quantity( # Set Variables best_strike = None best_premium = float(0) - best_quantity = int(0) + best_quantity = 0 # Calculate Risk Free Rate risk_free_rate = helpers.get_risk_free_rate() diff --git a/looptrader/basetypes/Strategy/spreadsbydeltastrategy.py b/looptrader/basetypes/Strategy/spreadsbydeltastrategy.py index 2aaec46..a47b26b 100644 --- a/looptrader/basetypes/Strategy/spreadsbydeltastrategy.py +++ b/looptrader/basetypes/Strategy/spreadsbydeltastrategy.py @@ -61,7 +61,7 @@ def process_strategy(self): # Check if should be sleeping if now < self.sleepuntil: - logger.debug("Markets Closed. Sleeping until {}".format(self.sleepuntil)) + logger.debug(f"Markets Closed. Sleeping until {self.sleepuntil}") return # Check market hours @@ -75,10 +75,9 @@ def process_strategy(self): if hours.start.day != now.day: self.sleepuntil = hours.end - dt.timedelta(minutes=10) logger.info( - "Markets are closed until {}. Sleeping until {}".format( - hours.start, self.sleepuntil - ) + f"Markets are closed until {hours.start}. Sleeping until {self.sleepuntil}" ) + return # If Pre-Market @@ -108,10 +107,7 @@ def process_pre_market(self): ) logger.info( - "Markets are closed until {}. Sleeping until {}".format( - nextmarketsession.start, - self.sleepuntil, - ) + f"Markets are closed until {nextmarketsession.start}. Sleeping until {self.sleepuntil}" ) def process_open_market(self): @@ -485,18 +481,10 @@ def calculate_order_quantity( # Log Values logger.info( - "Short Strike: {} Long Strike: {} BuyingPower: {} LiquidationValue: {} MaxLoss: {} BalanceToRisk: {} RemainingBalance: {} TradeSize: {} ".format( - shortstrike, - longstrike, - account_balance.buyingpower, - account_balance.liquidationvalue, - max_loss, - balance_to_risk, - remainingbalance, - trade_size, - ) + f"Short Strike: {shortstrike} Long Strike: {longstrike} BuyingPower: {account_balance.buyingpower} LiquidationValue: {account_balance.liquidationvalue} MaxLoss: {max_loss} BalanceToRisk: {balance_to_risk} RemainingBalance: {remainingbalance} TradeSize: {trade_size} " ) + # Return quantity return int(trade_size)