Fix dataframe format for portfolio history

Author: ttt733

alpaca_trade_api/entity.py

@@ -165,16 +165,18 @@ def __init__(self, raw):
     def df(self):
         if not hasattr(self, '_df'):
             df = pd.DataFrame(
-                self._raw, columns=('time', 'profit_loss', 'profit_loss_pct', 'equity'),
+                self._raw, columns=(
+                    'timestamp', 'profit_loss', 'profit_loss_pct', 'equity'
+                ),
             )
-            df.set_index('time', inplace=True)
+            df.set_index('timestamp', inplace=True)
             if not df.empty:
                 df.index = pd.to_datetime(
-                    (df.index * 1e9).astype('int64'), utc=True,
+                    (df.index * 1e6).astype('int64'), utc=True,
                 ).tz_convert(NY)
             else:
                 df.index = pd.to_datetime(
                     df.index, utc=True
                 )
             self._df = df
-        return self._df
+        return self._df

alpaca_trade_api/rest.py

@@ -12,7 +12,7 @@
 from .entity import (
     Account, AccountConfigurations, AccountActivity,
     Asset, Order, Position, BarSet, Clock, Calendar,
-    Watchlist
+    Watchlist, PortfolioHistory
 )
 from . import polygon
 from . import alpha_vantage
@@ -437,18 +437,20 @@ def delete_from_watchlist(self, watchlist_id, symbol):
         self.delete('/watchlists/{}/{}'.format(watchlist_id, symbol))
 
     def get_portfolio_history(
-        date_start=None, date_end=None, period=None,
+        self, date_start=None, date_end=None, period=None,
         timeframe=None, extended_hours=None
     ):
         params = {}
         if date_start is not None:
             params['date_start'] = date_start
         if date_end is not None:
             params['date_end'] = date_end
-        if perioid is not None:
+        if period is not None:
             params['period'] = period
         if timeframe is not None:
             params['timeframe'] = timeframe
         if extended_hours is not None:
             params['extended_hours'] = extended_hours
-        return PortfolioHistory(self.get('account/portfolio/history', data=params))
+        return PortfolioHistory(
+            self.get('/account/portfolio/history', data=params)
+        )