Merge branch 'develop' into feature/drawrects

api/.devcontainer/devcontainer.json

@@ -20,25 +20,15 @@
 		"vscode": {
 			// Set *default* container specific settings.json values on container create.
 			"settings": {
-				"python.defaultInterpreterPath": "/usr/local/bin/python",
+				"python.defaultInterpreterPath": "/usr/local/bin/python"
-				"python.linting.enabled": true,
-				"python.linting.pylintEnabled": true,
-				"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
-				"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
-				"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
-				"python.linting.banditPath": "/usr/local/py-utils/bin/bandit",
-				"python.linting.flake8Path": "/usr/local/py-utils/bin/flake8",
-				"python.linting.mypyPath": "/usr/local/py-utils/bin/mypy",
-				"python.linting.pycodestylePath": "/usr/local/py-utils/bin/pycodestyle",
-				"python.linting.pydocstylePath": "/usr/local/py-utils/bin/pydocstyle",
-				"python.linting.pylintPath": "/usr/local/py-utils/bin/pylint"
 			},
 			// Add the IDs of extensions you want installed when the container is created.
 			"extensions": [
 				"be5invis.toml",
 				"mhutchie.git-graph",
 				"ms-python.python",
-				"ms-python.flake8",
+				"ms-python.black-formatter",
+				// "ms-python.flake8",
 				"ms-python.isort",
 				"ms-python.vscode-pylance"
 			]

api/.flake8

@@ -0,0 +1,4 @@
+[flake8]
+max-line-length = 80
+select = C,E,F,W,B,B950
+extend-ignore = E203, E501

api/.vscode/settings.json

@@ -1,17 +1,16 @@
 {
-    "python.testing.pytestArgs": [
+  "python.linting.enabled": true,
-      "tests"
+  "python.linting.pylintEnabled": false,
-    ],
+  "python.linting.flake8Enabled": true,
-    "python.testing.unittestEnabled": false,
+  "python.languageServer": "Pylance",
-    "python.testing.pytestEnabled": true,
+  "editor.formatOnSave": true,
-    "python.linting.enabled": true,
+  "[python]": {
-    "python.linting.pylintEnabled": false,
+    "editor.defaultFormatter": "ms-python.black-formatter"
-    "python.linting.flake8Enabled": true,
+  },
-    "python.languageServer": "Pylance",
+  "editor.codeActionsOnSave": {
-    "editor.formatOnSave": true,
+    "source.organizeImports": true
-    "editor.codeActionsOnSave": {
+  },
-      "source.organizeImports": true
+  "git.closeDiffOnOperation": true,
-    },
+  "python.analysis.typeCheckingMode": "basic",
-    "git.closeDiffOnOperation": true,
+  "python.analysis.diagnosticMode": "workspace",
-    "python.analysis.typeCheckingMode": "basic"
+}
-  }

api/advent22_api/dav_common.py

@@ -6,22 +6,20 @@ from webdav3.client import Client as WebDAVclient
 
 from .settings import SETTINGS
 
-_WEBDAV_CLIENT = WebDAVclient({
+_WEBDAV_CLIENT = WebDAVclient(
-    "webdav_hostname":  SETTINGS.webdav.url,
+    {
-    "webdav_login":     SETTINGS.webdav.username,
+        "webdav_hostname": SETTINGS.webdav.url,
-    "webdav_password":  SETTINGS.webdav.password,
+        "webdav_login": SETTINGS.webdav.username,
-    "disable_check":    SETTINGS.webdav.disable_check,
+        "webdav_password": SETTINGS.webdav.password,
-})
+        "disable_check": SETTINGS.webdav.disable_check,
+    }
+)
 
 
 @AsyncTTL(time_to_live=SETTINGS.cache_ttl)
 async def dav_list_files(regex: re.Pattern, directory: str = "") -> list[str]:
     ls = _WEBDAV_CLIENT.list(directory)
-    return [
+    return [f"{directory}/{path}" for path in ls if regex.search(path)]
-        f"{directory}/{path}"
-        for path in ls
-        if regex.search(path)
-    ]
 
 
 @AsyncTTL(time_to_live=SETTINGS.cache_ttl)

api/advent22_api/routers/_image.py

@@ -1,5 +1,6 @@
 import colorsys
 from dataclasses import dataclass
+from typing import Self
 
 import numpy as np
 from PIL import Image, ImageDraw, ImageFont
@@ -10,7 +11,7 @@ class AdventImage:
     img: Image.Image
 
     @classmethod
-    async def load_standard(cls, fp) -> "AdventImage":
+    async def load_standard(cls, fp) -> Self:
         """
         Bild laden und einen quadratischen Ausschnitt
         aus der Mitte nehmen
@@ -24,16 +25,18 @@ class AdventImage:
         square = min(width, height)
 
         # Bild zuschneiden und skalieren
-        img = img.crop(box=(
+        img = img.crop(
-            int((width - square)/2),
+            box=(
-            int((height - square)/2),
+                int((width - square) / 2),
-            int((width + square)/2),
+                int((height - square) / 2),
-            int((height + square)/2),
+                int((width + square) / 2),
-        ))
+                int((height + square) / 2),
+            )
+        )
 
         img = img.resize(
             size=(500, 500),
-            resample=Image.ANTIALIAS,
+            resample=Image.LANCZOS,
         )
 
         # Farbmodell festlegen
@@ -79,7 +82,7 @@ class AdventImage:
         """
 
         pixel_data = self.img.crop(box).getdata()
-        mean_color: np.ndarray = np.mean(pixel_data, axis=0)
+        mean_color: np.ndarray = np.mean(a=pixel_data, axis=0)
 
         return tuple(mean_color.astype(int).tolist())
 
@@ -98,11 +101,7 @@ class AdventImage:
 
         # betroffenen Bildbereich bestimmen
         text_box = await self.get_text_box(
-            xy=xy,
+            xy=xy, text=text, font=font, anchor=anchor, **text_kwargs
-            text=text,
-            font=font,
-            anchor=anchor,
-            **text_kwargs
         )
 
         if text_box is not None:
@@ -131,5 +130,5 @@ class AdventImage:
                 font=font,
                 fill=text_color,
                 anchor=anchor,
-                **text_kwargs
+                **text_kwargs,
             )

api/advent22_api/routers/_misc.py

@@ -1,7 +1,7 @@
 import itertools
 import random
 import re
-from typing import Any, Sequence
+from typing import Any, Self, Sequence
 
 from fastapi import Depends
 from PIL import ImageFont
@@ -17,7 +17,7 @@ from ._image import AdventImage
 
 class Random(random.Random):
     @classmethod
-    async def get(cls, bonus_salt: Any = "") -> "Random":
+    async def get(cls, bonus_salt: Any = "") -> Self:
         cfg = await get_config()
         return cls(f"{cfg.puzzle.solution}{bonus_salt}")
 
@@ -36,6 +36,7 @@ async def shuffle(seq: Sequence, rnd: random.Random | None = None) -> list:
     # Elemente mischen
     return rnd.sample(seq, len(seq))
 
+
 #########
 # IMAGE #
 #########

api/advent22_api/routers/abspacken.py

@@ -22,8 +22,10 @@ async def uwe(
 ) -> str:
     kurix = await get_kurix(kgs)
 
-    return f"UWE hat bei {firma} einen beachtlichen Haufen von " \
+    return (
+        f"UWE hat bei {firma} einen beachtlichen Haufen von "
         f"{kgs} Kg ({kurix:.3f} Kurix) auf den Läufer geschissen."
+    )
 
 
 @router.get("/torsten/{ding}")
@@ -41,8 +43,8 @@ async def torsten(ding: str) -> str:
         status.HTTP_418_IM_A_TEAPOT: {
             "description": "Commit Sudoku",
             "content": None,
-        }
+        },
-    }
+    },
 )
 async def kys() -> None:
     """

api/advent22_api/routers/user.py

@@ -13,9 +13,7 @@ async def user_is_admin(
     credentials: HTTPBasicCredentials = Depends(security),
     config: Config = Depends(get_config),
 ) -> bool:
-    username_correct = secrets.compare_digest(
+    username_correct = secrets.compare_digest(credentials.username, config.admin.name)
-        credentials.username, config.admin.name
-    )
 
     password_correct = secrets.compare_digest(
         credentials.password, config.admin.password