uk_bin_collection 0.115.0__py3-none-any.whl → 0.117.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -32,6 +32,13 @@
         "wiki_name": "Ards and North Down Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
+    "ArgyllandButeCouncil": {
+        "uprn": "125061759",
+        "skip_get_url": true,
+        "url": "https://www.argyll-bute.gov.uk",
+        "wiki_name": "Argyll and Bute Council",
+        "wiki_note": "Pass the UPRN. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
+    },
     "ArmaghBanbridgeCraigavonCouncil": {
         "url": "https://www.armaghbanbridgecraigavon.gov.uk/",
         "wiki_command_url_override": "https://www.armaghbanbridgecraigavon.gov.uk/",
@@ -48,13 +55,13 @@
         "wiki_name": "Arun Council",
         "wiki_note": "Pass the house name/number and postcode in their respective parameters, both wrapped in double quotes. This parser requires a Selenium webdriver."
     },
-    "AshfordBoroughCouncil": {
-        "url": "https://ashford.gov.uk",
-        "wiki_command_url_override": "https://ashford.gov.uk",
-        "postcode": "TN23 7SP",
-        "uprn": "100060777899",
-        "wiki_name": "Ashford Borough Council",
-        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    "AshfieldDistrictCouncil": {
+        "url": "https://www.ashfield.gov.uk",
+        "postcode": "NG16 6RH",
+        "house_number": "1",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "Ashfield District Council",
+        "wiki_note": "Pass the house name/number and postcode in their respective parameters, both wrapped in double quotes. This parser requires a Selenium webdriver"
     },
     "AshfordBoroughCouncil": {
         "url": "https://ashford.gov.uk",
@@ -71,6 +78,13 @@
         "wiki_name": "Aylesbury Vale Council (Buckinghamshire)",
         "wiki_note": "To get the UPRN, please use [FindMyAddress](https://www.findmyaddress.co.uk/search). Returns all published collections in the past, present, future."
     },
+    "BaberghDistrictCouncil": {
+        "skip_get_url": true,
+        "house_number": "Monday",
+        "url": "https://www.babergh.gov.uk",
+        "wiki_name": "Babergh District Council",
+        "wiki_note": "Use the House Number field to pass the DAY of the week for your collections. Monday/Tuesday/Wednesday/Thursday/Friday"
+    },
     "BCPCouncil": {
         "skip_get_url": true,
         "uprn": "100040810214",
@@ -335,26 +349,19 @@
         "wiki_note": "Both the UPRN and a one-line address are passed in the URL, which needs to be wrapped in double quotes. The one-line address is made up of the house number, street name, and postcode. Use the form [here](https://online.cheshireeast.gov.uk/mycollectionday/) to find them, then take the first line and postcode and replace all spaces with `%20`."
     },
     "CheshireWestAndChesterCouncil": {
-        "house_number": "Hill View House",
-        "postcode": "CH3 9ER",
+        "uprn": "100012346655",
         "skip_get_url": true,
-        "url": "https://www.cheshirewestandchester.gov.uk/residents/waste-and-recycling/your-bin-collection/collection-day",
+        "url": "https://my.cheshirewestandchester.gov.uk",
         "wiki_name": "Cheshire West and Chester Council",
-        "wiki_note": "Pass the house name/number and postcode in their respective parameters."
+        "wiki_note": "Pass the UPRN. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "ChesterfieldBoroughCouncil": {
         "uprn": "74008234",
         "skip_get_url": true,
-        "url": "https://www.cheshirewestandchester.gov.uk/residents/waste-and-recycling/your-bin-collection/collection-day",
+        "url": "https://www.chesterfield.gov.uk",
         "wiki_name": "Chesterfield Borough Council",
         "wiki_note": "Pass the UPRN. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
-    "ChesterfieldBoroughCouncil": {
-        "uprn": "74008234",
-        "skip_get_url": true,
-        "url": "https://www.cheshirewestandchester.gov.uk/residents/waste-and-recycling/your-bin-collection/collection-day",
-        "wiki_name": "Chesterfield Borough Council"
-    },
     "ChichesterDistrictCouncil": {
         "house_number": "7, Plaistow Road, Kirdford, Billingshurst, West Sussex",
         "postcode": "RH14 0JT",
@@ -449,6 +456,12 @@
         "wiki_name": "Dartford Borough Council",
         "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
+    "DerbyCityCouncil": {
+        "url": "https://www.derby.gov.uk",
+        "uprn": "10010684240",
+        "wiki_name": "Derby City Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "DerbyshireDalesDistrictCouncil": {
         "postcode": "DE4 3AS",
         "skip_get_url": true,
@@ -702,6 +715,13 @@
         "wiki_name": "Gloucester City Council",
         "wiki_note": "Pass the house number, postcode, and UPRN in their respective parameters. This parser requires a Selenium webdriver."
     },
+    "GraveshamBoroughCouncil": {
+        "uprn": "100060927046",
+        "skip_get_url": true,
+        "url": "https://www.gravesham.gov.uk",
+        "wiki_name": "Gravesham Borough Council",
+        "wiki_note": "Pass the UPRN. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
+    },
     "GuildfordCouncil": {
         "house_number": "THE LODGE, PUTTENHAM HILL HOUSE, PUTTENHAM HILL, PUTTENHAM, GUILDFORD, GU3 1AH",
         "postcode": "GU3 1AH",
@@ -982,6 +1002,13 @@
         "wiki_name": "Midlothian Council",
         "wiki_note": "Pass the house name/number wrapped in double quotes along with the postcode parameter."
     },
+    "MidSuffolkDistrictCouncil": {
+        "skip_get_url": true,
+        "house_number": "Monday",
+        "url": "https://www.midsuffolk.gov.uk",
+        "wiki_name": "Mid Suffolk District Council",
+        "wiki_note": "Use the House Number field to pass the DAY of the week for your collections. Monday/Tuesday/Wednesday/Thursday/Friday"
+    },
     "MidSussexDistrictCouncil": {
         "house_number": "OAKLANDS, OAKLANDS ROAD RH16 1SS",
         "postcode": "RH16 1SS",
@@ -992,10 +1019,10 @@
         "wiki_note": "Pass the name of the street with the house number parameter, wrapped in double quotes. This parser requires a Selenium webdriver."
     },
     "MiltonKeynesCityCouncil": {
-        "uprn": "Fullers Slade",
-        "url": "https://www.milton-keynes.gov.uk/waste-and-recycling/collection-days",
+        "uprn": "25109551",
+        "url": "https://mycouncil.milton-keynes.gov.uk/en/service/Waste_Collection_Round_Checker",
         "wiki_name": "Milton Keynes City Council",
-        "wiki_note": "Pass the name of the estate with the UPRN parameter, wrapped in double quotes."
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "MoleValleyDistrictCouncil": {
         "postcode": "RH4 1SJ",
@@ -1421,6 +1448,12 @@
         "wiki_name": "South Ribble Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
+    "SouthStaffordshireDistrictCouncil": {
+      "uprn": "200004523954",
+      "url": "https://www.sstaffs.gov.uk/where-i-live?uprn=200004523954",
+      "wiki_name": "South Staffordshire District Council",
+      "wiki_note": "The URL needs to be `https://www.sstaffs.gov.uk/where-i-live?uprn=<Your_UPRN>`. Replace `<Your_UPRN>` with your UPRN."
+    },
     "SouthTynesideCouncil": {
         "house_number": "1",
         "postcode": "NE33 3JW",

uk_bin_collection/uk_bin_collection/councils/ArgyllandButeCouncil.py

@@ -0,0 +1,67 @@
+import time
+
+import requests
+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
+
+
+# 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:
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        user_uprn = user_uprn.zfill(12)
+        bindata = {"bins": []}
+
+        URI = "https://www.argyll-bute.gov.uk/rubbish-and-recycling/household-waste/bin-collection"
+
+        data = {"addressSelect": user_uprn}
+
+        s = requests.session()
+        r = s.post(URI, data=data)
+        r.raise_for_status()
+
+        soup = BeautifulSoup(r.content, features="html.parser")
+        soup.prettify()
+
+        # Find the table and extract the rows with bin schedule information
+        table = soup.find("table", class_="table table-bordered")
+        rows = table.find_all("tr")[1:]  # Skip the header row
+
+        current_year = datetime.now().year
+        # Loop through each row and extract the bin type and collection date
+        for row in rows:
+            cells = row.find_all("td")
+            bin_type = cells[0].get_text(strip=True)
+            collection_date = cells[1].get_text(strip=True)
+
+            collection_date = datetime.strptime(
+                collection_date,
+                "%A %d %B",
+            )
+
+            if collection_date.month == 1:
+                collection_date = collection_date.replace(year=current_year + 1)
+            else:
+                collection_date = collection_date.replace(year=current_year)
+
+            dict_data = {
+                "type": bin_type,
+                "collectionDate": collection_date.strftime(date_format),
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/AshfieldDistrictCouncil.py

@@ -0,0 +1,105 @@
+import time
+from datetime import datetime
+
+from bs4 import BeautifulSoup
+from selenium import webdriver
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+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
+
+
+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:
+        # Get and check UPRN
+        user_postcode = kwargs.get("postcode")
+        user_paon = kwargs.get("paon")
+        check_paon(user_paon)
+        check_postcode(user_postcode)
+        web_driver = kwargs.get("web_driver")
+        headless = kwargs.get("headless")
+        bindata = {"bins": []}
+
+        API_URL = "https://portal.digital.ashfield.gov.uk/w/webpage/raise-case?service=bin_calendar"
+
+        # Create Selenium webdriver
+        driver = create_webdriver(web_driver, headless, None, __name__)
+        driver.get(API_URL)
+
+        title = WebDriverWait(driver, 10).until(
+            EC.presence_of_element_located((By.ID, "sub_page_title"))
+        )
+
+        # Wait for the postcode field to appear then populate it
+        WebDriverWait(driver, 10).until(
+            EC.presence_of_element_located(
+                (By.CSS_SELECTOR, "input.relation_path_type_ahead_search")
+            )
+        )
+
+        inputElement_postcode = WebDriverWait(driver, 10).until(
+            EC.presence_of_element_located(
+                (By.CSS_SELECTOR, "input.relation_path_type_ahead_search")
+            )
+        )
+        inputElement_postcode.clear()
+        inputElement_postcode.send_keys(user_postcode)
+
+        # Wait for the 'Select your property' dropdown to appear and select the first result
+        dropdown = WebDriverWait(driver, 10).until(
+            EC.element_to_be_clickable(
+                (
+                    By.CLASS_NAME,
+                    "result_list ",
+                )
+            )
+        )
+
+        address_element = (
+            WebDriverWait(driver, 10)
+            .until(
+                EC.element_to_be_clickable(
+                    (By.XPATH, f"//li[starts-with(@aria-label, '{user_paon}')]")
+                )
+            )
+            .click()
+        )
+
+        search_button = WebDriverWait(driver, 10).until(
+            EC.element_to_be_clickable(
+                (By.XPATH, "//input[@type='submit' and @value='Search']")
+            )
+        )
+        search_button.click()
+
+        time.sleep(10)
+
+        soup = BeautifulSoup(driver.page_source, features="html.parser")
+        soup.prettify()
+
+        # Find the table by class name
+        table = soup.find("table", {"class": "table listing table-striped"})
+
+        # Iterate over each row in the tbody of the table
+        for row in table.find("tbody").find_all("tr"):
+            # Extract the service, day, and date for each row
+            service = row.find_all("td")[0].get_text(strip=True)
+            date = row.find_all("td")[2].get_text(strip=True)
+
+            dict_data = {
+                "type": service,
+                "collectionDate": datetime.strptime(date, "%a, %d %b %Y").strftime(
+                    date_format
+                ),
+            }
+            bindata["bins"].append(dict_data)
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/BaberghDistrictCouncil.py

@@ -0,0 +1,132 @@
+import re
+import time
+
+import requests
+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:
+
+        collection_day = kwargs.get("paon")
+        bindata = {"bins": []}
+
+        days_of_week = [
+            "Monday",
+            "Tuesday",
+            "Wednesday",
+            "Thursday",
+            "Friday",
+            "Saturday",
+            "Sunday",
+        ]
+
+        refusestartDate = datetime(2024, 11, 4)
+        recyclingstartDate = datetime(2024, 11, 11)
+
+        offset_days = days_of_week.index(collection_day)
+
+        refuse_dates = get_dates_every_x_days(refusestartDate, 14, 28)
+        recycling_dates = get_dates_every_x_days(recyclingstartDate, 14, 28)
+
+        bank_holidays = [
+            ("25/12/2024", 2),
+            ("26/12/2024", 2),
+            ("27/12/2024", 3),
+            ("30/12/2024", 1),
+            ("31/12/2024", 2),
+            ("01/01/2025", 2),
+            ("02/01/2025", 2),
+            ("03/01/2025", 3),
+            ("06/01/2025", 1),
+            ("07/01/2025", 1),
+            ("08/01/2025", 1),
+            ("09/01/2025", 1),
+            ("10/01/2025", 1),
+            ("18/04/2025", 1),
+            ("21/04/2025", 1),
+            ("22/04/2025", 1),
+            ("23/04/2025", 1),
+            ("24/04/2025", 1),
+            ("25/04/2025", 1),
+            ("05/05/2025", 1),
+            ("06/05/2025", 1),
+            ("07/05/2025", 1),
+            ("08/05/2025", 1),
+            ("09/05/2025", 1),
+            ("26/05/2025", 1),
+            ("27/05/2025", 1),
+            ("28/05/2025", 1),
+            ("29/05/2025", 1),
+            ("30/05/2025", 1),
+            ("25/08/2025", 1),
+            ("26/08/2025", 1),
+            ("27/08/2025", 1),
+            ("28/08/2025", 1),
+            ("29/08/2025", 1),
+        ]
+
+        for refuseDate in refuse_dates:
+
+            collection_date = (
+                datetime.strptime(refuseDate, "%d/%m/%Y") + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            holiday_offset = next(
+                (value for date, value in bank_holidays if date == collection_date), 0
+            )
+
+            if holiday_offset > 0:
+                collection_date = (
+                    datetime.strptime(collection_date, "%d/%m/%Y")
+                    + timedelta(days=holiday_offset)
+                ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Refuse Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        for recyclingDate in recycling_dates:
+
+            collection_date = (
+                datetime.strptime(recyclingDate, "%d/%m/%Y")
+                + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            holiday_offset = next(
+                (value for date, value in bank_holidays if date == collection_date), 0
+            )
+
+            if holiday_offset > 0:
+                collection_date = (
+                    datetime.strptime(collection_date, "%d/%m/%Y")
+                    + timedelta(days=holiday_offset)
+                ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Recycling Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py

@@ -1,123 +1,105 @@
-import logging
 import time
 
-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
+import requests
 
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
-# Set up logging
-logging.basicConfig(
-    level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
-)
 
+# import the wonderful Beautiful Soup and the URL grabber
 class CouncilClass(AbstractGetBinDataClass):
-    def parse_data(self, page: str, **kwargs) -> dict:
-        driver = None
-        try:
-            data = {"bins": []}
-            collections = []
-            user_uprn = kwargs.get("uprn")
-            user_paon = kwargs.get("paon")
-            user_postcode = kwargs.get("postcode")
-            web_driver = kwargs.get("web_driver")
-            headless = kwargs.get("headless")
-            check_paon(user_paon)
-            check_postcode(user_postcode)
-
-            # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless, None, __name__)
-            if headless:
-                driver.set_window_size(1920, 1080)
-
-            driver.get(
-                "https://www.cheshirewestandchester.gov.uk/residents/waste-and-recycling/your-bin-collection/collection-day"
-            )
-            wait = WebDriverWait(driver, 60)
-
-            def click_element(by, value):
-                element = wait.until(EC.element_to_be_clickable((by, value)))
-                driver.execute_script("arguments[0].scrollIntoView();", element)
-                element.click()
-
-            logging.info("Accepting cookies")
-            click_element(By.ID, "ccc-close")
-
-            logging.info("Finding collection day")
-            click_element(By.LINK_TEXT, "Find your collection day")
-
-            logging.info("Switching to iframe")
-            iframe_presence = wait.until(
-                EC.presence_of_element_located((By.ID, "fillform-frame-1"))
-            )
-            driver.switch_to.frame(iframe_presence)
-
-            logging.info("Entering postcode")
-            input_element_postcode = wait.until(
-                EC.presence_of_element_located(
-                    (By.XPATH, '//input[@id="postcode_search"]')
-                )
-            )
-            input_element_postcode.send_keys(user_postcode)
-
-            pcsearch_btn = wait.until(
-                EC.element_to_be_clickable((By.XPATH, "//input[@id='postcode_search']"))
-            )
-            click_element(By.XPATH, "//input[@id='postcode_search']")
-
-            logging.info("Selecting address")
-            dropdown = wait.until(EC.element_to_be_clickable((By.ID, "Choose_Address")))
-            dropdown_options = wait.until(
-                EC.presence_of_element_located((By.CLASS_NAME, "lookup-option"))
-            )
-            drop_down_values = Select(dropdown)
-            option_element = wait.until(
-                EC.presence_of_element_located(
-                    (By.CSS_SELECTOR, f'option.lookup-option[value="{str(user_uprn)}"]')
-                )
-            )
-            driver.execute_script("arguments[0].scrollIntoView();", option_element)
-            drop_down_values.select_by_value(str(user_uprn))
-
-            logging.info("Waiting for bin schedule")
-            wait.until(
-                EC.presence_of_element_located(
-                    (By.CLASS_NAME, "bin-schedule-content-bin-card")
-                )
-            )
-
-            logging.info("Extracting bin collection data")
-            soup = BeautifulSoup(driver.page_source, features="html.parser")
-            bin_cards = soup.find_all("div", {"class": "bin-schedule-content-bin-card"})
-            collections = []
-
-            for card in bin_cards:
-                bin_info = card.find("div", {"class": "bin-schedule-content-info"})
-                bin_name = bin_info.find_all("p")[0].text.strip() + " bin"
-                bin_date_str = bin_info.find_all("p")[1].text.split(":")[1].strip()
-                bin_date = datetime.strptime(bin_date_str, "%A, %B %d, %Y")
-                collections.append((bin_name, bin_date))
-
-            ordered_data = sorted(collections, key=lambda x: x[1])
-
-            for item in ordered_data:
-                dict_data = {
-                    "type": item[0].capitalize(),
-                    "collectionDate": item[1].strftime(date_format),
-                }
-                data["bins"].append(dict_data)
-
-            logging.info("Data extraction complete")
-            return data
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
 
-        except Exception as e:
-            logging.error(f"An error occurred: {e}")
-            raise
+    def parse_data(self, page: str, **kwargs) -> dict:
 
-        finally:
-            if driver:
-                driver.quit()
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        SESSION_URL = "https://my.cheshirewestandchester.gov.uk/authapi/isauthenticated?uri=https://my.cheshirewestandchester.gov.uk/fillform/?iframe_id=fillform-frame-1&db_id=&hostname=my.cheshirewestandchester.gov.uk&withCredentials=true"
+
+        API_URL = "https://my.cheshirewestandchester.gov.uk/apibroker/runLookup"
+
+        headers = {
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "User-Agent": "Mozilla/5.0",
+            "X-Requested-With": "XMLHttpRequest",
+            "Referer": "https://mycouncil.milton-keynes.gov.uk/fillform/?iframe_id=fillform-frame-1&db_id=",
+        }
+        s = requests.session()
+        r = s.get(SESSION_URL)
+        r.raise_for_status()
+        session_data = r.json()
+        sid = session_data["auth-session"]
+        params = {
+            "id": "609b918c7dd6d",
+            "repeat_against": "",
+            "noRetry": "false",
+            "getOnlyTokens": "undefined",
+            "log_id": "",
+            "app_name": "AchieveForms",
+            # unix_timestamp
+            "_": str(int(time.time() * 1000)),
+            "sid": sid,
+        }
+
+        r = s.post(API_URL, headers=headers, params=params)
+        r.raise_for_status()
+
+        data = r.json()
+        rows_data = data["integration"]["transformed"]["rows_data"]["0"]
+        AuthenticateResponse = rows_data["AuthenticateResponse"]
+
+        params = {
+            "id": "6101d23110243",
+            "repeat_against": "",
+            "noRetry": "false",
+            "getOnlyTokens": "undefined",
+            "log_id": "",
+            "app_name": "AchieveForms",
+            # unix_timestamp
+            "_": str(int(time.time() * 1000)),
+            "sid": sid,
+        }
+
+        data = {
+            "formValues": {
+                "Section 1": {
+                    "UPRN": {
+                        "value": user_uprn,
+                    },
+                    "AuthenticateResponse": {
+                        "value": AuthenticateResponse,
+                    },
+                }
+            },
+        }
+
+        r = s.post(API_URL, json=data, headers=headers, params=params)
+        r.raise_for_status()
+
+        data = r.json()
+        rows_data = data["integration"]["transformed"]["rows_data"]
+        if not isinstance(rows_data, dict):
+            raise ValueError("Invalid data returned from API")
+
+        # Extract each service's relevant details for the bin schedule
+        for item in rows_data.values():
+            dict_data = {
+                "type": item["serviceType"],
+                "collectionDate": datetime.strptime(
+                    item["collectionDateTime"], "%Y-%m-%dT%H:%M:%S"
+                ).strftime(date_format),
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/DerbyCityCouncil.py

@@ -0,0 +1,55 @@
+import requests
+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
+
+
+# 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:
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        URI = f"https://secure.derby.gov.uk/binday/Binday?search.PremisesId={user_uprn}"
+
+        # Make the GET request
+        session = requests.Session()
+        response = session.get(URI)
+
+        soup = BeautifulSoup(response.content, "html.parser")
+
+        # Find all divs with class "binresult" which contain the bin collection information
+        bin_results = soup.find_all("div", class_="binresult")
+
+        # Loop through each bin result to extract date and bin type
+        for result in bin_results:
+            # Find the collection date
+            date_text = result.find("p").strong.get_text(strip=True)
+
+            # Find the bin type by looking at the 'alt' attribute of the img tag
+            bin_type = result.find("img")["alt"]
+
+            if bin_type != "No bins":
+                dict_data = {
+                    "type": bin_type,
+                    "collectionDate": datetime.strptime(
+                        date_text,
+                        "%A, %d %B %Y:",
+                    ).strftime(date_format),
+                }
+                bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/GraveshamBoroughCouncil.py

@@ -0,0 +1,122 @@
+import time
+
+import requests
+from dateutil.relativedelta import relativedelta
+
+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:
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        SESSION_URL = "https://my.gravesham.gov.uk/authapi/isauthenticated?uri=https%253A%252F%252Fmy.gravesham.gov.uk%252Fen%252FAchieveForms%252F%253Fform_uri%253Dsandbox-publish%253A%252F%252FAF-Process-22218d5c-c6d6-492f-b627-c713771126be%252FAF-Stage-905e87c1-144b-4a72-8932-5518ddd3e618%252Fdefinition.json%2526redirectlink%253D%25252Fen%2526cancelRedirectLink%253D%25252Fen%2526consentMessage%253Dyes&hostname=my.gravesham.gov.uk&withCredentials=true"
+
+        API_URL = "https://my.gravesham.gov.uk/apibroker/runLookup"
+
+        headers = {
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "User-Agent": "Mozilla/5.0",
+            "X-Requested-With": "XMLHttpRequest",
+            "Referer": "https://my.gravesham.gov.uk/fillform/?iframe_id=fillform-frame-1&db_id=",
+        }
+        s = requests.session()
+        r = s.get(SESSION_URL)
+        r.raise_for_status()
+        session_data = r.json()
+        sid = session_data["auth-session"]
+        params = {
+            "id": "5ee8854759297",
+            "repeat_against": "",
+            "noRetry": "false",
+            "getOnlyTokens": "undefined",
+            "log_id": "",
+            "app_name": "AF-Renderer::Self",
+            # unix_timestamp
+            "_": str(int(time.time() * 1000)),
+            "sid": sid,
+        }
+        r = s.post(API_URL, headers=headers, params=params)
+        r.raise_for_status()
+
+        data = r.json()
+        rows_data = data["integration"]["transformed"]["rows_data"]["0"]
+        tokenString = rows_data["tokenString"]
+
+        # Get the current date and time
+        current_datetime = datetime.now()
+        future_datetime = current_datetime + relativedelta(months=1)
+
+        # Format it using strftime
+        current_datetime = current_datetime.strftime("%Y-%m-%dT%H:%M:%S")
+        future_datetime = future_datetime.strftime("%Y-%m-%dT%H:%M:%S")
+
+        data = {
+            "formValues": {
+                "Check your bin day": {
+                    "tokenString": {
+                        "value": tokenString,
+                    },
+                    "UPRNForAPI": {
+                        "value": user_uprn,
+                    },
+                    "formatDateToday": {
+                        "value": current_datetime,
+                    },
+                    "formatDateTo": {
+                        "value": future_datetime,
+                    },
+                }
+            },
+        }
+
+        params = {
+            "id": "5c8f869376376",
+            "repeat_against": "",
+            "noRetry": "false",
+            "getOnlyTokens": "undefined",
+            "log_id": "",
+            "app_name": "AF-Renderer::Self",
+            # unix_timestamp
+            "_": str(int(time.time() * 1000)),
+            "sid": sid,
+        }
+        r = s.post(API_URL, json=data, headers=headers, params=params)
+        r.raise_for_status()
+
+        data = r.json()
+
+        rows_data = data["integration"]["transformed"]["rows_data"]
+        if not isinstance(rows_data, dict):
+            raise ValueError("Invalid data returned from API")
+
+        # Extract each service's relevant details for the bin schedule
+        for item in rows_data.values():
+            if item["Name"]:
+                Bin_Types = item["Name"].split("Empty Bin ")
+                for Bin_Type in Bin_Types:
+                    if Bin_Type:
+                        dict_data = {
+                            "type": Bin_Type.strip(),
+                            "collectionDate": datetime.strptime(
+                                item["Date"], "%Y-%m-%dT%H:%M:%S"
+                            ).strftime(date_format),
+                        }
+                        bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
+        )
+        return bindata

uk_bin_collection/uk_bin_collection/councils/MidSuffolkDistrictCouncil.py

@@ -0,0 +1,132 @@
+import re
+import time
+
+import requests
+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:
+
+        collection_day = kwargs.get("paon")
+        bindata = {"bins": []}
+
+        days_of_week = [
+            "Monday",
+            "Tuesday",
+            "Wednesday",
+            "Thursday",
+            "Friday",
+            "Saturday",
+            "Sunday",
+        ]
+
+        refusestartDate = datetime(2024, 11, 11)
+        recyclingstartDate = datetime(2024, 11, 4)
+
+        offset_days = days_of_week.index(collection_day)
+
+        refuse_dates = get_dates_every_x_days(refusestartDate, 14, 28)
+        recycling_dates = get_dates_every_x_days(recyclingstartDate, 14, 28)
+
+        bank_holidays = [
+            ("25/12/2024", 2),
+            ("26/12/2024", 2),
+            ("27/12/2024", 3),
+            ("30/12/2024", 1),
+            ("31/12/2024", 2),
+            ("01/01/2025", 2),
+            ("02/01/2025", 2),
+            ("03/01/2025", 3),
+            ("06/01/2025", 1),
+            ("07/01/2025", 1),
+            ("08/01/2025", 1),
+            ("09/01/2025", 1),
+            ("10/01/2025", 1),
+            ("18/04/2025", 1),
+            ("21/04/2025", 1),
+            ("22/04/2025", 1),
+            ("23/04/2025", 1),
+            ("24/04/2025", 1),
+            ("25/04/2025", 1),
+            ("05/05/2025", 1),
+            ("06/05/2025", 1),
+            ("07/05/2025", 1),
+            ("08/05/2025", 1),
+            ("09/05/2025", 1),
+            ("26/05/2025", 1),
+            ("27/05/2025", 1),
+            ("28/05/2025", 1),
+            ("29/05/2025", 1),
+            ("30/05/2025", 1),
+            ("25/08/2025", 1),
+            ("26/08/2025", 1),
+            ("27/08/2025", 1),
+            ("28/08/2025", 1),
+            ("29/08/2025", 1),
+        ]
+
+        for refuseDate in refuse_dates:
+
+            collection_date = (
+                datetime.strptime(refuseDate, "%d/%m/%Y") + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            holiday_offset = next(
+                (value for date, value in bank_holidays if date == collection_date), 0
+            )
+
+            if holiday_offset > 0:
+                collection_date = (
+                    datetime.strptime(collection_date, "%d/%m/%Y")
+                    + timedelta(days=holiday_offset)
+                ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Refuse Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        for recyclingDate in recycling_dates:
+
+            collection_date = (
+                datetime.strptime(recyclingDate, "%d/%m/%Y")
+                + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            holiday_offset = next(
+                (value for date, value in bank_holidays if date == collection_date), 0
+            )
+
+            if holiday_offset > 0:
+                collection_date = (
+                    datetime.strptime(collection_date, "%d/%m/%Y")
+                    + timedelta(days=holiday_offset)
+                ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Recycling Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py

@@ -1,4 +1,7 @@
-from bs4 import BeautifulSoup
+import time
+
+import requests
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -12,43 +15,59 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
-        data = {"bins": []}
-
-        # Get the estate from the UPRN field
-        estate = kwargs.get("uprn")
-
-        # Parse the council's website
-        soup = BeautifulSoup(page.text, features="html.parser")
-        soup.prettify()
-
-        # Get a list of lists of estates and their collection days, then check for a match on estate name
-        collection_days = [
-            item.text.strip().replace("\xa0", " ").split(" - ")
-            for item in soup.find(
-                "div",
-                {
-                    "class": "field field--name-localgov-paragraphs field--type-entity-reference-revisions field--label-hidden field__items"
-                },
-            ).find_all("li")
-        ]
-        result = [
-            result for result in collection_days if result[0].lower() == estate.lower()
-        ]
-
-        # If there is a match, we can process it by getting the next eight dates for that day. Else, raise an exception.
-        if result is not None:
-            day_number = days_of_week.get(result[0][1].split()[0])
-            collection_dates = get_weekday_dates_in_period(
-                datetime.now(), day_number, 8
-            )
-
-            for date in collection_dates:
-                dict_data = {
-                    "type": f"Weekly collection",
-                    "collectionDate": date,
-                }
-                data["bins"].append(dict_data)
-        else:
-            raise ValueError("Estate not found on website.")
-
-        return data
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        SESSION_URL = "https://mycouncil.milton-keynes.gov.uk/authapi/isauthenticated?uri=https%253A%252F%252Fmycouncil.milton-keynes.gov.uk%252Fen%252Fservice%252FWaste_Collection_Round_Checker&hostname=mycouncil.milton-keynes.gov.uk&withCredentials=true"
+
+        API_URL = "https://mycouncil.milton-keynes.gov.uk/apibroker/runLookup"
+
+        data = {
+            "formValues": {"Section 1": {"uprnCore": {"value": user_uprn}}},
+        }
+
+        headers = {
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "User-Agent": "Mozilla/5.0",
+            "X-Requested-With": "XMLHttpRequest",
+            "Referer": "https://mycouncil.milton-keynes.gov.uk/fillform/?iframe_id=fillform-frame-1&db_id=",
+        }
+        s = requests.session()
+        r = s.get(SESSION_URL)
+        r.raise_for_status()
+        session_data = r.json()
+        sid = session_data["auth-session"]
+        params = {
+            "id": "64d9feda3a507",
+            "repeat_against": "",
+            "noRetry": "false",
+            "getOnlyTokens": "undefined",
+            "log_id": "",
+            "app_name": "AF-Renderer::Self",
+            # unix_timestamp
+            "_": str(int(time.time() * 1000)),
+            "sid": sid,
+        }
+
+        r = s.post(API_URL, json=data, headers=headers, params=params)
+        r.raise_for_status()
+
+        data = r.json()
+        rows_data = data["integration"]["transformed"]["rows_data"]
+        if not isinstance(rows_data, dict):
+            raise ValueError("Invalid data returned from API")
+
+        # Extract each service's relevant details for the bin schedule
+        for item in rows_data.values():
+            dict_data = {
+                "type": item["AssetTypeName"],
+                "collectionDate": datetime.strptime(
+                    item["NextInstance"], "%Y-%m-%d"
+                ).strftime(date_format),
+            }
+            bindata["bins"].append(dict_data)
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/SouthStaffordshireDistrictCouncil.py

@@ -0,0 +1,99 @@
+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
+
+
+# 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_date(self, date_str):
+        months = {
+            "January": "01",
+            "February": "02",
+            "March": "03",
+            "April": "04",
+            "May": "05",
+            "June": "06",
+            "July": "07",
+            "August": "08",
+            "September": "09",
+            "October": "10",
+            "November": "11",
+            "December": "12",
+        }
+        day, date, month_abbr, year = date_str.split()
+        month = months[month_abbr]
+        return f"{date}/{month}/{year}"
+
+    def add_bin_types_to_collection(
+        self, bin_data: {"bins": []}, collection_date: str, collectionType: str
+    ):
+        if "Grey Bin" in collectionType:
+            bin_data["bins"].append(
+                {
+                    "type": "Grey Bin",
+                    "collectionDate": self.parse_date(collection_date),
+                }
+            )
+        if "Green Bin" in collectionType:
+            bin_data["bins"].append(
+                {
+                    "type": "Green Bin",
+                    "collectionDate": self.parse_date(collection_date),
+                }
+            )
+
+        if "Blue Bin" in collectionType:
+            bin_data["bins"].append(
+                {
+                    "type": "Blue Bin",
+                    "collectionDate": self.parse_date(collection_date),
+                }
+            )
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        # Make a BS4 object
+        soup = BeautifulSoup(page.text, features="html.parser")
+        soup.prettify()
+
+        # Initialize the bin data structure
+        bin_data = {"bins": []}
+
+        collectionDatesSection = soup.find("div", id="showCollectionDates")
+
+        # Find next date
+        collection_date = collectionDatesSection.find(
+            "p", class_="collection-date"
+        ).getText()
+
+        # convert to date
+        collection_type = collectionDatesSection.find(
+            "p", class_="collection-type"
+        ).getText()
+
+        self.add_bin_types_to_collection(bin_data, collection_date, collection_type)
+
+        # Find the table with collection dates
+        table = collectionDatesSection.find("table", class_="leisure-table")
+
+        # Extract the rows containing the bin collection information
+        rows = table.find_all("tr")
+
+        # Loop through the rows and extract bin data
+        for row in rows:
+            cells = row.find_all("td")
+            if len(cells) == 2:
+                collection_date = cells[1].get_text(strip=True)
+                collection_type = cells[0].get_text(strip=True)
+
+                self.add_bin_types_to_collection(
+                    bin_data, collection_date, collection_type
+                )
+
+        return bin_data

{uk_bin_collection-0.115.0.dist-info → uk_bin_collection-0.117.0.dist-info}/METADATA

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

{uk_bin_collection-0.115.0.dist-info → uk_bin_collection-0.117.0.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=5mBEtJS5JmJUe4kjQfZt5A1YOgqkZJ9Fcp44_lLVm3U,100381
+uk_bin_collection/tests/input.json,sha256=SYYyHZnd-yzGAz4ZLulu4DWjY4ykaCQ3zQgtkLdYVpg,101933
 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
@@ -16,11 +16,14 @@ uk_bin_collection/uk_bin_collection/councils/AberdeenshireCouncil.py,sha256=aO1C
 uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py,sha256=ppbrmm-MzB1wOulK--CU_0j4P-djNf3ozMhHnmQFqLo,1511
 uk_bin_collection/uk_bin_collection/councils/AntrimAndNewtonabbeyCouncil.py,sha256=Hp5pteaC5RjL5ZqPZ564S9WQ6ZTKLMO6Dl_fxip2TUc,1653
 uk_bin_collection/uk_bin_collection/councils/ArdsAndNorthDownCouncil.py,sha256=iMBldxNErgi-ok1o6xpqdNgMvR6qapaNqoTWDTqMeGo,3824
+uk_bin_collection/uk_bin_collection/councils/ArgyllandButeCouncil.py,sha256=fJ0UvuSCbzFE9CPoxt1U9CJeFsbTKts_5GRBc3E9Eno,2201
 uk_bin_collection/uk_bin_collection/councils/ArmaghBanbridgeCraigavonCouncil.py,sha256=o9NBbVCTdxKXnpYbP8-zxe1Gh8s57vwfV75Son_sAHE,2863
 uk_bin_collection/uk_bin_collection/councils/ArunCouncil.py,sha256=yfhthv9nuogP19VOZ3TYQrq51qqjiCZcSel4sXhiKjs,4012
+uk_bin_collection/uk_bin_collection/councils/AshfieldDistrictCouncil.py,sha256=2kZt9HGCVK-n0aq2VFWG6yiWihXjRf8MnksdQLMj4LU,3555
 uk_bin_collection/uk_bin_collection/councils/AshfordBoroughCouncil.py,sha256=yC-8UMQHSbvze43PJ2_F4Z3cu7M7cynKTojipBJU7Ug,4307
 uk_bin_collection/uk_bin_collection/councils/AylesburyValeCouncil.py,sha256=LouqjspEMt1TkOGqWHs2zkxwOETIy3n7p64uKIlAgUg,2401
 uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py,sha256=W7QBx6Mgso8RYosuXsaYo3GGNAu-tiyBSmuYxr1JSOU,1707
+uk_bin_collection/uk_bin_collection/councils/BaberghDistrictCouncil.py,sha256=T0Awn7afXhpyp3-R3IjZcowhcBgfXNlimRlODDAMMdQ,4094
 uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py,sha256=Sd4-pbv0QZsR7soxvXYqsfdOUIqZqS6notyoZthG77s,9182
 uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py,sha256=RKuH8HzGc3Q0WtLg-g_xVMn9hUYqdENgfcvvR4Bx5PI,4763
 uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py,sha256=NymPmq5pud0PJ8ePcc2r1SKED4EHQ0EY2l71O-Metxc,3313
@@ -54,7 +57,7 @@ uk_bin_collection/uk_bin_collection/councils/CastlepointDistrictCouncil.py,sha25
 uk_bin_collection/uk_bin_collection/councils/CharnwoodBoroughCouncil.py,sha256=tXfzMetN6wxahuGGRp2mIyCCDSL4F2aG61HhUxw6COQ,2172
 uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py,sha256=EB88D0MNJwuDZ2GX1ENc5maGYx17mnHTCtNl6s-v11E,5090
 uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py,sha256=73P5GF6Y7Ud1hNgyFypvT1d6eBWjzdBjr3h0Dsl6NWw,1679
-uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py,sha256=xsJcx-Dcds0ZcX2vZ-xHVkCg-faQRvbhrJzRDY6Lguw,4779
+uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py,sha256=5mKZf22NgdyBY-SqV0c2q8b8IJobkoZrsfGEVUcxUyM,3544
 uk_bin_collection/uk_bin_collection/councils/ChesterfieldBoroughCouncil.py,sha256=mZiM8Ugm_OP0JkC5pLaQmi4i79mAp4SNNrcIdsREjHw,7198
 uk_bin_collection/uk_bin_collection/councils/ChichesterDistrictCouncil.py,sha256=HxrLcJves7ZsE8FbooymeecTUmScY4R7Oi71vwCePPo,4118
 uk_bin_collection/uk_bin_collection/councils/ChorleyCouncil.py,sha256=M7HjuUaFq8aSnOf_9m1QS4MmPPMmPhF3mLHSrfDPtV0,5194
@@ -67,6 +70,7 @@ uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py,sha256=_BE
 uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py,sha256=Vxh5ICoaXTAvx0nDOq_95XQ4He9sQKcLdI5keV2uxM4,11384
 uk_bin_collection/uk_bin_collection/councils/DacorumBoroughCouncil.py,sha256=Tm_6pvBPj-6qStbe6-02LXaoCOlnnDvVXAAocGVvf_E,3970
 uk_bin_collection/uk_bin_collection/councils/DartfordBoroughCouncil.py,sha256=SPirUUoweMwX5Txtsr0ocdcFtKxCQ9LhzTTJN20tM4w,1550
+uk_bin_collection/uk_bin_collection/councils/DerbyCityCouncil.py,sha256=M8FGLhZn9wdRCq1W6z_yqJQqeba3EKyba3vhM22MzB4,1883
 uk_bin_collection/uk_bin_collection/councils/DerbyshireDalesDistrictCouncil.py,sha256=MQC1-jXezXczrxTcvPQvkpGgyyAbzSKlX38WsmftHak,4007
 uk_bin_collection/uk_bin_collection/councils/DoncasterCouncil.py,sha256=b7pxoToXu6dBBYXsXmlwfPXE8BjHxt0hjCOBNlNgvX8,3118
 uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py,sha256=XUWH5BzkjPSFBLczo-Vo-Wly2JMoabm9WtI6_Mf-pO4,1523
@@ -98,6 +102,7 @@ uk_bin_collection/uk_bin_collection/councils/GatesheadCouncil.py,sha256=SRCgYhYs
 uk_bin_collection/uk_bin_collection/councils/GedlingBoroughCouncil.py,sha256=XzfFMCwclh9zAJgsbaj4jywjdiH0wPaFicaVsLrN3ms,2297
 uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py,sha256=9N5GXR32gXYBl3i44TITiZ7N73rgqXZmkyenI-kVRQI,2328
 uk_bin_collection/uk_bin_collection/councils/GloucesterCityCouncil.py,sha256=8Wjvmdvg5blHVrREaEnhhWZaWhYVP4v_KdDVPLIUxaU,4889
+uk_bin_collection/uk_bin_collection/councils/GraveshamBoroughCouncil.py,sha256=ueQ9xFiTxMUBTGV9VjtySHA1EFWliTM0AeNePBIG9ho,4568
 uk_bin_collection/uk_bin_collection/councils/GuildfordCouncil.py,sha256=9pVrmQhZcK2AD8gX8mNvP--L4L9KaY6L3B822VX6fec,5695
 uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py,sha256=gq_CPqi6qM2oNiHhKKF1lZC86fyKL4lPhh_DN9pJZ04,5971
 uk_bin_collection/uk_bin_collection/councils/HarboroughDistrictCouncil.py,sha256=uAbCgfrqkIkEKUyLVE8l72s5tzbfMFsw775i0nVRAyc,1934
@@ -133,9 +138,10 @@ uk_bin_collection/uk_bin_collection/councils/MansfieldDistrictCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/MertonCouncil.py,sha256=3Y2Un4xXo1sCcMsudynODSzocV_mMofWkX2JqONDb5o,1997
 uk_bin_collection/uk_bin_collection/councils/MidAndEastAntrimBoroughCouncil.py,sha256=oOWwU5FSgGej2Mv7FQ66N-EzS5nZgmGsd0WnfLWUc1I,5238
 uk_bin_collection/uk_bin_collection/councils/MidDevonCouncil.py,sha256=RjBZ7R3_Pax9p1d2DCygqryjV1RP4BYvqb-rT_KyOEg,3322
+uk_bin_collection/uk_bin_collection/councils/MidSuffolkDistrictCouncil.py,sha256=nnN7S1mK7HU3NPW7KsmEVkcC7Gb5rE1mmW9FCUfukWk,4094
 uk_bin_collection/uk_bin_collection/councils/MidSussexDistrictCouncil.py,sha256=AZgC9wmDLEjUOtIFvf0ehF5LHturXTH4DkE3ioPSVBA,6254
 uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py,sha256=mM5-itJDNhjsT5UEjSFfWppmfmPFSns4u_1QblewuFU,5605
-uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py,sha256=3olsWa77L34vz-c7NgeGK9xmNuR4Ws_oAk5D4UpIkPw,2005
+uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py,sha256=7e2pGBLCw24pNItHeI9jkxQ3rEOZ4WC4zVlbvKYGdXE,2600
 uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py,sha256=xWR5S0gwQu9gXxjl788Wux1KaC0CT7ZFw0iXuRLZCEM,5599
 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
@@ -192,6 +198,7 @@ uk_bin_collection/uk_bin_collection/councils/SouthLanarkshireCouncil.py,sha256=f
 uk_bin_collection/uk_bin_collection/councils/SouthNorfolkCouncil.py,sha256=C2qIZjjbl9JnuukX9OH2RbfP0hSdp3uX76APGY33qKs,4622
 uk_bin_collection/uk_bin_collection/councils/SouthOxfordshireCouncil.py,sha256=zW4bN3hcqNoK_Y0-vPpuZs3K0LTPvApu6_v9K-D7WjE,3879
 uk_bin_collection/uk_bin_collection/councils/SouthRibbleCouncil.py,sha256=OdexbeiI5WsCfjlsnHjAce8oGF5fW-n7q2XOuxcpHzw,3604
+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/SouthwarkCouncil.py,sha256=Z6JIbUt3yr4oG60n1At4AjPIGrs7Qzn_sDNY-TsS62E,4882
 uk_bin_collection/uk_bin_collection/councils/StAlbansCityAndDistrictCouncil.py,sha256=mPZz6Za6kTSkrfHnj0OfwtnpRYR1dKvxbuFEKnWsiL8,1451
@@ -252,8 +259,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.115.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.115.0.dist-info/METADATA,sha256=cHozMBPjD1SsD5IQeuL4wJJuYuV0_-3ZZWAZ5uAiALU,17574
-uk_bin_collection-0.115.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.115.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.115.0.dist-info/RECORD,,
+uk_bin_collection-0.117.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.117.0.dist-info/METADATA,sha256=bK7wQJkZL4lfbMyqO3y-K75RtMP4EoojmrDqozltkC8,17574
+uk_bin_collection-0.117.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.117.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.117.0.dist-info/RECORD,,