uk_bin_collection 0.102.0__tar.gz → 0.103.0__tar.gz

{uk_bin_collection-0.102.0 → uk_bin_collection-0.103.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.102.0
+Version: 0.103.0
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com

{uk_bin_collection-0.102.0 → uk_bin_collection-0.103.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.102.0"
+version = "0.103.0"
 description = "Python Lib to collect UK Bin Data"
 readme = "README.md"
 authors = ["Robert Bradley <robbrad182@gmail.com>"]

{uk_bin_collection-0.102.0 → uk_bin_collection-0.103.0}/uk_bin_collection/tests/input.json

@@ -367,7 +367,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."
     },

uk_bin_collection-0.103.0/uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py

@@ -0,0 +1,84 @@
+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
+
+
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete class that implements the abstract bin data fetching and parsing logic.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        url_base = "https://basildonportal.azurewebsites.net/api/getPropertyRefuseInformation"
+
+        uprn = kwargs.get("uprn")
+        # Check the UPRN is valid
+        check_uprn(uprn)
+
+        payload = {
+            "uprn": uprn
+        }
+
+        headers = {"Content-Type": "application/json"}
+
+        response = requests.post(url_base, data=json.dumps(payload), headers=headers)
+
+        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"),
+                    }
+                )
+
+            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():
+                # Handle the different cases of service data
+                match service_data["container"]:
+                    case "Green Wheelie Bin":
+                        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.get("name", "Unknown Service")
+                    case _:
+                        type_descr = service_data.get("container", "Unknown Container")
+
+                date_str = service_data.get("current_collection_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 {}
+
+        return {"bins": bins}

{uk_bin_collection-0.102.0 → uk_bin_collection-0.103.0}/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-0.102.0 → uk_bin_collection-0.103.0}/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-0.102.0 → uk_bin_collection-0.103.0}/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-0.103.0/uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py

@@ -0,0 +1,47 @@
+from typing import Dict, Any, Optional
+from bs4 import BeautifulSoup, Tag, NavigableString
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+"""
+This module provides bin collection data for Cheshire East Council.
+"""
+
+
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    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: Dict[str, Any] = {"bins": []}
+
+        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: isinstance(L, str)
+                        and L.startswith("visible-cell")
+                    },  # Explicitly check if L is a string
+                )
+                labels: list[Tag] = cells[0].find_all("label") if cells else []
+
+                if len(labels) >= 3:
+                    bin_type: str = labels[2].get_text(strip=True)
+                    collection_date: str = labels[1].get_text(strip=True)
+
+                    bin_data_dict["bins"].append(
+                        {
+                            "type": bin_type,
+                            "collectionDate": collection_date,
+                        }
+                    )
+
+        return bin_data_dict

{uk_bin_collection-0.102.0 → uk_bin_collection-0.103.0}/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))

{uk_bin_collection-0.102.0 → uk_bin_collection-0.103.0}/uk_bin_collection/uk_bin_collection/councils/EnfieldCouncil.py

@@ -56,9 +56,7 @@ class CouncilClass(AbstractGetBinDataClass):
             postcode_input.send_keys(user_postcode)
 
             find_address_button = WebDriverWait(driver, 10).until(
-                EC.presence_of_element_located(
-                    (By.ID, 'submitButton0')
-                )
+                EC.presence_of_element_located((By.ID, "submitButton0"))
             )
             find_address_button.click()
 
@@ -80,7 +78,7 @@ class CouncilClass(AbstractGetBinDataClass):
             template_parts = first_option.split(", ")
             template_parts[0] = user_paon  # Replace the first part with user_paon
 
-            addr_label =  ", ".join(template_parts)
+            addr_label = ", ".join(template_parts)
             for addr_option in select.options:
                 option_name = addr_option.accessible_name[0 : len(addr_label)]
                 if option_name == addr_label:
@@ -100,32 +98,27 @@ class CouncilClass(AbstractGetBinDataClass):
             # Find the div with the specified id
             target_div = soup.find("div", {"id": target_div_id})
 
-
             # Check if the div is found
             if target_div:
                 bin_data = {"bins": []}
 
-                for bin_div in target_div.find_all(
-                    "div"
-                ):
+                for bin_div in target_div.find_all("div"):
                     # Extract the collection date from the message
                     try:
                         bin_collection_message = bin_div.find("p").text.strip()
                         date_pattern = r"\b\d{2}/\d{2}/\d{4}\b"
 
                         collection_date_string = (
-                        re.search(date_pattern, bin_div.text)
-                        .group(0)
-                        .strip()
-                        .replace(",", "")
-                    )
+                            re.search(date_pattern, bin_div.text)
+                            .group(0)
+                            .strip()
+                            .replace(",", "")
+                        )
                     except AttributeError:
                         continue
 
                     current_date = datetime.now()
-                    parsed_date = datetime.strptime(
-                        collection_date_string, "%d/%m/%Y"
-                    )
+                    parsed_date = datetime.strptime(collection_date_string, "%d/%m/%Y")
                     # Check if the parsed date is in the past and not today
                     if parsed_date.date() < current_date.date():
                         # If so, set the year to the next year
@@ -137,9 +130,14 @@ class CouncilClass(AbstractGetBinDataClass):
                     contains_date(formatted_date)
 
                     # Extract the bin type from the message
-                    bin_type_match = re.search(r"Your next (.*?) collection", bin_collection_message)
+                    bin_type_match = re.search(
+                        r"Your next (.*?) collection", bin_collection_message
+                    )
                     if bin_type_match:
-                        bin_info = {"type": bin_type_match.group(1), "collectionDate": formatted_date}
+                        bin_info = {
+                            "type": bin_type_match.group(1),
+                            "collectionDate": formatted_date,
+                        }
                         bin_data["bins"].append(bin_info)
             else:
                 raise ValueError("Collection data not found.")

{uk_bin_collection-0.102.0 → uk_bin_collection-0.103.0}/uk_bin_collection/uk_bin_collection/councils/GedlingBoroughCouncil.py

@@ -16,7 +16,7 @@ class CouncilClass(AbstractGetBinDataClass):
     def parse_data(self, page: str, **kwargs) -> dict:
         data = {"bins": []}
         collections = []
-        selected_collections = kwargs.get("paon").split(',')
+        selected_collections = kwargs.get("paon").split(",")
         calendar_urls = []
         run_date = datetime.now().date()
 
@@ -25,9 +25,13 @@ class CouncilClass(AbstractGetBinDataClass):
         for item in selected_collections:
             item = item.strip().lower().replace(" ", "_")
             if has_numbers(item):
-                calendar_urls.append(f"https://www.gbcbincalendars.co.uk/json/gedling_borough_council_{item}_bin_schedule.json")
+                calendar_urls.append(
+                    f"https://www.gbcbincalendars.co.uk/json/gedling_borough_council_{item}_bin_schedule.json"
+                )
             else:
-                calendar_urls.append(f"https://www.gbcbincalendars.co.uk/json/gedling_borough_council_{item}_garden_bin_schedule.json")
+                calendar_urls.append(
+                    f"https://www.gbcbincalendars.co.uk/json/gedling_borough_council_{item}_garden_bin_schedule.json"
+                )
 
         # Parse each URL and load future data
         for url in calendar_urls:
@@ -36,7 +40,9 @@ class CouncilClass(AbstractGetBinDataClass):
                 raise ConnectionError(f"Could not get response from: {url}")
             json_data = response.json()["collectionDates"]
             for col in json_data:
-                bin_date = datetime.strptime(col.get("collectionDate"), "%Y-%m-%d").date()
+                bin_date = datetime.strptime(
+                    col.get("collectionDate"), "%Y-%m-%d"
+                ).date()
                 if bin_date >= run_date:
                     collections.append((col.get("alternativeName"), bin_date))
 

{uk_bin_collection-0.102.0 → uk_bin_collection-0.103.0}/uk_bin_collection/uk_bin_collection/councils/IslingtonCouncil.py

@@ -29,9 +29,11 @@ class CouncilClass(AbstractGetBinDataClass):
                 waste_type = row.find("th").text.strip()
                 next_collection = parse(row.find("td").text.strip()).date()
 
-                data['bins'].append({
-                    "type": waste_type,
-                    "collectionDate": next_collection.strftime(date_format),
-                })
+                data["bins"].append(
+                    {
+                        "type": waste_type,
+                        "collectionDate": next_collection.strftime(date_format),
+                    }
+                )
 
         return data

{uk_bin_collection-0.102.0 → uk_bin_collection-0.103.0}/uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py

@@ -7,6 +7,7 @@ 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
 
+
 class CouncilClass(AbstractGetBinDataClass):
     def parse_data(self, page: str, **kwargs) -> dict:
 
@@ -14,7 +15,9 @@ class CouncilClass(AbstractGetBinDataClass):
         check_postcode(user_postcode)
 
         # Fetch the page content
-        root_url = "https://myproperty.molevalley.gov.uk/molevalley/api/live_addresses/{}?format=json".format(user_postcode)
+        root_url = "https://myproperty.molevalley.gov.uk/molevalley/api/live_addresses/{}?format=json".format(
+            user_postcode
+        )
         response = requests.get(root_url, verify=False)
 
         if not response.ok:
@@ -63,23 +66,27 @@ class CouncilClass(AbstractGetBinDataClass):
         if bins_panel:
             panel = bins_panel.find_parent("div", class_="panel")
             print("Found 'Bins and Recycling' panel.")
-            
+
             # Extract bin collection info from the un-commented HTML
             for strong_tag in panel.find_all("strong"):
                 bin_type = strong_tag.text.strip()
                 collection_string = strong_tag.find_next("p").text.strip()
-                
+
                 # Debugging output
                 print(f"Processing bin type: {bin_type}")
                 print(f"Collection string: {collection_string}")
-                
+
                 match = regex_date.search(collection_string)
                 if match:
-                    collection_date = datetime.strptime(match.group(1), "%d/%m/%Y").date()
-                    data["bins"].append({
-                        "type": bin_type,
-                        "collectionDate": collection_date.strftime("%d/%m/%Y"),
-                    })
+                    collection_date = datetime.strptime(
+                        match.group(1), "%d/%m/%Y"
+                    ).date()
+                    data["bins"].append(
+                        {
+                            "type": bin_type,
+                            "collectionDate": collection_date.strftime("%d/%m/%Y"),
+                        }
+                    )
                     all_collection_dates.append(collection_date)
                 else:
                     # Add a debug line to show which collections are missing dates
@@ -88,7 +95,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Search for additional collections like electrical and textiles
             for p in panel.find_all("p"):
                 additional_match = regex_additional_collection.match(p.text.strip())
-                
+
                 # Debugging output for additional collections
                 if additional_match:
                     bin_type = additional_match.group(1)
@@ -96,23 +103,33 @@ class CouncilClass(AbstractGetBinDataClass):
                     if "each collection day" in additional_match.group(2):
                         if all_collection_dates:
                             collection_date = min(all_collection_dates)
-                            data["bins"].append({
-                                "type": bin_type,
-                                "collectionDate": collection_date.strftime("%d/%m/%Y"),
-                            })
+                            data["bins"].append(
+                                {
+                                    "type": bin_type,
+                                    "collectionDate": collection_date.strftime(
+                                        "%d/%m/%Y"
+                                    ),
+                                }
+                            )
                         else:
-                            print("No collection dates available for additional collection.")
+                            print(
+                                "No collection dates available for additional collection."
+                            )
                             raise ValueError("No valid bin collection dates found.")
                 else:
-                    print(f"No additional collection found in paragraph: {p.text.strip()}")
+                    print(
+                        f"No additional collection found in paragraph: {p.text.strip()}"
+                    )
         else:
-            raise ValueError("Unable to find 'Bins and Recycling' panel in the HTML data.")
+            raise ValueError(
+                "Unable to find 'Bins and Recycling' panel in the HTML data."
+            )
 
         # Debugging to check collected data
         print(f"Collected bin data: {data}")
-        
+
         # Handle the case where no collection dates were found
         if not all_collection_dates:
             raise ValueError("No valid collection dates were found in the data.")
-        
-        return data
+
+        return data