Skip to content

Allow text, add field, check for dict and append api_key #9

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Allow text, add field, check for dict and append api_key #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 19 additions & 11 deletions thingspeak/thingspeak.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@
class Channel(object):
"""ThingSpeak channel object"""

def __init__(self,
id, api_key=None,
fmt='json', timeout=None,
server_url='https://api.thingspeak.com'):
def __init__(self, id=None, api_key=None, fmt='json', timeout=None,
server_url='https://api.thingspeak.com'):
self.id = id
self.api_key = api_key
self.fmt = ('.' + fmt) if fmt in ['json', 'xml'] else ''
Expand Down Expand Up @@ -109,23 +107,33 @@ def view(self):
r = requests.get(url, params=options, timeout=self.timeout)
return self._fmt(r)

def update(self, data):
def update(self, data, field=None):
"""Update channel feed.

`update-channel-feed
<https://mathworks.com/help/thingspeak/update-channel-feed.html>`_
"""
data_req = dict()

if isinstance(data, dict):
data_req = data
else:
if field is not None:
data_req['field{}'.format(field)] = data
else:
data_req['field1'] = data

if self.api_key is not None:
data['api_key'] = self.api_key
data_req['api_key'] = self.api_key

url = '{server_url}/update{fmt}'.format(
server_url=self.server_url,
id=self.id,
fmt=self.fmt,
)
r = requests.post(url, params=data, timeout=self.timeout)
server_url=self.server_url, fmt=self.fmt)

r = requests.post(url, params=data_req, timeout=self.timeout)
return self._fmt(r)

def _fmt(self, r):
"""Format helper."""
r.raise_for_status()
if self.fmt == 'json':
return r.json()
Expand Down