uk_bin_collection 0.138.0__py3-none-any.whl → 0.138.1__py3-none-any.whl

uk_bin_collection/uk_bin_collection/councils/WalthamForest.py

@@ -5,7 +5,6 @@ from bs4 import BeautifulSoup
 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 *
@@ -26,7 +25,7 @@ class CouncilClass(AbstractGetBinDataClass):
             page = "https://portal.walthamforest.gov.uk/AchieveForms/?mode=fill&consentMessage=yes&form_uri=sandbox-publish://AF-Process-d62ccdd2-3de9-48eb-a229-8e20cbdd6393/AF-Stage-8bf39bf9-5391-4c24-857f-0dc2025c67f4/definition.json&process=1&process_uri=sandbox-processes://AF-Process-d62ccdd2-3de9-48eb-a229-8e20cbdd6393&process_id=AF-Process-d62ccdd2-3de9-48eb-a229-8e20cbdd6393"
 
             user_postcode = kwargs.get("postcode")
-            user_uprn = kwargs.get("uprn")
+            # user_uprn = kwargs.get("uprn")
             user_paon = kwargs.get("paon")
             web_driver = kwargs.get("web_driver")
             headless = kwargs.get("headless")
@@ -71,17 +70,17 @@ class CouncilClass(AbstractGetBinDataClass):
             )
 
             find_ac_button.send_keys(Keys.RETURN)
-            h4_element = wait.until(
+            wait.until(
                 EC.presence_of_element_located(
-                    (By.XPATH, "//h4[contains(text(), 'Your upcoming collections')]")
+                    (By.XPATH, "//h4[contains(text(), 'Next Collections')]")
                 )
             )
 
-            data_table = WebDriverWait(driver, 10).until(
+            WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
                     (
                         By.XPATH,
-                        '//div[contains(@class, "repeatable-table-wrapper")]',
+                        '//div[contains(@class, "fieldContent")]',
                     )
                 )
             )
@@ -90,15 +89,16 @@ class CouncilClass(AbstractGetBinDataClass):
 
             data = {"bins": []}
 
-            collection_divs = soup.find_all("tr", {"class": "repeatable-value"})
+            collection_divs = soup.find_all("div", {"style": "text-align: center;"})
 
             for collection_div in collection_divs:
-                td_list = collection_div.find_all("td")
-                bin_type = td_list[1].get_text(strip=True)
-                collection_date_text = td_list[2].get_text(strip=True)
+                h5_tag = collection_div.find("h5")
+                p_tag = collection_div.find("p")
+
+                if h5_tag and p_tag:
+                    bin_type = h5_tag.get_text(strip=True)
+                    collection_date_text = p_tag.find("b").get_text(strip=True)
 
-                # if collection_date_text is not 'NaN'
-                if collection_date_text != "NaN":
                     # Extract and format the date
                     date_match = re.search(r"(\d+ \w+)", collection_date_text)
                     if date_match:
@@ -123,4 +123,4 @@ class CouncilClass(AbstractGetBinDataClass):
             # This block ensures that the driver is closed regardless of an exception
             if driver:
                 driver.quit()
-        return data
+        return data

{uk_bin_collection-0.138.0.dist-info → uk_bin_collection-0.138.1.dist-info}/METADATA

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

{uk_bin_collection-0.138.0.dist-info → uk_bin_collection-0.138.1.dist-info}/RECORD

@@ -288,7 +288,7 @@ uk_bin_collection/uk_bin_collection/councils/ValeofGlamorganCouncil.py,sha256=dz
 uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py,sha256=fyskrQ4-osGOeCZuB_8m2TpW8iwHr7lpl52nrR06Xpo,4441
 uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py,sha256=mdAXKcoSSF-xnXS8boesFftS8RiKyuR76ITHQ9Q5DgM,4916
 uk_bin_collection/uk_bin_collection/councils/WalsallCouncil.py,sha256=wv-M3zZj0E6EIPoVB9AF_NCg_8XGM9uhqGa-F5yzoc4,2277
-uk_bin_collection/uk_bin_collection/councils/WalthamForest.py,sha256=mN-USLAG5bKQcEDAhuVjA-kDLkFWlE8OAwDOUjHdc3g,5028
+uk_bin_collection/uk_bin_collection/councils/WalthamForest.py,sha256=0z7TmlnSNKP42Etk0FusbIo-NzA_Y-zqOJa4P8HykVk,4923
 uk_bin_collection/uk_bin_collection/councils/WandsworthCouncil.py,sha256=aQoJpC7YkhKewQyZlsv5m4__2IPoKRsOrPxjNH5xRNo,2594
 uk_bin_collection/uk_bin_collection/councils/WarringtonBoroughCouncil.py,sha256=AB9mrV1v4pKKhfsBS8MpjO8XXBifqojSk53J9Q74Guk,1583
 uk_bin_collection/uk_bin_collection/councils/WarwickDistrictCouncil.py,sha256=DAL_f0BcIxFj7Ngkms5Q80kgSGp9y5zB35wRPudayz8,1644
@@ -321,8 +321,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.138.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.138.0.dist-info/METADATA,sha256=eA8Xw5kfi5OhuKXsI165x9eQC4DHuwISQGZlERkTKLI,19851
-uk_bin_collection-0.138.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.138.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.138.0.dist-info/RECORD,,
+uk_bin_collection-0.138.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.138.1.dist-info/METADATA,sha256=Ou6pY68sx1H_I3oRWLDjb1hx0XCDGAX5jecP9tO0pYQ,19851
+uk_bin_collection-0.138.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.138.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.138.1.dist-info/RECORD,,