uk_bin_collection 0.82.0__tar.gz → 0.82.1__tar.gz

{uk_bin_collection-0.82.0 → uk_bin_collection-0.82.1}/PKG-INFO

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

{uk_bin_collection-0.82.0 → uk_bin_collection-0.82.1}/pyproject.toml

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

{uk_bin_collection-0.82.0 → uk_bin_collection-0.82.1}/uk_bin_collection/tests/input.json

@@ -283,10 +283,10 @@
         "wiki_name": "Doncaster Council"
     },
     "DorsetCouncil": {
-        "url": "https://gi.dorsetcouncil.gov.uk/mapping/mylocal/viewresults/100040711049",
-        "wiki_command_url_override": "https://gi.dorsetcouncil.gov.uk/mapping/mylocal/viewresults/XXXXXXXX",
-        "wiki_name": "Dorset Council",
-        "wiki_note": "Replace XXXXXXXX with UPRN."
+        "skip_get_url": true,
+        "url": "https://www.dorsetcouncil.gov.uk/",
+        "uprn": "100040711049",
+        "wiki_name": "Dorset Council"
     },
     "DoverDistrictCouncil": {
         "url": "https://collections.dover.gov.uk/property/100060908340",

uk_bin_collection-0.82.1/uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py

@@ -0,0 +1,42 @@
+from bs4 import BeautifulSoup, element
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+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:
+        data = {"bins": []}
+        collections = []
+        url_base = "https://geoapi.dorsetcouncil.gov.uk/v1/services/"
+        url_types = ["recyclingday", "refuseday", "foodwasteday", "gardenwasteday"]
+
+        uprn = kwargs.get("uprn")
+        # Check the UPRN is valid
+        check_uprn(uprn)
+
+        for url_type in url_types:
+            response = requests.get(f"{url_base}{url_type}/{uprn}")
+            if response.status_code != 200:
+                raise ConnectionError(f"Could not fetch from {url_type} endpoint")
+            json_data = response.json()["values"][0]
+            collections.append((f"{json_data.get('type')} bin", datetime.strptime(json_data.get('dateNextVisit'), "%Y-%m-%d")))
+
+        # Sort the text and date elements by date
+        ordered_data = sorted(collections, key=lambda x: x[1])
+
+        # Put the elements into the dictionary
+        for item in ordered_data:
+            dict_data = {
+                "type": item[0],
+                "collectionDate": item[1].strftime(date_format),
+            }
+            data["bins"].append(dict_data)
+
+        return data

{uk_bin_collection-0.82.0 → uk_bin_collection-0.82.1}/uk_bin_collection/uk_bin_collection/get_bin_data.py

@@ -5,7 +5,7 @@ None
 """
 
 import json
-import logging
+import logging, logging.config
 from abc import ABC, abstractmethod
 import os
 import requests

uk_bin_collection-0.82.0/uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py

@@ -1,58 +0,0 @@
-from bs4 import BeautifulSoup, element
-from uk_bin_collection.uk_bin_collection.common import *
-from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
-
-
-# import the wonderful Beautiful Soup and the URL grabber
-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:
-        data = {"bins": []}
-        collections = []
-
-        # Parse the page and find all the result boxes
-        soup = BeautifulSoup(page.text, features="html.parser")
-        soup.prettify()
-        results = soup.find_all("li", {"class": "resultListItem"})
-
-        # If the result box has a wanted string in, we can use it. Check the contents of each box and find the
-        # desired text and dates
-        for r in results:
-            if "Your next" in r.text:
-                if type(r.contents[10]) is element.NavigableString:
-                    bin_text = r.contents[10].text.split(" ")[2].title() + " bin"
-                    bin_date = datetime.strptime(
-                        remove_ordinal_indicator_from_date_string(
-                            r.contents[11].text.strip()
-                        ),
-                        "%A %d %B %Y",
-                    )
-                else:
-                    bin_text = r.contents[11].text.split(" ")[2].title() + " bin"
-                    bin_date = datetime.strptime(
-                        remove_ordinal_indicator_from_date_string(
-                            r.contents[12].text.strip()
-                        ),
-                        "%A %d %B %Y",
-                    )
-
-                if bin_date.date() >= datetime.now().date():
-                    collections.append((bin_text, bin_date))
-
-                # Sort the text and date elements by date
-                ordered_data = sorted(collections, key=lambda x: x[1])
-
-        # Put the elements into the dictionary
-        for item in ordered_data:
-            dict_data = {
-                "type": item[0],
-                "collectionDate": item[1].strftime(date_format),
-            }
-            data["bins"].append(dict_data)
-
-        return data