uk_bin_collection 0.127.3__py3-none-any.whl → 0.127.4__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -1030,6 +1030,13 @@
         "wiki_name": "London Borough Ealing",
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
+    "LondonBoroughOfRichmondUponThames": {
+        "house_number": "March Road",
+        "skip_get_url": true,
+        "url": "https://www.richmond.gov.uk/services/waste_and_recycling/collection_days/",
+        "wiki_name": "London Borough Of Richmond Upon Thames",
+        "wiki_note": "Pass the name of the street ONLY in the house number parameter, unfortunately post code's are not allowed. "
+    },
     "LondonBoroughHarrow": {
         "url": "https://www.harrow.gov.uk",
         "wiki_command_url_override": "https://www.harrow.gov.uk",

uk_bin_collection/uk_bin_collection/councils/LondonBoroughOfRichmondUponThames.py

@@ -0,0 +1,98 @@
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from datetime import datetime
+from selenium.webdriver.support.wait import WebDriverWait
+from selenium.webdriver.common.keys import Keys
+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:
+        print(f"Arguments are f{kwargs}")
+        driver = None
+        try:
+            page = kwargs["url"]
+            street_name = kwargs.get("paon")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get(page)
+
+            wait = WebDriverWait(driver, 60)
+
+            self.dismiss_cookie_banner(wait)
+            self.input_street_name(street_name, wait)
+            self.submit(wait)
+            bin_types, collection_days = self.get_bins(driver)
+            bindata = self.get_collection_days(bin_types, collection_days)
+
+            print(bindata)
+
+        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 bindata
+
+    def get_collection_days(self, bin_types, collection_days):
+        bindata = {"bins": []}
+        WEEKLY_COLLECTION = 0
+        GARDEN_COLLECTION = 1
+
+        for index, bin_type in enumerate(bin_types):
+            # currently only handled weekly and garden collection, special collections like Christmas Day need to be added
+            if index == WEEKLY_COLLECTION:
+                next_collection_date = get_next_day_of_week(collection_days[index].text.strip(), date_format)
+            elif index == GARDEN_COLLECTION:
+                split_date_part = collection_days[index].text.split("More dates")[0]
+                next_collection_date = datetime.strptime(split_date_part.strip(), "%d %B %Y").strftime(date_format)
+            else:
+                next_collection_date = datetime.strptime(collection_days[index].text.strip(), "%d %B %Y").strftime(date_format)
+
+            dict_data = {
+                "type": bin_type.text.strip(),
+                "collectionDate": next_collection_date,
+            }
+            bindata["bins"].append(dict_data)
+        return bindata
+
+    def get_bins(self, driver):
+        table = driver.find_element(By.XPATH, ".//div[@id='maincontent']//table")
+        table_rows = table.find_elements(by=By.TAG_NAME, value="tr")
+        headerRow = table_rows[0]
+        table_info_row = table_rows[1]
+        bin_types = headerRow.find_elements(by=By.TAG_NAME, value="th")[2:]
+        collection_days = table_info_row.find_elements(by=By.TAG_NAME, value="td")[2:]
+        return bin_types, collection_days
+
+    def submit(self, wait):
+        main_content_submit_button = wait.until(
+            EC.element_to_be_clickable(
+                (By.XPATH, ".//div[@id='maincontent']//input[@type='submit']")
+            )
+        )
+        main_content_submit_button.send_keys(Keys.ENTER)
+
+    def input_street_name(self, street_name, wait):
+        input_element_postcodesearch = wait.until(
+            EC.visibility_of_element_located(
+                (By.ID, "Street")
+            )
+        )
+        input_element_postcodesearch.send_keys(street_name)
+
+    def dismiss_cookie_banner(self, wait):
+        cookie_banner = wait.until(
+            EC.visibility_of_element_located(
+                (By.ID, "ccc-dismiss-button")
+            )
+        )
+        cookie_banner.send_keys(Keys.ENTER)

uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py

@@ -125,10 +125,10 @@ class CouncilClass(AbstractGetBinDataClass):
                     )
 
             # Garden waste
-            garden_waste = soup.find("span", class_="CTID-17-_ eb-17-textControl")
+            garden_waste = soup.find("div", class_="eb-2HIpCnWC-Override-EditorInput")
             if garden_waste:
                 match = re.search(
-                    r"next collection is\s+(\d{2}/\d{2}/\d{4})", garden_waste.text
+                    r"(\d{2}/\d{2}/\d{4})", garden_waste.text
                 )
                 if match:
                     bins.append(

{uk_bin_collection-0.127.3.dist-info → uk_bin_collection-0.127.4.dist-info}/METADATA

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

{uk_bin_collection-0.127.3.dist-info → uk_bin_collection-0.127.4.dist-info}/RECORD

@@ -2,7 +2,7 @@ uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 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=P1EVRcGMASZCNVTAfhiQntWctYAdxa8nBytUeHLB0vY,114379
+uk_bin_collection/tests/input.json,sha256=TdxYXHlJlV1eO1flmo8pqn3beIagaugbpa6yvcmE_9E,114783
 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
@@ -150,6 +150,7 @@ uk_bin_collection/uk_bin_collection/councils/LondonBoroughHavering.py,sha256=6DN
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughHounslow.py,sha256=UOeiOxGMvVMm2UFaqjmQpm7vxzqJNSSN8LM9lAUjs2c,3021
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughLambeth.py,sha256=r9D5lHe5kIRStCd5lRIax16yhb4KTFzzfYEFv1bacWw,2009
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughLewisham.py,sha256=d8rlJDTbY3nj-Zjg6iwvwfe-X13Gq86DGGW6QkQAUW0,5310
+uk_bin_collection/uk_bin_collection/councils/LondonBoroughOfRichmondUponThames.py,sha256=F5G_Xu-nilCA72Qbm9N87q77yYZMzyXhiuJaB1tjFFs,3933
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughRedbridge.py,sha256=A_6Sis5hsF53Th04KeadHRasGbpAm6aoaWJ6X8eC4Y8,6604
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughSutton.py,sha256=T0gCjpBQ9k3uNNIiJGphNiSXeh2n6bohflg9RwbL3NA,2565
 uk_bin_collection/uk_bin_collection/councils/LutonBoroughCouncil.py,sha256=vScUi_R8FnBddii2_zLlZBLxuh85mKmCm8nKW3zxky0,2758
@@ -168,7 +169,7 @@ uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py,sha256
 uk_bin_collection/uk_bin_collection/councils/MonmouthshireCountyCouncil.py,sha256=V3R98D3DtCPZK3RNCg8yR2ddoUz_tOzl2YTgWfjdPX0,2468
 uk_bin_collection/uk_bin_collection/councils/MorayCouncil.py,sha256=jsHCQ_aV_bG0GPfF7h6g5TP84sroplYC5k2M6iEKiTw,2265
 uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py,sha256=ychYR2nsyk2UIb8tjWaKrLUT4hxSsHN558l3RqZ0mjw,5635
-uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py,sha256=ylTn9KmWITtaO9_Z8kJCN2w2ALfhrfGt3SeJ78lgw7M,5391
+uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py,sha256=LSQu1djVkbp4ous3DuOr9VWg4k9sFyBrQ2ZaJHY5FbA,5374
 uk_bin_collection/uk_bin_collection/councils/NewarkAndSherwoodDC.py,sha256=lAleYfCGUWCKOi7Ye_cjgfpI3pWwTcFctlYmh0hjebM,2140
 uk_bin_collection/uk_bin_collection/councils/NewcastleCityCouncil.py,sha256=eJMX10CG9QO7FRhHSmUDL-jO_44qoK3_1ztNTAXhkbw,2085
 uk_bin_collection/uk_bin_collection/councils/NewcastleUnderLymeCouncil.py,sha256=t150wPtF2eEFYNTVj2EnhXt6JJJRiEX8976bh9JBXlg,2328
@@ -299,8 +300,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.127.3.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.127.3.dist-info/METADATA,sha256=N5s90XpaFpVWjIAj1fQVSLB2QnHms0H6nZqXyQNsBww,19549
-uk_bin_collection-0.127.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.127.3.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.127.3.dist-info/RECORD,,
+uk_bin_collection-0.127.4.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.127.4.dist-info/METADATA,sha256=PEi9YKlMqAEGH-taK-nNRm9M5PxrewNMTbaireIyjhE,19549
+uk_bin_collection-0.127.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.127.4.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.127.4.dist-info/RECORD,,