Standardize simple and advanced examples

Author: justmobilize

examples/requests_cellular_advanced.py

@@ -1,40 +1,37 @@
 # SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
 # SPDX-License-Identifier: MIT
 
-# pylint: disable=unused-import
+import os
 import time
 
+import adafruit_connection_manager
 import adafruit_fona.adafruit_fona_network as network
-import adafruit_fona.adafruit_fona_socket as cellular_socket
+import adafruit_fona.adafruit_fona_socket as pool
 import board
 import busio
 import digitalio
-from adafruit_fona.adafruit_fona import FONA
-from adafruit_fona.fona_3g import FONA3G
+from adafruit_fona.adafruit_fona import FONA  # pylint: disable=unused-import
+from adafruit_fona.fona_3g import FONA3G  # pylint: disable=unused-import
 
-import adafruit_requests as requests
+import adafruit_requests
 
-# Get GPRS details and more from a secrets.py file
-try:
-    from secrets import secrets
-except ImportError:
-    print("GPRS secrets are kept in secrets.py, please add them there!")
-    raise
+# Get GPRS details, ensure these are setup in settings.toml
+apn = os.getenv("APN")
+apn_username = os.getenv("APN_USERNAME")
+apn_password = os.getenv("APN_PASSWORD")
 
 # Create a serial connection for the FONA connection
 uart = busio.UART(board.TX, board.RX)
-rst = digitalio.DigitalInOut(board.D9)
+rst = digitalio.DigitalInOut(board.D4)
 
 # Use this for FONA800 and FONA808
-# fona = FONA(uart, rst)
+radio = FONA(uart, rst)
 
 # Use this for FONA3G
-fona = FONA3G(uart, rst)
+# radio = FONA3G(uart, rst)
 
 # Initialize cellular data network
-network = network.CELLULAR(
-    fona, (secrets["apn"], secrets["apn_username"], secrets["apn_password"])
-)
+network = network.CELLULAR(radio, (apn, apn_username, apn_password))
 
 while not network.is_attached:
     print("Attaching to network...")
@@ -47,8 +44,9 @@
     time.sleep(0.5)
 print("Network Connected!")
 
-# Initialize a requests object with a socket and cellular interface
-requests.set_socket(cellular_socket, fona)
+# Initialize a requests session
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, radio)
+requests = adafruit_requests.Session(pool, ssl_context)
 
 JSON_GET_URL = "http://httpbin.org/get"
 
@@ -68,8 +66,5 @@
 print("Response HTTP Status Code: ", response.status_code)
 print("-" * 60)
 
-# Read Response, as raw bytes instead of pretty text
-print("Raw Response: ", response.content)
-
 # Close, delete and collect the response data
 response.close()

examples/requests_cellular_simpletest.py

@@ -1,40 +1,37 @@
 # SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
 # SPDX-License-Identifier: MIT
 
-# pylint: disable=unused-import
+import os
 import time
 
+import adafruit_connection_manager
 import adafruit_fona.adafruit_fona_network as network
-import adafruit_fona.adafruit_fona_socket as cellular_socket
+import adafruit_fona.adafruit_fona_socket as pool
 import board
 import busio
 import digitalio
-from adafruit_fona.adafruit_fona import FONA
-from adafruit_fona.fona_3g import FONA3G
+from adafruit_fona.adafruit_fona import FONA  # pylint: disable=unused-import
+from adafruit_fona.fona_3g import FONA3G  # pylint: disable=unused-import
 
-import adafruit_requests as requests
+import adafruit_requests
 
-# Get GPRS details and more from a secrets.py file
-try:
-    from secrets import secrets
-except ImportError:
-    print("GPRS secrets are kept in secrets.py, please add them there!")
-    raise
+# Get GPRS details, ensure these are setup in settings.toml
+apn = os.getenv("APN")
+apn_username = os.getenv("APN_USERNAME")
+apn_password = os.getenv("APN_PASSWORD")
 
 # Create a serial connection for the FONA connection
 uart = busio.UART(board.TX, board.RX)
 rst = digitalio.DigitalInOut(board.D4)
 
 # Use this for FONA800 and FONA808
-fona = FONA(uart, rst)
+radio = FONA(uart, rst)
 
 # Use this for FONA3G
-# fona = FONA3G(uart, rst)
+# radio = FONA3G(uart, rst)
 
 # Initialize cellular data network
-network = network.CELLULAR(
-    fona, (secrets["apn"], secrets["apn_username"], secrets["apn_password"])
-)
+network = network.CELLULAR(radio, (apn, apn_username, apn_password))
 
 while not network.is_attached:
     print("Attaching to network...")
@@ -47,8 +44,9 @@
     time.sleep(0.5)
 print("Network Connected!")
 
-# Initialize a requests object with a socket and cellular interface
-requests.set_socket(cellular_socket, fona)
+# Initialize a requests session
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, radio)
+requests = adafruit_requests.Session(pool, ssl_context)
 
 TEXT_URL = "http://wifitest.adafruit.com/testwifi/index.html"
 JSON_GET_URL = "http://httpbin.org/get"

examples/requests_cpython_advanced.py

@@ -1,19 +1,21 @@
 # SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
 # SPDX-License-Identifier: MIT
 
-import socket
+import socket as pool
+import ssl
 
 import adafruit_requests
 
-http = adafruit_requests.Session(socket)
+# Initialize a requests session
+requests = adafruit_requests.Session(pool, ssl.create_default_context())
 
-JSON_GET_URL = "http://httpbin.org/get"
+JSON_GET_URL = "https://httpbin.org/get"
 
 # Define a custom header as a dict.
 headers = {"user-agent": "blinka/1.0.0"}
 
 print("Fetching JSON data from %s..." % JSON_GET_URL)
-response = http.get(JSON_GET_URL, headers=headers)
+response = requests.get(JSON_GET_URL, headers=headers)
 print("-" * 60)
 
 json_data = response.json()
@@ -25,8 +27,5 @@
 print("Response HTTP Status Code: ", response.status_code)
 print("-" * 60)
 
-# Read Response, as raw bytes instead of pretty text
-print("Raw Response: ", response.content)
-
 # Close, delete and collect the response data
 response.close()

examples/requests_cpython_github.py

@@ -1,29 +1,28 @@
 # SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
 # SPDX-License-Identifier: MIT
 
-# adafruit_requests usage with a CPython socket
-import socket
+import socket as pool
+import ssl
 
 import adafruit_requests
 
-http = adafruit_requests.Session(socket)
+# Initialize a requests session
+requests = adafruit_requests.Session(pool, ssl.create_default_context())
 
 TEXT_URL = "http://wifitest.adafruit.com/testwifi/index.html"
-JSON_GET_URL = "http://httpbin.org/get"
-JSON_POST_URL = "http://httpbin.org/post"
-REDIRECT_URL = "http://httpbingo.org/redirect/1"
-RELATIVE_REDIRECT_URL = "http://httpbingo.org/relative-redirect/1"
-ABSOLUTE_REDIRECT_URL = "http://httpbingo.org/absolute-redirect/1"
+JSON_GET_URL = "https://httpbin.org/get"
+JSON_POST_URL = "https://httpbin.org/post"
 
 print("Fetching text from %s" % TEXT_URL)
-response = http.get(TEXT_URL)
+response = requests.get(TEXT_URL)
 print("-" * 40)
 
 print("Text Response: ", response.text)
 print("-" * 40)
+response.close()
 
 print("Fetching JSON data from %s" % JSON_GET_URL)
-response = http.get(JSON_GET_URL)
+response = requests.get(JSON_GET_URL)
 print("-" * 40)
 
 print("JSON Response: ", response.json())
@@ -32,43 +31,22 @@
 
 data = "31F"
 print("POSTing data to {0}: {1}".format(JSON_POST_URL, data))
-response = http.post(JSON_POST_URL, data=data)
+response = requests.post(JSON_POST_URL, data=data)
 print("-" * 40)
 
 json_resp = response.json()
 # Parse out the 'data' key from json_resp dict.
 print("Data received from server:", json_resp["data"])
 print("-" * 40)
+response.close()
 
 json_data = {"Date": "July 25, 2019"}
 print("POSTing data to {0}: {1}".format(JSON_POST_URL, json_data))
-response = http.post(JSON_POST_URL, json=json_data)
+response = requests.post(JSON_POST_URL, json=json_data)
 print("-" * 40)
 
 json_resp = response.json()
 # Parse out the 'json' key from json_resp dict.
 print("JSON Data received from server:", json_resp["json"])
 print("-" * 40)
-
-print("Fetching JSON data from redirect url %s" % REDIRECT_URL)
-response = http.get(REDIRECT_URL)
-print("-" * 40)
-
-print("JSON Response: ", response.json())
-print("-" * 40)
-
-print("Fetching JSON data from relative redirect url %s" % RELATIVE_REDIRECT_URL)
-response = http.get(RELATIVE_REDIRECT_URL)
-print("-" * 40)
-
-print("JSON Response: ", response.json())
-print("-" * 40)
-
-print("Fetching JSON data from aboslute redirect url %s" % ABSOLUTE_REDIRECT_URL)
-response = http.get(ABSOLUTE_REDIRECT_URL)
-print("-" * 40)
-
-print("JSON Response: ", response.json())
-print("-" * 40)
-
 response.close()

examples/requests_cpython_https.py

@@ -1,23 +1,20 @@
 # SPDX-FileCopyrightText: 2021 ladyada for Adafruit Industries
 # SPDX-License-Identifier: MIT
 
-import adafruit_esp32spi.adafruit_esp32spi_socket as socket
+import os
+
+import adafruit_connection_manager
+import adafruit_esp32spi.adafruit_esp32spi_socket as pool
 import board
 import busio
 from adafruit_esp32spi import adafruit_esp32spi
 from digitalio import DigitalInOut
 
-import adafruit_requests as requests
+import adafruit_requests
 
-# Add a secrets.py to your filesystem that has a dictionary called secrets with "ssid" and
-# "password" keys with your WiFi credentials. DO NOT share that file or commit it into Git or other
-# source control.
-# pylint: disable=no-name-in-module,wrong-import-order
-try:
-    from secrets import secrets
-except ImportError:
-    print("WiFi secrets are kept in secrets.py, please add them there!")
-    raise
+# Get WiFi details, ensure these are setup in settings.toml
+ssid = os.getenv("CIRCUITPY_WIFI_SSID")
+appw = os.getenv("CIRCUITPY_WIFI_PASSWORD")
 
 # If you are using a board with pre-defined ESP32 Pins:
 esp32_cs = DigitalInOut(board.ESP_CS)
@@ -29,23 +26,28 @@
 # esp32_ready = DigitalInOut(board.D10)
 # esp32_reset = DigitalInOut(board.D5)
 
+# If you have an AirLift Featherwing or ItsyBitsy Airlift:
+# esp32_cs = DigitalInOut(board.D13)
+# esp32_ready = DigitalInOut(board.D11)
+# esp32_reset = DigitalInOut(board.D12)
+
 spi = busio.SPI(board.SCK, board.MOSI, board.MISO)
-esp = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
+radio = adafruit_esp32spi.ESP_SPIcontrol(spi, esp32_cs, esp32_ready, esp32_reset)
 
 print("Connecting to AP...")
-while not esp.is_connected:
+while not radio.is_connected:
     try:
-        esp.connect_AP(secrets["ssid"], secrets["password"])
+        radio.connect_AP(ssid, appw)
     except RuntimeError as e:
         print("could not connect to AP, retrying: ", e)
         continue
-print("Connected to", str(esp.ssid, "utf-8"), "\tRSSI:", esp.rssi)
+print("Connected to", str(radio.ssid, "utf-8"), "\tRSSI:", radio.rssi)
 
-# Initialize a requests object with a socket and esp32spi interface
-socket.set_interface(esp)
-requests.set_socket(socket, esp)
+# Initialize a requests session
+ssl_context = adafruit_connection_manager.create_fake_ssl_context(pool, radio)
+requests = adafruit_requests.Session(pool, ssl_context)
 
-JSON_GET_URL = "http://httpbin.org/get"
+JSON_GET_URL = "https://httpbin.org/get"
 
 # Define a custom header as a dict.
 headers = {"user-agent": "blinka/1.0.0"}