fix: update pydantic schemas to v2 syntax

- Replace Config class with ConfigDict
- Add cron expression validation
- Add missing updated_at to Schedule
- Add JobExecutionUpdate schema
This commit is contained in:
2026-05-11 20:50:35 +02:00
parent 76cf5054be
commit 83c3075de0
+21 -13
View File
@@ -1,6 +1,7 @@
from pydantic import BaseModel, Field from pydantic import BaseModel, Field, ConfigDict, field_validator
from typing import Optional, List, Dict, Any from typing import Optional, List, Dict, Any
from datetime import datetime from datetime import datetime
import re
# Source schemas # Source schemas
class SourceBase(BaseModel): class SourceBase(BaseModel):
@@ -20,8 +21,7 @@ class Source(SourceBase):
created_at: datetime created_at: datetime
updated_at: datetime updated_at: datetime
class Config: model_config = ConfigDict(from_attributes=True)
from_attributes = True
# Job schemas # Job schemas
class JobBase(BaseModel): class JobBase(BaseModel):
@@ -47,8 +47,7 @@ class Job(JobBase):
created_at: datetime created_at: datetime
updated_at: datetime updated_at: datetime
class Config: model_config = ConfigDict(from_attributes=True)
from_attributes = True
# Schedule schemas # Schedule schemas
class ScheduleBase(BaseModel): class ScheduleBase(BaseModel):
@@ -56,6 +55,14 @@ class ScheduleBase(BaseModel):
cron_expression: str cron_expression: str
enabled: bool = True enabled: bool = True
@field_validator('cron_expression')
@classmethod
def validate_cron(cls, v: str) -> str:
pattern = r'^([0-9*,/-]+)\s+([0-9*,/-]+)\s+([0-9*,/-]+)\s+([0-9*,/-]+)\s+([0-9*,/-]+)$'
if not re.match(pattern, v):
raise ValueError('Invalid cron expression format')
return v
class ScheduleCreate(ScheduleBase): class ScheduleCreate(ScheduleBase):
pass pass
@@ -66,9 +73,9 @@ class ScheduleUpdate(BaseModel):
class Schedule(ScheduleBase): class Schedule(ScheduleBase):
id: int id: int
created_at: datetime created_at: datetime
updated_at: datetime
class Config: model_config = ConfigDict(from_attributes=True)
from_attributes = True
# Execution schemas # Execution schemas
class JobExecutionBase(BaseModel): class JobExecutionBase(BaseModel):
@@ -87,8 +94,11 @@ class JobExecution(JobExecutionBase):
bytes_backed_up: int = 0 bytes_backed_up: int = 0
error_message: Optional[str] = None error_message: Optional[str] = None
class Config: model_config = ConfigDict(from_attributes=True)
from_attributes = True
class JobExecutionUpdate(BaseModel):
status: Optional[str] = Field(None, pattern="^(pending|running|success|failed|cancelled)$")
error_message: Optional[str] = None
# Backup schemas # Backup schemas
class BackupBase(BaseModel): class BackupBase(BaseModel):
@@ -106,8 +116,7 @@ class Backup(BackupBase):
id: int id: int
created_at: datetime created_at: datetime
class Config: model_config = ConfigDict(from_attributes=True)
from_attributes = True
# Settings schemas # Settings schemas
class SettingBase(BaseModel): class SettingBase(BaseModel):
@@ -123,8 +132,7 @@ class SettingUpdate(BaseModel):
class Setting(SettingBase): class Setting(SettingBase):
updated_at: datetime updated_at: datetime
class Config: model_config = ConfigDict(from_attributes=True)
from_attributes = True
# Dashboard schemas # Dashboard schemas
class DashboardStats(BaseModel): class DashboardStats(BaseModel):