uk_bin_collection 0.137.0__tar.gz → 0.138.0__tar.gz

{uk_bin_collection-0.137.0 → uk_bin_collection-0.138.0}/PKG-INFO

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

{uk_bin_collection-0.137.0 → uk_bin_collection-0.138.0}/pyproject.toml

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

{uk_bin_collection-0.137.0 → uk_bin_collection-0.138.0}/uk_bin_collection/tests/input.json

@@ -800,6 +800,13 @@
         "wiki_name": "Forest of Dean District Council",
         "wiki_note": "Pass the full address in the house number and postcode parameters. This parser requires a Selenium webdriver."
     },
+    "FyldeCouncil": {
+        "uprn": "100010402452",
+        "url": "https://www.fylde.gov.uk",
+        "wiki_command_url_override": "https://www.fylde.gov.uk",
+        "wiki_name": "Fylde Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "GatesheadCouncil": {
         "house_number": "Bracken Cottage",
         "postcode": "NE16 5LQ",
@@ -911,6 +918,13 @@
         "wiki_name": "Hartlepool Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
+    "HastingsBoroughCouncil": {
+        "uprn": "100060038877",
+        "url": "https://www.hastings.gov.uk",
+        "wiki_command_url_override": "https://www.hastings.gov.uk",
+        "wiki_name": "Hastings Borough Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "HerefordshireCouncil": {
         "url": "https://www.herefordshire.gov.uk/rubbish-recycling/check-bin-collection-day?blpu_uprn=10096232662",
         "wiki_command_url_override": "https://www.herefordshire.gov.uk/rubbish-recycling/check-bin-collection-day?blpu_uprn=XXXXXXXXXXXX",

uk_bin_collection-0.138.0/uk_bin_collection/uk_bin_collection/councils/FyldeCouncil.py

@@ -0,0 +1,92 @@
+import re
+import urllib.parse
+
+import requests
+from bs4 import BeautifulSoup, Tag
+
+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)
+        bindata = {"bins": []}
+
+        URI = "https://fylde.gov.uk/resident/bins-recycling-and-rubbish/bin-collection-day"
+
+        # Make the GET request
+        session = requests.Session()
+        response = session.get(URI)
+        response.raise_for_status()
+
+        soup: BeautifulSoup = BeautifulSoup(response.text, "html.parser")
+        iframe = soup.find("iframe", id="bartec-iframe")
+        if not iframe or not isinstance(iframe, Tag):
+            raise Exception("Unexpected response from fylde.gov.uk")
+
+        search_res = re.search(r"(?<=Token=)(.*?)(?=&|$)", str(iframe["src"]))
+        if search_res is None:
+            raise Exception("Token could not be extracted from fylde.gov.uk")
+        token = search_res.group(1)
+
+        if not token:
+            raise Exception("Token could not be extracted from fylde.gov.uk")
+
+        token = urllib.parse.unquote(token)
+
+        parameters = {
+            "Method": "calendareventsfromtoken",
+            "Token": token,
+            "UPRN": user_uprn,
+        }
+
+        API_URL = "https://collectiveview.bartec-systems.com/R152"
+        API_METHOD = "GetData.ashx"
+
+        response = session.get(f"{API_URL}/{API_METHOD}", params=parameters)
+        response.raise_for_status()
+
+        # Parse the JSON response
+        bin_collection = response.json()
+        if not (len(bin_collection) > 0 and "title" in bin_collection[0]):
+            raise Exception("Unexpected response from fylde.gov.uk API")
+
+        today = datetime.now()
+
+        REGEX_JOB_NAME = r"(?i)Empty Bin\s+(?P<bin_type>\S+(?:\s+\S+)?)"
+        # Loop through each collection in bin_collection
+        for collection in bin_collection:
+            bin_type = (
+                re.search(REGEX_JOB_NAME, collection["title"])
+                .group("bin_type")
+                .strip()
+                .title()
+            )
+            collection_date = datetime.fromtimestamp(
+                int(collection["start"][6:-2]) / 1000
+            )
+
+            if collection_date < today:
+                continue
+
+            dict_data = {
+                "type": bin_type,
+                "collectionDate": collection_date.strftime("%d/%m/%Y"),
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

{uk_bin_collection-0.137.0 → uk_bin_collection-0.138.0}/uk_bin_collection/uk_bin_collection/councils/GloucesterCityCouncil.py

@@ -42,13 +42,6 @@ class CouncilClass(AbstractGetBinDataClass):
             )
             cookies_button.click()
 
-            without_login_button = WebDriverWait(driver, timeout=15).until(
-                EC.presence_of_element_located(
-                    (By.LINK_TEXT, "or, Continue with no account")
-                )
-            )
-            without_login_button.click()
-
             iframe_presense = WebDriverWait(driver, 30).until(
                 EC.presence_of_element_located((By.ID, "fillform-frame-1"))
             )

uk_bin_collection-0.138.0/uk_bin_collection/uk_bin_collection/councils/HastingsBoroughCouncil.py

@@ -0,0 +1,53 @@
+from datetime import datetime, timedelta
+
+import requests
+
+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)
+        bindata = {"bins": []}
+
+        URI = "https://el.hastings.gov.uk/MyArea/CollectionDays.asmx/LookupCollectionDaysByService"
+
+        payload = {"Uprn": user_uprn}
+
+        # Make the GET request
+        response = requests.post(URI, json=payload, verify=False)
+        response.raise_for_status()
+
+        # Parse the JSON response
+        bin_collection = response.json()["d"]
+
+        # Loop through each collection in bin_collection
+        for collection in bin_collection:
+            bin_type = collection["Service"].removesuffix("collection service").strip()
+            for collection_date in collection["Dates"]:
+                collection_date = datetime.fromtimestamp(
+                    int(collection_date.strip("/").removeprefix("Date").strip("()"))
+                    / 1000
+                ) + timedelta(hours=1)
+
+                dict_data = {
+                    "type": bin_type,
+                    "collectionDate": collection_date.strftime("%d/%m/%Y"),
+                }
+                bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

{uk_bin_collection-0.137.0 → uk_bin_collection-0.138.0}/uk_bin_collection/uk_bin_collection/councils/MidDevonCouncil.py

@@ -18,6 +18,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
         user_uprn = kwargs.get("uprn")
         check_uprn(user_uprn)
+        user_uprn = str(user_uprn).zfill(12)
         bindata = {"bins": []}
 
         SESSION_URL = "https://my.middevon.gov.uk/authapi/isauthenticated?uri=https%253A%252F%252Fmy.middevon.gov.uk%252Fen%252FAchieveForms%252F%253Fform_uri%253Dsandbox-publish%253A%252F%252FAF-Process-2289dd06-9a12-4202-ba09-857fe756f6bd%252FAF-Stage-eb382015-001c-415d-beda-84f796dbb167%252Fdefinition.json%2526redirectlink%253D%25252Fen%2526cancelRedirectLink%253D%25252Fen%2526consentMessage%253Dyes&hostname=my.middevon.gov.uk&withCredentials=true"

{uk_bin_collection-0.137.0 → uk_bin_collection-0.138.0}/uk_bin_collection/uk_bin_collection/councils/WestOxfordshireDistrictCouncil.py

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