uk_bin_collection 0.147.2__py3-none-any.whl → 0.148.1__py3-none-any.whl

uk_bin_collection/compare_lad_codes.py

@@ -1,6 +1,7 @@
 import json
 import geopandas as gpd
 
+
 def extract_lad_codes(input_json_path):
     with open(input_json_path, "r") as f:
         data = json.load(f)
@@ -21,6 +22,7 @@ def extract_lad_codes(input_json_path):
 
     return lad_codes, lad_code_to_council_input
 
+
 def compare_with_geojson(input_lad_codes, geojson_path):
     gdf = gpd.read_file(geojson_path)
     geojson_lad_codes = set(gdf["LAD24CD"].dropna().unique())
@@ -37,17 +39,22 @@ def compare_with_geojson(input_lad_codes, geojson_path):
 
     return matching, missing_in_input, extra_in_input, geojson_lad_map
 
+
 # --- Run the comparison ---
 input_json_path = "uk_bin_collection/tests/input.json"
 geojson_path = "uk_bin_collection/Local_Authority_Boundaries.geojson"
 
 input_lad_codes, input_name_map = extract_lad_codes(input_json_path)
-matching, missing, extra, geojson_name_map = compare_with_geojson(input_lad_codes, geojson_path)
+matching, missing, extra, geojson_name_map = compare_with_geojson(
+    input_lad_codes, geojson_path
+)
 
 # --- Print results ---
 print(f"✅ Matching LAD24CDs ({len(matching)}):")
 for code in sorted(matching):
-    print(f"  {code} → input.json: {input_name_map.get(code)} | geojson: {geojson_name_map.get(code)}")
+    print(
+        f"  {code} → input.json: {input_name_map.get(code)} | geojson: {geojson_name_map.get(code)}"
+    )
 
 print(f"\n🟡 LADs in GeoJSON but missing in input.json ({len(missing)}):")
 for code in sorted(missing):

uk_bin_collection/tests/generate_map_test_results.py

@@ -4,16 +4,18 @@ import xml.etree.ElementTree as ET
 from collections import defaultdict
 import re
 
+
 def extract_council_name(testname):
     """
     Extracts the council name from the test name.
     E.g. "test_scenario_outline[BarnetCouncil]" => "barnetcouncil"
     """
-    match = re.search(r'\[(.*?)\]', testname)
+    match = re.search(r"\[(.*?)\]", testname)
     if match:
         return match.group(1).strip().lower()
     return None
 
+
 def parse_junit_xml(path):
     tree = ET.parse(path)
     root = tree.getroot()
@@ -31,6 +33,7 @@ def parse_junit_xml(path):
 
     return results
 
+
 def main():
     if len(sys.argv) != 2:
         print("Usage: python generate_test_results.py <junit.xml path>")

uk_bin_collection/tests/input.json

@@ -45,8 +45,10 @@
     },
     "ArgyllandButeCouncil": {
         "skip_get_url": true,
-        "uprn": "125061759",
-        "url": "https://www.argyll-bute.gov.uk",
+        "postcode": "PA286LJ",
+        "uprn": "000125011723",
+        "url": "https://www.argyll-bute.gov.uk/rubbish-and-recycling/household-waste/bin-collection",
+        "web_driver": "http://selenium:4444",
         "wiki_name": "Argyll and Bute Council",
         "wiki_note": "Pass the UPRN. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search).",
         "LAD24CD": "S12000035"
@@ -1169,6 +1171,16 @@
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
         "LAD24CD": "E07000132"
     },
+    "HorshamDistrictCouncil": {
+        "postcode": "RH12 1AA",
+        "LAD24CD": "E07000227",
+        "skip_get_url": true,
+        "uprn": "010013792717",
+        "url": "https://www.horsham.gov.uk/waste-recycling-and-bins/household-bin-collections/check-your-bin-collection-day",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "Horsham District Council",
+        "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search). This parser requires a Selenium webdriver."
+    },
     "HullCityCouncil": {
         "LAD24CD": "E06000010",
         "skip_get_url": true,
@@ -2649,6 +2661,17 @@
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
         "LAD24CD": "E07000237"
     },
+    "WrexhamCountyBoroughCouncil": {
+        "house_number": "1",
+        "postcode": "LL12 7RW",
+        "uprn": "200002944225",
+        "skip_get_url": true,
+        "url": "https://www.wrexham.gov.uk/service/when-are-my-bins-collected",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "Wrexham County Borough Council",
+        "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter.",
+        "LAD24CD": "W06000006"
+    },
     "WychavonDistrictCouncil": {
         "postcode": "WR3 7RU",
         "skip_get_url": true,

uk_bin_collection/uk_bin_collection/councils/ArgyllandButeCouncil.py

@@ -1,13 +1,15 @@
-import time
-
-import requests
 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, WebDriverWait
+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
 
 
 # import the wonderful Beautiful Soup and the URL grabber
+
+
 class CouncilClass(AbstractGetBinDataClass):
     """
     Concrete classes have to implement all abstract operations of the
@@ -16,52 +18,121 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        try:
+            page = "https://www.argyll-bute.gov.uk/rubbish-and-recycling/household-waste/bin-collection"
+
+            user_uprn = kwargs.get("uprn")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            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)
+
+            # Accept cookies
+            try:
+                accept_cookies = WebDriverWait(driver, timeout=10).until(
+                    EC.element_to_be_clickable(
+                        (By.XPATH, "//button[@id='ccc-recommended-settings']")
+                    )
+                )
+                accept_cookies.click()
+            except:
+                print(
+                    "Accept cookies banner not found or clickable within the specified time."
+                )
+                pass
+            # Wait for postcode entry box
+
+            postcode_input = WebDriverWait(driver, timeout=15).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//input[@id='edit-postcode']")
+                )
+            )
+
+            postcode_input.send_keys(user_postcode)
+
+            search_btn = WebDriverWait(driver, timeout=15).until(
+                EC.presence_of_element_located((By.ID, "edit-submit"))
+            )
+            search_btn.click()
+
+            address_results = Select(
+                WebDriverWait(driver, timeout=15).until(
+                    EC.presence_of_element_located(
+                        (By.XPATH, "//select[@id='edit-address']")
+                    )
+                )
+            )
 
-        user_uprn = kwargs.get("uprn")
-        check_uprn(user_uprn)
-        user_uprn = user_uprn.zfill(12)
-        bindata = {"bins": []}
+            address_results.select_by_value(user_uprn)
+            submit_btn = WebDriverWait(driver, timeout=15).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//input[@value='Search for my bin collection details']")
+                )
+            )
+            submit_btn.click()
+
+            results = WebDriverWait(driver, timeout=15).until(
+                EC.presence_of_element_located(
+                    (
+                        By.XPATH,
+                        "//th[contains(text(),'Collection date')]/ancestor::table",
+                    )
+                )
+            )
 
-        URI = "https://www.argyll-bute.gov.uk/rubbish-and-recycling/household-waste/bin-collection"
+            soup = BeautifulSoup(
+                results.get_attribute("innerHTML"), features="html.parser"
+            )
 
-        data = {"addressSelect": user_uprn}
+            today = datetime.today()
+            current_year = today.year
+            current_month = today.month
 
-        s = requests.session()
-        r = s.post(URI, data=data)
-        r.raise_for_status()
+            bin_data = {"bins": []}
 
-        soup = BeautifulSoup(r.content, features="html.parser")
-        soup.prettify()
+            # Skip header
+            for row in soup.find_all("tr")[1:]:
+                cells = row.find_all("td")
+                if len(cells) < 2:
+                    continue
 
-        # Find the table and extract the rows with bin schedule information
-        table = soup.find("table", class_="table table-bordered")
-        rows = table.find_all("tr")[1:]  # Skip the header row
+                bin_type = cells[0].get_text(strip=True)
+                raw_date = cells[1].get_text(strip=True)
 
-        current_year = datetime.now().year
-        # Loop through each row and extract the bin type and collection date
-        for row in rows:
-            cells = row.find_all("td")
-            bin_type = cells[0].get_text(strip=True)
-            collection_date = cells[1].get_text(strip=True)
+                try:
+                    # Parse day and month first to determine year
+                    partial_date = datetime.strptime(raw_date, "%A %d %B")
+                    month = partial_date.month
 
-            collection_date = datetime.strptime(
-                collection_date,
-                "%A %d %B",
-            )
+                    # Determine correct year based on current month
+                    year = current_year + 1 if month < current_month else current_year
 
-            if collection_date.month == 1:
-                collection_date = collection_date.replace(year=current_year + 1)
-            else:
-                collection_date = collection_date.replace(year=current_year)
+                    # Re-parse with the correct year
+                    full_date_str = f"{raw_date} {year}"
+                    parsed_date = datetime.strptime(full_date_str, "%A %d %B %Y")
+                    date_str = parsed_date.strftime(date_format)
+                except ValueError:
+                    continue
 
-            dict_data = {
-                "type": bin_type,
-                "collectionDate": collection_date.strftime(date_format),
-            }
-            bindata["bins"].append(dict_data)
+                bin_data["bins"].append({"type": bin_type, "collectionDate": date_str})
 
-        bindata["bins"].sort(
-            key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
-        )
+            # Sort by date
+            bin_data["bins"].sort(
+                key=lambda x: datetime.strptime(x["collectionDate"], date_format)
+            )
 
-        return bindata
+        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 bin_data

uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py

@@ -1,6 +1,6 @@
-# import re
-
 import requests
+from bs4 import BeautifulSoup
+from dateutil.parser import parse
 
 from uk_bin_collection.uk_bin_collection.common import (
     check_postcode,
@@ -232,11 +232,46 @@ class CouncilClass(AbstractGetBinDataClass):
         )
         garden_dates: list[str] = get_dates_every_x_days(week[garden_week], 14, 28)
 
+        # Build a dictionary of bank holiday changes
+        bank_holiday_bins_url = "https://www.cheltenham.gov.uk/bank-holiday-collections"
+        response = requests.get(bank_holiday_bins_url)
+        soup = BeautifulSoup(response.content, "html.parser")
+        response.close()
+        tables = soup.find_all("table")
+
+        # Build a dictionary to modify any bank holiday collections
+        bh_dict = {}
+        for table in tables:
+            # extract table body
+            for row in table.find_all("tr")[1:]:
+                if row.find_all("td")[1].text.strip() == "Normal collection day":
+                    bh_dict[
+                        parse(
+                            row.find_all("td")[0].text.strip(),
+                            dayfirst=True,
+                            fuzzy=True,
+                        ).date()
+                    ] = parse(
+                        row.find_all("td")[0].text.strip(), dayfirst=True, fuzzy=True
+                    ).date()
+                else:
+                    bh_dict[
+                        parse(
+                            row.find_all("td")[0].text.strip(),
+                            dayfirst=True,
+                            fuzzy=True,
+                        ).date()
+                    ] = parse(
+                        row.find_all("td")[1].text.strip(), dayfirst=True, fuzzy=True
+                    ).date()
+
         for refuse_date in refuse_dates:
-            collection_date = (
-                datetime.strptime(refuse_date, "%d/%m/%Y")
-                + timedelta(days=refuse_day_offset)
-            ).strftime("%d/%m/%Y")
+            collection_date = datetime.strptime(refuse_date, "%d/%m/%Y") + timedelta(
+                days=refuse_day_offset
+            )
+            if collection_date in bh_dict:
+                collection_date = bh_dict[collection_date]
+            collection_date = collection_date.strftime("%d/%m/%Y")
 
             dict_data = {
                 "type": "Refuse Bin",
@@ -246,10 +281,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
         for recycling_date in recycling_dates:
 
-            collection_date = (
-                datetime.strptime(recycling_date, "%d/%m/%Y")
-                + timedelta(days=recycling_day_offset)
-            ).strftime("%d/%m/%Y")
+            collection_date = datetime.strptime(recycling_date, "%d/%m/%Y") + timedelta(
+                days=recycling_day_offset
+            )
+            if collection_date in bh_dict:
+                collection_date = bh_dict[collection_date]
+            collection_date = collection_date.strftime("%d/%m/%Y")
 
             dict_data = {
                 "type": "Recycling Bin",
@@ -259,10 +296,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
         for garden_date in garden_dates:
 
-            collection_date = (
-                datetime.strptime(garden_date, "%d/%m/%Y")
-                + timedelta(days=garden_day_offset)
-            ).strftime("%d/%m/%Y")
+            collection_date = datetime.strptime(garden_date, "%d/%m/%Y") + timedelta(
+                days=garden_day_offset
+            )
+            if collection_date in bh_dict:
+                collection_date = bh_dict[collection_date]
+            collection_date = collection_date.strftime("%d/%m/%Y")
 
             dict_data = {
                 "type": "Garden Waste Bin",
@@ -279,10 +318,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
             for food_date in food_dates:
 
-                collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y")
-                    + timedelta(days=food_day_offset)
-                ).strftime("%d/%m/%Y")
+                collection_date = datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
+                    days=food_day_offset
+                )
+                if collection_date in bh_dict:
+                    collection_date = bh_dict[collection_date]
+                collection_date = collection_date.strftime("%d/%m/%Y")
 
                 dict_data = {
                     "type": "Food Waste Bin",
@@ -313,10 +354,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
             for food_date in food_dates_first:
 
-                collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y")
-                    + timedelta(days=food_day_offset)
-                ).strftime("%d/%m/%Y")
+                collection_date = datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
+                    days=food_day_offset
+                )
+                if collection_date in bh_dict:
+                    collection_date = bh_dict[collection_date]
+                collection_date = collection_date.strftime("%d/%m/%Y")
 
                 dict_data = {
                     "type": "Food Waste Bin",
@@ -325,10 +368,12 @@ class CouncilClass(AbstractGetBinDataClass):
                 bindata["bins"].append(dict_data)
             for food_date in food_dates_second:
 
-                collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y")
-                    + timedelta(days=second_week_offset)
-                ).strftime("%d/%m/%Y")
+                collection_date = datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
+                    days=second_week_offset
+                )
+                if collection_date in bh_dict:
+                    collection_date = bh_dict[collection_date]
+                collection_date = collection_date.strftime("%d/%m/%Y")
 
                 dict_data = {
                     "type": "Food Waste Bin",

uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py

@@ -33,7 +33,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Wait for the postcode field to appear then populate it
             inputElement_postcode = WebDriverWait(driver, 30).until(
                 EC.presence_of_element_located(
-                    (By.ID, "WASTECOLLECTIONDAYS202425_LOOKUP_ADDRESSLOOKUPPOSTCODE")
+                    (By.ID, "WASTECOLLECTIONDAYS202526_LOOKUP_ADDRESSLOOKUPPOSTCODE")
                 )
             )
             inputElement_postcode.send_keys(user_postcode)
@@ -41,7 +41,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Click search button
             findAddress = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
-                    (By.ID, "WASTECOLLECTIONDAYS202425_LOOKUP_ADDRESSLOOKUPSEARCH")
+                    (By.ID, "WASTECOLLECTIONDAYS202526_LOOKUP_ADDRESSLOOKUPSEARCH")
                 )
             )
             findAddress.click()
@@ -51,7 +51,7 @@ class CouncilClass(AbstractGetBinDataClass):
                 EC.element_to_be_clickable(
                     (
                         By.XPATH,
-                        "//select[@id='WASTECOLLECTIONDAYS202425_LOOKUP_ADDRESSLOOKUPADDRESS']//option[contains(., '"
+                        "//select[@id='WASTECOLLECTIONDAYS202526_LOOKUP_ADDRESSLOOKUPADDRESS']//option[contains(., '"
                         + user_paon
                         + "')]",
                     )
@@ -61,7 +61,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Wait for the submit button to appear, then click it to get the collection dates
             submit = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
-                    (By.ID, "WASTECOLLECTIONDAYS202425_LOOKUP_FIELD2_NEXT")
+                    (By.ID, "WASTECOLLECTIONDAYS202526_LOOKUP_FIELD2_NEXT")
                 )
             )
             submit.click()

uk_bin_collection/uk_bin_collection/councils/HarrogateBoroughCouncil.py

@@ -37,7 +37,7 @@ class CouncilClass(AbstractGetBinDataClass):
         collections = []
 
         # Find section with bins in
-        table = soup.find_all("table", {"class": "hbcRounds"})[1]
+        table = soup.find_all("table", {"class": "hbcRounds"})[0]
 
         # For each bin section, get the text and the list elements
         for row in table.find_all("tr"):

uk_bin_collection/uk_bin_collection/councils/HorshamDistrictCouncil.py

@@ -0,0 +1,123 @@
+from time import sleep
+
+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, 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):
+    """
+    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:
+            page = "https://www.horsham.gov.uk/waste-recycling-and-bins/household-bin-collections/check-your-bin-collection-day"
+
+            bin_data = {"bins": []}
+
+            user_uprn = kwargs.get("uprn")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            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)
+
+            # Accept cookies
+            try:
+                accept_cookies = WebDriverWait(driver, timeout=10).until(
+                    EC.element_to_be_clickable(
+                        (By.XPATH, "//button[@id='ccc-notify-accept']")
+                    )
+                )
+                accept_cookies.click()
+            except:
+                print(
+                    "Accept cookies banner not found or clickable within the specified time."
+                )
+                pass
+            # Wait for postcode entry box
+
+            postcode_input = WebDriverWait(driver, timeout=15).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//input[@value='Enter your postcode']")
+                )
+            )
+
+            postcode_input.send_keys(user_postcode)
+            search_btn = WebDriverWait(driver, timeout=15).until(
+                EC.presence_of_element_located((By.ID, "Submit1"))
+            )
+            search_btn.click()
+
+            address_results = Select(
+                WebDriverWait(driver, timeout=15).until(
+                    EC.presence_of_element_located(
+                        (
+                            By.XPATH,
+                            "//option[contains(text(),'Please select address...')]/parent::select",
+                        )
+                    )
+                )
+            )
+
+            address_results.select_by_value(user_uprn)
+
+            results = WebDriverWait(driver, timeout=15).until(
+                EC.presence_of_element_located(
+                    (
+                        By.XPATH,
+                        "//th[contains(text(),'COLLECTION TYPE')]/ancestor::table",
+                    )
+                )
+            )
+
+            soup = BeautifulSoup(
+                results.get_attribute("innerHTML"), features="html.parser"
+            )
+
+            # Skip the header, loop through each row in tbody
+            for row in soup.find_all("tbody")[0].find_all("tr"):
+                cells = row.find_all("td")
+                if len(cells) < 3:
+                    continue
+                date_str = cells[1].get_text(strip=True)
+                collection_type = cells[2].get_text(strip=True)
+
+                try:
+                    date = datetime.strptime(date_str, "%d/%m/%Y").strftime(date_format)
+                except ValueError:
+                    continue  # Skip if date is invalid
+
+                bin_data["bins"].append(
+                    {"type": collection_type, "collectionDate": date}
+                )
+
+            # Sort by date
+            bin_data["bins"].sort(
+                key=lambda x: datetime.strptime(x["collectionDate"], date_format)
+            )
+
+        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 bin_data

uk_bin_collection/uk_bin_collection/councils/WrexhamCountyBoroughCouncil.py

@@ -0,0 +1,123 @@
+from time import sleep
+
+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, 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):
+    """
+    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:
+            page = "https://www.wrexham.gov.uk/service/when-are-my-bins-collected"
+
+            bin_data = {"bins": []}
+
+            user_uprn = kwargs.get("uprn")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            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)
+
+            start_now_btn = WebDriverWait(driver, timeout=15).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//a[contains(text(),'Start now')]")
+                )
+            )
+            start_now_btn.click()
+
+            continue_without_signup_btn = WebDriverWait(driver, timeout=15).until(
+                EC.presence_of_element_located(
+                    (
+                        By.XPATH,
+                        "//a[contains(text(),'or, continue without an account')]",
+                    )
+                )
+            )
+            continue_without_signup_btn.click()
+
+            iframe_presense = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located((By.ID, "fillform-frame-1"))
+            )
+
+            driver.switch_to.frame(iframe_presense)
+
+            inputElement_postcodesearch = WebDriverWait(driver, 30).until(
+                EC.element_to_be_clickable((By.ID, "LocationSearch"))
+            )
+
+            inputElement_postcodesearch.send_keys(user_postcode)
+
+            # Wait for the 'Select address' dropdown to be updated
+
+            # Wait for 'Searching for...' to be removed from page
+            WebDriverWait(driver, timeout=15).until(
+                EC.none_of(EC.presence_of_element_located((By.CLASS_NAME, "spinner")))
+            )
+
+            dropdown = WebDriverWait(driver, 30).until(
+                EC.element_to_be_clickable((By.ID, "ChooseAddress"))
+            )
+            # Create a 'Select' for it, then select the first address in the list
+            # (Index 0 is "Select...")
+            dropdownSelect = Select(dropdown)
+            dropdownSelect.select_by_value(str(user_uprn))
+
+            results_wait = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//th[contains(text(),'Collection')]")
+                )
+            )
+
+            results = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//table[@id='wcbc_collection_details']")
+                )
+            )
+
+            soup = BeautifulSoup(
+                results.get_attribute("innerHTML"), features="html.parser"
+            )
+
+            for row in soup.find_all("tr")[1:]:  # Skip the header row
+                date_cell, collection_cell = row.find_all("td")
+                date = datetime.strptime(date_cell.text.strip(), "%d/%m/%Y").strftime(
+                    date_format
+                )
+
+                for bin_item in collection_cell.find_all("li"):
+                    bin_type = bin_item.text.strip()
+                    bin_data["bins"].append({"type": bin_type, "collectionDate": date})
+
+            # Optional: sort by date
+            bin_data["bins"].sort(
+                key=lambda x: datetime.strptime(x["collectionDate"], date_format)
+            )
+
+        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 bin_data

{uk_bin_collection-0.147.2.dist-info → uk_bin_collection-0.148.1.dist-info}/METADATA

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

{uk_bin_collection-0.147.2.dist-info → uk_bin_collection-0.148.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
 uk_bin_collection/Local_Authority_Boundaries.geojson,sha256=_j-hUiL0--t2ewd_s29-j7_AKRlhagRMmOhXyco-B6I,1175922
 uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uk_bin_collection/compare_lad_codes.py,sha256=BjXPzxYbbqyl2Pv9yPip0BVpyD3GOofwgWa-BQUecqM,2214
+uk_bin_collection/compare_lad_codes.py,sha256=0bax1PbwfNp6IOI4XMKhBHF3illSG-NLbOH-DbBFIu8,2237
 uk_bin_collection/map.html,sha256=1xqlWRc2g4poZwT9FVdsSAkXPmkZ3dmQeA_-ikbU9dg,4135
 uk_bin_collection/tests/check_selenium_url_in_input.json.py,sha256=lf-JT7vvaSfvgbrfOhzrhfSzJqL82WajlRqo1GqfcMM,7875
 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/generate_map_test_results.py,sha256=8KjfNWNd44eGhiQMDJejoVzTh9dckGHikZQfwJgNO3w,1141
-uk_bin_collection/tests/input.json,sha256=-EVTLbgBwk879YMbAHkIYC7svXffzlL8xOa8Tab8M7g,133327
+uk_bin_collection/tests/generate_map_test_results.py,sha256=CKnGK2ZgiSXomRGkomX90DitgMP-X7wkHhyKORDcL2E,1144
+uk_bin_collection/tests/input.json,sha256=oKY8pf4KyZjiZxc0FvlmFdxsgBteImQF0VVkCJQBwmk,134509
 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
@@ -23,7 +23,7 @@ uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py,sha256=p
 uk_bin_collection/uk_bin_collection/councils/AmberValleyBoroughCouncil.py,sha256=mTeluIIEcuxLxhfDQ95A1fp8RM6AkJT5tRGZPUbYGdk,1853
 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=fJ0UvuSCbzFE9CPoxt1U9CJeFsbTKts_5GRBc3E9Eno,2201
+uk_bin_collection/uk_bin_collection/councils/ArgyllandButeCouncil.py,sha256=UnHge6FwigJKYuE6QYiXE659dTaKvs1xhHHJXoAXhSQ,5075
 uk_bin_collection/uk_bin_collection/councils/ArmaghBanbridgeCraigavonCouncil.py,sha256=o9NBbVCTdxKXnpYbP8-zxe1Gh8s57vwfV75Son_sAHE,2863
 uk_bin_collection/uk_bin_collection/councils/ArunCouncil.py,sha256=yfhthv9nuogP19VOZ3TYQrq51qqjiCZcSel4sXhiKjs,4012
 uk_bin_collection/uk_bin_collection/councils/AshfieldDistrictCouncil.py,sha256=fhX7S_A3jqoND7NE6qITPMPvdk3FJSKZ3Eoa5RtSg3I,4247
@@ -73,7 +73,7 @@ uk_bin_collection/uk_bin_collection/councils/CastlepointDistrictCouncil.py,sha25
 uk_bin_collection/uk_bin_collection/councils/CeredigionCountyCouncil.py,sha256=np9iLnMVWpMYUiHZ4sJaSaU5pOWfmiCLQ8TIrOlY48o,5924
 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/CheltenhamBoroughCouncil.py,sha256=Su77RQoX4Hw6goAT0f-sfhOf3NFPn0MaPFrNdEEhsMM,14100
+uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py,sha256=B7OgyFKlbvu8SowAALLI8j2EnKlmbXEj65XtB27rCWI,16357
 uk_bin_collection/uk_bin_collection/councils/CherwellDistrictCouncil.py,sha256=VxTe9qk93MFgtELEgVrEz3W0vYaG_32EpPmky_b4j0k,2590
 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
@@ -106,7 +106,7 @@ uk_bin_collection/uk_bin_collection/councils/EastAyrshireCouncil.py,sha256=i3AcW
 uk_bin_collection/uk_bin_collection/councils/EastCambridgeshireCouncil.py,sha256=aYUVE5QqTxdj8FHhCB4EiFVDJahWJD9Pq0d1upBEvXg,1501
 uk_bin_collection/uk_bin_collection/councils/EastDevonDC.py,sha256=U0VwSNIldMv5nUoiXtFgjbE0m6Kb-8W2WZQGVCNF_WI,3261
 uk_bin_collection/uk_bin_collection/councils/EastHertsCouncil.py,sha256=FsHfejTGPjRUByDz157690LTD8JpqGplD_XVb7pTe3A,4862
-uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py,sha256=RSOTD1MIXSW27eGf3TixCiJK4HtSJnpfME2CjalDeXs,4326
+uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py,sha256=Laf-j0LLr7M4xmKhk8kjPNTtt66oXKYWm0ppxdUX3F0,4326
 uk_bin_collection/uk_bin_collection/councils/EastLothianCouncil.py,sha256=zTp-GDWYeUIlFaqfkqGvo7XMtxJd0VbxdGgqaAwRACk,2792
 uk_bin_collection/uk_bin_collection/councils/EastRenfrewshireCouncil.py,sha256=5giegMCKQ2JhVDR5M4mevVxIdhZtSW7kbuuoSkj3EGk,4361
 uk_bin_collection/uk_bin_collection/councils/EastRidingCouncil.py,sha256=oL-NqriLVy_NChGASNh8qTqeakLn4iP_XzoMC6VlPGM,5216
@@ -142,7 +142,7 @@ uk_bin_collection/uk_bin_collection/councils/HackneyCouncil.py,sha256=vO3ugk5fcd
 uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py,sha256=gq_CPqi6qM2oNiHhKKF1lZC86fyKL4lPhh_DN9pJZ04,5971
 uk_bin_collection/uk_bin_collection/councils/HarboroughDistrictCouncil.py,sha256=uAbCgfrqkIkEKUyLVE8l72s5tzbfMFsw775i0nVRAyc,1934
 uk_bin_collection/uk_bin_collection/councils/HaringeyCouncil.py,sha256=t_6AkAu4wrv8Q0WlDhWh_82I0djl5tk531Pzs-SjWzg,2647
-uk_bin_collection/uk_bin_collection/councils/HarrogateBoroughCouncil.py,sha256=_g3fP5Nq-OUjgNrfRf4UEyFKzq0x8QK-4enh5RP1efA,2050
+uk_bin_collection/uk_bin_collection/councils/HarrogateBoroughCouncil.py,sha256=6Sf4l07YvpCmhuOMgD0VWsjfdwHPnEbbsEAsWbl4A44,2050
 uk_bin_collection/uk_bin_collection/councils/HartDistrictCouncil.py,sha256=_llxT4JYYlwm20ZtS3fXwtDs6mwJyLTZBP2wBhvEpWk,2342
 uk_bin_collection/uk_bin_collection/councils/HartlepoolBoroughCouncil.py,sha256=MUT1A24iZShT2p55rXEvgYwGUuw3W05Z4ZQAveehv-s,2842
 uk_bin_collection/uk_bin_collection/councils/HastingsBoroughCouncil.py,sha256=9MCuit4awXSZTbZCXWBsQGX2tp2mHZ1eP1wENZdMvgA,1806
@@ -152,6 +152,7 @@ uk_bin_collection/uk_bin_collection/councils/HighPeakCouncil.py,sha256=x7dfy8mdt
 uk_bin_collection/uk_bin_collection/councils/HighlandCouncil.py,sha256=GNxDU65QuZHV5va2IrKtcJ6TQoDdwmV03JvkVqOauP4,3291
 uk_bin_collection/uk_bin_collection/councils/Hillingdon.py,sha256=2OUp0iYO1YeZuTq0XRUalgoay5JRZgfHKKEwYzdMAU0,11291
 uk_bin_collection/uk_bin_collection/councils/HinckleyandBosworthBoroughCouncil.py,sha256=51vXTKrstfJhb7cLCcrsvA9qKCsptyNMZvy7ML9DasM,2344
+uk_bin_collection/uk_bin_collection/councils/HorshamDistrictCouncil.py,sha256=U8WelJiHivT7CS3meUVcLURWOLRKes1pKZ81tcqKarM,4446
 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/IpswichBoroughCouncil.py,sha256=57lmDl_FprG68gUhKQYpOa1M2pudyb1utfoMhUXNwzs,2802
@@ -327,6 +328,7 @@ uk_bin_collection/uk_bin_collection/councils/WokingBoroughCouncil.py,sha256=37ig
 uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py,sha256=H8aFHlacwV07X-6T9RQua4irqDA0cIQrF4O1FfPR7yI,4114
 uk_bin_collection/uk_bin_collection/councils/WolverhamptonCityCouncil.py,sha256=ncXfu5RHPCFsArczXHy7g0l_HEZa7GC-QA1QRReP_00,1801
 uk_bin_collection/uk_bin_collection/councils/WorcesterCityCouncil.py,sha256=dKHB2fPSmOGOwyvfpbdR4U8XW2ctBf63gCPxX06kwKA,1867
+uk_bin_collection/uk_bin_collection/councils/WrexhamCountyBoroughCouncil.py,sha256=MwP9tp6zAD9Xat1ZTKzm8w7iO7nA0HfS7g2OrqRDS8U,4588
 uk_bin_collection/uk_bin_collection/councils/WychavonDistrictCouncil.py,sha256=YuZdzEW0CZLwusm1VQcGRIKXAab_UDFLaCnN60itt_E,5776
 uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=QpCkmRSQmJo0RLsjXoCYPDcoxuDzG_00qNV0AHTDmXo,3000
 uk_bin_collection/uk_bin_collection/councils/WyreForestDistrictCouncil.py,sha256=3b7WzBXdYub6j13sqDL3jlqgICKmNyQaF4KxRxOMHWk,2000
@@ -334,8 +336,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.147.2.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.147.2.dist-info/METADATA,sha256=BrMV0QAdqHhWVOthzHNNSx0gW2Hol8Xr2l_ASF06IcI,20914
-uk_bin_collection-0.147.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.147.2.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.147.2.dist-info/RECORD,,
+uk_bin_collection-0.148.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.148.1.dist-info/METADATA,sha256=VttvCNYiRX4HrDRXZN4qtx7PnsSIRvM51WhxN0QPsDA,20914
+uk_bin_collection-0.148.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.148.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.148.1.dist-info/RECORD,,