uk_bin_collection 0.123.2__py3-none-any.whl → 0.124.1__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -840,6 +840,13 @@
         "wiki_name": "Harrogate Borough Council",
         "wiki_note": "Pass the UPRN, which can be found at [this site](https://secure.harrogate.gov.uk/inmyarea). URL doesn't need to be passed."
     },
+    "HartDistrictCouncil": {
+        "skip_get_url": true,
+        "uprn": "100062349291",
+        "url": "https://www.hart.gov.uk/",
+        "wiki_name": "Hart District Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "HartlepoolBoroughCouncil": {
         "url": "https://www.hartlepool.gov.uk",
         "uprn": "100110019551",
@@ -2120,4 +2127,4 @@
         "wiki_name": "York Council",
         "wiki_note": "Provide your UPRN."
     }
-}
+}

uk_bin_collection/uk_bin_collection/councils/BroxbourneCouncil.py

@@ -47,24 +47,31 @@ class CouncilClass(AbstractGetBinDataClass):
         # Process each row into a list of dictionaries
         for row in rows[1:]:  # Skip the header row
             columns = row.find_all("td")
-            collection_date = (
+            collection_date_text = (
                 columns[0].get_text(separator=" ").replace("\xa0", " ").strip()
             )
             service = columns[1].get_text(separator=" ").replace("\xa0", " ").strip()
 
-            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": service,
-                "collectionDate": (collection_date).strftime(date_format),
-            }
-            bindata["bins"].append(dict_data)
-
+            # Safely try to parse collection date
+            if collection_date_text:
+                try:
+                    collection_date = datetime.strptime(collection_date_text, "%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)
+
+                    formatted_collection_date = collection_date.strftime("%d/%m/%Y")  # Use your desired date format
+                    dict_data = {
+                        "type": service,
+                        "collectionDate": formatted_collection_date,
+                    }
+                    bindata["bins"].append(dict_data)
+                except ValueError:
+                    # Skip invalid collection_date
+                    continue
+
+        # Sort valid bins by collectionDate
         bindata["bins"].sort(
             key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
         )

uk_bin_collection/uk_bin_collection/councils/HartDistrictCouncil.py

@@ -0,0 +1,67 @@
+import json
+from datetime import datetime
+
+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)
+
+        URI = f"https://www.hart.gov.uk/bbd-whitespace/next-collection-dates?uri=entity%3Anode%2F172&uprn={user_uprn}"
+
+        response = requests.get(URI)
+        response_table = response.json()
+
+        soup = BeautifulSoup(response_table[0]["data"], "html.parser")
+        # Make a BS4 object
+        # Find all the rows in the table
+        rows = soup.find_all("tr")
+
+        # Initialize an empty list to hold the bin data
+        bins = []
+
+        # Iterate through each row
+        for row in rows:
+            cells = row.find_all("td")
+
+            # Check if there are exactly 3 cells in the row
+            if len(cells) == 3:
+                bin_type = cells[0].get_text(strip=True)
+                collection_date = self.format_date(cells[2].get_text(strip=True))
+
+            # Create a dictionary for each bin and append to the bins list
+            bins.append({"type": bin_type, "collectionDate": collection_date})
+
+        return {"bins": bins}
+
+    def format_date(self, date_str):
+        # Get the current date and year
+        current_date = datetime.now()
+        current_year = current_date.year
+
+        # Parse the provided date string (e.g. "23 January")
+        date_obj = datetime.strptime(date_str, "%d %B")
+
+        # Check if the provided date has already passed this year
+        if date_obj.replace(year=current_year) < current_date:
+            # If the date has passed this year, assume the next year
+            date_obj = date_obj.replace(year=current_year + 1)
+        else:
+            # Otherwise, use the current year
+            date_obj = date_obj.replace(year=current_year)
+
+        # Format the date in "DD/MM/YYYY" format
+        return date_obj.strftime("%d/%m/%Y")

{uk_bin_collection-0.123.2.dist-info → uk_bin_collection-0.124.1.dist-info}/METADATA

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

{uk_bin_collection-0.123.2.dist-info → uk_bin_collection-0.124.1.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=bKqDUy2Db-A44Vz-Tc0a-xwRh6MIaSxbvbsgBP1Bw1U,111573
+uk_bin_collection/tests/input.json,sha256=tHHO48XXBiy9Hiu9g30fiYRtaFmF5LGAxxoUT2uMLT4,111879
 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
@@ -46,7 +46,7 @@ uk_bin_collection/uk_bin_collection/councils/BrightonandHoveCityCouncil.py,sha25
 uk_bin_collection/uk_bin_collection/councils/BristolCityCouncil.py,sha256=kJmmDJz_kQ45DHmG7ocrUpNJonEn0kuXYEDQyZaf9ks,5576
 uk_bin_collection/uk_bin_collection/councils/BromleyBoroughCouncil.py,sha256=_bAFykZWZkEVUB-QKeVLfWO8plG6nRgn71QF2BUN2rk,4329
 uk_bin_collection/uk_bin_collection/councils/BromsgroveDistrictCouncil.py,sha256=PUfxP8j5Oh9wFHkdjbrJzQli9UzMHZzwrZ2hkThrvhI,1781
-uk_bin_collection/uk_bin_collection/councils/BroxbourneCouncil.py,sha256=JC6Qqou1Rj4awn2VP3iuvwFpYayKDTt2_JNuNitjSoY,2393
+uk_bin_collection/uk_bin_collection/councils/BroxbourneCouncil.py,sha256=XCKjkypptrWE-pTkaWekDiZu9BCzDrDa-8he88BopMY,2852
 uk_bin_collection/uk_bin_collection/councils/BroxtoweBoroughCouncil.py,sha256=-Facq-ToQkcWUePpKBwq90LZUFxgUSydNL2sYaLX4yw,4473
 uk_bin_collection/uk_bin_collection/councils/BuckinghamshireCouncil.py,sha256=_ELVUM5VLp1nwDxRpvpsp6n8SzLJvp_UyMp-i_MXYuo,4383
 uk_bin_collection/uk_bin_collection/councils/BurnleyBoroughCouncil.py,sha256=GJf1OPvUVj3vqsR3KjG0DFHZrSBu4ogIz_MJeVV8tNA,3192
@@ -118,6 +118,7 @@ uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py,sha256=gq_C
 uk_bin_collection/uk_bin_collection/councils/HarboroughDistrictCouncil.py,sha256=uAbCgfrqkIkEKUyLVE8l72s5tzbfMFsw775i0nVRAyc,1934
 uk_bin_collection/uk_bin_collection/councils/HaringeyCouncil.py,sha256=t_6AkAu4wrv8Q0WlDhWh_82I0djl5tk531Pzs-SjWzg,2647
 uk_bin_collection/uk_bin_collection/councils/HarrogateBoroughCouncil.py,sha256=_g3fP5Nq-OUjgNrfRf4UEyFKzq0x8QK-4enh5RP1efA,2050
+uk_bin_collection/uk_bin_collection/councils/HartDistrictCouncil.py,sha256=_llxT4JYYlwm20ZtS3fXwtDs6mwJyLTZBP2wBhvEpWk,2342
 uk_bin_collection/uk_bin_collection/councils/HartlepoolBoroughCouncil.py,sha256=MUT1A24iZShT2p55rXEvgYwGUuw3W05Z4ZQAveehv-s,2842
 uk_bin_collection/uk_bin_collection/councils/HertsmereBoroughCouncil.py,sha256=-ThSG6NIJP_wf2GmGL7SAvxbOujdhanZ8ECP4VSQCBs,5415
 uk_bin_collection/uk_bin_collection/councils/HighPeakCouncil.py,sha256=x7dfy8mdt2iGl8qJxHb-uBh4u0knmi9MJ6irOJw9WYA,4805
@@ -287,8 +288,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.123.2.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.123.2.dist-info/METADATA,sha256=wpSZCp1thutDXP9CUDfx_U4D5qKjpkCNdndMd7XYeeQ,17574
-uk_bin_collection-0.123.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.123.2.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.123.2.dist-info/RECORD,,
+uk_bin_collection-0.124.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.124.1.dist-info/METADATA,sha256=DVW3dzxr43iFYTE0MbQ6dgetaVGpIFnqt47wPLFXw_U,17574
+uk_bin_collection-0.124.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.124.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.124.1.dist-info/RECORD,,