uk_bin_collection 0.152.2__py3-none-any.whl → 0.152.4__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -1693,9 +1693,10 @@
         "LAD24CD": "E06000012"
     },
     "NorthHertfordshireDistrictCouncil": {
-        "house_number": "2",
+        "house_number": "22",
         "postcode": "SG6 4BJ",
         "url": "https://www.north-herts.gov.uk",
+        "web_driver": "http://selenium:4444",
         "wiki_name": "North Hertfordshire",
         "wiki_note": "Pass the house number and postcode in their respective parameters.",
         "LAD24CD": "E07000099"
@@ -2179,9 +2180,10 @@
         "LAD24CD": "E07000179"
     },
     "SouthRibbleCouncil": {
-        "uprn": "010013246384",
-        "url": "https://www.southribble.gov.uk",
-        "wiki_command_url_override": "https://www.southribble.gov.uk",
+        "uprn": "10013243496",
+        "postcode": "PR26 7RZ",
+        "url": "https://forms.chorleysouthribble.gov.uk/xfp/form/70",
+        "wiki_command_url_override": "https://forms.chorleysouthribble.gov.uk/xfp/form/70",
         "wiki_name": "South Ribble",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN.",
         "LAD24CD": "E07000126"

uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py

@@ -37,38 +37,55 @@ class CouncilClass(AbstractGetBinDataClass):
                 paragraphs = bin_row.find_all("p")
 
                 for p in paragraphs:
-                    if p.get_text() and "Next collection:" in p.get_text():
-                        date_str = p.get_text().replace("Next collection:", "").strip()
-                        # Extract day number from date string (e.g. "2" from "Friday 2nd May")
-                        day_number = int("".join(filter(str.isdigit, date_str)))
-                        # Replace ordinal in date string with plain number
-                        date_str = date_str.replace(
-                            get_date_with_ordinal(day_number), str(day_number)
+                    # Check for both singular and plural "Next collection(s):"
+                    if p.get_text() and (
+                        "Next collection:" in p.get_text()
+                        or "Next collections:" in p.get_text()
+                    ):
+                        # Extract collection dates
+                        date_text = (
+                            p.get_text()
+                            .replace("Next collection:", "")
+                            .replace("Next collections:", "")
+                            .strip()
                         )
 
-                        try:
-                            # Parse date with full format
-                            bin_date = datetime.strptime(date_str, "%A %d %B")
-
-                            # Add current year since it's not in the date string
-                            current_year = datetime.now().year
-                            bin_date = bin_date.replace(year=current_year)
-
-                            # If the date is in the past, it's probably for next year
-                            if bin_date < datetime.now():
-                                bin_date = bin_date.replace(year=current_year + 1)
-
-                            collections.append((bin_type, bin_date))
-                            print(
-                                f"Successfully parsed date for {bin_type}: {bin_date}"
-                            )
-                            break
-
-                        except ValueError as e:
-                            print(
-                                f"Failed to parse date '{date_str}' for {bin_type}: {e}"
-                            )
-                            continue
+                        # Split multiple dates if comma-separated
+                        date_strings = [date.strip() for date in date_text.split(",")]
+
+                        for date_str in date_strings:
+                            try:
+                                # Extract day number from date string (e.g. "2" from "Tuesday 27th May")
+                                day_number = int("".join(filter(str.isdigit, date_str)))
+                                # Replace ordinal in date string with plain number
+                                date_str = date_str.replace(
+                                    get_date_with_ordinal(day_number), str(day_number)
+                                )
+
+                                # Parse date with full format
+                                bin_date = datetime.strptime(date_str, "%A %d %B")
+
+                                # Add current year since it's not in the date string
+                                current_year = datetime.now().year
+                                bin_date = bin_date.replace(year=current_year)
+
+                                # If the date is in the past, it's probably for next year
+                                if bin_date < datetime.now():
+                                    bin_date = bin_date.replace(year=current_year + 1)
+
+                                collections.append((bin_type, bin_date))
+                                print(
+                                    f"Successfully parsed date for {bin_type}: {bin_date}"
+                                )
+
+                            except ValueError as e:
+                                print(
+                                    f"Failed to parse date '{date_str}' for {bin_type}: {e}"
+                                )
+                                continue
+
+                        # Found and processed the collection dates, so break the loop
+                        break
 
             except Exception as e:
                 print(f"Error processing bin row: {e}")

uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py

@@ -130,4 +130,22 @@ class CouncilClass(AbstractGetBinDataClass):
             key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
         )
 
+        data["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
+        )
+
+        # Deduplicate the bins based on type and collection date
+        # Feels a bit hacky, but fixes
+        # https://github.com/robbrad/UKBinCollectionData/issues/1436
+        unique_bins = []
+        seen = set()
+        for bin_item in data["bins"]:
+            # Create a unique identifier for each bin entry
+            bin_key = (bin_item["type"], bin_item["collectionDate"])
+            if bin_key not in seen:
+                seen.add(bin_key)
+                unique_bins.append(bin_item)
+
+        data["bins"] = unique_bins
+
         return data

uk_bin_collection/uk_bin_collection/councils/EastleighBoroughCouncil.py

@@ -77,8 +77,13 @@ class CouncilClass(AbstractGetBinDataClass):
             return data
 
         except Exception as e:
-            print(f"Error fetching/parsing data: {str(e)}")
-            return {"bins": [{"type": "Error", "collectionDate": "2024-01-01"}]}
+            import traceback
+
+            error_message = f"Error fetching/parsing data for Eastleigh: {str(e)}\n{traceback.format_exc()}"
+            print(error_message)
+            # Use the correct date format for the error fallback
+            today = datetime.now().strftime("%d/%m/%Y")
+            return {"bins": [{"type": "Error", "collectionDate": today}]}
         finally:
             if "driver" in locals():
                 driver.quit()

uk_bin_collection/uk_bin_collection/councils/NorthHertfordshireDistrictCouncil.py

@@ -1,93 +1,287 @@
-import requests
+# direct URL works, but includes a token, so I'm using Selenium
+# https://waste.nc.north-herts.gov.uk/w/webpage/find-bin-collection-day-show-details?webpage_token=c7c7c3cbc2f0478735fc746ca985b8f4221dea31c24dde99e39fb1c556b07788&auth=YTc5YTAwZmUyMGQ3&id=1421457
+
+import re
+import time
+from datetime import datetime
+
 from bs4 import BeautifulSoup
+from dateutil.parser import parse
+from selenium.common.exceptions import NoSuchElementException, TimeoutException
+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 *
 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")
+            postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            url = "https://waste.nc.north-herts.gov.uk/w/webpage/find-bin-collection-day-input-address"
+
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            driver.get(url)
+
+            WebDriverWait(driver, 10).until(
+                lambda d: d.execute_script("return document.readyState") == "complete"
+            )
+
+            # Define the wait variable
+            wait = WebDriverWait(
+                driver, 20
+            )  # Create the wait object with a 20-second timeout
+
+            # Enter postcode - try different approaches for reliability
+            # print("Looking for postcode input...")
+
+            postcode_input = wait.until(
+                EC.element_to_be_clickable(
+                    (
+                        By.CSS_SELECTOR,
+                        "input.relation_path_type_ahead_search.form-control",
+                    )
+                ),
+                message="Postcode input not found by class",
+            )
+            postcode_input.clear()
+            postcode_input.send_keys(postcode)
+            # print(f"Entered postcode: {postcode}")
+
+            # Wait for the dropdown to load
+            # print("Waiting for address list to populate...")
+            try:
+                # Wait for the results to appear
+                wait.until(
+                    EC.presence_of_element_located(
+                        (By.CSS_SELECTOR, ".relation_path_type_ahead_results_holder")
+                    ),
+                    message="Address results container not found",
+                )
+
+                # Wait for list items to appear
+                wait.until(
+                    EC.presence_of_all_elements_located(
+                        (By.CSS_SELECTOR, ".relation_path_type_ahead_results_holder li")
+                    ),
+                    message="No address items found in the list",
+                )
+                # print("Address list populated successfully")
+
+                # Search for user_paon in the address list using aria-label attribute
+                try:
+                    # Use XPath to look for aria-label containing user_paon
+                    address_xpath = (
+                        f"//li[@aria-label and contains(@aria-label, '{user_paon}')]"
+                    )
+                    matching_address = wait.until(
+                        EC.element_to_be_clickable((By.XPATH, address_xpath)),
+                        message=f"No address containing '{user_paon}' found in aria-label attributes",
+                    )
+                    # print(f"Found matching address: {matching_address.get_attribute('aria-label')}")
+                    matching_address.click()
+                    # print("Clicked on matching address")
+
+                    # Allow time for the selection to take effect
+                    time.sleep(2)
+
+                    # Find and click the "Select address and continue" button
+                    continue_button = wait.until(
+                        EC.element_to_be_clickable(
+                            (
+                                By.CSS_SELECTOR,
+                                "input.btn.bg-green[value='Select address and continue']",
+                            )
+                        ),
+                        message="Could not find 'Select address and continue' button",
+                    )
+                    # print("Found 'Select address and continue' button, clicking it...")
+                    continue_button.click()
+                    # print("Clicked on 'Select address and continue' button")
+
+                    # Allow time for the page to load after clicking the button
+                    time.sleep(3)
+                except TimeoutException as e:
+                    # print(f"Error finding address: {e}")
+                    raise
+            except TimeoutException as e:
+                # print(f"Error loading address list: {e}")
+                raise
+
+            # After pressing Next button and waiting for page to load
+            # print("Looking for schedule list...")
+
+            # Wait for the page to load - giving it extra time
+            time.sleep(5)
+
+            # Use only the selector that we know works
+            # print("Looking for bin type elements...")
+            try:
+                bin_type_selector = (
+                    By.CSS_SELECTOR,
+                    "div.formatting_bold.formatting_size_bigger.formatting span.value-as-text",
+                )
+                WebDriverWait(driver, 15).until(
+                    EC.presence_of_element_located(bin_type_selector)
+                )
+                # print(f"Found bin type elements with selector: {bin_type_selector}")
+            except TimeoutException:
+                # print("Could not find bin type elements. Taking screenshot for debugging...")
+                screenshot_path = f"bin_type_error_{int(time.time())}.png"
+                driver.save_screenshot(screenshot_path)
+                # print(f"Screenshot saved to {screenshot_path}")
+
+            # Create BS4 object from driver's page source
+            # print("Parsing page with BeautifulSoup...")
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+
+            # Initialize data dictionary
+            data = {"bins": []}
+
+            # Looking for bin types in the exact HTML structure
+            bin_type_elements = soup.select(
+                "div.formatting_bold.formatting_size_bigger.formatting span.value-as-text"
+            )
+            # print(f"Found {len(bin_type_elements)} bin type elements")
+
+            # Look specifically for date elements with the exact structure
+            date_elements = soup.select("div.col-sm-12.font-xs-3xl span.value-as-text")
+            hidden_dates = soup.select(
+                "div.col-sm-12.font-xs-3xl input[type='hidden'][value*='/']"
+            )
+
+            # print(f"Found {len(bin_type_elements)} bin types and {len(date_elements)} date elements")
+
+            # We need a smarter way to match bin types with their dates
+            bin_count = 0
+
+            # Map of bin types to their collection dates
+            bin_date_map = {}
+
+            # Extract all date strings that look like actual dates
+            date_texts = []
+            date_pattern = re.compile(
+                r"(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)\s+\d+(?:st|nd|rd|th)?\s+\w+\s+\d{4}",
+                re.IGNORECASE,
+            )
 
-        user_postcode = kwargs.get("postcode")
-        user_paon = kwargs.get("paon")
-        check_postcode(user_postcode)
-        check_paon(user_paon)
-        bindata = {"bins": []}
+            for element in date_elements:
+                text = element.get_text(strip=True)
+                if date_pattern.search(text):
+                    date_texts.append(text)
+                    # print(f"Found valid date text: {text}")
 
-        URI = "https://uhtn-wrp.whitespacews.com/"
+            # Find hidden date inputs with values in DD/MM/YYYY format
+            hidden_date_values = []
+            for hidden in hidden_dates:
+                value = hidden.get("value", "")
+                if re.match(r"\d{1,2}/\d{1,2}/\d{4}", value):
+                    hidden_date_values.append(value)
+                    # print(f"Found hidden date value: {value}")
 
-        session = requests.Session()
+            # When filtering date elements
+            date_elements = soup.select("div.col-sm-12.font-xs-3xl span.value-as-text")
+            valid_date_elements = []
 
-        # get link from first page as has some kind of unique hash
-        r = session.get(
-            URI,
-        )
-        r.raise_for_status()
-        soup = BeautifulSoup(r.text, features="html.parser")
+            for element in date_elements:
+                text = element.get_text(strip=True)
+                if contains_date(text):
+                    valid_date_elements.append(element)
+                    # print(f"Found valid date element: {text}")
+                else:
+                    pass
+                    # print(f"Skipping non-date element: {text}")
 
-        alink = soup.find("a", text="Find my bin collection day")
+            # print(f"Found {len(bin_type_elements)} bin types and {len(valid_date_elements)} valid date elements")
 
-        if alink is None:
-            raise Exception("Initial page did not load correctly")
+            # When processing each bin type
+            for i, bin_type_elem in enumerate(bin_type_elements):
+                bin_type = bin_type_elem.get_text(strip=True)
 
-        # greplace 'seq' query string to skip next step
-        nextpageurl = alink["href"].replace("seq=1", "seq=2")
+                # Try to find a date for this bin type
+                date_text = None
 
-        data = {
-            "address_name_number": user_paon,
-            "address_postcode": user_postcode,
-        }
+                # Look for a valid date element
+                if i < len(valid_date_elements):
+                    date_elem = valid_date_elements[i]
+                    date_text = date_elem.get_text(strip=True)
 
-        # get list of addresses
-        r = session.post(nextpageurl, data)
-        r.raise_for_status()
+                # If we don't have a valid date yet, try using the hidden input
+                if not date_text or not contains_date(date_text):
+                    if i < len(hidden_dates):
+                        date_value = hidden_dates[i].get("value")
+                        if contains_date(date_value):
+                            date_text = date_value
 
-        soup = BeautifulSoup(r.text, features="html.parser")
+                # Skip if we don't have a valid date
+                if not date_text or not contains_date(date_text):
+                    # print(f"No valid date found for bin type: {bin_type}")
+                    continue
 
-        # get first address (if you don't enter enough argument values this won't find the right address)
-        alink = soup.find("div", id="property_list").find("a")
+                # print(f"Found bin type: {bin_type} with date: {date_text}")
 
-        if alink is None:
-            raise Exception("Address not found")
+                try:
+                    # Clean up the date text
+                    date_text = remove_ordinal_indicator_from_date_string(date_text)
 
-        nextpageurl = URI + alink["href"]
+                    # Try to parse the date
+                    try:
+                        collection_date = datetime.strptime(
+                            date_text, "%A %d %B %Y"
+                        ).date()
+                    except ValueError:
+                        try:
+                            collection_date = datetime.strptime(
+                                date_text, "%d/%m/%Y"
+                            ).date()
+                        except ValueError:
+                            # Last resort
+                            collection_date = parse(date_text).date()
 
-        # get collection page
-        r = session.get(
-            nextpageurl,
-        )
-        r.raise_for_status()
-        soup = BeautifulSoup(r.text, features="html.parser")
+                    # Create bin entry
+                    bin_entry = {
+                        "type": bin_type,
+                        "collectionDate": collection_date.strftime(date_format),
+                    }
 
-        if soup.find("span", id="waste-hint"):
-            raise Exception("No scheduled services at this address")
+                    # Add to data
+                    data["bins"].append(bin_entry)
+                    bin_count += 1
+                    # print(f"Added bin entry: {bin_entry}")
 
-        u1s = soup.find("section", id="scheduled-collections").find_all("u1")
+                except Exception as e:
+                    pass
+                    # print(f"Error parsing date '{date_text}': {str(e)}")
 
-        for u1 in u1s:
-            lis = u1.find_all("li", recursive=False)
+            # print(f"Successfully parsed {bin_count} bin collections")
 
-            date = lis[1].text.replace("\n", "")
-            bin_type = lis[2].text.replace("\n", "")
+            if not data["bins"]:
+                # print("No bin data found. Saving page for debugging...")
+                with open(f"debug_page_{int(time.time())}.html", "w") as f:
+                    f.write(driver.page_source)
+                driver.save_screenshot(f"final_error_screenshot_{int(time.time())}.png")
+                raise ValueError(
+                    "No bin collection data could be extracted from the page"
+                )
 
-            dict_data = {
-                "type": bin_type,
-                "collectionDate": datetime.strptime(
-                    date,
-                    "%d/%m/%Y",
-                ).strftime(date_format),
-            }
-            bindata["bins"].append(dict_data)
+            # Sort the bin collections by date
+            data["bins"].sort(
+                key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
+            )
 
-        bindata["bins"].sort(
-            key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
-        )
+            return data
 
-        return bindata
+        except Exception as e:
+            # print(f"Error parsing bin collection data: {e}")
+            raise

uk_bin_collection/uk_bin_collection/councils/SouthRibbleCouncil.py

@@ -1,29 +1,11 @@
-from typing import Dict, List, Any, Optional
-from bs4 import BeautifulSoup
-from dateutil.relativedelta import relativedelta
 import requests
-import logging
-import re
-from datetime import datetime
-from uk_bin_collection.uk_bin_collection.common import *
-from dateutil.parser import parse
+from bs4 import BeautifulSoup
 
-from uk_bin_collection.uk_bin_collection.common import check_uprn, check_postcode
+from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
 
-def get_token(page) -> str:
-    """
-    Get a __token to include in the form data
-        :param page: Page html
-        :return: Form __token
-    """
-    soup = BeautifulSoup(page.text, features="html.parser")
-    soup.prettify()
-    token = soup.find("input", {"name": "__token"}).get("value")
-    return token
-
-
+# import the wonderful Beautiful Soup and the URL grabber
 class CouncilClass(AbstractGetBinDataClass):
     """
     Concrete classes have to implement all abstract operations of the
@@ -31,69 +13,38 @@ class CouncilClass(AbstractGetBinDataClass):
     implementation.
     """
 
-    def get_data(self, url: str) -> str:
-        """This method makes the request to the council
-
-        Keyword arguments:
-        url -- the url to get the data from
-        """
-        # Set a user agent so we look like a browser ;-)
-        user_agent = (
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-            "Chrome/108.0.0.0 Safari/537.36"
-        )
-        headers = {"User-Agent": user_agent}
-        requests.packages.urllib3.disable_warnings()
+    def parse_data(self, page: str, **kwargs) -> dict:
 
-        # Make the Request - change the URL - find out your property number
-        try:
-            session = requests.Session()
-            session.headers.update(headers)
-            full_page = session.get(url)
-            return full_page
-        except requests.exceptions.HTTPError as errh:
-            logging.error(f"Http Error: {errh}")
-            raise
-        except requests.exceptions.ConnectionError as errc:
-            logging.error(f"Error Connecting: {errc}")
-            raise
-        except requests.exceptions.Timeout as errt:
-            logging.error(f"Timeout Error: {errt}")
-            raise
-        except requests.exceptions.RequestException as err:
-            logging.error(f"Oops: Something Else {err}")
-            raise
+        user_uprn = kwargs.get("uprn")
+        user_postcode = kwargs.get("postcode")
+        check_uprn(user_uprn)
+        check_postcode(user_postcode)
+        bindata = {"bins": []}
 
-    def parse_data(self, page: str, **kwargs: Any) -> Dict[str, List[Dict[str, str]]]:
-        uprn: Optional[str] = kwargs.get("uprn")
-        postcode: Optional[str] = kwargs.get("postcode")
+        session_uri = "https://forms.chorleysouthribble.gov.uk/xfp/form/70"
+        URI = "https://forms.chorleysouthribble.gov.uk/xfp/form/70#qc576c657112a8277ba6f954ebc0490c946168363_0"
 
-        if uprn is None:
-            raise ValueError("UPRN is required and must be a non-empty string.")
-        if postcode is None:
-            raise ValueError("Postcode is required and must be a non-empty string.")
+        session = requests.Session()
+        token_response = session.get(session_uri)
+        soup = BeautifulSoup(token_response.text, "html.parser")
+        token = soup.find("input", {"name": "__token"}).attrs["value"]
 
-        check_uprn(uprn)
-        check_postcode(postcode)
-
-        values = {
-            "__token": get_token(page),
-            "page": "491",
+        form_data = {
+            "__token": token,
+            "page": "196",
             "locale": "en_GB",
-            "q1f8ccce1d1e2f58649b4069712be6879a839233f_0_0": postcode,
-            "q1f8ccce1d1e2f58649b4069712be6879a839233f_1_0": uprn,
+            "qc576c657112a8277ba6f954ebc0490c946168363_0_0": user_postcode,
+            "qc576c657112a8277ba6f954ebc0490c946168363_1_0": user_uprn,
             "next": "Next",
         }
-        headers = {"User-Agent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64)"}
-        requests.packages.urllib3.disable_warnings()
-        response = requests.request(
-            "POST",
-            "https://forms.chorleysouthribble.gov.uk/xfp/form/70",
-            headers=headers,
-            data=values,
-        )
 
-        soup = BeautifulSoup(response.text, features="html.parser")
+        collection_response = session.post(URI, data=form_data)
+
+        #collection_soup = BeautifulSoup(collection_response.text, "html.parser")
+        
+
+        soup = BeautifulSoup(collection_response.text, "html.parser")
+        #print(soup)
 
         rows = soup.find("table").find_all("tr")
 
@@ -103,31 +54,23 @@ class CouncilClass(AbstractGetBinDataClass):
         # Loops the Rows
         for row in rows:
             cells = row.find_all("td")
+            
             if cells:
                 bin_type = cells[0].get_text(strip=True)
                 collection_next = cells[1].get_text(strip=True)
 
-                collection_date = re.findall(r"\(.*?\)", collection_next)
-
-                if len(collection_date) != 1:
-                    continue
-
-                collection_date_obj = parse(
-                    re.sub(r"[()]", "", collection_date[0])
-                ).date()
-
-                # since we only have the next collection day, if the parsed date is in the past,
-                # assume the day is instead next month
-                if collection_date_obj < datetime.now().date():
-                    collection_date_obj += relativedelta(months=1)
-
-                # Make each Bin element in the JSON
-                dict_data = {
-                    "type": bin_type,
-                    "collectionDate": collection_date_obj.strftime(date_format),
-                }
-
-                # Add data to the main JSON Wrapper
-                data["bins"].append(dict_data)
-
+                if len(collection_next) != 1:
+                    collection_date_obj = datetime.strptime(collection_next, "%d/%m/%y").date()
+                    # since we only have the next collection day, if the parsed date is in the past,
+                    # assume the day is instead next month
+                    if collection_date_obj < datetime.now().date():
+                        collection_date_obj += relativedelta(months=1)
+                    # Make each Bin element in the JSON
+                    dict_data = {
+                        "type": bin_type,
+                        "collectionDate": collection_date_obj.strftime("%d/%m/%Y"),
+                    }
+                    # Add data to the main JSON Wrapper
+                    data["bins"].append(dict_data)
+                    continue      
         return data

{uk_bin_collection-0.152.2.dist-info → uk_bin_collection-0.152.4.dist-info}/METADATA

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

{uk_bin_collection-0.152.2.dist-info → uk_bin_collection-0.152.4.dist-info}/RECORD

@@ -7,7 +7,7 @@ uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-c
 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/generate_map_test_results.py,sha256=CKnGK2ZgiSXomRGkomX90DitgMP-X7wkHhyKORDcL2E,1144
-uk_bin_collection/tests/input.json,sha256=f8Jq_9vzVy3LFAZJ1nRZSwmJ34lOhqG53ee0_LJu5HI,132470
+uk_bin_collection/tests/input.json,sha256=hy8tlgmuKQWiq3PxNE16kaYHk6XxesuFkBvtpk-9oIw,132590
 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
@@ -19,7 +19,7 @@ uk_bin_collection/uk_bin_collection/collect_data.py,sha256=dB7wWXsJX4fm5bIf84lex
 uk_bin_collection/uk_bin_collection/common.py,sha256=izotgwavB08pUWisNL3wqcBrE9E1-bdrq-v6YKyriDE,11034
 uk_bin_collection/uk_bin_collection/councils/AberdeenCityCouncil.py,sha256=Je8VwVLK9KnYl9vqf2gWJ7ZYDgUq3A7caDiIzk5Xof8,4194
 uk_bin_collection/uk_bin_collection/councils/AberdeenshireCouncil.py,sha256=aO1CSdyqa8oAD0fB79y1Q9bikAWCP_JFa7CsyTa2j9s,1655
-uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py,sha256=mLbfq8a2jilFfnNs0ujj49V8to2bNERgJp_4Ugbro-g,3418
+uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py,sha256=N0BcdTxRlCiCh6SPluPK3wMlNDli8_wJgUOOwe4hgSE,4250
 uk_bin_collection/uk_bin_collection/councils/AmberValleyBoroughCouncil.py,sha256=mTeluIIEcuxLxhfDQ95A1fp8RM6AkJT5tRGZPUbYGdk,1853
 uk_bin_collection/uk_bin_collection/councils/AngusCouncil.py,sha256=YlhAnxkRAAvrwbUvleNKUuLROcwMTps2eMHElpuctm4,5894
 uk_bin_collection/uk_bin_collection/councils/AntrimAndNewtonabbeyCouncil.py,sha256=Hp5pteaC5RjL5ZqPZ564S9WQ6ZTKLMO6Dl_fxip2TUc,1653
@@ -50,7 +50,7 @@ uk_bin_collection/uk_bin_collection/councils/BolsoverCouncil.py,sha256=_NZuSvSbl
 uk_bin_collection/uk_bin_collection/councils/BoltonCouncil.py,sha256=WI68r8jB0IHPUT4CgmZMtng899AAMFTxkyTdPg9yLF8,4117
 uk_bin_collection/uk_bin_collection/councils/BostonBoroughCouncil.py,sha256=8xv6FMNj8Qgwn5K0nMdB5X8hkcNFzhcJ48DMordflJY,5631
 uk_bin_collection/uk_bin_collection/councils/BracknellForestCouncil.py,sha256=Llo1rULaAZ8rChVYZqXFFLo7CN6vbT0ULUJD6ActouY,9015
-uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py,sha256=BEWS2c62cOsf26jqn1AkNUvVmc5AlUADYLaQuPn9RY4,5456
+uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py,sha256=qtCGHIwKDJQw0SNvQr0EZub21PFPDsdcxABOPv_MC6s,6114
 uk_bin_collection/uk_bin_collection/councils/BraintreeDistrictCouncil.py,sha256=2vYHilpI8mSwC2Ykdr1gxYAN3excDWqF6AwtGbkwbTw,2441
 uk_bin_collection/uk_bin_collection/councils/BrecklandCouncil.py,sha256=PX6A_pDvaN109aSNWmEhm88GFKfkClIkmbwGURWvsks,1744
 uk_bin_collection/uk_bin_collection/councils/BrentCouncil.py,sha256=BsP7V0vezteX0WAxcxqMf3g6ro-J78W6hubefALRMyg,5222
@@ -114,7 +114,7 @@ uk_bin_collection/uk_bin_collection/councils/EastRidingCouncil.py,sha256=oL-Nqri
 uk_bin_collection/uk_bin_collection/councils/EastStaffordshireBoroughCouncil.py,sha256=s13zlAN9Rac-RVHNFLIjIY0X8C6sPTNS37EL2t6vXw8,3692
 uk_bin_collection/uk_bin_collection/councils/EastSuffolkCouncil.py,sha256=qQ0oOfGd0sWcczse_B22YoeL9uj3og8v3UJLt_Sx29c,4353
 uk_bin_collection/uk_bin_collection/councils/EastbourneBoroughCouncil.py,sha256=t2-Ri58feN4BHZ-yZx83QjmWuxlCkF7iu9UvXJ2rVp8,2669
-uk_bin_collection/uk_bin_collection/councils/EastleighBoroughCouncil.py,sha256=45oT8K8OoTx47FVHYqSl5sw8b-NQj8PJ11ugZTgf4Bg,3171
+uk_bin_collection/uk_bin_collection/councils/EastleighBoroughCouncil.py,sha256=ymHYdRVlTNNYIhZigvnwsEZUpJIecjxV0HrZm7lEdpY,3397
 uk_bin_collection/uk_bin_collection/councils/EdinburghCityCouncil.py,sha256=YRjNgevnCxfaAIU8BV9dkqG17NiT6S-hp7l-1rdLVgQ,3150
 uk_bin_collection/uk_bin_collection/councils/ElmbridgeBoroughCouncil.py,sha256=TgBOaReHWBbm0avV7HqRf0x7cxDe9cacTUcP9TFFprs,3005
 uk_bin_collection/uk_bin_collection/councils/EnfieldCouncil.py,sha256=2yR5p-kdApOm1gHiynNECP0jQDvaYHOiT6MAQJAvunE,6144
@@ -213,7 +213,7 @@ uk_bin_collection/uk_bin_collection/councils/NorthAyrshireCouncil.py,sha256=o8zv
 uk_bin_collection/uk_bin_collection/councils/NorthDevonCountyCouncil.py,sha256=tgJKIvu7nnCAHu_HImfG5SQABD6ygKFqrZU-ZoC6ObY,6260
 uk_bin_collection/uk_bin_collection/councils/NorthEastDerbyshireDistrictCouncil.py,sha256=BfNpYcjG3z0Yz8OYN6NkfzvZ5k1FI-80D-rv211kPPU,5449
 uk_bin_collection/uk_bin_collection/councils/NorthEastLincs.py,sha256=fYf438VZIaOaqPSwdTTWVjFTdrI0jGfFsxVzOc-QdkA,1817
-uk_bin_collection/uk_bin_collection/councils/NorthHertfordshireDistrictCouncil.py,sha256=dFgvZqVKEVEP0zSPeh2s9xIWSCGbhYHpXn2U6Nk0HXM,2847
+uk_bin_collection/uk_bin_collection/councils/NorthHertfordshireDistrictCouncil.py,sha256=Zps52bZroibL1h0h7WKD1aKJzQD7-OLwd9tHXDQkDFg,12263
 uk_bin_collection/uk_bin_collection/councils/NorthKestevenDistrictCouncil.py,sha256=vYOCerJXr9LTP6F2wm4vpYNYbQaWNZ6yfHEQ33N_hTw,1681
 uk_bin_collection/uk_bin_collection/councils/NorthLanarkshireCouncil.py,sha256=npK1V8D3SLNTSSKkfEpEPvVgXDFyhH_tAsuGogsVKQY,1763
 uk_bin_collection/uk_bin_collection/councils/NorthLincolnshireCouncil.py,sha256=MPzrfdo9YQFVlqBUOM-jDQkacz2DXnygLILQ_ojZeJo,2543
@@ -271,7 +271,7 @@ uk_bin_collection/uk_bin_collection/councils/SouthKestevenDistrictCouncil.py,sha
 uk_bin_collection/uk_bin_collection/councils/SouthLanarkshireCouncil.py,sha256=fj-eZI0yrvQVCv8GvhcovZ3b9bV6Xv_ws3IunWjnv4U,3126
 uk_bin_collection/uk_bin_collection/councils/SouthNorfolkCouncil.py,sha256=C2qIZjjbl9JnuukX9OH2RbfP0hSdp3uX76APGY33qKs,4622
 uk_bin_collection/uk_bin_collection/councils/SouthOxfordshireCouncil.py,sha256=f9d2YDGv5hnN7Ul-u_I63h_BbpBU7CJFdgv-lOviRGc,4031
-uk_bin_collection/uk_bin_collection/councils/SouthRibbleCouncil.py,sha256=QujJYORfiQmfBBUPt3Vnb0ryJy1XUiJtli-jLlUt5fs,4695
+uk_bin_collection/uk_bin_collection/councils/SouthRibbleCouncil.py,sha256=5HSTmrPc-gN3ZzLq6n2VDs_NhtCgXhnGqJkEejDmSHI,2900
 uk_bin_collection/uk_bin_collection/councils/SouthStaffordshireDistrictCouncil.py,sha256=ACQMHWyamnj1ag3gNF-8Jhp-DKUok1GhFdnzH4nCzwU,3201
 uk_bin_collection/uk_bin_collection/councils/SouthTynesideCouncil.py,sha256=dxXGrJfg_fn2IPTBgq6Duwy0WY8GYLafMuisaCjOnbs,3426
 uk_bin_collection/uk_bin_collection/councils/SouthamptonCityCouncil.py,sha256=exNoI-Vun_C5FowCYhZ_600MBUe_OPR7MdGZEMNLL0I,1542
@@ -346,8 +346,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=QD4v4xpsEE0QheR_fGaNOIRMc2FatcUfKkkhAhseyVU,1159
 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.152.2.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.152.2.dist-info/METADATA,sha256=TkzzP87OZ_9Mqtlf7CjxJSstnyQJveMZzCV_yXX7zHM,26688
-uk_bin_collection-0.152.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.152.2.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.152.2.dist-info/RECORD,,
+uk_bin_collection-0.152.4.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.152.4.dist-info/METADATA,sha256=wK9bVaoTAyW9e1hieARhWnIUnlDdpL6b_h0VNvGP4zw,26688
+uk_bin_collection-0.152.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.152.4.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.152.4.dist-info/RECORD,,