Merge branch 'develop' into feature/remove-svg-rect

api/.devcontainer/devcontainer.json

@@ -4,7 +4,7 @@
 	"name": "Advent22 API",
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "api",
-	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+	"workspaceFolder": "/workspaces/advent22/${localWorkspaceFolderBasename}",
 	// Configure tool-specific properties.
 	"customizations": {
 		// Configure properties specific to VS Code.

api/.devcontainer/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       TZ: "Europe/Berlin"
 
     volumes:
-      - "../..:/workspaces:cached"
+      - "../..:/workspaces/advent22:cached"
     
     # Overrides default command so things don't shut down after the process ends.
     command: "sleep infinity"

api/.env

@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME="advent22_api"

api/.gitignore

@@ -152,3 +152,4 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
+api.conf

api/advent22_api/core/dav/helpers.py

@@ -1,4 +1,5 @@
 from json import JSONDecodeError
+from typing import Callable, Hashable
 
 import requests
 from cachetools.keys import hashkey
@@ -8,11 +9,17 @@ from redis.typing import EncodableT
 from webdav3.client import Client as __WebDAVclient
 
 
-def davkey(name, _, *args, **kwargs):
+def davkey(
-    """Return a cache key for use with cached methods."""
+    name: str,
+    slice: slice = slice(1, None),
+) -> Callable[..., tuple[Hashable, ...]]:
+    def func(*args, **kwargs) -> tuple[Hashable, ...]:
+        """Return a cache key for use with cached methods."""
 
-    key = hashkey(name, *args, **kwargs)
+        key = hashkey(name, *args[slice], **kwargs)
-    return hashkey(*(str(key_item) for key_item in key))
+        return hashkey(*(str(key_item) for key_item in key))
+
+    return func
 
 
 class WebDAVclient(__WebDAVclient):

api/advent22_api/core/dav/webdav.py

@@ -1,4 +1,3 @@
-import functools
 import logging
 import re
 from io import BytesIO
@@ -34,10 +33,7 @@ class WebDAV:
 
     @classmethod
     @asyncify
-    @cachedmethod(
+    @cachedmethod(cache=lambda cls: cls._cache, key=davkey("list_files"))
-        cache=lambda cls: cls._cache,
-        key=functools.partial(davkey, "list_files"),
-    )
     def list_files(
         cls,
         directory: str = "",
@@ -55,10 +51,7 @@ class WebDAV:
 
     @classmethod
     @asyncify
-    @cachedmethod(
+    @cachedmethod(cache=lambda cls: cls._cache, key=davkey("exists"))
-        cache=lambda cls: cls._cache,
-        key=functools.partial(davkey, "exists"),
-    )
     def exists(cls, path: str) -> bool:
         """
         `True` iff there is a WebDAV resource at `path`
@@ -69,10 +62,7 @@ class WebDAV:
 
     @classmethod
     @asyncify
-    @cachedmethod(
+    @cachedmethod(cache=lambda cls: cls._cache, key=davkey("read_bytes"))
-        cache=lambda cls: cls._cache,
-        key=functools.partial(davkey, "read_bytes"),
-    )
     def read_bytes(cls, path: str) -> bytes:
         """
         Load WebDAV file from `path` as bytes
@@ -105,7 +95,7 @@ class WebDAV:
         cls._webdav_client.upload_to(buffer, path)
 
         # invalidate cache entry
-        cls._cache.pop(davkey("read_bytes", None, path))
+        cls._cache.pop(davkey("read_bytes")(path))
 
     @classmethod
     async def write_str(cls, path: str, content: str, encoding="utf-8") -> None:

api/advent22_api/core/settings.py

@@ -48,7 +48,7 @@ class Settings(BaseSettings):
     """
 
     model_config = SettingsConfigDict(
-        env_file=".env",
+        env_file="api.conf",
         env_file_encoding="utf-8",
         env_nested_delimiter="__",
     )