uk_bin_collection 0.141.0__py3-none-any.whl → 0.141.1__py3-none-any.whl

uk_bin_collection/uk_bin_collection/councils/AshfordBoroughCouncil.py

@@ -19,106 +19,117 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        try:
         # Get and check UPRN
-        user_uprn = kwargs.get("uprn")
-        user_postcode = kwargs.get("postcode")
-        check_uprn(user_uprn)
-        check_postcode(user_postcode)
-        web_driver = kwargs.get("web_driver")
-        headless = kwargs.get("headless")
-        bindata = {"bins": []}
-
-        API_URL = "https://secure.ashford.gov.uk/waste/collectiondaylookup/"
-
-        # Create Selenium webdriver
-        driver = create_webdriver(web_driver, headless, None, __name__)
-        driver.get(API_URL)
-
-        # Wait for the postcode field to appear then populate it
-        inputElement_postcode = WebDriverWait(driver, 30).until(
-            EC.presence_of_element_located(
-                (By.ID, "ContentPlaceHolder1_CollectionDayLookup2_TextBox_PostCode")
+            user_uprn = kwargs.get("uprn")
+            user_postcode = kwargs.get("postcode")
+            check_uprn(user_uprn)
+            check_postcode(user_postcode)
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            bindata = {"bins": []}
+
+            API_URL = "https://secure.ashford.gov.uk/waste/collectiondaylookup/"
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get(API_URL)
+
+            # Wait for the postcode field to appear then populate it
+            inputElement_postcode = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located(
+                    (By.ID, "ContentPlaceHolder1_CollectionDayLookup2_TextBox_PostCode")
+                )
             )
-        )
-        inputElement_postcode.send_keys(user_postcode)
-
-        # Click search button
-        findAddress = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located(
-                (
-                    By.ID,
-                    "ContentPlaceHolder1_CollectionDayLookup2_Button_PostCodeSearch",
+            inputElement_postcode.send_keys(user_postcode)
+
+            # Click search button
+            findAddress = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (
+                        By.ID,
+                        "ContentPlaceHolder1_CollectionDayLookup2_Button_PostCodeSearch",
+                    )
                 )
             )
-        )
-        findAddress.click()
-
-        # Wait for the 'Select your property' dropdown to appear and select the first result
-        dropdown = WebDriverWait(driver, 10).until(
-            EC.element_to_be_clickable(
-                (
-                    By.ID,
-                    "ContentPlaceHolder1_CollectionDayLookup2_DropDownList_Addresses",
+            findAddress.click()
+
+            # Wait for the 'Select your property' dropdown to appear and select the first result
+            dropdown = WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.ID,
+                        "ContentPlaceHolder1_CollectionDayLookup2_DropDownList_Addresses",
+                    )
                 )
             )
-        )
 
-        # Create a 'Select' for it, then select the first address in the list
-        # (Index 0 is "Make a selection from the list")
-        dropdownSelect = Select(dropdown)
-        dropdownSelect.select_by_value(str(user_uprn))
+            # Create a 'Select' for it, then select the first address in the list
+            # (Index 0 is "Make a selection from the list")
+            dropdownSelect = Select(dropdown)
+            dropdownSelect.select_by_value(str(user_uprn))
 
-        # Click search button
-        findAddress = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located(
-                (By.ID, "ContentPlaceHolder1_CollectionDayLookup2_Button_SelectAddress")
+            # Click search button
+            findAddress = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.ID, "ContentPlaceHolder1_CollectionDayLookup2_Button_SelectAddress")
+                )
             )
-        )
-        findAddress.click()
+            findAddress.click()
 
-        h4_element = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located(
-                (By.XPATH, "//h4[contains(text(), 'Collection Dates')]")
+            h4_element = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//h4[contains(text(), 'Collection Dates')]")
+                )
             )
-        )
 
-        soup = BeautifulSoup(driver.page_source, features="html.parser")
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
 
-        bin_tables = soup.find_all("table")
+            bin_tables = soup.find_all("table")
 
-        for bin_table in bin_tables:
-            bin_text = bin_table.find("td", id=re.compile("CollectionDayLookup2_td_"))
-            if not bin_text:
-                continue
+            for bin_table in bin_tables:
+                bin_text = bin_table.find("td", id=re.compile("CollectionDayLookup2_td_"))
+                if not bin_text:
+                    continue
 
-            bin_type_soup = bin_text.find("b")
+                bin_type_soup = bin_text.find("b")
 
-            if not bin_type_soup:
-                continue
-            bin_type: str = bin_type_soup.text.strip().split(" (")[0]
+                if not bin_type_soup:
+                    continue
+                bin_type: str = bin_type_soup.text.strip().split(" (")[0]
 
-            date_soup = bin_text.find(
-                "span", id=re.compile(r"CollectionDayLookup2_Label_\w*_Date")
-            )
-            if not date_soup or (
-                " " not in date_soup.text.strip()
-                and date_soup.text.strip().lower() != "today"
-            ):
-                continue
-            date_str: str = date_soup.text.strip()
-            try:
-                if date_soup.text.strip().lower() == "today":
-                    date = datetime.now().date()
-                else:
-                    date = datetime.strptime(date_str.split(" ")[1], "%d/%m/%Y").date()
-
-            except ValueError:
-                continue
-
-            dict_data = {
-                "type": bin_type,
-                "collectionDate": date.strftime("%d/%m/%Y"),
-            }
-            bindata["bins"].append(dict_data)
-
-        return bindata
+                date_soup = bin_text.find(
+                    "span", id=re.compile(r"CollectionDayLookup2_Label_\w*_Date")
+                )
+                if not date_soup or (
+                    " " not in date_soup.text.strip()
+                    and date_soup.text.strip().lower() != "today"
+                ):
+                    continue
+                date_str: str = date_soup.text.strip()
+                try:
+                    if date_soup.text.strip().lower() == "today":
+                        date = datetime.now().date()
+                    else:
+                        date = datetime.strptime(date_str.split(" ")[1], "%d/%m/%Y").date()
+
+                except ValueError:
+                    continue
+
+                dict_data = {
+                    "type": bin_type,
+                    "collectionDate": date.strftime("%d/%m/%Y"),
+                }
+                bindata["bins"].append(dict_data)
+
+        except Exception as e:
+            # Here you can log the exception if needed
+            print(f"An error occurred: {e}")
+            # Optionally, re-raise the exception if you want it to propagate
+            raise
+        finally:
+            # This block ensures that the driver is closed regardless of an exception
+            if driver:
+                driver.quit()
+        return bindata

uk_bin_collection/uk_bin_collection/councils/EastHertsCouncil.py

@@ -16,102 +16,113 @@ class CouncilClass(AbstractGetBinDataClass):
 
     def parse_data(self, page: str, **kwargs) -> dict:
         # Get and check UPRN
-        user_postcode = kwargs.get("postcode")
-        user_paon = kwargs.get("paon")
-        check_paon(user_paon)
-        check_postcode(user_postcode)
-        web_driver = kwargs.get("web_driver")
-        headless = kwargs.get("headless")
-        bindata = {"bins": []}
-
-        API_URL = "https://uhte-wrp.whitespacews.com"
-
-        # Create Selenium webdriver
-        driver = create_webdriver(web_driver, headless, None, __name__)
-        driver.get(API_URL)
-
-        # Click Find my bin collection day button
-        collectionButton = WebDriverWait(driver, 10).until(
-            EC.element_to_be_clickable((By.LINK_TEXT, "Find my bin collection day"))
-        )
-        collectionButton.click()
-
-        main_content = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located((By.ID, "main-content"))
-        )
-
-        # Wait for the property number field to appear then populate it
-        inputElement_number = WebDriverWait(driver, 10).until(
-            EC.element_to_be_clickable(
-                (
-                    By.ID,
-                    "address_name_number",
+        driver = None
+        try:
+            user_postcode = kwargs.get("postcode")
+            user_paon = kwargs.get("paon")
+            check_paon(user_paon)
+            check_postcode(user_postcode)
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            bindata = {"bins": []}
+
+            API_URL = "https://uhte-wrp.whitespacews.com"
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get(API_URL)
+
+            # Click Find my bin collection day button
+            collectionButton = WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable((By.LINK_TEXT, "Find my bin collection day"))
+            )
+            collectionButton.click()
+
+            main_content = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "main-content"))
+            )
+
+            # Wait for the property number field to appear then populate it
+            inputElement_number = WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.ID,
+                        "address_name_number",
+                    )
                 )
             )
-        )
-        inputElement_number.send_keys(user_paon)
-
-        # Wait for the postcode field to appear then populate it
-        inputElement_postcode = WebDriverWait(driver, 10).until(
-            EC.element_to_be_clickable(
-                (
-                    By.ID,
-                    "address_postcode",
+            inputElement_number.send_keys(user_paon)
+
+            # Wait for the postcode field to appear then populate it
+            inputElement_postcode = WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.ID,
+                        "address_postcode",
+                    )
                 )
             )
-        )
-        inputElement_postcode.send_keys(user_postcode)
-
-        # Click search button
-        continueButton = WebDriverWait(driver, 10).until(
-            EC.element_to_be_clickable(
-                (
-                    By.ID,
-                    "Submit",
+            inputElement_postcode.send_keys(user_postcode)
+
+            # Click search button
+            continueButton = WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.ID,
+                        "Submit",
+                    )
                 )
             )
-        )
-        continueButton.click()
-
-        # Wait for the 'Search Results' to appear and select the first result
-        property = WebDriverWait(driver, 10).until(
-            EC.element_to_be_clickable(
-                (
-                    By.CSS_SELECTOR,
-                    "li.app-subnav__section-item a",
-                    # "app-subnav__link govuk-link clicker colordarkblue fontfamilyArial fontsize12rem",
-                    # "//a[starts-with(@aria-label, '{user_paon}')]",
+            continueButton.click()
+
+            # Wait for the 'Search Results' to appear and select the first result
+            property = WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.CSS_SELECTOR,
+                        "li.app-subnav__section-item a",
+                        # "app-subnav__link govuk-link clicker colordarkblue fontfamilyArial fontsize12rem",
+                        # "//a[starts-with(@aria-label, '{user_paon}')]",
+                    )
                 )
             )
-        )
-        property.click()
-
-        upcoming_scheduled_collections = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located((By.ID, "upcoming-scheduled-collections"))
-        )
-
-        soup = BeautifulSoup(driver.page_source, features="html.parser")
-
-        collections = []
-        for collection in soup.find_all(
-            "u1",
-            class_="displayinlineblock justifycontentleft alignitemscenter margin0 padding0",
-        ):
-            date = collection.find(
-                "p", string=lambda text: text and "/" in text
-            ).text.strip()  # Extract date
-            service = collection.find(
-                "p", string=lambda text: text and "Collection Service" in text
-            ).text.strip()  # Extract service type
-            collections.append({"date": date, "service": service})
-
-        # Print the parsed data
-        for item in collections:
-
-            dict_data = {
-                "type": item["service"],
-                "collectionDate": item["date"],
-            }
-            bindata["bins"].append(dict_data)
-
-        return bindata
+            property.click()
+
+            upcoming_scheduled_collections = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "upcoming-scheduled-collections"))
+            )
+
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+
+            collections = []
+            for collection in soup.find_all(
+                "u1",
+                class_="displayinlineblock justifycontentleft alignitemscenter margin0 padding0",
+            ):
+                date = collection.find(
+                    "p", string=lambda text: text and "/" in text
+                ).text.strip()  # Extract date
+                service = collection.find(
+                    "p", string=lambda text: text and "Collection Service" in text
+                ).text.strip()  # Extract service type
+                collections.append({"date": date, "service": service})
+
+            # Print the parsed data
+            for item in collections:
+
+                dict_data = {
+                    "type": item["service"],
+                    "collectionDate": item["date"],
+                }
+                bindata["bins"].append(dict_data)
+
+        except Exception as e:
+            # Here you can log the exception if needed
+            print(f"An error occurred: {e}")
+            # Optionally, re-raise the exception if you want it to propagate
+            raise
+        finally:
+            # This block ensures that the driver is closed regardless of an exception
+            if driver:
+                driver.quit()
+        return bindata

uk_bin_collection/uk_bin_collection/councils/HertsmereBoroughCouncil.py

@@ -21,141 +21,151 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
-
-        user_paon = kwargs.get("paon")
-        user_postcode = kwargs.get("postcode")
-        web_driver = kwargs.get("web_driver")
-        headless = kwargs.get("headless")
-        check_paon(user_paon)
-        check_postcode(user_postcode)
-        bindata = {"bins": []}
-
-        URI_1 = "https://www.hertsmere.gov.uk/Environment-Refuse-and-Recycling/Recycling--Waste/Bin-collections/Collections-and-calendar.aspx"
-        URI_2 = "https://hertsmere-services.onmats.com/w/webpage/round-search"
-
-        # Create Selenium webdriver
-        driver = create_webdriver(web_driver, headless, None, __name__)
-        driver.get(URI_1)
-
-        soup = BeautifulSoup(driver.page_source, "html.parser")
-
-        current_week = (soup.find("li", class_="current")).text.strip()
-
-        strong = soup.find_all("strong", text=re.compile(r"^Week"))
-
-        bin_weeks = []
-        for tag in strong:
-            parent = tag.parent
-            bin_type = (
-                (parent.text).split("-")[1].strip().replace("\xa0", " ").split(" and ")
-            )
-            for bin in bin_type:
-                dict_data = {
-                    "week": tag.text.replace("\xa0", " "),
-                    "bin_type": bin,
-                }
-                bin_weeks.append(dict_data)
-
-        driver.get(URI_2)
-
-        # Wait for the postcode field to appear then populate it
-        inputElement_postcode = WebDriverWait(driver, 30).until(
-            EC.presence_of_element_located(
-                (
-                    By.CLASS_NAME,
-                    "relation_path_type_ahead_search",
+        driver = None
+        try:
+            user_paon = kwargs.get("paon")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            check_paon(user_paon)
+            check_postcode(user_postcode)
+            bindata = {"bins": []}
+
+            URI_1 = "https://www.hertsmere.gov.uk/Environment-Refuse-and-Recycling/Recycling--Waste/Bin-collections/Collections-and-calendar.aspx"
+            URI_2 = "https://hertsmere-services.onmats.com/w/webpage/round-search"
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get(URI_1)
+
+            soup = BeautifulSoup(driver.page_source, "html.parser")
+
+            current_week = (soup.find("li", class_="current")).text.strip()
+
+            strong = soup.find_all("strong", text=re.compile(r"^Week"))
+
+            bin_weeks = []
+            for tag in strong:
+                parent = tag.parent
+                bin_type = (
+                    (parent.text).split("-")[1].strip().replace("\xa0", " ").split(" and ")
                 )
-            )
-        )
-        inputElement_postcode.send_keys(user_postcode)
-
-        WebDriverWait(driver, 10).until(
-            EC.element_to_be_clickable(
-                (
-                    By.XPATH,
-                    f"//ul[@class='result_list']/li[starts-with(@aria-label, '{user_paon}')]",
+                for bin in bin_type:
+                    dict_data = {
+                        "week": tag.text.replace("\xa0", " "),
+                        "bin_type": bin,
+                    }
+                    bin_weeks.append(dict_data)
+
+            driver.get(URI_2)
+
+            # Wait for the postcode field to appear then populate it
+            inputElement_postcode = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located(
+                    (
+                        By.CLASS_NAME,
+                        "relation_path_type_ahead_search",
+                    )
                 )
             )
-        ).click()
+            inputElement_postcode.send_keys(user_postcode)
+
+            WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.XPATH,
+                        f"//ul[@class='result_list']/li[starts-with(@aria-label, '{user_paon}')]",
+                    )
+                )
+            ).click()
+
+            WebDriverWait(driver, timeout=10).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.CSS_SELECTOR,
+                        "input.fragment_presenter_template_edit.btn.bg-primary.btn-medium[type='submit']",
+                    )
+                )
+            ).click()
 
-        WebDriverWait(driver, timeout=10).until(
-            EC.element_to_be_clickable(
-                (
-                    By.CSS_SELECTOR,
-                    "input.fragment_presenter_template_edit.btn.bg-primary.btn-medium[type='submit']",
+            WebDriverWait(driver, timeout=10).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//h3[contains(text(), 'Collection days')]")
                 )
             )
-        ).click()
 
-        WebDriverWait(driver, timeout=10).until(
-            EC.presence_of_element_located(
-                (By.XPATH, "//h3[contains(text(), 'Collection days')]")
+            soup = BeautifulSoup(driver.page_source, "html.parser")
+
+            table = soup.find("table", class_="table listing table-striped")
+
+            # Check if the table was found
+            if table:
+                # Extract table rows and cells
+                table_data = []
+                for row in table.find("tbody").find_all("tr"):
+                    # Extract cell data from each <td> tag
+                    row_data = [cell.get_text(strip=True) for cell in row.find_all("td")]
+                    table_data.append(row_data)
+
+            else:
+                print("Table not found.")
+
+            collection_day = (table_data[0])[1]
+
+            current_week_bins = [bin for bin in bin_weeks if bin["week"] == current_week]
+            next_week_bins = [bin for bin in bin_weeks if bin["week"] != current_week]
+
+            days_of_week = [
+                "Monday",
+                "Tuesday",
+                "Wednesday",
+                "Thursday",
+                "Friday",
+                "Saturday",
+                "Sunday",
+            ]
+
+            today = datetime.now()
+            today_idx = today.weekday()  # Monday is 0 and Sunday is 6
+            target_idx = days_of_week.index(collection_day)
+
+            days_until_target = (target_idx - today_idx) % 7
+            if days_until_target == 0:
+                next_day = today
+            else:
+                next_day = today + timedelta(days=days_until_target)
+
+            current_week_dates = get_dates_every_x_days(next_day, 14, 7)
+            next_week_date = next_day + timedelta(days=7)
+            next_week_dates = get_dates_every_x_days(next_week_date, 14, 7)
+
+            for date in current_week_dates:
+                for bin in current_week_bins:
+                    dict_data = {
+                        "type": bin["bin_type"],
+                        "collectionDate": date,
+                    }
+                    bindata["bins"].append(dict_data)
+
+            for date in next_week_dates:
+                for bin in next_week_bins:
+                    dict_data = {
+                        "type": bin["bin_type"],
+                        "collectionDate": date,
+                    }
+                    bindata["bins"].append(dict_data)
+
+            bindata["bins"].sort(
+                key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
             )
-        )
-
-        soup = BeautifulSoup(driver.page_source, "html.parser")
-
-        table = soup.find("table", class_="table listing table-striped")
-
-        # Check if the table was found
-        if table:
-            # Extract table rows and cells
-            table_data = []
-            for row in table.find("tbody").find_all("tr"):
-                # Extract cell data from each <td> tag
-                row_data = [cell.get_text(strip=True) for cell in row.find_all("td")]
-                table_data.append(row_data)
-
-        else:
-            print("Table not found.")
-
-        collection_day = (table_data[0])[1]
-
-        current_week_bins = [bin for bin in bin_weeks if bin["week"] == current_week]
-        next_week_bins = [bin for bin in bin_weeks if bin["week"] != current_week]
-
-        days_of_week = [
-            "Monday",
-            "Tuesday",
-            "Wednesday",
-            "Thursday",
-            "Friday",
-            "Saturday",
-            "Sunday",
-        ]
-
-        today = datetime.now()
-        today_idx = today.weekday()  # Monday is 0 and Sunday is 6
-        target_idx = days_of_week.index(collection_day)
-
-        days_until_target = (target_idx - today_idx) % 7
-        if days_until_target == 0:
-            next_day = today
-        else:
-            next_day = today + timedelta(days=days_until_target)
-
-        current_week_dates = get_dates_every_x_days(next_day, 14, 7)
-        next_week_date = next_day + timedelta(days=7)
-        next_week_dates = get_dates_every_x_days(next_week_date, 14, 7)
-
-        for date in current_week_dates:
-            for bin in current_week_bins:
-                dict_data = {
-                    "type": bin["bin_type"],
-                    "collectionDate": date,
-                }
-                bindata["bins"].append(dict_data)
-
-        for date in next_week_dates:
-            for bin in next_week_bins:
-                dict_data = {
-                    "type": bin["bin_type"],
-                    "collectionDate": date,
-                }
-                bindata["bins"].append(dict_data)
-
-        bindata["bins"].sort(
-            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
-        )
-
-        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 bindata

uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py

@@ -28,108 +28,119 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
-        # Get postcode and UPRN from kwargs
-        user_postcode = kwargs.get("postcode")
-        user_paon = kwargs.get("paon")
-        web_driver = kwargs.get("web_driver")
-        headless = kwargs.get("headless")
-        check_postcode(user_postcode)
-        check_paon(user_paon)
-
-        # Build URL to parse
-        council_url = "https://swale.gov.uk/bins-littering-and-the-environment/bins/check-your-bin-day"
-
-        # Create Selenium webdriver
-        driver = create_webdriver(web_driver, headless, None, __name__)
-        driver.get(council_url)
-
-        # Wait for the postcode field to appear then populate it
+        driver = None
         try:
-            inputElement_postcode = WebDriverWait(driver, 10).until(
-                EC.presence_of_element_located((By.ID, "q485476_q1"))
+            # Get postcode and UPRN from kwargs
+            user_postcode = kwargs.get("postcode")
+            user_paon = kwargs.get("paon")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            check_postcode(user_postcode)
+            check_paon(user_paon)
+
+            # Build URL to parse
+            council_url = "https://swale.gov.uk/bins-littering-and-the-environment/bins/check-your-bin-day"
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get(council_url)
+
+            # Wait for the postcode field to appear then populate it
+            try:
+                inputElement_postcode = WebDriverWait(driver, 10).until(
+                    EC.presence_of_element_located((By.ID, "q485476_q1"))
+                )
+                inputElement_postcode.send_keys(user_postcode)
+            except Exception:
+                print("Page failed to load. Probably due to Cloudflare robot check!")
+
+            # Click search button
+            findAddress = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "form_email_485465_submit"))
             )
-            inputElement_postcode.send_keys(user_postcode)
-        except Exception:
-            print("Page failed to load. Probably due to Cloudflare robot check!")
-
-        # Click search button
-        findAddress = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located((By.ID, "form_email_485465_submit"))
-        )
-        driver.execute_script("arguments[0].click();", findAddress)
-
-        # Wait for the 'Select address' dropdown to appear and select option matching the house name/number
-        WebDriverWait(driver, 10).until(
-            EC.element_to_be_clickable(
-                (
-                    By.XPATH,
-                    "//select[@name='q485480:q1']//option[contains(., '"
-                    + user_paon
-                    + "')]",
+            driver.execute_script("arguments[0].click();", findAddress)
+
+            # Wait for the 'Select address' dropdown to appear and select option matching the house name/number
+            WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (
+                        By.XPATH,
+                        "//select[@name='q485480:q1']//option[contains(., '"
+                        + user_paon
+                        + "')]",
+                    )
                 )
+            ).click()
+
+            # Click search button
+            getBins = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "form_email_485465_submit"))
+            )
+            driver.execute_script("arguments[0].click();", getBins)
+
+            BinTable = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located((By.ID, "SBCYBDSummary"))
+            )
+
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+            soup.prettify()
+
+            data = {"bins": []}
+
+            current_year = datetime.now().year
+            next_year = current_year + 1
+
+            next_collection_date = soup.find(
+                "strong", id="SBC-YBD-collectionDate"
+            ).text.strip()
+
+            # Extract bins for the next collection
+            next_bins = [li.text.strip() for li in soup.select("#SBCFirstBins ul li")]
+
+            # Extract future collection details
+            future_collection_date_tag = soup.find(
+                "p", text=lambda t: t and "starting from" in t
+            )
+            future_collection_date = (
+                future_collection_date_tag.text.split("starting from")[-1].strip()
+                if future_collection_date_tag
+                else "No future date found"
             )
-        ).click()
-
-        # Click search button
-        getBins = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located((By.ID, "form_email_485465_submit"))
-        )
-        driver.execute_script("arguments[0].click();", getBins)
-
-        BinTable = WebDriverWait(driver, 30).until(
-            EC.presence_of_element_located((By.ID, "SBCYBDSummary"))
-        )
-
-        soup = BeautifulSoup(driver.page_source, features="html.parser")
-        soup.prettify()
-
-        data = {"bins": []}
-
-        current_year = datetime.now().year
-        next_year = current_year + 1
-
-        next_collection_date = soup.find(
-            "strong", id="SBC-YBD-collectionDate"
-        ).text.strip()
-
-        # Extract bins for the next collection
-        next_bins = [li.text.strip() for li in soup.select("#SBCFirstBins ul li")]
-
-        # Extract future collection details
-        future_collection_date_tag = soup.find(
-            "p", text=lambda t: t and "starting from" in t
-        )
-        future_collection_date = (
-            future_collection_date_tag.text.split("starting from")[-1].strip()
-            if future_collection_date_tag
-            else "No future date found"
-        )
-
-        future_bins = [li.text.strip() for li in soup.select("#FirstFutureBins li")]
-
-        for bin in next_bins:
-            collection_date = datetime.strptime(next_collection_date, "%A, %d %B")
-            if (datetime.now().month == 12) and (collection_date.month == 1):
-                collection_date = collection_date.replace(year=next_year)
-            else:
-                collection_date = collection_date.replace(year=current_year)
-
-            dict_data = {
-                "type": bin,
-                "collectionDate": collection_date.strftime(date_format),
-            }
-            data["bins"].append(dict_data)
-
-        for bin in future_bins:
-            collection_date = datetime.strptime(future_collection_date, "%A, %d %B")
-            if (datetime.now().month == 12) and (collection_date.month == 1):
-                collection_date = collection_date.replace(year=next_year)
-            else:
-                collection_date = collection_date.replace(year=current_year)
-            dict_data = {
-                "type": bin,
-                "collectionDate": collection_date.strftime(date_format),
-            }
-            data["bins"].append(dict_data)
 
+            future_bins = [li.text.strip() for li in soup.select("#FirstFutureBins li")]
+
+            for bin in next_bins:
+                collection_date = datetime.strptime(next_collection_date, "%A, %d %B")
+                if (datetime.now().month == 12) and (collection_date.month == 1):
+                    collection_date = collection_date.replace(year=next_year)
+                else:
+                    collection_date = collection_date.replace(year=current_year)
+
+                dict_data = {
+                    "type": bin,
+                    "collectionDate": collection_date.strftime(date_format),
+                }
+                data["bins"].append(dict_data)
+
+            for bin in future_bins:
+                collection_date = datetime.strptime(future_collection_date, "%A, %d %B")
+                if (datetime.now().month == 12) and (collection_date.month == 1):
+                    collection_date = collection_date.replace(year=next_year)
+                else:
+                    collection_date = collection_date.replace(year=current_year)
+                dict_data = {
+                    "type": bin,
+                    "collectionDate": collection_date.strftime(date_format),
+                }
+                data["bins"].append(dict_data)
+
+        except Exception as e:
+            # Here you can log the exception if needed
+            print(f"An error occurred: {e}")
+            # Optionally, re-raise the exception if you want it to propagate
+            raise
+        finally:
+            # This block ensures that the driver is closed regardless of an exception
+            if driver:
+                driver.quit()
         return data

uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py

@@ -16,35 +16,47 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
-        data = {"bins": []}
-        user_uprn = kwargs.get("uprn")
-        web_driver = kwargs.get("web_driver")
-        headless = kwargs.get("headless")
-        check_uprn(user_uprn)
-
-        root_url = "https://forms.rbwm.gov.uk/bincollections?uprn="
-        api_url = root_url + user_uprn
-
-        # Create Selenium webdriver
-        driver = create_webdriver(web_driver, headless, None, __name__)
-        driver.get(api_url)
-
-        soup = BeautifulSoup(driver.page_source, features="html.parser")
-        soup.prettify()
-
-        # Get collections div
-        next_collection_div = soup.find("div", {"class": "widget-bin-collections"})
-
-        for tbody in next_collection_div.find_all("tbody"):
-            for tr in tbody.find_all("tr"):
-                td = tr.find_all("td")
-                next_collection_type = td[0].get_text()
-                next_collection_date = dateutil.parser.parse(td[1].get_text())
-                print(next_collection_date)
-                dict_data = {
-                    "type": next_collection_type,
-                    "collectionDate": next_collection_date.strftime("%d/%m/%Y"),
-                }
-                data["bins"].append(dict_data)
-
+        driver = None
+        try:
+            data = {"bins": []}
+            user_uprn = kwargs.get("uprn")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            check_uprn(user_uprn)
+
+            root_url = "https://forms.rbwm.gov.uk/bincollections?uprn="
+            api_url = root_url + user_uprn
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get(api_url)
+
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+            soup.prettify()
+
+            # Get collections div
+            next_collection_div = soup.find("div", {"class": "widget-bin-collections"})
+
+            for tbody in next_collection_div.find_all("tbody"):
+                for tr in tbody.find_all("tr"):
+                    td = tr.find_all("td")
+                    next_collection_type = td[0].get_text()
+                    next_collection_date = dateutil.parser.parse(td[1].get_text())
+                    print(next_collection_date)
+                    dict_data = {
+                        "type": next_collection_type,
+                        "collectionDate": next_collection_date.strftime("%d/%m/%Y"),
+                    }
+                    data["bins"].append(dict_data)
+
+        except Exception as e:
+            # Here you can log the exception if needed
+            print(f"An error occurred: {e}")
+            # Optionally, re-raise the exception if you want it to propagate
+            raise
+        finally:
+            # This block ensures that the driver is closed regardless of an exception
+            if driver:
+                driver.quit()
         return data
+

{uk_bin_collection-0.141.0.dist-info → uk_bin_collection-0.141.1.dist-info}/METADATA

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

{uk_bin_collection-0.141.0.dist-info → uk_bin_collection-0.141.1.dist-info}/RECORD

@@ -23,7 +23,7 @@ uk_bin_collection/uk_bin_collection/councils/ArgyllandButeCouncil.py,sha256=fJ0U
 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
-uk_bin_collection/uk_bin_collection/councils/AshfordBoroughCouncil.py,sha256=yC-8UMQHSbvze43PJ2_F4Z3cu7M7cynKTojipBJU7Ug,4307
+uk_bin_collection/uk_bin_collection/councils/AshfordBoroughCouncil.py,sha256=4ebRyX2qZRbZdomuN1aJOSXij-r7YagRBQvV1vyPkqY,5059
 uk_bin_collection/uk_bin_collection/councils/AylesburyValeCouncil.py,sha256=LouqjspEMt1TkOGqWHs2zkxwOETIy3n7p64uKIlAgUg,2401
 uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py,sha256=W7QBx6Mgso8RYosuXsaYo3GGNAu-tiyBSmuYxr1JSOU,1707
 uk_bin_collection/uk_bin_collection/councils/BaberghDistrictCouncil.py,sha256=1eXdST58xFRMdYl8AGNG_EwyQeLa31WSWUe882hQ2ec,6329
@@ -100,7 +100,7 @@ uk_bin_collection/uk_bin_collection/councils/EalingCouncil.py,sha256=UhNXGi-_6NY
 uk_bin_collection/uk_bin_collection/councils/EastAyrshireCouncil.py,sha256=i3AcWkeAnk7rD59nOm0QCSH7AggqjUAdwsXuSIC8ZJE,1614
 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=hjIrZXM0qe8xvHfrBqMDyXnq0_h_ySODqTfmOI5ahTc,4071
+uk_bin_collection/uk_bin_collection/councils/EastHertsCouncil.py,sha256=gujFsqn3j4YGudXxhJcLiO_pVYHnY_rd6GeZHzSqqs4,4823
 uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py,sha256=RSOTD1MIXSW27eGf3TixCiJK4HtSJnpfME2CjalDeXs,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
@@ -141,7 +141,7 @@ uk_bin_collection/uk_bin_collection/councils/HartDistrictCouncil.py,sha256=_llxT
 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
 uk_bin_collection/uk_bin_collection/councils/HerefordshireCouncil.py,sha256=JpQhkWM6Jeuzf1W7r0HqvtVnEqNi18nhwJX70YucdsI,1848
-uk_bin_collection/uk_bin_collection/councils/HertsmereBoroughCouncil.py,sha256=-ThSG6NIJP_wf2GmGL7SAvxbOujdhanZ8ECP4VSQCBs,5415
+uk_bin_collection/uk_bin_collection/councils/HertsmereBoroughCouncil.py,sha256=k6MKZ3Xa-_a0oIpH5Rv5haYVq1eRHKSCiI6UAqAVTUk,6274
 uk_bin_collection/uk_bin_collection/councils/HighPeakCouncil.py,sha256=x7dfy8mdt2iGl8qJxHb-uBh4u0knmi9MJ6irOJw9WYA,4805
 uk_bin_collection/uk_bin_collection/councils/HighlandCouncil.py,sha256=GNxDU65QuZHV5va2IrKtcJ6TQoDdwmV03JvkVqOauP4,3291
 uk_bin_collection/uk_bin_collection/councils/HinckleyandBosworthBoroughCouncil.py,sha256=51vXTKrstfJhb7cLCcrsvA9qKCsptyNMZvy7ML9DasM,2344
@@ -272,7 +272,7 @@ uk_bin_collection/uk_bin_collection/councils/StratfordUponAvonCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/StroudDistrictCouncil.py,sha256=Akx80Ve7D8RVdIW1vkWLYp80VrhL6Qc3dMMKnbFWUhY,3653
 uk_bin_collection/uk_bin_collection/councils/SunderlandCityCouncil.py,sha256=Eyaer--n2JQmGNaEdDbOhgIIGA6mDu72N8ph2wPIZy4,4027
 uk_bin_collection/uk_bin_collection/councils/SurreyHeathBoroughCouncil.py,sha256=MROVvf7RSRYYjM2ZDD83rAEwf8BSnqXVrasgBiJC92A,5220
-uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py,sha256=pAGzj9CUDaU1w0wMEbJIl1fxcW0kWIzvzsU7oYMdgWE,5001
+uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py,sha256=FuQGlPaiFxfQS3KzkyrvcuTaVb8VkwdWYgjm42FfUt8,5762
 uk_bin_collection/uk_bin_collection/councils/SwanseaCouncil.py,sha256=nmVPoPhnFgVi--vczX2i4Sf3bqM5RWJuwfhioRUr5XE,2303
 uk_bin_collection/uk_bin_collection/councils/SwindonBoroughCouncil.py,sha256=lSIykpkBjVwQSf3rrnrNuh7YRepgnkKQLbf1iErMuJs,1932
 uk_bin_collection/uk_bin_collection/councils/TamesideMBCouncil.py,sha256=k2TAAZG7n2S1BWVyxbE_-4-lZuzhOimCNz4yimUCOGk,1995
@@ -313,7 +313,7 @@ uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py,sha256=9i8AQH
 uk_bin_collection/uk_bin_collection/councils/WiganBoroughCouncil.py,sha256=3gqFA4-BVx_In6QOu3KUNqPN4Fkn9iMlZTeopMK9p6A,3746
 uk_bin_collection/uk_bin_collection/councils/WiltshireCouncil.py,sha256=Q0ooHTQb9ynMXpSNBPk7XXEjI7zcHst3id4wxGdmVx4,5698
 uk_bin_collection/uk_bin_collection/councils/WinchesterCityCouncil.py,sha256=W2k00N5n9-1MzjMEqsNjldsQdOJPEPMjK7OGSinZm5Y,4335
-uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py,sha256=7Qhznj95ktAQjpWm5C8pbD5UcvfXm7Mwb7_DQxwjGSM,1777
+uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py,sha256=d294otB0MRTLNx0Axf8Giy2ggzRRqn8ABN35wyu0l5w,2295
 uk_bin_collection/uk_bin_collection/councils/WirralCouncil.py,sha256=X_e9zXEZAl_Mp6nPORHc9CTmf3QHdoMY3BCnKrXEr1I,2131
 uk_bin_collection/uk_bin_collection/councils/WokingBoroughCouncil.py,sha256=37igH9g0xe4XIhRhcJ-ZJBU8MxTp5yzgpadWbdE33Yg,5205
 uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py,sha256=H8aFHlacwV07X-6T9RQua4irqDA0cIQrF4O1FfPR7yI,4114
@@ -326,8 +326,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=EQWRhZ2pEejlvm0fPyOTsOHKvUZmPnxEYO_OWRGKTjs,1158
 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.141.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.141.0.dist-info/METADATA,sha256=wkZzAu4PUwGpBcnep3fvKUVjYSPYKVf4_wlShHwzfXM,19851
-uk_bin_collection-0.141.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.141.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.141.0.dist-info/RECORD,,
+uk_bin_collection-0.141.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.141.1.dist-info/METADATA,sha256=OnpbVrmjYIjaD38jCRatXYehUPJHXHczfJ5yYrqZfpI,19851
+uk_bin_collection-0.141.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.141.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.141.1.dist-info/RECORD,,