uk_bin_collection 0.101.0__py3-none-any.whl → 0.103.0__py3-none-any.whl

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/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/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))

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/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/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/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

uk_bin_collection/uk_bin_collection/councils/NorthTynesideCouncil.py

@@ -23,7 +23,7 @@ class CouncilClass(AbstractGetBinDataClass):
         # Get the first form
         response = s.get(
             "https://my.northtyneside.gov.uk/category/81/bin-collection-dates",
-            verify = False,
+            verify=False,
         )
 
         # Find the form ID and submit with a postcode
@@ -31,13 +31,13 @@ class CouncilClass(AbstractGetBinDataClass):
         form_build_id = soup.find("input", {"name": "form_build_id"})["value"]
         response = s.post(
             "https://my.northtyneside.gov.uk/category/81/bin-collection-dates",
-            data = {
+            data={
                 "postcode": user_postcode,
                 "op": "Find",
                 "form_build_id": form_build_id,
                 "form_id": "ntc_address_wizard",
             },
-            verify = False,
+            verify=False,
         )
 
         # Find the form ID and submit with the UPRN
@@ -45,18 +45,18 @@ class CouncilClass(AbstractGetBinDataClass):
         form_build_id = soup.find("input", {"name": "form_build_id"})["value"]
         response = s.post(
             "https://my.northtyneside.gov.uk/category/81/bin-collection-dates",
-            data = {
+            data={
                 "house_number": f"0000{user_uprn}",
                 "op": "Use",
                 "form_build_id": form_build_id,
                 "form_id": "ntc_address_wizard",
             },
-            verify = False,
+            verify=False,
         )
 
         # Parse form page and get the day of week and week offsets
         soup = BeautifulSoup(response.text, features="html.parser")
-        info_section  = soup.find("section", {"class": "block block-ntc-bins clearfix"})
+        info_section = soup.find("section", {"class": "block block-ntc-bins clearfix"})
 
         regular_day, garden_day, special_day = None, None, None
         # Get day of week and week label for refuse, garden and special collections.
@@ -82,7 +82,9 @@ class CouncilClass(AbstractGetBinDataClass):
         weeks_total = math.floor((datetime(2026, 4, 1) - datetime.now()).days / 7)
 
         # The garden calendar only shows until end of November 2024, work out how many weeks that is
-        garden_weeks_total = math.floor((datetime(2024, 12, 1) - datetime.now()).days / 7)
+        garden_weeks_total = math.floor(
+            (datetime(2024, 12, 1) - datetime.now()).days / 7
+        )
 
         regular_collections, garden_collections, special_collections = [], [], []
         # Convert day text to series of dates using previous calculation
@@ -134,10 +136,10 @@ class CouncilClass(AbstractGetBinDataClass):
 
         return {
             "bins": [
-                    {
+                {
                     "type": item[0],
                     "collectionDate": item[1].strftime(date_format),
                 }
                 for item in sorted(collections, key=lambda x: x[1])
             ]
-        }
+        }

uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py

@@ -36,8 +36,7 @@ class CouncilClass(AbstractGetBinDataClass):
                     collection_date = datetime.strptime(
                         remove_ordinal_indicator_from_date_string(
                             week_text[0].split(" - ")[0]
-                        )
-                        .strip(),
+                        ).strip(),
                         "%A %d %B",
                     )
                     next_collection = collection_date.replace(year=datetime.now().year)

uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py

@@ -17,7 +17,9 @@ class CouncilClass(AbstractGetBinDataClass):
         check_uprn(user_uprn)
 
         response = requests.post(
-            "https://www.rotherham.gov.uk/bin-collections?address={}&submit=Submit".format(user_uprn)
+            "https://www.rotherham.gov.uk/bin-collections?address={}&submit=Submit".format(
+                user_uprn
+            )
         )
         # Make a BS4 object
         soup = BeautifulSoup(response.text, features="html.parser")
@@ -25,15 +27,15 @@ class CouncilClass(AbstractGetBinDataClass):
 
         data = {"bins": []}
 
-        table = soup.select('table')[0]
+        table = soup.select("table")[0]
 
         if table:
-            rows = table.select('tr')
+            rows = table.select("tr")
 
             for index, row in enumerate(rows):
-                bin_info_cell = row.select('td')
-                if bin_info_cell: 
-                    bin_type = bin_info_cell[0].get_text(separator=' ', strip=True)
+                bin_info_cell = row.select("td")
+                if bin_info_cell:
+                    bin_type = bin_info_cell[0].get_text(separator=" ", strip=True)
                     bin_collection = bin_info_cell[1]
 
                     if bin_collection:

uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py

@@ -3,6 +3,7 @@ from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 from datetime import datetime
 
+
 class CouncilClass(AbstractGetBinDataClass):
     """
     Concrete class to scrape bin collection data.
@@ -25,23 +26,23 @@ class CouncilClass(AbstractGetBinDataClass):
             data = {"bins": []}
             # Locate the section with bin collection data
             sections = soup.find_all("div", {"class": "wil_c-content-section_heading"})
-            
+
             for s in sections:
                 if s.get_text(strip=True).lower() == "bin collections":
                     rows = s.find_next_sibling(
                         "div", {"class": "c-content-section_body"}
                     ).find_all("div", class_="tablet:l-col-fb-4 u-mt-10")
-                    
+
                     for row in rows:
                         title_elem = row.find("div", class_="u-mb-4")
                         if title_elem:
                             title = title_elem.get_text(strip=True).capitalize()
-                            
+
                             # Find all collection info in the same section
                             collections = row.find_all("div", class_="u-mb-2")
                             for c in collections:
                                 text = c.get_text(strip=True).lower()
-                                
+
                                 if "next collection" in text:
                                     date_text = text.replace("next collection - ", "")
                                     try:
@@ -51,34 +52,43 @@ class CouncilClass(AbstractGetBinDataClass):
 
                                         dict_data = {
                                             "type": title,
-                                            "collectionDate": next_collection_date
+                                            "collectionDate": next_collection_date,
                                         }
                                         data["bins"].append(dict_data)
                                     except ValueError:
                                         # Skip if the date isn't a valid date
                                         print(f"Skipping invalid date: {date_text}")
-                                    
+
                             # Get future collections
                             future_collections_section = row.find("ul", class_="u-mt-4")
                             if future_collections_section:
-                                future_collections = future_collections_section.find_all("li")
+                                future_collections = (
+                                    future_collections_section.find_all("li")
+                                )
                                 for future_collection in future_collections:
-                                    future_date_text = future_collection.get_text(strip=True)
+                                    future_date_text = future_collection.get_text(
+                                        strip=True
+                                    )
                                     try:
                                         future_collection_date = datetime.strptime(
                                             future_date_text, "%A, %d %B %Y"
                                         ).strftime(date_format)
 
                                         # Avoid duplicates of next collection date
-                                        if future_collection_date != next_collection_date:
+                                        if (
+                                            future_collection_date
+                                            != next_collection_date
+                                        ):
                                             dict_data = {
                                                 "type": title,
-                                                "collectionDate": future_collection_date
+                                                "collectionDate": future_collection_date,
                                             }
                                             data["bins"].append(dict_data)
                                     except ValueError:
                                         # Skip if the future collection date isn't valid
-                                        print(f"Skipping invalid future date: {future_date_text}")
+                                        print(
+                                            f"Skipping invalid future date: {future_date_text}"
+                                        )
 
             # Sort the collections by date
             data["bins"].sort(

uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py

@@ -56,7 +56,7 @@ class CouncilClass(AbstractGetBinDataClass):
                     )
                 )
             ).click()
-            
+
             # Wait for the Show collection dates button to appear, then click it to get the collection dates
             inputElement_show_dates_button = WebDriverWait(driver, timeout).until(
                 EC.presence_of_element_located(

{uk_bin_collection-0.101.0.dist-info → uk_bin_collection-0.103.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.101.0
+Version: 0.103.0
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com
@@ -98,6 +98,24 @@ This integration can be installed directly via HACS. To install:
 1. Restart your Home Assistant.
 1. In the Home Assistant UI go to `Settings` > `Devices & Services` click `+ Add Integration` and search for `UK Bin Collection Data`.
 
+### Overriding the Bin Icon and Bin Colour
+We realise it is difficult to set a colour from the councils text for the Bin Type and to keep the integration generic we dont capture colour from a council(not all councils supply this as a field), only bin type and next collection date.
+
+When you configure the componenent on the first screen you can set a JSON string to map the bin type to the colour and icon
+
+Here is an example to set the colour and icon for the type `Empty Standard General Waste`. This type is the type returned from the council for the bin. You can do this for multiple bins.
+
+If you miss this on the first setup you can reconfigure it.
+
+```
+{     
+  "Empty Standard General Waste": 
+  {         
+    "icon": "mdi:trash-can",         
+    "color": "blue"     
+  }
+}
+
 ---
 
 ## Standalone Usage

{uk_bin_collection-0.101.0.dist-info → uk_bin_collection-0.103.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-cutwz5RoYYWZRLYx2tr6zIs_9Rc,3843
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
-uk_bin_collection/tests/input.json,sha256=tzx_1v1h_XLo3-dJHd5vHnX97dIJVHFjjAkC4allAXc,71114
+uk_bin_collection/tests/input.json,sha256=_AUgQoj2KfwyLGGCXBX-OkT0fjRVTpSxKcnpzbE2aS8,71114
 uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
 uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
 uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=LrOSt_loA1Mw3vTqaO2LpaDMu7rYJy6k5Kr-EOBln7s,3424
@@ -19,16 +19,16 @@ uk_bin_collection/uk_bin_collection/councils/AylesburyValeCouncil.py,sha256=Louq
 uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py,sha256=W7QBx6Mgso8RYosuXsaYo3GGNAu-tiyBSmuYxr1JSOU,1707
 uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py,sha256=Sd4-pbv0QZsR7soxvXYqsfdOUIqZqS6notyoZthG77s,9182
 uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py,sha256=MgF_7XyIcIoNzFR0OJsjBkLCZKgWxBrV6nTcutMxO1Q,4244
-uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py,sha256=SBvAa0GZM3V7ygK8ARawbHAPH6R_303U30RH8WYPi5Q,3020
+uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py,sha256=UBHINX8WknQfnHU43Wp5kXAqmHl00aWM0Fh8NQdWBZA,3244
 uk_bin_collection/uk_bin_collection/councils/BasingstokeCouncil.py,sha256=VPWGljnH4C3q8qs5ZmCtqjNjgWQvviALzjk00q3EZeQ,2632
 uk_bin_collection/uk_bin_collection/councils/BathAndNorthEastSomersetCouncil.py,sha256=N_TPiIv8VBzN3rY0p3JtLlxSEru-6k1wW4UNIhN5X1M,3709
 uk_bin_collection/uk_bin_collection/councils/BedfordBoroughCouncil.py,sha256=CvGB7w9HMn7XyEtwfd9MWZE_HlZ75pDcaKMsQJz0xhk,1669
 uk_bin_collection/uk_bin_collection/councils/BedfordshireCouncil.py,sha256=U1HOr9YLMAlFoZysfw5n04E0bVuCliO5Yj1FMiiwcHA,2549
-uk_bin_collection/uk_bin_collection/councils/BelfastCityCouncil.py,sha256=mspYVHO8fgoVIwogT6V2Go1tbf3PDbEmr8kZMJug5Gs,4235
-uk_bin_collection/uk_bin_collection/councils/BexleyCouncil.py,sha256=nzet8yKKzpiAQXDr0tmqXuJ4R-EdJqtxSNGiUCh79bA,5591
+uk_bin_collection/uk_bin_collection/councils/BelfastCityCouncil.py,sha256=SGOv9mm3fByyR3TQDyNcSLeidX_7FlHelkxnh-NUTcY,4327
+uk_bin_collection/uk_bin_collection/councils/BexleyCouncil.py,sha256=wqqCQZzu_q_pJrxTTlTrGGDgPB5EYgd4RiBy7nKnSHc,5835
 uk_bin_collection/uk_bin_collection/councils/BirminghamCityCouncil.py,sha256=now2xgpfshYM33UWC18j6xa6BuBydO5Sl7OrDQOo6b0,4687
 uk_bin_collection/uk_bin_collection/councils/BlackburnCouncil.py,sha256=jHbCK8sL09vdmdP7Xnh8lIrU5AHTnJLEZfOLephPvWg,4090
-uk_bin_collection/uk_bin_collection/councils/BoltonCouncil.py,sha256=r7wjrRPT2EinRMnYjGxmsCD6aMFhEOyRNd8_3R9PdQU,4117
+uk_bin_collection/uk_bin_collection/councils/BoltonCouncil.py,sha256=WI68r8jB0IHPUT4CgmZMtng899AAMFTxkyTdPg9yLF8,4117
 uk_bin_collection/uk_bin_collection/councils/BracknellForestCouncil.py,sha256=Llo1rULaAZ8rChVYZqXFFLo7CN6vbT0ULUJD6ActouY,9015
 uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py,sha256=VFrdcqKpHPw8v77Ll9QzBz_4carUfC1XYnxqUvDihkA,4275
 uk_bin_collection/uk_bin_collection/councils/BrightonandHoveCityCouncil.py,sha256=k6qt4cds-Ejd97Z-__pw2BYvGVbFdc9SUfF73PPrTNA,5823
@@ -43,13 +43,13 @@ uk_bin_collection/uk_bin_collection/councils/CardiffCouncil.py,sha256=_k3sT_WR-g
 uk_bin_collection/uk_bin_collection/councils/CastlepointDistrictCouncil.py,sha256=JVPYUIlU2ISgbUSr5AOOXNK6IFQFtQmhZyYIMAOedD4,3858
 uk_bin_collection/uk_bin_collection/councils/CharnwoodBoroughCouncil.py,sha256=tXfzMetN6wxahuGGRp2mIyCCDSL4F2aG61HhUxw6COQ,2172
 uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py,sha256=EB88D0MNJwuDZ2GX1ENc5maGYx17mnHTCtNl6s-v11E,5090
-uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py,sha256=VZQsiSZX7Wdta3cXCBOcLv-muLb9EVmmUDEHerWyR3o,1146
+uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py,sha256=aMqT5sy1Z1gklFO5Xl893OgeBmpf19OwpizWEKWQ3hg,1680
 uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py,sha256=M58kIHCAZu1K5qBp6_M4sw8nMvHz38YkoxY_sNuhvOI,4780
 uk_bin_collection/uk_bin_collection/councils/ChichesterDistrictCouncil.py,sha256=HxrLcJves7ZsE8FbooymeecTUmScY4R7Oi71vwCePPo,4118
 uk_bin_collection/uk_bin_collection/councils/ChorleyCouncil.py,sha256=M7HjuUaFq8aSnOf_9m1QS4MmPPMmPhF3mLHSrfDPtV0,5194
 uk_bin_collection/uk_bin_collection/councils/ColchesterCityCouncil.py,sha256=Mny-q2rQkWe2Tj1gINwEM1L4AkqQl1EDMAaKY0-deD4,3968
 uk_bin_collection/uk_bin_collection/councils/ConwyCountyBorough.py,sha256=el75qv2QyfWZBU09tJLvD8vLQZ9pCg73u1NBFs6ybo8,1034
-uk_bin_collection/uk_bin_collection/councils/CornwallCouncil.py,sha256=W7_wWHLbE0cyE90GkNaZHmR7Lbd2Aq48A1hKMUNO-vg,2806
+uk_bin_collection/uk_bin_collection/councils/CornwallCouncil.py,sha256=WZiz50svwyZgO8QKUCLy7hfFuy2HmAx5h-TG3yAweRA,2836
 uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py,sha256=_BEKZAjlS5Ad5DjyxqAEFSLn8F-KYox0zmn4BXaAD6A,2367
 uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py,sha256=QJH27plySbbmoNcLNUXq-hUiFmZ5zBlRS5mzOJgWSK8,11594
 uk_bin_collection/uk_bin_collection/councils/DacorumBoroughCouncil.py,sha256=Tm_6pvBPj-6qStbe6-02LXaoCOlnnDvVXAAocGVvf_E,3970
@@ -69,7 +69,7 @@ uk_bin_collection/uk_bin_collection/councils/EastRidingCouncil.py,sha256=oL-Nqri
 uk_bin_collection/uk_bin_collection/councils/EastSuffolkCouncil.py,sha256=qQ0oOfGd0sWcczse_B22YoeL9uj3og8v3UJLt_Sx29c,4353
 uk_bin_collection/uk_bin_collection/councils/EastleighBoroughCouncil.py,sha256=V4Vso4DvawFiezKlmXbTlJEK9Sjhz9nA8WeYjwtO2e4,2310
 uk_bin_collection/uk_bin_collection/councils/ElmbridgeBoroughCouncil.py,sha256=TgBOaReHWBbm0avV7HqRf0x7cxDe9cacTUcP9TFFprs,3005
-uk_bin_collection/uk_bin_collection/councils/EnfieldCouncil.py,sha256=HhKHlLciZKXViqcgkWme-wBUKlGhAs5LIpkKuRETvXM,6119
+uk_bin_collection/uk_bin_collection/councils/EnfieldCouncil.py,sha256=2yR5p-kdApOm1gHiynNECP0jQDvaYHOiT6MAQJAvunE,6144
 uk_bin_collection/uk_bin_collection/councils/EnvironmentFirst.py,sha256=_9QJYDHpdnYK5R6znvZk1w0F9GnPnI8G4b6I_p26h4U,1695
 uk_bin_collection/uk_bin_collection/councils/EppingForestDistrictCouncil.py,sha256=cKFllQ4zt6MGkwiz_HedZvw3iL1kRMLA6Ct2spUE5og,2085
 uk_bin_collection/uk_bin_collection/councils/ErewashBoroughCouncil.py,sha256=QTQA6NjZtTL2baDeerIQW1SQpawwu6kGDMGdVvYQRRo,2501
@@ -78,7 +78,7 @@ uk_bin_collection/uk_bin_collection/councils/FarehamBoroughCouncil.py,sha256=25Q
 uk_bin_collection/uk_bin_collection/councils/FenlandDistrictCouncil.py,sha256=sFrnKzIE2tIcz0YrC6A9HcevzgNdf6E6_HLGMWDKtGw,2513
 uk_bin_collection/uk_bin_collection/councils/ForestOfDeanDistrictCouncil.py,sha256=xO5gqgsN9K-cQsuDoQF7ycZkjNdCPAQwIYOCFWxFJ_Y,4504
 uk_bin_collection/uk_bin_collection/councils/GatesheadCouncil.py,sha256=SRCgYhYs6rv_8C1UEDVORHZgXxcJkoZBjzdYS4Lu-ew,4531
-uk_bin_collection/uk_bin_collection/councils/GedlingBoroughCouncil.py,sha256=IssL5CJSdcGPkJCB0q2kieUSEjfoS6nDKfeT7-9eKsQ,2183
+uk_bin_collection/uk_bin_collection/councils/GedlingBoroughCouncil.py,sha256=XzfFMCwclh9zAJgsbaj4jywjdiH0wPaFicaVsLrN3ms,2297
 uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py,sha256=i7BympEhCm7D9yR0p5_QQICtWvNcDYNJIWB19SA0g2k,2303
 uk_bin_collection/uk_bin_collection/councils/GloucesterCityCouncil.py,sha256=8Wjvmdvg5blHVrREaEnhhWZaWhYVP4v_KdDVPLIUxaU,4889
 uk_bin_collection/uk_bin_collection/councils/GuildfordCouncil.py,sha256=9pVrmQhZcK2AD8gX8mNvP--L4L9KaY6L3B822VX6fec,5695
@@ -90,7 +90,7 @@ uk_bin_collection/uk_bin_collection/councils/HighlandCouncil.py,sha256=GNxDU65Qu
 uk_bin_collection/uk_bin_collection/councils/HounslowCouncil.py,sha256=LXhJ47rujx7k3naz0tFiTT1l5k6gAYcVdekJN1t_HLY,4564
 uk_bin_collection/uk_bin_collection/councils/HullCityCouncil.py,sha256=UHcesBoctFVcXDYuwfag43KbcJcopkEDzJ-54NxtK0Q,1851
 uk_bin_collection/uk_bin_collection/councils/HuntingdonDistrictCouncil.py,sha256=dGyhhG6HRjQ2SPeiRwUPTGlk9dPIslagV2k0GjEOn1s,1587
-uk_bin_collection/uk_bin_collection/councils/IslingtonCouncil.py,sha256=O2o5-oueMm8jXES_2kQGHVo-JpBSq1Z-1mqq11eyi3s,1208
+uk_bin_collection/uk_bin_collection/councils/IslingtonCouncil.py,sha256=xavzL6ZIU9DG8Xro3vN0CEnYmNU31OGnOvnq78wgpQc,1258
 uk_bin_collection/uk_bin_collection/councils/KingstonUponThamesCouncil.py,sha256=iZ7njIxccCGBhUUWWd9Azh7cxUAKaofebCm3lo-TuxA,3543
 uk_bin_collection/uk_bin_collection/councils/KirkleesCouncil.py,sha256=gtAtM6FappSZ0-BKid7_pnSrnqPPjHn_UYWqMg9wQlM,4499
 uk_bin_collection/uk_bin_collection/councils/KnowsleyMBCouncil.py,sha256=VdlWDESoHfr_X0r8-UMaLMUQhKZOa2BnpVPkX-1u3EQ,5605
@@ -114,7 +114,7 @@ uk_bin_collection/uk_bin_collection/councils/MidAndEastAntrimBoroughCouncil.py,s
 uk_bin_collection/uk_bin_collection/councils/MidSussexDistrictCouncil.py,sha256=AZgC9wmDLEjUOtIFvf0ehF5LHturXTH4DkE3ioPSVBA,6254
 uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py,sha256=3K3X7kv1oOJkZm2ivnT8Lx0GAzPefgFSHjruwcFgO7I,2821
 uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py,sha256=3olsWa77L34vz-c7NgeGK9xmNuR4Ws_oAk5D4UpIkPw,2005
-uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py,sha256=bvCrC4Qcg0Uzp9zZGcC7-7-oJcMh2cb1VaXfdkB11oc,5257
+uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py,sha256=xWR5S0gwQu9gXxjl788Wux1KaC0CT7ZFw0iXuRLZCEM,5599
 uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py,sha256=ychYR2nsyk2UIb8tjWaKrLUT4hxSsHN558l3RqZ0mjw,5635
 uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py,sha256=ylTn9KmWITtaO9_Z8kJCN2w2ALfhrfGt3SeJ78lgw7M,5391
 uk_bin_collection/uk_bin_collection/councils/NewarkAndSherwoodDC.py,sha256=lAleYfCGUWCKOi7Ye_cjgfpI3pWwTcFctlYmh0hjebM,2140
@@ -130,7 +130,7 @@ uk_bin_collection/uk_bin_collection/councils/NorthLincolnshireCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/NorthNorfolkDistrictCouncil.py,sha256=VV_zqVZYv8ekXcUHhrBlTX_W5qLYE9IA3mT2xmrZqoI,4315
 uk_bin_collection/uk_bin_collection/councils/NorthNorthamptonshireCouncil.py,sha256=kcMN-5GBjYDM9F1BKfHoYeydub8SuDxHamJbSvJRZ68,2337
 uk_bin_collection/uk_bin_collection/councils/NorthSomersetCouncil.py,sha256=EbFVnPYZIOkru5_Y75kjljM3Cr3HIJgP-SU6hxgf6tk,2754
-uk_bin_collection/uk_bin_collection/councils/NorthTynesideCouncil.py,sha256=N_ZRk3LZbIin7K4Vr8Rx-tExMW6Av7-WNQu4OOG3cfE,5921
+uk_bin_collection/uk_bin_collection/councils/NorthTynesideCouncil.py,sha256=MHfcSrfWBIiWwVnhOqUrOkr0Ahguu_oU4pHrv_vSa-Y,5929
 uk_bin_collection/uk_bin_collection/councils/NorthWestLeicestershire.py,sha256=gJj0dyQc5QUefqusKGk2LLXfWbG5tlEXUOh8KAPh3RI,4584
 uk_bin_collection/uk_bin_collection/councils/NorthYorkshire.py,sha256=2wTrr3VrZDp9-YtDPmWd649gXeWH4hbm2-Hw8Vau5Xs,1933
 uk_bin_collection/uk_bin_collection/councils/NorthumberlandCouncil.py,sha256=KEFsxEvQ159fkuFo-fza67YCnnCZ5ElwE80zTrqDEWI,4990
@@ -146,8 +146,8 @@ uk_bin_collection/uk_bin_collection/councils/ReigateAndBansteadBoroughCouncil.py
 uk_bin_collection/uk_bin_collection/councils/RenfrewshireCouncil.py,sha256=VlWm-w4d-UchoENe_hCTCGlfSHiMlS4wNEeMvxuNR2U,5109
 uk_bin_collection/uk_bin_collection/councils/RhonddaCynonTaffCouncil.py,sha256=wInyVG_0wRrX_dRO9qbAzPhlXDseXapj2zQhsISw8gg,3233
 uk_bin_collection/uk_bin_collection/councils/RochdaleCouncil.py,sha256=UTSwSw515VehGn4xkjjRhUlzS4lDj4hgna6y-4VW3uM,2379
-uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py,sha256=7J83wWoFYukSnVgpV_bDLZlAbeTi94xgjMe9x_su7m8,2646
-uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py,sha256=sjZ00iBdqn2kOvGsWyMpY3h-HWmfC_K6LQ2wz1X5WGg,1761
+uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py,sha256=rfhD66A9HfHL46ldF9sbxvV7fPaaoNxzIJbHjVT6A90,2621
+uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py,sha256=LtMPM8lj5bfReDR4buHEo-aRC_HTBIeo1nf8GE5-R80,1790
 uk_bin_collection/uk_bin_collection/councils/RugbyBoroughCouncil.py,sha256=a5ySLmFvvY56QMA7-bk6MVBxRp5tPBIBg4navH0eYas,4306
 uk_bin_collection/uk_bin_collection/councils/RushcliffeBoroughCouncil.py,sha256=wMtiYRirT585vtsEOIyXHugk7aEj3pvyVWBaAePdqtE,4005
 uk_bin_collection/uk_bin_collection/councils/RushmoorCouncil.py,sha256=ZsGnXjoEaOS6U7fI0w7-uqxayAHdNVKsJi2fqIWEls8,3375
@@ -192,7 +192,7 @@ uk_bin_collection/uk_bin_collection/councils/TunbridgeWellsCouncil.py,sha256=s8N
 uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py,sha256=GSELWbSn5jtznv6FSLIMxK6CyQ27MW9FoY_m5jhTEBA,4175
 uk_bin_collection/uk_bin_collection/councils/ValeofGlamorganCouncil.py,sha256=Phgb_ECiUOOkqOx6OsfsTHMCW5VQfRmOC2zgYIQhuZA,5044
 uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py,sha256=KBKGHcWAdPC_8-CfKnLOdP7Ww6RIvlxLIJGqBsq_77g,4208
-uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py,sha256=-xqJOzHTrT4jOB3rHPXFYeqLaHyK9XmCPi92whaYBhw,4671
+uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py,sha256=vRfIU0Uloi1bgXqjOCpdb-EQ4oY-aismcANZRwOIFkc,4914
 uk_bin_collection/uk_bin_collection/councils/WalsallCouncil.py,sha256=_anovUnXMr40lZLHyX3opIP73BwauCllKy-Z2SBrzPw,2076
 uk_bin_collection/uk_bin_collection/councils/WalthamForest.py,sha256=P7MMw0EhpRmDbbnHb25tY5_yvYuZUFwJ1br4TOv24sY,4997
 uk_bin_collection/uk_bin_collection/councils/WarwickDistrictCouncil.py,sha256=3WQrAxzYzKoV4LyOqNTp9xINVsNi1xW9t8etducGeag,1146
@@ -211,15 +211,15 @@ uk_bin_collection/uk_bin_collection/councils/WinchesterCityCouncil.py,sha256=W2k
 uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py,sha256=7Qhznj95ktAQjpWm5C8pbD5UcvfXm7Mwb7_DQxwjGSM,1777
 uk_bin_collection/uk_bin_collection/councils/WirralCouncil.py,sha256=X_e9zXEZAl_Mp6nPORHc9CTmf3QHdoMY3BCnKrXEr1I,2131
 uk_bin_collection/uk_bin_collection/councils/WokingBoroughCouncil.py,sha256=37igH9g0xe4XIhRhcJ-ZJBU8MxTp5yzgpadWbdE33Yg,5205
-uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py,sha256=qQOg5HjvHMTRuy3SVX8vbXhSqYBFZmN-htk_Dtoae0M,4126
+uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py,sha256=H8aFHlacwV07X-6T9RQua4irqDA0cIQrF4O1FfPR7yI,4114
 uk_bin_collection/uk_bin_collection/councils/WychavonDistrictCouncil.py,sha256=YuZdzEW0CZLwusm1VQcGRIKXAab_UDFLaCnN60itt_E,5776
 uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=zDDa7n4K_zm5PgDL08A26gD9yOOsOhuexI3x2seaBF4,3511
 uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bIdsvmoSzBjJAvTTi6yPfJa8xjJx1ys2w,1490
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=4s9ODGPAwPqwXc8SrTX5Wlfmizs3_58iXUtHc4Ir86o,1162
 uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
 uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
-uk_bin_collection-0.101.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.101.0.dist-info/METADATA,sha256=fcu_gjSU7JVGJ-O_7ZXo9HUj1YVcS4JeKJQ-zZnhNDA,16844
-uk_bin_collection-0.101.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.101.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.101.0.dist-info/RECORD,,
+uk_bin_collection-0.103.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.103.0.dist-info/METADATA,sha256=a_GcUI_307Qq6PiurZcZ1WUzk4AoPRjQLZPLj9TPKVs,17630
+uk_bin_collection-0.103.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.103.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.103.0.dist-info/RECORD,,