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

uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py

@@ -1,15 +1,16 @@
-from bs4 import BeautifulSoup
+import time
 from datetime import datetime
+
+from bs4 import BeautifulSoup
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 from selenium.webdriver.support.wait import WebDriverWait
-import time
+
 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
 
 
@@ -34,7 +35,7 @@ class CouncilClass(AbstractGetBinDataClass):
                 f"https://webapp.halton.gov.uk/PublicWebForms/WasteServiceSearchv1.aspx"
             )
 
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             # If you bang in the house number (or property name) and postcode in the box it should find your property

uk_bin_collection/uk_bin_collection/councils/HighPeakCouncil.py

@@ -66,7 +66,7 @@ class CouncilClass(AbstractGetBinDataClass):
             headless = kwargs.get("headless")
 
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             # Hide Cookies

uk_bin_collection/uk_bin_collection/councils/KingstonUponThamesCouncil.py

@@ -4,14 +4,16 @@
 
 # switched to using Selenium as the htmx elements are not rendered reliably with requests
 
+import re
+
+from bs4 import BeautifulSoup
 from selenium import webdriver
 from selenium.webdriver.common.by import By
-from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
-from bs4 import BeautifulSoup
+from selenium.webdriver.support.ui import WebDriverWait
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
-import re
 
 
 # import the wonderful Beautiful Soup and the URL grabber
@@ -29,7 +31,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
             headless = kwargs.get("headless")
             web_driver = kwargs.get("web_driver")
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(kwargs.get("url"))
             wait = WebDriverWait(driver, 15, 2)
 

uk_bin_collection/uk_bin_collection/councils/KirkleesCouncil.py

@@ -61,7 +61,7 @@ class CouncilClass(AbstractGetBinDataClass):
         user_postcode = kwargs["postcode"]
 
         self._driver = driver = create_webdriver(
-            web_driver=kwargs["web_driver"], headless=kwargs.get("headless", True)
+            web_driver=kwargs["web_driver"], headless=kwargs.get("headless", True), session_name=__name__
         )
         driver.implicitly_wait(1)
 

uk_bin_collection/uk_bin_collection/councils/KnowsleyMBCouncil.py

@@ -1,13 +1,14 @@
 import time
 
 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 selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 from selenium.webdriver.support.wait import WebDriverWait
 
+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):
@@ -30,7 +31,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_postcode(user_postcode)
 
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(
                 "https://knowsleytransaction.mendixcloud.com/link/youarebeingredirected?target=bincollectioninformation"
             )

uk_bin_collection/uk_bin_collection/councils/LeedsCityCouncil.py

@@ -1,17 +1,16 @@
+import urllib.request
 from datetime import datetime
-from uk_bin_collection.uk_bin_collection.common import *
-from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
+import pandas as pd
 from bs4 import BeautifulSoup
-from datetime import datetime
 from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 from selenium.webdriver.support.wait import WebDriverWait
-from selenium.webdriver.common.keys import Keys
 
-import pandas as pd
-import urllib.request
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
 
 class CouncilClass(AbstractGetBinDataClass):
@@ -37,7 +36,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Create Selenium webdriver
             page = f"https://www.leeds.gov.uk/residents/bins-and-recycling/check-your-bin-day"
 
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             wait = WebDriverWait(driver, 60)

uk_bin_collection/uk_bin_collection/councils/LondonBoroughRedbridge.py

@@ -1,19 +1,19 @@
-import re
-import requests
-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
-
 # This script pulls (in one hit) the data from Bromley Council Bins Data
 import datetime
+import re
+import time
 from datetime import datetime
+
+import requests
+from bs4 import BeautifulSoup
 from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 from selenium.webdriver.support.wait import WebDriverWait
-from selenium.webdriver.common.keys import Keys
-import time
+
+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
@@ -34,7 +34,7 @@ class CouncilClass(AbstractGetBinDataClass):
             postcode = kwargs.get("postcode")
             web_driver = kwargs.get("web_driver")
             headless = kwargs.get("headless")
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(kwargs.get("url"))
 
             wait = WebDriverWait(driver, 60)

uk_bin_collection/uk_bin_collection/councils/MidAndEastAntrimBoroughCouncil.py

@@ -1,10 +1,11 @@
-from bs4 import BeautifulSoup
 import time
+
+from bs4 import BeautifulSoup
 from dateutil.relativedelta import relativedelta
+from selenium.common.exceptions import NoSuchElementException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import Select
-from selenium.common.exceptions import NoSuchElementException
 
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
@@ -31,7 +32,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Create Selenium webdriver
             options = webdriver.ChromeOptions()
             options.add_experimental_option("excludeSwitches", ["enable-logging"])
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
 
             driver.get(page)
 

uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py

@@ -1,4 +1,5 @@
 import time
+
 from bs4 import BeautifulSoup
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
@@ -29,7 +30,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_postcode(user_postcode)
 
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get("https://www.npt.gov.uk/2195")
 
             # Accept cookies banner

uk_bin_collection/uk_bin_collection/councils/NorthEastDerbyshireDistrictCouncil.py

@@ -1,5 +1,6 @@
-from bs4 import BeautifulSoup
 from datetime import datetime
+
+from bs4 import BeautifulSoup
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
@@ -8,7 +9,6 @@ from selenium.webdriver.support.wait import WebDriverWait
 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
 
 
@@ -35,7 +35,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_uprn(user_uprn)
             check_postcode(user_postcode)
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             # If you bang in the house number (or property name) and postcode in the box it should find your property

uk_bin_collection/uk_bin_collection/councils/NorthNorfolkDistrictCouncil.py

@@ -31,7 +31,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_postcode(user_postcode)
 
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             # Populate postcode field

uk_bin_collection/uk_bin_collection/councils/NorthWestLeicestershire.py

@@ -1,15 +1,15 @@
-from bs4 import BeautifulSoup
+import re  # Import regular expressions
 from datetime import datetime, timedelta
+
+from bs4 import BeautifulSoup
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 from selenium.webdriver.support.wait import WebDriverWait
-import re  # Import regular expressions
 
 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
 
 
@@ -34,7 +34,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Create Selenium webdriver
             page = f"https://my.nwleics.gov.uk/my-property-finder?address={user_postcode}&go=1"
 
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             # If you bang in the house number (or property name) and postcode in the box it should find your property

uk_bin_collection/uk_bin_collection/councils/NorthumberlandCouncil.py

@@ -1,11 +1,11 @@
 import time
+
 from bs4 import BeautifulSoup
 from selenium.webdriver.common.by import By
 
 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
 
 
@@ -39,7 +39,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_postcode(user_postcode)
 
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             time.sleep(1)

uk_bin_collection/uk_bin_collection/councils/PortsmouthCityCouncil.py

@@ -1,15 +1,15 @@
-from bs4 import BeautifulSoup
+import time
 from datetime import datetime
+
+from bs4 import BeautifulSoup
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 from selenium.webdriver.support.wait import WebDriverWait
 
-import time
 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
 
 
@@ -34,7 +34,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_uprn(user_uprn)
             check_postcode(user_postcode)
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             # If you bang in the house number (or property name) and postcode in the box it should find your property

uk_bin_collection/uk_bin_collection/councils/PrestonCityCouncil.py

@@ -1,14 +1,14 @@
-from bs4 import BeautifulSoup
 from datetime import datetime
+
+from bs4 import BeautifulSoup
 from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 from selenium.webdriver.support.wait import WebDriverWait
 
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
-from selenium.webdriver.common.keys import Keys
-
 
 # import the wonderful Beautiful Soup and the URL grabber
 
@@ -35,7 +35,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_postcode(user_postcode)
 
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             # If you bang in the house number (or property name) and postcode in the box it should find your property

uk_bin_collection/uk_bin_collection/councils/ReigateAndBansteadBoroughCouncil.py

@@ -26,7 +26,7 @@ class CouncilClass(AbstractGetBinDataClass):
             user_uprn = user_uprn.zfill(12)
 
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(
                 f"https://my.reigate-banstead.gov.uk/en/service/Bins_and_recycling___collections_calendar?uprn={user_uprn}"
             )

uk_bin_collection/uk_bin_collection/councils/RenfrewshireCouncil.py

@@ -27,7 +27,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_postcode(user_postcode)
 
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(
                 "https://www.renfrewshire.gov.uk/article/2320/Check-your-bin-collection-day"
             )

uk_bin_collection/uk_bin_collection/councils/RushcliffeBoroughCouncil.py

@@ -31,7 +31,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_postcode(user_postcode)
 
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             # Populate postcode field

uk_bin_collection/uk_bin_collection/councils/SevenoaksDistrictCouncil.py

@@ -1,12 +1,12 @@
 import time
 from typing import Any
 
+from dateutil.parser import parse
+from selenium.common.exceptions import NoSuchElementException, TimeoutException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
-from selenium.common.exceptions import TimeoutException, NoSuchElementException
-from selenium.webdriver.support.ui import Select, WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
-from dateutil.parser import parse
+from selenium.webdriver.support.ui import Select, WebDriverWait
 
 from uk_bin_collection.uk_bin_collection.common import create_webdriver, date_format
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
@@ -32,7 +32,7 @@ class CouncilClass(AbstractGetBinDataClass):
             user_paon = kwargs.get("paon")
 
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(page)
 
             # Enter postcode

uk_bin_collection/uk_bin_collection/councils/StaffordshireMoorlandsDistrictCouncil.py

@@ -26,7 +26,7 @@ class CouncilClass(AbstractGetBinDataClass):
         check_postcode(user_postcode)
 
         # Create Selenium webdriver
-        driver = create_webdriver(web_driver, headless)
+        driver = create_webdriver(web_driver, headless, None, __name__)
         driver.get("https://www.staffsmoorlands.gov.uk/findyourbinday")
 
         # Close cookies banner

uk_bin_collection/uk_bin_collection/councils/SunderlandCityCouncil.py

@@ -1,11 +1,12 @@
 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 selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import Select
 from selenium.webdriver.support.wait import WebDriverWait
 
+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):
@@ -28,8 +29,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_paon(user_paon)
             check_postcode(user_postcode)
 
-            driver = create_webdriver(web_driver, headless)
-            # driver = webdriver.Chrome(service=ChromeService(ChromeDriverManager().install()))
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(
                 "https://webapps.sunderland.gov.uk/WEBAPPS/WSS/Sunderland_Portal/Forms/bindaychecker.aspx"
             )

uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py

@@ -17,7 +17,7 @@ class CouncilClass(AbstractGetBinDataClass):
         try:
             # Create Selenium webdriver
             headless = kwargs.get("headless")
-            driver = create_webdriver(kwargs.get("web_driver"), headless)
+            driver = create_webdriver(kwargs.get("web_driver"), headless, None, __name__)
             driver.get(kwargs.get("url"))
 
             # Make a BS4 object

uk_bin_collection/uk_bin_collection/councils/WestBerkshireCouncil.py

@@ -32,10 +32,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_postcode(user_postcode)
 
             # Create Selenium webdriver
-            # driver = create_webdriver(web_driver, headless)
-            driver = webdriver.Chrome(
-                service=ChromeService(ChromeDriverManager().install())
-            )
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get("https://www.westberks.gov.uk/binday")
 
             # Wait for the postcode field to appear then populate it

uk_bin_collection/uk_bin_collection/councils/WestLothianCouncil.py

@@ -27,7 +27,7 @@ class CouncilClass(AbstractGetBinDataClass):
             check_postcode(user_postcode)
 
             # Create Selenium webdriver
-            driver = create_webdriver(web_driver, headless)
+            driver = create_webdriver(web_driver, headless, None, __name__)
             driver.get(
                 "https://www.westlothian.gov.uk/article/31528/Bin-Collection-Calendar-Dates"
             )

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.74.1.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.74.1
+Version: 0.76.0
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com