black + isort

Author: mm0

.github/workflows/black.yml

@@ -0,0 +1,15 @@
+name: Lint Source Code
+on: [pull_request]
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Source Code
+        uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+      - name: Lint
+        uses: psf/black@stable
+        with:
+          black_args: "./ally --check"
+

.gitignore

@@ -17,3 +17,4 @@ pyally.egg-info/
 pyally.egg-info/*
 venv/
 sphinx/_build/
+.mypy_cache

ally/Account/__init__.py

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from .holdings	import holdings
-from .balances	import balances
-from .history	import history
-from .accounts	import accounts
+from .accounts import accounts
+from .balances import balances
+from .history import history
+from .holdings import holdings

ally/Account/accounts.py

@@ -20,78 +20,59 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from ..Api		import AccountEndpoint, RequestType
-from .utils		import _dot_flatten
+from .utils import _dot_flatten
+from ..Api import AccountEndpoint, RequestType
 
 
+class Accounts(AccountEndpoint):
+    _type = RequestType.Info
+    _resource = "accounts.json"
 
-class Accounts ( AccountEndpoint ):
-	_type		= RequestType.Info
-	_resource	= 'accounts.json'
+    def extract(self, response):
+        """Extract certain fields from response"""
+        response = response.json()["response"]
+        accounts = response["accounts"]
 
+        d = {k: v for k, v in _dot_flatten(accounts).items()}
+        return d
 
+    @staticmethod
+    def DataFrame(raw):
+        import pandas as pd
 
+        # Wrap these in lists so that they can be read by pandas
+        raw = {k: [v] for k, v in raw.items()}
 
-	def extract ( self, response ):
-		"""Extract certain fields from response
-		"""
-		response = response.json()['response']
-		accounts = response['accounts']
+        return pd.DataFrame.from_dict(raw)
 
-		d = {
-			k: v
-			for k,v in _dot_flatten( accounts ).items()
-		}
-		return d
 
+def accounts(self, dataframe: bool = True, block: bool = True):
+    """Gets list of available accounts, and some basic metrics for each one.
 
-	@staticmethod
-	def DataFrame ( raw ):
-		import pandas as pd
+    Calls the 'accounts.json' endpoint to get the current list of accounts.
+    This includes account number, cash account balances, and P/L.
 
-		# Wrap these in lists so that they can be read by pandas
-		raw = { k: [v] for k,v in raw.items() }
+    Args:
 
-		return pd.DataFrame.from_dict ( raw )
+            dataframe: Specify an output format
+            block: Specify whether to block thread if request exceeds rate limit
 
 
+    Returns:
 
+            A pandas dataframe by default,
+                    otherwise a flat dictionary.
 
+    Raises:
 
+            RateLimitException: If block=False, rate limit problems will be raised
+    """
+    result = Accounts(auth=self.auth, block=block).request()
 
+    if dataframe:
+        try:
+            result = Accounts.DataFrame(result)
+        except:
+            pass
 
-def accounts ( self, dataframe: bool = True, block: bool = True ):
-	"""Gets list of available accounts, and some basic metrics for each one.
-
-	Calls the 'accounts.json' endpoint to get the current list of accounts.
-	This includes account number, cash account balances, and P/L.
-
-	Args:
-
-		dataframe: Specify an output format
-		block: Specify whether to block thread if request exceeds rate limit
-
-
-	Returns:
-
-		A pandas dataframe by default,
-			otherwise a flat dictionary.
-
-	Raises:
-
-		RateLimitException: If block=False, rate limit problems will be raised
-	"""
-	result = Accounts(
-		auth = self.auth,
-		block = block
-	).request()
-
-
-	if dataframe:
-		try:
-			result = Accounts.DataFrame ( result )
-		except:
-			pass
-
-	return result
-
+    return result

ally/Account/balances.py

@@ -20,79 +20,61 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from ..Api		import AccountEndpoint, RequestType
-from .utils		import _dot_flatten
+from .utils import _dot_flatten
+from ..Api import AccountEndpoint, RequestType
 
 
+class Balances(AccountEndpoint):
+    _type = RequestType.Info
+    _resource = "accounts/{0}/balances.json"
 
-class Balances ( AccountEndpoint ):
-	_type		= RequestType.Info
-	_resource	= 'accounts/{0}/balances.json'
+    def extract(self, response):
+        """Extract certain fields from response"""
+        response = response.json()["response"]
+        balances = response["accountbalance"]
 
+        d = {k: v for k, v in _dot_flatten(balances).items()}
+        return d
 
+    @staticmethod
+    def DataFrame(raw):
+        import pandas as pd
 
+        # Wrap these in lists so that they can be read by pandas
+        raw = {k: [v] for k, v in raw.items()}
 
-	def extract ( self, response ):
-		"""Extract certain fields from response
-		"""
-		response = response.json()['response']
-		balances = response['accountbalance']
+        return pd.DataFrame.from_dict(raw)
 
-		d = {
-			k: v
-			for k,v in _dot_flatten( balances ).items()
-		}
-		return d
 
+def balances(self, dataframe: bool = True, block: bool = True):
+    """Gets current cash and various account metrics.
 
-	@staticmethod
-	def DataFrame ( raw ):
-		import pandas as pd
+    Calls the 'accounts/./balances.json' endpoint to get the current list of balances.
+    This includes margin amounts, cash, etc.
 
-		# Wrap these in lists so that they can be read by pandas
-		raw = { k: [v] for k,v in raw.items() }
+    Args:
 
-		return pd.DataFrame.from_dict ( raw )
+            dataframe: Specify an output format
+            block: Specify whether to block thread if request exceeds rate limit
 
 
+    Returns:
 
+            A pandas dataframe with 1 row by default,
+                    otherwise a flat dictionary.
 
+    Raises:
 
+            RateLimitException: If block=False, rate limit problems will be raised
+    """
+    result = Balances(
+        auth=self.auth, account_nbr=self.account_nbr, block=block
+    ).request()
 
+    if dataframe:
+        try:
+            result = Balances.DataFrame(result)
+        except:
+            pass
 
-def balances ( self, dataframe: bool = True, block: bool = True ):
-	"""Gets current cash and various account metrics.
-
-	Calls the 'accounts/./balances.json' endpoint to get the current list of balances.
-	This includes margin amounts, cash, etc.
-
-	Args:
-
-		dataframe: Specify an output format
-		block: Specify whether to block thread if request exceeds rate limit
-
-
-	Returns:
-
-		A pandas dataframe with 1 row by default,
-			otherwise a flat dictionary.
-
-	Raises:
-
-		RateLimitException: If block=False, rate limit problems will be raised
-	"""
-	result = Balances(
-		auth = self.auth,
-		account_nbr = self.account_nbr,
-		block = block
-	).request()
-
-
-	if dataframe:
-		try:
-			result = Balances.DataFrame ( result )
-		except:
-			pass
-
-	return result
-
+    return result