uk_bin_collection 0.102.0__py3-none-any.whl → 0.104.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -1,4 +1,11 @@
 {
+    "AberdeenshireCouncil": {
+        "url": "https://online.aberdeenshire.gov.uk",
+        "wiki_command_url_override": "https://online.aberdeenshire.gov.uk",
+        "uprn": "151176430",
+        "wiki_name": "Aberdeenshire Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "AdurAndWorthingCouncils": {
         "url": "https://www.adur-worthing.gov.uk/bin-day/?brlu-selected-address=100061878829",
         "wiki_command_url_override": "https://www.adur-worthing.gov.uk/bin-day/?brlu-selected-address=XXXXXXXX",
@@ -201,6 +208,13 @@
         "wiki_name": "Cannock Chase District Council",
         "wiki_note": "To get the UPRN, you can use [FindMyAddress](https://www.findmyaddress.co.uk/search)"
     },
+    "CanterburyCityCouncil": {
+        "url": "https://www.canterbury.gov.uk",
+        "wiki_command_url_override": "https://www.canterbury.gov.uk",
+        "uprn": "10094583181",
+        "wiki_name": "Canterbury City Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "CardiffCouncil": {
         "skip_get_url": true,
         "uprn": "100100112419",
@@ -367,7 +381,7 @@
     },
     "EastDevonDC": {
         "url": "https://eastdevon.gov.uk/recycling-and-waste/recycling-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=010090909915",
-        "wiki_command_url_override": "https://eastdevon.gov.uk/recycling-waste/recycling-and-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=XXXXXXXX",
+        "wiki_command_url_override": "https://eastdevon.gov.uk/recycling-and-waste/recycling-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=XXXXXXXX",
         "wiki_name": "East Devon District Council",
         "wiki_note": "Replace XXXXXXXX with UPRN."
     },
@@ -681,6 +695,13 @@
         "wiki_name": "London Borough Redbridge",
         "wiki_note": "Follow the instructions [here](https://my.redbridge.gov.uk/RecycleRefuse) until you get the page listing your \"Address\" then copy the entire address text and use that in the house number field."
     },
+    "LutonBoroughCouncil": {
+        "url": "https://myforms.luton.gov.uk",
+        "wiki_command_url_override": "https://myforms.luton.gov.uk",
+        "uprn": "100080155778",
+        "wiki_name": "Luton Borough Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "MaldonDistrictCouncil": {
         "skip_get_url": true,
         "uprn": "100090557253",
@@ -1189,6 +1210,13 @@
         "url": "https://www1.swansea.gov.uk/recyclingsearch/",
         "wiki_name": "SwanseaCouncil"
     },
+    "SwindonBoroughCouncil": {
+        "url": "https://www.swindon.gov.uk",
+        "wiki_command_url_override": "https://www.swindon.gov.uk",
+        "uprn": "10022793351",
+        "wiki_name": "Swindon Borough Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "TamesideMBCouncil": {
         "skip_get_url": true,
         "uprn": "100012835362",
@@ -1369,6 +1397,15 @@
         "url": "https://www.northampton.gov.uk/info/200084/bins-waste-and-recycling/1602/check-your-collection-day",
         "wiki_name": "West Northamptonshire Council"
     },
+    "WestOxfordshireDistrictCouncil": {
+        "house_number": "24",
+        "postcode": "OX28 1YA",
+        "skip_get_url": true,
+        "url": "https://community.westoxon.gov.uk/s/waste-collection-enquiry",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "West Oxfordshire District Council",
+        "wiki_note": "Pass the full address in the house number and postcode in"
+    },
     "WestSuffolkCouncil": {
         "postcode": "IP28 6DR",
         "skip_get_url": true,

uk_bin_collection/uk_bin_collection/councils/AberdeenshireCouncil.py

@@ -0,0 +1,52 @@
+import requests
+from bs4 import BeautifulSoup
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        URI = f"https://online.aberdeenshire.gov.uk/Apps/Waste-Collections/Routes/Route/{user_uprn}"
+
+        # Make the GET request
+        response = requests.get(URI)
+
+        soup = BeautifulSoup(response.content, features="html.parser")
+        soup.prettify()
+
+        for collection in soup.find("table").find("tbody").find_all("tr"):
+            th = collection.find("th")
+            if th:
+                continue
+            td = collection.find_all("td")
+            collection_date = datetime.strptime(
+                td[0].text,
+                "%d/%m/%Y %A",
+            )
+            bin_type = td[1].text.split(" and ")
+
+            for bin in bin_type:
+                dict_data = {
+                    "type": bin,
+                    "collectionDate": collection_date.strftime(date_format),
+                }
+                bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py

@@ -1,13 +1,13 @@
-from uk_bin_collection.uk_bin_collection.common import *
+import requests
+import json
+from datetime import datetime
+from uk_bin_collection.uk_bin_collection.common import check_uprn, date_format as DATE_FORMAT
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
 
-# import the wonderful Beautiful Soup and the URL grabber
 class CouncilClass(AbstractGetBinDataClass):
     """
-    Concrete classes have to implement all abstract operations of the
-    base class. They can also override some operations with a default
-    implementation.
+    Concrete class that implements the abstract bin data fetching and parsing logic.
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
@@ -18,64 +18,67 @@ class CouncilClass(AbstractGetBinDataClass):
         check_uprn(uprn)
 
         payload = {
-            # Add your payload details here (replace this with the actual payload structure if required)
             "uprn": uprn
         }
 
-        # Headers for the request
-        headers = {
-            "Content-Type": "application/json"
-        }
+        headers = {"Content-Type": "application/json"}
 
         response = requests.post(url_base, data=json.dumps(payload), headers=headers)
 
-        # Ensure the request was successful
         if response.status_code == 200:
             data = response.json()
 
             # Initialize an empty list to store the bin collection details
-
             bins = []
 
             # Function to add collection details to bins list
             def add_collection(service_name, collection_data):
-                bins.append({
-                    "type": service_name,
-                    "collectionDate": collection_data.get("current_collection_date")
-                })
+                bins.append(
+                    {
+                        "type": service_name,
+                        "collectionDate": collection_data.get("current_collection_date"),
+                    }
+                )
 
-            # Extract refuse information
-            available_services = data["refuse"]["available_services"]
+            available_services = data.get("refuse", {}).get("available_services", {})
+
+            date_format = "%d-%m-%Y"  # Define the desired date format
 
             for service_name, service_data in available_services.items():
-                # Append the service name and current collection date to the "bins" list
+                # Handle the different cases of service data
                 match service_data["container"]:
                     case "Green Wheelie Bin":
-                        subscription_status = service_data["subscription"]["active"] if service_data["subscription"] else False
-                        type_descr = f"Green Wheelie Bin ({"Active" if subscription_status else "Expired"})"
+                        subscription_status = (
+                            service_data["subscription"]["active"]
+                            if service_data.get("subscription")
+                            else False
+                        )
+                        type_descr = f"Green Wheelie Bin ({'Active' if subscription_status else 'Expired'})"
                     case "N/A":
-                        type_descr = service_data["name"]
+                        type_descr = service_data.get("name", "Unknown Service")
                     case _:
-                        type_descr = service_data["container"]
-
+                        type_descr = service_data.get("container", "Unknown Container")
 
                 date_str = service_data.get("current_collection_date")
-                # Parse the date string into a datetime object
-                date_obj = datetime.strptime(date_str, "%Y-%m-%d")
-
-                # Convert the datetime object to the desired format
-                formatted_date = date_obj.strftime(date_format)
-
-                bins.append({
-                    "type": type_descr,  # Use service name from the data
-                    "collectionDate": formatted_date
-                })
+                if date_str:  # Ensure the date string exists
+                    try:
+                        # Parse and format the date string
+                        date_obj = datetime.strptime(date_str, "%Y-%m-%d")
+                        formatted_date = date_obj.strftime(DATE_FORMAT)
+                    except ValueError:
+                        formatted_date = "Invalid Date"
+                else:
+                    formatted_date = "No Collection Date"
+
+                bins.append(
+                    {
+                        "type": type_descr,  # Use service name from the data
+                        "collectionDate": formatted_date,
+                    }
+                )
 
         else:
             print(f"Failed to fetch data. Status code: {response.status_code}")
+            return {}
 
-        data = {
-            "bins": bins
-        }
-
-        return data
+        return {"bins": bins}

uk_bin_collection/uk_bin_collection/councils/BelfastCityCouncil.py

@@ -9,7 +9,6 @@ from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
 
-
 # import the wonderful Beautiful Soup and the URL grabber
 class CouncilClass(AbstractGetBinDataClass):
     """
@@ -34,7 +33,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
         session = requests.Session()
         session.headers.update(headers)
-        
+
         user_uprn = kwargs.get("uprn")
         user_postcode = kwargs.get("postcode")
         URL = "https://online.belfastcity.gov.uk/find-bin-collection-day/Default.aspx"
@@ -47,14 +46,16 @@ class CouncilClass(AbstractGetBinDataClass):
             "__EVENTTARGET": "",
             "__EVENTARGUMENT": "",
             "__VIEWSTATE": self.get_session_variable(soup, "__VIEWSTATE"),
-            "__VIEWSTATEGENERATOR": self.get_session_variable(soup, "__VIEWSTATEGENERATOR"),
+            "__VIEWSTATEGENERATOR": self.get_session_variable(
+                soup, "__VIEWSTATEGENERATOR"
+            ),
             "__SCROLLPOSITIONX": "0",
             "__SCROLLPOSITIONY": "0",
             "__EVENTVALIDATION": self.get_session_variable(soup, "__EVENTVALIDATION"),
             "ctl00$MainContent$searchBy_radio": "P",
             "ctl00$MainContent$Street_textbox": "",
             "ctl00$MainContent$Postcode_textbox": user_postcode,
-            "ctl00$MainContent$AddressLookup_button": "Find address"
+            "ctl00$MainContent$AddressLookup_button": "Find address",
         }
 
         # Build intermediate ASP.NET variables for uprn Select address
@@ -65,7 +66,9 @@ class CouncilClass(AbstractGetBinDataClass):
             "__EVENTTARGET": "",
             "__EVENTARGUMENT": "",
             "__VIEWSTATE": self.get_session_variable(soup, "__VIEWSTATE"),
-            "__VIEWSTATEGENERATOR": self.get_session_variable(soup, "__VIEWSTATEGENERATOR"),
+            "__VIEWSTATEGENERATOR": self.get_session_variable(
+                soup, "__VIEWSTATEGENERATOR"
+            ),
             "__SCROLLPOSITIONX": "0",
             "__SCROLLPOSITIONY": "0",
             "__EVENTVALIDATION": self.get_session_variable(soup, "__EVENTVALIDATION"),
@@ -73,14 +76,14 @@ class CouncilClass(AbstractGetBinDataClass):
             "ctl00$MainContent$Street_textbox": "",
             "ctl00$MainContent$Postcode_textbox": user_postcode,
             "ctl00$MainContent$lstAddresses": user_uprn,
-            "ctl00$MainContent$SelectAddress_button": "Select address"
+            "ctl00$MainContent$SelectAddress_button": "Select address",
         }
 
         # Actual http call to get Bins Data
         response = session.post(URL, data=form_data)
         response.raise_for_status()
         soup = BeautifulSoup(response.text, "html.parser")
-        
+
         # Find Bins table and data
         table = soup.find("div", {"id": "binsGrid"})
         if table:
@@ -91,7 +94,9 @@ class CouncilClass(AbstractGetBinDataClass):
                     collection_type = columns[0].get_text(strip=True)
                     collection_date_raw = columns[3].get_text(strip=True)
                     # if the month number is a single digit there are 2 spaces, stripping all spaces to make it consistent
-                    collection_date = datetime.strptime(collection_date_raw.replace(" ", ""),'%a%b%d%Y')
+                    collection_date = datetime.strptime(
+                        collection_date_raw.replace(" ", ""), "%a%b%d%Y"
+                    )
                     bin_entry = {
                         "type": collection_type,
                         "collectionDate": collection_date.strftime(date_format),

uk_bin_collection/uk_bin_collection/councils/BexleyCouncil.py

@@ -45,17 +45,13 @@ class CouncilClass(AbstractGetBinDataClass):
             )
             inputElement_postcodesearch.send_keys(user_postcode)
 
-
-
             find_address_btn = wait.until(
                 EC.element_to_be_clickable((By.XPATH, '//*[@id="sub"]'))
             )
             find_address_btn.click()
 
             dropdown_options = wait.until(
-                EC.presence_of_element_located(
-                    (By.XPATH, '//*[@id="address"]')
-                )
+                EC.presence_of_element_located((By.XPATH, '//*[@id="address"]'))
             )
             time.sleep(2)
             dropdown_options.click()
@@ -71,11 +67,8 @@ class CouncilClass(AbstractGetBinDataClass):
             # Click the element
             address.click()
 
-
             submit_address = wait.until(
-                EC.presence_of_element_located(
-                    (By.XPATH, '//*[@id="go"]')
-                )
+                EC.presence_of_element_located((By.XPATH, '//*[@id="go"]'))
             )
             time.sleep(2)
             submit_address.click()
@@ -83,13 +76,11 @@ class CouncilClass(AbstractGetBinDataClass):
             results_found = wait.until(
                 EC.element_to_be_clickable(
                     (By.XPATH, '//h1[contains(text(), "Your bin days")]')
-                )           
                 )
+            )
 
             final_page = wait.until(
-                EC.presence_of_element_located(
-                    (By.CLASS_NAME, "waste__collections")
-                )
+                EC.presence_of_element_located((By.CLASS_NAME, "waste__collections"))
             )
 
             soup = BeautifulSoup(driver.page_source, features="html.parser")
@@ -103,29 +94,41 @@ class CouncilClass(AbstractGetBinDataClass):
             # Loop through each bin field
             for bin_section in bin_sections:
                 # Extract the bin type (e.g., "Brown Caddy", "Green Wheelie Bin", etc.)
-                bin_type = bin_section.get_text(strip=True).split("\n")[0]  # The first part is the bin type
+                bin_type = bin_section.get_text(strip=True).split("\n")[
+                    0
+                ]  # The first part is the bin type
 
                 # Find the next sibling <dl> tag that contains the next collection information
                 summary_list = bin_section.find_next("dl", class_="govuk-summary-list")
 
                 if summary_list:
                     # Now, instead of finding by class, we'll search by text within the dt element
-                    next_collection_dt = summary_list.find("dt", string=lambda text: "Next collection" in text)
+                    next_collection_dt = summary_list.find(
+                        "dt", string=lambda text: "Next collection" in text
+                    )
 
                     if next_collection_dt:
                         # Find the sibling <dd> tag for the collection date
-                        next_collection = next_collection_dt.find_next_sibling("dd").get_text(strip=True)
+                        next_collection = next_collection_dt.find_next_sibling(
+                            "dd"
+                        ).get_text(strip=True)
 
                         if next_collection:
                             try:
                                 # Parse the next collection date (assuming the format is like "Tuesday 15 October 2024")
-                                parsed_date = datetime.strptime(next_collection, "%A %d %B %Y")
+                                parsed_date = datetime.strptime(
+                                    next_collection, "%A %d %B %Y"
+                                )
 
                                 # Add the bin information to the data dictionary
-                                data["bins"].append({
-                                    "type": bin_type,
-                                    "collectionDate": parsed_date.strftime(date_format),
-                                })
+                                data["bins"].append(
+                                    {
+                                        "type": bin_type,
+                                        "collectionDate": parsed_date.strftime(
+                                            date_format
+                                        ),
+                                    }
+                                )
                             except ValueError as e:
                                 print(f"Error parsing date for {bin_type}: {e}")
                         else:

uk_bin_collection/uk_bin_collection/councils/BoltonCouncil.py

@@ -82,7 +82,7 @@ class CouncilClass(AbstractGetBinDataClass):
                 bin_type = " ".join(words).capitalize()
                 date_list = item.find_all("p")
                 for d in date_list:
-                    clean_date_str = re.sub(r'[^A-Za-z0-9 ]+', '', d.text.strip())
+                    clean_date_str = re.sub(r"[^A-Za-z0-9 ]+", "", d.text.strip())
                     next_collection = datetime.strptime(clean_date_str, "%A %d %B %Y")
                     collections.append((bin_type, next_collection))
 

uk_bin_collection/uk_bin_collection/councils/CanterburyCityCouncil.py

@@ -0,0 +1,54 @@
+import time
+
+import requests
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        data = {"uprn": user_uprn, "usrn": "1"}
+
+        URI = (
+            "https://zbr7r13ke2.execute-api.eu-west-2.amazonaws.com/Beta/get-bin-dates"
+        )
+
+        # Make the GET request
+        response = requests.post(URI, json=data)
+        response.raise_for_status()
+
+        # Parse the JSON response
+        bin_collection = json.loads(response.json()["dates"])
+        collections = {
+            "General": bin_collection["blackBinDay"],
+            "Recycling": bin_collection["recyclingBinDay"],
+            "Food": bin_collection["foodBinDay"],
+            "Garden": bin_collection["gardenBinDay"],
+        }
+        # Loop through each collection in bin_collection
+        for collection in collections:
+            print(collection)
+
+            if len(collections[collection]) <= 0:
+                continue
+            for date in collections[collection]:
+                date = (
+                    datetime.strptime(date, "%Y-%m-%dT%H:%M:%S").strftime("%d/%m/%Y"),
+                )
+                dict_data = {"type": collection, "collectionDate": date[0]}
+                bindata["bins"].append(dict_data)
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py

@@ -1,26 +1,41 @@
-from bs4 import BeautifulSoup
+from typing import Dict, Any, Optional
+from bs4 import BeautifulSoup, Tag, NavigableString
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
-#Cheshire East
+"""
+This module provides bin collection data for Cheshire East Council.
+"""
+
+
 class CouncilClass(AbstractGetBinDataClass):
-    def parse_data(self, page: str, **kwargs) -> dict:
+    """
+    A class to fetch and parse bin collection data for Cheshire East Council.
+    """
+
+    def parse_data(self, page: Any, **kwargs: Any) -> Dict[str, Any]:
         soup = BeautifulSoup(page.text, features="html.parser")
 
-        bin_data_dict = {"bins": []}
+        bin_data_dict: Dict[str, Any] = {"bins": []}
 
-        table = soup.find("table", {"class": "job-details"})
-        if table:
+        table: Optional[Tag | NavigableString] = soup.find(
+            "table", {"class": "job-details"}
+        )
+        if isinstance(table, Tag):  # Ensure we only proceed if 'table' is a Tag
             rows = table.find_all("tr", {"class": "data-row"})
 
             for row in rows:
                 cells = row.find_all(
-                    "td", {"class": lambda L: L and L.startswith("visible-cell")}
+                    "td",
+                    {
+                        "class": lambda L: isinstance(L, str)
+                        and L.startswith("visible-cell")
+                    },  # Explicitly check if L is a string
                 )
-                labels = cells[0].find_all("label") if cells else []
+                labels: list[Tag] = cells[0].find_all("label") if cells else []
 
                 if len(labels) >= 3:
-                    bin_type = labels[2].get_text(strip=True)
-                    collection_date = labels[1].get_text(strip=True)
+                    bin_type: str = labels[2].get_text(strip=True)
+                    collection_date: str = labels[1].get_text(strip=True)
 
                     bin_data_dict["bins"].append(
                         {

uk_bin_collection/uk_bin_collection/councils/CornwallCouncil.py

@@ -4,7 +4,6 @@ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataC
 from dateutil.relativedelta import relativedelta
 
 
-
 # import the wonderful Beautiful Soup and the URL grabber
 class CouncilClass(AbstractGetBinDataClass):
     """
@@ -23,37 +22,39 @@ class CouncilClass(AbstractGetBinDataClass):
         check_uprn(user_uprn)
 
         headers = {
-            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
-            'Accept-Language': 'en-GB,en;q=0.9',
-            'Cache-Control': 'no-cache',
-            'Connection': 'keep-alive',
-            'Pragma': 'no-cache',
-            'Sec-Fetch-Dest': 'document',
-            'Sec-Fetch-Mode': 'navigate',
-            'Sec-Fetch-Site': 'none',
-            'Sec-Fetch-User': '?1',
-            'Upgrade-Insecure-Requests': '1',
-            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.6422.143 Safari/537.36',
-            'sec-ch-ua': '"Opera GX";v="111", "Chromium";v="125", "Not.A/Brand";v="24"',
-            'sec-ch-ua-mobile': '?0',
-            'sec-ch-ua-platform': '"Windows"',
+            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+            "Accept-Language": "en-GB,en;q=0.9",
+            "Cache-Control": "no-cache",
+            "Connection": "keep-alive",
+            "Pragma": "no-cache",
+            "Sec-Fetch-Dest": "document",
+            "Sec-Fetch-Mode": "navigate",
+            "Sec-Fetch-Site": "none",
+            "Sec-Fetch-User": "?1",
+            "Upgrade-Insecure-Requests": "1",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.6422.143 Safari/537.36",
+            "sec-ch-ua": '"Opera GX";v="111", "Chromium";v="125", "Not.A/Brand";v="24"',
+            "sec-ch-ua-mobile": "?0",
+            "sec-ch-ua-platform": '"Windows"',
         }
         params = {
-            'uprn': f'{user_uprn}',
+            "uprn": f"{user_uprn}",
             # 'uprn': f'100040128734',
         }
         response = requests.get(
-            'https://www.cornwall.gov.uk/umbraco/surface/waste/MyCollectionDays',
+            "https://www.cornwall.gov.uk/umbraco/surface/waste/MyCollectionDays",
             params=params,
-            headers=headers
+            headers=headers,
         )
 
         soup = BeautifulSoup(response.text, features="html.parser")
         soup.prettify()
 
-        for item in soup.find_all('div', class_='collection text-center service'):
+        for item in soup.find_all("div", class_="collection text-center service"):
             bin_type = item.contents[1].text + " bin"
-            collection_date = datetime.strptime(item.contents[5].text, "%d %b").replace(year=curr_date.year)
+            collection_date = datetime.strptime(item.contents[5].text, "%d %b").replace(
+                year=curr_date.year
+            )
             if curr_date.month == 12 and collection_date.month == 1:
                 collection_date = collection_date + relativedelta(years=1)
             collections.append((bin_type, collection_date))