uk_bin_collection 0.75.0__py3-none-any.whl → 0.76.0__py3-none-any.whl

uk_bin_collection/tests/council_feature_input_parity.py

@@ -8,7 +8,19 @@ def get_councils_from_files(branch):
     url = f"https://api.github.com/repos/robbrad/UKBinCollectionData/contents/uk_bin_collection/uk_bin_collection/councils?ref={branch}"
     response = requests.get(url)
     data = response.json()
-    return [item['name'].replace('.py', '') for item in data if item['name'].endswith('.py')]
+    
+    # Debugging lines to check the response content and type
+    print(f"Response Status Code: {response.status_code}")
+    print(f"Response Content: {response.content}")
+    print(f"Parsed JSON Data: {data}")
+    print(f"Data Type: {type(data)}")
+    
+    # Ensure 'data' is a list before proceeding
+    if isinstance(data, list):
+        return [item['name'].replace('.py', '') for item in data if item['name'].endswith('.py')]
+    else:
+        raise ValueError("Expected a list from the JSON response but got something else.")
+
 
 def get_councils_from_json(branch):
     url = f"https://raw.githubusercontent.com/robbrad/UKBinCollectionData/{branch}/uk_bin_collection/tests/input.json"

uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py

@@ -13,9 +13,7 @@ class CouncilClass(AbstractGetBinDataClass):
         data = {"bins": []}
         user_uprn = kwargs.get("uprn")
 
-        api_url = (
-            f"https://maps.westsuffolk.gov.uk/MyWestSuffolk.aspx?action=SetAddress&UniqueId={user_uprn}"
-        )
+        api_url = f"https://maps.westsuffolk.gov.uk/MyWestSuffolk.aspx?action=SetAddress&UniqueId={user_uprn}"
 
         response = requests.get(api_url)
 
@@ -33,7 +31,9 @@ class CouncilClass(AbstractGetBinDataClass):
             if tag_class is None:
                 return False
 
-            parent_has_header = cur_tag.parent.find_all("h4", string="Bin collection days")
+            parent_has_header = cur_tag.parent.find_all(
+                "h4", string="Bin collection days"
+            )
             if len(parent_has_header) < 1:
                 return False
 
@@ -46,19 +46,32 @@ class CouncilClass(AbstractGetBinDataClass):
             text_list = list(tag.stripped_strings)
             # Create and parse the list as tuples of name:date
             for bin_name, collection_date in itertools.batched(text_list, 2):
-                # Clean-up the bin_name
-                bin_name_clean = bin_name.strip().replace("\r", "").replace("\n", "")
-                bin_name_clean = re.sub(' +', ' ', bin_name_clean)
-
-                # Parse the date
-                next_collection = date_parse(collection_date)
-                next_collection = next_collection.replace(year=datetime.now().year)
-
-                dict_data = {
-                    "type": bin_name_clean,
-                    "collectionDate": next_collection.strftime(date_format),
-                }
-
-                data["bins"].append(dict_data)
+                try:
+                    # Clean-up the bin_name
+                    bin_name_clean = (
+                        bin_name.strip()
+                        .replace("\r", "")
+                        .replace("\n", "")
+                        .replace(":", "")
+                    )
+                    bin_name_clean = re.sub(" +", " ", bin_name_clean)
+
+                    # Get the bin colour
+                    bin_colour = "".join(re.findall(r"^(.*) ", bin_name_clean))
+
+                    # Parse the date
+                    next_collection = date_parse(collection_date)
+                    next_collection = next_collection.replace(year=datetime.now().year)
+
+                    dict_data = {
+                        "type": bin_name_clean,
+                        "colour": bin_colour,
+                        "collectionDate": next_collection.strftime(date_format),
+                    }
+
+                    data["bins"].append(dict_data)
+
+                except Exception as ex:
+                    raise ValueError(f"Error parsing bin data: {ex}")
 
         return data

{uk_bin_collection-0.75.0.dist-info → uk_bin_collection-0.76.0.dist-info}/METADATA

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

{uk_bin_collection-0.75.0.dist-info → uk_bin_collection-0.76.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-uk_bin_collection/tests/council_feature_input_parity.py,sha256=qS3JuQD__NomFiVvA0_xHL_kWRuvvRhLj_M30xUzcbg,3072
+uk_bin_collection/tests/council_feature_input_parity.py,sha256=66MrXc-3SnkricUV7LyAs9GFux7wEH31xcs9xbdB5Qo,3515
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=XIYnckDPBwBd7jTX2CN7Nv4mhUQsiJYOnYzvXVGfpdk,16246
 uk_bin_collection/tests/input.json,sha256=lbJZCvGd0kvIvI-0dD7Q9clMnkk_zX2UWbp8j2Ji1ow,53474
@@ -155,7 +155,7 @@ uk_bin_collection/uk_bin_collection/councils/WestBerkshireCouncil.py,sha256=r90A
 uk_bin_collection/uk_bin_collection/councils/WestLindseyDistrictCouncil.py,sha256=JFWUy4w0CKulGq16PfbRDKAdQEbokVEuabwlZYigdEU,4606
 uk_bin_collection/uk_bin_collection/councils/WestLothianCouncil.py,sha256=dq0jimtARvRkZiGbVFrXXZgY-BODtz3uYZ5UKn0bf64,4114
 uk_bin_collection/uk_bin_collection/councils/WestNorthamptonshireCouncil.py,sha256=F1GeJUGND4DN_HuM6N0Elpeb0DAMm9_KeqG6qtIgZf4,1079
-uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py,sha256=06GdKwfpbyJ0me3S6WGtAjG0bmdEuH6IupqSnu5xDYM,2143
+uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py,sha256=HMFWxM7VMhBuC7iubNGbZYEoCVWi--gRHDJMVdPPFOM,2633
 uk_bin_collection/uk_bin_collection/councils/WiganBoroughCouncil.py,sha256=YEbpbjkparhah4ahl6WZzI0mMHNrbKzdC6kA5gDQCUA,3745
 uk_bin_collection/uk_bin_collection/councils/WiltshireCouncil.py,sha256=it2Oh5Kmq3lD30gAZgk2bzZPNCtJcFHyQO1NgOQtfvU,5653
 uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py,sha256=triYeI4IIHF6_XMokF6BGAZkx_lPAXeGyuS9DEr5UxY,5553
@@ -164,8 +164,8 @@ uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=zDDa7n4K_zm5P
 uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bIdsvmoSzBjJAvTTi6yPfJa8xjJx1ys2w,1490
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=4s9ODGPAwPqwXc8SrTX5Wlfmizs3_58iXUtHc4Ir86o,1162
 uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=9qppF2oPkhmOoK8-ZkRIU1M6vhBh-yUCWAZEEd07iLk,5414
-uk_bin_collection-0.75.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.75.0.dist-info/METADATA,sha256=b_0s8wb3G7mz-D7aJGldKJYhveWr_59wZDTP-DXbplw,12594
-uk_bin_collection-0.75.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.75.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.75.0.dist-info/RECORD,,
+uk_bin_collection-0.76.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.76.0.dist-info/METADATA,sha256=fPVuZ8P3q1gKfuv1H9OEOUlFRxRWSuJmAWNXCaCZQfs,12594
+uk_bin_collection-0.76.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.76.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.76.0.dist-info/RECORD,,