Merge branch 'main' into drop_redis

Signed-off-by: Jakob Schlyter <[email protected]>
dnstapir · Jan 9, 2025 · b2ae317 · b2ae317
2 parents bbf56d2 + 713b598
commit b2ae317
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/evrec/server.py b/evrec/server.py
@@ -31,7 +31,7 @@ def __init__(self, settings: Settings):
             self.logger.warning("Not publishing verified messages")
         key_cache = key_cache_from_settings(self.settings.key_cache) if self.settings.key_cache else None
         key_resolver = key_resolver_from_client_database(
-            client_database=str(self.settings.clients_database), key_cache=key_cache
+            client_database=self.settings.clients_database, key_cache=key_cache
         )
         self.clients_keyset = EvrecJWKSet(key_resolver=key_resolver)
         self.message_validator = MessageValidator()

diff --git a/evrec/settings.py b/evrec/settings.py
@@ -1,6 +1,6 @@
 from typing import Annotated
 
-from pydantic import AnyHttpUrl, BaseModel, DirectoryPath, Field, UrlConstraints
+from pydantic import BaseModel, Field, UrlConstraints
 from pydantic_core import Url
 from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, SettingsConfigDict, TomlConfigSettingsSource
 
@@ -21,7 +21,7 @@ class MqttSettings(BaseModel):
 
 class Settings(BaseSettings):
     mqtt: MqttSettings = Field(default=MqttSettings())
-    clients_database: DirectoryPath | AnyHttpUrl = Field(default="clients")
+    clients_database: str = Field(default="clients")
     schema_validation: bool = False
     key_cache: KeyCacheSettings | None = None
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,7 +10,7 @@ evrec_server = "evrec.server:main"
 
 [tool.poetry.dependencies]
 python = "^3.12"
-dnstapir = {git = "https://github.com/dnstapir/python-dnstapir.git", rev = "v1.2.2", extras = ["keymanager", "opentelemetry"]}
+dnstapir = {git = "https://github.com/dnstapir/python-dnstapir.git", rev = "v1.2.3", extras = ["keymanager", "opentelemetry"]}
 pydantic-settings = "^2.7.0"
 aiomqtt = "^2.2.0"
 jwcrypto = "^1.5.6"