uk_bin_collection 0.144.0__py3-none-any.whl → 0.144.1__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -1677,7 +1677,7 @@
     },
     "SandwellBoroughCouncil": {
         "skip_get_url": true,
-        "uprn": "10008755549",
+        "uprn": "32101971",
         "url": "https://www.sandwell.gov.uk",
         "wiki_name": "Sandwell Borough Council",
         "wiki_note": "Pass the UPRN. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
@@ -2332,4 +2332,4 @@
         "wiki_name": "York Council",
         "wiki_note": "Provide your UPRN."
     }
-}
+}

uk_bin_collection/uk_bin_collection/councils/SandwellBoroughCouncil.py

@@ -32,12 +32,13 @@ class CouncilClass(AbstractGetBinDataClass):
             "Referer": "https://my.sandwell.gov.uk/fillform/?iframe_id=fillform-frame-1&db_id=",
         }
         s = requests.session()
+        # Establish a session and grab the session ID
         r = s.get(SESSION_URL)
         r.raise_for_status()
         session_data = r.json()
         sid = session_data["auth-session"]
 
-        data = {
+        payload = {
             "formValues": {
                 "Property details": {
                     "Uprn": {
@@ -49,9 +50,7 @@ class CouncilClass(AbstractGetBinDataClass):
                 },
             },
         }
-
-        params = {
-            "id": "58a1a71694992",
+        base_params = {
             "repeat_against": "",
             "noRetry": "false",
             "getOnlyTokens": "undefined",
@@ -61,27 +60,36 @@ class CouncilClass(AbstractGetBinDataClass):
             "_": str(int(time.time() * 1000)),
             "sid": sid,
         }
+        # (request_id, date field to use from response, bin type labels)
+        lookups = [
+            (
+                "58a1a71694992",
+                "DWDate",
+                [
+                    "Recycling (Blue)",
+                    "Household Waste (Grey)",
+                    "Food Waste (Brown)",
+                    "Batteries",
+                ],
+            ),
+            ("56b1cdaf6bb43", "GWDate", ["Garden Waste (Green)"]),
+        ]
 
-        r = s.post(API_URL, json=data, headers=headers, params=params)
-        r.raise_for_status()
+        for request_id, date_key, bin_types in lookups:
+            params = {"id": request_id, **base_params}
 
-        data = r.json()
-        rows_data = data["integration"]["transformed"]["rows_data"]
-        if not isinstance(rows_data, dict):
-            raise ValueError("Invalid data returned from API")
-        bin_types = {
-            "Recycling (Blue)",
-            "Household Waste (Grey)",
-            "Food Waste (Brown)",
-            "Garden Waste (Green)",
-        }
-        for row in rows_data.items():
-            date = row[1]["DWDate"]
-            for bin_type in bin_types:
-                dict_data = {
-                    "type": bin_type,
-                    "collectionDate": date,
-                }
-                bindata["bins"].append(dict_data)
+            resp = s.post(API_URL, json=payload, headers=headers, params=params)
+            resp.raise_for_status()
+            result = resp.json()
+
+            rows_data = result["integration"]["transformed"]["rows_data"]
+            if not isinstance(rows_data, dict):
+                # Garden waste for some Uprns returns an empty list
+                continue
+
+            for row in rows_data.values():
+                date = row[date_key]
+                for bin_type in bin_types:
+                    bindata["bins"].append({"type": bin_type, "collectionDate": date})
 
         return bindata

{uk_bin_collection-0.144.0.dist-info → uk_bin_collection-0.144.1.dist-info}/METADATA

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

{uk_bin_collection-0.144.0.dist-info → uk_bin_collection-0.144.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ uk_bin_collection/tests/check_selenium_url_in_input.json.py,sha256=Iecdja0I3XIiY
 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=ArQftTY8SVx1lttw69j6vTOydzcq2D-aza_sXwjQq5I,121959
+uk_bin_collection/tests/input.json,sha256=6GN41kIFiUAvCo4mzwTWpxumcY9MSYTqCIqsvY5wg_4,121957
 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
@@ -239,7 +239,7 @@ uk_bin_collection/uk_bin_collection/councils/RunnymedeBoroughCouncil.py,sha256=v
 uk_bin_collection/uk_bin_collection/councils/RushcliffeBoroughCouncil.py,sha256=nWo8xeER71FEbnMTX8W9bcwZNpLEExWzPvgRT7DmcMc,4221
 uk_bin_collection/uk_bin_collection/councils/RushmoorCouncil.py,sha256=ZsGnXjoEaOS6U7fI0w7-uqxayAHdNVKsJi2fqIWEls8,3375
 uk_bin_collection/uk_bin_collection/councils/SalfordCityCouncil.py,sha256=XUGemp2cdzsvkWjnv2m4YKTMcoKDUfIlVy3YucX-_o4,2601
-uk_bin_collection/uk_bin_collection/councils/SandwellBoroughCouncil.py,sha256=shJhvqDcha2ypDCSfhss59G95jNaWBuMnVIxJiZXcY8,3110
+uk_bin_collection/uk_bin_collection/councils/SandwellBoroughCouncil.py,sha256=Y9aPYNu1ZahJJ0BuDIWoQqynSz2AQGUcwrJR_cvPsvc,3516
 uk_bin_collection/uk_bin_collection/councils/SeftonCouncil.py,sha256=XUEz2li0oHrRhdkls5qzlZNZ0GuwSG7r0dwsL-qdoFA,2480
 uk_bin_collection/uk_bin_collection/councils/SevenoaksDistrictCouncil.py,sha256=qqrrRaSVm9CYAtm0rB2ZnyH_nLwaReuacoUxZpo597k,4260
 uk_bin_collection/uk_bin_collection/councils/SheffieldCityCouncil.py,sha256=9g9AeiackoWyej9EVlKUzywzAtMuBVD0f93ZryAUha8,2016
@@ -329,8 +329,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=EQWRhZ2pEejlvm0fPyOTsOHKvUZmPnxEYO_OWRGKTjs,1158
 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.144.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.144.0.dist-info/METADATA,sha256=k-jkQ-brkbppOAbOHd39-gv751ReJOWBS72yj-zZSyI,19858
-uk_bin_collection-0.144.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.144.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.144.0.dist-info/RECORD,,
+uk_bin_collection-0.144.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.144.1.dist-info/METADATA,sha256=Pk5QeIPJ_FQYDxoe4UgUdqG8-vDxsX4CbzkE-EGVmzs,19858
+uk_bin_collection-0.144.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.144.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.144.1.dist-info/RECORD,,