uk_bin_collection 0.127.3__tar.gz → 0.127.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.127.3
+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.3 → uk_bin_collection-0.127.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.127.3"
+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.3 → 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",

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.3 → 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(