Updated builtin_timeseries.py

These changes were done to return `entry` type data ( alongside dataframe) to clustering_example.ipynb.

emission/storage/timeseries/builtin_timeseries.py

@@ -23,6 +23,9 @@
 INVALID_QUERY = {'metadata.key': 'invalid'}
 
 class BuiltinTimeSeries(esta.TimeSeries):
+
+    entryList=[]
+
     def __init__(self, user_id):
         super(BuiltinTimeSeries, self).__init__(user_id)
         self.key_query = lambda key: {"metadata.key": key}
@@ -261,6 +264,9 @@ def get_entry_at_ts(self, key, ts_key, ts):
         logging.debug("get_entry_at_ts result = %s" % retValue)
         return retValue
 
+    def getEntryList(self):
+        return self.entryList
+
     def get_data_df(self, key, time_query = None, geo_query = None,
                     extra_query_list=None,
                     map_fn = None):
@@ -290,7 +296,11 @@ def to_data_df(key, entry_it, map_fn = None):
         if map_fn is None:
             map_fn = BuiltinTimeSeries._to_df_entry
         # Dataframe doesn't like to work off an iterator - it wants everything in memory
-        df = pd.DataFrame([map_fn(e) for e in entry_it])
+
+        for e in entry_it:
+            BuiltinTimeSeries.entryList.append(map_fn(e)) 
+        df = pd.DataFrame(BuiltinTimeSeries.entryList)
+
         logging.debug("Found %s results" % len(df))
         if len(df) > 0:
             dedup_check_list = [item for item in ecwe.Entry.get_dedup_list(key)