uk_bin_collection 0.93.0__tar.gz → 0.94.0__tar.gz

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

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

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.93.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.93.0 → uk_bin_collection-0.94.0}/uk_bin_collection/tests/input.json

@@ -293,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",
@@ -344,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."
     },
@@ -596,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",

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