uk_bin_collection 0.86.2__py3-none-any.whl → 0.88.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -314,6 +314,12 @@
         "url": "https://www.durham.gov.uk/bincollections?uprn=",
         "wiki_name": "Durham Council"
     },
+    "EalingCouncil": {
+        "skip_get_url": true,
+        "uprn": "12073883",
+        "url": "https://www.ealing.gov.uk/site/custom_scripts/WasteCollectionWS/home/FindCollection",
+        "wiki_name": "Ealing Council"
+    },
     "EastCambridgeshireCouncil": {
         "skip_get_url": true,
         "uprn": "10002597178",
@@ -432,6 +438,7 @@
         "postcode": "GL2 0RR",
         "uprn": "100120479507",
         "skip_get_url": true,
+        "web_driver": "http://selenium:4444",
         "url": "https://gloucester-self.achieveservice.com/service/Bins___Check_your_bin_day",
         "wiki_name": "Gloucester City Council"
     },
@@ -498,6 +505,13 @@
         "wiki_name": "Huntingdon District Council",
         "wiki_note": "Replace XXXXXXXX with UPRN."
     },
+    "IslingtonCouncil": {
+        "uprn": "5300094897",
+        "url": "https://www.islington.gov.uk/your-area?Postcode=unused&Uprn=5300094897",
+        "wiki_command_url_override": "https://www.islington.gov.uk/your-area?Postcode=unused&Uprn=XXXXXXXX",
+        "wiki_name": "Islington Council",
+        "wiki_note": "Replace XXXXXXXX with UPRN."
+    },
     "KingstonUponThamesCouncil": {
         "url": "https://waste-services.kingston.gov.uk/waste/2701097",
         "wiki_command_url_override": "https://waste-services.kingston.gov.uk/waste/XXXXXXX",
@@ -1233,4 +1247,4 @@
         "url": "https://waste-api.york.gov.uk/api/Collections/GetBinCollectionDataForUprn/",
         "wiki_name": "York Council"
     }
-}
+}

uk_bin_collection/uk_bin_collection/councils/EalingCouncil.py

@@ -0,0 +1,43 @@
+import json
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+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:
+        api_url = "https://www.ealing.gov.uk/site/custom_scripts/WasteCollectionWS/home/FindCollection"
+        user_uprn = kwargs.get("uprn")
+
+        # Check the UPRN is valid
+        check_uprn(user_uprn)
+
+        # Create the form data
+        form_data = {
+            "UPRN": user_uprn,
+        }
+
+        # Make a request to the API
+        requests.packages.urllib3.disable_warnings()
+        response = requests.post(api_url, data=form_data)
+
+        json_data = json.loads(response.text)
+
+        data = {"bins": []}
+
+        for param in json_data["param2"]:
+            data["bins"].append(
+                {
+                    "type": param["Service"],
+                    "collectionDate": datetime.strptime(
+                        param["collectionDateString"], "%d/%m/%Y"
+                    ).strftime(date_format),
+                }
+            )
+
+        return data

uk_bin_collection/uk_bin_collection/councils/IslingtonCouncil.py

@@ -0,0 +1,37 @@
+from bs4 import BeautifulSoup
+from dateutil.parser import parse
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+class CouncilClass(AbstractGetBinDataClass):
+    def parse_data(self, page: str, **kwargs) -> dict:
+        uprn = kwargs.get("uprn")
+        check_uprn(uprn)
+
+        api_url = f"https://www.islington.gov.uk/your-area?Postcode=unused&Uprn={uprn}"
+        response = requests.get(api_url)
+
+        soup = BeautifulSoup(response.text, features="html.parser")
+
+        data = {"bins": []}
+
+        waste_table = (
+            soup.find(string="Waste and recycling collections")
+            .find_next("div", class_="m-toggle-content")
+            .find("table")
+        )
+
+        if waste_table:
+            rows = waste_table.find_all("tr")
+            for row in rows:
+                waste_type = row.find("th").text.strip()
+                next_collection = parse(row.find("td").text.strip()).date()
+
+                data['bins'].append({
+                    "type": waste_type,
+                    "collectionDate": next_collection.strftime(date_format),
+                })
+
+        return data

{uk_bin_collection-0.86.2.dist-info → uk_bin_collection-0.88.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.86.2
+Version: 0.88.0
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com
@@ -57,6 +57,15 @@ Most scripts make use of [Beautiful Soup 4](https://pypi.org/project/beautifulso
 
 ### Install with HACS (recommended)
 
+#### Automated
+[![hacs_badge](https://img.shields.io/badge/HACS-Default-41BDF5.svg?style=for-the-badge)](https://github.com/hacs/integration)
+
+This integration can be installed directly via HACS. To install:
+
+* [Add the repository](https://my.home-assistant.io/redirect/hacs_repository/?owner=robbrad&repository=UKBinCollectionData&category=integration) to your HACS installation
+* Click `Download`
+
+#### Manual
 1. Ensure you have [HACS](https://hacs.xyz/) installed
 1. In the Home Assistant UI go to `HACS` > `Integrations` > `⋮` > `Custom repositories`.
 1. Enter `https://github.com/robbrad/UKBinCollectionData` in the `Repository` field.

{uk_bin_collection-0.86.2.dist-info → uk_bin_collection-0.88.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-cutwz5RoYYWZRLYx2tr6zIs_9Rc,3843
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
-uk_bin_collection/tests/input.json,sha256=WJ6GsmG_nIzmOA0ItYnBRc7DwWD8jsytgA6XO5WstMo,60242
+uk_bin_collection/tests/input.json,sha256=p6iViHOSYbTWhUp9ICC46nws0Wusa7akA5k5--vGQaI,60871
 uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
 uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
 uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=LrOSt_loA1Mw3vTqaO2LpaDMu7rYJy6k5Kr-EOBln7s,3424
@@ -55,6 +55,7 @@ uk_bin_collection/uk_bin_collection/councils/DoncasterCouncil.py,sha256=b7pxoToX
 uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py,sha256=zfXQJpywfEQvBOhv5uPSkHdTrAg114yXIuTYDjHSXsA,1629
 uk_bin_collection/uk_bin_collection/councils/DoverDistrictCouncil.py,sha256=3Zgap6kaVpDXtRfBKEL1Ms6eb0iFIipYKNtOq3Hrdd4,1891
 uk_bin_collection/uk_bin_collection/councils/DurhamCouncil.py,sha256=6O8bNsQVYQbrCYQE9Rp0c_rtkcXuxR3s9J6jn4MK4_s,1695
+uk_bin_collection/uk_bin_collection/councils/EalingCouncil.py,sha256=UhNXGi-_6NYZu50988VEvOzmAVunxOoyJ6mz0OEaUz4,1321
 uk_bin_collection/uk_bin_collection/councils/EastCambridgeshireCouncil.py,sha256=aYUVE5QqTxdj8FHhCB4EiFVDJahWJD9Pq0d1upBEvXg,1501
 uk_bin_collection/uk_bin_collection/councils/EastDevonDC.py,sha256=U0VwSNIldMv5nUoiXtFgjbE0m6Kb-8W2WZQGVCNF_WI,3261
 uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py,sha256=o_HPSFhb2ybmwv32_7T7CO1f2mGDkYCNPfaM5xz6bUI,4356
@@ -80,6 +81,7 @@ uk_bin_collection/uk_bin_collection/councils/HighPeakCouncil.py,sha256=oybn_cbzj
 uk_bin_collection/uk_bin_collection/councils/HounslowCouncil.py,sha256=LXhJ47rujx7k3naz0tFiTT1l5k6gAYcVdekJN1t_HLY,4564
 uk_bin_collection/uk_bin_collection/councils/HullCityCouncil.py,sha256=UHcesBoctFVcXDYuwfag43KbcJcopkEDzJ-54NxtK0Q,1851
 uk_bin_collection/uk_bin_collection/councils/HuntingdonDistrictCouncil.py,sha256=dGyhhG6HRjQ2SPeiRwUPTGlk9dPIslagV2k0GjEOn1s,1587
+uk_bin_collection/uk_bin_collection/councils/IslingtonCouncil.py,sha256=O2o5-oueMm8jXES_2kQGHVo-JpBSq1Z-1mqq11eyi3s,1208
 uk_bin_collection/uk_bin_collection/councils/KingstonUponThamesCouncil.py,sha256=iZ7njIxccCGBhUUWWd9Azh7cxUAKaofebCm3lo-TuxA,3543
 uk_bin_collection/uk_bin_collection/councils/KirkleesCouncil.py,sha256=gtAtM6FappSZ0-BKid7_pnSrnqPPjHn_UYWqMg9wQlM,4499
 uk_bin_collection/uk_bin_collection/councils/KnowsleyMBCouncil.py,sha256=VdlWDESoHfr_X0r8-UMaLMUQhKZOa2BnpVPkX-1u3EQ,5605
@@ -188,8 +190,8 @@ uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bId
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=4s9ODGPAwPqwXc8SrTX5Wlfmizs3_58iXUtHc4Ir86o,1162
 uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
 uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
-uk_bin_collection-0.86.2.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.86.2.dist-info/METADATA,sha256=LRsdDRZdbzUoFma7eHGhI7jA8ZtZrf7y4xaO_3q6Lcw,16231
-uk_bin_collection-0.86.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.86.2.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.86.2.dist-info/RECORD,,
+uk_bin_collection-0.88.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.88.0.dist-info/METADATA,sha256=kEIvcUhPtE0L1WNL_Oad5JcufNcj9mK2F2xei7bjD7I,16643
+uk_bin_collection-0.88.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.88.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.88.0.dist-info/RECORD,,