uk_bin_collection 0.152.7__tar.gz → 0.152.8__tar.gz

{uk_bin_collection-0.152.7 → uk_bin_collection-0.152.8}/PKG-INFO

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

{uk_bin_collection-0.152.7 → uk_bin_collection-0.152.8}/pyproject.toml

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

{uk_bin_collection-0.152.7 → uk_bin_collection-0.152.8}/uk_bin_collection/uk_bin_collection/councils/BedfordshireCouncil.py

@@ -28,6 +28,8 @@ class CouncilClass(AbstractGetBinDataClass):
         headers = {
             "Origin": "https://www.centralbedfordshire.gov.uk",
             "Referer": "https://www.centralbedfordshire.gov.uk/info/163/bins_and_waste_collections_-_check_bin_collection_day",
+
+            "User-Agent": "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.7968.1811 Mobile Safari/537.36",
         }
 
         files = {

{uk_bin_collection-0.152.7 → uk_bin_collection-0.152.8}/uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py

@@ -22,6 +22,15 @@ class CouncilClass(AbstractGetBinDataClass):
         "Next brown bin collection": "Brown Bin",
         "Next food bin collection": "Food Bin",
     }
+    HEADERS = {
+        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8",
+        "Accept-Language": "en-GB,en;q=0.9",
+        "Connection": "keep-alive",
+        "Host": "www.midlothian.gov.uk",
+        "Referer": "https://www.midlothian.gov.uk/info/200284/bins_and_recycling",
+        "Upgrade-Insecure-Requests": "1",
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36",
+    }
 
     def parse_data(self, page: str, **kwargs) -> dict:
 
@@ -46,7 +55,7 @@ class CouncilClass(AbstractGetBinDataClass):
         search_url = self.DIRECTORY_URL.format(quote(postcode))
 
         try:
-            search_results_html = requests.get(search_url)
+            search_results_html = requests.get(search_url, headers=self.HEADERS)
             search_results_html.raise_for_status()
 
             soup = BeautifulSoup(search_results_html.text, "html.parser")
@@ -93,7 +102,7 @@ class CouncilClass(AbstractGetBinDataClass):
                     next_page_url = next_page_link["href"]
 
                     # Send a GET request to the next page
-                    next_response = requests.get(next_page_url)
+                    next_response = requests.get(next_page_url, headers=self.HEADERS)
                     next_response.raise_for_status()  # Raise an exception for HTTP errors
 
                     # Parse the HTML content of the next page
@@ -116,7 +125,7 @@ class CouncilClass(AbstractGetBinDataClass):
     def _fetch_bin_collection_data(self, url: str) -> list:
         """Fetch and parse bin collection data from the given URL."""
         try:
-            bin_collection_html = requests.get(url)
+            bin_collection_html = requests.get(url, headers=self.HEADERS)
             bin_collection_html.raise_for_status()
 
             soup = BeautifulSoup(bin_collection_html.text, "html.parser")

{uk_bin_collection-0.152.7 → uk_bin_collection-0.152.8}/uk_bin_collection/uk_bin_collection/councils/NewcastleUnderLymeCouncil.py

@@ -23,7 +23,8 @@ class CouncilClass(AbstractGetBinDataClass):
         URI = f"https://www.newcastle-staffs.gov.uk/homepage/97/check-your-bin-day?uprn={user_uprn}"
 
         # Make the GET request
-        response = requests.get(URI)
+        request_headers = {'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'}
+        response = requests.get(URI, headers=request_headers) 
         response.raise_for_status()
         soup = BeautifulSoup(response.text, features="html.parser")
         soup.prettify()

{uk_bin_collection-0.152.7 → uk_bin_collection-0.152.8}/uk_bin_collection/uk_bin_collection/councils/RoyalBoroughofGreenwich.py

@@ -22,12 +22,18 @@ class CouncilClass(AbstractGetBinDataClass):
         check_paon(user_paon)
         bindata = {"bins": []}
 
+        headers = {
+            "Origin": "https://www.royalgreenwich.gov.uk/",
+            "Referer": "https://www.royalgreenwich.gov.uk/info/200171/recycling_and_rubbish/100/bin_collection_days",
+            "User-Agent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64)",
+        }
+
         user_postcode = user_postcode.replace(" ", "+")
 
         URI = f"https://www.royalgreenwich.gov.uk/site/custom_scripts/apps/waste-collection/new2023/source.php?term={user_postcode}"
 
         # Make the GET request
-        response = requests.get(URI)
+        response = requests.get(URI, headers=headers)
 
         for address in response.json():
             if user_paon in address:
@@ -38,7 +44,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
         data = {"address": collection_address}
 
-        response = requests.post(URI, data=data)
+        response = requests.post(URI, data=data, headers=headers)
 
         response = response.json()
 

{uk_bin_collection-0.152.7 → uk_bin_collection-0.152.8}/uk_bin_collection/uk_bin_collection/councils/SwindonBoroughCouncil.py

@@ -22,9 +22,10 @@ class CouncilClass(AbstractGetBinDataClass):
         bindata = {"bins": []}
 
         URI = f"https://www.swindon.gov.uk/info/20122/rubbish_and_recycling_collection_days?addressList={user_uprn}&uprnSubmit=Yes"
+        headers = {"User-Agent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64)"}
 
         # Make the GET request
-        response = requests.get(URI)
+        response = requests.get(URI, headers=headers)
 
         # Parse the JSON response
         soup = BeautifulSoup(response.text, "html.parser")

{uk_bin_collection-0.152.7 → uk_bin_collection-0.152.8}/uk_bin_collection/uk_bin_collection/councils/WestOxfordshireDistrictCouncil.py

@@ -42,12 +42,12 @@ class CouncilClass(AbstractGetBinDataClass):
             wait = WebDriverWait(driver, 60)
             address_entry_field = wait.until(
                 EC.presence_of_element_located(
-                    (By.XPATH, '//*[@id="combobox-input-22"]')
+                    (By.XPATH, '//*[@id="combobox-input-23"]')
                 )
             )
 
             address_entry_field = wait.until(
-                EC.element_to_be_clickable((By.XPATH, '//*[@id="combobox-input-22"]'))
+                EC.element_to_be_clickable((By.XPATH, '//*[@id="combobox-input-23"]'))
             )
             address_entry_field.click()
             address_entry_field.send_keys(str(full_address))
@@ -56,7 +56,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
             first_found_address = wait.until(
                 EC.element_to_be_clickable(
-                    (By.XPATH, '//*[@id="dropdown-element-22"]/ul')
+                    (By.XPATH, '//*[@id="dropdown-element-23"]/ul')
                 )
             )