uk_bin_collection 0.151.0__py3-none-any.whl → 0.152.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -28,6 +28,16 @@
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
         "LAD24CD": "E07000032"
     },
+    "AngusCouncil": {
+        "uprn": "117053733",
+        "skip_get_url": true,
+        "postcode": "DD7 7LE",
+        "url": "https://www.angus.gov.uk/bins_litter_and_recycling/bin_collection_days",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "Angus",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN. Requires Selenium",
+        "LAD24CD": "S12000041"
+    },
     "AntrimAndNewtonabbeyCouncil": {
         "LAD24CD": "N09000001",
         "url": "https://antrimandnewtownabbey.gov.uk/residents/bins-recycling/bins-schedule/?Id=643",
@@ -117,13 +127,13 @@
         "LAD24CD": "E07000200"
     },
     "BarkingDagenham": {
-        "house_number": "19 KELLY WAY, CHADWELL HEATH, RM6 6XH",
+        "house_number": "19",
         "postcode": "RM6 6XH",
         "skip_get_url": true,
         "web_driver": "http://selenium:4444",
         "url": "https://www.lbbd.gov.uk/rubbish-recycling/household-bin-collection/check-your-bin-collection-days",
         "wiki_name": "Barking and Dagenham",
-        "wiki_note": "Use the full address as it appears on the drop-down on the site when you search by postcode.",
+        "wiki_note": "Use house number and postcode. Requires Selenium.",
         "LAD24CD": "E09000002"
     },
     "BarnetCouncil": {
@@ -311,13 +321,13 @@
         "LAD24CD": "E09000005"
     },
     "BrightonandHoveCityCouncil": {
-        "house_number": "44 Carden Avenue, Brighton, BN1 8NE",
+        "house_number": "44",
         "postcode": "BN1 8NE",
         "skip_get_url": true,
         "url": "https://cityclean.brighton-hove.gov.uk/link/collections",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Brighton and Hove",
-        "wiki_note": "Use the full address as it appears on the drop-down on the site when you search by postcode.",
+        "wiki_note": "Use house number and postcode. Requires Selenium",
         "LAD24CD": "E06000043"
     },
     "BristolCityCouncil": {
@@ -330,12 +340,12 @@
     },
     "BroadlandDistrictCouncil": {
         "skip_get_url": true,
-        "house_number": "1 Park View, Horsford, Norfolk, NR10 3FD",
+        "house_number": "1",
         "postcode": "NR10 3FD",
         "url": "https://area.southnorfolkandbroadland.gov.uk/FindAddress",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Broadland",
-        "wiki_note": "Use the full address as it appears on the drop-down on the site when you search by postcode.",
+        "wiki_note": "Use house number and postcode. Requires Selenium.",
         "LAD24CD": "E07000144"
     },
     "BromleyBoroughCouncil": {
@@ -521,7 +531,7 @@
         "LAD24CD": "E07000034"
     },
     "ChichesterDistrictCouncil": {
-        "house_number": "7, Plaistow Road, Kirdford, Billingshurst, West Sussex",
+        "house_number": "7",
         "postcode": "RH14 0JT",
         "skip_get_url": true,
         "url": "https://www.chichester.gov.uk/checkyourbinday",
@@ -901,6 +911,15 @@
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
         "LAD24CD": "E07000010"
     },
+    "FermanaghOmaghDistrictCouncil": {
+        "house_number": "20",
+        "postcode": "BT74 6DQ",
+        "skip_get_url": true,
+        "url": "https://www.fermanaghomagh.com/services/environment-and-waste/waste-collection-calendar/",
+        "wiki_name": "Fermanagh and Omagh",
+        "wiki_note": "Pass the house number and postcode in their respective parameters.",
+        "LAD24CD": "N09000006"
+    },
     "FifeCouncil": {
         "uprn": "320203521",
         "url": "https://www.fife.gov.uk",
@@ -1199,6 +1218,7 @@
         "LAD24CD": "E07000120",
         "uprn": "100010448773",
         "url": "https://iapp.itouchvision.com/iappcollectionday/collection-day/?uuid=FEBA68993831481FD81B2E605364D00A8DC017A4",
+        "skip_get_url": true,
         "web_driver": "http://selenium:4444",
         "wiki_name": "Hyndburn",
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search). This parser requires a Selenium webdriver."
@@ -1622,7 +1642,7 @@
     "NorthEastDerbyshireDistrictCouncil": {
         "postcode": "S42 5RB",
         "skip_get_url": true,
-        "uprn": "010034492221",
+        "uprn": "010034492222",
         "url": "https://myselfservice.ne-derbyshire.gov.uk/service/Check_your_Bin_Day",
         "web_driver": "http://selenium:4444",
         "wiki_name": "North East Derbyshire",
@@ -2013,6 +2033,15 @@
         "wiki_note": "Follow the instructions [here](https://bins.shropshire.gov.uk/) until you get the page showing your bin collection dates, then copy the URL and replace the URL in the command.",
         "LAD24CD": "E06000051"
     },
+    "SloughBoroughCouncil": {
+        "postcode": "SL2 2EW",
+        "skip_get_url": true,
+        "url": "https://www.slough.gov.uk/bin-collections",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "Slough",
+        "wiki_note": "Pass the UPRN and postcode in their respective parameters. This parser requires a Selenium webdriver.",
+        "LAD24CD": "E06000039"
+    },
     "SolihullCouncil": {
         "url": "https://digital.solihull.gov.uk/BinCollectionCalendar/Calendar.aspx?UPRN=100071005444",
         "wiki_command_url_override": "https://digital.solihull.gov.uk/BinCollectionCalendar/Calendar.aspx?UPRN=XXXXXXXX",
@@ -2332,6 +2361,14 @@
         "wiki_note": "Provide your UPRN. Find it using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
         "LAD24CD": "E06000020"
     },
+    "TewkesburyBoroughCouncil": {
+        "skip_get_url": true,
+        "uprn": "10067626314",
+        "url": "https://tewkesbury.gov.uk/services/waste-and-recycling/",
+        "wiki_name": "Tewkesbury",
+        "wiki_note": "Provide your UPRN. Find it using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
+        "LAD24CD": "E07000083"
+    },
     "TendringDistrictCouncil": {
         "postcode": "CO15 4EU",
         "skip_get_url": true,

uk_bin_collection/uk_bin_collection/councils/AngusCouncil.py

@@ -0,0 +1,149 @@
+import time
+import re
+from datetime import datetime
+
+from bs4 import BeautifulSoup
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select, WebDriverWait
+
+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:
+        driver = None
+        try:
+            user_postcode = kwargs.get("postcode")
+            if not user_postcode:
+                raise ValueError("No postcode provided.")
+            check_postcode(user_postcode)
+
+            user_uprn = kwargs.get("uprn")
+            check_uprn(user_uprn)
+
+            headless = kwargs.get("headless")
+            web_driver = kwargs.get("web_driver")
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            page = "https://www.angus.gov.uk/bins_litter_and_recycling/bin_collection_days"
+
+            driver.get(page)
+
+            wait = WebDriverWait(driver, 10)
+            accept_cookies_button = wait.until(
+                EC.element_to_be_clickable((By.ID, "ccc-recommended-settings"))
+            )
+            accept_cookies_button.click()
+
+            find_your_collection_button = wait.until(
+                EC.element_to_be_clickable(
+                    (By.XPATH, "/html/body/div[2]/div[2]/div/div/section/div[2]/div/article/div/div/p[2]/a")
+                )
+            )
+            find_your_collection_button.click()
+
+            iframe = wait.until(EC.presence_of_element_located((By.ID, "fillform-frame-1")))
+            driver.switch_to.frame(iframe)
+
+            postcode_input = wait.until(EC.presence_of_element_located((By.ID, "searchString")))
+            postcode_input.send_keys(user_postcode + Keys.TAB + Keys.ENTER)
+
+            time.sleep(15)
+
+            select_elem = wait.until(EC.presence_of_element_located((By.ID, "customerAddress")))
+            WebDriverWait(driver, 10).until(
+                lambda d: len(select_elem.find_elements(By.TAG_NAME, "option")) > 1
+            )
+            dropdown = Select(select_elem)
+            dropdown.select_by_value(user_uprn)
+
+            time.sleep(10)
+
+            wait.until(
+                EC.presence_of_element_located(
+                    (By.CSS_SELECTOR, "span.fieldInput.content.html.non-input"))
+            )
+
+            soup = BeautifulSoup(driver.page_source, "html.parser")
+            bin_data = {"bins": []}
+            current_date = datetime.now()
+            current_formatted_date = None
+
+            spans = soup.select("span.fieldInput.content.html.non-input")
+            print(f"Found {len(spans)} bin info spans.")
+
+            for i, span in enumerate(spans):
+                try:
+                    # Look for any non-empty <u> tag recursively
+                    date_tag = next(
+                        (u for u in span.find_all("u") if u and u.text.strip()),
+                        None
+                    )
+                    bin_type_tag = span.find("b")
+
+                    if date_tag:
+                        raw_date = date_tag.text.strip().replace(",", "")
+                        full_date_str = f"{raw_date} {current_date.year}"
+                        full_date_str = re.sub(r"\s+", " ", full_date_str)
+
+                        try:
+                            parsed_date = datetime.strptime(full_date_str, "%A %d %B %Y")
+                            if parsed_date.date() < current_date.date():
+                                parsed_date = parsed_date.replace(year=current_date.year + 1)
+                            current_formatted_date = parsed_date.strftime("%d/%m/%Y")
+                            print(f"[{i}] Parsed date: {current_formatted_date}")
+                        except ValueError as ve:
+                            print(f"[{i}] Could not parse date: '{full_date_str}' - {ve}")
+                            continue
+                    else:
+                        print(f"[{i}] No date tag found, using last valid date: {current_formatted_date}")
+
+                    if not current_formatted_date:
+                        print(f"[{i}] No current date to associate bin type with — skipping.")
+                        continue
+
+                    if not bin_type_tag or not bin_type_tag.text.strip():
+                        print(f"[{i}] No bin type found — skipping.")
+                        continue
+
+                    bin_type = bin_type_tag.text.strip()
+
+                    # Optional seasonal override
+                    try:
+                        overrides_dict = get_seasonal_overrides()
+                        if current_formatted_date in overrides_dict:
+                            current_formatted_date = overrides_dict[current_formatted_date]
+                    except Exception:
+                        pass
+
+                    print(f"[{i}] Found bin: {bin_type} on {current_formatted_date}")
+
+                    bin_data["bins"].append({
+                        "type": bin_type,
+                        "collectionDate": current_formatted_date
+                    })
+
+                except Exception as inner_e:
+                    print(f"[{i}] Skipping span due to error: {inner_e}")
+                    continue
+
+                except Exception as inner_e:
+                    print(f"Skipping span due to error: {inner_e}")
+                    continue
+
+            if not bin_data["bins"]:
+                raise ValueError("No bin data found.")
+
+            print(bin_data)
+            
+            return bin_data
+
+        except Exception as e:
+            print(f"An error occurred: {e}")
+            raise
+
+        finally:
+            if driver:
+                driver.quit()

uk_bin_collection/uk_bin_collection/councils/BarkingDagenham.py

@@ -84,10 +84,19 @@ class CouncilClass(AbstractGetBinDataClass):
                 EC.element_to_be_clickable((By.ID, "address")),
                 message="Address dropdown not found",
             )
+            
             dropdown = Select(address_select)
 
-            dropdown.select_by_visible_text(user_paon)
-            print("Address selected successfully")
+            found = False
+            for option in dropdown.options:
+                if user_paon in option.text:
+                    option.click()
+                    found = True
+                    print("Address selected successfully")
+                    break
+
+            if not found:
+                raise Exception(f"No matching address containing '{user_paon}' found.")
 
             driver.switch_to.active_element.send_keys(Keys.TAB + Keys.ENTER)
             print("Pressed ENTER on Next button")

uk_bin_collection/uk_bin_collection/councils/BrightonandHoveCityCouncil.py

@@ -63,8 +63,16 @@ class CouncilClass(AbstractGetBinDataClass):
 
             # Create a 'Select' for it, then select the first address in the list
             # (Index 0 is "Make a selection from the list")
-            dropdownSelect = Select(parent_element)
-            dropdownSelect.select_by_visible_text(str(user_paon))
+            options = parent_element.find_elements(By.TAG_NAME, "option")
+            found = False
+            for option in options:
+                if user_paon in option.text:
+                    option.click()
+                    found = True
+                    break
+
+            if not found:
+                raise Exception(f"Address containing '{user_paon}' not found in dropdown options")
 
             submit_btn = wait.until(
                 EC.presence_of_element_located(
@@ -125,6 +133,7 @@ class CouncilClass(AbstractGetBinDataClass):
                                 break
                 dict_data = {"type": bin_type, "collectionDate": bin_date}
                 data["bins"].append(dict_data)
+                print(data)
         except Exception as e:
             # Here you can log the exception if needed
             print(f"An error occurred: {e}")

uk_bin_collection/uk_bin_collection/councils/BroadlandDistrictCouncil.py

@@ -83,15 +83,30 @@ class CouncilClass(AbstractGetBinDataClass):
             )
             print("Found address dropdown")
 
-            # Create a Select object for the dropdown
             dropdown_select = Select(address_dropdown)
 
-            # Search for the exact address
-            print(f"Looking for address: {user_paon}")
+            print(f"Looking for address containing: {user_paon}")
 
-            # Select the address by visible text
-            dropdown_select.select_by_visible_text(user_paon)
-            print(f"Selected address: {user_paon}")
+            found = False
+            user_paon_clean = user_paon.lower().strip()
+
+            for option in dropdown_select.options:
+                option_text_clean = option.text.lower().strip()
+
+                if (
+                    option_text_clean == user_paon_clean  # Exact match if full address given
+                    or option_text_clean.startswith(f"{user_paon_clean} ")  # Startswith match if just a number
+                ):
+                    option.click()
+                    found = True
+                    print(f"Selected address: {option.text.strip()}")
+                    break
+
+            if not found:
+                all_options = [opt.text for opt in dropdown_select.options]
+                raise Exception(
+                    f"Could not find a matching address for '{user_paon}'. Available options: {all_options}"
+                )
 
             print("Looking for submit button after address selection...")
             submit_btn = wait.until(

uk_bin_collection/uk_bin_collection/councils/ChichesterDistrictCouncil.py

@@ -1,110 +1,162 @@
 import time
 from datetime import datetime
 
-from selenium.webdriver.support.ui import Select
 from bs4 import BeautifulSoup
 from selenium.webdriver.common.by import By
-from selenium.webdriver.support import expected_conditions as EC
-from selenium.webdriver.support.ui import Select
-from selenium.webdriver.support.wait import WebDriverWait
 from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support.ui import WebDriverWait, Select
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.common.exceptions import StaleElementReferenceException, TimeoutException
 
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
+date_format = "%d/%m/%Y"
 
-# 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:
         driver = None
         try:
-            # Make a BS4 object
-
             page = "https://www.chichester.gov.uk/checkyourbinday"
 
             user_postcode = kwargs.get("postcode")
-            user_uprn = kwargs.get("uprn")
+            house_number = kwargs.get("paon")
             web_driver = kwargs.get("web_driver")
             headless = kwargs.get("headless")
-            house_number = kwargs.get("paon")
 
             driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             wait = WebDriverWait(driver, 60)
 
-            inputElement_postcodesearch = wait.until(
+            input_postcode = wait.until(
                 EC.visibility_of_element_located(
                     (By.ID, "WASTECOLLECTIONCALENDARV5_CALENDAR_ADDRESSLOOKUPPOSTCODE")
                 )
             )
+            input_postcode.send_keys(user_postcode)
 
-            inputElement_postcodesearch.send_keys(user_postcode)
-
-            inputElement_postcodesearch_btn = wait.until(
-                EC.visibility_of_element_located(
-                    (By.ID, "WASTECOLLECTIONCALENDARV5_CALENDAR_ADDRESSLOOKUPSEARCH")
-                )
-            )
-            inputElement_postcodesearch_btn.send_keys(Keys.ENTER)
-
-            inputElement_select_address = wait.until(
+            search_button = wait.until(
                 EC.element_to_be_clickable(
-                    (By.ID, "WASTECOLLECTIONCALENDARV5_CALENDAR_ADDRESSLOOKUPADDRESS")
+                    (By.ID, "WASTECOLLECTIONCALENDARV5_CALENDAR_ADDRESSLOOKUPSEARCH")
                 )
             )
-            dropdown_element = driver.find_element(
-                By.ID, "WASTECOLLECTIONCALENDARV5_CALENDAR_ADDRESSLOOKUPADDRESS"
-            )
+            search_button.send_keys(Keys.ENTER)
 
-            # Now create a Select object based on the found element
-            dropdown = Select(dropdown_element)
+            self.smart_select_address(driver, house_number)
 
-            # Select the option by visible text
-            dropdown.select_by_visible_text(house_number)
-
-            results = wait.until(
-                EC.element_to_be_clickable(
+            wait.until(
+                EC.presence_of_element_located(
                     (By.CLASS_NAME, "bin-collection-dates-container")
                 )
             )
 
             soup = BeautifulSoup(driver.page_source, features="html.parser")
-            soup.prettify()
+            table = soup.find("table", class_="defaultgeneral bin-collection-dates")
+            rows = table.find_all("tr") if table else []
 
-            # Extract data from the table
             bin_collection_data = []
-            rows = soup.find(
-                "table", class_="defaultgeneral bin-collection-dates"
-            ).find_all("tr")
             for row in rows:
                 cells = row.find_all("td")
                 if cells:
                     date_str = cells[0].text.strip()
                     bin_type = cells[1].text.strip()
-                    # Convert date string to the required format DD/MM/YYYY
                     date_obj = datetime.strptime(date_str, "%d %B %Y")
-                    date_formatted = date_obj.strftime(date_format)
-                    bin_collection_data.append(
-                        {"collectionDate": date_formatted, "type": bin_type}
-                    )
+                    formatted_date = date_obj.strftime(date_format)
+                    bin_collection_data.append({
+                        "collectionDate": formatted_date,
+                        "type": bin_type
+                    })
 
-            # Convert to JSON
-            json_data = {"bins": bin_collection_data}
+            print(bin_collection_data)
+
+            return {"bins": bin_collection_data}
 
         except Exception as e:
-            # Here you can log the exception if needed
             print(f"An error occurred: {e}")
-            # Optionally, re-raise the exception if you want it to propagate
             raise
         finally:
-            # This block ensures that the driver is closed regardless of an exception
             if driver:
                 driver.quit()
-        return json_data
+
+    def smart_select_address(self, driver, house_number: str):
+        dropdown_id = "WASTECOLLECTIONCALENDARV5_CALENDAR_ADDRESSLOOKUPADDRESS"
+
+        print("Waiting for address dropdown...")
+
+        def dropdown_has_addresses(d):
+            try:
+                dropdown_el = d.find_element(By.ID, dropdown_id)
+                select = Select(dropdown_el)
+                return len(select.options) > 1
+            except StaleElementReferenceException:
+                return False
+
+        WebDriverWait(driver, 30).until(dropdown_has_addresses)
+
+        dropdown_el = driver.find_element(By.ID, dropdown_id)
+        dropdown = Select(dropdown_el)
+
+        print("Address dropdown options:")
+        for opt in dropdown.options:
+            print(f"- {opt.text.strip()}")
+
+        user_input_clean = house_number.lower().strip()
+        found = False
+
+        for option in dropdown.options:
+            option_text_clean = option.text.lower().strip()
+            print(f"Comparing: {repr(option_text_clean)} == {repr(user_input_clean)}")
+
+            if (
+                option_text_clean == user_input_clean
+                or option_text_clean.startswith(f"{user_input_clean},")
+            ):
+                try:
+                    option.click()
+                    found = True
+                    print(f"Strict match clicked: {option.text.strip()}")
+                    break
+                except StaleElementReferenceException:
+                    print("Stale during click, retrying...")
+                    dropdown_el = driver.find_element(By.ID, dropdown_id)
+                    dropdown = Select(dropdown_el)
+                    for fresh_option in dropdown.options:
+                        if fresh_option.text.lower().strip() == option_text_clean:
+                            fresh_option.click()
+                            found = True
+                            print(f"Strict match clicked after refresh: {fresh_option.text.strip()}")
+                            break
+
+            if found:
+                break
+
+        if not found:
+            print("No strict match found, trying fuzzy match...")
+            for option in dropdown.options:
+                option_text_clean = option.text.lower().strip()
+                if user_input_clean in option_text_clean:
+                    try:
+                        option.click()
+                        found = True
+                        print(f"Fuzzy match clicked: {option.text.strip()}")
+                        break
+                    except StaleElementReferenceException:
+                        print("Stale during fuzzy click, retrying...")
+                        dropdown_el = driver.find_element(By.ID, dropdown_id)
+                        dropdown = Select(dropdown_el)
+                        for fresh_option in dropdown.options:
+                            if fresh_option.text.lower().strip() == option_text_clean:
+                                fresh_option.click()
+                                found = True
+                                print(f"Fuzzy match clicked after refresh: {fresh_option.text.strip()}")
+                                break
+
+                if found:
+                    break
+
+        if not found:
+            all_opts = [opt.text.strip() for opt in dropdown.options]
+            raise Exception(
+                f"Could not find address '{house_number}' in options: {all_opts}"
+            )

uk_bin_collection/uk_bin_collection/councils/FermanaghOmaghDistrictCouncil.py

@@ -0,0 +1,102 @@
+import difflib
+from datetime import date, datetime
+
+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.
+    """
+
+    base_url = "https://fermanaghomagh.isl-fusion.com/"
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        """
+        This function will make a request to the search endpoint with the postcode, extract the
+        house numbers from the responses, then retrieve the ID of the entry with the house number that matches,
+        to then retrieve the bin schedule.
+
+        The API here is a weird combination of HTML in json responses.
+        """
+        postcode = kwargs.get("postcode")
+        paon = kwargs.get("paon")
+
+        if not postcode:
+            raise ValueError("Must provide a postcode")
+
+        if not paon:
+            raise ValueError("Must provide a house number")
+
+        search_url = f"{self.base_url}/address/{postcode}"
+
+        requests.packages.urllib3.disable_warnings()
+        s = requests.Session()
+        response = s.get(search_url)
+        response.raise_for_status()
+
+        address_data = response.json()
+
+        address_list = address_data["html"]
+
+        soup = BeautifulSoup(address_list, features="html.parser")
+
+        address_by_id = {}
+
+        for li in soup.find_all("li"):
+            link = li.find_all("a")[0]
+            address_id = link.attrs["href"]
+            address = link.text
+
+            address_by_id[address_id] = address
+
+        addresses = list(address_by_id.values())
+
+        common = difflib.SequenceMatcher(
+            a=addresses[0], b=addresses[1]
+        ).find_longest_match()
+        extra_bit = addresses[0][common.a : common.a + common.size]
+
+        ids_by_paon = {
+            a.replace(extra_bit, ""): a_id.replace("/view/", "").replace("/", "")
+            for a_id, a in address_by_id.items()
+        }
+
+        property_id = ids_by_paon.get(paon)
+        if not property_id:
+            raise ValueError(
+                f"Invalid house number, valid values are {', '.join(ids_by_paon.keys())}"
+            )
+
+        today = date.today()
+        calendar_url = (
+            f"{self.base_url}/calendar/{property_id}/{today.strftime('%Y-%m-%d')}"
+        )
+        response = s.get(calendar_url)
+        response.raise_for_status()
+        calendar_data = response.json()
+        next_collections = calendar_data["nextCollections"]
+
+        collections = list(next_collections["collections"].values())
+
+        data = {"bins": []}
+
+        for collection in collections:
+            collection_date = datetime.strptime(collection["date"], "%Y-%m-%d")
+            bins = [c["name"] for c in collection["collections"].values()]
+
+            for bin in bins:
+                data["bins"].append(
+                    {
+                        "type": bin,
+                        "collectionDate": collection_date.strftime(date_format),
+                    }
+                )
+        return data

uk_bin_collection/uk_bin_collection/councils/NorthEastDerbyshireDistrictCouncil.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from time import sleep
 
 from bs4 import BeautifulSoup
 from selenium.webdriver.common.by import By
@@ -9,8 +10,6 @@ from selenium.webdriver.support.wait import WebDriverWait
 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,82 +33,105 @@ class CouncilClass(AbstractGetBinDataClass):
             headless = kwargs.get("headless")
             check_uprn(user_uprn)
             check_postcode(user_postcode)
-            # Create Selenium webdriver
+
             driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
-            # If you bang in the house number (or property name) and postcode in the box it should find your property
-
             iframe_presense = WebDriverWait(driver, 30).until(
                 EC.presence_of_element_located((By.ID, "fillform-frame-1"))
             )
 
             driver.switch_to.frame(iframe_presense)
             wait = WebDriverWait(driver, 60)
+
             inputElement_postcodesearch = wait.until(
                 EC.element_to_be_clickable((By.NAME, "postcode_search"))
             )
-
             inputElement_postcodesearch.send_keys(str(user_postcode))
 
-            # Wait for the 'Select your property' dropdown to appear and select the first result
             dropdown = wait.until(EC.element_to_be_clickable((By.NAME, "selAddress")))
-
             dropdown_options = wait.until(
                 EC.presence_of_element_located((By.CLASS_NAME, "lookup-option"))
             )
 
-            # Create a 'Select' for it, then select the first address in the list
-            # (Index 0 is "Make a selection from the list")
             drop_down_values = Select(dropdown)
             option_element = wait.until(
                 EC.presence_of_element_located(
                     (By.CSS_SELECTOR, f'option.lookup-option[value="{str(user_uprn)}"]')
                 )
             )
-
             drop_down_values.select_by_value(str(user_uprn))
 
-            # Wait for the 'View more' link to appear, then click it to get the full set of dates
             h3_element = wait.until(
                 EC.presence_of_element_located(
                     (By.XPATH, "//th[contains(text(), 'Waste Collection')]")
                 )
             )
 
+            sleep(10)
+
             soup = BeautifulSoup(driver.page_source, features="html.parser")
+            print("Parsing HTML content...")
+
+            collection_rows = soup.find_all("tr")
+
+            for row in collection_rows:
+                cells = row.find_all("td")
+                if len(cells) == 3:  # Date, Image, Bin Type
+                    # Extract date carefully
+                    date_labels = cells[0].find_all("label")
+                    collection_date = None
+                    for label in date_labels:
+                        label_text = label.get_text().strip()
+                        if contains_date(label_text):
+                            collection_date = label_text
+                            break
+
+                    # Extract bin type
+                    bin_label = cells[2].find("label")
+                    bin_types = bin_label.get_text().strip() if bin_label else None
+
+                    if collection_date and bin_types:
+                        print(f"Found collection: {collection_date} - {bin_types}")
+
+                        # Handle combined collections
+                        if "&" in bin_types:
+                            if "Burgundy" in bin_types:
+                                data["bins"].append(
+                                    {
+                                        "type": "Burgundy Bin",
+                                        "collectionDate": datetime.strptime(
+                                            collection_date, "%d/%m/%Y"
+                                        ).strftime(date_format),
+                                    }
+                                )
+                            if "Green" in bin_types:
+                                data["bins"].append(
+                                    {
+                                        "type": "Green Bin",
+                                        "collectionDate": datetime.strptime(
+                                            collection_date, "%d/%m/%Y"
+                                        ).strftime(date_format),
+                                    }
+                                )
+                        else:
+                            if "Black" in bin_types:
+                                data["bins"].append(
+                                    {
+                                        "type": "Black Bin",
+                                        "collectionDate": datetime.strptime(
+                                            collection_date, "%d/%m/%Y"
+                                        ).strftime(date_format),
+                                    }
+                                )
+
+            print(f"Found {len(data['bins'])} collections")
+            print(f"Final data: {data}")
 
-            target_h3 = soup.find("h3", string="Collection Details")
-            tables_after_h3 = target_h3.parent.parent.find_next("table")
-
-            table_rows = tables_after_h3.find_all("tr")
-            for row in table_rows:
-                rowdata = row.find_all("td")
-                if len(rowdata) == 3:
-                    labels = rowdata[0].find_all("label")
-                    # Strip the day (i.e., Monday) out of the collection date string for parsing
-                    if len(labels) >= 2:
-                        date_label = labels[1]
-                        datestring = date_label.text.strip()
-
-                    # Add the bin type and collection date to the 'data' dictionary
-                    data["bins"].append(
-                        {
-                            "type": rowdata[2].text.strip(),
-                            "collectionDate": datetime.strptime(
-                                datestring, "%d/%m/%Y"
-                            ).strftime(
-                                date_format
-                            ),  # Format the date as needed
-                        }
-                    )
         except Exception as e:
-            # Here you can log the exception if needed
             print(f"An error occurred: {e}")
-            # Optionally, re-raise the exception if you want it to propagate
             raise
         finally:
-            # This block ensures that the driver is closed regardless of an exception
             if driver:
                 driver.quit()
         return data

uk_bin_collection/uk_bin_collection/councils/SloughBoroughCouncil.py

@@ -0,0 +1,140 @@
+import time
+import re
+import requests
+from datetime import datetime
+from bs4 import BeautifulSoup
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+def get_street_from_postcode(postcode: str, api_key: str) -> str:
+    url = "https://maps.googleapis.com/maps/api/geocode/json"
+    params = {"address": postcode, "key": api_key}
+    response = requests.get(url, params=params)
+    data = response.json()
+
+    if data["status"] != "OK":
+        raise ValueError(f"API error: {data['status']}")
+
+    for component in data["results"][0]["address_components"]:
+        if "route" in component["types"]:
+            return component["long_name"]
+
+    raise ValueError("No street (route) found in the response.")
+
+class CouncilClass(AbstractGetBinDataClass):
+    def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        bin_data = {"bins": []}
+        try:
+            user_postcode = kwargs.get("postcode")
+            if not user_postcode:
+                raise ValueError("No postcode provided.")
+            check_postcode(user_postcode)
+
+            headless = kwargs.get("headless")
+            web_driver = kwargs.get("web_driver")
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            page = "https://www.slough.gov.uk/bin-collections"
+            driver.get(page)
+
+            # Accept cookies
+            WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable((By.ID, "ccc-recommended-settings"))
+            ).click()
+
+            # Enter the street name into the address search
+            address_input = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "keyword_directory25"))
+            )
+            user_address = get_street_from_postcode(user_postcode, "AIzaSyBDLULT7EIlNtHerswPtfmL15Tt3Oc0bV8")
+            address_input.send_keys(user_address + Keys.ENTER)
+
+            # Wait for address results to load
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_all_elements_located((By.CSS_SELECTOR, "span.list__link-text"))
+            )
+            span_elements = driver.find_elements(By.CSS_SELECTOR, "span.list__link-text")
+
+            for span in span_elements:
+                if user_address.lower() in span.text.lower():
+                    span.click()
+                    break
+            else:
+                raise Exception(f"No link found containing address: {user_address}")
+
+            # Wait for address detail page
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.CSS_SELECTOR, "section.site-content"))
+            )
+            soup = BeautifulSoup(driver.page_source, "html.parser")
+
+            # Extract each bin link and type
+            for heading in soup.select("dt.definition__heading"):
+                heading_text = heading.get_text(strip=True)
+                if "bin day details" in heading_text.lower():
+                    bin_type = heading_text.split()[0].capitalize() + " bin"
+                    dd = heading.find_next_sibling("dd")
+                    link = dd.find("a", href=True)
+
+                    if link:
+                        bin_url = link["href"]
+                        if not bin_url.startswith("http"):
+                            bin_url = "https://www.slough.gov.uk" + bin_url
+
+                        # Visit the child page
+                        print(f"Navigating to {bin_url}")
+                        driver.get(bin_url)
+                        WebDriverWait(driver, 10).until(
+                            EC.presence_of_element_located((By.CSS_SELECTOR, "div.page-content"))
+                        )
+                        child_soup = BeautifulSoup(driver.page_source, "html.parser")
+
+                        editor_div = child_soup.find("div", class_="editor")
+                        if not editor_div:
+                            print("No editor div found on bin detail page.")
+                            continue
+
+                        ul = editor_div.find("ul")
+                        if not ul:
+                            print("No <ul> with dates found in editor div.")
+                            continue
+
+                    for li in ul.find_all("li"):
+                        raw_text = li.get_text(strip=True).replace(".", "")
+
+                        if "no collection" in raw_text.lower() or "no collections" in raw_text.lower():
+                            print(f"Ignoring non-collection note: {raw_text}")
+                            continue
+
+                        raw_date = raw_text
+
+                        try:
+                            parsed_date = datetime.strptime(raw_date, "%d %B %Y")
+                        except ValueError:
+                            raw_date_cleaned = raw_date.split("(")[0].strip()
+                            try:
+                                parsed_date = datetime.strptime(raw_date_cleaned, "%d %B %Y")
+                            except Exception:
+                                print(f"Could not parse date: {raw_text}")
+                                continue
+
+                        formatted_date = parsed_date.strftime("%d/%m/%Y")
+                        contains_date(formatted_date)
+                        bin_data["bins"].append({
+                            "type": bin_type,
+                            "collectionDate": formatted_date
+                        })
+
+                        print(f"Type: {bin_type}, Date: {formatted_date}") 
+
+        except Exception as e:
+            print(f"An error occurred: {e}")
+            raise
+        finally:
+            if driver:
+                driver.quit()
+        return bin_data

uk_bin_collection/uk_bin_collection/councils/TewkesburyBoroughCouncil.py

@@ -0,0 +1,40 @@
+import json
+import requests
+from datetime import datetime
+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:
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+
+        url = f"https://api-2.tewkesbury.gov.uk/incab/rounds/{user_uprn}/next-collection"
+        response = requests.get(url)
+        response.raise_for_status()
+
+        json_data = response.json()
+
+        data = {"bins": []}
+
+        if json_data.get("status") == "OK" and "body" in json_data:
+            for entry in json_data["body"]:
+                bin_type = entry.get("collectionType")
+                date_str = entry.get("NextCollection")
+
+                if bin_type and date_str:
+                    try:
+                        collection_date = datetime.strptime(date_str, "%Y-%m-%d")
+                        data["bins"].append({
+                            "type": bin_type,
+                            "collectionDate": collection_date.strftime(date_format)
+                        })
+                    except ValueError:
+                        continue
+
+        # Sort by date
+        data["bins"].sort(key=lambda x: x["collectionDate"])
+
+        print(json.dumps(data, indent=2))
+        return data

{uk_bin_collection-0.151.0.dist-info → uk_bin_collection-0.152.0.dist-info}/METADATA

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

{uk_bin_collection-0.151.0.dist-info → uk_bin_collection-0.152.0.dist-info}/RECORD

@@ -7,7 +7,7 @@ uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-c
 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/generate_map_test_results.py,sha256=CKnGK2ZgiSXomRGkomX90DitgMP-X7wkHhyKORDcL2E,1144
-uk_bin_collection/tests/input.json,sha256=1E27u-92jfA9sMw0AzxCP-emvGQNq3GD8GWGbZjnPCQ,131840
+uk_bin_collection/tests/input.json,sha256=pwAeJYV_DJ4zMkXDYolTi5e-v9g_0gd-AMv_VCeJsyE,133191
 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=VZ0a81sioJULD7syAYHjvK_-nT_Rd36tUyzPetSA0gk,3475
@@ -21,6 +21,7 @@ uk_bin_collection/uk_bin_collection/councils/AberdeenCityCouncil.py,sha256=Je8Vw
 uk_bin_collection/uk_bin_collection/councils/AberdeenshireCouncil.py,sha256=aO1CSdyqa8oAD0fB79y1Q9bikAWCP_JFa7CsyTa2j9s,1655
 uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py,sha256=ppbrmm-MzB1wOulK--CU_0j4P-djNf3ozMhHnmQFqLo,1511
 uk_bin_collection/uk_bin_collection/councils/AmberValleyBoroughCouncil.py,sha256=mTeluIIEcuxLxhfDQ95A1fp8RM6AkJT5tRGZPUbYGdk,1853
+uk_bin_collection/uk_bin_collection/councils/AngusCouncil.py,sha256=YlhAnxkRAAvrwbUvleNKUuLROcwMTps2eMHElpuctm4,5894
 uk_bin_collection/uk_bin_collection/councils/AntrimAndNewtonabbeyCouncil.py,sha256=Hp5pteaC5RjL5ZqPZ564S9WQ6ZTKLMO6Dl_fxip2TUc,1653
 uk_bin_collection/uk_bin_collection/councils/ArdsAndNorthDownCouncil.py,sha256=iMBldxNErgi-ok1o6xpqdNgMvR6qapaNqoTWDTqMeGo,3824
 uk_bin_collection/uk_bin_collection/councils/ArgyllandButeCouncil.py,sha256=NBeXjzv0bOblkS5xjSy5D0DdW9vtx_TGMLVP0FP1JqA,5073
@@ -31,7 +32,7 @@ uk_bin_collection/uk_bin_collection/councils/AshfordBoroughCouncil.py,sha256=kuL
 uk_bin_collection/uk_bin_collection/councils/AylesburyValeCouncil.py,sha256=LouqjspEMt1TkOGqWHs2zkxwOETIy3n7p64uKIlAgUg,2401
 uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py,sha256=W7QBx6Mgso8RYosuXsaYo3GGNAu-tiyBSmuYxr1JSOU,1707
 uk_bin_collection/uk_bin_collection/councils/BaberghDistrictCouncil.py,sha256=1eXdST58xFRMdYl8AGNG_EwyQeLa31WSWUe882hQ2ec,6329
-uk_bin_collection/uk_bin_collection/councils/BarkingDagenham.py,sha256=8lYnRazbh_iOcmciSOJIhF44e8z3ZFlTZ0vnZKEfwJI,5973
+uk_bin_collection/uk_bin_collection/councils/BarkingDagenham.py,sha256=fgbaD8jsUBJrnUWKbcjSdJHDVRAh9KRUsG6JwB31NYA,6263
 uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py,sha256=Sd4-pbv0QZsR7soxvXYqsfdOUIqZqS6notyoZthG77s,9182
 uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py,sha256=hqzVKEqwYmjcQjCYBletcCt9_pE96qQ3kn7eDroJeNk,4764
 uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py,sha256=NymPmq5pud0PJ8ePcc2r1SKED4EHQ0EY2l71O-Metxc,3313
@@ -53,9 +54,9 @@ uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py,sha256=BEWS2c62cOsf2
 uk_bin_collection/uk_bin_collection/councils/BraintreeDistrictCouncil.py,sha256=2vYHilpI8mSwC2Ykdr1gxYAN3excDWqF6AwtGbkwbTw,2441
 uk_bin_collection/uk_bin_collection/councils/BrecklandCouncil.py,sha256=PX6A_pDvaN109aSNWmEhm88GFKfkClIkmbwGURWvsks,1744
 uk_bin_collection/uk_bin_collection/councils/BrentCouncil.py,sha256=BsP7V0vezteX0WAxcxqMf3g6ro-J78W6hubefALRMyg,5222
-uk_bin_collection/uk_bin_collection/councils/BrightonandHoveCityCouncil.py,sha256=k6qt4cds-Ejd97Z-__pw2BYvGVbFdc9SUfF73PPrTNA,5823
+uk_bin_collection/uk_bin_collection/councils/BrightonandHoveCityCouncil.py,sha256=trTCVrSwQ8EuKe30V1vShkkCSw5fEG1kg0DimnsZqdM,6133
 uk_bin_collection/uk_bin_collection/councils/BristolCityCouncil.py,sha256=nQeRBKrDcZE2m_EzjUBr9dJ5tcUdGcUuA5FcnLkbLr4,5575
-uk_bin_collection/uk_bin_collection/councils/BroadlandDistrictCouncil.py,sha256=aelqhh503dx6O2EEmC3AT5tnY39Dc53qcouH8T-mek8,7613
+uk_bin_collection/uk_bin_collection/councils/BroadlandDistrictCouncil.py,sha256=YhzP8zar_oSSkBOA3mdMAehnMTrcTBmGO0RfC4UBzvM,8236
 uk_bin_collection/uk_bin_collection/councils/BromleyBoroughCouncil.py,sha256=dii85JLmYU1uMidCEsWVo3stTcq_QqyC65DxG8u1UmE,4302
 uk_bin_collection/uk_bin_collection/councils/BromsgroveDistrictCouncil.py,sha256=PUfxP8j5Oh9wFHkdjbrJzQli9UzMHZzwrZ2hkThrvhI,1781
 uk_bin_collection/uk_bin_collection/councils/BroxbourneCouncil.py,sha256=mcRtkFc9g3YNN17OQfhzYJtNYeWrZPP_e7m7goEhz5I,3012
@@ -78,7 +79,7 @@ uk_bin_collection/uk_bin_collection/councils/CherwellDistrictCouncil.py,sha256=V
 uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py,sha256=I7Dj8LzG-Q4yrJ99jLRIwKwW5WQ9he8UksvF_YPzTxI,1681
 uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py,sha256=5mKZf22NgdyBY-SqV0c2q8b8IJobkoZrsfGEVUcxUyM,3544
 uk_bin_collection/uk_bin_collection/councils/ChesterfieldBoroughCouncil.py,sha256=mZiM8Ugm_OP0JkC5pLaQmi4i79mAp4SNNrcIdsREjHw,7198
-uk_bin_collection/uk_bin_collection/councils/ChichesterDistrictCouncil.py,sha256=HxrLcJves7ZsE8FbooymeecTUmScY4R7Oi71vwCePPo,4118
+uk_bin_collection/uk_bin_collection/councils/ChichesterDistrictCouncil.py,sha256=bvtqXSZN64jSND0NxwzJ-WA9H49FwARQMGS3PlUSiUg,6311
 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=QcFHTzW7Q1jYyHWq6thpA6fhO8w38eCOpUPk9EfjGIA,1291
@@ -124,6 +125,7 @@ uk_bin_collection/uk_bin_collection/councils/ExeterCityCouncil.py,sha256=FPNyBuQ
 uk_bin_collection/uk_bin_collection/councils/FalkirkCouncil.py,sha256=C3OA9PEhBsCYPzwsSdqVi_SbF8uiB186i2XfHWKd3VI,1694
 uk_bin_collection/uk_bin_collection/councils/FarehamBoroughCouncil.py,sha256=25QxeN5q3ad1Wwexs2d-B7ooH0ru6pOUx58413FOTY4,2352
 uk_bin_collection/uk_bin_collection/councils/FenlandDistrictCouncil.py,sha256=sFrnKzIE2tIcz0YrC6A9HcevzgNdf6E6_HLGMWDKtGw,2513
+uk_bin_collection/uk_bin_collection/councils/FermanaghOmaghDistrictCouncil.py,sha256=om9bdOv3_n16DMNX3-ndRwBEAlddhY1BB8z6doXrDfo,3317
 uk_bin_collection/uk_bin_collection/councils/FifeCouncil.py,sha256=eP_NnHtBLyflRUko9ubi_nxUPb7qg9SbaaSxqWZxNEs,2157
 uk_bin_collection/uk_bin_collection/councils/FlintshireCountyCouncil.py,sha256=RvPHhGbzP3mcjgWe2rIQux43UuDH7XofJGIKs7wJRe0,2060
 uk_bin_collection/uk_bin_collection/councils/FolkstoneandHytheDistrictCouncil.py,sha256=yKgZhua-2hjMihHshhncXVUBagbTOQBnNbKzdIZkWjw,3114
@@ -207,7 +209,7 @@ uk_bin_collection/uk_bin_collection/councils/NewhamCouncil.py,sha256=-UTgDseUtAG
 uk_bin_collection/uk_bin_collection/councils/NewportCityCouncil.py,sha256=dAcl5P97bttl2xCPvxof1a18kmqOrMmiElgtn3Ej7zs,8480
 uk_bin_collection/uk_bin_collection/councils/NorthAyrshireCouncil.py,sha256=o8zv40Wt19d51mrN5lsgLMCKMokMPmI1cMHBNT5yAho,1976
 uk_bin_collection/uk_bin_collection/councils/NorthDevonCountyCouncil.py,sha256=tgJKIvu7nnCAHu_HImfG5SQABD6ygKFqrZU-ZoC6ObY,6260
-uk_bin_collection/uk_bin_collection/councils/NorthEastDerbyshireDistrictCouncil.py,sha256=bps_uCFAeUHQla7AE5lZOv6sUkUz1fb6zduZdAcYMuw,4651
+uk_bin_collection/uk_bin_collection/councils/NorthEastDerbyshireDistrictCouncil.py,sha256=BfNpYcjG3z0Yz8OYN6NkfzvZ5k1FI-80D-rv211kPPU,5449
 uk_bin_collection/uk_bin_collection/councils/NorthEastLincs.py,sha256=fYf438VZIaOaqPSwdTTWVjFTdrI0jGfFsxVzOc-QdkA,1817
 uk_bin_collection/uk_bin_collection/councils/NorthHertfordshireDistrictCouncil.py,sha256=dFgvZqVKEVEP0zSPeh2s9xIWSCGbhYHpXn2U6Nk0HXM,2847
 uk_bin_collection/uk_bin_collection/councils/NorthKestevenDistrictCouncil.py,sha256=vYOCerJXr9LTP6F2wm4vpYNYbQaWNZ6yfHEQ33N_hTw,1681
@@ -254,6 +256,7 @@ uk_bin_collection/uk_bin_collection/councils/SeftonCouncil.py,sha256=XUEz2li0oHr
 uk_bin_collection/uk_bin_collection/councils/SevenoaksDistrictCouncil.py,sha256=qqrrRaSVm9CYAtm0rB2ZnyH_nLwaReuacoUxZpo597k,4260
 uk_bin_collection/uk_bin_collection/councils/SheffieldCityCouncil.py,sha256=9g9AeiackoWyej9EVlKUzywzAtMuBVD0f93ZryAUha8,2016
 uk_bin_collection/uk_bin_collection/councils/ShropshireCouncil.py,sha256=6OIEhJmv-zLJiEo8WaJePA7JuhNRGkh2WohFLhzN8Kk,1477
+uk_bin_collection/uk_bin_collection/councils/SloughBoroughCouncil.py,sha256=B6ksHUgcPns9fRUrPpyTkGGAwqn1DH0rQfS3Ma6Gzrs,5987
 uk_bin_collection/uk_bin_collection/councils/SolihullCouncil.py,sha256=gbTHjbdV46evGfLfF8rxVMQIgNZD-XPHgZeuyje7kGY,1609
 uk_bin_collection/uk_bin_collection/councils/SomersetCouncil.py,sha256=CZJnkCGn4-yH31HH5_ix-8V2_vsjGuKYxgzAPGZdSAw,8480
 uk_bin_collection/uk_bin_collection/councils/SouthAyrshireCouncil.py,sha256=03eapeXwxneKI4ccKPSHoviIbhmV1m90I-0WQ_s3KsY,2722
@@ -294,6 +297,7 @@ uk_bin_collection/uk_bin_collection/councils/TeignbridgeCouncil.py,sha256=-NowMN
 uk_bin_collection/uk_bin_collection/councils/TelfordAndWrekinCouncil.py,sha256=p1ZS5R4EGxbEWlRBrkGXgKwE_lkyBT-R60yKFFhVObc,1844
 uk_bin_collection/uk_bin_collection/councils/TendringDistrictCouncil.py,sha256=1_CkpWPTfRUEP5YJ9R4_dJRLtb-O9i83hfWJc1shw_c,4283
 uk_bin_collection/uk_bin_collection/councils/TestValleyBoroughCouncil.py,sha256=Dtfkyrwt795W7gqFJxVGRR8t3R5WMNQZwTWJckLpZWE,8480
+uk_bin_collection/uk_bin_collection/councils/TewkesburyBoroughCouncil.py,sha256=cSULCQBddk4tfaJZHv7mrNwM4sZkOYJpmlQXlvrZvPk,1396
 uk_bin_collection/uk_bin_collection/councils/ThanetDistrictCouncil.py,sha256=Cxrf0tUryDL-wFclPH5yovVt8i7Sc7g-ZFrU9_wg6KY,2717
 uk_bin_collection/uk_bin_collection/councils/ThreeRiversDistrictCouncil.py,sha256=RHt3e9oeKzwxjjY-M8aC0nk-ZXhHIoyC81JzxkPVxsE,5531
 uk_bin_collection/uk_bin_collection/councils/ThurrockCouncil.py,sha256=vAZMm6mcsdEcOkP15xwxWy9gdXpmLYQFH7qRifurNoY,2935
@@ -340,8 +344,8 @@ uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bId
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=QD4v4xpsEE0QheR_fGaNOIRMc2FatcUfKkkhAhseyVU,1159
 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.151.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.151.0.dist-info/METADATA,sha256=5SIksvWnLyMwc7YNjzyWRTDxFdUbCbpspDeRWeahvVs,20914
-uk_bin_collection-0.151.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.151.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.151.0.dist-info/RECORD,,
+uk_bin_collection-0.152.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.152.0.dist-info/METADATA,sha256=2gnhvjy_Hu9moRYLw5s6ogGMDh1dYkitouNtc5DOOM4,20914
+uk_bin_collection-0.152.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.152.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.152.0.dist-info/RECORD,,