Skip to content

Commit a17ada1

Browse files
Helper: fix pydantic v2 migration
1 parent 271747a commit a17ada1

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

core/services/helper/main.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
from fastapi_versioning import VersionedFastAPI, version
3838
from loguru import logger
3939
from nginx_parser import parse_nginx_file
40-
from pydantic import BaseModel
40+
from pydantic import BaseModel, Field
4141
from uvicorn import Config, Server
4242

4343
SERVICE_NAME = "helper"
@@ -95,14 +95,14 @@ class ServiceMetadata(BaseModel):
9595
company: str
9696
version: str
9797
webpage: str
98-
route: Optional[str]
99-
new_page: Optional[bool]
100-
extra_query: Optional[str]
101-
avoid_iframes: Optional[bool]
98+
route: Optional[str] = Field(default=None)
99+
new_page: Optional[bool] = Field(default=None)
100+
extra_query: Optional[str] = Field(default=None)
101+
avoid_iframes: Optional[bool] = Field(default=None)
102102
api: str
103-
sanitized_name: Optional[str]
104-
works_in_relative_paths: Optional[bool]
105-
extras: Optional[Dict[str, str]]
103+
sanitized_name: Optional[str] = Field(default=None)
104+
works_in_relative_paths: Optional[bool] = Field(default=None)
105+
extras: Optional[Dict[str, str]] = Field(default=None)
106106

107107

108108
class ServiceInfo(BaseModel):
@@ -319,7 +319,7 @@ def detect_service(port: int) -> ServiceInfo:
319319
response_as_json = response.as_json
320320
if response.status == http.client.OK and response_as_json is not None and isinstance(response_as_json, dict):
321321
try:
322-
info.metadata = ServiceMetadata.parse_obj(response_as_json)
322+
info.metadata = ServiceMetadata.model_validate(response_as_json)
323323
info.metadata.sanitized_name = re.sub(r"[^a-z0-9]", "", info.metadata.name.lower())
324324
except Exception as e:
325325
logger.warning(f"Failed parsing the received JSON as ServiceMetadata object: {e}")

0 commit comments

Comments
 (0)