uk_bin_collection 0.147.2__tar.gz → 0.148.1__tar.gz

{uk_bin_collection-0.147.2 → uk_bin_collection-0.148.1}/PKG-INFO

@@ -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 → uk_bin_collection-0.148.1}/pyproject.toml

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

{uk_bin_collection-0.147.2 → uk_bin_collection-0.148.1}/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-0.147.2 → uk_bin_collection-0.148.1}/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-0.147.2 → uk_bin_collection-0.148.1}/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-0.148.1/uk_bin_collection/uk_bin_collection/councils/ArgyllandButeCouncil.py

@@ -0,0 +1,138 @@
+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
+    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.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']")
+                    )
+                )
+            )
+
+            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",
+                    )
+                )
+            )
+
+            soup = BeautifulSoup(
+                results.get_attribute("innerHTML"), features="html.parser"
+            )
+
+            today = datetime.today()
+            current_year = today.year
+            current_month = today.month
+
+            bin_data = {"bins": []}
+
+            # Skip header
+            for row in soup.find_all("tr")[1:]:
+                cells = row.find_all("td")
+                if len(cells) < 2:
+                    continue
+
+                bin_type = cells[0].get_text(strip=True)
+                raw_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
+
+                    # Determine correct year based on current month
+                    year = current_year + 1 if month < current_month else 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
+
+                bin_data["bins"].append({"type": bin_type, "collectionDate": date_str})
+
+            # 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 → uk_bin_collection-0.148.1}/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-0.147.2 → uk_bin_collection-0.148.1}/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-0.147.2 → uk_bin_collection-0.148.1}/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-0.148.1/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