Skip to content

Commit 2d3de68

Browse files
authored
Merge pull request #44 from makermelissa/master
Added get_all_data and linted
2 parents 2fcef79 + 871dd8b commit 2d3de68

8 files changed

+32
-21
lines changed

adafruit_io/adafruit_io.py

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ def __init__(self, mqtt_client):
7070
# MiniMQTT's username kwarg is optional, IO requires a username
7171
try:
7272
self._user = self._client.user
73-
except:
73+
except Exception as err:
7474
raise TypeError(
7575
"Adafruit IO requires a username, please set one in MiniMQTT"
76-
)
76+
) from err
7777
# User-defined MQTT callback methods must be init'd to None
7878
self.on_connect = None
7979
self.on_disconnect = None
@@ -105,17 +105,17 @@ def reconnect(self):
105105
"""
106106
try:
107107
self._client.reconnect()
108-
except:
109-
raise AdafruitIO_MQTTError("Unable to reconnect to Adafruit IO.")
108+
except Exception as err:
109+
raise AdafruitIO_MQTTError("Unable to reconnect to Adafruit IO.") from err
110110

111111
def connect(self):
112112
"""Connects to the Adafruit IO MQTT Broker.
113113
Must be called before any other API methods are called.
114114
"""
115115
try:
116116
self._client.connect()
117-
except:
118-
raise AdafruitIO_MQTTError("Unable to connect to Adafruit IO.")
117+
except Exception as err:
118+
raise AdafruitIO_MQTTError("Unable to connect to Adafruit IO.") from err
119119

120120
def disconnect(self):
121121
"""Disconnects from Adafruit IO MQTT Broker.
@@ -556,11 +556,22 @@ def send_data(self, feed_key, data, metadata=None, precision=None):
556556
if precision:
557557
try:
558558
data = round(data, precision)
559-
except NotImplementedError: # received a non-float value
560-
raise NotImplementedError("Precision requires a floating point value")
559+
except NotImplementedError as err: # received a non-float value
560+
raise NotImplementedError(
561+
"Precision requires a floating point value"
562+
) from err
561563
payload = self._create_data(data, metadata)
562564
self._post(path, payload)
563565

566+
def receive_all_data(self, feed_key):
567+
"""
568+
Get all data values from a specified Adafruit IO feed. Data is
569+
returned in reverse order.
570+
:param str feed_key: Adafruit IO feed key
571+
"""
572+
path = self._compose_path("feeds/{0}/data".format(feed_key))
573+
return self._get(path)
574+
564575
def receive_data(self, feed_key):
565576
"""
566577
Return the most recent value for the specified feed.

adafruit_io/adafruit_io_errors.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class AdafruitIO_ThrottleError(Exception):
3131
"""Adafruit IO request error class for rate-limiting"""
3232

3333
def __init__(self):
34-
super(AdafruitIO_ThrottleError, self).__init__(
34+
super().__init__(
3535
"Number of Adafruit IO Requests exceeded! \
3636
Please try again in 30 seconds.."
3737
)
@@ -43,7 +43,7 @@ class AdafruitIO_RequestError(Exception):
4343
def __init__(self, response):
4444
response_content = response.json()
4545
error = response_content["error"]
46-
super(AdafruitIO_RequestError, self).__init__(
46+
super().__init__(
4747
"Adafruit IO Error {0}: {1}".format(response.status_code, error)
4848
)
4949

@@ -52,4 +52,4 @@ class AdafruitIO_MQTTError(Exception):
5252
"""Adafruit IO MQTT error class"""
5353

5454
def __init__(self, response):
55-
super(AdafruitIO_MQTTError, self).__init__("MQTT Error: {0}".format(response))
55+
super().__init__("MQTT Error: {0}".format(response))

examples/adafruit_io_http/adafruit_io_esp_at.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
import busio
1111
from digitalio import DigitalInOut
1212

13-
# Import Adafruit IO HTTP Client
14-
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
15-
1613
# ESP32 AT
1714
from adafruit_espatcontrol import (
1815
adafruit_espatcontrol,
@@ -22,6 +19,9 @@
2219
# Use below for Most Boards
2320
import neopixel
2421

22+
# Import Adafruit IO HTTP Client
23+
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
24+
2525
status_light = neopixel.NeoPixel(
2626
board.NEOPIXEL, 1, brightness=0.2
2727
) # Uncomment for Most Boards

examples/adafruit_io_http/adafruit_io_temperature.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
# Import NeoPixel Library
1818
import neopixel
1919

20-
# Import Adafruit IO HTTP Client
21-
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
22-
2320
# Import ADT7410 Library
2421
import adafruit_adt7410
2522

23+
# Import Adafruit IO HTTP Client
24+
from adafruit_io.adafruit_io import IO_HTTP, AdafruitIO_RequestError
25+
2626
# Get wifi details and more from a secrets.py file
2727
try:
2828
from secrets import secrets

examples/adafruit_io_mqtt/adafruit_io_groups.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
1111
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
1212
import neopixel
13-
from adafruit_io.adafruit_io import IO_MQTT
1413
import adafruit_minimqtt.adafruit_minimqtt as MQTT
14+
from adafruit_io.adafruit_io import IO_MQTT
1515

1616
### WiFi ###
1717

examples/adafruit_io_mqtt/adafruit_io_simpletest_cellular.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
from adafruit_fona.adafruit_fona_gsm import GSM
1616
import adafruit_fona.adafruit_fona_socket as cellular_socket
1717

18-
from adafruit_io.adafruit_io import IO_MQTT
1918
import adafruit_minimqtt.adafruit_minimqtt as MQTT
19+
from adafruit_io.adafruit_io import IO_MQTT
2020

2121
# Get MQTT details and more from a secrets.py file
2222
try:

examples/adafruit_io_mqtt/adafruit_io_simpletest_eth.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
from adafruit_wiznet5k.adafruit_wiznet5k import WIZNET5K
1515
import adafruit_wiznet5k.adafruit_wiznet5k_socket as socket
16-
from adafruit_io.adafruit_io import IO_MQTT
1716
import adafruit_minimqtt.adafruit_minimqtt as MQTT
17+
from adafruit_io.adafruit_io import IO_MQTT
1818

1919
# Get MQTT details and more from a secrets.py file
2020
try:

examples/adafruit_io_simpletest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
from adafruit_esp32spi import adafruit_esp32spi_wifimanager
1616
import adafruit_esp32spi.adafruit_esp32spi_socket as socket
1717
import neopixel
18-
from adafruit_io.adafruit_io import IO_MQTT
1918
import adafruit_minimqtt.adafruit_minimqtt as MQTT
19+
from adafruit_io.adafruit_io import IO_MQTT
2020

2121
### WiFi ###
2222

0 commit comments

Comments
 (0)