uk_bin_collection 0.152.10__py3-none-any.whl → 0.152.11__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -641,6 +641,13 @@
         "wiki_note": "Pass the house number and postcode in their respective parameters. This parser requires a Selenium webdriver.",
         "LAD24CD": "E07000096"
     },
+    "DarlingtonBoroughCouncil": {
+        "uprn": "10003076924",
+        "url": "https://www.darlington.gov.uk/bins-waste-and-recycling/collection-day-lookup/",
+        "wiki_name": "Darlington Borough Council",
+        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN.",
+        "LAD24CD": "E06000005"
+    },
     "DartfordBoroughCouncil": {
         "uprn": "100060861698",
         "url": "https://www.dartford.gov.uk/waste-recycling/collection-day",

uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py

@@ -245,25 +245,39 @@ class CouncilClass(AbstractGetBinDataClass):
             # extract table body
             for row in table.find_all("tr")[1:]:
                 if row.find_all("td")[1].text.strip() == "Normal collection day":
-                    bh_dict[
-                        parse(
-                            row.find_all("td")[0].text.strip(),
-                            dayfirst=True,
-                            fuzzy=True,
-                        ).date()
-                    ] = parse(
-                        row.find_all("td")[0].text.strip(), dayfirst=True, fuzzy=True
-                    ).date()
+                    try:
+                        # Check for normal collection day (no change)
+                        if row.find_all("td")[0].text.strip() == "Normal collection":
+                            continue
+                        else:
+                            bh_dict[
+                                parse(
+                                    row.find_all("td")[0].text.strip(),
+                                    dayfirst=True,
+                                    fuzzy=True,
+                                ).date()
+                            ] = parse(
+                                row.find_all("td")[0].text.strip(), dayfirst=True, fuzzy=True
+                            ).date()
+                    except:
+                        continue
                 else:
-                    bh_dict[
-                        parse(
-                            row.find_all("td")[0].text.strip(),
-                            dayfirst=True,
-                            fuzzy=True,
-                        ).date()
-                    ] = parse(
-                        row.find_all("td")[1].text.strip(), dayfirst=True, fuzzy=True
-                    ).date()
+                    try:
+                        # Check for normal collection day (no change)
+                        if row.find_all("td")[1].text.strip() == "Normal collection":
+                            continue
+                        else:
+                            bh_dict[
+                                parse(
+                                    row.find_all("td")[0].text.strip(),
+                                    dayfirst=True,
+                                    fuzzy=True,
+                                ).date()
+                            ] = parse(
+                                row.find_all("td")[1].text.strip(), dayfirst=True, fuzzy=True
+                            ).date()
+                    except:
+                        continue
 
         for refuse_date in refuse_dates:
             collection_date = (datetime.strptime(refuse_date, "%d/%m/%Y") + timedelta(

uk_bin_collection/uk_bin_collection/councils/DarlingtonBoroughCouncil.py

@@ -0,0 +1,68 @@
+import re
+
+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:
+
+        data = {"bins": []}
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+
+        url = f"https://www.darlington.gov.uk/bins-waste-and-recycling/collection-day-lookup/?uprn={user_uprn}"
+
+        # Referrer: https://www.darlington.gov.uk/bins-waste-and-recycling/collection-day-lookup/
+        # X-Requested-With: XMLHttpRequest
+        headers = {
+            "Accept": "*/*",
+            "Accept-Encoding": "gzip, deflate, br, zstd",
+            "Accept-Language": "en-GB,en;q=0.5",
+            "Referer": "https://www.darlington.gov.uk/bins-waste-and-recycling/collection-day-lookup/",
+            "Sec-Detch-Dest": "empty",
+            "Sec-Fetch-Mode": "cors",
+            "Sec-Fetch-Site": "same-origin",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.6167.186 Safari/537.36",
+            "X-Requested-With": "XMLHttpRequest",
+        }
+
+        # Make a BS4 object
+        page = requests.get(url, headers=headers)
+        soup = BeautifulSoup(page.text, features="html.parser")
+        soup.prettify()
+
+        # Loop over each date card
+        card_blocks = soup.select("#detailsDisplay .refuse-results")
+
+        for card in card_blocks:
+            bin_date_tag = card.select_one(".card-footer h3")
+            if not bin_date_tag:
+                continue
+
+            bin_type = card.select_one(".card-header h2").text.strip()
+            bin_date = bin_date_tag.text.strip()
+
+            # Remove any extra text from the date "(Today)", "(Tomorrow)"
+            cleaned_bin_date = re.sub(r"\s*\(.*?\)", "", bin_date).strip()
+
+            next_binfo = {
+                "type": bin_type,
+                "collectionDate": datetime.strptime(
+                    cleaned_bin_date, "%A %d %B %Y"
+                ).strftime(date_format),
+            }
+
+            data["bins"].append(next_binfo)
+
+        return data

uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py

@@ -33,10 +33,9 @@ class CouncilClass(AbstractGetBinDataClass):
                     "tr", {"class": "govuk-table__row"}
                 ):
                     week_text = week.get_text().strip().split("\n")
+                    date_str = week_text[0].split(" - ")[0].split("–")[0].strip()
                     collection_date = datetime.strptime(
-                        remove_ordinal_indicator_from_date_string(
-                            week_text[0].split(" - ")[0]
-                        ).strip(),
+                        remove_ordinal_indicator_from_date_string(date_str),
                         "%A %d %B",
                     )
                     next_collection = collection_date.replace(year=datetime.now().year)

{uk_bin_collection-0.152.10.dist-info → uk_bin_collection-0.152.11.dist-info}/METADATA

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

{uk_bin_collection-0.152.10.dist-info → uk_bin_collection-0.152.11.dist-info}/RECORD

@@ -7,7 +7,7 @@ uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-c
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
 uk_bin_collection/tests/generate_map_test_results.py,sha256=CKnGK2ZgiSXomRGkomX90DitgMP-X7wkHhyKORDcL2E,1144
-uk_bin_collection/tests/input.json,sha256=TEBMKFjbR6llQIMVXw1KlkoSRUiWIp-Zbka4yARv2Kw,132602
+uk_bin_collection/tests/input.json,sha256=JRZxMEtYTjeq26L4i0zU41U8qqHS4iLENdMv4bZWx6M,132955
 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
@@ -73,7 +73,7 @@ uk_bin_collection/uk_bin_collection/councils/CastlepointDistrictCouncil.py,sha25
 uk_bin_collection/uk_bin_collection/councils/CeredigionCountyCouncil.py,sha256=np9iLnMVWpMYUiHZ4sJaSaU5pOWfmiCLQ8TIrOlY48o,5924
 uk_bin_collection/uk_bin_collection/councils/CharnwoodBoroughCouncil.py,sha256=FC8jftZFfMnqV-Of_eQAYBcUiCIJDSNFO2DMZbtDy6E,2569
 uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py,sha256=thagz60NeEDbOHdnBH-ByKDBRNElPvo0UU0lwZ6c2OQ,3891
-uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py,sha256=bGxfMO4PpTd6ZTfm1hA9tmNUFDKGt20CMJolZ3K_CeM,16411
+uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py,sha256=7W0MmXn0yXhryRg8rPVMvp1rilYHnYRfxpZ9UmATt24,17173
 uk_bin_collection/uk_bin_collection/councils/CherwellDistrictCouncil.py,sha256=h8jgpTra9H-aqfDB7tcOd8fveRcQXEXRUnG35SF7ARg,3484
 uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py,sha256=RoybPitUD4u0xk4Kc9hXqHbUXCqGJG9Z4uRHWKj4ttk,2495
 uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py,sha256=5mKZf22NgdyBY-SqV0c2q8b8IJobkoZrsfGEVUcxUyM,3544
@@ -91,6 +91,7 @@ uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py,sha256=6UCT2Q75NA
 uk_bin_collection/uk_bin_collection/councils/CumberlandAllerdaleCouncil.py,sha256=bPOmkyzNnHrOtUprbouHdOsgpu7WilUADcaccWTCPFI,2839
 uk_bin_collection/uk_bin_collection/councils/CumberlandCouncil.py,sha256=PwTbTVNDdGZnSkPcIHYf-LHItDyIbR68Avr96T1FrX8,3308
 uk_bin_collection/uk_bin_collection/councils/DacorumBoroughCouncil.py,sha256=Tm_6pvBPj-6qStbe6-02LXaoCOlnnDvVXAAocGVvf_E,3970
+uk_bin_collection/uk_bin_collection/councils/DarlingtonBoroughCouncil.py,sha256=5rv6xiGkqBrCP57dw2vkrqyQlSX6qhGj_uB2nKrkHL4,2448
 uk_bin_collection/uk_bin_collection/councils/DartfordBoroughCouncil.py,sha256=3vuXYhoK3ZkFGtxIDJXCTeY8_kbaXDcKn0C2yk5g1kI,2056
 uk_bin_collection/uk_bin_collection/councils/DenbighshireCouncil.py,sha256=FtG0LMTY21RBQiBpeX4FihdMCEZ1knpARYyMfyCn9ng,2103
 uk_bin_collection/uk_bin_collection/councils/DerbyCityCouncil.py,sha256=M8FGLhZn9wdRCq1W6z_yqJQqeba3EKyba3vhM22MzB4,1883
@@ -243,7 +244,7 @@ uk_bin_collection/uk_bin_collection/councils/ReigateAndBansteadBoroughCouncil.py
 uk_bin_collection/uk_bin_collection/councils/RenfrewshireCouncil.py,sha256=VjjolGn0KemgIUnmF-JlB8gxNLyaQB5mP61NonxVJAo,5080
 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/RochfordCouncil.py,sha256=a4sL2K3a0dAWeX74qW9bbsTC666ahNRz0rZg3fAn_C0,2623
 uk_bin_collection/uk_bin_collection/councils/RotherDistrictCouncil.py,sha256=-fdLvtik9ytfwXrrhwWdBxqQOMq2N1pvrIuvShhf8PU,3090
 uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py,sha256=dfAqXtmbptHGZGGWkurjY9snaVm1aH5CGjhzdtoe4JM,2058
 uk_bin_collection/uk_bin_collection/councils/RoyalBoroughofGreenwich.py,sha256=AziuKhP6wKu_316MA4xXRN-ayDU6RSB21EfSWjmMqU8,3800
@@ -345,8 +346,8 @@ uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bId
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=QD4v4xpsEE0QheR_fGaNOIRMc2FatcUfKkkhAhseyVU,1159
 uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
 uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=Qb76X46V0UMZJwO8zMNPvnVY7jNa-bmTlrirDi1tuJA,4553
-uk_bin_collection-0.152.10.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.152.10.dist-info/METADATA,sha256=51DE3tDCHbfraq7wzD0wncD7biFXidumcQZfwgg3_Mk,26689
-uk_bin_collection-0.152.10.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.152.10.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.152.10.dist-info/RECORD,,
+uk_bin_collection-0.152.11.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.152.11.dist-info/METADATA,sha256=1aRDxnf77XU3b7Z4OQkJuVLt5H8ZzdF54MU39_w9fLU,26689
+uk_bin_collection-0.152.11.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.152.11.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.152.11.dist-info/RECORD,,