uk_bin_collection 0.90.0__tar.gz → 0.91.0__tar.gz

{uk_bin_collection-0.90.0 → uk_bin_collection-0.91.0}/PKG-INFO

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

{uk_bin_collection-0.90.0 → uk_bin_collection-0.91.0}/pyproject.toml

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

{uk_bin_collection-0.90.0 → uk_bin_collection-0.91.0}/uk_bin_collection/tests/input.json

@@ -341,6 +341,15 @@
         "wiki_name": "East Lindsey District Council",
         "wiki_note": "Pass the house name/number in the house number parameter, wrapped in double quotes"
     },
+    "EastRenfrewshireCouncil": {
+        "house_number": "23",
+        "postcode": "G46 6RG",
+        "skip_get_url": true,
+        "url": "https://eastrenfrewshire.gov.uk/",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "East Renfrewshire Council",
+        "wiki_note": "Pass the house name/number in the house number parameter, wrapped in double quotes"
+    },
     "EastRidingCouncil": {
         "house_number": "14 THE LEASES BEVERLEY HU17 8LG",
         "postcode": "HU17 8LG",

uk_bin_collection-0.91.0/uk_bin_collection/uk_bin_collection/councils/EastRenfrewshireCouncil.py

@@ -0,0 +1,117 @@
+from bs4 import BeautifulSoup
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.wait import WebDriverWait
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        try:
+            data = {"bins": []}
+            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)
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get(
+                "https://eastrenfrewshire.gov.uk/article/1145/Bin-collection-days"
+            )
+
+            # Wait for the postcode field to appear then populate it
+            inputElement_postcode = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located(
+                    (By.ID, "RESIDUALWASTEV2_PAGE1_POSTCODE")
+                )
+            )
+            inputElement_postcode.send_keys(user_postcode)
+
+            # Click search button
+            findAddress = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.ID, "RESIDUALWASTEV2_PAGE1_FIELD199_NEXT")
+                )
+            )
+            findAddress.click()
+
+            # 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[@id='RESIDUALWASTEV2_PAGE2_UPRN']//option[contains(., '"
+                        + user_paon
+                        + "')]",
+                    )
+                )
+            ).click()
+
+            # Click search button
+            findDates = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.ID, "RESIDUALWASTEV2_PAGE2_FIELD206_NEXT")
+                )
+            )
+            findDates.click()
+
+            # Wait for the collections table to appear
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.ID, "RESIDUALWASTEV2_COLLECTIONDATES_DISPLAYBINCOLLECTIONINFO")
+                )
+            )
+
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+            soup.prettify()
+
+            # Get collections div
+            next_collection_div = soup.find("div", {"id": "yourNextCollection"})
+
+            # Get next collection date
+            next_collection_date = datetime.strptime(
+                next_collection_div.find("span", {"class": "dueDate"})
+                .get_text()
+                .strip(),
+                "%d/%m/%Y",
+            )
+
+            # Get next collection bins
+            next_collection_bin = next_collection_div.findAll(
+                "span", {"class": "binColour"}
+            )
+
+            # Format results
+            for row in next_collection_bin:
+                dict_data = {
+                    "type": row.get_text().strip(),
+                    "collectionDate": next_collection_date.strftime("%d/%m/%Y"),
+                }
+                data["bins"].append(dict_data)
+
+            data["bins"].sort(
+                key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+            )
+        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