uk_bin_collection 0.142.0__py3-none-any.whl → 0.143.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -100,6 +100,15 @@
         "wiki_name": "Babergh District Council",
         "wiki_note": "Use the House Number field to pass the DAY of the week for your NORMAL collections. [Monday/Tuesday/Wednesday/Thursday/Friday]. [OPTIONAL] Use the 'postcode' field to pass the WEEK for your garden collection. [Week 1/Week 2]. [OPTIONAL] Use the 'uprn' field to pass the DAY for your garden collection. [Monday/Tuesday/Wednesday/Thursday/Friday]"
     },
+    "BarkingDagenham": {
+        "house_number": "19 KELLY WAY, CHADWELL HEATH, RM6 6XH",
+        "postcode": "RM6 6XH",
+        "skip_get_url": true,
+        "web_driver": "http://selenium:4444",
+        "url": "https://www.lbbd.gov.uk/rubbish-recycling/household-bin-collection/check-your-bin-collection-days",
+        "wiki_name": "BarkingDagenham",
+        "wiki_note": "Use the full address as it appears on the drop-down on the site when you search by postcode."
+    },
     "BarnetCouncil": {
         "house_number": "HA8 7NA, 2, MANOR PARK GARDENS, EDGWARE, BARNET",
         "postcode": "HA8 7NA",
@@ -1862,10 +1871,10 @@
         "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
     "StirlingCouncil": {
-        "url": "https://www.stirling.gov.uk/bins-and-recycling/bin-collection-dates-search/",
         "house_number": "5, SUNNYLAW ROAD, BRIDGE OF ALLAN, STIRLING, FK9 4QA",
         "postcode": "FK9 4QA",
         "skip_get_url": true,
+        "url": "https://www.stirling.gov.uk/bins-and-recycling/bin-collection-dates-search/",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Stirling Council",
         "wiki_note": "Use the full address as it appears on the drop-down on the site when you search by postcode."

uk_bin_collection/uk_bin_collection/councils/BarkingDagenham.py

@@ -0,0 +1,150 @@
+# This script pulls bin collection data from Barking and Dagenham Council
+# Example URL: https://www.lbbd.gov.uk/rubbish-recycling/household-bin-collection/check-your-bin-collection-days
+import time
+
+from bs4 import BeautifulSoup
+from dateutil.parser import parse
+from selenium.common.exceptions import NoSuchElementException, TimeoutException
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select
+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
+
+
+class CouncilClass(AbstractGetBinDataClass):
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        try:
+            data = {"bins": []}
+
+            user_paon = kwargs.get("paon")
+            postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            url = kwargs.get("url")
+
+            print(
+                f"Starting parse_data with parameters: postcode={postcode}, paon={user_paon}"
+            )
+            print(
+                f"Creating webdriver with: web_driver={web_driver}, headless={headless}"
+            )
+
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            print(f"Navigating to URL: {url}")
+            driver.get(url)
+            print("Successfully loaded the page")
+
+            WebDriverWait(driver, 10).until(
+                lambda d: d.execute_script("return document.readyState") == "complete"
+            )
+
+            # Close popup if it exists
+            driver.switch_to.active_element.send_keys(Keys.ESCAPE)
+
+            # Handle cookie banner if present
+            wait = WebDriverWait(driver, 60)
+            try:
+                cookie_button = wait.until(
+                    EC.element_to_be_clickable(
+                        (
+                            By.CSS_SELECTOR,
+                            ".agree-button.eu-cookie-compliance-secondary-button.button.button--small",
+                        )
+                    ),
+                    message="Cookie banner not found",
+                )
+                cookie_button.click()
+                print("Cookie banner clicked.")
+                time.sleep(1)  # Brief pause to let banner disappear
+            except (TimeoutException, NoSuchElementException):
+                print("No cookie banner appeared or selector failed.")
+
+            # Enter postcode
+            print("Looking for postcode input...")
+            post_code_input = wait.until(
+                EC.element_to_be_clickable((By.ID, "postcode")),
+                message="Postcode input not found",
+            )
+            post_code_input.clear()
+            post_code_input.send_keys(postcode)
+            print(f"Entered postcode: {postcode}")
+
+            driver.switch_to.active_element.send_keys(Keys.TAB + Keys.ENTER)
+            print("Pressed ENTER on Search button")
+
+            # Wait for and select address
+            print("Waiting for address dropdown...")
+            address_select = wait.until(
+                EC.element_to_be_clickable((By.ID, "address")),
+                message="Address dropdown not found",
+            )
+            dropdown = Select(address_select)
+
+            dropdown.select_by_visible_text(user_paon)
+            print("Address selected successfully")
+
+            driver.switch_to.active_element.send_keys(Keys.TAB + Keys.ENTER)
+            print("Pressed ENTER on Next button")
+
+            print("Looking for schedule list...")
+            schedule_list = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.CLASS_NAME, "bin--container"))
+            )
+
+            # Make a BS4 object
+            print("Parsing page with BeautifulSoup...")
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+
+            # Process collection details
+            print("Looking for collection details in the page...")
+
+            bin_rows = soup.select("div.bin--row:not(:first-child)")  # Skip header row
+            print(f"\nProcessing {len(bin_rows)} bin rows...")
+
+            for row in bin_rows:
+                try:
+                    # Extract bin type from first column
+                    bin_type = row.select_one("div.col-md-3").text.strip()
+
+                    # Get the collection dates column
+                    collection_dates_div = row.select("div.col-md-3")[1]  # Third column
+
+                    # Get only the immediate text content before any <p> tags
+                    next_collection_text = "".join(
+                        collection_dates_div.find_all(text=True, recursive=False)
+                    ).strip()
+
+                    # Parse the date
+                    cleaned_date_text = remove_ordinal_indicator_from_date_string(
+                        next_collection_text
+                    )
+                    parsed_date = parse(cleaned_date_text, fuzzy=True)
+                    bin_date = parsed_date.strftime("%d/%m/%Y")
+
+                    # Add to data
+                    if bin_type and bin_date:
+                        dict_data = {
+                            "type": bin_type,
+                            "collectionDate": bin_date,
+                        }
+                        data["bins"].append(dict_data)
+                        print(f"Successfully added collection: {dict_data}")
+
+                except Exception as e:
+                    print(f"Error processing item: {e}")
+                    continue
+        except Exception as e:
+            print(f"An error occurred: {e}")
+            raise
+        finally:
+            print("Cleaning up webdriver...")
+            if driver:
+                driver.quit()
+
+        return data

{uk_bin_collection-0.142.0.dist-info → uk_bin_collection-0.143.0.dist-info}/METADATA

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

{uk_bin_collection-0.142.0.dist-info → uk_bin_collection-0.143.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ uk_bin_collection/tests/check_selenium_url_in_input.json.py,sha256=Iecdja0I3XIiY
 uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-cutwz5RoYYWZRLYx2tr6zIs_9Rc,3843
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
-uk_bin_collection/tests/input.json,sha256=CheFZpYR_5AaYma_Eb1EtziWGQWR8c7nYgwLLzxAio4,120996
+uk_bin_collection/tests/input.json,sha256=yjo1upzl2zK_UgPqSSZY3mjyY-ItLPJ8CzfL1fDB7vk,121472
 uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
 uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
 uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=VZ0a81sioJULD7syAYHjvK_-nT_Rd36tUyzPetSA0gk,3475
@@ -27,6 +27,7 @@ uk_bin_collection/uk_bin_collection/councils/AshfordBoroughCouncil.py,sha256=4eb
 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
+uk_bin_collection/uk_bin_collection/councils/BarkingDagenham.py,sha256=8lYnRazbh_iOcmciSOJIhF44e8z3ZFlTZ0vnZKEfwJI,5973
 uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py,sha256=Sd4-pbv0QZsR7soxvXYqsfdOUIqZqS6notyoZthG77s,9182
 uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py,sha256=hqzVKEqwYmjcQjCYBletcCt9_pE96qQ3kn7eDroJeNk,4764
 uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py,sha256=NymPmq5pud0PJ8ePcc2r1SKED4EHQ0EY2l71O-Metxc,3313
@@ -327,8 +328,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.142.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.142.0.dist-info/METADATA,sha256=i2E_v_Kj_688lBYFandCTV20fc9CRU4UJIl50Z30AmU,19851
-uk_bin_collection-0.142.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.142.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.142.0.dist-info/RECORD,,
+uk_bin_collection-0.143.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.143.0.dist-info/METADATA,sha256=t5XZR0LERoiQknGYzJMdNIHGH0w2cF2ZGaru0yjlGBA,19851
+uk_bin_collection-0.143.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.143.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.143.0.dist-info/RECORD,,