update bug fix

realiti4 · Mar 14, 2021 · e5523d3 · e5523d3
1 parent bc456cd
commit e5523d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/tradingfeatures/api_base.py b/tradingfeatures/api_base.py
@@ -75,6 +75,8 @@ def get_hist(self,
         steps = (total_entries // self.per_step) + 1
 
         df = pd.DataFrame(columns=columns)
+        df.index.name = 'timestamp'
+        # df = None
 
         print(f'  Downloading {name}')
 
@@ -90,6 +92,10 @@ def get_hist(self,
                 print('error between timestamps: ', start_batch, end_batch)
                 if steps <= 1: return None
 
+            # if df is None:
+            #     df = df_temp
+            # else:
+
             df_temp = pd.concat([df, df_temp])
             df = df_temp
 

diff --git a/tradingfeatures/apis/bitmex/funding.py b/tradingfeatures/apis/bitmex/funding.py
@@ -34,7 +34,7 @@ def get(self, symbol=None, query=None, start=None, end=None, *args, **kwargs):
     def get_hist(self, convert_funds=False, *args, **kwargs):  
         df_fundings = apiBase.get_hist(
             self,
-            columns=['timestamp', 'fundingRate', 'fundingRateDaily'],
+            columns=['fundingRate', 'fundingRateDaily'],
             interval='8h',
             *args, **kwargs
         )