Merge pull request #9 from AdrianoKF/8-new-vaccination-report-format

Support new vaccination report format

.github/workflows/python-app.yml

@@ -50,3 +50,13 @@ jobs:
     - name: Test with pytest
       run: |
         poetry run pytest
+
+  validate:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: "actions/checkout@v2"
+      - name: HACS validation
+        uses: "hacs/action@main"
+        with:
+          category: "integration"
+          ignore: brands wheels

README.md

@@ -2,7 +2,8 @@
 
 ## Adding to your dashboard
 
-You can add an overview of the current infection numbers to your dashboard using the [multiple-entity-row](https://github.com/benct/lovelace-multiple-entity-row) card:
+You can add an overview of the current infection and vaccination numbers to your dashboard
+using the [multiple-entity-row](https://github.com/benct/lovelace-multiple-entity-row) card:
 
 ```yaml
 type: entities
@@ -24,4 +25,25 @@ entities:
     secondary_info:
       attribute: incidence
       unit: cases/100k
+  - type: custom:multiple-entity-row
+    entity: sensor.covid_19_vaccinations_augsburg
+    entities:
+      - attribute: ratio_vaccinated_once
+        name: Once
+        format: precision1
+        unit: '%'
+      - attribute: ratio_vaccinated_full
+        name: Fully
+        format: precision1
+        unit: '%'
+      - attribute: ratio_vaccinated_total
+        name: Total
+        format: precision1
+        unit: '%'
+    show_state: false
+    icon: mdi:needle
+    name: COVID-19 Vaccinations
+    secondary_info:
+      attribute: date
+      format: date
 ```

custom_components/home_assistant_covid19_augsburg/__init__.py

@@ -12,7 +12,7 @@ if TYPE_CHECKING:
     from homeassistant.core import HomeAssistant
 
 from .const import DOMAIN
-from .crawler import CovidCrawler, IncidenceData
+from .crawler import CovidCrawler
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -67,9 +67,12 @@ async def get_coordinator(hass: HomeAssistant):
     if DOMAIN in hass.data:
         return hass.data[DOMAIN]
 
-    async def async_get_data() -> IncidenceData:
+    async def async_get_data() -> dict:
         crawler = CovidCrawler(hass)
-        return await crawler.crawl_incidence()
+        return {
+            "incidence": await crawler.crawl_incidence(),
+            "vaccination": await crawler.crawl_vaccination(),
+        }
 
     hass.data[DOMAIN] = DataUpdateCoordinator(
         hass,

custom_components/home_assistant_covid19_augsburg/crawler.py

@@ -59,9 +59,12 @@ class VaccinationData:
     total_vaccinations: int = 0
     num_vaccinated_once: int = 0
     num_vaccinated_full: int = 0
+    num_vaccinated_booster: int = 0
 
     ratio_vaccinated_once: float = 0.0
     ratio_vaccinated_full: float = 0.0
+    ratio_vaccinated_total: float = 0.0
+    ratio_vaccinated_booster: float = 0.0
 
 
 class CovidCrawlerBase(ABC):
@@ -106,11 +109,11 @@ class CovidCrawler(CovidCrawlerBase):
         )
         soup = await self._fetch(url)
 
-        match = soup.find(class_="frame--type-textpic")
+        match = soup.find(id="c1067628")
-        text = match.p.text
+        text = match.text.strip()
         _log.debug(f"Infection data text: {text}")
 
-        matches = re.search(r"(\d+,\d+)\sNeuinfektion", text)
+        matches = re.search(r"(\d+(,\d+)?)\sNeuinfektion", text)
         if not matches:
             raise ValueError(
                 f"Could not extract incidence from scraped web page, {text=}"
@@ -119,18 +122,15 @@ class CovidCrawler(CovidCrawlerBase):
         incidence = parse_num(matches.group(1), t=float)
         _log.debug(f"Parsed incidence: {incidence}")
 
-        text = match.h2.text
+        match = soup.find(id="c1052517")
-        matches = re.search(r"\((\d+)\. (\w+).*\)", text)
+        text = match.text.strip()
+        matches = re.search(r"Stand: (\d+)\. (\w+) (\d{4})", text)
         if not matches:
             raise ValueError(f"Could not extract date from scraped web page, {text=}")
 
-        date = parse_date(matches.group(1), matches.group(2))
+        date = parse_date(matches.group(1), matches.group(2), matches.group(3))
         _log.debug(f"Parsed date: {date}")
 
-        match = match.find_next_sibling(class_="frame--type-textpic")
-        text = match.text
-        _log.debug(f"Infection counts text: {text}")
-
         regexes = [
             r"Insgesamt: (?P<total_cases>[0-9.]+)",
             r"genesen: (?P<num_recovered>[0-9.]+)",
@@ -167,9 +167,9 @@ class CovidCrawler(CovidCrawlerBase):
         result = soup.find(id=container_id)
         text = re.sub(r"\s+", " ", result.text)
         regexes = [
-            r"(?P<total_vaccinations>\d+[.]\d+) Impfdosen",
+            r"(?P<total_vaccinations>\d+([.]\d+)?) Personen in Augsburg mindestens",
-            r"Weitere (?P<num_vaccinated_once>\d+[.]\d+) Personen haben die Erstimpfung erhalten",
+            r"(?P<num_vaccinated_full>\d+([.]\d+)?) Personen sind mindestens zweimal geimpft",
-            r"(?P<num_vaccinated_full>\d+[.]\d+) Personen sind bereits vollständig geimpft",
+            r"(?P<num_vaccinated_booster>\d+([.]\d+)?) Personen haben eine Auffrischungsimpfung",
         ]
         values = {}
         for r in regexes:
@@ -187,15 +187,24 @@ class CovidCrawler(CovidCrawlerBase):
         if not matches:
             raise ValueError(f"Could not extract date from scraped web page, {text=}")
 
+        values["num_vaccinated_once"] = values["total_vaccinations"] - (
+            values["num_vaccinated_full"] + values["num_vaccinated_booster"]
+        )
+
         values["date"] = parse_date(**matches.groupdict()).strftime("%Y-%m-%d")
         result = VaccinationData(**values)
 
-        # Total population in Augsburg as of 2020
+        # Total population in Augsburg as listed on the crawled page
-        # https://www.augsburg.de/fileadmin/user_upload/buergerservice_rathaus/rathaus/statisiken_und_geodaten/statistiken/Monitoring/Demografiemonitoring_der_Stadt_Augsburg_2021.pdf
+        population = 298014
-        population = 299021
 
-        result.ratio_vaccinated_full = result.num_vaccinated_full / population
+        result.ratio_vaccinated_full = result.num_vaccinated_full / population * 100
-        result.ratio_vaccinated_once = result.num_vaccinated_once / population
+        result.ratio_vaccinated_once = result.num_vaccinated_once / population * 100
+        result.ratio_vaccinated_total = (
+            result.ratio_vaccinated_once + result.ratio_vaccinated_full
+        )
+        result.ratio_vaccinated_booster = (
+            result.num_vaccinated_booster / population * 100
+        )
         _log.debug(f"Result data: {result}")
 
         return result

custom_components/home_assistant_covid19_augsburg/manifest.json

@@ -1,9 +1,10 @@
 {
     "domain": "covid19_augsburg",
     "name": "COVID-19 Augsburg",
-    "version": "0.1.0",
+    "version": "1.2.0",
     "config_flow": true,
     "documentation": "https://github.com/AdrianoKF/home-assistant-covid19-augsburg",
+    "issue_tracker": "https://github.com/AdrianoKF/home-assistant-covid19-augsburg/issues",
     "requirements": ["beautifulsoup4==4.8.2"],
     "dependencies": [],
     "codeowners": ["@AdrianoKF"]

custom_components/home_assistant_covid19_augsburg/sensor.py

@@ -1,3 +1,5 @@
+from dataclasses import asdict
+
 from homeassistant.helpers.entity import Entity
 
 from . import get_coordinator
@@ -7,7 +9,12 @@ async def async_setup_entry(hass, _, async_add_entities):
     """Defer sensor setup to the shared sensor module."""
     coordinator = await get_coordinator(hass)
 
-    async_add_entities([CoronaAugsburgSensor(coordinator)])
+    async_add_entities(
+        [
+            CoronaAugsburgSensor(coordinator),
+            CoronaAugsburgVaccinationSensor(coordinator),
+        ]
+    )
 
 
 class CoronaAugsburgSensor(Entity):
@@ -41,18 +48,59 @@ class CoronaAugsburgSensor(Entity):
 
     @property
     def state(self):
-        return self.coordinator.data.incidence
+        return self.coordinator.data["incidence"].incidence
 
     @property
     def device_state_attributes(self):
-        return {
+        data = self.coordinator.data["incidence"]
-            "date": self.coordinator.data.date,
+        return asdict(data)
-            "incidence": self.coordinator.data.incidence,
+
-            "total_cases": self.coordinator.data.total_cases,
+    async def async_added_to_hass(self):
-            "num_dead": self.coordinator.data.num_dead,
+        """When entity is added to hass."""
-            "num_recovered": self.coordinator.data.num_recovered,
+        self.coordinator.async_add_listener(self.async_write_ha_state)
-            "num_infected": self.coordinator.data.num_infected,
+
-        }
+    async def async_will_remove_from_hass(self):
+        """When entity will be removed from hass."""
+        self.coordinator.async_remove_listener(self.async_write_ha_state)
+
+
+class CoronaAugsburgVaccinationSensor(Entity):
+    """Representation of vaccination data for the city of Augsburg"""
+
+    def __init__(self, coordinator):
+        """Initialize sensor."""
+        self.coordinator = coordinator
+        self._name = "COVID-19 Vaccinations Augsburg"
+        self._state = None
+
+    @property
+    def available(self):
+        return self.coordinator.last_update_success and self.coordinator.data
+
+    @property
+    def name(self):
+        return self._name
+
+    @property
+    def unique_id(self):
+        return self._name
+
+    @property
+    def icon(self):
+        return "mdi:needle"
+
+    @property
+    def unit_of_measurement(self):
+        return ""
+
+    @property
+    def state(self):
+        return self.coordinator.data["vaccination"].total_vaccinations
+
+    @property
+    def device_state_attributes(self):
+        data = self.coordinator.data["vaccination"]
+        return asdict(data)
 
     async def async_added_to_hass(self):
         """When entity is added to hass."""

pyproject.toml

@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "git add re"
+name = "home_assistant_covid19_augsburg"
 version = "0.1.0"
 description = ""
 authors = ["Adrian Rumpold <a.rumpold@gmail.com>"]