uk_bin_collection 0.85.7__py3-none-any.whl → 0.86.1__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -69,11 +69,11 @@
         "wiki_note": "In order to use this parser, you must provide a valid postcode and a uprn retrieved from the councils website for your specific address"
     },
     "BelfastCityCouncil": {
+        "postcode": "BT10 0GY",
         "skip_get_url": true,
+        "uprn": "185086469",
         "url": "https://online.belfastcity.gov.uk/find-bin-collection-day/Default.aspx",
-        "wiki_name": "BelfastCityCouncil",
-        "postcode": "BT10 0GY",
-        "uprn": "185086469"
+        "wiki_name": "BelfastCityCouncil"
     },
     "BexleyCouncil": {
         "house_number": "1 Dorchester Avenue, Bexley",
@@ -298,8 +298,8 @@
     },
     "DorsetCouncil": {
         "skip_get_url": true,
-        "url": "https://www.dorsetcouncil.gov.uk/",
         "uprn": "100040711049",
+        "url": "https://www.dorsetcouncil.gov.uk/",
         "wiki_name": "Dorset Council"
     },
     "DoverDistrictCouncil": {
@@ -360,12 +360,12 @@
         "wiki_name": "Eastleigh Borough Council"
     },
     "EnfieldCouncil": {
-        "url": "https://www.enfield.gov.uk/services/rubbish-and-recycling/find-my-collection-day",
-        "wiki_name": "Enfield Council",
-        "skip_get_url": true,
-        "postcode": "N13 5AJ",
         "house_number": "111",
-        "web_driver": "http://selenium:4444"
+        "postcode": "N13 5AJ",
+        "skip_get_url": true,
+        "url": "https://www.enfield.gov.uk/services/rubbish-and-recycling/find-my-collection-day",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "Enfield Council"
     },
     "EnvironmentFirst": {
         "url": "https://environmentfirst.co.uk/house.php?uprn=100060055444",
@@ -599,9 +599,9 @@
         "postcode": "RH16 1SS",
         "skip_get_url": true,
         "url": "https://www.midsussex.gov.uk/waste-recycling/bin-collection/",
+        "web_driver": "http://selenium:4444",
         "wiki_name": "Mid Sussex District Council",
-        "wiki_note": "Pass the name of the street with the house number parameter, wrapped in double quotes",
-        "web_driver": "http://selenium:4444"
+        "wiki_note": "Pass the name of the street with the house number parameter, wrapped in double quotes"
     },
     "MiltonKeynesCityCouncil": {
         "uprn": "Fullers Slade",
@@ -813,6 +813,11 @@
         "wiki_name": "Rochford Council",
         "wiki_note": "No extra parameters are required. Dates presented should be read as 'week commencing'."
     },
+    "RotherhamCouncil": {
+        "url": "https://www.rotherham.gov.uk/bin-collections\\?address\\=100050866000\\&submit\\=Submit",
+        "uprn": "100050866000",
+        "wiki_name": "RotherhamCouncil"
+    },
     "RugbyBoroughCouncil": {
         "postcode": "CV22 6LA",
         "skip_get_url": true,
@@ -1199,12 +1204,12 @@
         "wiki_note": "Works with all collection areas that use Joint Waste Solutions. Just use the correct URL."
     },
     "WychavonDistrictCouncil": {
+        "postcode": "WR3 7RU",
+        "skip_get_url": true,
+        "uprn": "100120716273",
         "url": "https://selfservice.wychavon.gov.uk/wdcroundlookup/wdc_search.jsp",
-        "wiki_name": "WychavonDistrictCouncil",
         "web_driver": "http://selenium:4444",
-        "skip_get_url": true,
-        "postcode": "WR3 7RU", 
-        "uprn": "100120716273"
+        "wiki_name": "WychavonDistrictCouncil"
     },
     "WyreCouncil": {
         "postcode": "FY6 8HG",

uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py

@@ -0,0 +1,51 @@
+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)
+
+        response = requests.post(
+            "https://www.rotherham.gov.uk/bin-collections?address={}&submit=Submit".format(user_uprn)
+        )
+        # Make a BS4 object
+        soup = BeautifulSoup(response.text, features="html.parser")
+        soup.prettify()
+
+        data = {"bins": []}
+
+        table = soup.select('table')[0]
+
+        if table:
+            rows = table.select('tr')
+
+            for index, row in enumerate(rows):
+                bin_info_cell = row.select('td')
+                if bin_info_cell: 
+                    bin_type = bin_info_cell[0].get_text(separator=' ', strip=True)
+                    bin_collection = bin_info_cell[1]
+
+                    if bin_collection:
+                        dict_data = {
+                            "type": bin_type.title(),
+                            "collectionDate": datetime.strptime(
+                                bin_collection.get_text(strip=True), "%A, %d %B %Y"
+                            ).strftime(date_format),
+                        }
+
+                    data["bins"].append(dict_data)
+        else:
+            print("Something went wrong. Please open a GitHub issue.")
+
+        return data

uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py

@@ -1,15 +1,11 @@
 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
+from datetime import datetime
 
-
-# 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.
+    Concrete class to scrape bin collection data.
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
@@ -27,65 +23,71 @@ class CouncilClass(AbstractGetBinDataClass):
             soup.prettify()
 
             data = {"bins": []}
+            # Locate the section with bin collection data
             sections = soup.find_all("div", {"class": "wil_c-content-section_heading"})
+            
             for s in sections:
                 if s.get_text(strip=True).lower() == "bin collections":
                     rows = s.find_next_sibling(
                         "div", {"class": "c-content-section_body"}
-                    ).find_all("div", {"class": "u-mb-8"})
+                    ).find_all("div", class_="tablet:l-col-fb-4 u-mt-10")
+                    
                     for row in rows:
-                        title = row.find("div", {"class": "u-mb-4"})
-                        collections = row.find_all("div", {"class": "u-mb-2"})
-                        if title and collections:
+                        title_elem = row.find("div", class_="u-mb-4")
+                        if title_elem:
+                            title = title_elem.get_text(strip=True).capitalize()
+                            
+                            # Find all collection info in the same section
+                            collections = row.find_all("div", class_="u-mb-2")
                             for c in collections:
-                                if (
-                                    c.get_text(strip=True)
-                                    .lower()
-                                    .startswith("next collection")
-                                ):
-                                    # add next collection
-                                    next_collection_date = datetime.strptime(
-                                        c.get_text(strip=True).replace(
-                                            "Next collection - ", ""
-                                        ),
-                                        "%A, %d %B %Y",
-                                    ).strftime(date_format)
-                                    dict_data = {
-                                        "type": title.get_text(strip=True).capitalize(),
-                                        "collectionDate": next_collection_date,
-                                    }
-                                    data["bins"].append(dict_data)
-                                    # add future collections without duplicating next collection
-                                    future_collections = row.find(
-                                        "ul", {"class": "u-mt-4"}
-                                    ).find_all("li")
-                                    for c in future_collections:
+                                text = c.get_text(strip=True).lower()
+                                
+                                if "next collection" in text:
+                                    date_text = text.replace("next collection - ", "")
+                                    try:
+                                        next_collection_date = datetime.strptime(
+                                            date_text, "%A, %d %B %Y"
+                                        ).strftime(date_format)
+
+                                        dict_data = {
+                                            "type": title,
+                                            "collectionDate": next_collection_date
+                                        }
+                                        data["bins"].append(dict_data)
+                                    except ValueError:
+                                        # Skip if the date isn't a valid date
+                                        print(f"Skipping invalid date: {date_text}")
+                                    
+                            # Get future collections
+                            future_collections_section = row.find("ul", class_="u-mt-4")
+                            if future_collections_section:
+                                future_collections = future_collections_section.find_all("li")
+                                for future_collection in future_collections:
+                                    future_date_text = future_collection.get_text(strip=True)
+                                    try:
                                         future_collection_date = datetime.strptime(
-                                            c.get_text(strip=True),
-                                            "%A, %d %B %Y",
+                                            future_date_text, "%A, %d %B %Y"
                                         ).strftime(date_format)
-                                        if (
-                                            future_collection_date
-                                            != next_collection_date
-                                        ):
+
+                                        # Avoid duplicates of next collection date
+                                        if future_collection_date != next_collection_date:
                                             dict_data = {
-                                                "type": title.get_text(
-                                                    strip=True
-                                                ).capitalize(),
-                                                "collectionDate": future_collection_date,
+                                                "type": title,
+                                                "collectionDate": future_collection_date
                                             }
                                             data["bins"].append(dict_data)
+                                    except ValueError:
+                                        # Skip if the future collection date isn't valid
+                                        print(f"Skipping invalid future date: {future_date_text}")
 
+            # Sort the collections by date
             data["bins"].sort(
                 key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
             )
         except Exception as e:
-            # Here you can log the exception if needed
             print(f"An error occurred: {e}")
-            # Optionally, re-raise the exception if you want it to propagate
             raise
         finally:
-            # This block ensures that the driver is closed regardless of an exception
             if driver:
                 driver.quit()
         return data

{uk_bin_collection-0.85.7.dist-info → uk_bin_collection-0.86.1.dist-info}/METADATA

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

{uk_bin_collection-0.85.7.dist-info → uk_bin_collection-0.86.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=mhfscmGyBmckPef5PwBNFLus437GxD8E6WBlKxhzY5I,59728
+uk_bin_collection/tests/input.json,sha256=w1JMksNwhHC4EojFuBhlvn1NrPgrR1XojBqneb3hJyQ,59938
 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=LrOSt_loA1Mw3vTqaO2LpaDMu7rYJy6k5Kr-EOBln7s,3424
@@ -125,6 +125,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=_J2Eb5gec2Gmv_QYzKHT6sQleDnIHsn-5qf-T6TM9X0,2613
+uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py,sha256=sjZ00iBdqn2kOvGsWyMpY3h-HWmfC_K6LQ2wz1X5WGg,1761
 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
 uk_bin_collection/uk_bin_collection/councils/RushmoorCouncil.py,sha256=ZsGnXjoEaOS6U7fI0w7-uqxayAHdNVKsJi2fqIWEls8,3375
@@ -165,7 +166,7 @@ uk_bin_collection/uk_bin_collection/councils/TorridgeDistrictCouncil.py,sha256=6
 uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py,sha256=8CvO-WgdKdvyaOf3TYc4XwME8ogAXojgB40oyGRL8Dw,4129
 uk_bin_collection/uk_bin_collection/councils/ValeofGlamorganCouncil.py,sha256=Phgb_ECiUOOkqOx6OsfsTHMCW5VQfRmOC2zgYIQhuZA,5044
 uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py,sha256=5nZLbU5YVKNsJ2X_wuybrNLFAzjVAxkazu-bYP4IGXw,4292
-uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py,sha256=9zW4C0WKbsDLCKvFyVYFpyvp20JbrWc4G0HzadqF8WQ,4466
+uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py,sha256=-xqJOzHTrT4jOB3rHPXFYeqLaHyK9XmCPi92whaYBhw,4671
 uk_bin_collection/uk_bin_collection/councils/WalthamForest.py,sha256=P7MMw0EhpRmDbbnHb25tY5_yvYuZUFwJ1br4TOv24sY,4997
 uk_bin_collection/uk_bin_collection/councils/WarwickDistrictCouncil.py,sha256=3WQrAxzYzKoV4LyOqNTp9xINVsNi1xW9t8etducGeag,1146
 uk_bin_collection/uk_bin_collection/councils/WaverleyBoroughCouncil.py,sha256=tp9l7vdgSGRzNNG0pDfnNuFj4D2bpRJUJmAiTJ6bM0g,4662
@@ -186,8 +187,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=4s9ODGPAwPqwXc8SrTX5Wlfmizs3_58iXUtHc4Ir86o,1162
 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.85.7.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.85.7.dist-info/METADATA,sha256=QaL1Kok_IeZ67sAPpPQQBarqR_SHff1CY-3HPMTuoIM,16231
-uk_bin_collection-0.85.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.85.7.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.85.7.dist-info/RECORD,,
+uk_bin_collection-0.86.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.86.1.dist-info/METADATA,sha256=0Jhf4AjdTWOwmSNGJ_xLQNHjV-nrnLl0TXF6m_5_U8E,16231
+uk_bin_collection-0.86.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.86.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.86.1.dist-info/RECORD,,