Handle clients_database as string (#141)

dnstapir · Jan 9, 2025 · d37c949 · d37c949
1 parent 1698806
commit d37c949
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/aggrec/server.py b/aggrec/server.py
@@ -46,7 +46,7 @@ def __init__(self, settings: Settings):
             self.logger.info("Configured without OpenTelemetry")
         key_cache = key_cache_from_settings(self.settings.key_cache) if self.settings.key_cache else None
         self.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.mqtt_new_aggregate_messages = asyncio.Queue(maxsize=self.settings.mqtt.queue_size)
 

diff --git a/aggrec/settings.py b/aggrec/settings.py
@@ -1,7 +1,7 @@
 from datetime import datetime, timezone
 from typing import Annotated
 
-from pydantic import AnyHttpUrl, BaseModel, DirectoryPath, Field, UrlConstraints
+from pydantic import AnyHttpUrl, BaseModel, Field, UrlConstraints
 from pydantic_core import Url
 from pydantic_settings import BaseSettings, PydanticBaseSettingsSource, SettingsConfigDict, TomlConfigSettingsSource
 
@@ -46,7 +46,7 @@ def get_bucket_name(self) -> str:
 
 class Settings(BaseSettings):
     metadata_base_url: AnyHttpUrl = Field(default="http://127.0.0.1")
-    clients_database: DirectoryPath | AnyHttpUrl = Field(default="clients")
+    clients_database: str = Field(default="clients")
     s3: S3 = Field(default=S3())
     mqtt: MqttSettings = Field(default=MqttSettings())
     mongodb: MongoDB = Field(default=MongoDB())

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ aggrec_client = "aggrec.client: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"]}
 mongoengine = "^0.29.0"
 http-message-signatures = ">=0.5.0"
 requests = "^2.30.0"