Allow top-level tags with write_points

aviau · aviau · commit 3ab875aa70b1 · 2015-04-09T10:09:26.000-04:00
diff --git a/influxdb/client.py b/influxdb/client.py
@@ -243,6 +243,7 @@ def write_points(self,
                      time_precision=None,
                      database=None,
                      retention_policy=None,
+                     tags=None,
                      ):
         """
         Write to multiple time series names.
@@ -258,13 +259,15 @@ def write_points(self,
         return self._write_points(points=points,
                                   time_precision=time_precision,
                                   database=database,
-                                  retention_policy=retention_policy)
+                                  retention_policy=retention_policy,
+                                  tags=tags)
 
     def _write_points(self,
                       points,
                       time_precision,
                       database,
-                      retention_policy):
+                      retention_policy,
+                      tags):
         if time_precision not in ['n', 'u', 'ms', 's', 'm', 'h', None]:
             raise ValueError(
                 "Invalid time precision is given. "
@@ -285,6 +288,9 @@ def _write_points(self,
         if retention_policy:
             data['retentionPolicy'] = retention_policy
 
+        if tags:
+            data['tags'] = tags
+
         data['database'] = database or self._database
 
         if self.use_udp:
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
@@ -161,6 +161,30 @@ def test_write_points(self):
                 json.loads(m.last_request.body)
             )
 
+    def test_write_points_toplevel_attributes(self):
+        with requests_mock.Mocker() as m:
+            m.register_uri(
+                requests_mock.POST,
+                "http://localhost:8086/write"
+            )
+
+            cli = InfluxDBClient(database='db')
+            cli.write_points(
+                self.dummy_points,
+                database='testdb',
+                tags={"tag": "hello"},
+                retention_policy="somepolicy"
+            )
+            self.assertDictEqual(
+                {
+                    "database": "testdb",
+                    "tags": {"tag": "hello"},
+                    "points": self.dummy_points,
+                    "retentionPolicy": "somepolicy"
+                },
+                json.loads(m.last_request.body)
+            )
+
     @unittest.skip('Not implemented for 0.9')
     def test_write_points_batch(self):
         cli = InfluxDBClient('host', 8086, 'username', 'password', 'db')
