uk_bin_collection 0.152.1__py3-none-any.whl → 0.152.3__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- uk_bin_collection/tests/input.json +3 -1
- uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py +47 -30
- uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py +18 -0
- uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py +0 -1
- uk_bin_collection/uk_bin_collection/councils/EastleighBoroughCouncil.py +7 -2
- uk_bin_collection/uk_bin_collection/councils/NorthHertfordshireDistrictCouncil.py +257 -63
- uk_bin_collection/uk_bin_collection/councils/NorthLincolnshireCouncil.py +2 -1
- {uk_bin_collection-0.152.1.dist-info → uk_bin_collection-0.152.3.dist-info}/METADATA +179 -1
- {uk_bin_collection-0.152.1.dist-info → uk_bin_collection-0.152.3.dist-info}/RECORD +12 -12
- {uk_bin_collection-0.152.1.dist-info → uk_bin_collection-0.152.3.dist-info}/LICENSE +0 -0
- {uk_bin_collection-0.152.1.dist-info → uk_bin_collection-0.152.3.dist-info}/WHEEL +0 -0
- {uk_bin_collection-0.152.1.dist-info → uk_bin_collection-0.152.3.dist-info}/entry_points.txt +0 -0
@@ -1693,9 +1693,10 @@
|
|
1693
1693
|
"LAD24CD": "E06000012"
|
1694
1694
|
},
|
1695
1695
|
"NorthHertfordshireDistrictCouncil": {
|
1696
|
-
"house_number": "
|
1696
|
+
"house_number": "22",
|
1697
1697
|
"postcode": "SG6 4BJ",
|
1698
1698
|
"url": "https://www.north-herts.gov.uk",
|
1699
|
+
"web_driver": "http://selenium:4444",
|
1699
1700
|
"wiki_name": "North Hertfordshire",
|
1700
1701
|
"wiki_note": "Pass the house number and postcode in their respective parameters.",
|
1701
1702
|
"LAD24CD": "E07000099"
|
@@ -2180,6 +2181,7 @@
|
|
2180
2181
|
},
|
2181
2182
|
"SouthRibbleCouncil": {
|
2182
2183
|
"uprn": "010013246384",
|
2184
|
+
"postcode": "PR5 6DT",
|
2183
2185
|
"url": "https://www.southribble.gov.uk",
|
2184
2186
|
"wiki_command_url_override": "https://www.southribble.gov.uk",
|
2185
2187
|
"wiki_name": "South Ribble",
|
@@ -37,38 +37,55 @@ class CouncilClass(AbstractGetBinDataClass):
|
|
37
37
|
paragraphs = bin_row.find_all("p")
|
38
38
|
|
39
39
|
for p in paragraphs:
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
40
|
+
# Check for both singular and plural "Next collection(s):"
|
41
|
+
if p.get_text() and (
|
42
|
+
"Next collection:" in p.get_text()
|
43
|
+
or "Next collections:" in p.get_text()
|
44
|
+
):
|
45
|
+
# Extract collection dates
|
46
|
+
date_text = (
|
47
|
+
p.get_text()
|
48
|
+
.replace("Next collection:", "")
|
49
|
+
.replace("Next collections:", "")
|
50
|
+
.strip()
|
47
51
|
)
|
48
52
|
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
53
|
+
# Split multiple dates if comma-separated
|
54
|
+
date_strings = [date.strip() for date in date_text.split(",")]
|
55
|
+
|
56
|
+
for date_str in date_strings:
|
57
|
+
try:
|
58
|
+
# Extract day number from date string (e.g. "2" from "Tuesday 27th May")
|
59
|
+
day_number = int("".join(filter(str.isdigit, date_str)))
|
60
|
+
# Replace ordinal in date string with plain number
|
61
|
+
date_str = date_str.replace(
|
62
|
+
get_date_with_ordinal(day_number), str(day_number)
|
63
|
+
)
|
64
|
+
|
65
|
+
# Parse date with full format
|
66
|
+
bin_date = datetime.strptime(date_str, "%A %d %B")
|
67
|
+
|
68
|
+
# Add current year since it's not in the date string
|
69
|
+
current_year = datetime.now().year
|
70
|
+
bin_date = bin_date.replace(year=current_year)
|
71
|
+
|
72
|
+
# If the date is in the past, it's probably for next year
|
73
|
+
if bin_date < datetime.now():
|
74
|
+
bin_date = bin_date.replace(year=current_year + 1)
|
75
|
+
|
76
|
+
collections.append((bin_type, bin_date))
|
77
|
+
print(
|
78
|
+
f"Successfully parsed date for {bin_type}: {bin_date}"
|
79
|
+
)
|
80
|
+
|
81
|
+
except ValueError as e:
|
82
|
+
print(
|
83
|
+
f"Failed to parse date '{date_str}' for {bin_type}: {e}"
|
84
|
+
)
|
85
|
+
continue
|
86
|
+
|
87
|
+
# Found and processed the collection dates, so break the loop
|
88
|
+
break
|
72
89
|
|
73
90
|
except Exception as e:
|
74
91
|
print(f"Error processing bin row: {e}")
|
@@ -130,4 +130,22 @@ class CouncilClass(AbstractGetBinDataClass):
|
|
130
130
|
key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
|
131
131
|
)
|
132
132
|
|
133
|
+
data["bins"].sort(
|
134
|
+
key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
|
135
|
+
)
|
136
|
+
|
137
|
+
# Deduplicate the bins based on type and collection date
|
138
|
+
# Feels a bit hacky, but fixes
|
139
|
+
# https://github.com/robbrad/UKBinCollectionData/issues/1436
|
140
|
+
unique_bins = []
|
141
|
+
seen = set()
|
142
|
+
for bin_item in data["bins"]:
|
143
|
+
# Create a unique identifier for each bin entry
|
144
|
+
bin_key = (bin_item["type"], bin_item["collectionDate"])
|
145
|
+
if bin_key not in seen:
|
146
|
+
seen.add(bin_key)
|
147
|
+
unique_bins.append(bin_item)
|
148
|
+
|
149
|
+
data["bins"] = unique_bins
|
150
|
+
|
133
151
|
return data
|
@@ -9,7 +9,6 @@ from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataC
|
|
9
9
|
This module provides bin collection data for Cheshire East Council.
|
10
10
|
"""
|
11
11
|
|
12
|
-
|
13
12
|
class CouncilClass(AbstractGetBinDataClass):
|
14
13
|
"""
|
15
14
|
A class to fetch and parse bin collection data for Cheshire East Council.
|
@@ -77,8 +77,13 @@ class CouncilClass(AbstractGetBinDataClass):
|
|
77
77
|
return data
|
78
78
|
|
79
79
|
except Exception as e:
|
80
|
-
|
81
|
-
|
80
|
+
import traceback
|
81
|
+
|
82
|
+
error_message = f"Error fetching/parsing data for Eastleigh: {str(e)}\n{traceback.format_exc()}"
|
83
|
+
print(error_message)
|
84
|
+
# Use the correct date format for the error fallback
|
85
|
+
today = datetime.now().strftime("%d/%m/%Y")
|
86
|
+
return {"bins": [{"type": "Error", "collectionDate": today}]}
|
82
87
|
finally:
|
83
88
|
if "driver" in locals():
|
84
89
|
driver.quit()
|
@@ -1,93 +1,287 @@
|
|
1
|
-
|
1
|
+
# direct URL works, but includes a token, so I'm using Selenium
|
2
|
+
# https://waste.nc.north-herts.gov.uk/w/webpage/find-bin-collection-day-show-details?webpage_token=c7c7c3cbc2f0478735fc746ca985b8f4221dea31c24dde99e39fb1c556b07788&auth=YTc5YTAwZmUyMGQ3&id=1421457
|
3
|
+
|
4
|
+
import re
|
5
|
+
import time
|
6
|
+
from datetime import datetime
|
7
|
+
|
2
8
|
from bs4 import BeautifulSoup
|
9
|
+
from dateutil.parser import parse
|
10
|
+
from selenium.common.exceptions import NoSuchElementException, TimeoutException
|
11
|
+
from selenium.webdriver.common.by import By
|
12
|
+
from selenium.webdriver.common.keys import Keys
|
13
|
+
from selenium.webdriver.support import expected_conditions as EC
|
14
|
+
from selenium.webdriver.support.ui import Select
|
15
|
+
from selenium.webdriver.support.wait import WebDriverWait
|
3
16
|
|
4
17
|
from uk_bin_collection.uk_bin_collection.common import *
|
5
18
|
from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
|
6
19
|
|
7
20
|
|
8
|
-
# import the wonderful Beautiful Soup and the URL grabber
|
9
21
|
class CouncilClass(AbstractGetBinDataClass):
|
10
|
-
"""
|
11
|
-
Concrete classes have to implement all abstract operations of the
|
12
|
-
base class. They can also override some operations with a default
|
13
|
-
implementation.
|
14
|
-
"""
|
15
22
|
|
16
23
|
def parse_data(self, page: str, **kwargs) -> dict:
|
24
|
+
driver = None
|
25
|
+
try:
|
26
|
+
data = {"bins": []}
|
27
|
+
|
28
|
+
user_paon = kwargs.get("paon")
|
29
|
+
postcode = kwargs.get("postcode")
|
30
|
+
web_driver = kwargs.get("web_driver")
|
31
|
+
headless = kwargs.get("headless")
|
32
|
+
url = "https://waste.nc.north-herts.gov.uk/w/webpage/find-bin-collection-day-input-address"
|
33
|
+
|
34
|
+
driver = create_webdriver(web_driver, headless, None, __name__)
|
35
|
+
driver.get(url)
|
36
|
+
|
37
|
+
WebDriverWait(driver, 10).until(
|
38
|
+
lambda d: d.execute_script("return document.readyState") == "complete"
|
39
|
+
)
|
40
|
+
|
41
|
+
# Define the wait variable
|
42
|
+
wait = WebDriverWait(
|
43
|
+
driver, 20
|
44
|
+
) # Create the wait object with a 20-second timeout
|
45
|
+
|
46
|
+
# Enter postcode - try different approaches for reliability
|
47
|
+
# print("Looking for postcode input...")
|
48
|
+
|
49
|
+
postcode_input = wait.until(
|
50
|
+
EC.element_to_be_clickable(
|
51
|
+
(
|
52
|
+
By.CSS_SELECTOR,
|
53
|
+
"input.relation_path_type_ahead_search.form-control",
|
54
|
+
)
|
55
|
+
),
|
56
|
+
message="Postcode input not found by class",
|
57
|
+
)
|
58
|
+
postcode_input.clear()
|
59
|
+
postcode_input.send_keys(postcode)
|
60
|
+
# print(f"Entered postcode: {postcode}")
|
61
|
+
|
62
|
+
# Wait for the dropdown to load
|
63
|
+
# print("Waiting for address list to populate...")
|
64
|
+
try:
|
65
|
+
# Wait for the results to appear
|
66
|
+
wait.until(
|
67
|
+
EC.presence_of_element_located(
|
68
|
+
(By.CSS_SELECTOR, ".relation_path_type_ahead_results_holder")
|
69
|
+
),
|
70
|
+
message="Address results container not found",
|
71
|
+
)
|
72
|
+
|
73
|
+
# Wait for list items to appear
|
74
|
+
wait.until(
|
75
|
+
EC.presence_of_all_elements_located(
|
76
|
+
(By.CSS_SELECTOR, ".relation_path_type_ahead_results_holder li")
|
77
|
+
),
|
78
|
+
message="No address items found in the list",
|
79
|
+
)
|
80
|
+
# print("Address list populated successfully")
|
81
|
+
|
82
|
+
# Search for user_paon in the address list using aria-label attribute
|
83
|
+
try:
|
84
|
+
# Use XPath to look for aria-label containing user_paon
|
85
|
+
address_xpath = (
|
86
|
+
f"//li[@aria-label and contains(@aria-label, '{user_paon}')]"
|
87
|
+
)
|
88
|
+
matching_address = wait.until(
|
89
|
+
EC.element_to_be_clickable((By.XPATH, address_xpath)),
|
90
|
+
message=f"No address containing '{user_paon}' found in aria-label attributes",
|
91
|
+
)
|
92
|
+
# print(f"Found matching address: {matching_address.get_attribute('aria-label')}")
|
93
|
+
matching_address.click()
|
94
|
+
# print("Clicked on matching address")
|
95
|
+
|
96
|
+
# Allow time for the selection to take effect
|
97
|
+
time.sleep(2)
|
98
|
+
|
99
|
+
# Find and click the "Select address and continue" button
|
100
|
+
continue_button = wait.until(
|
101
|
+
EC.element_to_be_clickable(
|
102
|
+
(
|
103
|
+
By.CSS_SELECTOR,
|
104
|
+
"input.btn.bg-green[value='Select address and continue']",
|
105
|
+
)
|
106
|
+
),
|
107
|
+
message="Could not find 'Select address and continue' button",
|
108
|
+
)
|
109
|
+
# print("Found 'Select address and continue' button, clicking it...")
|
110
|
+
continue_button.click()
|
111
|
+
# print("Clicked on 'Select address and continue' button")
|
112
|
+
|
113
|
+
# Allow time for the page to load after clicking the button
|
114
|
+
time.sleep(3)
|
115
|
+
except TimeoutException as e:
|
116
|
+
# print(f"Error finding address: {e}")
|
117
|
+
raise
|
118
|
+
except TimeoutException as e:
|
119
|
+
# print(f"Error loading address list: {e}")
|
120
|
+
raise
|
121
|
+
|
122
|
+
# After pressing Next button and waiting for page to load
|
123
|
+
# print("Looking for schedule list...")
|
124
|
+
|
125
|
+
# Wait for the page to load - giving it extra time
|
126
|
+
time.sleep(5)
|
127
|
+
|
128
|
+
# Use only the selector that we know works
|
129
|
+
# print("Looking for bin type elements...")
|
130
|
+
try:
|
131
|
+
bin_type_selector = (
|
132
|
+
By.CSS_SELECTOR,
|
133
|
+
"div.formatting_bold.formatting_size_bigger.formatting span.value-as-text",
|
134
|
+
)
|
135
|
+
WebDriverWait(driver, 15).until(
|
136
|
+
EC.presence_of_element_located(bin_type_selector)
|
137
|
+
)
|
138
|
+
# print(f"Found bin type elements with selector: {bin_type_selector}")
|
139
|
+
except TimeoutException:
|
140
|
+
# print("Could not find bin type elements. Taking screenshot for debugging...")
|
141
|
+
screenshot_path = f"bin_type_error_{int(time.time())}.png"
|
142
|
+
driver.save_screenshot(screenshot_path)
|
143
|
+
# print(f"Screenshot saved to {screenshot_path}")
|
144
|
+
|
145
|
+
# Create BS4 object from driver's page source
|
146
|
+
# print("Parsing page with BeautifulSoup...")
|
147
|
+
soup = BeautifulSoup(driver.page_source, features="html.parser")
|
148
|
+
|
149
|
+
# Initialize data dictionary
|
150
|
+
data = {"bins": []}
|
151
|
+
|
152
|
+
# Looking for bin types in the exact HTML structure
|
153
|
+
bin_type_elements = soup.select(
|
154
|
+
"div.formatting_bold.formatting_size_bigger.formatting span.value-as-text"
|
155
|
+
)
|
156
|
+
# print(f"Found {len(bin_type_elements)} bin type elements")
|
157
|
+
|
158
|
+
# Look specifically for date elements with the exact structure
|
159
|
+
date_elements = soup.select("div.col-sm-12.font-xs-3xl span.value-as-text")
|
160
|
+
hidden_dates = soup.select(
|
161
|
+
"div.col-sm-12.font-xs-3xl input[type='hidden'][value*='/']"
|
162
|
+
)
|
163
|
+
|
164
|
+
# print(f"Found {len(bin_type_elements)} bin types and {len(date_elements)} date elements")
|
165
|
+
|
166
|
+
# We need a smarter way to match bin types with their dates
|
167
|
+
bin_count = 0
|
168
|
+
|
169
|
+
# Map of bin types to their collection dates
|
170
|
+
bin_date_map = {}
|
171
|
+
|
172
|
+
# Extract all date strings that look like actual dates
|
173
|
+
date_texts = []
|
174
|
+
date_pattern = re.compile(
|
175
|
+
r"(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)\s+\d+(?:st|nd|rd|th)?\s+\w+\s+\d{4}",
|
176
|
+
re.IGNORECASE,
|
177
|
+
)
|
17
178
|
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
179
|
+
for element in date_elements:
|
180
|
+
text = element.get_text(strip=True)
|
181
|
+
if date_pattern.search(text):
|
182
|
+
date_texts.append(text)
|
183
|
+
# print(f"Found valid date text: {text}")
|
23
184
|
|
24
|
-
|
185
|
+
# Find hidden date inputs with values in DD/MM/YYYY format
|
186
|
+
hidden_date_values = []
|
187
|
+
for hidden in hidden_dates:
|
188
|
+
value = hidden.get("value", "")
|
189
|
+
if re.match(r"\d{1,2}/\d{1,2}/\d{4}", value):
|
190
|
+
hidden_date_values.append(value)
|
191
|
+
# print(f"Found hidden date value: {value}")
|
25
192
|
|
26
|
-
|
193
|
+
# When filtering date elements
|
194
|
+
date_elements = soup.select("div.col-sm-12.font-xs-3xl span.value-as-text")
|
195
|
+
valid_date_elements = []
|
27
196
|
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
197
|
+
for element in date_elements:
|
198
|
+
text = element.get_text(strip=True)
|
199
|
+
if contains_date(text):
|
200
|
+
valid_date_elements.append(element)
|
201
|
+
# print(f"Found valid date element: {text}")
|
202
|
+
else:
|
203
|
+
pass
|
204
|
+
# print(f"Skipping non-date element: {text}")
|
34
205
|
|
35
|
-
|
206
|
+
# print(f"Found {len(bin_type_elements)} bin types and {len(valid_date_elements)} valid date elements")
|
36
207
|
|
37
|
-
|
38
|
-
|
208
|
+
# When processing each bin type
|
209
|
+
for i, bin_type_elem in enumerate(bin_type_elements):
|
210
|
+
bin_type = bin_type_elem.get_text(strip=True)
|
39
211
|
|
40
|
-
|
41
|
-
|
212
|
+
# Try to find a date for this bin type
|
213
|
+
date_text = None
|
42
214
|
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
215
|
+
# Look for a valid date element
|
216
|
+
if i < len(valid_date_elements):
|
217
|
+
date_elem = valid_date_elements[i]
|
218
|
+
date_text = date_elem.get_text(strip=True)
|
47
219
|
|
48
|
-
|
49
|
-
|
50
|
-
|
220
|
+
# If we don't have a valid date yet, try using the hidden input
|
221
|
+
if not date_text or not contains_date(date_text):
|
222
|
+
if i < len(hidden_dates):
|
223
|
+
date_value = hidden_dates[i].get("value")
|
224
|
+
if contains_date(date_value):
|
225
|
+
date_text = date_value
|
51
226
|
|
52
|
-
|
227
|
+
# Skip if we don't have a valid date
|
228
|
+
if not date_text or not contains_date(date_text):
|
229
|
+
# print(f"No valid date found for bin type: {bin_type}")
|
230
|
+
continue
|
53
231
|
|
54
|
-
|
55
|
-
alink = soup.find("div", id="property_list").find("a")
|
232
|
+
# print(f"Found bin type: {bin_type} with date: {date_text}")
|
56
233
|
|
57
|
-
|
58
|
-
|
234
|
+
try:
|
235
|
+
# Clean up the date text
|
236
|
+
date_text = remove_ordinal_indicator_from_date_string(date_text)
|
59
237
|
|
60
|
-
|
238
|
+
# Try to parse the date
|
239
|
+
try:
|
240
|
+
collection_date = datetime.strptime(
|
241
|
+
date_text, "%A %d %B %Y"
|
242
|
+
).date()
|
243
|
+
except ValueError:
|
244
|
+
try:
|
245
|
+
collection_date = datetime.strptime(
|
246
|
+
date_text, "%d/%m/%Y"
|
247
|
+
).date()
|
248
|
+
except ValueError:
|
249
|
+
# Last resort
|
250
|
+
collection_date = parse(date_text).date()
|
61
251
|
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
soup = BeautifulSoup(r.text, features="html.parser")
|
252
|
+
# Create bin entry
|
253
|
+
bin_entry = {
|
254
|
+
"type": bin_type,
|
255
|
+
"collectionDate": collection_date.strftime(date_format),
|
256
|
+
}
|
68
257
|
|
69
|
-
|
70
|
-
|
258
|
+
# Add to data
|
259
|
+
data["bins"].append(bin_entry)
|
260
|
+
bin_count += 1
|
261
|
+
# print(f"Added bin entry: {bin_entry}")
|
71
262
|
|
72
|
-
|
263
|
+
except Exception as e:
|
264
|
+
pass
|
265
|
+
# print(f"Error parsing date '{date_text}': {str(e)}")
|
73
266
|
|
74
|
-
|
75
|
-
lis = u1.find_all("li", recursive=False)
|
267
|
+
# print(f"Successfully parsed {bin_count} bin collections")
|
76
268
|
|
77
|
-
|
78
|
-
|
269
|
+
if not data["bins"]:
|
270
|
+
# print("No bin data found. Saving page for debugging...")
|
271
|
+
with open(f"debug_page_{int(time.time())}.html", "w") as f:
|
272
|
+
f.write(driver.page_source)
|
273
|
+
driver.save_screenshot(f"final_error_screenshot_{int(time.time())}.png")
|
274
|
+
raise ValueError(
|
275
|
+
"No bin collection data could be extracted from the page"
|
276
|
+
)
|
79
277
|
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
"%d/%m/%Y",
|
85
|
-
).strftime(date_format),
|
86
|
-
}
|
87
|
-
bindata["bins"].append(dict_data)
|
278
|
+
# Sort the bin collections by date
|
279
|
+
data["bins"].sort(
|
280
|
+
key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
|
281
|
+
)
|
88
282
|
|
89
|
-
|
90
|
-
key=lambda x: datetime.strptime(x.get("collectionDate"), date_format)
|
91
|
-
)
|
283
|
+
return data
|
92
284
|
|
93
|
-
|
285
|
+
except Exception as e:
|
286
|
+
# print(f"Error parsing bin collection data: {e}")
|
287
|
+
raise
|
@@ -46,7 +46,8 @@ class CouncilClass(AbstractGetBinDataClass):
|
|
46
46
|
"type": bin_type,
|
47
47
|
"collectionDate": get_next_occurrence_from_day_month(
|
48
48
|
datetime.strptime(
|
49
|
-
|
49
|
+
remove_ordinal_indicator_from_date_string(
|
50
|
+
c["BinCollectionDate"].replace(" (*)", "").strip())
|
50
51
|
+ " "
|
51
52
|
+ datetime.now().strftime("%Y"),
|
52
53
|
"%A %d %B %Y",
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.1
|
2
2
|
Name: uk_bin_collection
|
3
|
-
Version: 0.152.
|
3
|
+
Version: 0.152.3
|
4
4
|
Summary: Python Lib to collect UK Bin Data
|
5
5
|
Author: Robert Bradley
|
6
6
|
Author-email: robbrad182@gmail.com
|
@@ -398,6 +398,184 @@ Open the map viewer in VS Code:
|
|
398
398
|

|
399
399
|
|
400
400
|
---
|
401
|
+
## ICS Calendar Generation
|
402
|
+
|
403
|
+
You can convert bin collection data to an ICS calendar file that can be imported into calendar applications like Google Calendar, Apple Calendar, Microsoft Outlook, etc.
|
404
|
+
|
405
|
+
### Overview
|
406
|
+
|
407
|
+
The `bin_to_ics.py` script allows you to:
|
408
|
+
- Convert JSON output from bin collection data into ICS calendar events
|
409
|
+
- Group multiple bin collections on the same day into a single event
|
410
|
+
- Create all-day events (default) or timed events
|
411
|
+
- Add optional reminders/alarms to events
|
412
|
+
- Customize the calendar name
|
413
|
+
|
414
|
+
### Requirements
|
415
|
+
|
416
|
+
- Python 3.6 or higher
|
417
|
+
- The `icalendar` package, which can be installed with:
|
418
|
+
```bash
|
419
|
+
pip install icalendar
|
420
|
+
```
|
421
|
+
|
422
|
+
### Basic Usage
|
423
|
+
|
424
|
+
```bash
|
425
|
+
# Basic usage with stdin input and default output file (bin.ics)
|
426
|
+
python bin_to_ics.py < bin_data.json
|
427
|
+
|
428
|
+
# Specify input and output files
|
429
|
+
python bin_to_ics.py -i bin_data.json -o my_calendar.ics
|
430
|
+
|
431
|
+
# Custom calendar name
|
432
|
+
python bin_to_ics.py -i bin_data.json -o my_calendar.ics -n "My Bin Collections"
|
433
|
+
```
|
434
|
+
|
435
|
+
### Options
|
436
|
+
|
437
|
+
```
|
438
|
+
--input, -i Input JSON file (if not provided, read from stdin)
|
439
|
+
--output, -o Output ICS file (default: bin.ics)
|
440
|
+
--name, -n Calendar name (default: Bin Collections)
|
441
|
+
--alarms, -a Comma-separated list of alarm times before event (e.g., "1d,2h,30m")
|
442
|
+
--no-all-day Create timed events instead of all-day events
|
443
|
+
```
|
444
|
+
|
445
|
+
### Examples
|
446
|
+
|
447
|
+
#### Adding Reminders (Alarms)
|
448
|
+
|
449
|
+
Add reminders 1 day and 2 hours before each collection:
|
450
|
+
|
451
|
+
```bash
|
452
|
+
python bin_to_ics.py -i bin_data.json -a "1d,2h"
|
453
|
+
```
|
454
|
+
|
455
|
+
The time format supports:
|
456
|
+
- Days: `1d`, `2day`, `3days`
|
457
|
+
- Hours: `1h`, `2hour`, `3hours`
|
458
|
+
- Minutes: `30m`, `45min`, `60mins`, `90minutes`
|
459
|
+
|
460
|
+
#### Creating Timed Events
|
461
|
+
|
462
|
+
By default, events are created as all-day events. To create timed events instead (default time: 7:00 AM):
|
463
|
+
|
464
|
+
```bash
|
465
|
+
python bin_to_ics.py -i bin_data.json --no-all-day
|
466
|
+
```
|
467
|
+
|
468
|
+
### Integration with Bin Collection Data Retriever
|
469
|
+
|
470
|
+
You can pipe the output from the bin collection data retriever directly to the ICS generator. The required parameters (postcode, house number, UPRN, etc.) depend on the specific council implementation - refer to the [Quickstart](#quickstart) section above or check the [project wiki](https://github.com/robbrad/UKBinCollectionData/wiki) for details about your council.
|
471
|
+
|
472
|
+
```bash
|
473
|
+
python uk_bin_collection/uk_bin_collection/collect_data.py CouncilName "URL" [OPTIONS] |
|
474
|
+
python bin_to_ics.py [OPTIONS]
|
475
|
+
```
|
476
|
+
|
477
|
+
#### Complete Example for a Council
|
478
|
+
|
479
|
+
```bash
|
480
|
+
python uk_bin_collection/uk_bin_collection/collect_data.py CouncilName \
|
481
|
+
"council_url" \
|
482
|
+
-p "YOUR_POSTCODE" \
|
483
|
+
-n "YOUR_HOUSE_NUMBER" \
|
484
|
+
-w "http://localhost:4444/wd/hub" |
|
485
|
+
python bin_to_ics.py \
|
486
|
+
--name "My Bin Collections" \
|
487
|
+
--output my_bins.ics \
|
488
|
+
--alarms "1d,12h"
|
489
|
+
```
|
490
|
+
|
491
|
+
This will:
|
492
|
+
1. Fetch bin collection data for your address from your council's website
|
493
|
+
2. Convert it to an ICS file named "my_bins.ics"
|
494
|
+
3. Set the calendar name to "My Bin Collections"
|
495
|
+
4. Add reminders 1 day and 12 hours before each collection
|
496
|
+
|
497
|
+
For postcode lookup and UPRN information, please check the [UPRN Finder](#uprn-finder) section above.
|
498
|
+
|
499
|
+
### Using the Calendar
|
500
|
+
|
501
|
+
You have two options for using the generated ICS file:
|
502
|
+
|
503
|
+
#### 1. Importing the Calendar
|
504
|
+
|
505
|
+
You can directly import the ICS file into your calendar application:
|
506
|
+
|
507
|
+
- **Google Calendar**: Go to Settings > Import & export > Import
|
508
|
+
- **Apple Calendar**: File > Import
|
509
|
+
- **Microsoft Outlook**: File > Open & Export > Import/Export > Import an iCalendar (.ics)
|
510
|
+
|
511
|
+
Note: Importing creates a static copy of the calendar events. If bin collection dates change, you'll need to re-import the calendar.
|
512
|
+
|
513
|
+
#### 2. Subscribing to the Calendar
|
514
|
+
|
515
|
+
If you host the ICS file on a publicly accessible web server, you can subscribe to it as an internet calendar:
|
516
|
+
|
517
|
+
- **Google Calendar**: Go to "Other calendars" > "+" > "From URL" > Enter the URL of your hosted ICS file
|
518
|
+
- **Apple Calendar**: File > New Calendar Subscription > Enter the URL
|
519
|
+
- **Microsoft Outlook**: File > Account Settings > Internet Calendars > New > Enter the URL
|
520
|
+
|
521
|
+
Benefits of subscribing:
|
522
|
+
- Calendar automatically updates when the source file changes
|
523
|
+
- No need to manually re-import when bin collection dates change
|
524
|
+
- Easily share the calendar with household members
|
525
|
+
|
526
|
+
You can set up a cron job or scheduled task to regularly:
|
527
|
+
1. Retrieve the latest bin collection data
|
528
|
+
2. Generate a fresh ICS file
|
529
|
+
3. Publish it to a web-accessible location
|
530
|
+
|
531
|
+
### Additional Examples and Use Cases
|
532
|
+
|
533
|
+
#### Automation with Cron Jobs
|
534
|
+
|
535
|
+
Create a weekly update script on a Linux/Mac system:
|
536
|
+
|
537
|
+
```bash
|
538
|
+
#!/bin/bash
|
539
|
+
# File: update_bin_calendar.sh
|
540
|
+
|
541
|
+
# Set variables
|
542
|
+
COUNCIL="YourCouncilName"
|
543
|
+
COUNCIL_URL="https://your-council-website.gov.uk/bins"
|
544
|
+
POSTCODE="YOUR_POSTCODE"
|
545
|
+
HOUSE_NUMBER="YOUR_HOUSE_NUMBER"
|
546
|
+
OUTPUT_DIR="/var/www/html/calendars" # Web-accessible directory
|
547
|
+
CALENDAR_NAME="Household Bins"
|
548
|
+
|
549
|
+
# Ensure output directory exists
|
550
|
+
mkdir -p $OUTPUT_DIR
|
551
|
+
|
552
|
+
# Run the collector and generate the calendar
|
553
|
+
cd /path/to/UKBinCollectionData && \
|
554
|
+
python uk_bin_collection/uk_bin_collection/collect_data.py $COUNCIL "$COUNCIL_URL" \
|
555
|
+
-p "$POSTCODE" -n "$HOUSE_NUMBER" | \
|
556
|
+
python bin_to_ics.py --name "$CALENDAR_NAME" --output "$OUTPUT_DIR/bins.ics" --alarms "1d,6h"
|
557
|
+
|
558
|
+
# Add timestamp to show last update time
|
559
|
+
echo "Calendar last updated: $(date)" > "$OUTPUT_DIR/last_update.txt"
|
560
|
+
```
|
561
|
+
|
562
|
+
Make the script executable:
|
563
|
+
```bash
|
564
|
+
chmod +x update_bin_calendar.sh
|
565
|
+
```
|
566
|
+
|
567
|
+
Add to crontab to run weekly (every Monday at 2 AM):
|
568
|
+
```bash
|
569
|
+
0 2 * * 1 /path/to/update_bin_calendar.sh
|
570
|
+
```
|
571
|
+
|
572
|
+
**Google Assistant/Alexa Integration**
|
573
|
+
|
574
|
+
If you have your calendar connected to Google Calendar or Outlook, you can ask your smart assistant about upcoming bin collections:
|
575
|
+
|
576
|
+
- "Hey Google, when is my next bin collection?"
|
577
|
+
- "Alexa, what's on my calendar tomorrow?" (will include bin collections)
|
578
|
+
|
401
579
|
## Docker API Server
|
402
580
|
We have created an API for this located under [uk_bin_collection_api_server](https://github.com/robbrad/UKBinCollectionData/uk_bin_collection_api_server)
|
403
581
|
|
@@ -7,7 +7,7 @@ uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-c
|
|
7
7
|
uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
|
8
8
|
uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
|
9
9
|
uk_bin_collection/tests/generate_map_test_results.py,sha256=CKnGK2ZgiSXomRGkomX90DitgMP-X7wkHhyKORDcL2E,1144
|
10
|
-
uk_bin_collection/tests/input.json,sha256=
|
10
|
+
uk_bin_collection/tests/input.json,sha256=93VJl5bKKggne94vYtI71b1WLGhcI7NSVZF3bmXjJ1A,132548
|
11
11
|
uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
|
12
12
|
uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
|
13
13
|
uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=VZ0a81sioJULD7syAYHjvK_-nT_Rd36tUyzPetSA0gk,3475
|
@@ -19,7 +19,7 @@ uk_bin_collection/uk_bin_collection/collect_data.py,sha256=dB7wWXsJX4fm5bIf84lex
|
|
19
19
|
uk_bin_collection/uk_bin_collection/common.py,sha256=izotgwavB08pUWisNL3wqcBrE9E1-bdrq-v6YKyriDE,11034
|
20
20
|
uk_bin_collection/uk_bin_collection/councils/AberdeenCityCouncil.py,sha256=Je8VwVLK9KnYl9vqf2gWJ7ZYDgUq3A7caDiIzk5Xof8,4194
|
21
21
|
uk_bin_collection/uk_bin_collection/councils/AberdeenshireCouncil.py,sha256=aO1CSdyqa8oAD0fB79y1Q9bikAWCP_JFa7CsyTa2j9s,1655
|
22
|
-
uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py,sha256=
|
22
|
+
uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py,sha256=N0BcdTxRlCiCh6SPluPK3wMlNDli8_wJgUOOwe4hgSE,4250
|
23
23
|
uk_bin_collection/uk_bin_collection/councils/AmberValleyBoroughCouncil.py,sha256=mTeluIIEcuxLxhfDQ95A1fp8RM6AkJT5tRGZPUbYGdk,1853
|
24
24
|
uk_bin_collection/uk_bin_collection/councils/AngusCouncil.py,sha256=YlhAnxkRAAvrwbUvleNKUuLROcwMTps2eMHElpuctm4,5894
|
25
25
|
uk_bin_collection/uk_bin_collection/councils/AntrimAndNewtonabbeyCouncil.py,sha256=Hp5pteaC5RjL5ZqPZ564S9WQ6ZTKLMO6Dl_fxip2TUc,1653
|
@@ -50,7 +50,7 @@ uk_bin_collection/uk_bin_collection/councils/BolsoverCouncil.py,sha256=_NZuSvSbl
|
|
50
50
|
uk_bin_collection/uk_bin_collection/councils/BoltonCouncil.py,sha256=WI68r8jB0IHPUT4CgmZMtng899AAMFTxkyTdPg9yLF8,4117
|
51
51
|
uk_bin_collection/uk_bin_collection/councils/BostonBoroughCouncil.py,sha256=8xv6FMNj8Qgwn5K0nMdB5X8hkcNFzhcJ48DMordflJY,5631
|
52
52
|
uk_bin_collection/uk_bin_collection/councils/BracknellForestCouncil.py,sha256=Llo1rULaAZ8rChVYZqXFFLo7CN6vbT0ULUJD6ActouY,9015
|
53
|
-
uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py,sha256=
|
53
|
+
uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py,sha256=qtCGHIwKDJQw0SNvQr0EZub21PFPDsdcxABOPv_MC6s,6114
|
54
54
|
uk_bin_collection/uk_bin_collection/councils/BraintreeDistrictCouncil.py,sha256=2vYHilpI8mSwC2Ykdr1gxYAN3excDWqF6AwtGbkwbTw,2441
|
55
55
|
uk_bin_collection/uk_bin_collection/councils/BrecklandCouncil.py,sha256=PX6A_pDvaN109aSNWmEhm88GFKfkClIkmbwGURWvsks,1744
|
56
56
|
uk_bin_collection/uk_bin_collection/councils/BrentCouncil.py,sha256=BsP7V0vezteX0WAxcxqMf3g6ro-J78W6hubefALRMyg,5222
|
@@ -76,7 +76,7 @@ uk_bin_collection/uk_bin_collection/councils/CharnwoodBoroughCouncil.py,sha256=F
|
|
76
76
|
uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py,sha256=EB88D0MNJwuDZ2GX1ENc5maGYx17mnHTCtNl6s-v11E,5090
|
77
77
|
uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py,sha256=bGxfMO4PpTd6ZTfm1hA9tmNUFDKGt20CMJolZ3K_CeM,16411
|
78
78
|
uk_bin_collection/uk_bin_collection/councils/CherwellDistrictCouncil.py,sha256=VxTe9qk93MFgtELEgVrEz3W0vYaG_32EpPmky_b4j0k,2590
|
79
|
-
uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py,sha256=
|
79
|
+
uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py,sha256=RoybPitUD4u0xk4Kc9hXqHbUXCqGJG9Z4uRHWKj4ttk,2495
|
80
80
|
uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py,sha256=5mKZf22NgdyBY-SqV0c2q8b8IJobkoZrsfGEVUcxUyM,3544
|
81
81
|
uk_bin_collection/uk_bin_collection/councils/ChesterfieldBoroughCouncil.py,sha256=mZiM8Ugm_OP0JkC5pLaQmi4i79mAp4SNNrcIdsREjHw,7198
|
82
82
|
uk_bin_collection/uk_bin_collection/councils/ChichesterDistrictCouncil.py,sha256=bvtqXSZN64jSND0NxwzJ-WA9H49FwARQMGS3PlUSiUg,6311
|
@@ -114,7 +114,7 @@ uk_bin_collection/uk_bin_collection/councils/EastRidingCouncil.py,sha256=oL-Nqri
|
|
114
114
|
uk_bin_collection/uk_bin_collection/councils/EastStaffordshireBoroughCouncil.py,sha256=s13zlAN9Rac-RVHNFLIjIY0X8C6sPTNS37EL2t6vXw8,3692
|
115
115
|
uk_bin_collection/uk_bin_collection/councils/EastSuffolkCouncil.py,sha256=qQ0oOfGd0sWcczse_B22YoeL9uj3og8v3UJLt_Sx29c,4353
|
116
116
|
uk_bin_collection/uk_bin_collection/councils/EastbourneBoroughCouncil.py,sha256=t2-Ri58feN4BHZ-yZx83QjmWuxlCkF7iu9UvXJ2rVp8,2669
|
117
|
-
uk_bin_collection/uk_bin_collection/councils/EastleighBoroughCouncil.py,sha256=
|
117
|
+
uk_bin_collection/uk_bin_collection/councils/EastleighBoroughCouncil.py,sha256=ymHYdRVlTNNYIhZigvnwsEZUpJIecjxV0HrZm7lEdpY,3397
|
118
118
|
uk_bin_collection/uk_bin_collection/councils/EdinburghCityCouncil.py,sha256=YRjNgevnCxfaAIU8BV9dkqG17NiT6S-hp7l-1rdLVgQ,3150
|
119
119
|
uk_bin_collection/uk_bin_collection/councils/ElmbridgeBoroughCouncil.py,sha256=TgBOaReHWBbm0avV7HqRf0x7cxDe9cacTUcP9TFFprs,3005
|
120
120
|
uk_bin_collection/uk_bin_collection/councils/EnfieldCouncil.py,sha256=2yR5p-kdApOm1gHiynNECP0jQDvaYHOiT6MAQJAvunE,6144
|
@@ -213,10 +213,10 @@ uk_bin_collection/uk_bin_collection/councils/NorthAyrshireCouncil.py,sha256=o8zv
|
|
213
213
|
uk_bin_collection/uk_bin_collection/councils/NorthDevonCountyCouncil.py,sha256=tgJKIvu7nnCAHu_HImfG5SQABD6ygKFqrZU-ZoC6ObY,6260
|
214
214
|
uk_bin_collection/uk_bin_collection/councils/NorthEastDerbyshireDistrictCouncil.py,sha256=BfNpYcjG3z0Yz8OYN6NkfzvZ5k1FI-80D-rv211kPPU,5449
|
215
215
|
uk_bin_collection/uk_bin_collection/councils/NorthEastLincs.py,sha256=fYf438VZIaOaqPSwdTTWVjFTdrI0jGfFsxVzOc-QdkA,1817
|
216
|
-
uk_bin_collection/uk_bin_collection/councils/NorthHertfordshireDistrictCouncil.py,sha256=
|
216
|
+
uk_bin_collection/uk_bin_collection/councils/NorthHertfordshireDistrictCouncil.py,sha256=Zps52bZroibL1h0h7WKD1aKJzQD7-OLwd9tHXDQkDFg,12263
|
217
217
|
uk_bin_collection/uk_bin_collection/councils/NorthKestevenDistrictCouncil.py,sha256=vYOCerJXr9LTP6F2wm4vpYNYbQaWNZ6yfHEQ33N_hTw,1681
|
218
218
|
uk_bin_collection/uk_bin_collection/councils/NorthLanarkshireCouncil.py,sha256=npK1V8D3SLNTSSKkfEpEPvVgXDFyhH_tAsuGogsVKQY,1763
|
219
|
-
uk_bin_collection/uk_bin_collection/councils/NorthLincolnshireCouncil.py,sha256=
|
219
|
+
uk_bin_collection/uk_bin_collection/councils/NorthLincolnshireCouncil.py,sha256=MPzrfdo9YQFVlqBUOM-jDQkacz2DXnygLILQ_ojZeJo,2543
|
220
220
|
uk_bin_collection/uk_bin_collection/councils/NorthNorfolkDistrictCouncil.py,sha256=VV_zqVZYv8ekXcUHhrBlTX_W5qLYE9IA3mT2xmrZqoI,4315
|
221
221
|
uk_bin_collection/uk_bin_collection/councils/NorthNorthamptonshireCouncil.py,sha256=kcMN-5GBjYDM9F1BKfHoYeydub8SuDxHamJbSvJRZ68,2337
|
222
222
|
uk_bin_collection/uk_bin_collection/councils/NorthSomersetCouncil.py,sha256=RNfvvmsBCTJ4GpkvuueF6d9UdJOhp5zzlhzTg2bTO_M,2937
|
@@ -346,8 +346,8 @@ uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bId
|
|
346
346
|
uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=QD4v4xpsEE0QheR_fGaNOIRMc2FatcUfKkkhAhseyVU,1159
|
347
347
|
uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
|
348
348
|
uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
|
349
|
-
uk_bin_collection-0.152.
|
350
|
-
uk_bin_collection-0.152.
|
351
|
-
uk_bin_collection-0.152.
|
352
|
-
uk_bin_collection-0.152.
|
353
|
-
uk_bin_collection-0.152.
|
349
|
+
uk_bin_collection-0.152.3.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
|
350
|
+
uk_bin_collection-0.152.3.dist-info/METADATA,sha256=WouCuuXElczpnEgF3wFXEH9BfYqCG33PFpA-GdPPSpA,26688
|
351
|
+
uk_bin_collection-0.152.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
|
352
|
+
uk_bin_collection-0.152.3.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
|
353
|
+
uk_bin_collection-0.152.3.dist-info/RECORD,,
|
File without changes
|
File without changes
|
{uk_bin_collection-0.152.1.dist-info → uk_bin_collection-0.152.3.dist-info}/entry_points.txt
RENAMED
File without changes
|