uk_bin_collection 0.75.0__tar.gz → 0.76.1__tar.gz

{uk_bin_collection-0.75.0 → uk_bin_collection-0.76.1}/PKG-INFO

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

{uk_bin_collection-0.75.0 → uk_bin_collection-0.76.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.75.0"
+version = "0.76.1"
 description = "Python Lib to collect UK Bin Data"
 readme = "README.md"
 authors = ["Robert Bradley <robbrad182@gmail.com>"]

{uk_bin_collection-0.75.0 → uk_bin_collection-0.76.1}/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-0.75.0 → uk_bin_collection-0.76.1}/uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py

@@ -75,6 +75,21 @@ class CouncilClass(AbstractGetBinDataClass):
 
             time.sleep(5)
 
+            try:
+                accept_cookies = WebDriverWait(driver, timeout=10).until(
+                    EC.presence_of_element_located((By.ID, "epdagree"))
+                )
+                accept_cookies.click()
+                accept_cookies_submit = WebDriverWait(driver, timeout=10).until(
+                    EC.presence_of_element_located((By.ID, "epdsubmit"))
+                )
+                accept_cookies_submit.click()
+            except:
+                print(
+                    "Accept cookies banner not found or clickable within the specified time."
+                )
+                pass
+
             postcode_input = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
                     (By.CSS_SELECTOR, '[aria-label="Postcode"]')

{uk_bin_collection-0.75.0 → uk_bin_collection-0.76.1}/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