Allow time to be specified in SeriesHelper.__init__()

matt-snider · matt-snider · commit ab983d32f070 · 2016-04-10T16:05:53.000+02:00
diff --git a/influxdb/helper.py b/influxdb/helper.py
@@ -6,6 +6,7 @@
 from warnings import warn
 
 import six
+import time
 
 
 class SeriesHelper(object):
@@ -87,8 +88,11 @@ def __new__(cls, *args, **kwargs):
                         ' autocommit is false.'.format(cls.__name__))
 
             cls._datapoints = defaultdict(list)
-            cls._type = namedtuple(cls.__name__, cls._fields + cls._tags)
 
+            if 'time' in cls._fields:
+                cls._fields.remove('time')
+            cls._type = namedtuple(cls.__name__,
+                                   cls._fields + cls._tags + ['time'])
         return super(SeriesHelper, cls).__new__(cls)
 
     def __init__(self, **kw):
@@ -99,14 +103,17 @@ def __init__(self, **kw):
         :warning: Data points are *immutable* (`namedtuples`).
         """
         cls = self.__class__
+        timestamp = kw.pop('time', time.time())
 
         if sorted(cls._fields + cls._tags) != sorted(kw.keys()):
             raise NameError(
                 'Expected {0}, got {1}.'.format(
                     sorted(cls._fields + cls._tags),
                     kw.keys()))
 
-        cls._datapoints[cls._series_name.format(**kw)].append(cls._type(**kw))
+        cls._datapoints[cls._series_name.format(**kw)].append(
+            cls._type(time=timestamp, **kw)
+        )
 
         if cls._autocommit and \
                 sum(len(series) for series in cls._datapoints.values()) \
@@ -140,6 +147,7 @@ def _json_body_(cls):
                     "measurement": series_name,
                     "fields": {},
                     "tags": {},
+                    "time": getattr(point, "time")
                 }
 
                 for field in cls._fields:
