uk_bin_collection 0.86.0__py3-none-any.whl → 0.86.2__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -427,6 +427,14 @@
         "wiki_name": "Glasgow City Council",
         "wiki_note": "Replace XXXXXXXX with UPRN."
     },
+    "GloucesterCityCouncil": {
+        "house_number": "111",
+        "postcode": "GL2 0RR",
+        "uprn": "100120479507",
+        "skip_get_url": true,
+        "url": "https://gloucester-self.achieveservice.com/service/Bins___Check_your_bin_day",
+        "wiki_name": "Gloucester City Council"
+    },
     "GuildfordCouncil": {
         "house_number": "THE LODGE, PUTTENHAM HILL HOUSE, PUTTENHAM HILL, PUTTENHAM, GUILDFORD, GU3 1AH",
         "postcode": "GU3 1AH",

uk_bin_collection/uk_bin_collection/councils/GloucesterCityCouncil.py

@@ -0,0 +1,128 @@
+import time
+from datetime import datetime
+
+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:
+            page = "https://gloucester-self.achieveservice.com/service/Bins___Check_your_bin_day"
+
+            bin_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(page)
+
+            cookies_button = WebDriverWait(driver, timeout=15).until(
+                EC.presence_of_element_located((By.ID, "close-cookie-message"))
+            )
+            cookies_button.click()
+
+            without_login_button = WebDriverWait(driver, timeout=15).until(
+                EC.presence_of_element_located(
+                    (By.LINK_TEXT, "or, Continue with no account")
+                )
+            )
+            without_login_button.click()
+
+            iframe_presense = WebDriverWait(driver, 30).until(
+                EC.presence_of_element_located((By.ID, "fillform-frame-1"))
+            )
+
+            driver.switch_to.frame(iframe_presense)
+            wait = WebDriverWait(driver, 60)
+            inputElement_postcodesearch = wait.until(
+                EC.element_to_be_clickable((By.NAME, "find_postcode"))
+            )
+
+            inputElement_postcodesearch.send_keys(user_postcode)
+
+            # Wait for the 'Select address' dropdown to be updated
+            time.sleep(2)
+
+            dropdown = wait.until(
+                EC.element_to_be_clickable((By.NAME, "chooseAddress"))
+            )
+            # Create a 'Select' for it, then select the first address in the list
+            # (Index 0 is "Select...")
+            dropdownSelect = Select(dropdown)
+            dropdownSelect.select_by_value(str(user_uprn))
+
+            # Wait for 'Searching for...' to be added to page
+            WebDriverWait(driver, timeout=15).until(
+                EC.text_to_be_present_in_element(
+                    (By.CSS_SELECTOR, "span[data-name=html1]"), "Searching"
+                )
+            )
+
+            # Wait for 'Searching for...' to be removed from page
+            WebDriverWait(driver, timeout=15).until(
+                EC.none_of(
+                    EC.text_to_be_present_in_element(
+                        (By.CSS_SELECTOR, "span[data-name=html1]"), "Searching"
+                    )
+                )
+            )
+
+            # Even then it can still be adding data to the page...
+            time.sleep(5)
+
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+
+            # This is ugly but there is literally no consistency to the HTML
+            def is_a_collection_date(t):
+                return any("Next collection" in c for c in t.children)
+
+            for next_collection in soup.find_all(is_a_collection_date):
+                bin_info = list(
+                    next_collection.parent.select_one("div:nth-child(1)").children
+                )
+                if not bin_info:
+                    continue
+                bin = bin_info[0].get_text()
+                date = next_collection.select_one("strong").get_text(strip=True)
+                bin_date = datetime.strptime(date, "%d %b %Y")
+                dict_data = {
+                    "type": bin,
+                    "collectionDate": bin_date.strftime(date_format),
+                }
+                bin_data["bins"].append(dict_data)
+
+            bin_data["bins"].sort(
+                key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+            )
+
+        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 bin_data

uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py

@@ -1,15 +1,11 @@
 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
+from datetime import datetime
 
-
-# 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.
+    Concrete class to scrape bin collection data.
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
@@ -27,65 +23,71 @@ class CouncilClass(AbstractGetBinDataClass):
             soup.prettify()
 
             data = {"bins": []}
+            # Locate the section with bin collection data
             sections = soup.find_all("div", {"class": "wil_c-content-section_heading"})
+            
             for s in sections:
                 if s.get_text(strip=True).lower() == "bin collections":
                     rows = s.find_next_sibling(
                         "div", {"class": "c-content-section_body"}
-                    ).find_all("div", {"class": "u-mb-8"})
+                    ).find_all("div", class_="tablet:l-col-fb-4 u-mt-10")
+                    
                     for row in rows:
-                        title = row.find("div", {"class": "u-mb-4"})
-                        collections = row.find_all("div", {"class": "u-mb-2"})
-                        if title and collections:
+                        title_elem = row.find("div", class_="u-mb-4")
+                        if title_elem:
+                            title = title_elem.get_text(strip=True).capitalize()
+                            
+                            # Find all collection info in the same section
+                            collections = row.find_all("div", class_="u-mb-2")
                             for c in collections:
-                                if (
-                                    c.get_text(strip=True)
-                                    .lower()
-                                    .startswith("next collection")
-                                ):
-                                    # add next collection
-                                    next_collection_date = datetime.strptime(
-                                        c.get_text(strip=True).replace(
-                                            "Next collection - ", ""
-                                        ),
-                                        "%A, %d %B %Y",
-                                    ).strftime(date_format)
-                                    dict_data = {
-                                        "type": title.get_text(strip=True).capitalize(),
-                                        "collectionDate": next_collection_date,
-                                    }
-                                    data["bins"].append(dict_data)
-                                    # add future collections without duplicating next collection
-                                    future_collections = row.find(
-                                        "ul", {"class": "u-mt-4"}
-                                    ).find_all("li")
-                                    for c in future_collections:
+                                text = c.get_text(strip=True).lower()
+                                
+                                if "next collection" in text:
+                                    date_text = text.replace("next collection - ", "")
+                                    try:
+                                        next_collection_date = datetime.strptime(
+                                            date_text, "%A, %d %B %Y"
+                                        ).strftime(date_format)
+
+                                        dict_data = {
+                                            "type": title,
+                                            "collectionDate": next_collection_date
+                                        }
+                                        data["bins"].append(dict_data)
+                                    except ValueError:
+                                        # Skip if the date isn't a valid date
+                                        print(f"Skipping invalid date: {date_text}")
+                                    
+                            # Get future collections
+                            future_collections_section = row.find("ul", class_="u-mt-4")
+                            if future_collections_section:
+                                future_collections = future_collections_section.find_all("li")
+                                for future_collection in future_collections:
+                                    future_date_text = future_collection.get_text(strip=True)
+                                    try:
                                         future_collection_date = datetime.strptime(
-                                            c.get_text(strip=True),
-                                            "%A, %d %B %Y",
+                                            future_date_text, "%A, %d %B %Y"
                                         ).strftime(date_format)
-                                        if (
-                                            future_collection_date
-                                            != next_collection_date
-                                        ):
+
+                                        # Avoid duplicates of next collection date
+                                        if future_collection_date != next_collection_date:
                                             dict_data = {
-                                                "type": title.get_text(
-                                                    strip=True
-                                                ).capitalize(),
-                                                "collectionDate": future_collection_date,
+                                                "type": title,
+                                                "collectionDate": future_collection_date
                                             }
                                             data["bins"].append(dict_data)
+                                    except ValueError:
+                                        # Skip if the future collection date isn't valid
+                                        print(f"Skipping invalid future date: {future_date_text}")
 
+            # Sort the collections by date
             data["bins"].sort(
                 key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
             )
         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.86.0.dist-info → uk_bin_collection-0.86.2.dist-info}/METADATA

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

{uk_bin_collection-0.86.0.dist-info → uk_bin_collection-0.86.2.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=w1JMksNwhHC4EojFuBhlvn1NrPgrR1XojBqneb3hJyQ,59938
+uk_bin_collection/tests/input.json,sha256=WJ6GsmG_nIzmOA0ItYnBRc7DwWD8jsytgA6XO5WstMo,60242
 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=LrOSt_loA1Mw3vTqaO2LpaDMu7rYJy6k5Kr-EOBln7s,3424
@@ -71,6 +71,7 @@ uk_bin_collection/uk_bin_collection/councils/ForestOfDeanDistrictCouncil.py,sha2
 uk_bin_collection/uk_bin_collection/councils/GatesheadCouncil.py,sha256=Ecq4kMbtAHnQrnxjhC7CG3oEZQ3D1aAk5qXVZk-ouxc,4601
 uk_bin_collection/uk_bin_collection/councils/GedlingBoroughCouncil.py,sha256=IssL5CJSdcGPkJCB0q2kieUSEjfoS6nDKfeT7-9eKsQ,2183
 uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py,sha256=IOgM8Wl-LpO1T-F9uU1FlVfPaEObpvsdP7S2h03Mycc,2528
+uk_bin_collection/uk_bin_collection/councils/GloucesterCityCouncil.py,sha256=8Wjvmdvg5blHVrREaEnhhWZaWhYVP4v_KdDVPLIUxaU,4889
 uk_bin_collection/uk_bin_collection/councils/GuildfordCouncil.py,sha256=9pVrmQhZcK2AD8gX8mNvP--L4L9KaY6L3B822VX6fec,5695
 uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py,sha256=r8cmtWhMJg-XG63ZHxidKKW7i4yQNrZSSMSCkBwrqjI,5837
 uk_bin_collection/uk_bin_collection/councils/HaringeyCouncil.py,sha256=t_6AkAu4wrv8Q0WlDhWh_82I0djl5tk531Pzs-SjWzg,2647
@@ -166,7 +167,7 @@ uk_bin_collection/uk_bin_collection/councils/TorridgeDistrictCouncil.py,sha256=6
 uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py,sha256=8CvO-WgdKdvyaOf3TYc4XwME8ogAXojgB40oyGRL8Dw,4129
 uk_bin_collection/uk_bin_collection/councils/ValeofGlamorganCouncil.py,sha256=Phgb_ECiUOOkqOx6OsfsTHMCW5VQfRmOC2zgYIQhuZA,5044
 uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py,sha256=5nZLbU5YVKNsJ2X_wuybrNLFAzjVAxkazu-bYP4IGXw,4292
-uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py,sha256=9zW4C0WKbsDLCKvFyVYFpyvp20JbrWc4G0HzadqF8WQ,4466
+uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py,sha256=-xqJOzHTrT4jOB3rHPXFYeqLaHyK9XmCPi92whaYBhw,4671
 uk_bin_collection/uk_bin_collection/councils/WalthamForest.py,sha256=P7MMw0EhpRmDbbnHb25tY5_yvYuZUFwJ1br4TOv24sY,4997
 uk_bin_collection/uk_bin_collection/councils/WarwickDistrictCouncil.py,sha256=3WQrAxzYzKoV4LyOqNTp9xINVsNi1xW9t8etducGeag,1146
 uk_bin_collection/uk_bin_collection/councils/WaverleyBoroughCouncil.py,sha256=tp9l7vdgSGRzNNG0pDfnNuFj4D2bpRJUJmAiTJ6bM0g,4662
@@ -187,8 +188,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=4s9ODGPAwPqwXc8SrTX5Wlfmizs3_58iXUtHc4Ir86o,1162
 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.86.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.86.0.dist-info/METADATA,sha256=W9Zw3dC1eK4xUSPeYD_HDSR96SdLdci0-6ULiuop1gg,16231
-uk_bin_collection-0.86.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.86.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.86.0.dist-info/RECORD,,
+uk_bin_collection-0.86.2.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.86.2.dist-info/METADATA,sha256=LRsdDRZdbzUoFma7eHGhI7jA8ZtZrf7y4xaO_3q6Lcw,16231
+uk_bin_collection-0.86.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.86.2.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.86.2.dist-info/RECORD,,