uk_bin_collection 0.116.0__py3-none-any.whl → 0.118.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -81,9 +81,10 @@
     "BaberghDistrictCouncil": {
         "skip_get_url": true,
         "house_number": "Monday",
+        "postcode": "Week 1",
         "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"
+        "wiki_note": "Use the House Number field to pass the DAY of the week for your collections. Monday/Tuesday/Wednesday/Thursday/Friday. [OPTIONAL] Use the 'postcode' field to pass the WEEK for your garden collection. [Week 1/Week 2]"
     },
     "BCPCouncil": {
         "skip_get_url": true,
@@ -397,6 +398,12 @@
         "wiki_name": "Conwy County Borough Council",
         "wiki_note": "Conwy County Borough Council uses a straight UPRN in the URL, e.g., `&uprn=XXXXXXXXXXXXX`."
     },
+    "CopelandBoroughCouncil": {
+        "uprn": "100110734613",
+        "url": "https://www.copeland.gov.uk",
+        "wiki_name": "Copeland Borough Council",
+        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
+    },
     "CornwallCouncil": {
         "skip_get_url": true,
         "uprn": "100040128734",
@@ -1005,9 +1012,10 @@
     "MidSuffolkDistrictCouncil": {
         "skip_get_url": true,
         "house_number": "Monday",
+        "postcode": "Week 2",
         "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"
+        "wiki_note": "Use the House Number field to pass the DAY of the week for your collections. Monday/Tuesday/Wednesday/Thursday/Friday. [OPTIONAL] Use the 'postcode' field to pass the WEEK for your garden collection. [Week 1/Week 2]"
     },
     "MidSussexDistrictCouncil": {
         "house_number": "OAKLANDS, OAKLANDS ROAD RH16 1SS",
@@ -1303,6 +1311,12 @@
         "wiki_name": "Rochford Council",
         "wiki_note": "No extra parameters are required. Dates presented should be read as 'week commencing'."
     },
+    "RotherDistrictCouncil": {
+        "uprn": "100061937338",
+        "url": "https://www.rother.gov.uk",
+        "wiki_name": "Rother District Council",
+        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
+    },
     "RotherhamCouncil": {
         "url": "https://www.rotherham.gov.uk/bin-collections?address=100050866000&submit=Submit",
         "uprn": "100050866000",
@@ -1412,6 +1426,12 @@
         "wiki_name": "South Gloucestershire Council",
         "wiki_note": "Provide your UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
+    "SouthHamsDistrictCouncil": {
+        "uprn": "10004742851",
+        "url": "https://www.southhams.gov.uk",
+        "wiki_name": "South Hams District Council",
+        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
+    },
     "SouthKestevenDistrictCouncil": {
         "house_number": "2 Althorpe Close, Market Deeping, PE6 8BL",
         "postcode": "PE68BL",
@@ -1448,6 +1468,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",
@@ -1470,6 +1496,12 @@
         "wiki_name": "St Albans City and District Council",
         "wiki_note": "Provide your UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
+    "StevenageBoroughCouncil": {
+        "uprn": "100080878852",
+        "url": "https://www.stevenage.gov.uk",
+        "wiki_name": "Stevenage Borough Council",
+        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
+    },
     "StHelensBC": {
         "house_number": "15",
         "postcode": "L34 2GA",
@@ -1624,6 +1656,12 @@
         "wiki_name": "Test Valley Borough Council",
         "wiki_note": "Provide your UPRN and postcode. Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
+    "ThanetDistrictCouncil": {
+        "uprn": "100061111858",
+        "url": "https://www.thanet.gov.uk",
+        "wiki_name": "Thanet District Council",
+        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
+    },
     "ThreeRiversDistrictCouncil": {
         "postcode": "WD3 7AZ",
         "skip_get_url": true,
@@ -1891,6 +1929,13 @@
         "wiki_name": "Worcester City Council",
         "wiki_note": "Provide your UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
+    "WolverhamptonCityCouncil": {
+        "uprn": "100071205205",
+        "postcode": "WV3 9NZ",
+        "url": "https://www.wolverhampton.gov.uk",
+        "wiki_name": "Wolverhampton City Council",
+        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
+    },
     "WorcesterCityCouncil": {
         "url": "https://www.Worcester.gov.uk",
         "wiki_command_url_override": "https://www.Worcester.gov.uk",

uk_bin_collection/uk_bin_collection/councils/BaberghDistrictCouncil.py

@@ -23,6 +23,7 @@ class CouncilClass(AbstractGetBinDataClass):
     def parse_data(self, page: str, **kwargs) -> dict:
 
         collection_day = kwargs.get("paon")
+        garden_collection_week = kwargs.get("postcode")
         bindata = {"bins": []}
 
         days_of_week = [
@@ -35,10 +36,14 @@ class CouncilClass(AbstractGetBinDataClass):
             "Sunday",
         ]
 
+        garden_week = ["Week 1", "Week 2"]
+
         refusestartDate = datetime(2024, 11, 4)
         recyclingstartDate = datetime(2024, 11, 11)
 
         offset_days = days_of_week.index(collection_day)
+        if garden_collection_week:
+            garden_collection = garden_week.index(garden_collection_week)
 
         refuse_dates = get_dates_every_x_days(refusestartDate, 14, 28)
         recycling_dates = get_dates_every_x_days(recyclingstartDate, 14, 28)
@@ -125,6 +130,63 @@ class CouncilClass(AbstractGetBinDataClass):
             }
             bindata["bins"].append(dict_data)
 
+        if garden_collection_week:
+            if garden_collection == 0:
+                gardenstartDate = datetime(2024, 11, 11)
+            elif garden_collection == 1:
+                gardenstartDate = datetime(2024, 11, 4)
+
+            garden_dates = get_dates_every_x_days(gardenstartDate, 14, 28)
+
+            garden_bank_holidays = [
+                ("23/12/2024", 1),
+                ("24/12/2024", 1),
+                ("25/12/2024", 1),
+                ("26/12/2024", 1),
+                ("27/12/2024", 1),
+                ("30/12/2024", 1),
+                ("31/12/2024", 1),
+                ("01/01/2025", 1),
+                ("02/01/2025", 1),
+                ("03/01/2025", 1),
+            ]
+
+            for gardenDate in garden_dates:
+
+                collection_date = (
+                    datetime.strptime(gardenDate, "%d/%m/%Y")
+                    + timedelta(days=offset_days)
+                ).strftime("%d/%m/%Y")
+
+                garden_holiday = next(
+                    (
+                        value
+                        for date, value in garden_bank_holidays
+                        if date == collection_date
+                    ),
+                    0,
+                )
+
+                if garden_holiday > 0:
+                    continue
+
+                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": "Garden Bin",
+                    "collectionDate": collection_date,
+                }
+                bindata["bins"].append(dict_data)
+
         bindata["bins"].sort(
             key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
         )

uk_bin_collection/uk_bin_collection/councils/CopelandBoroughCouncil.py

@@ -0,0 +1,93 @@
+from xml.etree import ElementTree
+
+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
+
+
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    baseclass. They can also override some
+    operations with a default implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        uprn = kwargs.get("uprn")
+        check_uprn(uprn)
+        council = "CPL"
+
+        # Make SOAP request
+        headers = {
+            "Content-Type": "text/xml; charset=UTF-8",
+            "Referer": "https://collections-copeland.azurewebsites.net/calendar.html",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36",
+        }
+        requests.packages.urllib3.disable_warnings()
+        post_data = (
+            '<?xml version="1.0" encoding="utf-8"?>'
+            '<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">'
+            '<soap:Body><getRoundCalendarForUPRN xmlns="http://webaspx-collections.azurewebsites.net/">'
+            "<council>" + council + "</council><UPRN>" + uprn + "</UPRN>"
+            "<from>Chtml</from></getRoundCalendarForUPRN></soap:Body></soap:Envelope>"
+        )
+        response = requests.post(
+            "https://collections-copeland.azurewebsites.net/WSCollExternal.asmx",
+            headers=headers,
+            data=post_data,
+        )
+
+        if response.status_code != 200:
+            raise ValueError("No bin data found for provided UPRN.")
+
+        # Get HTML from SOAP response
+        xmltree = ElementTree.fromstring(response.text)
+        html = xmltree.find(
+            ".//{http://webaspx-collections.azurewebsites.net/}getRoundCalendarForUPRNResult"
+        ).text
+        # Parse with BS4
+        soup = BeautifulSoup(html, features="html.parser")
+        soup.prettify()
+
+        data = {"bins": []}
+        for bin_type in ["Refuse", "Recycling", "Garden"]:
+            bin_el = soup.find("b", string=bin_type)
+            if bin_el:
+                bin_info = bin_el.next_sibling.split(": ")[1]
+                collection_date = ""
+                results = re.search("([A-Za-z]+ \\d\\d? [A-Za-z]+) then", bin_info)
+                if results:
+                    if results[1] == "Today":
+                        date = datetime.now()
+                    elif results[1] == "Tomorrow":
+                        date = datetime.now() + timedelta(days=1)
+                    else:
+                        date = get_next_occurrence_from_day_month(
+                            datetime.strptime(
+                                results[1] + " " + datetime.now().strftime("%Y"),
+                                "%a %d %b %Y",
+                            )
+                        )
+                    if date:
+                        collection_date = date.strftime(date_format)
+                else:
+                    results2 = re.search("([A-Za-z]+) then", bin_info)
+                    if results2:
+                        if results2[1] == "Today":
+                            collection_date = datetime.now().strftime(date_format)
+                        elif results2[1] == "Tomorrow":
+                            collection_date = (
+                                datetime.now() + timedelta(days=1)
+                            ).strftime(date_format)
+                        else:
+                            collection_date = results2[1]
+
+                if collection_date != "":
+                    dict_data = {
+                        "type": bin_type,
+                        "collectionDate": collection_date,
+                    }
+                    data["bins"].append(dict_data)
+
+        return data

uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py

@@ -1,4 +1,6 @@
-from bs4 import BeautifulSoup
+import time
+
+import requests
 from dateutil.relativedelta import relativedelta
 
 from uk_bin_collection.uk_bin_collection.common import *
@@ -19,43 +21,92 @@ class CouncilClass(AbstractGetBinDataClass):
         usrn = kwargs.get("paon")
         check_uprn(uprn)
         check_usrn(usrn)
+        bindata = {"bins": []}
+
+        SESSION_URL = "https://crawleybc-self.achieveservice.com/authapi/isauthenticated?uri=https%253A%252F%252Fcrawleybc-self.achieveservice.com%252Fen%252FAchieveForms%252F%253Fform_uri%253Dsandbox-publish%253A%252F%252FAF-Process-fb73f73e-e8f5-4441-9f83-8b5d04d889d6%252FAF-Stage-ec9ada91-d2d9-43bc-9730-597d15fc8108%252Fdefinition.json%2526redirectlink%253D%252Fen%2526cancelRedirectLink%253D%252Fen%2526noLoginPrompt%253D1%2526accept%253Dyes&hostname=crawleybc-self.achieveservice.com&withCredentials=true"
+
+        API_URL = "https://crawleybc-self.achieveservice.com/apibroker/"
+
+        currentdate = datetime.now().strftime("%d/%m/%Y")
+
+        data = {
+            "formValues": {
+                "Address": {
+                    "address": {
+                        "value": {
+                            "Address": {
+                                "usrn": {
+                                    "value": usrn,
+                                },
+                                "uprn": {
+                                    "value": uprn,
+                                },
+                            }
+                        },
+                    },
+                    "dayConverted": {
+                        "value": currentdate,
+                    },
+                    "getCollection": {
+                        "value": "true",
+                    },
+                    "getWorksheets": {
+                        "value": "false",
+                    },
+                },
+            },
+        }
+
+        headers = {
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "User-Agent": "Mozilla/5.0",
+            "X-Requested-With": "XMLHttpRequest",
+            "Referer": "https://crawleybc-self.achieveservice.com/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 = {
+            "api": "RunLookup",
+            "id": "5b4f0ec5f13f4",
+            "repeat_against": "",
+            "noRetry": "true",
+            "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"]["0"]
+        if not isinstance(rows_data, dict):
+            raise ValueError("Invalid data returned from API")
+
+        # Extract each service's relevant details for the bin schedule
+        for key, value in rows_data.items():
+            if key.endswith("DateNext"):
+                BinType = key.replace("DateNext", "Service")
+                for key2, value2 in rows_data.items():
+                    if key2 == BinType:
+                        BinType = value2
+                next_collection = datetime.strptime(value, "%A %d %B").replace(
+                    year=datetime.now().year
+                )
+                if datetime.now().month == 12 and next_collection.month == 1:
+                    next_collection = next_collection + relativedelta(years=1)
+
+                dict_data = {
+                    "type": BinType,
+                    "collectionDate": next_collection.strftime(date_format),
+                }
+                bindata["bins"].append(dict_data)
 
-        day = datetime.now().date().strftime("%d")
-        month = datetime.now().date().strftime("%m")
-        year = datetime.now().date().strftime("%Y")
-
-        api_url = (
-            f"https://my.crawley.gov.uk/appshost/firmstep/self/apps/custompage/waste?language=en&uprn={uprn}"
-            f"&usrn={usrn}&day={day}&month={month}&year={year}"
-        )
-        response = requests.get(api_url)
-
-        soup = BeautifulSoup(response.text, features="html.parser")
-        soup.prettify()
-
-        data = {"bins": []}
-
-        titles = [title.text for title in soup.select(".block-title")]
-        collection_tag = soup.body.find_all(
-            "div", {"class": "col-md-6 col-sm-6 col-xs-6"}, string="Next collection"
-        )
-        bin_index = 0
-        for tag in collection_tag:
-            for item in tag.next_elements:
-                if (
-                    str(item).startswith('<div class="date text-right text-grey">')
-                    and str(item) != ""
-                ):
-                    collection_date = datetime.strptime(item.text, "%A %d %B")
-                    next_collection = collection_date.replace(year=datetime.now().year)
-                    if datetime.now().month == 12 and next_collection.month == 1:
-                        next_collection = next_collection + relativedelta(years=1)
-
-                    dict_data = {
-                        "type": titles[bin_index].strip(),
-                        "collectionDate": next_collection.strftime(date_format),
-                    }
-                    data["bins"].append(dict_data)
-                    bin_index += 1
-                    break
-        return data
+        return bindata

uk_bin_collection/uk_bin_collection/councils/MidSuffolkDistrictCouncil.py

@@ -23,6 +23,7 @@ class CouncilClass(AbstractGetBinDataClass):
     def parse_data(self, page: str, **kwargs) -> dict:
 
         collection_day = kwargs.get("paon")
+        garden_collection_week = kwargs.get("postcode")
         bindata = {"bins": []}
 
         days_of_week = [
@@ -35,10 +36,14 @@ class CouncilClass(AbstractGetBinDataClass):
             "Sunday",
         ]
 
+        garden_week = ["Week 1", "Week 2"]
+
         refusestartDate = datetime(2024, 11, 11)
         recyclingstartDate = datetime(2024, 11, 4)
 
         offset_days = days_of_week.index(collection_day)
+        if garden_collection_week:
+            garden_collection = garden_week.index(garden_collection_week)
 
         refuse_dates = get_dates_every_x_days(refusestartDate, 14, 28)
         recycling_dates = get_dates_every_x_days(recyclingstartDate, 14, 28)
@@ -125,6 +130,63 @@ class CouncilClass(AbstractGetBinDataClass):
             }
             bindata["bins"].append(dict_data)
 
+        if garden_collection_week:
+            if garden_collection == 0:
+                gardenstartDate = datetime(2024, 11, 11)
+            elif garden_collection == 1:
+                gardenstartDate = datetime(2024, 11, 4)
+
+            garden_dates = get_dates_every_x_days(gardenstartDate, 14, 28)
+
+            garden_bank_holidays = [
+                ("23/12/2024", 1),
+                ("24/12/2024", 1),
+                ("25/12/2024", 1),
+                ("26/12/2024", 1),
+                ("27/12/2024", 1),
+                ("30/12/2024", 1),
+                ("31/12/2024", 1),
+                ("01/01/2025", 1),
+                ("02/01/2025", 1),
+                ("03/01/2025", 1),
+            ]
+
+            for gardenDate in garden_dates:
+
+                collection_date = (
+                    datetime.strptime(gardenDate, "%d/%m/%Y")
+                    + timedelta(days=offset_days)
+                ).strftime("%d/%m/%Y")
+
+                garden_holiday = next(
+                    (
+                        value
+                        for date, value in garden_bank_holidays
+                        if date == collection_date
+                    ),
+                    0,
+                )
+
+                if garden_holiday > 0:
+                    continue
+
+                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": "Garden Bin",
+                    "collectionDate": collection_date,
+                }
+                bindata["bins"].append(dict_data)
+
         bindata["bins"].sort(
             key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
         )

uk_bin_collection/uk_bin_collection/councils/RotherDistrictCouncil.py

@@ -0,0 +1,84 @@
+from datetime import datetime
+
+import requests
+from bs4 import BeautifulSoup
+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
+
+
+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_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        uri = "https://www.rother.gov.uk/wp-admin/admin-ajax.php"
+        params = {
+            "action": "get_address_data",
+            "uprn": user_uprn,
+            "context": "full-page",
+        }
+
+        headers = {
+            "Content-Type": "application/x-www-form-urlencoded",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36",
+        }
+
+        # Send a POST request with form data and headers
+        r = requests.post(uri, data=params, headers=headers, verify=False)
+
+        result = r.json()
+
+        if result["success"]:
+            # Parse the HTML with BeautifulSoup
+            soup = BeautifulSoup(result["data"], "html.parser")
+            soup.prettify()
+
+            # print(soup)
+
+            # Find the div elements with class "bindays-item"
+            bin_days = soup.find_all("div", class_="bindays-item")
+
+            # Loop through each bin item and extract type and date
+            for bin_day in bin_days:
+                # Extract bin type from the <h3> tag
+                bin_type = bin_day.find("h3").get_text(strip=True).replace(":", "")
+
+                # Extract date (or check if it's a subscription link for Garden Waste)
+                date_span = bin_day.find("span", class_="find-my-nearest-bindays-date")
+                if date_span:
+                    if date_span.find("a"):
+                        # If there is a link, this is the Garden bin signup link
+                        continue
+                    else:
+                        # Otherwise, get the date text directly
+                        date = date_span.get_text(strip=True)
+                else:
+                    date = None
+
+                date = datetime.strptime(
+                    remove_ordinal_indicator_from_date_string(date),
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
+                if datetime.now().month == 12 and date.month == 1:
+                    date = date + relativedelta(years=1)
+
+                dict_data = {
+                    "type": bin_type,
+                    "collectionDate": date.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/SouthHamsDistrictCouncil.py

@@ -0,0 +1,90 @@
+from datetime import datetime
+
+import requests
+from bs4 import BeautifulSoup
+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
+
+
+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_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        uri = "https://waste.southhams.gov.uk/mycollections"
+
+        s = requests.session()
+        r = s.get(uri)
+        for cookie in r.cookies:
+            if cookie.name == "fcc_session_cookie":
+                fcc_session_token = cookie.value
+
+        uri = "https://waste.southhams.gov.uk/mycollections/getcollectiondetails"
+
+        params = {
+            "fcc_session_token": fcc_session_token,
+            "uprn": user_uprn,
+        }
+
+        headers = {
+            "Content-Type": "application/x-www-form-urlencoded",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36",
+            "Referer": "https://waste.southhams.gov.uk/mycollections",
+            "X-Requested-With": "XMLHttpRequest",
+        }
+
+        # Send a POST request with form data and headers
+        r = s.post(uri, data=params, headers=headers)
+
+        result = r.json()
+
+        for collection in result["binCollections"]["tile"]:
+
+            # Parse the HTML with BeautifulSoup
+            soup = BeautifulSoup(collection[0], "html.parser")
+            soup.prettify()
+
+            # Find all collectionDiv elements
+            collections = soup.find_all("div", class_="collectionDiv")
+
+            # Process each collectionDiv
+            for collection in collections:
+                # Extract the service name
+                service_name = collection.find("h3").text.strip()
+
+                # Extract collection frequency and day
+                details = collection.find("div", class_="detWrap").text.strip()
+
+                # Extract the next collection date
+                next_collection = details.split("Your next scheduled collection is ")[
+                    1
+                ].split(".")[0]
+
+                if next_collection.startswith("today"):
+                    next_collection = next_collection.split("today, ")[1]
+                elif next_collection.startswith("tomorrow"):
+                    next_collection = next_collection.split("tomorrow, ")[1]
+
+                dict_data = {
+                    "type": service_name,
+                    "collectionDate": datetime.strptime(
+                        next_collection, "%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/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/uk_bin_collection/councils/StevenageBoroughCouncil.py

@@ -0,0 +1,101 @@
+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:
+        # Make a BS4 object
+        uprn = kwargs.get("uprn")
+        check_uprn(uprn)
+        bindata = {"bins": []}
+
+        SESSION_URL = "https://stevenage-self.achieveservice.com/authapi/isauthenticated?uri=https%253A%252F%252Fstevenage-self.achieveservice.com%252Fservice%252Fmy_bin_collection_schedule&hostname=stevenage-self.achieveservice.com&withCredentials=true"
+        TOKEN_URL = "https://stevenage-self.achieveservice.com/apibroker/runLookup?id=5e55337a540d4"
+        API_URL = "https://stevenage-self.achieveservice.com/apibroker/runLookup"
+
+        data = {
+            "formValues": {
+                "Section 1": {
+                    "token": {"value": ""},
+                    "LLPGUPRN": {
+                        "value": uprn,
+                    },
+                    "MinimumDateLookAhead": {
+                        "value": time.strftime("%Y-%m-%d"),
+                    },
+                    "MaximumDateLookAhead": {
+                        "value": str(int(time.strftime("%Y")) + 1)
+                        + time.strftime("-%m-%d"),
+                    },
+                },
+            },
+        }
+
+        headers = {
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "User-Agent": "Mozilla/5.0",
+            "X-Requested-With": "XMLHttpRequest",
+            "Referer": "https://stevenage-self.achieveservice.com/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"]
+
+        t = s.get(TOKEN_URL)
+        t.raise_for_status()
+        token_data = t.json()
+        data["formValues"]["Section 1"]["token"]["value"] = token_data["integration"][
+            "transformed"
+        ]["rows_data"]["0"]["token"]
+
+        params = {
+            "id": "64ba8cee353e6",
+            "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")
+
+        for key in rows_data:
+            value = rows_data[key]
+            bin_type = value["bintype"].strip()
+
+            try:
+                date = datetime.strptime(value["collectiondate"], "%A %d %B %Y").date()
+            except ValueError:
+                continue
+
+            dict_data = {
+                "type": bin_type,
+                "collectionDate": date.strftime(date_format),
+            }
+            bindata["bins"].append(dict_data)
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/ThanetDistrictCouncil.py

@@ -0,0 +1,51 @@
+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
+
+
+# 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://www.thanet.gov.uk/wp-content/mu-plugins/collection-day/incl/mu-collection-day-calls.php?pAddress={user_uprn}"
+
+        headers = {
+            "x-requested-with": "XMLHttpRequest",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36",
+        }
+
+        # Make the GET request
+        response = requests.get(URI, headers=headers)
+
+        # Parse the JSON response
+        bin_collection = response.json()
+
+        # Loop through each collection in bin_collection
+        for collection in bin_collection:
+            bin_type = collection["type"]
+            collection_date = collection["nextDate"].split(" ")[0]
+
+            dict_data = {
+                "type": bin_type,
+                "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/WolverhamptonCityCouncil.py

@@ -0,0 +1,57 @@
+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")
+        user_postcode = kwargs.get("postcode")
+        check_uprn(user_uprn)
+        check_postcode(user_postcode)
+        bindata = {"bins": []}
+
+        user_postcode = user_postcode.replace(" ", "%20")
+
+        URI = f"https://www.wolverhampton.gov.uk/find-my-nearest/{user_postcode}/{user_uprn}"
+
+        # Make the GET request
+        response = requests.get(URI)
+
+        soup = BeautifulSoup(response.content, "html.parser")
+
+        jumbotron = soup.find("div", {"class": "jumbotron jumbotron-fluid"})
+
+        # Find all bin entries in the row
+        for bin_div in jumbotron.select("div.col-md-4"):
+            service_name = bin_div.h3.text.strip()
+            next_date = bin_div.find(
+                "h4", text=lambda x: x and "Next date" in x
+            ).text.split(": ")[1]
+
+            dict_data = {
+                "type": service_name,
+                "collectionDate": datetime.strptime(
+                    next_date,
+                    "%B %d, %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-0.116.0.dist-info → uk_bin_collection-0.118.0.dist-info}/METADATA

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

{uk_bin_collection-0.116.0.dist-info → uk_bin_collection-0.118.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=YbcJwMyKLhZPNACJ8VL3QKjV47A3SQD5suyo4N9yfDc,101581
+uk_bin_collection/tests/input.json,sha256=d54M0Eun5WcoFXATl2jFSaNkMv3QYAZFl20ujKzW9Co,103837
 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
@@ -23,7 +23,7 @@ uk_bin_collection/uk_bin_collection/councils/AshfieldDistrictCouncil.py,sha256=2
 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/BaberghDistrictCouncil.py,sha256=aPONTzKXtPy7aBHFTRvhKTJ13qXqNicSquNRVAYV2d8,6200
 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
@@ -63,10 +63,11 @@ uk_bin_collection/uk_bin_collection/councils/ChichesterDistrictCouncil.py,sha256
 uk_bin_collection/uk_bin_collection/councils/ChorleyCouncil.py,sha256=M7HjuUaFq8aSnOf_9m1QS4MmPPMmPhF3mLHSrfDPtV0,5194
 uk_bin_collection/uk_bin_collection/councils/ColchesterCityCouncil.py,sha256=Mny-q2rQkWe2Tj1gINwEM1L4AkqQl1EDMAaKY0-deD4,3968
 uk_bin_collection/uk_bin_collection/councils/ConwyCountyBorough.py,sha256=el75qv2QyfWZBU09tJLvD8vLQZ9pCg73u1NBFs6ybo8,1034
+uk_bin_collection/uk_bin_collection/councils/CopelandBoroughCouncil.py,sha256=JDtcJFUY47a3Ws4_7pnCYlngw_3p_A-m5MitPLdrv3w,3983
 uk_bin_collection/uk_bin_collection/councils/CornwallCouncil.py,sha256=WZiz50svwyZgO8QKUCLy7hfFuy2HmAx5h-TG3yAweRA,2836
 uk_bin_collection/uk_bin_collection/councils/CotswoldDistrictCouncil.py,sha256=K_HVkAJHEs-i3PRdoBqWVtWUl3BNed6mRLGaqvtSskg,4896
 uk_bin_collection/uk_bin_collection/councils/CoventryCityCouncil.py,sha256=kfAvA2e4MlO0W9YT70U_mW9gxVPrmr0BOGzV99Tw2Bg,2012
-uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py,sha256=_BEKZAjlS5Ad5DjyxqAEFSLn8F-KYox0zmn4BXaAD6A,2367
+uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py,sha256=Oaj5INA3zNjtzBRsfLvRTIxZzcd4E4bJfVF1ULWlrL4,4322
 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
@@ -138,7 +139,7 @@ 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/MidSuffolkDistrictCouncil.py,sha256=b1E47oGUmBfLHzoIT74t556kO-SuopelRprf_ywUsvM,6200
 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=7e2pGBLCw24pNItHeI9jkxQ3rEOZ4WC4zVlbvKYGdXE,2600
@@ -178,6 +179,7 @@ uk_bin_collection/uk_bin_collection/councils/RenfrewshireCouncil.py,sha256=VlWm-
 uk_bin_collection/uk_bin_collection/councils/RhonddaCynonTaffCouncil.py,sha256=wInyVG_0wRrX_dRO9qbAzPhlXDseXapj2zQhsISw8gg,3233
 uk_bin_collection/uk_bin_collection/councils/RochdaleCouncil.py,sha256=UTSwSw515VehGn4xkjjRhUlzS4lDj4hgna6y-4VW3uM,2379
 uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py,sha256=rfhD66A9HfHL46ldF9sbxvV7fPaaoNxzIJbHjVT6A90,2621
+uk_bin_collection/uk_bin_collection/councils/RotherDistrictCouncil.py,sha256=-fdLvtik9ytfwXrrhwWdBxqQOMq2N1pvrIuvShhf8PU,3090
 uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py,sha256=LtMPM8lj5bfReDR4buHEo-aRC_HTBIeo1nf8GE5-R80,1790
 uk_bin_collection/uk_bin_collection/councils/RugbyBoroughCouncil.py,sha256=a5ySLmFvvY56QMA7-bk6MVBxRp5tPBIBg4navH0eYas,4306
 uk_bin_collection/uk_bin_collection/councils/RushcliffeBoroughCouncil.py,sha256=wMtiYRirT585vtsEOIyXHugk7aEj3pvyVWBaAePdqtE,4005
@@ -193,17 +195,20 @@ uk_bin_collection/uk_bin_collection/councils/SouthAyrshireCouncil.py,sha256=03ea
 uk_bin_collection/uk_bin_collection/councils/SouthCambridgeshireCouncil.py,sha256=xGSMcikxjS4UzqKs0X50LJKmn09C-XAAs98SPhNZgkQ,2308
 uk_bin_collection/uk_bin_collection/councils/SouthDerbyshireDistrictCouncil.py,sha256=irqelQSENPsZLlNtYtpt-Z7GwKUyvhp94kKKVIIDjQg,2087
 uk_bin_collection/uk_bin_collection/councils/SouthGloucestershireCouncil.py,sha256=ytQot0J7i6DTJo6hb9koTB1UpXLATKVeRU4FBF9kHRo,2412
+uk_bin_collection/uk_bin_collection/councils/SouthHamsDistrictCouncil.py,sha256=DiijlLisR8qwPSo-4XSAiNk5G31-fYr7bDHKSFjDT7o,3180
 uk_bin_collection/uk_bin_collection/councils/SouthKestevenDistrictCouncil.py,sha256=_26ouWln5VrKiIFcp2b6ZzuwCKpp3aNcS2n5d4-8NsA,6210
 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=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
 uk_bin_collection/uk_bin_collection/councils/StHelensBC.py,sha256=X9dvnQTNn7QUO8gv1A587e1aDI92TWN4iNLATTn3H3w,4777
 uk_bin_collection/uk_bin_collection/councils/StaffordBoroughCouncil.py,sha256=9Qj4HJI7Dbiqb2mVSG2UtkBe27Y7wvQ5SYFTwGzJ5g0,2292
 uk_bin_collection/uk_bin_collection/councils/StaffordshireMoorlandsDistrictCouncil.py,sha256=_N8Cg26EbTaKp0RsWvQuELVcZDHbT2BlD2LW8qhkS_Q,4361
+uk_bin_collection/uk_bin_collection/councils/StevenageBoroughCouncil.py,sha256=EiDIyOlHhdiJ-YYjo7T5uA5sN2jzNoysu6FctjuAjBI,3549
 uk_bin_collection/uk_bin_collection/councils/StockportBoroughCouncil.py,sha256=v0HmioNVRoU1-9OnLJl2V3M5pVR1aVu1BgOLHFR1Sf4,1429
 uk_bin_collection/uk_bin_collection/councils/StocktonOnTeesCouncil.py,sha256=obaBgsmIJ95Ah7KaTNWdU107tZDPVuuJox0mGUoGjNk,6070
 uk_bin_collection/uk_bin_collection/councils/StokeOnTrentCityCouncil.py,sha256=KM0EgWeO7mk8lkozX0RCTfMchXdjrfBqIjCiOtB09aM,2884
@@ -219,6 +224,7 @@ uk_bin_collection/uk_bin_collection/councils/TeignbridgeCouncil.py,sha256=vSnQ7U
 uk_bin_collection/uk_bin_collection/councils/TelfordAndWrekinCouncil.py,sha256=p1ZS5R4EGxbEWlRBrkGXgKwE_lkyBT-R60yKFFhVObc,1844
 uk_bin_collection/uk_bin_collection/councils/TendringDistrictCouncil.py,sha256=DJbYI8m6lIISDrK5h8V5Jo-9kGG7kr9dz7GD8St4nc8,4274
 uk_bin_collection/uk_bin_collection/councils/TestValleyBoroughCouncil.py,sha256=Dtfkyrwt795W7gqFJxVGRR8t3R5WMNQZwTWJckLpZWE,8480
+uk_bin_collection/uk_bin_collection/councils/ThanetDistrictCouncil.py,sha256=-opmZG9GzjB_NvmWpN6nFZ7rlkSoaRrQICU5E8T0DEQ,1659
 uk_bin_collection/uk_bin_collection/councils/ThreeRiversDistrictCouncil.py,sha256=RHt3e9oeKzwxjjY-M8aC0nk-ZXhHIoyC81JzxkPVxsE,5531
 uk_bin_collection/uk_bin_collection/councils/TonbridgeAndMallingBC.py,sha256=UlgnHDoi8ecav2H5-HqKNDpqW1J3RN-c___5c08_Q7I,4859
 uk_bin_collection/uk_bin_collection/councils/TorbayCouncil.py,sha256=JW_BS7wkfxFsmx6taQtPAQWdBp1AfLrxs0XRQ2XZcSw,2029
@@ -251,6 +257,7 @@ uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py,sha2
 uk_bin_collection/uk_bin_collection/councils/WirralCouncil.py,sha256=X_e9zXEZAl_Mp6nPORHc9CTmf3QHdoMY3BCnKrXEr1I,2131
 uk_bin_collection/uk_bin_collection/councils/WokingBoroughCouncil.py,sha256=37igH9g0xe4XIhRhcJ-ZJBU8MxTp5yzgpadWbdE33Yg,5205
 uk_bin_collection/uk_bin_collection/councils/WokinghamBoroughCouncil.py,sha256=H8aFHlacwV07X-6T9RQua4irqDA0cIQrF4O1FfPR7yI,4114
+uk_bin_collection/uk_bin_collection/councils/WolverhamptonCityCouncil.py,sha256=ncXfu5RHPCFsArczXHy7g0l_HEZa7GC-QA1QRReP_00,1801
 uk_bin_collection/uk_bin_collection/councils/WorcesterCityCouncil.py,sha256=dKHB2fPSmOGOwyvfpbdR4U8XW2ctBf63gCPxX06kwKA,1867
 uk_bin_collection/uk_bin_collection/councils/WychavonDistrictCouncil.py,sha256=GnNNMe33YMlK6S7rjM3c4BQkBnXelS0DKl2x5V4fb2w,5775
 uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=zDDa7n4K_zm5PgDL08A26gD9yOOsOhuexI3x2seaBF4,3511
@@ -258,8 +265,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.116.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.116.0.dist-info/METADATA,sha256=Dn9hGIlLa54AUUAhbw_fnO9kixM10sHL3cke0azYc3Y,17574
-uk_bin_collection-0.116.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.116.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.116.0.dist-info/RECORD,,
+uk_bin_collection-0.118.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.118.0.dist-info/METADATA,sha256=qfGDaPkQ6hAS_gVAFVs10LUi2EzwBJtfvFK5c7m-rh0,17574
+uk_bin_collection-0.118.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.118.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.118.0.dist-info/RECORD,,