uk_bin_collection 0.124.3__tar.gz → 0.125.0__tar.gz

{uk_bin_collection-0.124.3 → uk_bin_collection-0.125.0}/PKG-INFO

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

{uk_bin_collection-0.124.3 → uk_bin_collection-0.125.0}/pyproject.toml

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

{uk_bin_collection-0.124.3 → uk_bin_collection-0.125.0}/uk_bin_collection/tests/input.json

@@ -194,6 +194,15 @@
         "wiki_name": "Blackburn Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
+    "BlaenauGwentCountyBoroughCouncil": {
+        "uprn": "100100471367",
+        "postcode": "NP23 7TE",
+        "skip_get_url": false,
+        "url": "https://www.blaenau-gwent.gov.uk",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "Blaenau Gwent County Borough Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "BoltonCouncil": {
         "postcode": "BL1 5PQ",
         "skip_get_url": true,
@@ -1403,6 +1412,13 @@
         "wiki_name": "Reading Borough Council",
         "wiki_note": "Replace XXXXXXXX with your property's UPRN."
     },
+    "RedditchBoroughCouncil": {
+        "url": "https://redditchbc.gov.uk",
+        "wiki_command_url_override": "https://redditchbc.gov.uk",
+        "uprn": "10094557691",
+        "wiki_name": "Redditch Borough Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "ReigateAndBansteadBoroughCouncil": {
         "skip_get_url": true,
         "uprn": "68134867",
@@ -1904,6 +1920,13 @@
         "wiki_name": "Waltham Forest",
         "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
+    "WandsworthCouncil": {
+        "url": "https://www.wandsworth.gov.uk",
+        "wiki_command_url_override": "https://www.wandsworth.gov.uk",
+        "uprn": "100022684035",
+        "wiki_name": "Wandsworth Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "WarringtonBoroughCouncil": {
         "url": "https://www.warrington.gov.uk",
         "wiki_command_url_override": "https://www.warrington.gov.uk",

uk_bin_collection-0.125.0/uk_bin_collection/uk_bin_collection/councils/BlaenauGwentCountyBoroughCouncil.py

@@ -0,0 +1,113 @@
+from bs4 import BeautifulSoup
+from selenium.webdriver.common.by import By
+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
+
+
+# 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_uprn = kwargs.get("uprn")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            check_uprn(user_uprn)
+            check_postcode(user_postcode)
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get(
+                "https://iportal.itouchvision.com/icollectionday/collection-day/?uuid=238D5F9796C12643D190E3505931401A8C003F0D&lang=en"
+            )
+
+            # Wait for the postcode field to appear then populate it
+            inputElement_postcode = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "postcodeSearch"))
+            )
+            inputElement_postcode.send_keys(user_postcode)
+
+            # Click search button
+            findAddress = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (By.XPATH, '//button[@class="govuk-button mt-4"]')
+                )
+            )
+            findAddress.click()
+
+            # Wait for the dropdown to be visible
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "addressSelect"))
+            )
+
+            dropdown = Select(driver.find_element(By.ID, "addressSelect"))
+            dropdown.select_by_value(user_uprn)
+
+            # Wait for the collections table to appear
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located(
+                    (
+                        By.XPATH,
+                        '//div[@class="ant-row d-flex justify-content-between mb-4 mt-2 css-2rgkd4"]',
+                    )
+                )
+            )
+
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+
+            recyclingcalendar = soup.find(
+                "div",
+                {
+                    "class": "ant-row d-flex justify-content-between mb-4 mt-2 css-2rgkd4"
+                },
+            )
+
+            rows = recyclingcalendar.find_all(
+                "div",
+                {
+                    "class": "ant-col ant-col-xs-12 ant-col-sm-12 ant-col-md-12 ant-col-lg-12 ant-col-xl-12 css-2rgkd4"
+                },
+            )
+
+            current_year = datetime.now().year
+            current_month = datetime.now().month
+
+            for row in rows:
+                BinType = row.find("h3").text
+                collectiondate = datetime.strptime(
+                    row.find("div", {"class": "text-white fw-bold"}).text,
+                    "%A %d %B",
+                )
+                if (current_month > 10) and (collectiondate.month < 3):
+                    collectiondate = collectiondate.replace(year=(current_year + 1))
+                else:
+                    collectiondate = collectiondate.replace(year=current_year)
+
+                dict_data = {
+                    "type": BinType,
+                    "collectionDate": collectiondate.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.124.3 → uk_bin_collection-0.125.0}/uk_bin_collection/uk_bin_collection/councils/LondonBoroughSutton.py

@@ -42,14 +42,18 @@ class CouncilClass(AbstractGetBinDataClass):
             bin_type = service.get_text(
                 strip=True
             )  # Bin type name (e.g., 'Food waste', 'Mixed recycling')
-            if bin_type == "Bulky waste":
+            if bin_type == "Bulky Waste":
                 continue
             service_details = service.find_next("div", class_="govuk-grid-row")
 
             next_collection = (
-                service_details.find("dt", string="Next collection")
-                .find_next_sibling("dd")
-                .get_text(strip=True)
+                (
+                    service_details.find("dt", string="Next collection")
+                    .find_next_sibling("dd")
+                    .get_text(strip=True)
+                )
+                .replace("(this collection has been adjusted from its usual time)", "")
+                .strip()
             )
 
             next_collection = datetime.strptime(

{uk_bin_collection-0.124.3 → uk_bin_collection-0.125.0}/uk_bin_collection/uk_bin_collection/councils/MertonCouncil.py

@@ -1,5 +1,6 @@
 # This script pulls (in one hit) the data from Merton Council Bins Data
 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
 
@@ -33,6 +34,11 @@ class CouncilClass(AbstractGetBinDataClass):
             ),
         )
 
+        possible_formats = [
+            "%d %B %Y",
+            "%A %d %B %Y",
+        ]
+
         # Loops the Rows
         for row in rows:
             # Get all the cells
@@ -40,9 +46,15 @@ class CouncilClass(AbstractGetBinDataClass):
             # First cell is the bin_type
             bin_type = cells[0].get_text().strip()
             # Date is on the second cell, second paragraph, wrapped in p
-            collectionDate = datetime.strptime(
-                cells[1].select("p > b")[2].get_text(strip=True), "%d %B %Y"
-            )
+            collectionDate = None
+            for date_format in possible_formats:
+                try:
+                    collectionDate = datetime.strptime(
+                        cells[1].select("p > b")[2].get_text(strip=True), date_format
+                    )
+                    break  # Exit the loop if parsing is successful
+                except ValueError:
+                    continue
 
             # Add each collection to the list as a tuple
             collections.append((bin_type, collectionDate))

uk_bin_collection-0.125.0/uk_bin_collection/uk_bin_collection/councils/RedditchBoroughCouncil.py

@@ -0,0 +1,73 @@
+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
+
+
+# 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:
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        URI = "https://bincollections.redditchbc.gov.uk/BinCollections/Details"
+
+        data = {"UPRN": user_uprn}
+
+        # Make the GET request
+        response = requests.post(URI, data=data)
+
+        # Parse the HTML
+        soup = BeautifulSoup(response.content, "html.parser")
+
+        # Find all collection containers
+        collection_containers = soup.find_all("div", class_="collection-container")
+
+        # Parse each collection container
+        for container in collection_containers:
+            # Extract bin type (from heading or image alt attribute)
+            bin_type = container.find("img")["alt"]
+
+            # Extract the next collection date (from the caption paragraph)
+            next_collection = (
+                container.find("p", class_="caption")
+                .text.replace("Next collection ", "")
+                .strip()
+            )
+
+            # Extract additional future collection dates (from the list items)
+            future_dates = [li.text.strip() for li in container.find_all("li")]
+
+            dict_data = {
+                "type": bin_type,
+                "collectionDate": datetime.strptime(
+                    next_collection,
+                    "%A, %d %B %Y",
+                ).strftime("%d/%m/%Y"),
+            }
+            bindata["bins"].append(dict_data)
+
+            for date in future_dates:  # Add to the schedule
+                dict_data = {
+                    "type": bin_type,
+                    "collectionDate": datetime.strptime(
+                        date,
+                        "%A, %d %B %Y",
+                    ).strftime("%d/%m/%Y"),
+                }
+                bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

{uk_bin_collection-0.124.3 → uk_bin_collection-0.125.0}/uk_bin_collection/uk_bin_collection/councils/SalfordCityCouncil.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 
 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
 
@@ -14,20 +15,20 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
-        api_url = "https://www.salford.gov.uk/bins-and-recycling/bin-collection-days/your-bin-collections"
         user_uprn = kwargs.get("uprn")
-
         # Check the UPRN is valid
         check_uprn(user_uprn)
 
-        # Create the form data
-        params = {
-            "UPRN": user_uprn,
+        api_url = f"https://www.salford.gov.uk/bins-and-recycling/bin-collection-days/your-bin-collections/?UPRN={user_uprn}"
+
+        headers = {
+            "User-Agent": "Mozilla/5.0",
+            "Referer": "https://www.salford.gov.uk/bins-and-recycling/bin-collection-days/",
         }
 
         # Make a request to the API
         requests.packages.urllib3.disable_warnings()
-        response = requests.get(api_url, params=params)
+        response = requests.get(api_url, headers=headers)
 
         # Make a BS4 object
         soup = BeautifulSoup(response.text, features="html.parser")

{uk_bin_collection-0.124.3 → uk_bin_collection-0.125.0}/uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py

@@ -26,7 +26,7 @@ class CouncilClass(AbstractGetBinDataClass):
         check_paon(user_paon)
 
         # Build URL to parse
-        council_url = "https://swale.gov.uk/bins-littering-and-the-environment/bins/my-collection-day"
+        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__)
@@ -35,7 +35,7 @@ class CouncilClass(AbstractGetBinDataClass):
         # Wait for the postcode field to appear then populate it
         try:
             inputElement_postcode = WebDriverWait(driver, 10).until(
-                EC.presence_of_element_located((By.ID, "q462406_q1"))
+                EC.presence_of_element_located((By.ID, "q485476_q1"))
             )
             inputElement_postcode.send_keys(user_postcode)
         except Exception:
@@ -43,7 +43,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
         # Click search button
         findAddress = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located((By.ID, "form_email_462397_submit"))
+            EC.presence_of_element_located((By.ID, "form_email_485465_submit"))
         )
         driver.execute_script("arguments[0].click();", findAddress)
 
@@ -52,7 +52,7 @@ class CouncilClass(AbstractGetBinDataClass):
             EC.element_to_be_clickable(
                 (
                     By.XPATH,
-                    "//select[@id='SBCYBDAddressList']//option[contains(., '"
+                    "//select[@name='q485480:q1']//option[contains(., '"
                     + user_paon
                     + "')]",
                 )
@@ -61,12 +61,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
         # Click search button
         getBins = WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located((By.ID, "form_email_462397_submit"))
+            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, "SBC-YBD-Main"))
+            EC.presence_of_element_located((By.ID, "SBCYBDSummary"))
         )
 
         soup = BeautifulSoup(driver.page_source, features="html.parser")
@@ -74,17 +74,41 @@ class CouncilClass(AbstractGetBinDataClass):
 
         data = {"bins": []}
 
-        # Get the collection bullet points on the page and parse them
-        nextCollections = soup.find("div", {"id": "nextCollections"})
-        for c in nextCollections:
-            collection = c.find_all("strong")
-            for bin in collection:
-                split = (bin.text).split(" on ")
-                bin_type = split[0]
-                bin_date = datetime.strptime(split[1], "%A %d %b %Y").strftime(
-                    "%d/%m/%Y"
-                )
-                dict_data = {"type": bin_type, "collectionDate": bin_date}
-                data["bins"].append(dict_data)
+        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:
+            dict_data = {
+                "type": bin,
+                "collectionDate": datetime.strptime(
+                    next_collection_date, "%A, %d %B"
+                ).strftime(date_format),
+            }
+            data["bins"].append(dict_data)
+
+        for bin in future_bins:
+            dict_data = {
+                "type": bin,
+                "collectionDate": datetime.strptime(
+                    future_collection_date, "%A, %d %B"
+                ).strftime(date_format),
+            }
+            data["bins"].append(dict_data)
 
         return data

uk_bin_collection-0.125.0/uk_bin_collection/uk_bin_collection/councils/WandsworthCouncil.py

@@ -0,0 +1,74 @@
+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
+
+
+# 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:
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        URI = f"https://www.wandsworth.gov.uk/my-property/?UPRN={user_uprn}"
+
+        # Make the GET request
+        response = requests.get(URI)
+
+        soup = BeautifulSoup(response.content, features="html.parser")
+        soup.prettify()
+
+        # Find all collection types
+        collection_types = soup.find_all("h4", class_="collection-heading")
+
+        # Iterate over each collection type
+        for collection_type in collection_types:
+            bin_types = collection_type.text.strip().split("/")
+            collections = collection_type.find_next_sibling("div", class_="collections")
+
+            # Extract next and previous collections
+            next_collection = collections.find_all("div", class_="collection")
+
+            # Parse each collection
+            for collection in next_collection:
+                # Extract the collection type (Next or Previous)
+                strong_tag = collection.find("strong")
+                collection_type = (
+                    strong_tag.text.strip(":") if strong_tag else "Unknown"
+                )
+
+                # Extract the date
+                date_text = (
+                    strong_tag.next_sibling.strip()
+                    if strong_tag and strong_tag.next_sibling
+                    else "No date found"
+                )
+
+                if date_text == "No date found":
+                    continue
+
+                for bin_type in bin_types:
+                    # Append to the schedule
+                    dict_data = {
+                        "type": bin_type,
+                        "collectionDate": datetime.strptime(
+                            date_text,
+                            "%A %d %B %Y",
+                        ).strftime(date_format),
+                    }
+                    bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
+        )
+
+        return bindata

{uk_bin_collection-0.124.3 → uk_bin_collection-0.125.0}/uk_bin_collection/uk_bin_collection/councils/WiltshireCouncil.py

@@ -25,6 +25,7 @@ class CouncilClass(AbstractGetBinDataClass):
         check_postcode(user_postcode)
         user_uprn = kwargs.get("uprn")
         check_uprn(user_uprn)
+        user_uprn = str(user_uprn).zfill(12)
 
         # Some data for the request
         cookies = {