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

uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py

@@ -36,21 +36,29 @@ class CouncilClass(AbstractGetBinDataClass):
         s = requests.session()
 
         # Ask for a new SessionId from the server
-        session_id_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/"\
-            "RequestSession?userName=guest+CBC&password=&"\
+        session_id_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/"
+            "RequestSession?userName=guest+CBC&password=&"
             "script=%5CAurora%5CCBC+Waste+Streets.AuroraScript%24"
+        )
         session_id_response = s.get(session_id_url)
         session_id_response.raise_for_status()
         session_id = session_id_response.json().get("Session").get("SessionId")
 
         # Ask what tasks we can do within the session
-        tasks_url = f"https://maps.cheltenham.gov.uk/map/Aurora.svc/"\
+        tasks_url = (
+            f"https://maps.cheltenham.gov.uk/map/Aurora.svc/"
             f"GetWorkflow?sessionId={session_id}&workflowId=wastestreet"
+        )
         tasks_response = s.get(tasks_url)
         tasks_response.raise_for_status()
         # JSON response contained a BOM marker
         tasks = json.loads(tasks_response.text[1:])
-        retrieve_results_task_id, initialise_map_task_id, drilldown_task_id = None, None, None
+        retrieve_results_task_id, initialise_map_task_id, drilldown_task_id = (
+            None,
+            None,
+            None,
+        )
         # Pull out the ID's of the tasks we will need
         for task in tasks.get("Tasks"):
             if task.get("$type") == "StatMap.Aurora.FetchResultSetTask, StatMapService":
@@ -59,64 +67,86 @@ class CouncilClass(AbstractGetBinDataClass):
                 initialise_map_task_id = task.get("Id")
             elif task.get("$type") == "StatMap.Aurora.DrillDownTask, StatMapService":
                 drilldown_task_id = task.get("Id")
-        if not all([retrieve_results_task_id, initialise_map_task_id, drilldown_task_id]):
+        if not all(
+            [retrieve_results_task_id, initialise_map_task_id, drilldown_task_id]
+        ):
             raise ValueError("Not all task ID's found")
 
         # Find the X / Y coordinates for the requested postcode
-        postcode_search_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/FindLocation?"\
+        postcode_search_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/FindLocation?"
             f"sessionId={session_id}&address={postcode}&limit=1000"
+        )
         postcode_search_response = s.get(postcode_search_url)
         postcode_search_response.raise_for_status()
         if len(locations_list := postcode_search_response.json().get("Locations")) == 0:
             raise ValueError("Address locations empty")
         for location in locations_list:
-            location_search_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/FindLocation?"\
+            location_search_url = (
+                "https://maps.cheltenham.gov.uk/map/Aurora.svc/FindLocation?"
                 f"sessionId={session_id}&locationId={location.get('Id')}"
+            )
             location_search_response = s.get(location_search_url)
             location_search_response.raise_for_status()
             if not (location_list := location_search_response.json().get("Locations")):
                 raise KeyError("Locations wasn't present in results")
             if not (location_detail := location_list[0].get("Details")):
                 raise KeyError("Details wasn't present in location")
-            location_uprn = [detail.get(
-                "Value") for detail in location_detail if detail.get("Name") == "UPRN"][0]
+            location_uprn = [
+                detail.get("Value")
+                for detail in location_detail
+                if detail.get("Name") == "UPRN"
+            ][0]
             if str(location_uprn) == uprn:
-                location_usrn = str([detail.get(
-                    "Value") for detail in location_detail if detail.get("Name") == "USRN"][0])
+                location_usrn = str(
+                    [
+                        detail.get("Value")
+                        for detail in location_detail
+                        if detail.get("Name") == "USRN"
+                    ][0]
+                )
                 location_x = location_list[0].get("X")
                 location_y = location_list[0].get("Y")
                 break
 
         # Needed to initialise the server to allow follow on call
-        open_map_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/OpenScriptMap?"\
+        open_map_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/OpenScriptMap?"
             f"sessionId={session_id}"
+        )
         if res := s.get(open_map_url):
             res.raise_for_status()
 
         # Needed to initialise the server to allow follow on call
-        save_state_map_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"\
-            f"sessionId={session_id}&taskId={initialise_map_task_id}&job="\
-            "%7BTask%3A+%7B+%24type%3A+%27StatMap.Aurora.SaveStateTask%2C"\
+        save_state_map_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"
+            f"sessionId={session_id}&taskId={initialise_map_task_id}&job="
+            "%7BTask%3A+%7B+%24type%3A+%27StatMap.Aurora.SaveStateTask%2C"
             "+StatMapService%27+%7D%7D"
+        )
         if res := s.get(save_state_map_url):
             res.raise_for_status()
 
         # Start search for address given by x / y coord
-        drilldown_map_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"\
-            f"sessionId={session_id}&taskId={drilldown_task_id}&job=%7B%22"\
-            f"QueryX%22%3A{location_x}%2C%22QueryY%22%3A{location_y}%2C%22"\
-            "Task%22%3A%7B%22Type%22%3A%22StatMap.Aurora.DrillDownTask%2C"\
+        drilldown_map_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"
+            f"sessionId={session_id}&taskId={drilldown_task_id}&job=%7B%22"
+            f"QueryX%22%3A{location_x}%2C%22QueryY%22%3A{location_y}%2C%22"
+            "Task%22%3A%7B%22Type%22%3A%22StatMap.Aurora.DrillDownTask%2C"
             "+StatMapService%22%7D%7D"
+        )
         if res := s.get(drilldown_map_url):
             res.raise_for_status()
 
         # Get results from search for address given by x / y coord
-        address_details_url = "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"\
-            f"sessionId={session_id}&taskId={retrieve_results_task_id}"\
-            f"&job=%7B%22QueryX%22%3A{location_x}%2C%22QueryY%22%3A"\
-            f"{location_y}%2C%22Task%22%3A%7B%22Type%22%3A%22"\
-            "StatMap.Aurora.FetchResultSetTask%2C+StatMapService"\
+        address_details_url = (
+            "https://maps.cheltenham.gov.uk/map/Aurora.svc/ExecuteTaskJob?"
+            f"sessionId={session_id}&taskId={retrieve_results_task_id}"
+            f"&job=%7B%22QueryX%22%3A{location_x}%2C%22QueryY%22%3A"
+            f"{location_y}%2C%22Task%22%3A%7B%22Type%22%3A%22"
+            "StatMap.Aurora.FetchResultSetTask%2C+StatMapService"
             "%22%2C%22ResultSetName%22%3A%22inspection%22%7D%7D"
+        )
         address_details_response = s.get(address_details_url)
         address_details_response.raise_for_status()
         # JSON response contained a BOM marker, skip first character
@@ -150,7 +180,9 @@ class CouncilClass(AbstractGetBinDataClass):
         # After we've got the correct result, pull out the week number each bin type is taken on
         if (refuse_week_raw := result_dict.get("New_Refuse_Week".upper())) is not None:
             refuse_week = int(refuse_week_raw)
-        if (recycling_week_raw := result_dict.get("New_Recycling_Week".upper())) is not None:
+        if (
+            recycling_week_raw := result_dict.get("New_Recycling_Week".upper())
+        ) is not None:
             recycling_week = int(recycling_week_raw)
         if (garden_week_raw := result_dict.get("Garden_Bin_Week".upper())) is not None:
             garden_week = int(garden_week_raw)
@@ -169,13 +201,17 @@ class CouncilClass(AbstractGetBinDataClass):
         ]
 
         refuse_day_offset = days_of_week.index(
-            str(result_dict.get("New_Refuse_Day_internal".upper())).upper())
+            str(result_dict.get("New_Refuse_Day_internal".upper())).upper()
+        )
         recycling_day_offset = days_of_week.index(
-            str(result_dict.get("New_Recycling_Day".upper())).upper())
+            str(result_dict.get("New_Recycling_Day".upper())).upper()
+        )
         garden_day_offset = days_of_week.index(
-            str(result_dict.get("New_Garden_Day".upper())).upper())
+            str(result_dict.get("New_Garden_Day".upper())).upper()
+        )
         food_day_offset = days_of_week.index(
-            str(result_dict.get("New_Food_Day".upper())).upper())
+            str(result_dict.get("New_Food_Day".upper())).upper()
+        )
 
         # Initialise WEEK-1/WEEK-2 based on known details
         week_1_epoch = datetime(2025, 1, 13)
@@ -186,27 +222,20 @@ class CouncilClass(AbstractGetBinDataClass):
         # If there's an even number of weeks between the week-1
         # epoch and this week, then this week is of type week-1
         if (((this_week - week_1_epoch).days // 7)) % 2 == 0:
-            week = {
-                1: this_week,
-                2: this_week + timedelta(days=7)
-            }
+            week = {1: this_week, 2: this_week + timedelta(days=7)}
         else:
-            week = {
-                1: this_week - timedelta(days=7),
-                2: this_week
-            }
+            week = {1: this_week - timedelta(days=7), 2: this_week}
 
-        refuse_dates: list[str] = get_dates_every_x_days(
-            week[refuse_week], 14, 28)
+        refuse_dates: list[str] = get_dates_every_x_days(week[refuse_week], 14, 28)
         recycling_dates: list[str] = get_dates_every_x_days(
-            week[recycling_week], 14, 28)
-        garden_dates: list[str] = get_dates_every_x_days(
-            week[garden_week], 14, 28)
+            week[recycling_week], 14, 28
+        )
+        garden_dates: list[str] = get_dates_every_x_days(week[garden_week], 14, 28)
 
         for refuse_date in refuse_dates:
             collection_date = (
-                datetime.strptime(refuse_date, "%d/%m/%Y") +
-                timedelta(days=refuse_day_offset)
+                datetime.strptime(refuse_date, "%d/%m/%Y")
+                + timedelta(days=refuse_day_offset)
             ).strftime("%d/%m/%Y")
 
             dict_data = {
@@ -218,8 +247,8 @@ class CouncilClass(AbstractGetBinDataClass):
         for recycling_date in recycling_dates:
 
             collection_date = (
-                datetime.strptime(recycling_date, "%d/%m/%Y") +
-                timedelta(days=recycling_day_offset)
+                datetime.strptime(recycling_date, "%d/%m/%Y")
+                + timedelta(days=recycling_day_offset)
             ).strftime("%d/%m/%Y")
 
             dict_data = {
@@ -231,8 +260,8 @@ class CouncilClass(AbstractGetBinDataClass):
         for garden_date in garden_dates:
 
             collection_date = (
-                datetime.strptime(garden_date, "%d/%m/%Y") +
-                timedelta(days=garden_day_offset)
+                datetime.strptime(garden_date, "%d/%m/%Y")
+                + timedelta(days=garden_day_offset)
             ).strftime("%d/%m/%Y")
 
             dict_data = {
@@ -241,15 +270,18 @@ class CouncilClass(AbstractGetBinDataClass):
             }
             bindata["bins"].append(dict_data)
 
-        if ((food_waste_week := str(result_dict.get("FOOD_WASTE_WEEK_EXTERNAL", "")).upper())
-                == "weekly".upper()):
+        if (
+            food_waste_week := str(
+                result_dict.get("FOOD_WASTE_WEEK_EXTERNAL", "")
+            ).upper()
+        ) == "weekly".upper():
             food_dates: list[str] = get_dates_every_x_days(week[1], 7, 56)
 
             for food_date in food_dates:
 
                 collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y") +
-                    timedelta(days=food_day_offset)
+                    datetime.strptime(food_date, "%d/%m/%Y")
+                    + timedelta(days=food_day_offset)
                 ).strftime("%d/%m/%Y")
 
                 dict_data = {
@@ -266,21 +298,24 @@ class CouncilClass(AbstractGetBinDataClass):
             first_week = int(first_week.strip())
 
             second_week_day, _, second_week_number = second_week_detail.partition(
-                "WEEK")
+                "WEEK"
+            )
             second_week_number = int(second_week_number.strip())
             second_week_day: str = second_week_day.strip()[:3]
 
             food_dates_first: list[str] = get_dates_every_x_days(
-                week[first_week], 14, 28)
+                week[first_week], 14, 28
+            )
             food_dates_second: list[str] = get_dates_every_x_days(
-                week[second_week_number], 14, 28)
+                week[second_week_number], 14, 28
+            )
             second_week_offset = days_of_week.index(second_week_day)
 
             for food_date in food_dates_first:
 
                 collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y") +
-                    timedelta(days=food_day_offset)
+                    datetime.strptime(food_date, "%d/%m/%Y")
+                    + timedelta(days=food_day_offset)
                 ).strftime("%d/%m/%Y")
 
                 dict_data = {
@@ -291,8 +326,8 @@ class CouncilClass(AbstractGetBinDataClass):
             for food_date in food_dates_second:
 
                 collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y") +
-                    timedelta(days=second_week_offset)
+                    datetime.strptime(food_date, "%d/%m/%Y")
+                    + timedelta(days=second_week_offset)
                 ).strftime("%d/%m/%Y")
 
                 dict_data = {
@@ -302,7 +337,6 @@ class CouncilClass(AbstractGetBinDataClass):
                 bindata["bins"].append(dict_data)
 
         bindata["bins"].sort(
-            key=lambda x: datetime.strptime(
-                x.get("collectionDate", ""), "%d/%m/%Y")
+            key=lambda x: datetime.strptime(x.get("collectionDate", ""), "%d/%m/%Y")
         )
         return bindata

uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py

@@ -6,6 +6,7 @@ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataC
 This module provides bin collection data for Cheshire East Council.
 """
 
+
 class CouncilClass(AbstractGetBinDataClass):
     """
     A class to fetch and parse bin collection data for Cheshire East Council.

uk_bin_collection/uk_bin_collection/councils/CoventryCityCouncil.py

@@ -20,7 +20,10 @@ class CouncilClass(AbstractGetBinDataClass):
         curr_date = datetime.today()
 
         soup = BeautifulSoup(page.content, features="html.parser")
-        button = soup.find("a", text="Find out which bin will be collected when and sign up for a free email reminder.")
+        button = soup.find(
+            "a",
+            text="Find out which bin will be collected when and sign up for a free email reminder.",
+        )
 
         if button["href"]:
             URI = button["href"]

uk_bin_collection/uk_bin_collection/councils/ForestOfDeanDistrictCouncil.py

@@ -12,6 +12,7 @@ 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
+import re
 
 
 class CouncilClass(AbstractGetBinDataClass):
@@ -42,72 +43,82 @@ class CouncilClass(AbstractGetBinDataClass):
             wait = WebDriverWait(driver, 60)
             address_entry_field = wait.until(
                 EC.presence_of_element_located(
-                    (By.XPATH, '//*[@id="combobox-input-19"]')
+                    (By.XPATH, '//*[@placeholder="Search Properties..."]')
                 )
             )
 
             address_entry_field.send_keys(str(full_address))
 
             address_entry_field = wait.until(
-                EC.element_to_be_clickable((By.XPATH, '//*[@id="combobox-input-19"]'))
+                EC.element_to_be_clickable((By.XPATH, f'//*[@title="{full_address}"]'))
             )
             address_entry_field.click()
-            address_entry_field.send_keys(Keys.BACKSPACE)
-            address_entry_field.send_keys(str(full_address[len(full_address) - 1]))
 
-            first_found_address = wait.until(
+            next_button = wait.until(
                 EC.element_to_be_clickable(
-                    (By.XPATH, '//*[@id="dropdown-element-19"]/ul')
+                    (By.XPATH, "//lightning-button/button[contains(text(), 'Next')]")
                 )
             )
+            next_button.click()
 
-            first_found_address.click()
-            # Wait for the 'Select your property' dropdown to appear and select the first result
-            next_btn = wait.until(
-                EC.element_to_be_clickable((By.XPATH, "//lightning-button/button"))
-            )
-            next_btn.click()
-            bin_data = wait.until(
+            result = wait.until(
                 EC.presence_of_element_located(
-                    (By.XPATH, "//span[contains(text(), 'Container')]")
+                    (
+                        By.XPATH,
+                        '//table[@class="slds-table slds-table_header-fixed slds-table_bordered slds-table_edit slds-table_resizable-cols"]',
+                    )
                 )
             )
 
-            soup = BeautifulSoup(driver.page_source, features="html.parser")
+            # Make a BS4 object
+            soup = BeautifulSoup(
+                result.get_attribute("innerHTML"), features="html.parser"
+            )  # Wait for the 'Select your property' dropdown to appear and select the first result
 
+            data = {"bins": []}
+            today = datetime.now()
+            current_year = today.year
+
+            # Find all bin rows in the table
             rows = soup.find_all("tr", class_="slds-hint-parent")
-            current_year = datetime.now().year
 
             for row in rows:
-                columns = row.find_all("td")
-                if columns:
-                    container_type = row.find("th").text.strip()
-                    if columns[0].get_text() == "Today":
-                        collection_day = datetime.now().strftime("%a, %d %B")
-                    elif columns[0].get_text() == "Tomorrow":
-                        collection_day = (datetime.now() + timedelta(days=1)).strftime(
-                            "%a, %d %B"
-                        )
-                    else:
-                        collection_day = re.sub(
-                            r"[^a-zA-Z0-9,\s]", "", columns[0].get_text()
-                        ).strip()
-
-                    # Parse the date from the string
-                    parsed_date = datetime.strptime(collection_day, "%a, %d %B")
-                    if parsed_date < datetime(
-                        parsed_date.year, parsed_date.month, parsed_date.day
-                    ):
-                        parsed_date = parsed_date.replace(year=current_year + 1)
-                    else:
-                        parsed_date = parsed_date.replace(year=current_year)
-                    # Format the date as %d/%m/%Y
-                    formatted_date = parsed_date.strftime("%d/%m/%Y")
+                try:
+                    bin_type_cell = row.find("th")
+                    date_cell = row.find("td")
+
+                    if not bin_type_cell or not date_cell:
+                        continue
+
+                    container_type = bin_type_cell.get("data-cell-value", "").strip()
+                    raw_date_text = date_cell.get("data-cell-value", "").strip()
 
-                    # Add the bin type and collection date to the 'data' dictionary
+                    # Handle relative values like "Today" or "Tomorrow"
+                    if "today" in raw_date_text.lower():
+                        parsed_date = today
+                    elif "tomorrow" in raw_date_text.lower():
+                        parsed_date = today + timedelta(days=1)
+                    else:
+                        # Expected format: "Thu, 10 April"
+                        # Strip any rogue characters and try parsing
+                        cleaned_date = re.sub(r"[^\w\s,]", "", raw_date_text)
+                        try:
+                            parsed_date = datetime.strptime(cleaned_date, "%a, %d %B")
+                            parsed_date = parsed_date.replace(year=current_year)
+                            if parsed_date < today:
+                                # Date has passed this year, must be next year
+                                parsed_date = parsed_date.replace(year=current_year + 1)
+                        except Exception as e:
+                            print(f"Could not parse date '{cleaned_date}': {e}")
+                            continue
+
+                    formatted_date = parsed_date.strftime(date_format)
                     data["bins"].append(
                         {"type": container_type, "collectionDate": formatted_date}
                     )
+
+                except Exception as e:
+                    print(f"Error processing row: {e}")
         except Exception as e:
             # Here you can log the exception if needed
             print(f"An error occurred: {e}")

uk_bin_collection/uk_bin_collection/councils/GooglePublicCalendarCouncil.py

@@ -30,9 +30,8 @@ class CouncilClass(AbstractGetBinDataClass):
             except Exception:
                 continue
 
-            bindata["bins"].append({
-                "type": event.name,
-                "collectionDate": collection_date
-            })
+            bindata["bins"].append(
+                {"type": event.name, "collectionDate": collection_date}
+            )
 
         return bindata

uk_bin_collection/uk_bin_collection/councils/LondonBoroughOfRichmondUponThames.py

@@ -50,12 +50,18 @@ class CouncilClass(AbstractGetBinDataClass):
         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)
+                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)
+                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)
+                next_collection_date = datetime.strptime(
+                    collection_days[index].text.strip(), "%d %B %Y"
+                ).strftime(date_format)
 
             dict_data = {
                 "type": bin_type.text.strip(),
@@ -83,16 +89,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
     def input_street_name(self, street_name, wait):
         input_element_postcodesearch = wait.until(
-            EC.visibility_of_element_located(
-                (By.ID, "Street")
-            )
+            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")
-            )
+            EC.visibility_of_element_located((By.ID, "ccc-dismiss-button"))
         )
         cookie_banner.send_keys(Keys.ENTER)

uk_bin_collection/uk_bin_collection/councils/MiddlesbroughCouncil.py

@@ -12,6 +12,7 @@ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataC
 
 import re
 
+
 class CouncilClass(AbstractGetBinDataClass):
     def parse_data(self, page: str, **kwargs) -> dict:
         try:
@@ -63,19 +64,27 @@ class CouncilClass(AbstractGetBinDataClass):
 
                 # **Regex to match "Wednesday, February 19" format**
                 match = re.match(r"([A-Za-z]+), ([A-Za-z]+) (\d{1,2})", raw_date)
-                
+
                 if match:
-                    day_name, month_name, day_number = match.groups()  # Extract components
+                    day_name, month_name, day_number = (
+                        match.groups()
+                    )  # Extract components
                     extracted_month = datetime.strptime(month_name, "%B").month
                     extracted_day = int(day_number)
 
                     # Handle Dec-Jan rollover: If month is before the current month, assume next year
-                    inferred_year = current_year + 1 if extracted_month < current_month else current_year
+                    inferred_year = (
+                        current_year + 1
+                        if extracted_month < current_month
+                        else current_year
+                    )
 
                     # **Correct the raw_date format before parsing**
                     raw_date = f"{day_name}, {month_name} {day_number}, {inferred_year}"
 
-                print(f"DEBUG: Final raw_date before parsing -> {raw_date}")  # Debugging output
+                print(
+                    f"DEBUG: Final raw_date before parsing -> {raw_date}"
+                )  # Debugging output
 
                 # Convert to required format (%d/%m/%Y)
                 try:

uk_bin_collection/uk_bin_collection/councils/MonmouthshireCountyCouncil.py

@@ -43,7 +43,11 @@ class CouncilClass(AbstractGetBinDataClass):
 
             # Extract collection date (e.g., "Monday 9th December")
             date_tag = panel.find("p")
-            if date_tag and "Your next collection date is" in date_tag.text.strip().replace("\r", "").replace("\n", ""):
+            if (
+                date_tag
+                and "Your next collection date is"
+                in date_tag.text.strip().replace("\r", "").replace("\n", "")
+            ):
                 collection_date = date_tag.find("strong").text.strip()
             else:
                 continue

uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py

@@ -127,9 +127,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Garden waste
             garden_waste = soup.find("div", class_="eb-2HIpCnWC-Override-EditorInput")
             if garden_waste:
-                match = re.search(
-                    r"(\d{2}/\d{2}/\d{4})", garden_waste.text
-                )
+                match = re.search(r"(\d{2}/\d{2}/\d{4})", garden_waste.text)
                 if match:
                     bins.append(
                         {"type": "Garden waste", "collectionDate": match.group(1)}