diff --git a/src/intensivstationen/Intensivstationen.nbconvert.ipynb b/src/intensivstationen/Intensivstationen.nbconvert.ipynb
index e3e53fe870d..9bb116b906c 100644
--- a/src/intensivstationen/Intensivstationen.nbconvert.ipynb
+++ b/src/intensivstationen/Intensivstationen.nbconvert.ipynb
@@ -6,59 +6,77 @@
"id": "9de5907f-18f5-4cb1-903e-26028ff1fa03",
"metadata": {
"execution": {
- "iopub.execute_input": "2022-12-05T13:33:15.922037Z",
- "iopub.status.busy": "2022-12-05T13:33:15.921181Z",
- "iopub.status.idle": "2022-12-05T13:33:16.274097Z",
- "shell.execute_reply": "2022-12-05T13:33:16.273561Z"
+ "iopub.execute_input": "2023-01-17T14:25:20.046543Z",
+ "iopub.status.busy": "2023-01-17T14:25:20.046232Z",
+ "iopub.status.idle": "2023-01-17T14:25:20.053776Z",
+ "shell.execute_reply": "2023-01-17T14:25:20.053215Z"
}
},
"outputs": [],
"source": [
- "import pandas as pd\n",
- "from urllib import request\n",
+ "import os\n",
+ "import sys\n",
"\n",
- "pd.set_option('display.max_rows', 100)\n",
- "pd.set_option('display.max_columns', None)\n",
- "pd.set_option('mode.chained_assignment', 'raise')"
+ "module_path = os.path.abspath(os.path.join('..'))\n",
+ "if module_path not in sys.path:\n",
+ " sys.path.append(module_path)\n"
]
},
{
"cell_type": "code",
"execution_count": 2,
- "id": "e40d4c8d",
+ "id": "640be762",
"metadata": {
"execution": {
- "iopub.execute_input": "2022-12-05T13:33:16.277294Z",
- "iopub.status.busy": "2022-12-05T13:33:16.276717Z",
- "iopub.status.idle": "2022-12-05T13:33:16.280833Z",
- "shell.execute_reply": "2022-12-05T13:33:16.280184Z"
+ "iopub.execute_input": "2023-01-17T14:25:20.056419Z",
+ "iopub.status.busy": "2023-01-17T14:25:20.055982Z",
+ "iopub.status.idle": "2023-01-17T14:25:20.913002Z",
+ "shell.execute_reply": "2023-01-17T14:25:20.912373Z"
}
},
"outputs": [
{
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "05.12.2022, 14:33:16 Uhr\n"
+ "ename": "ModuleNotFoundError",
+ "evalue": "No module named 'decouple'",
+ "output_type": "error",
+ "traceback": [
+ "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+ "\u001b[0;31mModuleNotFoundError\u001b[0m Traceback (most recent call last)",
+ "Cell \u001b[0;32mIn[2], line 11\u001b[0m\n\u001b[1;32m 9\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mKreisOptionsProvider\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m getKreisOptionsAndAlleLandkreise\n\u001b[1;32m 10\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mIntensiveCareBedsPersister\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m getAndPersistIntensiveCareBeds4AlleKreise\n\u001b[0;32m---> 11\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mChart\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m createMedianOfFreeBedsByKreisChart\n\u001b[1;32m 14\u001b[0m pd\u001b[38;5;241m.\u001b[39mset_option(\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mdisplay.max_rows\u001b[39m\u001b[38;5;124m'\u001b[39m, \u001b[38;5;241m100\u001b[39m)\n\u001b[1;32m 15\u001b[0m pd\u001b[38;5;241m.\u001b[39mset_option(\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mdisplay.max_columns\u001b[39m\u001b[38;5;124m'\u001b[39m, \u001b[38;5;28;01mNone\u001b[39;00m)\n",
+ "File \u001b[0;32m~/work/HowBadIsMyBatch/HowBadIsMyBatch/src/intensivstationen/Chart.py:1\u001b[0m\n\u001b[0;32m----> 1\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mdecouple\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m AutoConfig\n\u001b[1;32m 2\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mDatawrapper\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m Datawrapper\n\u001b[1;32m 3\u001b[0m \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;21;01mColumnsAdder\u001b[39;00m \u001b[38;5;28;01mimport\u001b[39;00m ColumnsAdder\n",
+ "\u001b[0;31mModuleNotFoundError\u001b[0m: No module named 'decouple'"
]
}
],
"source": [
+ "import pandas as pd\n",
+ "from DateProvider import DateProvider\n",
"from datetime import datetime\n",
+ "from ColumnsAdder import ColumnsAdder\n",
+ "from MedianOfFreeBedsByKreisTableFactory import MedianOfFreeBedsByKreisTableFactory\n",
+ "from TimeseriesReader import readTimeseries\n",
+ "from IntensivstationenHtmlFileUpdater import saveLastUpdatedIntensivstationen, saveKreisOptions\n",
+ "from KreiseReader import readKreise\n",
+ "from KreisOptionsProvider import getKreisOptionsAndAlleLandkreise\n",
+ "from IntensiveCareBedsPersister import getAndPersistIntensiveCareBeds4AlleKreise\n",
+ "from Chart import createMedianOfFreeBedsByKreisChart\n",
"\n",
- "print(datetime.now().strftime(\"%d.%m.%Y, %H:%M:%S Uhr\"))"
+ "\n",
+ "pd.set_option('display.max_rows', 100)\n",
+ "pd.set_option('display.max_columns', None)\n",
+ "pd.set_option('mode.chained_assignment', 'raise')\n"
]
},
{
"cell_type": "code",
"execution_count": 3,
- "id": "579c0911",
+ "id": "e40d4c8d",
"metadata": {
"execution": {
- "iopub.execute_input": "2022-12-05T13:33:16.284148Z",
- "iopub.status.busy": "2022-12-05T13:33:16.283939Z",
- "iopub.status.idle": "2022-12-05T13:33:16.989074Z",
- "shell.execute_reply": "2022-12-05T13:33:16.986448Z"
+ "iopub.execute_input": "2023-01-17T14:25:20.916234Z",
+ "iopub.status.busy": "2023-01-17T14:25:20.915769Z",
+ "iopub.status.idle": "2023-01-17T14:25:20.920845Z",
+ "shell.execute_reply": "2023-01-17T14:25:20.920219Z"
}
},
"outputs": [
@@ -66,111 +84,24 @@
"name": "stdout",
"output_type": "stream",
"text": [
- "/home/frankknoll/Dokumente/Corona/projects/HowBadIsMyBatch/src/intensivstationen\r\n"
+ "17.01.2023, 14:25:20 Uhr\n"
]
}
],
"source": [
- "! pwd"
+ "print(datetime.now().strftime(\"%d.%m.%Y, %H:%M:%S Uhr\"))"
]
},
{
"cell_type": "code",
"execution_count": 4,
- "id": "dfa836ec",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:33:16.999683Z",
- "iopub.status.busy": "2022-12-05T13:33:16.998858Z",
- "iopub.status.idle": "2022-12-05T13:33:17.009146Z",
- "shell.execute_reply": "2022-12-05T13:33:17.007377Z"
- }
- },
- "outputs": [],
- "source": [
- "needsUpdate = False"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 5,
- "id": "79de4057",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:33:17.019274Z",
- "iopub.status.busy": "2022-12-05T13:33:17.017784Z",
- "iopub.status.idle": "2022-12-05T13:33:17.166150Z",
- "shell.execute_reply": "2022-12-05T13:33:17.165518Z"
- }
- },
- "outputs": [],
- "source": [
- "from bs4 import BeautifulSoup\n",
- "import requests\n",
- "from datetime import datetime\n",
- "from time import sleep\n",
- "from selenium import webdriver\n",
- "from selenium.webdriver.firefox.options import Options\n",
- "\n",
- "class DateProvider:\n",
- " \n",
- " INTENSIVSTATIONEN_DATE_FORMAT = \"%d.%m.%Y, %H:%M Uhr\"\n",
- "\n",
- " def __init__(self):\n",
- " self.lastUpdated = None\n",
- " self.lastUpdatedDataSource = None\n",
- "\n",
- " def needsUpdate(self):\n",
- " return self.getLastUpdated() < self.getLastUpdatedDataSource()\n",
- " \n",
- " def getLastUpdated(self):\n",
- " if self.lastUpdated is None:\n",
- " htmlContent = requests.get(\"https://knollfrank.github.io/HowBadIsMyBatch/intensivstationen.html\").text\n",
- " soup = BeautifulSoup(htmlContent, \"lxml\")\n",
- " dateStr = soup.find(id = \"Datenstand\").text\n",
- " self.lastUpdated = datetime.strptime(dateStr, DateProvider.INTENSIVSTATIONEN_DATE_FORMAT)\n",
- " \n",
- " return self.lastUpdated\n",
- "\n",
- " def getLastUpdatedDataSource(self):\n",
- " if self.lastUpdatedDataSource is None:\n",
- " html = self._getOriginalHtml()\n",
- " lastUpdatedColumn = 'Letzte Änderung'\n",
- " dataFrame = self._asDataFrame(html, lastUpdatedColumn)\n",
- " self.lastUpdatedDataSource = dataFrame.loc['Landkreis-Daten', lastUpdatedColumn].to_pydatetime()\n",
- "\n",
- " return self.lastUpdatedDataSource\n",
- "\n",
- " def _getOriginalHtml(self):\n",
- " options = Options()\n",
- " options.headless = True\n",
- " options.add_argument(\"-profile\")\n",
- " # put the root directory your default profile path here, you can check it by opening Firefox and then pasting 'about:profiles' into the url field \n",
- " options.add_argument(\"/home/frankknoll/snap/firefox/common/.mozilla/firefox/1j6r2yp6.default\")\n",
- " driver = webdriver.Firefox(options = options)\n",
- " driver.get('https://www.intensivregister.de/#/aktuelle-lage/downloads')\n",
- " sleep(10)\n",
- " innerHTML = driver.execute_script(\"return document.body.innerHTML\")\n",
- " driver.quit()\n",
- " return innerHTML\n",
- "\n",
- " def _asDataFrame(self, html, lastUpdatedColumn):\n",
- " dataFrame = pd.read_html(html, parse_dates = [lastUpdatedColumn])[0]\n",
- " dataFrame[lastUpdatedColumn] = pd.to_datetime(dataFrame[lastUpdatedColumn], format = \"%d.%m.%Y %H:%M Uhr\")\n",
- " dataFrame.set_index('Name', inplace = True)\n",
- " return dataFrame\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 6,
"id": "336f56e6",
"metadata": {
"execution": {
- "iopub.execute_input": "2022-12-05T13:33:17.169436Z",
- "iopub.status.busy": "2022-12-05T13:33:17.168987Z",
- "iopub.status.idle": "2022-12-05T13:33:31.118196Z",
- "shell.execute_reply": "2022-12-05T13:33:31.117473Z"
+ "iopub.execute_input": "2023-01-17T14:25:20.923692Z",
+ "iopub.status.busy": "2023-01-17T14:25:20.923250Z",
+ "iopub.status.idle": "2023-01-17T14:25:21.928844Z",
+ "shell.execute_reply": "2023-01-17T14:25:21.928050Z"
}
},
"outputs": [
@@ -178,9 +109,25 @@
"name": "stdout",
"output_type": "stream",
"text": [
- " lastUpdated: 2022-11-30 12:49:00\n",
- "lastUpdatedDataSource: 2022-12-05 12:49:00\n",
- "needsUpdate: True\n"
+ " lastUpdated: 2023-01-14 12:49:00\n"
+ ]
+ },
+ {
+ "ename": "SessionNotCreatedException",
+ "evalue": "Message: Failed to set preferences: Unable to write Firefox profile: No such file or directory (os error 2)\n",
+ "output_type": "error",
+ "traceback": [
+ "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+ "\u001b[0;31mSessionNotCreatedException\u001b[0m Traceback (most recent call last)",
+ "Cell \u001b[0;32mIn[4], line 3\u001b[0m\n\u001b[1;32m 1\u001b[0m dateProvider \u001b[38;5;241m=\u001b[39m DateProvider()\n\u001b[1;32m 2\u001b[0m \u001b[38;5;28mprint\u001b[39m(\u001b[38;5;124m'\u001b[39m\u001b[38;5;124m lastUpdated:\u001b[39m\u001b[38;5;124m'\u001b[39m, dateProvider\u001b[38;5;241m.\u001b[39mgetLastUpdated())\n\u001b[0;32m----> 3\u001b[0m \u001b[38;5;28mprint\u001b[39m(\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mlastUpdatedDataSource:\u001b[39m\u001b[38;5;124m'\u001b[39m, \u001b[43mdateProvider\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mgetLastUpdatedDataSource\u001b[49m\u001b[43m(\u001b[49m\u001b[43m)\u001b[49m) \n\u001b[1;32m 4\u001b[0m needsUpdate \u001b[38;5;241m=\u001b[39m dateProvider\u001b[38;5;241m.\u001b[39mneedsUpdate()\n\u001b[1;32m 5\u001b[0m \u001b[38;5;28mprint\u001b[39m(\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mneedsUpdate:\u001b[39m\u001b[38;5;124m'\u001b[39m, needsUpdate)\n",
+ "File \u001b[0;32m~/work/HowBadIsMyBatch/HowBadIsMyBatch/src/intensivstationen/DateProvider.py:31\u001b[0m, in \u001b[0;36mDateProvider.getLastUpdatedDataSource\u001b[0;34m(self)\u001b[0m\n\u001b[1;32m 29\u001b[0m \u001b[38;5;28;01mdef\u001b[39;00m \u001b[38;5;21mgetLastUpdatedDataSource\u001b[39m(\u001b[38;5;28mself\u001b[39m):\n\u001b[1;32m 30\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39mlastUpdatedDataSource \u001b[38;5;129;01mis\u001b[39;00m \u001b[38;5;28;01mNone\u001b[39;00m:\n\u001b[0;32m---> 31\u001b[0m html \u001b[38;5;241m=\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43m_getOriginalHtml\u001b[49m\u001b[43m(\u001b[49m\u001b[43m)\u001b[49m\n\u001b[1;32m 32\u001b[0m lastUpdatedColumn \u001b[38;5;241m=\u001b[39m \u001b[38;5;124m'\u001b[39m\u001b[38;5;124mLetzte Änderung\u001b[39m\u001b[38;5;124m'\u001b[39m\n\u001b[1;32m 33\u001b[0m dataFrame \u001b[38;5;241m=\u001b[39m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39m_asDataFrame(html, lastUpdatedColumn)\n",
+ "File \u001b[0;32m~/work/HowBadIsMyBatch/HowBadIsMyBatch/src/intensivstationen/DateProvider.py:44\u001b[0m, in \u001b[0;36mDateProvider._getOriginalHtml\u001b[0;34m(self)\u001b[0m\n\u001b[1;32m 42\u001b[0m \u001b[38;5;66;03m# put the root directory your default profile path here, you can check it by opening Firefox and then pasting 'about:profiles' into the url field \u001b[39;00m\n\u001b[1;32m 43\u001b[0m options\u001b[38;5;241m.\u001b[39madd_argument(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124m/home/frankknoll/snap/firefox/common/.mozilla/firefox/1j6r2yp6.default\u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[0;32m---> 44\u001b[0m driver \u001b[38;5;241m=\u001b[39m \u001b[43mwebdriver\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mFirefox\u001b[49m\u001b[43m(\u001b[49m\u001b[43moptions\u001b[49m\u001b[43m \u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43m \u001b[49m\u001b[43moptions\u001b[49m\u001b[43m)\u001b[49m\n\u001b[1;32m 45\u001b[0m driver\u001b[38;5;241m.\u001b[39mget(\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mhttps://www.intensivregister.de/#/aktuelle-lage/downloads\u001b[39m\u001b[38;5;124m'\u001b[39m)\n\u001b[1;32m 46\u001b[0m sleep(\u001b[38;5;241m10\u001b[39m)\n",
+ "File \u001b[0;32m/usr/share/miniconda/envs/howbadismybatch-venv/lib/python3.10/site-packages/selenium/webdriver/firefox/webdriver.py:197\u001b[0m, in \u001b[0;36mWebDriver.__init__\u001b[0;34m(self, firefox_profile, firefox_binary, capabilities, proxy, executable_path, options, service_log_path, service_args, service, desired_capabilities, log_path, keep_alive)\u001b[0m\n\u001b[1;32m 192\u001b[0m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39mservice\u001b[38;5;241m.\u001b[39mstart()\n\u001b[1;32m 194\u001b[0m executor \u001b[38;5;241m=\u001b[39m FirefoxRemoteConnection(\n\u001b[1;32m 195\u001b[0m remote_server_addr\u001b[38;5;241m=\u001b[39m\u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39mservice\u001b[38;5;241m.\u001b[39mservice_url, ignore_proxy\u001b[38;5;241m=\u001b[39moptions\u001b[38;5;241m.\u001b[39m_ignore_local_proxy\n\u001b[1;32m 196\u001b[0m )\n\u001b[0;32m--> 197\u001b[0m \u001b[38;5;28;43msuper\u001b[39;49m\u001b[43m(\u001b[49m\u001b[43m)\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[38;5;21;43m__init__\u001b[39;49m\u001b[43m(\u001b[49m\u001b[43mcommand_executor\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43mexecutor\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43moptions\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[43moptions\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mkeep_alive\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[38;5;28;43;01mTrue\u001b[39;49;00m\u001b[43m)\u001b[49m\n\u001b[1;32m 199\u001b[0m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39m_is_remote \u001b[38;5;241m=\u001b[39m \u001b[38;5;28;01mFalse\u001b[39;00m\n",
+ "File \u001b[0;32m/usr/share/miniconda/envs/howbadismybatch-venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:288\u001b[0m, in \u001b[0;36mWebDriver.__init__\u001b[0;34m(self, command_executor, desired_capabilities, browser_profile, proxy, keep_alive, file_detector, options)\u001b[0m\n\u001b[1;32m 286\u001b[0m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39m_authenticator_id \u001b[38;5;241m=\u001b[39m \u001b[38;5;28;01mNone\u001b[39;00m\n\u001b[1;32m 287\u001b[0m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39mstart_client()\n\u001b[0;32m--> 288\u001b[0m \u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mstart_session\u001b[49m\u001b[43m(\u001b[49m\u001b[43mcapabilities\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mbrowser_profile\u001b[49m\u001b[43m)\u001b[49m\n",
+ "File \u001b[0;32m/usr/share/miniconda/envs/howbadismybatch-venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:381\u001b[0m, in \u001b[0;36mWebDriver.start_session\u001b[0;34m(self, capabilities, browser_profile)\u001b[0m\n\u001b[1;32m 379\u001b[0m w3c_caps \u001b[38;5;241m=\u001b[39m _make_w3c_caps(capabilities)\n\u001b[1;32m 380\u001b[0m parameters \u001b[38;5;241m=\u001b[39m {\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mcapabilities\u001b[39m\u001b[38;5;124m\"\u001b[39m: w3c_caps}\n\u001b[0;32m--> 381\u001b[0m response \u001b[38;5;241m=\u001b[39m \u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mexecute\u001b[49m\u001b[43m(\u001b[49m\u001b[43mCommand\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mNEW_SESSION\u001b[49m\u001b[43m,\u001b[49m\u001b[43m \u001b[49m\u001b[43mparameters\u001b[49m\u001b[43m)\u001b[49m\n\u001b[1;32m 382\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124msessionId\u001b[39m\u001b[38;5;124m\"\u001b[39m \u001b[38;5;129;01mnot\u001b[39;00m \u001b[38;5;129;01min\u001b[39;00m response:\n\u001b[1;32m 383\u001b[0m response \u001b[38;5;241m=\u001b[39m response[\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mvalue\u001b[39m\u001b[38;5;124m\"\u001b[39m]\n",
+ "File \u001b[0;32m/usr/share/miniconda/envs/howbadismybatch-venv/lib/python3.10/site-packages/selenium/webdriver/remote/webdriver.py:444\u001b[0m, in \u001b[0;36mWebDriver.execute\u001b[0;34m(self, driver_command, params)\u001b[0m\n\u001b[1;32m 442\u001b[0m response \u001b[38;5;241m=\u001b[39m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39mcommand_executor\u001b[38;5;241m.\u001b[39mexecute(driver_command, params)\n\u001b[1;32m 443\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m response:\n\u001b[0;32m--> 444\u001b[0m \u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43merror_handler\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mcheck_response\u001b[49m\u001b[43m(\u001b[49m\u001b[43mresponse\u001b[49m\u001b[43m)\u001b[49m\n\u001b[1;32m 445\u001b[0m response[\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mvalue\u001b[39m\u001b[38;5;124m\"\u001b[39m] \u001b[38;5;241m=\u001b[39m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39m_unwrap_value(response\u001b[38;5;241m.\u001b[39mget(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mvalue\u001b[39m\u001b[38;5;124m\"\u001b[39m, \u001b[38;5;28;01mNone\u001b[39;00m))\n\u001b[1;32m 446\u001b[0m \u001b[38;5;28;01mreturn\u001b[39;00m response\n",
+ "File \u001b[0;32m/usr/share/miniconda/envs/howbadismybatch-venv/lib/python3.10/site-packages/selenium/webdriver/remote/errorhandler.py:249\u001b[0m, in \u001b[0;36mErrorHandler.check_response\u001b[0;34m(self, response)\u001b[0m\n\u001b[1;32m 247\u001b[0m alert_text \u001b[38;5;241m=\u001b[39m value[\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124malert\u001b[39m\u001b[38;5;124m\"\u001b[39m]\u001b[38;5;241m.\u001b[39mget(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mtext\u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[1;32m 248\u001b[0m \u001b[38;5;28;01mraise\u001b[39;00m exception_class(message, screen, stacktrace, alert_text) \u001b[38;5;66;03m# type: ignore[call-arg] # mypy is not smart enough here\u001b[39;00m\n\u001b[0;32m--> 249\u001b[0m \u001b[38;5;28;01mraise\u001b[39;00m exception_class(message, screen, stacktrace)\n",
+ "\u001b[0;31mSessionNotCreatedException\u001b[0m: Message: Failed to set preferences: Unable to write Firefox profile: No such file or directory (os error 2)\n"
]
}
],
@@ -194,269 +141,65 @@
},
{
"cell_type": "code",
- "execution_count": 7,
- "id": "03784154",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:33:31.121382Z",
- "iopub.status.busy": "2022-12-05T13:33:31.121151Z",
- "iopub.status.idle": "2022-12-05T13:33:31.126158Z",
- "shell.execute_reply": "2022-12-05T13:33:31.125603Z"
- }
- },
- "outputs": [],
- "source": [
- "from bs4 import BeautifulSoup\n",
- "\n",
- "class HtmlTransformerUtil:\n",
- " \n",
- " def applySoupTransformerToFile(self, file, soupTransformer):\n",
- " self._writeSoup(soupTransformer(self._readSoup(file)), file)\n",
- "\n",
- " def _readSoup(self, file):\n",
- " with open(file) as fp:\n",
- " soup = BeautifulSoup(fp, 'lxml')\n",
- " return soup\n",
- "\n",
- " def _writeSoup(self, soup, file):\n",
- " with open(file, \"w\") as fp:\n",
- " fp.write(str(soup)) \n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 8,
- "id": "af101279",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:33:31.128954Z",
- "iopub.status.busy": "2022-12-05T13:33:31.128733Z",
- "iopub.status.idle": "2022-12-05T13:33:31.132967Z",
- "shell.execute_reply": "2022-12-05T13:33:31.132243Z"
- }
- },
- "outputs": [],
- "source": [
- "def saveLastUpdatedIntensivstationen(lastUpdated):\n",
- " def setLastUpdated(soup):\n",
- " soup.find(id = \"Datenstand\").string.replace_with(lastUpdated.strftime(DateProvider.INTENSIVSTATIONEN_DATE_FORMAT))\n",
- " return soup\n",
- "\n",
- " HtmlTransformerUtil().applySoupTransformerToFile(\n",
- " file = \"../../docs/intensivstationen.html\",\n",
- " soupTransformer = setLastUpdated)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 9,
+ "execution_count": 5,
"id": "63be303c",
"metadata": {
"execution": {
- "iopub.execute_input": "2022-12-05T13:33:31.136146Z",
- "iopub.status.busy": "2022-12-05T13:33:31.135871Z",
- "iopub.status.idle": "2022-12-05T13:33:31.165780Z",
- "shell.execute_reply": "2022-12-05T13:33:31.165247Z"
- }
- },
- "outputs": [],
- "source": [
- "saveLastUpdatedIntensivstationen(dateProvider.getLastUpdatedDataSource())"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 10,
- "id": "d021de84",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:33:31.168581Z",
- "iopub.status.busy": "2022-12-05T13:33:31.168238Z",
- "iopub.status.idle": "2022-12-05T13:33:31.226680Z",
- "shell.execute_reply": "2022-12-05T13:33:31.225887Z"
- }
- },
- "outputs": [],
- "source": [
- "def readTimeseries(download = False):\n",
- " timeSeriesFile = 'zeitreihe-tagesdaten.csv'\n",
- " if download:\n",
- " _downloadTimeseries(timeSeriesFile)\n",
- "\n",
- " timeseries = pd.read_csv(\n",
- " timeSeriesFile,\n",
- " low_memory = False,\n",
- " usecols = ['date', 'bundesland', 'gemeindeschluessel', 'betten_belegt', 'betten_frei'],\n",
- " parse_dates = ['date'],\n",
- " date_parser = lambda dateStr: pd.to_datetime(dateStr, format = \"%Y-%m-%d\"),\n",
- " dtype = {\n",
- " 'gemeindeschluessel': 'string',\n",
- " 'bundesland': 'string'\n",
- " })\n",
- " return timeseries.sort_values(by = 'date', ascending = True)\n",
- "\n",
- "# download https://diviexchange.blob.core.windows.net/%24web/zeitreihe-tagesdaten.csv or https://www.intensivregister.de/#/aktuelle-lage/downloads\n",
- "def _downloadTimeseries(timeSeriesFile):\n",
- " request.urlretrieve(\n",
- " 'https://diviexchange.blob.core.windows.net/%24web/zeitreihe-tagesdaten.csv',\n",
- " timeSeriesFile)\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 11,
- "id": "3f992231",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:33:31.230684Z",
- "iopub.status.busy": "2022-12-05T13:33:31.230285Z",
- "iopub.status.idle": "2022-12-05T13:34:23.278366Z",
- "shell.execute_reply": "2022-12-05T13:34:23.277732Z"
+ "iopub.execute_input": "2023-01-17T14:25:21.931546Z",
+ "iopub.status.busy": "2023-01-17T14:25:21.931244Z",
+ "iopub.status.idle": "2023-01-17T14:25:22.507178Z",
+ "shell.execute_reply": "2023-01-17T14:25:22.506540Z"
}
},
"outputs": [
{
- "data": {
- "text/html": [
- "\n",
- "\n",
- "
\n",
- " \n",
- " \n",
- " date \n",
- " bundesland \n",
- " gemeindeschluessel \n",
- " betten_frei \n",
- " betten_belegt \n",
- " \n",
- " \n",
- " \n",
- " \n",
- " 0 \n",
- " 2020-04-24 \n",
- " 01 \n",
- " 01001 \n",
- " 40 \n",
- " 38 \n",
- " \n",
- " \n",
- " 267 \n",
- " 2020-04-24 \n",
- " 09 \n",
- " 09471 \n",
- " 9 \n",
- " 9 \n",
- " \n",
- " \n",
- " 266 \n",
- " 2020-04-24 \n",
- " 09 \n",
- " 09464 \n",
- " 17 \n",
- " 23 \n",
- " \n",
- " \n",
- " 265 \n",
- " 2020-04-24 \n",
- " 09 \n",
- " 09463 \n",
- " 9 \n",
- " 25 \n",
- " \n",
- " \n",
- " 264 \n",
- " 2020-04-24 \n",
- " 09 \n",
- " 09462 \n",
- " 12 \n",
- " 51 \n",
- " \n",
- " \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " \n",
- " \n",
- " 378119 \n",
- " 2022-12-05 \n",
- " 06 \n",
- " 06437 \n",
- " 4 \n",
- " 122 \n",
- " \n",
- " \n",
- " 378118 \n",
- " 2022-12-05 \n",
- " 06 \n",
- " 06436 \n",
- " 0 \n",
- " 19 \n",
- " \n",
- " \n",
- " 378117 \n",
- " 2022-12-05 \n",
- " 06 \n",
- " 06435 \n",
- " 9 \n",
- " 64 \n",
- " \n",
- " \n",
- " 378115 \n",
- " 2022-12-05 \n",
- " 06 \n",
- " 06433 \n",
- " 1 \n",
- " 18 \n",
- " \n",
- " \n",
- " 378388 \n",
- " 2022-12-05 \n",
- " 16 \n",
- " 16077 \n",
- " 4 \n",
- " 24 \n",
- " \n",
- " \n",
- "
\n",
- "
378389 rows × 5 columns
\n",
- "
\n",
- "\n",
- "
\n",
- " \n",
- " \n",
- " Bundesland \n",
- " Kreis \n",
- " Einwohnerzahl \n",
- " \n",
- " \n",
- " Key \n",
- " \n",
- " \n",
- " \n",
- " \n",
- " NaN \n",
- " NaN \n",
- " NaN \n",
- " NaN \n",
- " \n",
- " \n",
- " 01 \n",
- " Schleswig-Holstein \n",
- " NaN \n",
- " NaN \n",
- " \n",
- " \n",
- " 01001 \n",
- " Kreisfreie Stadt \n",
- " Flensburg, Stadt \n",
- " 89934.0 \n",
- " \n",
- " \n",
- " 01002 \n",
- " Kreisfreie Stadt \n",
- " Kiel, Landeshauptstadt \n",
- " 246601.0 \n",
- " \n",
- " \n",
- " 01003 \n",
- " Kreisfreie Stadt \n",
- " Lübeck, Hansestadt \n",
- " 215846.0 \n",
- " \n",
- " \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " \n",
- " \n",
- " 2) Die Ergebnisse ab Berichtsjahr 2016 sind aufgrund methodischer Änderungen und technischer Weiterentwicklung\\n nur bedingt mit den Vorjahreswerten vegleichbar. Erläuterungen dazu finden Sie unter www.destatis.de beim Bevölkerungsstand. \n",
- " NaN \n",
- " NaN \n",
- " NaN \n",
- " \n",
- " \n",
- " NaN \n",
- " NaN \n",
- " NaN \n",
- " NaN \n",
- " \n",
- " \n",
- " © Daten (im Auftrag der Herausgebergemeinschaft Statistische Ämter des Bundes und der Länder) \n",
- " NaN \n",
- " NaN \n",
- " NaN \n",
- " \n",
- " \n",
- " Statistisches Bundesamt (Destatis), 2021 \n",
- " NaN \n",
- " NaN \n",
- " NaN \n",
- " \n",
- " \n",
- " Vervielfältigung und Verbreitung, auch auszugsweise, mit Quellenangabe gestattet. \n",
- " NaN \n",
- " NaN \n",
- " NaN \n",
- " \n",
- " \n",
- "
\n",
- "
488 rows × 3 columns
\n",
- "
\n",
- "\n",
- "
\n",
- " \n",
- " \n",
- " date \n",
- " bundesland \n",
- " gemeindeschluessel \n",
- " betten_frei \n",
- " betten_belegt \n",
- " Kreis \n",
- " Einwohnerzahl \n",
- " Bundesland \n",
- " \n",
- " \n",
- " \n",
- " \n",
- " 0 \n",
- " 2020-04-24 \n",
- " 01 \n",
- " 01001 \n",
- " 40 \n",
- " 38 \n",
- " Flensburg, Stadt \n",
- " 89934.0 \n",
- " Schleswig-Holstein \n",
- " \n",
- " \n",
- " 267 \n",
- " 2020-04-24 \n",
- " 09 \n",
- " 09471 \n",
- " 9 \n",
- " 9 \n",
- " Bamberg \n",
- " 147497.0 \n",
- " Bayern \n",
- " \n",
- " \n",
- " 266 \n",
- " 2020-04-24 \n",
- " 09 \n",
- " 09464 \n",
- " 17 \n",
- " 23 \n",
- " Hof \n",
- " 45173.0 \n",
- " Bayern \n",
- " \n",
- " \n",
- " 265 \n",
- " 2020-04-24 \n",
- " 09 \n",
- " 09463 \n",
- " 9 \n",
- " 25 \n",
- " Coburg \n",
- " 40842.0 \n",
- " Bayern \n",
- " \n",
- " \n",
- " 264 \n",
- " 2020-04-24 \n",
- " 09 \n",
- " 09462 \n",
- " 12 \n",
- " 51 \n",
- " Bayreuth \n",
- " 74048.0 \n",
- " Bayern \n",
- " \n",
- " \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " \n",
- " \n",
- " 378119 \n",
- " 2022-12-05 \n",
- " 06 \n",
- " 06437 \n",
- " 4 \n",
- " 122 \n",
- " Odenwaldkreis \n",
- " 96754.0 \n",
- " Hessen \n",
- " \n",
- " \n",
- " 378118 \n",
- " 2022-12-05 \n",
- " 06 \n",
- " 06436 \n",
- " 0 \n",
- " 19 \n",
- " Main-Taunus-Kreis \n",
- " 239264.0 \n",
- " Hessen \n",
- " \n",
- " \n",
- " 378117 \n",
- " 2022-12-05 \n",
- " 06 \n",
- " 06435 \n",
- " 9 \n",
- " 64 \n",
- " Main-Kinzig-Kreis \n",
- " 421689.0 \n",
- " Hessen \n",
- " \n",
- " \n",
- " 378115 \n",
- " 2022-12-05 \n",
- " 06 \n",
- " 06433 \n",
- " 1 \n",
- " 18 \n",
- " Groß-Gerau \n",
- " 275807.0 \n",
- " Hessen \n",
- " \n",
- " \n",
- " 378388 \n",
- " 2022-12-05 \n",
- " 16 \n",
- " 16077 \n",
- " 4 \n",
- " 24 \n",
- " Altenburger Land \n",
- " 88356.0 \n",
- " Thüringen \n",
- " \n",
- " \n",
- "
\n",
- "
378389 rows × 8 columns
\n",
- "
{kreis} '\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 18,
- "id": "9c38ca16",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:23.702827Z",
- "iopub.status.busy": "2022-12-05T13:34:23.702589Z",
- "iopub.status.idle": "2022-12-05T13:34:23.705946Z",
- "shell.execute_reply": "2022-12-05T13:34:23.705365Z"
- }
- },
- "outputs": [],
- "source": [
- "kreisOptions = ['Alle Landkreise '] + getKreisOptions(kreisValues)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 19,
- "id": "9eb453d0",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:23.708378Z",
- "iopub.status.busy": "2022-12-05T13:34:23.708108Z",
- "iopub.status.idle": "2022-12-05T13:34:23.712564Z",
- "shell.execute_reply": "2022-12-05T13:34:23.712053Z"
- }
- },
- "outputs": [],
- "source": [
- "from bs4 import BeautifulSoup\n",
- "\n",
- "\n",
- "class KreisOptionsSetter:\n",
- "\n",
- " def setKreisOptions(self, html, options):\n",
- " soup = self._setKreisOptions(self._parse(html), self._parseOptions(options))\n",
- " return str(soup)\n",
- "\n",
- " def _setKreisOptions(self, soup, options):\n",
- " kreisSelect = soup.find(id = \"kreisSelect\")\n",
- " kreisSelect.clear()\n",
- " for option in options:\n",
- " kreisSelect.append(option)\n",
- " return soup\n",
- "\n",
- " def _parseOptions(self, options):\n",
- " return [self._parse(option).option for option in options]\n",
- "\n",
- " def _parse(self, html):\n",
- " return BeautifulSoup(html, 'lxml')\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 20,
- "id": "29b0930a",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:23.715615Z",
- "iopub.status.busy": "2022-12-05T13:34:23.715350Z",
- "iopub.status.idle": "2022-12-05T13:34:23.722997Z",
- "shell.execute_reply": "2022-12-05T13:34:23.722368Z"
- }
- },
- "outputs": [],
- "source": [
- "import unittest"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 21,
- "id": "45072a1d",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:23.726203Z",
- "iopub.status.busy": "2022-12-05T13:34:23.725738Z",
- "iopub.status.idle": "2022-12-05T13:34:23.729594Z",
- "shell.execute_reply": "2022-12-05T13:34:23.728988Z"
- }
- },
- "outputs": [],
- "source": [
- "class TestHelper:\n",
- "\n",
- " @staticmethod\n",
- " def createDataFrame(index, columns, data, dtypes = {}):\n",
- " return pd.DataFrame(index = index, columns = columns, data = data).astype(dtypes)\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 22,
- "id": "e4f8fa80",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:23.732788Z",
- "iopub.status.busy": "2022-12-05T13:34:23.732533Z",
- "iopub.status.idle": "2022-12-05T13:34:23.739863Z",
- "shell.execute_reply": "2022-12-05T13:34:23.739211Z"
- }
- },
- "outputs": [],
- "source": [
- "class KreisOptionsSetterTest(unittest.TestCase):\n",
- "\n",
- " def test_setKreisOptions(self):\n",
- " # Given\n",
- " kreisOptionsSetter = KreisOptionsSetter()\n",
- "\n",
- " # When\n",
- " htmlActual = kreisOptionsSetter.setKreisOptions(\n",
- " html='''\n",
- " \n",
- " \n",
- " Test
\n",
- " \n",
- " Alle Landkreise \n",
- " Ahrweiler \n",
- " Wiesbaden, Landeshauptstadt \n",
- " Aichach-Friedberg \n",
- " \n",
- " \n",
- " \n",
- " ''',\n",
- " options=[\n",
- " 'Alle Landkreise ',\n",
- " 'Ahrweiler ',\n",
- " 'Aichach-Friedberg '])\n",
- "\n",
- " # Then\n",
- " assertEqualHTML(\n",
- " htmlActual,\n",
- " '''\n",
- " \n",
- " \n",
- " Test
\n",
- " \n",
- " Alle Landkreise \n",
- " Ahrweiler \n",
- " Aichach-Friedberg \n",
- " \n",
- " \n",
- " \n",
- " ''')\n",
- "\n",
- "# adapted from https://stackoverflow.com/questions/8006909/pretty-print-assertequal-for-html-strings\n",
- "def assertEqualHTML(string1, string2, file1='', file2=''):\n",
- " u'''\n",
- " Compare two unicode strings containing HTML.\n",
- " A human friendly diff goes to logging.error() if they\n",
- " are not equal, and an exception gets raised.\n",
- " '''\n",
- " from bs4 import BeautifulSoup as bs\n",
- " import difflib\n",
- "\n",
- " def short(mystr):\n",
- " max = 20\n",
- " if len(mystr) > max:\n",
- " return mystr[:max]\n",
- " return mystr\n",
- " p = []\n",
- " for mystr, file in [(string1, file1), (string2, file2)]:\n",
- " if not isinstance(mystr, str):\n",
- " raise Exception(u'string ist not unicode: %r %s' %\n",
- " (short(mystr), file))\n",
- " soup = bs(mystr)\n",
- " pretty = soup.prettify()\n",
- " p.append(pretty)\n",
- " if p[0] != p[1]:\n",
- " for line in difflib.unified_diff(p[0].splitlines(), p[1].splitlines(), fromfile=file1, tofile=file2):\n",
- " display(line)\n",
- " display(p[0], ' != ', p[1])\n",
- " raise Exception('Not equal %s %s' % (file1, file2))\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 23,
- "id": "403f8b7b",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:23.742169Z",
- "iopub.status.busy": "2022-12-05T13:34:23.741967Z",
- "iopub.status.idle": "2022-12-05T13:34:23.747093Z",
- "shell.execute_reply": "2022-12-05T13:34:23.746418Z"
- }
- },
- "outputs": [],
- "source": [
- "from bs4 import BeautifulSoup\n",
- "\n",
- "\n",
- "def saveKreisOptions(kreisOptions):\n",
- " HtmlTransformerUtil().applySoupTransformerToFile(\n",
- " file = \"../../docs/intensivstationen.html\",\n",
- " soupTransformer =\n",
- " lambda soup:\n",
- " BeautifulSoup(\n",
- " KreisOptionsSetter().setKreisOptions(html = str(soup), options = kreisOptions),\n",
- " 'lxml'))\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 24,
- "id": "5dd8d864",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:23.750413Z",
- "iopub.status.busy": "2022-12-05T13:34:23.750007Z",
- "iopub.status.idle": "2022-12-05T13:34:23.881791Z",
- "shell.execute_reply": "2022-12-05T13:34:23.881263Z"
- }
- },
- "outputs": [],
- "source": [
- "saveKreisOptions(kreisOptions)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 25,
- "id": "43c2f826",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:23.884901Z",
- "iopub.status.busy": "2022-12-05T13:34:23.884619Z",
- "iopub.status.idle": "2022-12-05T13:34:23.889692Z",
- "shell.execute_reply": "2022-12-05T13:34:23.889202Z"
- }
- },
- "outputs": [],
- "source": [
- "import os\n",
- "import json\n",
- "\n",
- "\n",
- "class IOUtils:\n",
- "\n",
- " def saveDictAsJson(dict, file):\n",
- " IOUtils.ensurePath(file)\n",
- " with open(file, 'w') as outfile:\n",
- " json.dump(dict, outfile)\n",
- "\n",
- " @staticmethod\n",
- " def ensurePath(file):\n",
- " directory = os.path.dirname(file)\n",
- " if not os.path.exists(directory):\n",
- " os.makedirs(directory)\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 26,
- "id": "997a4bdb",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:23.892139Z",
- "iopub.status.busy": "2022-12-05T13:34:23.891892Z",
- "iopub.status.idle": "2022-12-05T13:34:23.897733Z",
- "shell.execute_reply": "2022-12-05T13:34:23.897193Z"
- }
- },
- "outputs": [],
- "source": [
- "def getIntensiveCareBeds(timeSeries, kreis = None):\n",
- " if kreis is not None:\n",
- " return timeSeries[timeSeries['Kreis'] == kreis][['date', 'betten_belegt', 'betten_frei', 'Einwohnerzahl']]\n",
- " else:\n",
- " return timeSeries.groupby('date').agg(**{\n",
- " 'betten_belegt': pd.NamedAgg(column = 'betten_belegt', aggfunc = 'sum'),\n",
- " 'betten_frei': pd.NamedAgg(column = 'betten_frei', aggfunc = 'sum'),\n",
- " 'Einwohnerzahl': pd.NamedAgg(column = 'Einwohnerzahl', aggfunc = 'sum')\n",
- " }).reset_index()"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 27,
- "id": "a97f5b2b",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:23.900813Z",
- "iopub.status.busy": "2022-12-05T13:34:23.900512Z",
- "iopub.status.idle": "2022-12-05T13:34:23.906789Z",
- "shell.execute_reply": "2022-12-05T13:34:23.906125Z"
- }
- },
- "outputs": [],
- "source": [
- "def getAndPersistIntensiveCareBeds(timeSeries, kreis = None):\n",
- " intensiveCareBeds = getIntensiveCareBeds(timeSeries, kreis)\n",
- " display(kreis)\n",
- " _saveAsJson(intensiveCareBeds, _getFilename(kreis))\n",
- " return intensiveCareBeds\n",
- "\n",
- "\n",
- "def _saveAsJson(intensiveCareBeds, file):\n",
- " IOUtils.saveDictAsJson(\n",
- " {\n",
- " 'population': int(intensiveCareBeds.iloc[0]['Einwohnerzahl']),\n",
- " 'data': _intensiveCareBeds2Dict(intensiveCareBeds),\n",
- " },\n",
- " file)\n",
- "\n",
- "\n",
- "def _intensiveCareBeds2Dict(intensiveCareBeds):\n",
- " df = intensiveCareBeds[['date', 'betten_belegt', 'betten_frei']].copy()\n",
- " df['date'] = df['date'].dt.strftime('%Y-%m-%d')\n",
- " return df.to_dict(orient = \"records\")\n",
- "\n",
- "\n",
- "def _getFilename(kreis):\n",
- " return f'../../docs/data/intensivstationen/intensivstationen-{_getSuffix(kreis)}.json'\n",
- "\n",
- "\n",
- "def _getSuffix(kreis):\n",
- " return kreis if kreis is not None else 'de'\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 28,
+ "execution_count": 8,
"id": "349edd73",
"metadata": {
"execution": {
- "iopub.execute_input": "2022-12-05T13:34:23.909788Z",
- "iopub.status.busy": "2022-12-05T13:34:23.909329Z",
- "iopub.status.idle": "2022-12-05T13:34:23.948250Z",
- "shell.execute_reply": "2022-12-05T13:34:23.947596Z"
+ "iopub.execute_input": "2023-01-17T14:25:22.540140Z",
+ "iopub.status.busy": "2023-01-17T14:25:22.539842Z",
+ "iopub.status.idle": "2023-01-17T14:25:22.551789Z",
+ "shell.execute_reply": "2023-01-17T14:25:22.551210Z"
}
},
"outputs": [
{
- "data": {
- "text/plain": [
- "None"
- ]
- },
- "metadata": {},
- "output_type": "display_data"
- },
- {
- "data": {
- "text/html": [
- "\n",
- "\n",
- "
\n",
- " \n",
- " \n",
- " date \n",
- " betten_belegt \n",
- " betten_frei \n",
- " Einwohnerzahl \n",
- " \n",
- " \n",
- " \n",
- " \n",
- " 0 \n",
- " 2020-04-24 \n",
- " 19237 \n",
- " 12270 \n",
- " 82401553.0 \n",
- " \n",
- " \n",
- " 1 \n",
- " 2020-04-25 \n",
- " 19100 \n",
- " 12290 \n",
- " 82401553.0 \n",
- " \n",
- " \n",
- " 2 \n",
- " 2020-04-26 \n",
- " 18617 \n",
- " 12694 \n",
- " 82401553.0 \n",
- " \n",
- " \n",
- " 3 \n",
- " 2020-04-27 \n",
- " 18803 \n",
- " 12537 \n",
- " 82360711.0 \n",
- " \n",
- " \n",
- " 4 \n",
- " 2020-04-28 \n",
- " 19345 \n",
- " 12207 \n",
- " 82504802.0 \n",
- " \n",
- " \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " ... \n",
- " \n",
- " \n",
- " 951 \n",
- " 2022-12-01 \n",
- " 20513 \n",
- " 2988 \n",
- " 82658396.0 \n",
- " \n",
- " \n",
- " 952 \n",
- " 2022-12-02 \n",
- " 20501 \n",
- " 2935 \n",
- " 82658396.0 \n",
- " \n",
- " \n",
- " 953 \n",
- " 2022-12-03 \n",
- " 20189 \n",
- " 2959 \n",
- " 82658396.0 \n",
- " \n",
- " \n",
- " 954 \n",
- " 2022-12-04 \n",
- " 19955 \n",
- " 3141 \n",
- " 82658396.0 \n",
- " \n",
- " \n",
- " 955 \n",
- " 2022-12-05 \n",
- " 20141 \n",
- " 3077 \n",
- " 82658396.0 \n",
- " \n",
- " \n",
- "
\n",
- "
956 rows × 4 columns
\n",
- "
"
- ]
- },
- "execution_count": 32,
- "metadata": {},
- "output_type": "execute_result"
}
],
"source": [
- "unittest.main(argv = [''], verbosity = 2, exit = False)"
+ "getAndPersistIntensiveCareBeds4AlleKreise(\n",
+ " timeSeries,\n",
+ " intensivstationenDataDir = '../../docs/data/intensivstationen',\n",
+ " kreisValues = kreisValues)\n"
]
},
{
"cell_type": "code",
- "execution_count": 33,
+ "execution_count": 9,
"id": "f10704f3",
"metadata": {
"execution": {
- "iopub.execute_input": "2022-12-05T13:34:36.766917Z",
- "iopub.status.busy": "2022-12-05T13:34:36.766669Z",
- "iopub.status.idle": "2022-12-05T13:34:36.809453Z",
- "shell.execute_reply": "2022-12-05T13:34:36.808830Z"
+ "iopub.execute_input": "2023-01-17T14:25:22.554665Z",
+ "iopub.status.busy": "2023-01-17T14:25:22.554375Z",
+ "iopub.status.idle": "2023-01-17T14:25:22.566660Z",
+ "shell.execute_reply": "2023-01-17T14:25:22.566217Z"
}
},
- "outputs": [],
+ "outputs": [
+ {
+ "ename": "NameError",
+ "evalue": "name 'timeSeries' is not defined",
+ "output_type": "error",
+ "traceback": [
+ "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+ "\u001b[0;31mNameError\u001b[0m Traceback (most recent call last)",
+ "Cell \u001b[0;32mIn[9], line 1\u001b[0m\n\u001b[0;32m----> 1\u001b[0m medianOfFreeBedsByKreisTable \u001b[38;5;241m=\u001b[39m MedianOfFreeBedsByKreisTableFactory(\u001b[43mtimeSeries\u001b[49m)\u001b[38;5;241m.\u001b[39mcreateMedianOfFreeBedsByKreisTable(\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mKreis\u001b[39m\u001b[38;5;124m'\u001b[39m)\n\u001b[1;32m 2\u001b[0m medianOfFreeBedsByKreisTable\u001b[38;5;241m.\u001b[39mreset_index()\u001b[38;5;241m.\u001b[39mto_json(\n\u001b[1;32m 3\u001b[0m \u001b[38;5;124m'\u001b[39m\u001b[38;5;124m../../docs/data/intensivstationen/medianOfFreeBedsByKreisTable.json\u001b[39m\u001b[38;5;124m'\u001b[39m,\n\u001b[1;32m 4\u001b[0m orient \u001b[38;5;241m=\u001b[39m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mrecords\u001b[39m\u001b[38;5;124m\"\u001b[39m)\n",
+ "\u001b[0;31mNameError\u001b[0m: name 'timeSeries' is not defined"
+ ]
+ }
+ ],
"source": [
- "medianOfFreeBedsByKreisTableFactory = MedianOfFreeBedsByKreisTableFactory(timeSeries)\n",
- "medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('Kreis')\n",
- "medianOfFreeBedsByKreisTable.reset_index().to_json('../../docs/data/intensivstationen/medianOfFreeBedsByKreisTable.json', orient = \"records\")"
+ "medianOfFreeBedsByKreisTable = MedianOfFreeBedsByKreisTableFactory(timeSeries).createMedianOfFreeBedsByKreisTable('Kreis')\n",
+ "medianOfFreeBedsByKreisTable.reset_index().to_json(\n",
+ " '../../docs/data/intensivstationen/medianOfFreeBedsByKreisTable.json',\n",
+ " orient = \"records\")"
]
},
{
"cell_type": "code",
- "execution_count": 34,
- "id": "396cb4f8",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:36.812441Z",
- "iopub.status.busy": "2022-12-05T13:34:36.811933Z",
- "iopub.status.idle": "2022-12-05T13:34:36.864332Z",
- "shell.execute_reply": "2022-12-05T13:34:36.863755Z"
- }
- },
- "outputs": [],
- "source": [
- "def createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory):\n",
- " medianOfFreeBedsByKreisTable = medianOfFreeBedsByKreisTableFactory.createMedianOfFreeBedsByKreisTable('gemeindeschluessel').reset_index()\n",
- " return ColumnsAdder(kreise).addKreisAndEinwohnerzahlColumns(medianOfFreeBedsByKreisTable)\n",
- " \n",
- "medianOfFreeBedsByKreisTable = createMedianOfFreeBedsByKreisTableForChoroplethMap(medianOfFreeBedsByKreisTableFactory)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 35,
- "id": "b4247571",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:36.867473Z",
- "iopub.status.busy": "2022-12-05T13:34:36.867257Z",
- "iopub.status.idle": "2022-12-05T13:34:36.873291Z",
- "shell.execute_reply": "2022-12-05T13:34:36.872643Z"
- }
- },
- "outputs": [],
- "source": [
- "import requests\n",
- "import json\n",
- "\n",
- "\n",
- "class Datawrapper:\n",
- "\n",
- " def __init__(self, accessToken):\n",
- " self.authHeader = {\"Authorization\": f\"Bearer {accessToken}\"}\n",
- "\n",
- " def setChartTitle(self, title):\n",
- " response = requests.request(\n",
- " \"PATCH\",\n",
- " \"https://api.datawrapper.de/v3/charts/dYmYb\",\n",
- " json={\"title\": title},\n",
- " headers={\n",
- " \"Accept\": \"*/*\",\n",
- " \"Content-Type\": \"application/json\"\n",
- " } | self.authHeader)\n",
- " return json.loads(response.text)\n",
- "\n",
- " def uploadChartData(self, data: pd.DataFrame):\n",
- " response = requests.request(\n",
- " \"PUT\",\n",
- " \"https://api.datawrapper.de/v3/charts/dYmYb/data\",\n",
- " data=data.to_csv(\n",
- " index=False,\n",
- " columns=['gemeindeschluessel', 'median_free_beds_in_percent', 'Kreis']).encode(\"utf-8\"),\n",
- " headers={\n",
- " \"Accept\": \"*/*\",\n",
- " \"Content-Type\": \"text/csv\"\n",
- " } | self.authHeader)\n",
- " return response.text\n",
- "\n",
- " def fetchChartData(self):\n",
- " response = requests.request(\n",
- " \"GET\",\n",
- " \"https://api.datawrapper.de/v3/charts/dYmYb/data\",\n",
- " headers={\n",
- " \"Accept\": \"text/csv\"\n",
- " } | self.authHeader)\n",
- "\n",
- " return response.text\n",
- "\n",
- " def publishChart(self):\n",
- " response = requests.request(\n",
- " \"POST\",\n",
- " \"https://api.datawrapper.de/v3/charts/dYmYb/publish\",\n",
- " headers={\n",
- " \"Accept\": \"*/*\"\n",
- " } | self.authHeader)\n",
- " return json.loads(response.text)\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 36,
+ "execution_count": 10,
"id": "d1b75357",
"metadata": {
"execution": {
- "iopub.execute_input": "2022-12-05T13:34:36.876234Z",
- "iopub.status.busy": "2022-12-05T13:34:36.875963Z",
- "iopub.status.idle": "2022-12-05T13:34:36.879930Z",
- "shell.execute_reply": "2022-12-05T13:34:36.879224Z"
+ "iopub.execute_input": "2023-01-17T14:25:22.569080Z",
+ "iopub.status.busy": "2023-01-17T14:25:22.568625Z",
+ "iopub.status.idle": "2023-01-17T14:25:22.572139Z",
+ "shell.execute_reply": "2023-01-17T14:25:22.571452Z"
}
},
"outputs": [],
@@ -5171,210 +326,41 @@
},
{
"cell_type": "code",
- "execution_count": 37,
- "id": "9de2f34e",
+ "execution_count": 11,
+ "id": "8b392b34",
"metadata": {
"execution": {
- "iopub.execute_input": "2022-12-05T13:34:36.882759Z",
- "iopub.status.busy": "2022-12-05T13:34:36.882520Z",
- "iopub.status.idle": "2022-12-05T13:34:40.380031Z",
- "shell.execute_reply": "2022-12-05T13:34:40.377515Z"
+ "iopub.execute_input": "2023-01-17T14:25:22.574445Z",
+ "iopub.status.busy": "2023-01-17T14:25:22.574160Z",
+ "iopub.status.idle": "2023-01-17T14:25:22.587195Z",
+ "shell.execute_reply": "2023-01-17T14:25:22.586634Z"
}
},
"outputs": [
{
- "data": {
- "text/plain": [
- "{'data': {'publicId': 'dYmYb',\n",
- " 'language': 'de-DE',\n",
- " 'theme': 'datawrapper',\n",
- " 'id': 'dYmYb',\n",
- " 'type': 'd3-maps-choropleth',\n",
- " 'title': 'Median freier Intensivbetten im Zeitraum 24.04.2020 bis 05.12.2022',\n",
- " 'lastEditStep': 5,\n",
- " 'publishedAt': '2022-12-05T13:34:40.155Z',\n",
- " 'publicUrl': 'https://datawrapper.dwcdn.net/dYmYb/273/',\n",
- " 'publicVersion': 273,\n",
- " 'deleted': False,\n",
- " 'deletedAt': None,\n",
- " 'forkable': True,\n",
- " 'isFork': False,\n",
- " 'metadata': {'data': {'changes': [],\n",
- " 'transpose': False,\n",
- " 'vertical-header': True,\n",
- " 'horizontal-header': True,\n",
- " 'column-format': {'ags': {'type': 'text'},\n",
- " 'Kreis': {'type': 'text'},\n",
- " 'Einwohnerzahl': {'type': 'number',\n",
- " 'number-append': '',\n",
- " 'number-format': 'auto',\n",
- " 'number-divisor': 0,\n",
- " 'number-prepend': ''},\n",
- " 'gemeindeschluessel': {'type': 'text'},\n",
- " 'median_free_beds_in_percent': {'type': 'number'}},\n",
- " 'upload-method': 'upload'},\n",
- " 'describe': {'source-name': 'Landkreis-Daten',\n",
- " 'source-url': 'https://www.intensivregister.de/#/aktuelle-lage/downloads',\n",
- " 'intro': '',\n",
- " 'byline': '',\n",
- " 'aria-description': '',\n",
- " 'number-format': '-',\n",
- " 'number-divisor': 0,\n",
- " 'number-append': '',\n",
- " 'number-prepend': '',\n",
- " 'hide-title': False},\n",
- " 'visualize': {'dark-mode-invert': True,\n",
- " 'highlighted-series': [],\n",
- " 'highlighted-values': [],\n",
- " 'sharing': {'enabled': False, 'auto': True},\n",
- " 'labels': {'max': 33, 'type': 'places', 'places': [], 'enabled': False},\n",
- " 'legend': {'size': 170,\n",
- " 'title': '',\n",
- " 'labels': 'ranges',\n",
- " 'enabled': True,\n",
- " 'reverse': True,\n",
- " 'labelMax': 'high',\n",
- " 'labelMin': 'low',\n",
- " 'position': 'mt',\n",
- " 'hideItems': [],\n",
- " 'offsetTop': 0,\n",
- " 'offsetLeft': 0,\n",
- " 'interactive': True,\n",
- " 'labelCenter': 'medium',\n",
- " 'labelFormat': '0%',\n",
- " 'orientation': 'horizontal',\n",
- " 'customLabels': ['Group A', 'Group B', 'Group C']},\n",
- " 'basemap': 'germany-kreise-2021',\n",
- " 'tooltip': {'body': 'Median freier Intensivbetten: {{ FORMAT(median_free_beds_in_percent, \"0.0%\") }} \\n\\n',\n",
- " 'title': '{{ kreis }}',\n",
- " 'sticky': True,\n",
- " 'enabled': True},\n",
- " 'zoomable': True,\n",
- " 'map-align': 'center',\n",
- " 'colorscale': {'map': [],\n",
- " 'mode': 'discrete',\n",
- " 'stops': 'custom',\n",
- " 'colors': [{'color': '#F03B20', 'position': 0},\n",
- " {'color': '#FEB24C', 'position': 0.5},\n",
- " {'color': '#38A800', 'position': 1}],\n",
- " 'palette': 0,\n",
- " 'rangeMax': '100',\n",
- " 'rangeMin': '0',\n",
- " 'stopCount': 3,\n",
- " 'customStops': [None, '10', '25', None, 45.5, 56.1, None],\n",
- " 'rangeCenter': '',\n",
- " 'categoryOrder': [],\n",
- " 'interpolation': 'equidistant',\n",
- " 'categoryLabels': []},\n",
- " 'max-height': 650,\n",
- " 'map-padding': 0,\n",
- " 'map-key-attr': 'ags',\n",
- " 'map-type-set': True,\n",
- " 'chart-type-set': True,\n",
- " 'max-map-height': 650,\n",
- " 'min-label-zoom': 1,\n",
- " 'zoom-button-pos': 'br',\n",
- " 'map-label-format': '0,0.[00]',\n",
- " 'text-annotations': [],\n",
- " 'hide-empty-regions': False,\n",
- " 'avoid-label-overlap': True},\n",
- " 'axes': {'keys': 'gemeindeschluessel',\n",
- " 'values': 'median_free_beds_in_percent'},\n",
- " 'publish': {'embed-width': 600,\n",
- " 'embed-height': 785,\n",
- " 'blocks': {'logo': {'enabled': False},\n",
- " 'embed': True,\n",
- " 'download-pdf': False,\n",
- " 'download-svg': False,\n",
- " 'get-the-data': True,\n",
- " 'download-image': True},\n",
- " 'export-pdf': {},\n",
- " 'embed-codes': {'embed-method-responsive': '',\n",
- " 'embed-method-iframe': ''},\n",
- " 'chart-height': 673.13330078125},\n",
- " 'annotate': {'notes': ''},\n",
- " 'custom': {},\n",
- " 'json_error': None},\n",
- " 'externalData': '',\n",
- " 'utf8': False,\n",
- " 'createdAt': '2022-03-25T16:27:58.000Z',\n",
- " 'lastModifiedAt': '2022-12-05T13:34:40.155Z',\n",
- " 'forkedFrom': None,\n",
- " 'organizationId': None,\n",
- " 'authorId': 433861,\n",
- " 'folderId': None},\n",
- " 'version': 273,\n",
- " 'url': 'https://datawrapper.dwcdn.net/dYmYb/273/'}"
- ]
- },
- "execution_count": 37,
- "metadata": {},
- "output_type": "execute_result"
+ "ename": "NameError",
+ "evalue": "name 'createMedianOfFreeBedsByKreisChart' is not defined",
+ "output_type": "error",
+ "traceback": [
+ "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+ "\u001b[0;31mNameError\u001b[0m Traceback (most recent call last)",
+ "Cell \u001b[0;32mIn[11], line 1\u001b[0m\n\u001b[0;32m----> 1\u001b[0m \u001b[43mcreateMedianOfFreeBedsByKreisChart\u001b[49m(\n\u001b[1;32m 2\u001b[0m timeSeries,\n\u001b[1;32m 3\u001b[0m chartTitle \u001b[38;5;241m=\u001b[39m getChartTitle(\n\u001b[1;32m 4\u001b[0m dateStart\u001b[38;5;241m=\u001b[39mtimeSeries[\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mdate\u001b[39m\u001b[38;5;124m'\u001b[39m]\u001b[38;5;241m.\u001b[39mmin(),\n\u001b[1;32m 5\u001b[0m dateEnd\u001b[38;5;241m=\u001b[39mtimeSeries[\u001b[38;5;124m'\u001b[39m\u001b[38;5;124mdate\u001b[39m\u001b[38;5;124m'\u001b[39m]\u001b[38;5;241m.\u001b[39mmax()))\n",
+ "\u001b[0;31mNameError\u001b[0m: name 'createMedianOfFreeBedsByKreisChart' is not defined"
+ ]
}
],
"source": [
- "from decouple import AutoConfig\n",
- "\n",
- "config = AutoConfig(search_path='../..')\n",
- "dataWrapper = Datawrapper(config('DATAWRAPPER_API_TOKEN'))\n",
- "dataWrapper.setChartTitle(\n",
- " getChartTitle(\n",
+ "createMedianOfFreeBedsByKreisChart(\n",
+ " timeSeries,\n",
+ " chartTitle = getChartTitle(\n",
" dateStart=timeSeries['date'].min(),\n",
- " dateEnd=timeSeries['date'].max()))\n",
- "dataWrapper.uploadChartData(medianOfFreeBedsByKreisTable)\n",
- "dataWrapper.publishChart()\n"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 38,
- "id": "0218cdb4",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:40.389248Z",
- "iopub.status.busy": "2022-12-05T13:34:40.388449Z",
- "iopub.status.idle": "2022-12-05T13:34:40.401978Z",
- "shell.execute_reply": "2022-12-05T13:34:40.400480Z"
- }
- },
- "outputs": [],
- "source": [
- "def publishGitHubPages():\n",
- " %cd /home/frankknoll/Dokumente/Corona/projects/HowBadIsMyBatch-pages\n",
- " ! git add -A\n",
- " ! git commit -m \"updating data for Intensivstationen\"\n",
- " ! git push"
- ]
- },
- {
- "cell_type": "markdown",
- "id": "a1e83b07",
- "metadata": {},
- "source": [
- "### see https://knollfrank.github.io/HowBadIsMyBatch/intensivstationen.html"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 39,
- "id": "5f173c2b",
- "metadata": {
- "execution": {
- "iopub.execute_input": "2022-12-05T13:34:40.407363Z",
- "iopub.status.busy": "2022-12-05T13:34:40.406933Z",
- "iopub.status.idle": "2022-12-05T13:34:40.411533Z",
- "shell.execute_reply": "2022-12-05T13:34:40.410663Z"
- }
- },
- "outputs": [],
- "source": [
- "# publishGitHubPages()"
+ " dateEnd=timeSeries['date'].max()))"
]
}
],
"metadata": {
"kernelspec": {
- "display_name": "Python 3.10.8 ('howbadismybatch-venv')",
+ "display_name": "howbadismybatch-venv",
"language": "python",
"name": "python3"
},
@@ -5388,7 +374,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.10.8 (main, Nov 24 2022, 14:13:03) [GCC 11.2.0]"
+ "version": "3.10.8"
},
"vscode": {
"interpreter": {