Skip to content

FluxRecord supports dictionary-style access #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
1. [#24](https://github.com/influxdata/influxdb-client-python/issues/24): Added possibility to write dictionary-style object
1. [#27](https://github.com/influxdata/influxdb-client-python/issues/27): Added possibility to write bytes type of data
1. [#30](https://github.com/influxdata/influxdb-client-python/issues/30): Added support for streaming a query response
1. [#35](https://github.com/influxdata/influxdb-client-python/pull/35): FluxRecord supports dictionary-style access
1. [#31](https://github.com/influxdata/influxdb-client-python/issues/31): Added support for delete metrics

### API
Expand Down
18 changes: 12 additions & 6 deletions influxdb_client/client/flux_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,28 @@ def __init__(self, table, values=None) -> None:
self.values = values

def get_start(self):
return self.values.get("_start")
return self["_start"]

def get_stop(self):
return self.values.get("_stop")
return self["_stop"]

def get_time(self):
return self.values.get("_time")
return self["_time"]

def get_value(self):
return self.values.get("_value")
return self["_value"]

def get_field(self):
return self.values.get("_field")
return self["_field"]

def get_measurement(self):
return self.values.get("_measurement")
return self["_measurement"]

def __getitem__(self, key):
return self.values.__getitem__(key)

def __setitem__(self, key, value):
return self.values.__setitem__(key, value)

def __str__(self):
cls_name = type(self).__name__
Expand Down
35 changes: 28 additions & 7 deletions tests/test_FluxObject.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,26 @@ def test_create_structure(self):
FluxColumn(index=7, label='_measurement', data_type='string', group=True, default_value=''),
FluxColumn(index=8, label='location', data_type='string', group=True, default_value='')]

record1 = FluxRecord(table=0, values={'result': '_result', 'table': 0, '_start': _time, '_stop': _time,
'_time': _time, '_value': 1.0, '_field': 'water level',
'_measurement': 'h2o', 'location': 'coyote_creek'})
record2 = FluxRecord(table=0, values={'result': '_result', 'table': 0, '_start': _time, '_stop': _time,
'_time': _time + datetime.timedelta(days=1), '_value': 2.0,
'_field': 'water level', '_measurement': 'h2o',
'location': 'coyote_creek'})
record1 = FluxRecord(table=0)
record1["table"] = 0
record1["_start"] = _time
record1["_stop"] = _time
record1["_time"] = _time
record1["_value"] = 1.0
record1["_field"] = 'water level'
record1["_measurement"] = 'h2o'
record1["location"] = 'coyote_creek'

record2 = FluxRecord(table=0)
record2["table"] = 0
record2["_start"] = _time
record2["_stop"] = _time
record2["_time"] = _time + datetime.timedelta(days=1)
record2["_value"] = 2.0
record2["_field"] = 'water level'
record2["_measurement"] = 'h2o'
record2["location"] = 'coyote_creek'

table.records = [record1, record2]

self.assertEqual(9, table.columns.__len__())
Expand All @@ -39,15 +52,23 @@ def test_create_structure(self):
self.assertEqual(_time, table.records[0].get_stop())
self.assertEqual(_time, table.records[0].get_time())
self.assertEqual(1.0, table.records[0].get_value())
self.assertEqual(1.0, table.records[0]["_value"])
self.assertEqual('water level', table.records[0].get_field())
self.assertEqual('water level', table.records[0]["_field"])
self.assertEqual('h2o', table.records[0].get_measurement())
self.assertEqual('h2o', table.records[0]["_measurement"])
self.assertEqual('coyote_creek', table.records[0].values['location'])
self.assertEqual('coyote_creek', table.records[0]['location'])

# record 2
self.assertEqual(_time, table.records[1].get_start())
self.assertEqual(_time, table.records[1].get_stop())
self.assertEqual(_time + datetime.timedelta(days=1), table.records[1].get_time())
self.assertEqual(2.0, table.records[1].get_value())
self.assertEqual(2.0, table.records[1]["_value"])
self.assertEqual('water level', table.records[1].get_field())
self.assertEqual('water level', table.records[1]["_field"])
self.assertEqual('h2o', table.records[1].get_measurement())
self.assertEqual('h2o', table.records[1]["_measurement"])
self.assertEqual('coyote_creek', table.records[1].values['location'])
self.assertEqual('coyote_creek', table.records[1]['location'])