Skip to content

code clean up #1

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: master
Choose a base branch
from
Open

code clean up #1

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
38 changes: 16 additions & 22 deletions arablepy/arablepy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ class ArableClient(object):
>>> client.connect(email='[email protected]', password='#@#SS')
"""
_base_url = "https://api.arable.cloud/api/v2"
_param_options = {"device","end_time", "format", "limit", "location", "measure", "order", "select", "start_time", "temp"
"pres", "ratio", "size", "speed", "local_time"}
_param_options = {"device", "end_time", "format", "limit", "location", "measure", "order", "select", "start_time", "temp"
"pres", "ratio", "size", "speed", "local_time"}

def __init__(self):
self.header = None
Expand Down Expand Up @@ -43,7 +43,7 @@ def _output(self, url=None, df=False, header=None, params=None):
r = requests.get(url, headers=header, params=params)
data = r.json()
if 200 == r.status_code:
if df == True:
if df is True:
if isinstance(data, dict):
if 'items' in data.keys():
a = len(data['items'])
Expand All @@ -61,7 +61,7 @@ def _output(self, url=None, df=False, header=None, params=None):

# def __init__(self):
# self.header = ArableClient.header

def create_apikey(self, scopes=None, name=None, exp=None):
"""
"""
Expand All @@ -85,8 +85,6 @@ def create_apikey(self, scopes=None, name=None, exp=None):
else:
r.raise_for_status()



def list_apikeys(self, df=False):
"""
"""
Expand All @@ -107,11 +105,11 @@ def delete_apikeys(self, apikey_id):

url = ArableClient._base_url + "/apikeys/" + i


r = requests.delete(url, headers=self.header)

if r.status_code == 200:
print("Apikey with ID " + i + " was deleted")

def scopes(self, df=False):
"""
"""
Expand All @@ -122,7 +120,6 @@ def scopes(self, df=False):

return self._output(url=url, df=df, header=self.header)


def connect(self, email=None, password=None, apikey=None):
""" Logs the client in to the API.
:param email: user email address
Expand Down Expand Up @@ -156,7 +153,7 @@ def devices(self, name=None, order=None, order_by=None, limit=None, page=None, s
e.g. "name" for name ascending or "-name" for name descending (default "-last_post")
:param limit: optional; max number of devices to retrieve when looking up multiple (default 24)
:param page: optional; results page to retrieve when looking up multiple devices (default 1)
:param battery: optional; shows battery percentage for
:param battery: optional; shows battery percentage for
"""

self._check_connection()
Expand All @@ -172,32 +169,31 @@ def devices(self, name=None, order=None, order_by=None, limit=None, page=None, s
url += "/locations"
elif find:
url += "/find"
# elif email:
# url += "/email"
# elif email:
# url += "/email"

params = {}
if order is not None:
params['order'] = order
if order_by is not None or name:
params['order_by'] = order_by
else:
params['order_by'] = 'state'
params['order_by'] = 'state'
if limit is not None:
params['limit'] = limit
if page is not None:
params['page'] = page
if days is not None:
params['days'] = days


# r = requests.post(url, headers=self, )
# r = requests.post(url, headers=self, )
return self._output(url=url, df=df, header=self.header, params=params)

def _query(self, table, params=None):

self._check_connection()

url = ArableClient._base_url + "/data/" + table
url = ArableClient._base_url + "/data/" + table

if not params.get('limit'):
params['limit'] = '10000'
Expand Down Expand Up @@ -232,15 +228,15 @@ def data(self, measure, devices, **kwargs):
params = {}
for param in ArableClient._param_options:
if kwargs.get(param):
params[param] = str(kwargs[param])
params[param] = str(kwargs[param])
for i in devices:
try:
params['device'] = str(i)
# print(params)
df = df.append(self._query(measure, params=params))
except:
continue

return df

def schema(self, table=None, df=False):
Expand Down Expand Up @@ -273,10 +269,8 @@ def locations(self, page=None, limit=None, df=False):
return self._output(url=url, df=df, header=self.header, params=params)

# class Locations(object):

# def __init__(self):


# def __init__(self):

def orgs(self, org_id=None, param=None, df=False):
"""
Expand All @@ -296,13 +290,13 @@ def search(self, name, suggest=False, df=False):
self._check_connection()

url = ArableClient._base_url + "/search"
if suggest == True:
if suggest is True:
url += "/suggestions"

params = {}
params['name'] = name

return self._output(url=url, df=df, header=self.header, params=params)
return self._output(url=url, df=df, header=self.header, params=params)

def team(self):
pass
Expand Down