|
|
@@ -166,7 +166,7 @@ class Stream(NilmApp): |
|
|
|
try: |
|
|
|
data = self.db.stream_get_metadata(path) |
|
|
|
except nilmdb.server.nilmdb.StreamError as e: |
|
|
|
raise cherrypy.HTTPError("404 Not Found", e.message) |
|
|
|
raise cherrypy.HTTPError("404 Not Found", str(e)) |
|
|
|
if key is None: # If no keys specified, return them all |
|
|
|
key = list(data.keys()) |
|
|
|
elif not isinstance(key, list): |
|
|
@@ -185,7 +185,7 @@ class Stream(NilmApp): |
|
|
|
try: |
|
|
|
data = dict(json.loads(data)) |
|
|
|
except TypeError as e: |
|
|
|
raise NilmDBError("can't parse 'data' parameter: " + e.message) |
|
|
|
raise NilmDBError("can't parse 'data' parameter: " + str(e)) |
|
|
|
for key in data: |
|
|
|
if not (isinstance(data[key], str) or |
|
|
|
isinstance(data[key], float) or |
|
|
|