uk_bin_collection 0.127.0__tar.gz → 0.127.2__tar.gz

{uk_bin_collection-0.127.0 → uk_bin_collection-0.127.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.127.0
+Version: 0.127.2
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com
@@ -256,7 +256,6 @@ Some councils need Selenium to run the scrape on behalf of Home Assistant. The e
     ```bash
     docker run -d -p 4444:4444 --name selenium-chrome selenium/standalone-chrome
     ```
-    
 
 #### Step 3: Test the Selenium Server
 
@@ -288,6 +287,71 @@ docker pull selenium/standalone-chrome docker run -d -p 4444:4444 --name seleniu
 
 ---
 
+### Instructions for Home Assistant OS
+
+If you're running Home Assistant Supervised, it's possible to host the Selenium instance on the same system.
+
+This guide is based on a Raspberry Pi 4. Instructions for other systems may vary.
+
+#### Prerequisites
+1. Install **Portainer** from Alex Belgium's add-on repository:
+   [github.com/alexbelgium/hassio-addons](https://github.com/alexbelgium/hassio-addons)
+
+---
+
+#### Step 1: Pull and Run Docker Image
+
+Since the Raspberry Pi 4 uses an ARM64-based architecture, use the `seleniarm/standalone-chromium:latest` Docker image.
+
+1. Open **Portainer** and navigate to the **Images** tab.
+2. In the **Image** text box, enter:
+
+   ```
+   seleniarm/standalone-chromium:latest
+   ```
+
+3. Click **Pull the image**.
+
+4. Once the image is pulled, navigate to the **Containers** tab and click **Add container**.
+
+5. Configure the container:
+   - **Name:** Give it a clear and descriptive name (e.g., `selenium-chromium`).
+   - **Image:** Enter:
+
+     ```
+     seleniarm/standalone-chromium
+     ```
+
+     Make sure to uncheck **Always pull the image**.
+
+   - **Network ports configuration:**
+     - Click **Map additional port**.
+     - Set both the **Host** and **Container** ports to `4444`.
+
+6. Click **Deploy the container**.
+
+---
+
+#### Step 2: Configure UKBinCollectionData Integration
+
+1. **Add the integration** in Home Assistant.
+
+2. On the second stage of the integration setup wizard:
+   - Ensure that `http://localhost:4444` shows as accessible.
+     - If not, verify that the Selenium container is running in Portainer.
+
+3. Enter the required information for the integration.
+
+4. In the **Remote Selenium Server** text box, enter:
+
+   ```
+   http://<HA IP address>:4444
+   ```
+
+   Replace `<HA IP address>` with the IP address of your Home Assistant system.
+
+---
+
 ## Reports
 
 ### Nightly Full Integration Test Reports:

{uk_bin_collection-0.127.0 → uk_bin_collection-0.127.2}/README.md

@@ -233,7 +233,6 @@ Some councils need Selenium to run the scrape on behalf of Home Assistant. The e
     ```bash
     docker run -d -p 4444:4444 --name selenium-chrome selenium/standalone-chrome
     ```
-    
 
 #### Step 3: Test the Selenium Server
 
@@ -265,6 +264,71 @@ docker pull selenium/standalone-chrome docker run -d -p 4444:4444 --name seleniu
 
 ---
 
+### Instructions for Home Assistant OS
+
+If you're running Home Assistant Supervised, it's possible to host the Selenium instance on the same system.
+
+This guide is based on a Raspberry Pi 4. Instructions for other systems may vary.
+
+#### Prerequisites
+1. Install **Portainer** from Alex Belgium's add-on repository:
+   [github.com/alexbelgium/hassio-addons](https://github.com/alexbelgium/hassio-addons)
+
+---
+
+#### Step 1: Pull and Run Docker Image
+
+Since the Raspberry Pi 4 uses an ARM64-based architecture, use the `seleniarm/standalone-chromium:latest` Docker image.
+
+1. Open **Portainer** and navigate to the **Images** tab.
+2. In the **Image** text box, enter:
+
+   ```
+   seleniarm/standalone-chromium:latest
+   ```
+
+3. Click **Pull the image**.
+
+4. Once the image is pulled, navigate to the **Containers** tab and click **Add container**.
+
+5. Configure the container:
+   - **Name:** Give it a clear and descriptive name (e.g., `selenium-chromium`).
+   - **Image:** Enter:
+
+     ```
+     seleniarm/standalone-chromium
+     ```
+
+     Make sure to uncheck **Always pull the image**.
+
+   - **Network ports configuration:**
+     - Click **Map additional port**.
+     - Set both the **Host** and **Container** ports to `4444`.
+
+6. Click **Deploy the container**.
+
+---
+
+#### Step 2: Configure UKBinCollectionData Integration
+
+1. **Add the integration** in Home Assistant.
+
+2. On the second stage of the integration setup wizard:
+   - Ensure that `http://localhost:4444` shows as accessible.
+     - If not, verify that the Selenium container is running in Portainer.
+
+3. Enter the required information for the integration.
+
+4. In the **Remote Selenium Server** text box, enter:
+
+   ```
+   http://<HA IP address>:4444
+   ```
+
+   Replace `<HA IP address>` with the IP address of your Home Assistant system.
+
+---
+
 ## Reports
 
 ### Nightly Full Integration Test Reports:

{uk_bin_collection-0.127.0 → uk_bin_collection-0.127.2}/pyproject.toml

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

{uk_bin_collection-0.127.0 → uk_bin_collection-0.127.2}/uk_bin_collection/uk_bin_collection/councils/RushcliffeBoroughCouncil.py

@@ -7,6 +7,7 @@ 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 string
 
 # import the wonderful Beautiful Soup and the URL grabber
 class CouncilClass(AbstractGetBinDataClass):
@@ -37,42 +38,57 @@ class CouncilClass(AbstractGetBinDataClass):
             # Populate postcode field
             inputElement_postcode = driver.find_element(
                 By.ID,
-                "ctl00_ContentPlaceHolder1_FF3518TB",
+                "FF3518-text",
             )
             inputElement_postcode.send_keys(user_postcode)
 
             # Click search button
             driver.find_element(
                 By.ID,
-                "ctl00_ContentPlaceHolder1_FF3518BTN",
+                "FF3518-find",
             ).click()
 
-            # Wait for the 'Select address' dropdown to appear and select option matching UPRN
+            # Wait for the 'Select address' dropdown to be visible and select option matching UPRN
             dropdown = WebDriverWait(driver, 10).until(
-                EC.presence_of_element_located(
-                    (By.ID, "ctl00_ContentPlaceHolder1_FF3518DDL")
+                EC.visibility_of_element_located(
+                    (By.ID, "FF3518-list")
                 )
             )
+
             # Create a 'Select' for it, then select the matching URPN option
             dropdownSelect = Select(dropdown)
-            dropdownSelect.select_by_value("U" + user_uprn)
+            found_uprn = False
+            for o in dropdownSelect.options:
+                ov = o.get_dom_attribute("value")
+                if "U" + user_uprn in ov:
+                    dropdownSelect.select_by_value(ov)
+                    found_uprn = True
+                    break
+
+            if not found_uprn:
+                raise Exception("could not find UPRN " + user_uprn + " in list")
+
+            # Click submit button
+            driver.find_element(
+                By.ID,
+                "submit-button",
+            ).click()
 
-            # Wait for the submit button to appear, then click it to get the collection dates
-            submit = WebDriverWait(driver, 10).until(
+            # Wait for the confirmation panel to appear
+            conf_div = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
-                    (By.ID, "ctl00_ContentPlaceHolder1_btnSubmit")
+                    (By.CLASS_NAME, "ss_confPanel")
                 )
             )
-            submit.click()
 
             soup = BeautifulSoup(driver.page_source, features="html.parser")
 
-            bins_text = soup.find("div", id="ctl00_ContentPlaceHolder1_pnlConfirmation")
+            bins_text = soup.find("div", id="body-content")
 
             if bins_text:
                 results = re.findall(
-                    "Your (.*?) bin will next be collected on (\d\d?\/\d\d?\/\d{4})",
-                    bins_text.find("div", {"class": "ss_confPanel"}).get_text(),
+                    r"Your (.*?) bin will next be collected on (\d\d?\/\d\d?\/\d{4})",
+                    bins_text.get_text(),
                 )
                 if results:
                     for result in results:

{uk_bin_collection-0.127.0 → uk_bin_collection-0.127.2}/uk_bin_collection/uk_bin_collection/councils/SouthOxfordshireCouncil.py

@@ -66,7 +66,7 @@ class CouncilClass(AbstractGetBinDataClass):
                             "%A %d %B - %Y",
                         )
                     ).strftime(date_format)
-                    bin_type = str.capitalize(bin_info[1])
+                    bin_type = str.capitalize(' '.join(bin_info[1:]))
                 # On exceptional collection schedule (e.g. around English Bank Holidays), date will be contained in the second stripped string
                 else:
                     bin_date = get_next_occurrence_from_day_month(
@@ -75,7 +75,7 @@ class CouncilClass(AbstractGetBinDataClass):
                             "%A %d %B - %Y",
                         )
                     ).strftime(date_format)
-                    bin_type = str.capitalize(bin_info[2])
+                    str.capitalize(' '.join(bin_info[2:]))
             except Exception as ex:
                 raise ValueError(f"Error parsing bin data: {ex}")