Merge branch 'almet/pydantic-configdicts' into 'main'

Use new Pydantic ConfigDict. Fixes #10

Closes #10

See merge request framasoft/framaspace/argos!6
This commit is contained in:
Luc Didry 2023-11-16 15:42:20 +00:00
commit 463594b2fc
2 changed files with 4 additions and 7 deletions

View file

@ -1,6 +1,6 @@
from typing import Dict, List, Literal, Optional, Tuple
from pydantic import BaseModel, HttpUrl, field_validator
from pydantic import BaseModel, ConfigDict, HttpUrl, field_validator
from pydantic.functional_validators import BeforeValidator
from typing_extensions import Annotated
@ -26,9 +26,7 @@ class SSL(BaseModel):
class WebsiteCheck(BaseModel):
key: str
value: str | List[str] | Dict[str, str]
class Config:
arbitrary_types_allowed = True
model_config = ConfigDict(arbitrary_types_allowed=True)
@classmethod
def __get_validators__(cls):

View file

@ -2,7 +2,7 @@ import traceback
from datetime import datetime
from typing import Literal
from pydantic import BaseModel
from pydantic import BaseModel, ConfigDict
# XXX Refactor using SQLModel to avoid duplication of model data
@ -16,8 +16,7 @@ class Task(BaseModel):
selected_at: datetime | None
selected_by: str | None
class Config:
from_attributes = True
model_config = ConfigDict(from_attributes=True)
def __str__(self):
id = self.id