Merge pull request #2227 from dhalbert/pyplanter-fixes

TheKitty · web-flow · commit 53e94f5f11a9 · 2022-07-26T20:05:46.000-04:00
Fix PyPlanter; update other catches of requests exceptions
diff --git a/Adafruit_IO_Air_Quality/code.py b/Adafruit_IO_Air_Quality/code.py
@@ -168,7 +168,7 @@ def read_bme(is_celsius=False):
         # Hourly reset
         if cur_time.tm_min == 0:
             prv_mins = 0
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Failed to fetch time, retrying\n", e)
         wifi.reset()
         wifi.connect()
@@ -200,7 +200,7 @@ def read_bme(is_celsius=False):
             io.send_data(feed_temperature["key"], str(temperature))
             io.send_data(feed_humidity["key"], str(humidity))
             print("Published!")
-        except (ValueError, RuntimeError) as e:
+        except (ValueError, RuntimeError, ConnectionError, OSError) as e:
             print("Failed to send data to IO, retrying\n", e)
             wifi.reset()
             wifi.connect()
diff --git a/Adafruit_IO_Power_Relay/code.py b/Adafruit_IO_Power_Relay/code.py
@@ -129,7 +129,7 @@ def on_relay_msg(client, topic, value):
 while True:
     try: # Poll for new messages on feed_relay
         client.loop()
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Failed to get data, retrying\n", e)
         wifi.reset()
         client.reconnect()
diff --git a/Adafruit_IO_Power_Relay/code_light_sensor/code.py b/Adafruit_IO_Power_Relay/code_light_sensor/code.py
@@ -169,7 +169,7 @@ def on_relay_msg(client, topic, value):
                     print("Published!")
                 prv_sensor_value = sensor_value
             start_time = now
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Failed to get data, retrying\n", e)
         wifi.reset()
         client.reconnect()
diff --git a/Adafruit_IO_Schedule_Trigger/code.py b/Adafruit_IO_Schedule_Trigger/code.py
@@ -141,7 +141,7 @@ def on_relay_msg(client, topic, message):
 while True:
     try:
         io.loop()
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Failed to get data, retrying\n", e)
         wifi.reset()
         io.reconnect()
diff --git a/Bitcoin_Matrix/code.py b/Bitcoin_Matrix/code.py
@@ -51,7 +51,7 @@ def text_transform(val):
     try:
         value = matrixportal.fetch()
         print("Response is", value)
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Some error occured, retrying! -", e)
 
     time.sleep(3 * 60)  # wait 3 minutes
diff --git a/Feather_ESP32-S2_TFT_Azure/code.py b/Feather_ESP32-S2_TFT_Azure/code.py
@@ -216,8 +216,8 @@
         device.loop()
 	#  if something disrupts the loop, reconnect
     # pylint: disable=broad-except
-    except (ValueError, RuntimeError, OSError, Exception) as e:
-        print("Connection error, reconnecting\n", str(e))
+    except (ValueError, RuntimeError, OSError, ConnectionError) as e:
+        print("Network error, reconnecting\n", str(e))
         supervisor.reload()
         continue
 	#  delay
diff --git a/MagTag_AdafruitQuotes/code.py b/MagTag_AdafruitQuotes/code.py
@@ -36,6 +36,6 @@
         try:
             value = magtag.fetch()
             print("Response is", value)
-        except (ValueError, RuntimeError) as e:
+        except (ValueError, RuntimeError, ConnectionError, OSError) as e:
             print("Some error occured, retrying! -", e)
         timestamp = time.monotonic()
diff --git a/MagTag_Cheerlights/code.py b/MagTag_Cheerlights/code.py
@@ -43,6 +43,6 @@
             magtag.peripherals.neopixels.fill(color)
             external_pixels.fill(color)
             timestamp = time.monotonic()
-        except (ValueError, RuntimeError) as e:
+        except (ValueError, RuntimeError, ConnectionError, OSError) as e:
             print("Some error occured, retrying! -", e)
     time.sleep(1)
diff --git a/MagTag_Cheerlights_LED_Animations/code.py b/MagTag_Cheerlights_LED_Animations/code.py
@@ -137,7 +137,7 @@
                 )
 
             timestamp = time.monotonic()
-        except (ValueError, RuntimeError) as e:
+        except (ValueError, RuntimeError, ConnectionError, OSError) as e:
             # Catch any random errors so the code will continue running.
             print("Some error occured, retrying! -", e)
     try:
diff --git a/MagTag_CountdownCelebration/code.py b/MagTag_CountdownCelebration/code.py
@@ -60,7 +60,7 @@
             seconds = int(datetime_str[17:19])
             rtc.RTC().datetime = time.struct_time((year, month, mday, hours, minutes, seconds, 0, 0, False))
             lasttimefetch_stamp = time.monotonic()
-        except (ValueError, RuntimeError) as e:
+        except (ValueError, RuntimeError, ConnectionError, OSError) as e:
             print("Some error occured, retrying! -", e)
             continue
 
diff --git a/MagTag_CovidTracking/code.py b/MagTag_CovidTracking/code.py
@@ -95,7 +95,7 @@
 
     # OK we're done!
     magtag.peripherals.neopixels.fill(0x000F00) # greten
-except (ValueError, RuntimeError) as e:
+except (ValueError, RuntimeError, ConnectionError, OSError) as e:
     print("Some error occured, trying again later -", e)
 
 time.sleep(2) # let screen finish updating
diff --git a/MagTag_Covid_Vaccination/code.py b/MagTag_Covid_Vaccination/code.py
@@ -112,7 +112,7 @@ def l_split(line):
 
     SECONDS_TO_SLEEP = 24 * 60 * 60  # Sleep for one day
 
-except (ValueError, RuntimeError) as e:
+except (ValueError, RuntimeError, ConnectionError, OSError) as e:
     print("Some error occured, retrying in one hour! -", e)
     seconds_to_sleep = 60 * 60  # Sleep for one hour
 
diff --git a/MagTag_Killed_By_Google/code.py b/MagTag_Killed_By_Google/code.py
@@ -95,5 +95,5 @@
         PAUSE = alarm.time.TimeAlarm(monotonic_time=time.monotonic() + 60 * 60)
         alarm.exit_and_deep_sleep_until_alarms(PAUSE)
 
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Some error occured, retrying! -", e)
diff --git a/MagTag_NYC_Positivity/code.py b/MagTag_NYC_Positivity/code.py
@@ -43,7 +43,7 @@
             qn_idx = header.index("Queens")
             si_idx = header.index("Staten Island")
             nyc_idx = header.index("Citywide")
-        except (ValueError, RuntimeError) as e:
+        except (ValueError, RuntimeError, ConnectionError, OSError) as e:
             print("Some error occured, retrying! -", e)
             continue
 
diff --git a/MagTag_Progress_Displays/weblate_translated_percent/code.py b/MagTag_Progress_Displays/weblate_translated_percent/code.py
@@ -85,6 +85,6 @@ def texturl_transform(val):
     progress_bar.progress = value[1] / 100.0
     magtag.refresh()
     magtag.exit_and_deep_sleep(24 * 60 * 60)  # one day
-except (ValueError, RuntimeError) as e:
+except (ValueError, RuntimeError, ConnectionError, OSError) as e:
     print("Some error occurred, retrying! -", e)
     magtag.exit_and_deep_sleep(60)  # one minute
diff --git a/MagTag_Progress_Displays/year_progress_percent/code.py b/MagTag_Progress_Displays/year_progress_percent/code.py
@@ -67,6 +67,6 @@ def days_in_year(date_obj):
     print(now)
     magtag.exit_and_deep_sleep(24 * 60 * 60)  # one day
 
-except (ValueError, RuntimeError) as e:
+except (ValueError, RuntimeError, ConnectionError, OSError) as e:
     print("Some error occurred, retrying after 1 minute! -", e)
     magtag.exit_and_deep_sleep(60)  # one  minute
diff --git a/MagTag_Quote_Board/code.py b/MagTag_Quote_Board/code.py
@@ -48,7 +48,7 @@
     magtag.network.connect()
     value = magtag.fetch()
     print("Response is", value)
-except (ValueError, RuntimeError) as e:
+except (ValueError, RuntimeError, ConnectionError, OSError) as e:
     magtag.set_text(e)
     print("Some error occured, retrying later -", e)
 # wait 2 seconds for display to complete
diff --git a/MagTag_Showerthoughts/code.py b/MagTag_Showerthoughts/code.py
@@ -50,7 +50,7 @@
     magtag.network.connect()
     value = magtag.fetch()
     print("Response is", value)
-except (ValueError, RuntimeError) as e:
+except (ValueError, RuntimeError, ConnectionError, OSError) as e:
     magtag.set_text(e)
     print("Some error occured, retrying! -", e)
 
diff --git a/MagTag_SpaceX/code.py b/MagTag_SpaceX/code.py
@@ -84,7 +84,7 @@ def details_transform(val3):
 magtag.add_text(
     text_font=terminalio.FONT,
     text_position=(10, 94),
-    line_spacing=0.8, 
+    line_spacing=0.8,
     text_wrap=47,     # wrap text at this count
     text_transform=details_transform
 )
@@ -95,7 +95,7 @@ def details_transform(val3):
     # This statement gets the JSON data and displays it automagically
     value = magtag.fetch()
     print("Response is", value)
-except (ValueError, RuntimeError) as e:
+except (ValueError, RuntimeError, ConnectionError, OSError) as e:
     print("Some error occured, retrying! -", e)
 
 # wait 2 seconds for display to complete
diff --git a/MagTag_Twitter/code.py b/MagTag_Twitter/code.py
@@ -68,7 +68,7 @@
 try:
     value = magtag.fetch()
     print("Response is", value)
-except (ValueError, RuntimeError) as e:
+except (ValueError, RuntimeError, ConnectionError, OSError) as e:
     print("Some error occured, retrying! -", e)
 
 time.sleep(2)
diff --git a/PyPortal_AWS_IOT_Planter/code.py b/PyPortal_AWS_IOT_Planter/code.py
@@ -172,6 +172,6 @@ def message(client, topic, msg):
             # Reset timer
             initial = now
         aws_iot.loop()
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Failed to get data, retrying", e)
         wifi.reset()
diff --git a/PyPortal_AdafruitIO_Logger/code.py b/PyPortal_AdafruitIO_Logger/code.py
@@ -88,7 +88,7 @@
         io.send_data(light_feed['key'], light_value)
         io.send_data(temperature_feed['key'], temperature, precision=2)
         print('Sent to Adafruit IO!')
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Failed to get data, retrying\n", e)
         wifi.reset()
         continue
diff --git a/PyPortal_Azure_Plant_Monitor/code.py b/PyPortal_Azure_Plant_Monitor/code.py
@@ -97,7 +97,7 @@
 
         gfx.display_azure_status("Data sent!")
         print("Data sent!")
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Failed to get data, retrying\n", e)
         wifi.reset()
         wifi.connect()
diff --git a/PyPortal_Bitcoin/bitcoin/code.py b/PyPortal_Bitcoin/bitcoin/code.py
@@ -42,7 +42,7 @@ def text_transform(val):
     try:
         value = pyportal.fetch()
         print("Response is", value)
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Some error occured, retrying! -", e)
 
     time.sleep(3*60)  # wait 3 minutes
diff --git a/PyPortal_Bitcoin/bitcoin_2/code.py b/PyPortal_Bitcoin/bitcoin_2/code.py
@@ -46,7 +46,7 @@ def text_transform(val):
     try:
         value = pyportal.fetch()
         print("Response is", value)
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Some error occured, retrying! -", e)
 
     time.sleep(3*60)  # wait 3 minutes
diff --git a/PyPortal_GCP_IOT_Planter/code.py b/PyPortal_GCP_IOT_Planter/code.py
@@ -189,7 +189,7 @@ def handle_pump(command):
             # Reset timer
             initial = now
         google_mqtt.loop()
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, OSError, ConnectionError) as e:
         print("Failed to get data, retrying", e)
         wifi.reset()
         google_mqtt.reconnect()
diff --git a/PyPortal_GithubStars/code.py b/PyPortal_GithubStars/code.py
@@ -51,7 +51,7 @@
             print("New star!")
             pyportal.play_file(cwd+"/coin.wav")
         last_value = value
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Some error occured, retrying! -", e)
 
     time.sleep(60)  # wait a minute before getting again
diff --git a/PyPortal_IOT_Scale/code.py b/PyPortal_IOT_Scale/code.py
@@ -104,7 +104,7 @@
             text_label.text = 'sending...'
             # send data to Adafruit IO (rounded to one decimal place)
             io.send_data(weight_feed['key'], round(reading.weight, 1))
-        except (ValueError, RuntimeError) as e:
+        except (ValueError, RuntimeError, ConnectionError, OSError) as e:
             print("failed to send data..retrying...")
             wifi.reset()
             continue
diff --git a/PyPortal_LeagueLevel/code.py b/PyPortal_LeagueLevel/code.py
@@ -52,7 +52,7 @@
             print("New level!")
             pyportal.play_file(cwd+"/triode_low_fade.wav")
         last_value = value
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Some error occurred, retrying! -", e)
     #check again in two minutes
     time.sleep(60*2)
diff --git a/PyPortal_Quarantine_Clock/code.py b/PyPortal_Quarantine_Clock/code.py
@@ -90,7 +90,7 @@
             refresh_time = time.monotonic()
             # set the_time
             the_time = time.localtime()
-        except (ValueError, RuntimeError) as e:
+        except (ValueError, RuntimeError, ConnectionError, OSError) as e:
             print("Failed to get data, retrying\n", e)
             esp.reset()
             continue
diff --git a/PyPortal_Quarantine_Clock/month_clock/code.py b/PyPortal_Quarantine_Clock/month_clock/code.py
@@ -119,7 +119,7 @@
             refresh_time = time.monotonic()
             # set the_time
             the_time = time.localtime()
-        except (ValueError, RuntimeError) as e:
+        except (ValueError, RuntimeError, ConnectionError, OSError) as e:
             print("Failed to get data, retrying\n", e)
             esp.reset()
             continue
diff --git a/PyPortal_Quotes/code.py b/PyPortal_Quotes/code.py
@@ -34,6 +34,6 @@
     try:
         value = pyportal.fetch()
         print("Response is", value)
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Some error occured, retrying! -", e)
     time.sleep(60)
diff --git a/PyPortal_Reddit/code.py b/PyPortal_Reddit/code.py
@@ -42,7 +42,7 @@
             print("New subscriber!")
             pyportal.play_file(cwd+"/coin.wav")
         last_value = value
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Some error occured, retrying! -", e)
 
     time.sleep(60)
diff --git a/PyPortal_Remote/code.py b/PyPortal_Remote/code.py
@@ -88,7 +88,7 @@ def getchannels():
             channel_dict[name] = chan_id
         response.close()
         return channel_dict
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Failed to get data\n", e)
         wifi.reset()
         return None
@@ -104,7 +104,7 @@ def sendkey(key):
         if response:
             response.close()
             print("OK")
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Failed to get data\n", e)
         wifi.reset()
         return
@@ -119,7 +119,7 @@ def sendletter(letter):
         if response:
             response.close()
             print("OK")
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Failed to get data\n", e)
         wifi.reset()
         return
@@ -135,8 +135,8 @@ def openchannel(channel):
             response.close()
             print("OK")
         response = None
-    except (ValueError, RuntimeError):
-        print("Probably worked")
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
+        print("Probably worked, but got error\n", e)
         wifi.reset()
     response = None
 
diff --git a/PyPortal_Smart_Thermometer/code.py b/PyPortal_Smart_Thermometer/code.py
@@ -105,7 +105,7 @@ def set_backlight(val):
             gfx.display_io_status('Data sent!')
         except AdafruitIO_RequestError as e:
             raise AdafruitIO_RequestError('IO Error: ', e)
-    except (ValueError, RuntimeError) as e: # WiFi Connection Failure
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Failed to get data, retrying\n", e)
         wifi.reset()
         continue
diff --git a/PyPortal_TwitterFollowers/code.py b/PyPortal_TwitterFollowers/code.py
@@ -45,7 +45,7 @@
             print("New follower!")
             pyportal.play_file(cwd+"/coin.wav")  # uncomment make a noise!
         last_value = value
-    except (ValueError, RuntimeError) as e:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as e:
         print("Some error occured, retrying! -", e)
 
     time.sleep(60)  # wait a minute before getting again
diff --git a/PyPortal_UV_Index/code.py b/PyPortal_UV_Index/code.py
@@ -82,7 +82,7 @@ def extract_date(date_time):
     try:
         json_payload = pyportal.fetch()
         raw_data = json.loads(json_payload)
-    except (ValueError, RuntimeError) as ex:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as ex:
         print('Error: ', ex)
         if isinstance(ex, ValueError):
             print('JSON:', json_payload)
diff --git a/Smart_Alarm_Clock/code.py b/Smart_Alarm_Clock/code.py
@@ -439,7 +439,7 @@ def brighten_cool(i):
         else:
             pass
         gc.collect()
-    except (ValueError, RuntimeError) as err:
+    except (ValueError, RuntimeError, ConnectionError, OSError) as err:
         print("Failed to get data, retrying\n", err)
         wifi.reset()
         mqtt_client.reconnect()
diff --git a/pyportal_pet_planter/code.py b/pyportal_pet_planter/code.py
diff --git a/pyportal_weather_station/code.py b/pyportal_weather_station/code.py

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@`
`137`	`137`	`)`
`138`	`138`
`139`	`139`	`timestamp = time.monotonic()`
`140`		`- except (ValueError, RuntimeError) as e:`
	`140`	`+ except (ValueError, RuntimeError, ConnectionError, OSError) as e:`
`141`	`141`	`# Catch any random errors so the code will continue running.`
`142`	`142`	`print("Some error occured, retrying! -", e)`
`143`	`143`	`try:`