uk_bin_collection 0.152.0__tar.gz → 0.152.1__tar.gz

{uk_bin_collection-0.152.0 → uk_bin_collection-0.152.1}/PKG-INFO

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

{uk_bin_collection-0.152.0 → uk_bin_collection-0.152.1}/pyproject.toml

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

{uk_bin_collection-0.152.0 → uk_bin_collection-0.152.1}/uk_bin_collection/tests/input.json

@@ -206,13 +206,11 @@
         "LAD24CD": "N09000003"
     },
     "BexleyCouncil": {
-        "house_number": "1",
-        "postcode": "DA5 3AH",
+        "uprn": "100020196143",
         "skip_get_url": true,
         "url": "https://waste.bexley.gov.uk/waste",
-        "web_driver": "http://selenium:4444",
         "wiki_name": "Bexley",
-        "wiki_note": "In order to use this parser, you will need to sign up to [Bexley's @Home app](https://www.bexley.gov.uk/services/rubbish-and-recycling/bexley-home-recycling-app/about-app). Complete the setup by entering your email and setting your address with postcode and address line. Once you can see the calendar, you should be good to run the parser. Just pass the email you used in quotes in the UPRN parameter.",
+        "wiki_note": "Provide your UPRN. Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to locate it.",
         "LAD24CD": "E09000004"
     },
     "BirminghamCityCouncil": {
@@ -476,10 +474,11 @@
         "LAD24CD": "W06000008"
     },
     "CharnwoodBoroughCouncil": {
-        "url": "https://my.charnwood.gov.uk/location?put=cbc10070067259&rememberme=0&redirect=%2F",
-        "wiki_command_url_override": "https://my.charnwood.gov.uk/location?put=cbcXXXXXXXX&rememberme=0&redirect=%2F",
+        "uprn": "100030446438",
+        "skip_get_url": true,
+        "url": "https://www.charnwood.gov.uk/pages/waste_collections_calendars",
         "wiki_name": "Charnwood",
-        "wiki_note": "Replace XXXXXXXX with your UPRN, keeping \"cbc\" before it.",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
         "LAD24CD": "E07000130"
     },
     "ChelmsfordCityCouncil": {
@@ -508,10 +507,11 @@
         "LAD24CD": "E07000177"
     },
     "CheshireEastCouncil": {
-        "url": "https://online.cheshireeast.gov.uk/MyCollectionDay/SearchByAjax/GetBartecJobList?uprn=100012791226&onelineaddress=3%20COBBLERS%20YARD,%20SK9%207DZ&_=1689413260149",
-        "wiki_command_url_override": "https://online.cheshireeast.gov.uk/MyCollectionDay/SearchByAjax/GetBartecJobList?uprn=XXXXXXXX&onelineaddress=XXXXXXXX&_=1689413260149",
+        "skip_get_url": true,
+        "uprn": "100012830647",
+        "url": "https://online.cheshireeast.gov.uk/mycollectionday",
         "wiki_name": "Cheshire East",
-        "wiki_note": "Both the UPRN and a one-line address are passed in the URL, which needs to be wrapped in double quotes. The one-line address is made up of the house number, street name, and postcode. Use the form [here](https://online.cheshireeast.gov.uk/mycollectionday/) to find them, then take the first line and postcode and replace all spaces with `%20`.",
+        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN.",
         "LAD24CD": "E06000049"
     },
     "CheshireWestAndChesterCouncil": {
@@ -543,11 +543,11 @@
     "ChorleyCouncil": {
         "postcode": "PR6 7PG",
         "skip_get_url": true,
-        "uprn": "UPRN100010382247",
+        "uprn": "100010382247",
         "url": "https://myaccount.chorley.gov.uk/wastecollections.aspx",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Chorley",
-        "wiki_note": "Chorley needs to be passed both a Postcode & UPRN in the format of UPRNXXXXXX to work. Find this on [FindMyAddress](https://www.findmyaddress.co.uk/search).",
+        "wiki_note": "Chorley needs to be passed both a Postcode & UPRN to work. Find this on [FindMyAddress](https://www.findmyaddress.co.uk/search).",
         "LAD24CD": "E07000118"
     },
     "ColchesterCityCouncil": {
@@ -644,8 +644,9 @@
         "LAD24CD": "E07000096"
     },
     "DartfordBoroughCouncil": {
-        "uprn": "010094157511",
-        "url": "https://windmz.dartford.gov.uk/ufs/WS_CHECK_COLLECTIONS.eb?UPRN=010094157511",
+        "uprn": "100060861698",
+        "url": "https://www.dartford.gov.uk/waste-recycling/collection-day",
+        "skip_get_url": true,
         "wiki_name": "Dartford",
         "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN.",
         "LAD24CD": "E07000107"
@@ -690,10 +691,11 @@
         "LAD24CD": "E06000059"
     },
     "DoverDistrictCouncil": {
-        "url": "https://collections.dover.gov.uk/property/100060908340",
-        "wiki_command_url_override": "https://collections.dover.gov.uk/property/XXXXXXXXXXX",
+        "uprn": "100060908340",
+        "url": "https://collections.dover.gov.uk/property",
+        "skip_get_url": true,
         "wiki_name": "Dover",
-        "wiki_note": "Replace XXXXXXXXXXX with your UPRN. To get the UPRN, you can use [FindMyAddress](https://www.findmyaddress.co.uk/search).",
+        "wiki_note": "To get the UPRN, you can use [FindMyAddress](https://www.findmyaddress.co.uk/search).",
         "LAD24CD": "E07000108"
     },
     "DudleyCouncil": {
@@ -735,7 +737,15 @@
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
         "LAD24CD": "S12000008"
     },
-    "EastCambridgeshireCouncil": {
+    "EastbourneBoroughCouncil": {
+        "uprn": "100060011258",
+        "url": "https://www.lewes-eastbourne.gov.uk/article/1158/When-is-my-bin-collection-day",
+        "skip_get_url": true,
+        "wiki_name": "Eastbourne",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
+        "LAD24CD": "E07000061"
+    },
+    "EastCambridgeshireCouncil": { 
         "skip_get_url": true,
         "uprn": "10002597178",
         "url": "https://www.eastcambs.gov.uk/",
@@ -744,10 +754,11 @@
         "LAD24CD": "E07000009"
     },
     "EastDevonDC": {
-        "url": "https://eastdevon.gov.uk/recycling-and-waste/recycling-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=010090909915",
-        "wiki_command_url_override": "https://eastdevon.gov.uk/recycling-and-waste/recycling-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=XXXXXXXX",
+        "uprn": "010090909915",
+        "url": "https://eastdevon.gov.uk/recycling-and-waste/recycling-waste-information/when-is-my-bin-collected/",
+        "skip_get_url": true,
         "wiki_name": "East Devon",
-        "wiki_note": "Replace XXXXXXXX with your UPRN.",
+        "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
         "LAD24CD": "E07000040"
     },
     "EastHertsCouncil": {
@@ -820,6 +831,7 @@
         "skip_get_url": true,
         "uprn": "100060303535",
         "url": "https://www.eastleigh.gov.uk/waste-bins-and-recycling/collection-dates/your-waste-bin-and-recycling-collections?uprn=",
+        "web_driver": "http://selenium:4444",
         "wiki_name": "Eastleigh",
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
         "LAD24CD": "E07000086"
@@ -860,9 +872,10 @@
     "EppingForestDistrictCouncil": {
         "postcode": "IG9 6EP",
         "url": "https://eppingforestdc.maps.arcgis.com/apps/instant/lookup/index.html?appid=bfca32b46e2a47cd9c0a84f2d8cdde17&find=IG9%206EP",
+        "skip_get_url": true,
         "web_driver": "http://selenium:4444",
         "wiki_name": "Epping Forest",
-        "wiki_note": "Replace the postcode in the URL with your own.",
+        "wiki_note": "Add your postcode.",
         "LAD24CD": "E07000072"
     },
     "EpsomandEwellBoroughCouncil": {
@@ -981,10 +994,11 @@
         "LAD24CD": "E07000173"
     },
     "GlasgowCityCouncil": {
-        "url": "https://onlineservices.glasgow.gov.uk/forms/RefuseAndRecyclingWebApplication/CollectionsCalendar.aspx?UPRN=906700034497",
-        "wiki_command_url_override": "https://onlineservices.glasgow.gov.uk/forms/RefuseAndRecyclingWebApplication/CollectionsCalendar.aspx?UPRN=XXXXXXXX",
+        "uprn": "906700034497",
+        "url": "https://onlineservices.glasgow.gov.uk/forms/RefuseAndRecyclingWebApplication/AddressSearch.aspx",
+        "skip_get_url": true,
         "wiki_name": "Glasgow City",
-        "wiki_note": "Replace XXXXXXXX with your UPRN.",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
         "LAD24CD": "S12000049"
     },
     "GloucesterCityCouncil": {
@@ -1003,21 +1017,21 @@
         "wiki_name": "Google Calendar (Public)",
         "wiki_note": "The URL should be the public ics file URL for the public Google calendar. See https://support.google.com/calendar/answer/37083?sjid=7202815583021446882-EU. Councils that currently need this are Trafford.",
         "supported_councils": [
-            "TraffordCouncil",
-            "ClackmannanshireCouncil",
-            "HavantBoroughCouncil",
-            "NorthWarwickshireBoroughCouncil",
-            "NewryMourneAndDownDistrictCouncil",
-            "EastDunbartonshireCouncil",
-            "PendleBoroughCouncil",
-            "TorfaenCountyBoroughCouncil",
-            "EastHampshireCountyCouncil",
-            "RibbleValleyCouncil",
-            "BrentwoodBoroughCouncil",
-            "IsleOfWightCouncil",
-            "WestmorlAndFurnessCouncil",
-            "DerryAndStrabaneDistrictCouncil",
-            "NorwichCityCouncil"
+            "Trafford",
+            "Clackmannanshire",
+            "Havant",
+            "North Warwickshire",
+            "Newry and Mourne",
+            "East Dunbartonshire",
+            "Pendle",
+            "Torfaen",
+            "East Hampshire",
+            "Ribble Valley",
+            "Brentwood",
+            "Isle of Wight",
+            "Westmorland and Furness",
+            "Derry City and Strabane",
+            "Norwich"
         ],
         "supported_councils_LAD24CD": [
             "E06000046",
@@ -1054,14 +1068,13 @@
         "LAD24CD": "E07000145"
     },
     "GuildfordCouncil": {
-        "house_number": "THE LODGE, PUTTENHAM HILL HOUSE, PUTTENHAM HILL, PUTTENHAM, GUILDFORD, GU3 1AH",
+        "house_number": "THE LODGE",
         "postcode": "GU3 1AH",
         "skip_get_url": true,
-        "uprn": "100061372691",
         "url": "https://my.guildford.gov.uk/customers/s/view-bin-collections",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Guildford",
-        "wiki_note": "If the bin day is 'today' then the collectionDate will only show today's date if before 7 AM; else the date will be in 'previousCollectionDate'. To get the UPRN, you will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search).",
+        "wiki_note": "If the bin day is 'today' then the collectionDate will only show today's date if before 7 AM; else the date will be in 'previousCollectionDate'.",
         "LAD24CD": "E07000209"
     },
     "GwyneddCouncil": {
@@ -1137,10 +1150,11 @@
         "LAD24CD": "E07000062"
     },
     "HerefordshireCouncil": {
-        "url": "https://www.herefordshire.gov.uk/rubbish-recycling/check-bin-collection-day?blpu_uprn=10096232662",
-        "wiki_command_url_override": "https://www.herefordshire.gov.uk/rubbish-recycling/check-bin-collection-day?blpu_uprn=XXXXXXXXXXXX",
+        "uprn": "200002618844",
+        "url": "https://www.herefordshire.gov.uk/rubbish-recycling/check-bin-collection-day",
+        "skip_get_url": true,
         "wiki_name": "Herefordshire",
-        "wiki_note": "Replace 'XXXXXXXXXX' with your property's UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search).",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
         "LAD24CD": "E06000019"
     },
     "HertsmereBoroughCouncil": {
@@ -1207,11 +1221,12 @@
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "HuntingdonDistrictCouncil": {
+        "uprn": "10012048679",
         "LAD24CD": "E07000011",
-        "url": "http://www.huntingdonshire.gov.uk/refuse-calendar/10012048679",
-        "wiki_command_url_override": "https://www.huntingdonshire.gov.uk/refuse-calendar/XXXXXXXX",
+        "url": "http://www.huntingdonshire.gov.uk/refuse-calendar/",
+        "skip_get_url": true,
         "wiki_name": "Huntingdonshire",
-        "wiki_note": "Replace XXXXXXXX with your UPRN."
+        "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "HyndburnBoroughCouncil": {
         "postcode": "BB1 4DJ",
@@ -1298,6 +1313,14 @@
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
         "LAD24CD": "E06000016"
     },
+    "LewesDistrictCouncil": {
+        "uprn": "100061930155",
+        "url": "https://www.lewes-eastbourne.gov.uk/article/1158/When-is-my-bin-collection-day",
+        "skip_get_url": true,
+        "wiki_name": "Lewes",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
+        "LAD24CD": "E07000063"
+    },
     "LichfieldDistrictCouncil": {
         "uprn": "100031694085",
         "url": "https://www.lichfielddc.gov.uk",
@@ -1325,10 +1348,11 @@
         "LAD24CD": "N09000007"
     },
     "LiverpoolCityCouncil": {
-        "url": "https://liverpool.gov.uk/Bins/BinDatesTable?UPRN=38164600",
-        "wiki_command_url_override": "https://liverpool.gov.uk/Bins/BinDatesTable?UPRN=XXXXXXXX",
+        "uprn": "38164600",
+        "skip_get_url": true,
+        "url": "https://liverpool.gov.uk/bins-and-recycling/bin-collections/",
         "wiki_name": "Liverpool",
-        "wiki_note": "Replace XXXXXXXX with your property's UPRN.",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
         "LAD24CD": "E08000012"
     },
     "LondonBoroughEaling": {
@@ -1414,6 +1438,15 @@
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN.",
         "LAD24CD": "E06000032"
     },
+    "MaidstoneBoroughCouncil": {
+        "skip_get_url": true,
+        "house_number": "71",
+        "postcode": "ME16 8BT",
+        "url": "https://my.maidstone.gov.uk/service/Find-your-bin-day",
+        "wiki_name": "Maidstone",
+        "wiki_note": "Pass the house number and postcode in their respective parameters. This parser requires a Selenium webdriver.",
+        "LAD24CD": "E07000110"
+    },
     "MaldonDistrictCouncil": {
         "skip_get_url": true,
         "uprn": "100090557253",
@@ -1584,8 +1617,9 @@
         "LAD24CD": "E07000091"
     },
     "NewarkAndSherwoodDC": {
-        "url": "http://app.newark-sherwooddc.gov.uk/bincollection/calendar?pid=200004258529",
-        "wiki_command_url_override": "http://app.newark-sherwooddc.gov.uk/bincollection/calendar?pid=XXXXXXXX",
+        "uprn": "200004258529",
+        "url": "https://app.newark-sherwooddc.gov.uk/bincollection/",
+        "skip_get_url": true,
         "wiki_name": "Newark and Sherwood",
         "wiki_note": "Replace XXXXXXXX with your UPRN.",
         "LAD24CD": "E07000175"
@@ -1605,10 +1639,11 @@
         "LAD24CD": "E07000195"
     },
     "NewhamCouncil": {
-        "url": "https://bincollection.newham.gov.uk/Details/Index/000046002133",
-        "wiki_command_url_override": "https://bincollection.newham.gov.uk/Details/Index/XXXXXXXXXXX",
+        "uprn": "46077811",
+        "url": "https://bincollection.newham.gov.uk/",
+        "skip_get_url": true,
         "wiki_name": "Newham",
-        "wiki_note": "Follow the instructions [here](https://bincollection.newham.gov.uk/) until you get the \"Rubbish and Recycling Collections\" page, then copy the URL and replace the URL in the command.",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN.",
         "LAD24CD": "E09000025"
     },
     "NewportCityCouncil": {
@@ -2323,7 +2358,6 @@
     "SwindonBoroughCouncil": {
         "uprn": "10022793351",
         "url": "https://www.swindon.gov.uk",
-        "wiki_command_url_override": "https://www.swindon.gov.uk",
         "wiki_name": "Swindon",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN.",
         "LAD24CD": "E06000030"

uk_bin_collection-0.152.1/uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py

@@ -0,0 +1,88 @@
+from datetime import datetime
+
+from bs4 import BeautifulSoup
+
+from uk_bin_collection.uk_bin_collection.common import (
+    date_format,
+    get_date_with_ordinal,
+)
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+class CouncilClass(AbstractGetBinDataClass):
+    def parse_data(self, page: str, **kwargs) -> dict:
+        # Handle both string and Response objects
+        page_content = page.text if hasattr(page, "text") else page
+
+        soup = BeautifulSoup(page_content, features="html.parser")
+
+        data = {"bins": []}
+        collections = []
+
+        # Find all bin collection rows
+        bin_rows = soup.find_all("div", class_="bin-collection-listing-row")
+
+        if not bin_rows:
+            raise ValueError("No bin collection rows found in HTML")
+
+        for bin_row in bin_rows:
+            try:
+                # Get bin type from h2
+                bin_type_elem = bin_row.find("h2")
+                if not bin_type_elem:
+                    continue
+                bin_type = bin_type_elem.text.strip()
+
+                # Find next collection date - look for all <p> tags
+                paragraphs = bin_row.find_all("p")
+
+                for p in paragraphs:
+                    if p.get_text() and "Next collection:" in p.get_text():
+                        date_str = p.get_text().replace("Next collection:", "").strip()
+                        # Extract day number from date string (e.g. "2" from "Friday 2nd May")
+                        day_number = int("".join(filter(str.isdigit, date_str)))
+                        # Replace ordinal in date string with plain number
+                        date_str = date_str.replace(
+                            get_date_with_ordinal(day_number), str(day_number)
+                        )
+
+                        try:
+                            # Parse date with full format
+                            bin_date = datetime.strptime(date_str, "%A %d %B")
+
+                            # Add current year since it's not in the date string
+                            current_year = datetime.now().year
+                            bin_date = bin_date.replace(year=current_year)
+
+                            # If the date is in the past, it's probably for next year
+                            if bin_date < datetime.now():
+                                bin_date = bin_date.replace(year=current_year + 1)
+
+                            collections.append((bin_type, bin_date))
+                            print(
+                                f"Successfully parsed date for {bin_type}: {bin_date}"
+                            )
+                            break
+
+                        except ValueError as e:
+                            print(
+                                f"Failed to parse date '{date_str}' for {bin_type}: {e}"
+                            )
+                            continue
+
+            except Exception as e:
+                print(f"Error processing bin row: {e}")
+                continue
+
+        if not collections:
+            raise ValueError("No valid collection dates found")
+
+        ordered_data = sorted(collections, key=lambda x: x[1])
+        for item in ordered_data:
+            dict_data = {
+                "type": item[0],
+                "collectionDate": item[1].strftime(date_format),
+            }
+            data["bins"].append(dict_data)
+
+        return data

{uk_bin_collection-0.152.0 → uk_bin_collection-0.152.1}/uk_bin_collection/uk_bin_collection/councils/BexleyCouncil.py

@@ -24,74 +24,51 @@ class CouncilClass(AbstractGetBinDataClass):
     def parse_data(self, page: str, **kwargs) -> dict:
         driver = None
         try:
-            page = "https://waste.bexley.gov.uk/waste"
-
-            data = {"bins": []}
-
             user_uprn = kwargs.get("uprn")
-            user_paon = kwargs.get("paon")
-            user_postcode = kwargs.get("postcode")
             web_driver = kwargs.get("web_driver")
             headless = kwargs.get("headless")
 
+            page = f"https://waste.bexley.gov.uk/waste/{user_uprn}"
+
+            print(f"Trying URL: {page}")  # Debug
+
             # Create Selenium webdriver
             driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
-            wait = WebDriverWait(driver, 10)
-
-            inputElement_postcodesearch = wait.until(
-                EC.element_to_be_clickable((By.ID, "pc"))
-            )
-            inputElement_postcodesearch.send_keys(user_postcode)
-
-            find_address_btn = wait.until(
-                EC.element_to_be_clickable((By.XPATH, '//*[@id="sub"]'))
-            )
-            find_address_btn.click()
+            # Wait for the main content container to be present
+            wait = WebDriverWait(driver, 30)  # Increased timeout to 30 seconds
 
-            dropdown_options = wait.until(
-                EC.presence_of_element_located((By.XPATH, '//*[@id="address"]'))
-            )
-            time.sleep(2)
-            dropdown_options.click()
-            time.sleep(1)
-
-            # Wait for the element to be clickable
-            address = WebDriverWait(driver, 10).until(
-                EC.element_to_be_clickable(
-                    (By.XPATH, f'//li[contains(text(), "{user_paon}")]')
+            # First wait for container
+            main_content = wait.until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "/html/body/div[1]/div/div[2]/div")
                 )
             )
 
-            # Click the element
-            address.click()
-
-            submit_address = wait.until(
-                EC.presence_of_element_located((By.XPATH, '//*[@id="go"]'))
-            )
-            time.sleep(2)
-            submit_address.click()
+            # Then wait for loading indicator to disappear
+            wait.until(EC.invisibility_of_element_located((By.ID, "loading-indicator")))
 
-            results_found = wait.until(
-                EC.element_to_be_clickable(
-                    (By.XPATH, '//h1[contains(text(), "Your bin days")]')
-                )
-            )
+            # Add after the loading indicator wait
+            time.sleep(3)  # Give extra time for JavaScript to populate the data
 
-            final_page = wait.until(
-                EC.presence_of_element_located((By.CLASS_NAME, "waste__collections"))
+            # Then wait for at least one bin section to appear
+            wait.until(
+                EC.presence_of_element_located((By.CLASS_NAME, "waste-service-name"))
             )
 
+            # Now parse the page content
             soup = BeautifulSoup(driver.page_source, features="html.parser")
 
-            # Find all waste services
-
-            # Initialize the data dictionary
             data = {"bins": []}
             bin_sections = soup.find_all("h3", class_="waste-service-name")
 
-            # Loop through each bin field
+            if not bin_sections:
+                print("No bin sections found after waiting for content")
+                print(f"Page source: {driver.page_source}")
+                return data
+
+            # Rest of your existing bin processing code
             for bin_section in bin_sections:
                 # Extract the bin type (e.g., "Brown Caddy", "Green Wheelie Bin", etc.)
                 bin_type = bin_section.get_text(strip=True).split("\n")[

{uk_bin_collection-0.152.0 → uk_bin_collection-0.152.1}/uk_bin_collection/uk_bin_collection/councils/CharnwoodBoroughCouncil.py

@@ -1,10 +1,11 @@
+from datetime import timedelta
+
 from bs4 import BeautifulSoup
+from dateutil.relativedelta import relativedelta
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
-from datetime import timedelta
-from dateutil.relativedelta import relativedelta
-
 
 # import the wonderful Beautiful Soup and the URL grabber
 class CouncilClass(AbstractGetBinDataClass):
@@ -15,7 +16,17 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
+        try:
+            user_uprn = kwargs.get("uprn")
+            check_uprn(user_uprn)
+            url = f"https://my.charnwood.gov.uk/location?put=cbc{user_uprn}&rememberme=0&redirect=%2F"
+            if not user_uprn:
+                url = kwargs.get("url")
+        except Exception as e:
+            raise ValueError(f"Error getting identifier: {str(e)}")
+
         # Make a BS4 object
+        page = requests.get(url)
         soup = BeautifulSoup(page.text, features="html.parser")
         soup.prettify()
 

{uk_bin_collection-0.152.0 → uk_bin_collection-0.152.1}/uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py

@@ -266,9 +266,9 @@ class CouncilClass(AbstractGetBinDataClass):
                     ).date()
 
         for refuse_date in refuse_dates:
-            collection_date = datetime.strptime(refuse_date, "%d/%m/%Y") + timedelta(
+            collection_date = (datetime.strptime(refuse_date, "%d/%m/%Y") + timedelta(
                 days=refuse_day_offset
-            )
+            )).date()
             if collection_date in bh_dict:
                 collection_date = bh_dict[collection_date]
             collection_date = collection_date.strftime("%d/%m/%Y")
@@ -281,9 +281,9 @@ class CouncilClass(AbstractGetBinDataClass):
 
         for recycling_date in recycling_dates:
 
-            collection_date = datetime.strptime(recycling_date, "%d/%m/%Y") + timedelta(
+            collection_date = (datetime.strptime(recycling_date, "%d/%m/%Y") + timedelta(
                 days=recycling_day_offset
-            )
+            )).date()
             if collection_date in bh_dict:
                 collection_date = bh_dict[collection_date]
             collection_date = collection_date.strftime("%d/%m/%Y")
@@ -296,9 +296,9 @@ class CouncilClass(AbstractGetBinDataClass):
 
         for garden_date in garden_dates:
 
-            collection_date = datetime.strptime(garden_date, "%d/%m/%Y") + timedelta(
+            collection_date = (datetime.strptime(garden_date, "%d/%m/%Y") + timedelta(
                 days=garden_day_offset
-            )
+            )).date()
             if collection_date in bh_dict:
                 collection_date = bh_dict[collection_date]
             collection_date = collection_date.strftime("%d/%m/%Y")
@@ -318,9 +318,9 @@ class CouncilClass(AbstractGetBinDataClass):
 
             for food_date in food_dates:
 
-                collection_date = datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
+                collection_date = (datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
                     days=food_day_offset
-                )
+                )).date()
                 if collection_date in bh_dict:
                     collection_date = bh_dict[collection_date]
                 collection_date = collection_date.strftime("%d/%m/%Y")
@@ -354,9 +354,9 @@ class CouncilClass(AbstractGetBinDataClass):
 
             for food_date in food_dates_first:
 
-                collection_date = datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
+                collection_date = (datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
                     days=food_day_offset
-                )
+                )).date()
                 if collection_date in bh_dict:
                     collection_date = bh_dict[collection_date]
                 collection_date = collection_date.strftime("%d/%m/%Y")
@@ -368,9 +368,9 @@ 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(
+                collection_date = (datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
                     days=second_week_offset
-                )
+                )).date()
                 if collection_date in bh_dict:
                     collection_date = bh_dict[collection_date]
                 collection_date = collection_date.strftime("%d/%m/%Y")