uk_bin_collection 0.152.3__py3-none-any.whl → 0.152.4__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -2180,10 +2180,10 @@
         "LAD24CD": "E07000179"
     },
     "SouthRibbleCouncil": {
-        "uprn": "010013246384",
-        "postcode": "PR5 6DT",
-        "url": "https://www.southribble.gov.uk",
-        "wiki_command_url_override": "https://www.southribble.gov.uk",
+        "uprn": "10013243496",
+        "postcode": "PR26 7RZ",
+        "url": "https://forms.chorleysouthribble.gov.uk/xfp/form/70",
+        "wiki_command_url_override": "https://forms.chorleysouthribble.gov.uk/xfp/form/70",
         "wiki_name": "South Ribble",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN.",
         "LAD24CD": "E07000126"

uk_bin_collection/uk_bin_collection/councils/SouthRibbleCouncil.py

@@ -1,29 +1,11 @@
-from typing import Dict, List, Any, Optional
-from bs4 import BeautifulSoup
-from dateutil.relativedelta import relativedelta
 import requests
-import logging
-import re
-from datetime import datetime
-from uk_bin_collection.uk_bin_collection.common import *
-from dateutil.parser import parse
+from bs4 import BeautifulSoup
 
-from uk_bin_collection.uk_bin_collection.common import check_uprn, check_postcode
+from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
 
-def get_token(page) -> str:
-    """
-    Get a __token to include in the form data
-        :param page: Page html
-        :return: Form __token
-    """
-    soup = BeautifulSoup(page.text, features="html.parser")
-    soup.prettify()
-    token = soup.find("input", {"name": "__token"}).get("value")
-    return token
-
-
+# import the wonderful Beautiful Soup and the URL grabber
 class CouncilClass(AbstractGetBinDataClass):
     """
     Concrete classes have to implement all abstract operations of the
@@ -31,69 +13,38 @@ class CouncilClass(AbstractGetBinDataClass):
     implementation.
     """
 
-    def get_data(self, url: str) -> str:
-        """This method makes the request to the council
-
-        Keyword arguments:
-        url -- the url to get the data from
-        """
-        # Set a user agent so we look like a browser ;-)
-        user_agent = (
-            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
-            "Chrome/108.0.0.0 Safari/537.36"
-        )
-        headers = {"User-Agent": user_agent}
-        requests.packages.urllib3.disable_warnings()
+    def parse_data(self, page: str, **kwargs) -> dict:
 
-        # Make the Request - change the URL - find out your property number
-        try:
-            session = requests.Session()
-            session.headers.update(headers)
-            full_page = session.get(url)
-            return full_page
-        except requests.exceptions.HTTPError as errh:
-            logging.error(f"Http Error: {errh}")
-            raise
-        except requests.exceptions.ConnectionError as errc:
-            logging.error(f"Error Connecting: {errc}")
-            raise
-        except requests.exceptions.Timeout as errt:
-            logging.error(f"Timeout Error: {errt}")
-            raise
-        except requests.exceptions.RequestException as err:
-            logging.error(f"Oops: Something Else {err}")
-            raise
+        user_uprn = kwargs.get("uprn")
+        user_postcode = kwargs.get("postcode")
+        check_uprn(user_uprn)
+        check_postcode(user_postcode)
+        bindata = {"bins": []}
 
-    def parse_data(self, page: str, **kwargs: Any) -> Dict[str, List[Dict[str, str]]]:
-        uprn: Optional[str] = kwargs.get("uprn")
-        postcode: Optional[str] = kwargs.get("postcode")
+        session_uri = "https://forms.chorleysouthribble.gov.uk/xfp/form/70"
+        URI = "https://forms.chorleysouthribble.gov.uk/xfp/form/70#qc576c657112a8277ba6f954ebc0490c946168363_0"
 
-        if uprn is None:
-            raise ValueError("UPRN is required and must be a non-empty string.")
-        if postcode is None:
-            raise ValueError("Postcode is required and must be a non-empty string.")
+        session = requests.Session()
+        token_response = session.get(session_uri)
+        soup = BeautifulSoup(token_response.text, "html.parser")
+        token = soup.find("input", {"name": "__token"}).attrs["value"]
 
-        check_uprn(uprn)
-        check_postcode(postcode)
-
-        values = {
-            "__token": get_token(page),
-            "page": "491",
+        form_data = {
+            "__token": token,
+            "page": "196",
             "locale": "en_GB",
-            "q1f8ccce1d1e2f58649b4069712be6879a839233f_0_0": postcode,
-            "q1f8ccce1d1e2f58649b4069712be6879a839233f_1_0": uprn,
+            "qc576c657112a8277ba6f954ebc0490c946168363_0_0": user_postcode,
+            "qc576c657112a8277ba6f954ebc0490c946168363_1_0": user_uprn,
             "next": "Next",
         }
-        headers = {"User-Agent": "Mozilla/5.0 (Windows NT 6.1; Win64; x64)"}
-        requests.packages.urllib3.disable_warnings()
-        response = requests.request(
-            "POST",
-            "https://forms.chorleysouthribble.gov.uk/xfp/form/70",
-            headers=headers,
-            data=values,
-        )
 
-        soup = BeautifulSoup(response.text, features="html.parser")
+        collection_response = session.post(URI, data=form_data)
+
+        #collection_soup = BeautifulSoup(collection_response.text, "html.parser")
+        
+
+        soup = BeautifulSoup(collection_response.text, "html.parser")
+        #print(soup)
 
         rows = soup.find("table").find_all("tr")
 
@@ -103,31 +54,23 @@ class CouncilClass(AbstractGetBinDataClass):
         # Loops the Rows
         for row in rows:
             cells = row.find_all("td")
+            
             if cells:
                 bin_type = cells[0].get_text(strip=True)
                 collection_next = cells[1].get_text(strip=True)
 
-                collection_date = re.findall(r"\(.*?\)", collection_next)
-
-                if len(collection_date) != 1:
-                    continue
-
-                collection_date_obj = parse(
-                    re.sub(r"[()]", "", collection_date[0])
-                ).date()
-
-                # since we only have the next collection day, if the parsed date is in the past,
-                # assume the day is instead next month
-                if collection_date_obj < datetime.now().date():
-                    collection_date_obj += relativedelta(months=1)
-
-                # Make each Bin element in the JSON
-                dict_data = {
-                    "type": bin_type,
-                    "collectionDate": collection_date_obj.strftime(date_format),
-                }
-
-                # Add data to the main JSON Wrapper
-                data["bins"].append(dict_data)
-
+                if len(collection_next) != 1:
+                    collection_date_obj = datetime.strptime(collection_next, "%d/%m/%y").date()
+                    # since we only have the next collection day, if the parsed date is in the past,
+                    # assume the day is instead next month
+                    if collection_date_obj < datetime.now().date():
+                        collection_date_obj += relativedelta(months=1)
+                    # Make each Bin element in the JSON
+                    dict_data = {
+                        "type": bin_type,
+                        "collectionDate": collection_date_obj.strftime("%d/%m/%Y"),
+                    }
+                    # Add data to the main JSON Wrapper
+                    data["bins"].append(dict_data)
+                    continue      
         return data

{uk_bin_collection-0.152.3.dist-info → uk_bin_collection-0.152.4.dist-info}/METADATA

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

{uk_bin_collection-0.152.3.dist-info → uk_bin_collection-0.152.4.dist-info}/RECORD

@@ -7,7 +7,7 @@ uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-c
 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/generate_map_test_results.py,sha256=CKnGK2ZgiSXomRGkomX90DitgMP-X7wkHhyKORDcL2E,1144
-uk_bin_collection/tests/input.json,sha256=93VJl5bKKggne94vYtI71b1WLGhcI7NSVZF3bmXjJ1A,132548
+uk_bin_collection/tests/input.json,sha256=hy8tlgmuKQWiq3PxNE16kaYHk6XxesuFkBvtpk-9oIw,132590
 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=VZ0a81sioJULD7syAYHjvK_-nT_Rd36tUyzPetSA0gk,3475
@@ -271,7 +271,7 @@ uk_bin_collection/uk_bin_collection/councils/SouthKestevenDistrictCouncil.py,sha
 uk_bin_collection/uk_bin_collection/councils/SouthLanarkshireCouncil.py,sha256=fj-eZI0yrvQVCv8GvhcovZ3b9bV6Xv_ws3IunWjnv4U,3126
 uk_bin_collection/uk_bin_collection/councils/SouthNorfolkCouncil.py,sha256=C2qIZjjbl9JnuukX9OH2RbfP0hSdp3uX76APGY33qKs,4622
 uk_bin_collection/uk_bin_collection/councils/SouthOxfordshireCouncil.py,sha256=f9d2YDGv5hnN7Ul-u_I63h_BbpBU7CJFdgv-lOviRGc,4031
-uk_bin_collection/uk_bin_collection/councils/SouthRibbleCouncil.py,sha256=QujJYORfiQmfBBUPt3Vnb0ryJy1XUiJtli-jLlUt5fs,4695
+uk_bin_collection/uk_bin_collection/councils/SouthRibbleCouncil.py,sha256=5HSTmrPc-gN3ZzLq6n2VDs_NhtCgXhnGqJkEejDmSHI,2900
 uk_bin_collection/uk_bin_collection/councils/SouthStaffordshireDistrictCouncil.py,sha256=ACQMHWyamnj1ag3gNF-8Jhp-DKUok1GhFdnzH4nCzwU,3201
 uk_bin_collection/uk_bin_collection/councils/SouthTynesideCouncil.py,sha256=dxXGrJfg_fn2IPTBgq6Duwy0WY8GYLafMuisaCjOnbs,3426
 uk_bin_collection/uk_bin_collection/councils/SouthamptonCityCouncil.py,sha256=exNoI-Vun_C5FowCYhZ_600MBUe_OPR7MdGZEMNLL0I,1542
@@ -346,8 +346,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=QD4v4xpsEE0QheR_fGaNOIRMc2FatcUfKkkhAhseyVU,1159
 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.152.3.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.152.3.dist-info/METADATA,sha256=WouCuuXElczpnEgF3wFXEH9BfYqCG33PFpA-GdPPSpA,26688
-uk_bin_collection-0.152.3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.152.3.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.152.3.dist-info/RECORD,,
+uk_bin_collection-0.152.4.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.152.4.dist-info/METADATA,sha256=wK9bVaoTAyW9e1hieARhWnIUnlDdpL6b_h0VNvGP4zw,26688
+uk_bin_collection-0.152.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.152.4.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.152.4.dist-info/RECORD,,