From 39d270fbeccafeac653f6ef10a03844406be2ade Mon Sep 17 00:00:00 2001 From: Steve White Date: Thu, 20 Mar 2025 17:30:20 -0500 Subject: [PATCH] Fix deprecated Pydantic features: replace dict() with model_dump(), orm_mode with from_attributes, and schema_extra with json_schema_extra --- sim-search-api/app/api/routes/search.py | 6 ++---- sim-search-api/app/schemas/query.py | 2 +- sim-search-api/app/schemas/report.py | 2 +- sim-search-api/app/schemas/search.py | 2 +- sim-search-api/app/schemas/user.py | 4 +--- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sim-search-api/app/api/routes/search.py b/sim-search-api/app/api/routes/search.py index dfa787f..d8c49f6 100644 --- a/sim-search-api/app/api/routes/search.py +++ b/sim-search-api/app/api/routes/search.py @@ -38,7 +38,7 @@ async def execute_search( """ try: search_results = await search_service.execute_search( - search_in.structured_query, + search_in.structured_query.model_dump(), search_in.search_engines, search_in.num_results, search_in.timeout, @@ -142,7 +142,7 @@ async def delete_search( search_id: str, current_user: User = Depends(get_current_active_user), db: Session = Depends(get_db), -) -> Any: +) -> None: """ Delete a search from history. @@ -166,5 +166,3 @@ async def delete_search( db.delete(search) db.commit() - - return None diff --git a/sim-search-api/app/schemas/query.py b/sim-search-api/app/schemas/query.py index 2457ba3..2b64980 100644 --- a/sim-search-api/app/schemas/query.py +++ b/sim-search-api/app/schemas/query.py @@ -62,7 +62,7 @@ class ProcessedQuery(BaseModel): class Config: """Pydantic config.""" - schema_extra = { + json_schema_extra = { "example": { "original_query": "What are the latest advancements in quantum computing?", "structured_query": { diff --git a/sim-search-api/app/schemas/report.py b/sim-search-api/app/schemas/report.py index e58f794..f8cb224 100644 --- a/sim-search-api/app/schemas/report.py +++ b/sim-search-api/app/schemas/report.py @@ -50,7 +50,7 @@ class ReportInDBBase(ReportBase): class Config: """Pydantic config.""" - orm_mode = True + from_attributes = True class Report(ReportInDBBase): diff --git a/sim-search-api/app/schemas/search.py b/sim-search-api/app/schemas/search.py index b9b63b8..3bd6b29 100644 --- a/sim-search-api/app/schemas/search.py +++ b/sim-search-api/app/schemas/search.py @@ -65,7 +65,7 @@ class SearchHistory(BaseModel): class Config: """Pydantic config.""" - orm_mode = True + from_attributes = True class SearchHistoryList(BaseModel): diff --git a/sim-search-api/app/schemas/user.py b/sim-search-api/app/schemas/user.py index 2ed8bdf..e4ac63f 100644 --- a/sim-search-api/app/schemas/user.py +++ b/sim-search-api/app/schemas/user.py @@ -37,9 +37,7 @@ class UserInDBBase(UserBase): id: Optional[str] = None class Config: - """Pydantic config.""" - - orm_mode = True + from_attributes = True class User(UserInDBBase):