uk_bin_collection 0.127.2__tar.gz → 0.127.4__tar.gz

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/PKG-INFO

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

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/pyproject.toml

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

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/tests/input.json

@@ -1030,6 +1030,13 @@
         "wiki_name": "London Borough Ealing",
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
+    "LondonBoroughOfRichmondUponThames": {
+        "house_number": "March Road",
+        "skip_get_url": true,
+        "url": "https://www.richmond.gov.uk/services/waste_and_recycling/collection_days/",
+        "wiki_name": "London Borough Of Richmond Upon Thames",
+        "wiki_note": "Pass the name of the street ONLY in the house number parameter, unfortunately post code's are not allowed. "
+    },
     "LondonBoroughHarrow": {
         "url": "https://www.harrow.gov.uk",
         "wiki_command_url_override": "https://www.harrow.gov.uk",
@@ -1208,8 +1215,8 @@
         "wiki_note": "Pass the postcode and UPRN. This parser requires a Selenium webdriver."
     },
     "NewarkAndSherwoodDC": {
-        "url": "http://app.newark-sherwooddc.gov.uk/bincollection/calendar?pid=200004258529&nc=1",
-        "wiki_command_url_override": "http://app.newark-sherwooddc.gov.uk/bincollection/calendar?pid=XXXXXXXX&nc=1",
+        "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",
         "wiki_name": "Newark and Sherwood District Council",
         "wiki_note": "Replace XXXXXXXX with your UPRN."
     },
@@ -1409,15 +1416,6 @@
         "wiki_name": "Portsmouth City Council",
         "wiki_note": "Pass the postcode and UPRN. This parser requires a Selenium webdriver."
     },
-    "PowysCouncil": {
-        "house_number": "LANE COTTAGE",
-        "postcode": "HR3 5JS",
-        "skip_get_url": true,
-        "url": "https://www.powys.gov.uk",
-        "web_driver": "http://selenium:4444",
-        "wiki_name": "Powys Council",
-        "wiki_note": "Pass the house name/number and postcode in their respective parameters. This parser requires a Selenium webdriver."
-    },
     "PowysCouncil": {
         "house_number": "LANE COTTAGE",
         "postcode": "HR3 5JS",
@@ -1768,6 +1766,14 @@
         "wiki_name": "Sunderland City Council",
         "wiki_note": "Provide your house number (without quotes) and postcode (wrapped in double quotes with a space)."
     },
+    "SurreyHeathBoroughCouncil": {
+        "house_number": "36",
+        "postcode": "GU20 6PN",
+        "skip_get_url": true,
+        "url": "https://asjwsw-wrpsurreyheathmunicipal-live.whitespacews.com/",
+        "wiki_name": "Surrey Heath Borough Council / Joint Waste Solutions",
+        "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter."
+    },
     "SwaleBoroughCouncil": {
         "postcode": "ME12 2NQ",
         "skip_get_url": true,

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/uk_bin_collection/councils/CarmarthenshireCountyCouncil.py

@@ -34,10 +34,10 @@ class CouncilClass(AbstractGetBinDataClass):
 
             # Find the next collection date
             date_tag = container.find(class_="font11 text-center")
-            if date_tag.text.strip() == "":
-                continue
-            else:
+            if date_tag:
                 collection_date = date_tag.text.strip()
+            else:
+                continue
 
             dict_data = {
                 "type": bin_type,

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py

@@ -1,3 +1,5 @@
+import datetime
+
 from bs4 import BeautifulSoup
 
 from uk_bin_collection.uk_bin_collection.common import *
@@ -32,15 +34,24 @@ class CouncilClass(AbstractGetBinDataClass):
         for p in ps:
             collection = p.text.strip().replace("Your next ", "").split(".")[0]
             bin_type = collection.split(" day is")[0]
-            collection_date = datetime.strptime(
-                remove_ordinal_indicator_from_date_string(collection).split("day is ")[
-                    1
-                ],
-                "%A %d %B %Y",
-            )
+            collection_date = remove_ordinal_indicator_from_date_string(
+                collection
+            ).split("day is ")[1]
+            if collection_date == "Today":
+                collection_date = datetime.today().strftime(date_format)
+            elif collection_date == "Tomorrow":
+                collection_date = (datetime.today() + timedelta(days=1)).strftime(
+                    date_format
+                )
+                print(collection_date)
+            else:
+                collection_date = datetime.strptime(
+                    collection_date,
+                    "%A %d %B %Y",
+                ).strftime(date_format)
             dict_data = {
                 "type": bin_type,
-                "collectionDate": collection_date.strftime(date_format),
+                "collectionDate": collection_date,
             }
             data["bins"].append(dict_data)
 

uk_bin_collection-0.127.4/uk_bin_collection/uk_bin_collection/councils/LondonBoroughOfRichmondUponThames.py

@@ -0,0 +1,98 @@
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from datetime import datetime
+from selenium.webdriver.support.wait import WebDriverWait
+from selenium.webdriver.common.keys import Keys
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+class CouncilClass(AbstractGetBinDataClass):
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        print(f"Arguments are f{kwargs}")
+        driver = None
+        try:
+            page = kwargs["url"]
+            street_name = kwargs.get("paon")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get(page)
+
+            wait = WebDriverWait(driver, 60)
+
+            self.dismiss_cookie_banner(wait)
+            self.input_street_name(street_name, wait)
+            self.submit(wait)
+            bin_types, collection_days = self.get_bins(driver)
+            bindata = self.get_collection_days(bin_types, collection_days)
+
+            print(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 bindata
+
+    def get_collection_days(self, bin_types, collection_days):
+        bindata = {"bins": []}
+        WEEKLY_COLLECTION = 0
+        GARDEN_COLLECTION = 1
+
+        for index, bin_type in enumerate(bin_types):
+            # currently only handled weekly and garden collection, special collections like Christmas Day need to be added
+            if index == WEEKLY_COLLECTION:
+                next_collection_date = get_next_day_of_week(collection_days[index].text.strip(), date_format)
+            elif index == GARDEN_COLLECTION:
+                split_date_part = collection_days[index].text.split("More dates")[0]
+                next_collection_date = datetime.strptime(split_date_part.strip(), "%d %B %Y").strftime(date_format)
+            else:
+                next_collection_date = datetime.strptime(collection_days[index].text.strip(), "%d %B %Y").strftime(date_format)
+
+            dict_data = {
+                "type": bin_type.text.strip(),
+                "collectionDate": next_collection_date,
+            }
+            bindata["bins"].append(dict_data)
+        return bindata
+
+    def get_bins(self, driver):
+        table = driver.find_element(By.XPATH, ".//div[@id='maincontent']//table")
+        table_rows = table.find_elements(by=By.TAG_NAME, value="tr")
+        headerRow = table_rows[0]
+        table_info_row = table_rows[1]
+        bin_types = headerRow.find_elements(by=By.TAG_NAME, value="th")[2:]
+        collection_days = table_info_row.find_elements(by=By.TAG_NAME, value="td")[2:]
+        return bin_types, collection_days
+
+    def submit(self, wait):
+        main_content_submit_button = wait.until(
+            EC.element_to_be_clickable(
+                (By.XPATH, ".//div[@id='maincontent']//input[@type='submit']")
+            )
+        )
+        main_content_submit_button.send_keys(Keys.ENTER)
+
+    def input_street_name(self, street_name, wait):
+        input_element_postcodesearch = wait.until(
+            EC.visibility_of_element_located(
+                (By.ID, "Street")
+            )
+        )
+        input_element_postcodesearch.send_keys(street_name)
+
+    def dismiss_cookie_banner(self, wait):
+        cookie_banner = wait.until(
+            EC.visibility_of_element_located(
+                (By.ID, "ccc-dismiss-button")
+            )
+        )
+        cookie_banner.send_keys(Keys.ENTER)

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/uk_bin_collection/councils/MertonCouncil.py

@@ -47,10 +47,10 @@ class CouncilClass(AbstractGetBinDataClass):
             bin_type = cells[0].get_text().strip()
             # Date is on the second cell, second paragraph, wrapped in p
             collectionDate = None
-            for date_format in possible_formats:
+            for format in possible_formats:
                 try:
                     collectionDate = datetime.strptime(
-                        cells[1].select("p > b")[2].get_text(strip=True), date_format
+                        cells[1].select("p > b")[2].get_text(strip=True), format
                     )
                     break  # Exit the loop if parsing is successful
                 except ValueError:

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py

@@ -125,10 +125,10 @@ class CouncilClass(AbstractGetBinDataClass):
                     )
 
             # Garden waste
-            garden_waste = soup.find("span", class_="CTID-17-_ eb-17-textControl")
+            garden_waste = soup.find("div", class_="eb-2HIpCnWC-Override-EditorInput")
             if garden_waste:
                 match = re.search(
-                    r"next collection is\s+(\d{2}/\d{2}/\d{4})", garden_waste.text
+                    r"(\d{2}/\d{2}/\d{4})", garden_waste.text
                 )
                 if match:
                     bins.append(

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/uk_bin_collection/councils/PowysCouncil.py

@@ -127,12 +127,15 @@ class CouncilClass(AbstractGetBinDataClass):
             li.text for li in garden_waste_section.find_next("ul").find_all("li")
         ]
         for date in garden_waste_dates:
-            dict_data = {
-                "type": "Garden Waste",
-                "collectionDate": datetime.strptime(
-                    remove_ordinal_indicator_from_date_string(date), "%d %B %Y"
-                ).strftime(date_format),
-            }
-            data["bins"].append(dict_data)
+            try:
+                dict_data = {
+                    "type": "Garden Waste",
+                    "collectionDate": datetime.strptime(
+                        remove_ordinal_indicator_from_date_string(date), "%d %B %Y"
+                    ).strftime(date_format),
+                }
+                data["bins"].append(dict_data)
+            except:
+                continue
 
         return data

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/uk_bin_collection/councils/SouthOxfordshireCouncil.py

@@ -1,5 +1,6 @@
 import requests
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -54,6 +55,9 @@ class CouncilClass(AbstractGetBinDataClass):
 
         data = {"bins": []}
 
+        current_year = datetime.now().year
+        next_year = current_year + 1
+
         # Page has slider info side by side, which are two instances of this class
         for bin in soup.find_all("div", {"class": "binextra"}):
             bin_info = list(bin.stripped_strings)
@@ -62,27 +66,32 @@ class CouncilClass(AbstractGetBinDataClass):
                 if contains_date(bin_info[0]):
                     bin_date = get_next_occurrence_from_day_month(
                         datetime.strptime(
-                            bin_info[0] + " " + datetime.today().strftime("%Y"),
-                            "%A %d %B - %Y",
+                            bin_info[0],
+                            "%A %d %B -",
                         )
-                    ).strftime(date_format)
-                    bin_type = str.capitalize(' '.join(bin_info[1:]))
+                    )
+                    bin_type = str.capitalize(" ".join(bin_info[1:]))
                 # On exceptional collection schedule (e.g. around English Bank Holidays), date will be contained in the second stripped string
                 else:
                     bin_date = get_next_occurrence_from_day_month(
                         datetime.strptime(
-                            bin_info[1] + " " + datetime.today().strftime("%Y"),
-                            "%A %d %B - %Y",
+                            bin_info[1],
+                            "%A %d %B -",
                         )
-                    ).strftime(date_format)
-                    str.capitalize(' '.join(bin_info[2:]))
-            except Exception as ex:
-                raise ValueError(f"Error parsing bin data: {ex}")
+                    )
+                    str.capitalize(" ".join(bin_info[2:]))
+            except:
+                continue
+
+            if (datetime.now().month == 12) and (bin_date.month == 1):
+                bin_date = bin_date.replace(year=next_year)
+            else:
+                bin_date = bin_date.replace(year=current_year)
 
             # Build data dict for each entry
             dict_data = {
                 "type": bin_type,
-                "collectionDate": bin_date,
+                "collectionDate": bin_date.strftime(date_format),
             }
             data["bins"].append(dict_data)
 

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/uk_bin_collection/councils/StaffordshireMoorlandsDistrictCouncil.py

@@ -30,12 +30,12 @@ class CouncilClass(AbstractGetBinDataClass):
         driver.get("https://www.staffsmoorlands.gov.uk/findyourbinday")
 
         # Close cookies banner
-        cookieAccept = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located(
-                (By.CSS_SELECTOR, ".cookiemessage__link--close")
-            )
-        )
-        cookieAccept.click()
+        # cookieAccept = WebDriverWait(driver, 10).until(
+        #    EC.presence_of_element_located(
+        #        (By.CSS_SELECTOR, ".cookiemessage__link--close")
+        #    )
+        # )
+        # cookieAccept.click()
 
         # Wait for the postcode field to appear then populate it
         inputElement_postcode = WebDriverWait(driver, 30).until(

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/uk_bin_collection/councils/StroudDistrictCouncil.py

@@ -1,8 +1,10 @@
+from datetime import datetime, timedelta
+from typing import Any, Dict
+
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
-from datetime import datetime, timedelta
-from typing import Dict, Any
 
 
 class CouncilClass(AbstractGetBinDataClass):
@@ -78,7 +80,10 @@ class CouncilClass(AbstractGetBinDataClass):
                     formatted_date = self.get_next_weekday(day_name)
                 else:
                     # Convert date format from "Tuesday 28 May 2024" to "28/05/2024"
-                    date_obj = datetime.strptime(value, "%A %d %B %Y")
+                    try:
+                        date_obj = datetime.strptime(value, "%A %d %B %Y")
+                    except:
+                        continue
                     formatted_date = date_obj.strftime("%d/%m/%Y")
 
                 bin_entry = {

uk_bin_collection-0.127.4/uk_bin_collection/uk_bin_collection/councils/SurreyHeathBoroughCouncil.py

@@ -0,0 +1,116 @@
+import urllib
+
+from bs4 import BeautifulSoup
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    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:
+        requests.packages.urllib3.disable_warnings()
+        root_url = "https://asjwsw-wrpsurreyheathmunicipal-live.whitespacews.com/"
+        # Get the house number and postcode from the commandline
+        user_paon = kwargs.get("paon")
+        user_postcode = kwargs.get("postcode")
+        check_postcode(user_postcode)
+
+        # Start a new session for the form, and get the chosen URL from the commandline
+        session = requests.Session()
+        req = session.get(root_url)
+
+        # Parse the requested URL to get a link to the "View My Collections" portal with a unique service ID
+        start = BeautifulSoup(req.text, features="html.parser")
+        start.prettify()
+        base_link = start.select(
+            "#menu-content > div > div:nth-child(1) > p.govuk-body.govuk-\\!-margin-bottom-0.colorblue.lineheight15 > a"
+        )[0].attrs.get("href")
+
+        # We need to reorder the query parts from the unique URL, so split them up to make it easier
+        query_parts = urllib.parse.urlparse(base_link).query.split("&")
+        parts = base_link.split("?")
+        addr_link = (
+            parts[0] + "/mop.php?" + query_parts[1] + "&" + query_parts[0] + "&seq=2"
+        )
+
+        # Bring in some headers to emulate a browser, and put the UPRN and postcode into the form data.
+        # This is sent in a POST request, emulating browser behaviour.
+        headers = {
+            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+            "Accept-Language": "en-GB,en;q=0.9",
+            "Cache-Control": "no-cache",
+            "Connection": "keep-alive",
+            "Content-Type": "application/x-www-form-urlencoded",
+            "Origin": "https://asjwsw-wrpsurreyheathmunicipal-live.whitespacews.com",
+            "Pragma": "no-cache",
+            "Referer": "https://asjwsw-wrpsurreyheathmunicipal-live.whitespacews.com/",
+            "Sec-Fetch-Dest": "document",
+            "Sec-Fetch-Mode": "navigate",
+            "Sec-Fetch-Site": "same-origin",
+            "Sec-Fetch-User": "?1",
+            "Upgrade-Insecure-Requests": "1",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36 OPR/98.0.0.0",
+            "sec-ch-ua": '"Chromium";v="112", "Not_A Brand";v="24", "Opera GX";v="98"',
+            "sec-ch-ua-mobile": "?0",
+            "sec-ch-ua-platform": '"Windows"',
+        }
+        data = {
+            "address_name_number": user_paon,
+            "address_street": "",
+            "street_town": "",
+            "address_postcode": user_postcode,
+        }
+        addr_page = session.post(addr_link, headers=headers, data=data)
+        addr = BeautifulSoup(addr_page.text, features="html.parser")
+        addr.prettify()
+
+        # This page should only have one address, but regardless, select the first one and make a request to load the
+        # calendar page.
+        cal_link = root_url + addr.select("#property_list > ul > li > a")[0].attrs.get(
+            "href"
+        )
+        cal_page = session.get(cal_link)
+
+        # Parse the calendar page
+        soup = BeautifulSoup(cal_page.text, features="html.parser")
+        soup.prettify()
+        data = {"bins": []}
+
+        # For whatever reason, each row contains all the information for that row, and each one after it. This code
+        # essentially gets all items from each row, but ignores the whitespace that you get when splitting using \n.
+        # This produces a big list of dates then bin types, so we split them up into a list of lists - each pair is
+        # a date and the bin type.
+        items = [
+            i
+            for i in soup.find(
+                "u1",
+                {
+                    "class": "displayinlineblock justifycontentleft alignitemscenter margin0 padding0"
+                },
+            ).text.split("\n")
+            if i != ""
+        ]
+        pairs = [items[i : i + 2] for i in range(0, len(items), 2)]
+
+        # Loop through the paired bin dates and types
+        for pair in pairs:
+            # This isn't necessary, but better safe than sorry
+            collection_date = datetime.strptime(pair[0], date_format).strftime(
+                date_format
+            )
+            # Change the formatting of the purple bins to replace the hyphens with slashes
+            if pair[1] == "Batteries-small electricals-textiles":
+                bin_type = pair[1].replace("-", "/").strip()
+            else:
+                bin_type = pair[1]
+
+            # Add the data into the dictionary
+            data["bins"].append({"type": bin_type, "collectionDate": collection_date})
+
+        return data

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/uk_bin_collection/councils/ValeofGlamorganCouncil.py

@@ -1,4 +1,5 @@
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -31,12 +32,12 @@ class CouncilClass(AbstractGetBinDataClass):
         params = {
             "RequestType": "LocalInfo",
             "ms": "ValeOfGlamorgan/AllMaps",
-            "group": "Community and Living|Refuse HIDE2",
-            "type": "json",
+            "group": "Waste|new_refuse",
+            "type": "jsonp",
             "callback": "AddressInfoCallback",
             "uid": user_uprn,
-            "import": "jQuery35108514154283927682_1673022974838",
-            "_": "1673022974840",
+            "import": "jQuery35107288886041176057_1736292844067",
+            "_": "1736292844068",
         }
 
         # Get a response from the council
@@ -46,13 +47,15 @@ class CouncilClass(AbstractGetBinDataClass):
             headers=headers,
         ).text
 
+        response = response.replace("AddressInfoCallback(", "").rstrip(");")
+
         # Load the JSON and seek out the bin week text, then add it to the calendar URL. Also take the weekly
         # collection type and generate dates for it. Then make a GET request for the calendar
         bin_week = str(
-            json.loads(response)["Results"]["Refuse_HIDE2"]["Your_Refuse_round_is"]
+            json.loads(response)["Results"]["waste"]["roundday_residual"]
         ).replace(" ", "-")
         weekly_collection = str(
-            json.loads(response)["Results"]["Refuse_HIDE2"]["Recycling__type"]
+            json.loads(response)["Results"]["waste"]["recycling_code"]
         ).capitalize()
         weekly_dates = get_weekday_dates_in_period(
             datetime.now(), days_of_week.get(bin_week.split("-")[0].strip()), amount=48

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py

@@ -53,6 +53,9 @@ class CouncilClass(AbstractGetBinDataClass):
 
         data = {"bins": []}
 
+        current_year = datetime.now().year
+        next_year = current_year + 1
+
         # Page has slider info side by side, which are two instances of this class
         for bin in soup.find_all("div", {"class": "bintxt"}):
             try:
@@ -74,23 +77,31 @@ class CouncilClass(AbstractGetBinDataClass):
                 if contains_date(bin_date_info[0]):
                     bin_date = get_next_occurrence_from_day_month(
                         datetime.strptime(
-                            bin_date_info[0] + " " + datetime.today().strftime("%Y"),
-                            "%A %d %B - %Y",
+                            bin_date_info[0],
+                            "%A %d %B -",
                         )
-                    ).strftime(date_format)
+                    )
                 # On exceptional collection schedule (e.g. around English Bank Holidays), date will be contained in the second stripped string
                 else:
                     bin_date = get_next_occurrence_from_day_month(
                         datetime.strptime(
-                            bin_date_info[1] + " " + datetime.today().strftime("%Y"),
-                            "%A %d %B - %Y",
+                            bin_date_info[1],
+                            "%A %d %B -",
                         )
-                    ).strftime(date_format)
+                    )
             except Exception as ex:
                 raise ValueError(f"Error parsing bin data: {ex}")
 
+            if (datetime.now().month == 12) and (bin_date.month == 1):
+                bin_date = bin_date.replace(year=next_year)
+            else:
+                bin_date = bin_date.replace(year=current_year)
+
             # Build data dict for each entry
-            dict_data = {"type": bin_type, "collectionDate": bin_date}
+            dict_data = {
+                "type": bin_type,
+                "collectionDate": bin_date.strftime(date_format),
+            }
             data["bins"].append(dict_data)
 
         data["bins"].sort(

{uk_bin_collection-0.127.2 → uk_bin_collection-0.127.4}/uk_bin_collection/uk_bin_collection/councils/WestOxfordshireDistrictCouncil.py

@@ -42,14 +42,14 @@ class CouncilClass(AbstractGetBinDataClass):
             wait = WebDriverWait(driver, 60)
             address_entry_field = wait.until(
                 EC.presence_of_element_located(
-                    (By.XPATH, '//*[@id="combobox-input-19"]')
+                    (By.XPATH, '//*[@id="combobox-input-20"]')
                 )
             )
 
             address_entry_field.send_keys(str(full_address))
 
             address_entry_field = wait.until(
-                EC.element_to_be_clickable((By.XPATH, '//*[@id="combobox-input-19"]'))
+                EC.element_to_be_clickable((By.XPATH, '//*[@id="combobox-input-20"]'))
             )
             address_entry_field.click()
             address_entry_field.send_keys(Keys.BACKSPACE)
@@ -57,7 +57,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
             first_found_address = wait.until(
                 EC.element_to_be_clickable(
-                    (By.XPATH, '//*[@id="dropdown-element-19"]/ul')
+                    (By.XPATH, '//*[@id="dropdown-element-20"]/ul')
                 )
             )