uk_bin_collection 0.92.0__tar.gz → 0.94.0__tar.gz

{uk_bin_collection-0.92.0 → uk_bin_collection-0.94.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.92.0
+Version: 0.94.0
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com
@@ -53,6 +53,21 @@ Most scripts make use of [Beautiful Soup 4](https://pypi.org/project/beautifulso
 
 ---
 
+## Requesting your council
+> :warning: Please check that a request for your council has not already been made. You can do this by searching on the [Issues](https://github.com/robbrad/UKBinCollectionData/issues) page.
+
+If an issue already exists, please comment on that issue to express your interest. Please do not open a new issue, as it will be closed as a duplicate.
+
+If an issue does not already exist, please fill in a new [Council Request](https://github.com/robbrad/UKBinCollectionData/issues/new/choose) form, including as much information as possible, including:
+- Name of the council
+- URL to bin collections
+- An example postcode and/or UPRN (whichever is relevant)
+- Any further information
+
+Please be aware that this project is run by volunteer contributors and completion depends on numerous factors - even with a request, we cannot guarantee if/when your council will get added.
+
+---
+
 ## Home Assistant Usage
 
 ### Install with HACS (recommended)
@@ -255,17 +270,6 @@ docker pull selenium/standalone-chrome docker run -d -p 4444:4444 --name seleniu
 
 ---
 
-## Requesting your council
-To make a request for your council, first check the [Issues](https://github.com/robbrad/UKBinCollectionData/issues) page to make sure it has not already been requested. If not, please fill in a new [Council Request](https://github.com/robbrad/UKBinCollectionData/issues/new/choose) form, including as much information as possible, including:
-- Name of the council
-- URL to bin collections
-- An example postcode and/or UPRN (whichever is relevant)
-- Any further information
-
-Please be aware that this project is run by volunteer contributors and completion depends on numerous factors - even with a request, we cannot guarantee if/when your council will get a script.
-
----
-
 ## Reports
 
 - [3.11](https://robbrad.github.io/UKBinCollectionData/3.11/)
@@ -371,3 +375,4 @@ Contributions are always welcome! See ```CONTRIBUTING.md``` to get started. Plea
   <img src="https://contrib.rocks/image?repo=robbrad/UKBinCollectionData"  alt="Image of contributors"/>
 </a>
 
+

{uk_bin_collection-0.92.0 → uk_bin_collection-0.94.0}/README.md

@@ -30,6 +30,21 @@ Most scripts make use of [Beautiful Soup 4](https://pypi.org/project/beautifulso
 
 ---
 
+## Requesting your council
+> :warning: Please check that a request for your council has not already been made. You can do this by searching on the [Issues](https://github.com/robbrad/UKBinCollectionData/issues) page.
+
+If an issue already exists, please comment on that issue to express your interest. Please do not open a new issue, as it will be closed as a duplicate.
+
+If an issue does not already exist, please fill in a new [Council Request](https://github.com/robbrad/UKBinCollectionData/issues/new/choose) form, including as much information as possible, including:
+- Name of the council
+- URL to bin collections
+- An example postcode and/or UPRN (whichever is relevant)
+- Any further information
+
+Please be aware that this project is run by volunteer contributors and completion depends on numerous factors - even with a request, we cannot guarantee if/when your council will get added.
+
+---
+
 ## Home Assistant Usage
 
 ### Install with HACS (recommended)
@@ -232,17 +247,6 @@ docker pull selenium/standalone-chrome docker run -d -p 4444:4444 --name seleniu
 
 ---
 
-## Requesting your council
-To make a request for your council, first check the [Issues](https://github.com/robbrad/UKBinCollectionData/issues) page to make sure it has not already been requested. If not, please fill in a new [Council Request](https://github.com/robbrad/UKBinCollectionData/issues/new/choose) form, including as much information as possible, including:
-- Name of the council
-- URL to bin collections
-- An example postcode and/or UPRN (whichever is relevant)
-- Any further information
-
-Please be aware that this project is run by volunteer contributors and completion depends on numerous factors - even with a request, we cannot guarantee if/when your council will get a script.
-
----
-
 ## Reports
 
 - [3.11](https://robbrad.github.io/UKBinCollectionData/3.11/)
@@ -347,3 +351,4 @@ Contributions are always welcome! See ```CONTRIBUTING.md``` to get started. Plea
 <a href="https://github.com/robbrad/UKBinCollectionData/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=robbrad/UKBinCollectionData"  alt="Image of contributors"/>
 </a>
+

{uk_bin_collection-0.92.0 → uk_bin_collection-0.94.0}/pyproject.toml

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

{uk_bin_collection-0.92.0 → uk_bin_collection-0.94.0}/uk_bin_collection/tests/input.json

@@ -42,7 +42,13 @@
         "wiki_name": "Barnsley Metropolitan Borough Council",
         "wiki_note": "To get the UPRN, you will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
-    "BasingstokeCouncil": {
+"BasildonCouncil": {
+        "skip_get_url": true,
+        "uprn": "10013350430",
+        "url": "https://basildonportal.azurewebsites.net/api/getPropertyRefuseInformation",
+        "wiki_name": "Basildon Council"
+    },
+        "BasingstokeCouncil": {
         "skip_get_url": true,
         "uprn": "100060220926",
         "url": "https://www.basingstoke.gov.uk/bincollection",
@@ -109,6 +115,7 @@
         "wiki_note": "To get the UPRN, you will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search). Previously required single field that was UPRN and full address, now requires UPRN and postcode as separate fields."
     },
     "BracknellForestCouncil": {
+        "house_number": "57",
         "paon": "57",
         "postcode": "GU47 9BS",
         "skip_get_url": true,
@@ -155,10 +162,10 @@
         "wiki_name": "Broxtowe Borough Council"
     },
     "BuckinghamshireCouncil": {
-        "house_number": "HUGHENDEN MANOR, MANOR ROAD, HUGHENDEN VALLEY, HIGH WYCOMBE",
-        "postcode": "HP14 4LA",
+        "house_number": "2",
+        "postcode": "HP13 7BA",
         "skip_get_url": true,
-        "url": "https://chiltern.gov.uk/collection-dates",
+        "url": "https://iapp.itouchvision.com/iappcollectionday/collection-day/?uuid=FA353FC74600CBE61BE409534D00A8EC09BDA3AC&lang=en",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Buckinghamshire Council (Chiltern, South Bucks, Wycombe)",
         "wiki_note": "Pass the name of the street with the house number parameter, wrapped in double quotes"
@@ -286,6 +293,14 @@
         "url": "https://service.croydon.gov.uk/wasteservices/w/webpage/bin-day-enter-address",
         "wiki_name": "Croydon Council"
     },
+    "DacorumBoroughCouncil": {
+        "house_number": "13",
+        "postcode": "HP3 9JY",
+        "skip_get_url": true,
+        "web_driver": "http://selenium:4444",
+        "url": "https://webapps.dacorum.gov.uk/bincollections/",
+        "wiki_name": "Dacorum Borough Council"
+    },
     "DartfordBoroughCouncil": {
         "uprn": "010094157511",
         "url": "https://windmz.dartford.gov.uk/ufs/WS_CHECK_COLLECTIONS.eb?UPRN=010094157511",
@@ -337,8 +352,8 @@
         "wiki_name": "East Cambridgeshire Council"
     },
     "EastDevonDC": {
-        "url": "https://eastdevon.gov.uk/recycling-and-waste/recycling-and-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=010090909915",
-        "wiki_command_url_override": "https://eastdevon.gov.uk/recycling-and-waste/recycling-and-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=XXXXXXXX",
+        "url": "https://eastdevon.gov.uk/recycling-and-waste/recycling-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=010090909915",
+        "wiki_command_url_override": "https://eastdevon.gov.uk/recycling-waste/recycling-and-waste-information/when-is-my-bin-collected/future-collections-calendar/?UPRN=XXXXXXXX",
         "wiki_name": "East Devon District Council",
         "wiki_note": "Replace XXXXXXXX with UPRN."
     },
@@ -589,6 +604,12 @@
         "url": "https://www.hounslow.gov.uk/homepage/86/recycling_and_waste_collection_day_finder",
         "wiki_name": "London Borough Hounslow"
     },
+    "LondonBoroughLambeth": {
+        "skip_get_url": true,
+        "uprn": "100021881738",
+        "url": "https://wasteservice.lambeth.gov.uk/WhitespaceComms/GetServicesByUprn",
+        "wiki_name": "London Borough Lambeth"
+    },
     "LondonBoroughRedbridge": {
         "postcode": "IG2 6LQ",
         "uprn": "10023770353",
@@ -659,9 +680,9 @@
         "wiki_note": "UPRN can only be parsed with a valid postcode."
     },
     "NeathPortTalbotCouncil": {
+        "house_number": "2",
         "postcode": "SA13 3BA",
         "skip_get_url": true,
-        "uprn": "10023947752",
         "url": "https://www.npt.gov.uk",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Neath Port Talbot Council"
@@ -1229,6 +1250,16 @@
         "url": "https://ilambassadorformsprod.azurewebsites.net/wastecollectiondays/index",
         "wiki_name": "Wiltshire Council"
     },
+    "WinchesterCityCouncil": {
+        "house_number": "12",
+        "paon": "12",
+        "postcode": "SO23 7GA",
+        "skip_get_url": false,
+        "url": "https://iportal.itouchvision.com/icollectionday/collection-day",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "Winchester City Council",
+        "wiki_note": "Pass the house name/number in the house number parameter, wrapped in double quotes"
+    },
     "WindsorAndMaidenheadCouncil": {
         "web_driver": "http://selenium:4444",
         "uprn": "100080371082",
@@ -1244,6 +1275,13 @@
         "wiki_name": "Woking Borough Council/Joint Waste Solutions",
         "wiki_note": "Works with all collection areas that use Joint Waste Solutions. Just use the correct URL."
     },
+    "WokinghamBoroughCouncil": {
+        "house_number": "90",
+        "postcode": "RG40 2HR",
+        "skip_get_url": true,
+        "url": "https://www.wokingham.gov.uk/rubbish-and-recycling/waste-collection/find-your-bin-collection-day",
+        "wiki_name": "Wokingham Borough Council"
+    },
     "WychavonDistrictCouncil": {
         "postcode": "WR3 7RU",
         "skip_get_url": true,

uk_bin_collection-0.94.0/uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py

@@ -0,0 +1,81 @@
+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:
+        url_base = "https://basildonportal.azurewebsites.net/api/getPropertyRefuseInformation"
+
+        uprn = kwargs.get("uprn")
+        # Check the UPRN is valid
+        check_uprn(uprn)
+
+        payload = {
+            # Add your payload details here (replace this with the actual payload structure if required)
+            "uprn": uprn
+        }
+
+        # Headers for the request
+        headers = {
+            "Content-Type": "application/json"
+        }
+
+        response = requests.post(url_base, data=json.dumps(payload), headers=headers)
+
+        # Ensure the request was successful
+        if response.status_code == 200:
+            data = response.json()
+
+            # Initialize an empty list to store the bin collection details
+
+            bins = []
+
+            # Function to add collection details to bins list
+            def add_collection(service_name, collection_data):
+                bins.append({
+                    "type": service_name,
+                    "collectionDate": collection_data.get("current_collection_date")
+                })
+
+            # Extract refuse information
+            available_services = data["refuse"]["available_services"]
+
+            for service_name, service_data in available_services.items():
+                # Append the service name and current collection date to the "bins" list
+                match service_data["container"]:
+                    case "Green Wheelie Bin":
+                        subscription_status = service_data["subscription"]["active"] if service_data["subscription"] else False
+                        type_descr = f"Green Wheelie Bin ({"Active" if subscription_status else "Expired"})"
+                    case "N/A":
+                        type_descr = service_data["name"]
+                    case _:
+                        type_descr = service_data["container"]
+
+
+                date_str = service_data.get("current_collection_date")
+                # Parse the date string into a datetime object
+                date_obj = datetime.strptime(date_str, "%Y-%m-%d")
+
+                # Convert the datetime object to the desired format
+                formatted_date = date_obj.strftime(date_format)
+
+                bins.append({
+                    "type": type_descr,  # Use service name from the data
+                    "collectionDate": formatted_date
+                })
+
+        else:
+            print(f"Failed to fetch data. Status code: {response.status_code}")
+
+        data = {
+            "bins": bins
+        }
+
+        return data

uk_bin_collection-0.94.0/uk_bin_collection/uk_bin_collection/councils/BuckinghamshireCouncil.py

@@ -0,0 +1,115 @@
+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
+
+
+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://iapp.itouchvision.com/iappcollectionday/collection-day/?uuid=FA353FC74600CBE61BE409534D00A8EC09BDA3AC&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 '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='addressSelect']//option[contains(., '"
+                        + user_paon
+                        + "')]",
+                    )
+                )
+            ).click()
+
+            # 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.94.0/uk_bin_collection/uk_bin_collection/councils/DacorumBoroughCouncil.py

@@ -0,0 +1,102 @@
+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://webapps.dacorum.gov.uk/bincollections/")
+
+            # Wait for the postcode field to appear then populate it
+            inputElement_postcode = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located((By.ID, "txtBxPCode"))
+            )
+            inputElement_postcode.send_keys(user_postcode)
+
+            # Click search button
+            findAddress = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "btnFindAddr"))
+            )
+            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='lstBxAddrList']//option[contains(., '"
+                        + user_paon
+                        + "')]",
+                    )
+                )
+            ).click()
+
+            # Click search button
+            findDates = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "MainContent_btnGetSchedules"))
+            )
+            findDates.click()
+
+            # Wait for the collections table to appear
+            WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located((By.ID, "lblSelectedAddr"))
+            )
+
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+            soup.prettify()
+
+            # Get collections div
+            BinCollectionSchedule = soup.find("div", {"id": "MainContent_updPnl"})
+
+            NextCollections = BinCollectionSchedule.find_all(
+                "div", {"style": " margin:5px;"}
+            )
+
+            for Collection in NextCollections:
+                BinType = Collection.find("strong").text.strip()
+                if BinType:
+                    CollectionDate = datetime.strptime(
+                        Collection.find_all("div", {"style": "display:table-cell;"})[1]
+                        .get_text()
+                        .strip(),
+                        "%a, %d %b %Y",
+                    )
+                    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.94.0/uk_bin_collection/uk_bin_collection/councils/LondonBoroughLambeth.py

@@ -0,0 +1,54 @@
+import requests
+from requests.structures import CaseInsensitiveDict
+
+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)
+        data = {"bins": []}
+
+        url = "https://wasteservice.lambeth.gov.uk/WhitespaceComms/GetServicesByUprn"
+
+        headers = CaseInsensitiveDict()
+        headers["Content-Type"] = "application/json"
+
+        body = {"uprn": user_uprn, "includeEventTypes": False, "includeFlags": True}
+        json_data = json.dumps(body)
+
+        res = requests.post(url, headers=headers, data=json_data)
+
+        if res.status_code != 200:
+            raise ConnectionRefusedError("Cannot connect to API!")
+
+        json_data = res.json()
+
+        if "SiteServices" in json_data:
+            SiteServices = json_data["SiteServices"]
+            for service in SiteServices:
+                if "NextCollectionDate" in service:
+                    NextCollectionDate = service["NextCollectionDate"]
+                    if NextCollectionDate:
+                        Container = service["Container"]
+                        if Container:
+                            Bin_Type = Container["DisplayPhrase"]
+                            dict_data = {
+                                "type": Bin_Type,
+                                "collectionDate": datetime.strptime(
+                                    NextCollectionDate, "%d/%m/%Y"
+                                ).strftime(date_format),
+                            }
+                            data["bins"].append(dict_data)
+
+        return data