V1.0.1 (#32)

* update readme

* refactoring

Author: TexasCoding

README.md

@@ -48,8 +48,7 @@ def activity(self, activity_type: str, date: str = None, until_date: str = None)
             "until_date": until_date if until_date else None,
         }
 
-        request = Requests().get(url=url, headers=self.headers, params=params)
-        response = json.loads(request.text)
+        response = json.loads(Requests().get(url=url, headers=self.headers, params=params).text)
 
         activity_df = pd.DataFrame()
         activity_df.assign(
@@ -117,12 +116,8 @@ def get(self) -> AccountClass:
             Example:
                 >>> account = account.get()
         """
-        # Alpaca API URL for account information
         url = f"{self.trade_url}/account"
-        # Get request to Alpaca API for account information
-        request = Requests().get(url=url, headers=self.headers)
-        response = json.loads(request.text)
-
+        response = json.loads(Requests().get(url=url, headers=self.headers).text)
         return account_class_from_dict(response)
 
     ########################################################
@@ -156,8 +151,7 @@ def portfolio_history(
             "intraday_reporting": intraday_reporting,
         }
 
-        request = Requests().get(url=url, headers=self.headers, params=params)
-        response = json.loads(request.text)
+        response = json.loads(Requests().get(url=url, headers=self.headers, params=params).text)
 
         portfolio_df = pd.DataFrame(
             response,

py_alpaca_api/src/account.py

@@ -50,14 +50,11 @@ def get_all(
             "exchange": exchange,
         }
 
-        request = Requests().get(url, headers=self.headers, params=params)
+        assets_df = pd.json_normalize(json.loads(Requests().get(url, headers=self.headers, params=params).text))
 
-        assets_df = pd.json_normalize(json.loads(request.text))
-
-        assets_df = assets_df[assets_df["status"] == "active"]
-        assets_df = assets_df[assets_df["fractionable"]]
-        assets_df = assets_df[assets_df["tradable"]]
-        assets_df = assets_df[assets_df["exchange"] != "OTC"]
+        assets_df = assets_df[
+            (assets_df["status"] == "active") & (assets_df["fractionable"]) & (assets_df["tradable"]) & (assets_df["exchange"] != "OTC")
+        ]
         assets_df.reset_index(drop=True, inplace=True)
 
         return assets_df
@@ -79,8 +76,5 @@ def get(self, symbol: str) -> AssetClass:
             ValueError: If the request to the Alpaca API fails.
         """
         url = f"{self.trade_url}/assets/{symbol}"
-
-        request = Requests().get(url, headers=self.headers)
-
-        response = json.loads(request.text)
+        response = json.loads(Requests().get(url, headers=self.headers).text)
         return asset_class_from_dict(response)

py_alpaca_api/src/asset.py

@@ -1,3 +1,4 @@
+import json
 from collections import defaultdict
 from typing import Dict
 
@@ -188,9 +189,7 @@ def get_historical_data(self, symbol: str, url: str, params: dict) -> list[defau
         while True:
             params["page_token"] = page_token
 
-            request = Requests().get(url, headers=self.headers, params=params)
-
-            res_data = request.json()
+            res_data = json.loads(Requests().get(url, headers=self.headers, params=params).text)
             symbols_data[symbol].extend(res_data.get("bars", []))
             page_token = res_data.get("next_page_token", "")
             if not page_token:

py_alpaca_api/src/history.py

@@ -24,9 +24,7 @@ def __init__(self, trade_url: str, headers: Dict[str, str]) -> None:
     ########################################################
     @staticmethod
     def get_api_response(url: str, headers: Dict[str, str], params: Dict[str, str] = None) -> Dict:
-        # response = requests.get(url, headers=headers, params=params)
-        request = Requests().get(url=url, headers=headers, params=params)
-        data = json.loads(request.text)
+        data = json.loads(Requests().get(url=url, headers=headers, params=params).text)
         return data
 
     ########################################################

py_alpaca_api/src/market.py

@@ -40,9 +40,7 @@ def get_by_id(self, order_id: str, nested: bool = False) -> OrderClass:
         params = {"nested": nested}
         url = f"{self.trade_url}/orders/{order_id}"
 
-        request = Requests().get(url=url, headers=self.headers, params=params)
-
-        response = json.loads(request.text)
+        response = json.loads(Requests().get(url=url, headers=self.headers, params=params).text)
         return order_class_from_dict(response)
 
     ########################################################
@@ -81,9 +79,8 @@ def cancel_all(self) -> str:
             Exception: If the request to cancel orders is not successful, an exception is raised with the error message.
         """
         url = f"{self.trade_url}/orders"
-        request = Requests().delete(url=url, headers=self.headers)
 
-        response = json.loads(request.text)
+        response = json.loads(Requests().delete(url=url, headers=self.headers).text)
         return f"{len(response)} orders have been cancelled"
 
     @staticmethod
@@ -462,7 +459,5 @@ def _submit_order(
 
         url = f"{self.trade_url}/orders"
 
-        request = Requests().post(url=url, headers=self.headers, payload=payload)
-
-        response = json.loads(request.text)
+        response = json.loads(Requests().post(url=url, headers=self.headers, payload=payload).text)
         return order_class_from_dict(response)

py_alpaca_api/src/order.py

@@ -39,10 +39,8 @@ def get_all(self) -> pd.DataFrame:
         """
 
         url = f"{self.trade_url}/positions"
-        request = Requests().get(url=url, headers=self.headers)
-        # response = requests.get(url, headers=self.headers)
 
-        res_data_df = pd.json_normalize(json.loads(request.text))
+        res_data_df = pd.json_normalize(json.loads(Requests().get(url=url, headers=self.headers).text))
 
         pos_data_df = pd.DataFrame(
             {
@@ -146,9 +144,8 @@ def get(self, symbol: str = None, symbol_dict: dict = None) -> PositionClass:
             return position_class_from_dict(symbol_dict)
 
         url = f"{self.trade_url}/positions/{symbol}"
-        request = Requests().get(url=url, headers=self.headers)
 
-        res_dict = json.loads(request.text)
+        res_dict = json.loads(Requests().get(url=url, headers=self.headers).text)
 
         equity = self.account.get().equity
         res_dict["portfolio_pct"] = round(float(res_dict["market_value"]) / equity, 4)
@@ -189,9 +186,7 @@ def close_all(self, cancel_orders: bool = False) -> str:
         url = f"{self.trade_url}/positions"
         params = {"cancel_orders": cancel_orders}
 
-        request = Requests().delete(url=url, headers=self.headers, params=params)
-
-        response = json.loads(request.text)
+        response = json.loads(Requests().delete(url=url, headers=self.headers, params=params).text)
         return f"{len(response)} positions have been closed"
 
     ########################################################

py_alpaca_api/src/position.py

@@ -196,17 +196,14 @@ def _get_percentages(
             "sort": "asc",
         }
 
-        request = Requests().get(url=url, headers=self.headers, params=params)
-
-        res = json.loads(request.text)
+        res = json.loads(Requests().get(url=url, headers=self.headers, params=params).text)
 
         bars_df = pd.DataFrame.from_dict(res["bars"], orient="index")
         page_token = res["next_page_token"]
 
         while page_token:
             params["page_token"] = page_token
-            request = Requests().get(url=url, headers=self.headers, params=params)
-            res = json.loads(request.text)
+            res = json.loads(Requests().get(url=url, headers=self.headers, params=params).text)
             bars_df = pd.concat(
                 [
                     bars_df,

py_alpaca_api/src/screener.py

@@ -60,16 +60,16 @@ def _request(self, method: str, url: str, payload: dict = None, params: dict = N
         Raises:
             Exception: If the response status code is not 200 or 204.
         """
-        request = Requests().request(
+        response = Requests().request(
             method=method,
             url=url,
             headers=self.headers,
             json=payload,
             params=params,
         )
 
-        if request.text:
-            return json.loads(request.text)
+        if response.text:
+            return json.loads(response.text)
         return {}
 
     ########################################################
@@ -117,9 +117,8 @@ def get_all(self) -> list[WatchlistClass]:
             Exception: If the API request fails.
         """
         url = f"{self.trade_url}/watchlists"
-        request = Requests().get(url, headers=self.headers)
 
-        response = json.loads(request.text)
+        response = json.loads(Requests().get(url, headers=self.headers).text)
 
         watchlists = []
         if response: