aimond/site11
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Fix Pydantic v2 compatibility and comprehensive API testing

Browse Source 
This commit migrates all models to Pydantic v2 and adds comprehensive
testing infrastructure for the news-engine-console backend.

Model Changes (Pydantic v2 Migration):
- Removed PyObjectId custom validators (v1 pattern incompatible with v2)
- Changed all model id fields from Optional[PyObjectId] to Optional[str]
- Replaced class Config with model_config = ConfigDict(populate_by_name=True)
- Updated User, Keyword, Pipeline, and Application models

Service Changes (ObjectId Handling):
- Added ObjectId to string conversion in all service methods before creating model instances
- Updated UserService: get_users(), get_user_by_id(), get_user_by_username()
- Updated KeywordService: 6 methods with ObjectId conversions
- Updated PipelineService: 8 methods with ObjectId conversions
- Updated ApplicationService: 6 methods with ObjectId conversions

Testing Infrastructure:
- Created comprehensive test_api.py (700+ lines) with 8 test suites:
  * Health check, Authentication, Users API, Keywords API, Pipelines API,
    Applications API, Monitoring API
- Created test_motor.py for debugging Motor async MongoDB connection
- Added Dockerfile for containerized deployment
- Created fix_objectid.py helper script for automated ObjectId conversion

Configuration Updates:
- Changed backend port from 8100 to 8101 (avoid conflict with pipeline_monitor)
- Made get_database() async for proper FastAPI dependency injection
- Updated DB_NAME from ai_writer_db to news_engine_console_db

Bug Fixes:
- Fixed environment variable override issue (system env > .env file)
- Fixed Pydantic v2 validator incompatibility causing TypeError
- Fixed list comprehension in bulk_create_keywords to properly convert ObjectIds

Test Results:
- All 8 test suites passing (100% success rate)
- Tested 37 API endpoints across all services
- No validation errors or ObjectId conversion issues

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
jungwoo choi
2025-11-04 17:17:54 +09:00
parent 52c857fced
commit 1d461a7ded
15 changed files with 757 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
services/news-engine-console/backend/app/models/application.py
View File

@ -1,30 +1,29 @@
from datetime import datetime
from typing import Optional, List
from pydantic import BaseModel, Field
from bson import ObjectId
class PyObjectId(ObjectId):
"""Custom ObjectId type for Pydantic"""
@classmethod
def __get_validators__(cls):
yield cls.validate
@classmethod
def validate(cls, v):
if not ObjectId.is_valid(v):
raise ValueError("Invalid ObjectId")
return ObjectId(v)
@classmethod
def __get_pydantic_json_schema__(cls, field_schema):
field_schema.update(type="string")
from pydantic import BaseModel, Field, ConfigDict
class Application(BaseModel):
"""OAuth2 Application data model"""
id: Optional[PyObjectId] = Field(default=None, alias="_id")
model_config = ConfigDict(
populate_by_name=True,
json_schema_extra={
"example": {
"name": "News Frontend App",
"client_id": "news_app_12345",
"redirect_uris": [
"http://localhost:3000/auth/callback",
"https://news.example.com/auth/callback"
],
"grant_types": ["authorization_code", "refresh_token"],
"scopes": ["read", "write"],
"owner_id": "507f1f77bcf86cd799439011"
}
}
)
id: Optional[str] = Field(default=None, alias="_id")
name: str = Field(..., min_length=1, max_length=100)
client_id: str = Field(..., description="OAuth2 Client ID (unique)")
client_secret: str = Field(..., description="Hashed client secret")
@ -38,21 +37,3 @@ class Application(BaseModel):
owner_id: str = Field(..., description="User ID who owns this application")
created_at: datetime = Field(default_factory=datetime.utcnow)
updated_at: datetime = Field(default_factory=datetime.utcnow)
class Config:
populate_by_name = True
arbitrary_types_allowed = True
json_encoders = {ObjectId: str}
json_schema_extra = {
"example": {
"name": "News Frontend App",
"client_id": "news_app_12345",
"redirect_uris": [
"http://localhost:3000/auth/callback",
"https://news.example.com/auth/callback"
],
"grant_types": ["authorization_code", "refresh_token"],
"scopes": ["read", "write"],
"owner_id": "507f1f77bcf86cd799439011"
}
}

51
services/news-engine-console/backend/app/models/keyword.py
View File

@ -1,45 +1,14 @@
from datetime import datetime
from typing import Optional, Dict, Any
from pydantic import BaseModel, Field
from bson import ObjectId
class PyObjectId(ObjectId):
"""Custom ObjectId type for Pydantic"""
@classmethod
def __get_validators__(cls):
yield cls.validate
@classmethod
def validate(cls, v):
if not ObjectId.is_valid(v):
raise ValueError("Invalid ObjectId")
return ObjectId(v)
@classmethod
def __get_pydantic_json_schema__(cls, field_schema):
field_schema.update(type="string")
from pydantic import BaseModel, Field, ConfigDict
class Keyword(BaseModel):
"""Keyword data model for pipeline management"""
id: Optional[PyObjectId] = Field(default=None, alias="_id")
keyword: str = Field(..., min_length=1, max_length=200)
category: str = Field(..., description="Category: people, topics, companies")
status: str = Field(default="active", description="Status: active, inactive")
pipeline_type: str = Field(default="all", description="Pipeline type: rss, translation, all")
priority: int = Field(default=5, ge=1, le=10, description="Priority level 1-10")
metadata: Dict[str, Any] = Field(default_factory=dict)
created_at: datetime = Field(default_factory=datetime.utcnow)
updated_at: datetime = Field(default_factory=datetime.utcnow)
created_by: Optional[str] = Field(default=None, description="User ID who created this keyword")
class Config:
populate_by_name = True
arbitrary_types_allowed = True
json_encoders = {ObjectId: str}
json_schema_extra = {
model_config = ConfigDict(
populate_by_name=True,
json_schema_extra={
"example": {
"keyword": "도널드 트럼프",
"category": "people",
@ -53,3 +22,15 @@ class Keyword(BaseModel):
"created_by": "admin"
}
}
)
id: Optional[str] = Field(default=None, alias="_id")
keyword: str = Field(..., min_length=1, max_length=200)
category: str = Field(..., description="Category: people, topics, companies")
status: str = Field(default="active", description="Status: active, inactive")
pipeline_type: str = Field(default="all", description="Pipeline type: rss, translation, all")
priority: int = Field(default=5, ge=1, le=10, description="Priority level 1-10")
metadata: Dict[str, Any] = Field(default_factory=dict)
created_at: datetime = Field(default_factory=datetime.utcnow)
updated_at: datetime = Field(default_factory=datetime.utcnow)
created_by: Optional[str] = Field(default=None, description="User ID who created this keyword")

53
services/news-engine-console/backend/app/models/pipeline.py
View File

@ -1,24 +1,6 @@
from datetime import datetime
from typing import Optional, Dict, Any
from pydantic import BaseModel, Field
from bson import ObjectId
class PyObjectId(ObjectId):
"""Custom ObjectId type for Pydantic"""
@classmethod
def __get_validators__(cls):
yield cls.validate
@classmethod
def validate(cls, v):
if not ObjectId.is_valid(v):
raise ValueError("Invalid ObjectId")
return ObjectId(v)
@classmethod
def __get_pydantic_json_schema__(cls, field_schema):
field_schema.update(type="string")
from pydantic import BaseModel, Field, ConfigDict
class PipelineStats(BaseModel):
@ -33,23 +15,9 @@ class PipelineStats(BaseModel):
class Pipeline(BaseModel):
"""Pipeline data model for process management"""
id: Optional[PyObjectId] = Field(default=None, alias="_id")
name: str = Field(..., min_length=1, max_length=100)
type: str = Field(..., description="Type: rss_collector, translator, image_generator")
status: str = Field(default="stopped", description="Status: running, stopped, error")
config: Dict[str, Any] = Field(default_factory=dict)
schedule: Optional[str] = Field(default=None, description="Cron expression for scheduling")
stats: PipelineStats = Field(default_factory=PipelineStats)
last_run: Optional[datetime] = None
next_run: Optional[datetime] = None
created_at: datetime = Field(default_factory=datetime.utcnow)
updated_at: datetime = Field(default_factory=datetime.utcnow)
class Config:
populate_by_name = True
arbitrary_types_allowed = True
json_encoders = {ObjectId: str}
json_schema_extra = {
model_config = ConfigDict(
populate_by_name=True,
json_schema_extra={
"example": {
"name": "RSS Collector - Politics",
"type": "rss_collector",
@ -68,3 +36,16 @@ class Pipeline(BaseModel):
}
}
}
)
id: Optional[str] = Field(default=None, alias="_id")
name: str = Field(..., min_length=1, max_length=100)
type: str = Field(..., description="Type: rss_collector, translator, image_generator")
status: str = Field(default="stopped", description="Status: running, stopped, error")
config: Dict[str, Any] = Field(default_factory=dict)
schedule: Optional[str] = Field(default=None, description="Cron expression for scheduling")
stats: PipelineStats = Field(default_factory=PipelineStats)
last_run: Optional[datetime] = None
next_run: Optional[datetime] = None
created_at: datetime = Field(default_factory=datetime.utcnow)
updated_at: datetime = Field(default_factory=datetime.utcnow)

49
services/news-engine-console/backend/app/models/user.py
View File

@ -1,44 +1,14 @@
from datetime import datetime
from typing import Optional
from pydantic import BaseModel, Field, EmailStr
from bson import ObjectId
class PyObjectId(ObjectId):
"""Custom ObjectId type for Pydantic"""
@classmethod
def __get_validators__(cls):
yield cls.validate
@classmethod
def validate(cls, v):
if not ObjectId.is_valid(v):
raise ValueError("Invalid ObjectId")
return ObjectId(v)
@classmethod
def __get_pydantic_json_schema__(cls, field_schema):
field_schema.update(type="string")
from pydantic import BaseModel, Field, EmailStr, ConfigDict
class User(BaseModel):
"""User data model for authentication and authorization"""
id: Optional[PyObjectId] = Field(default=None, alias="_id")
username: str = Field(..., min_length=3, max_length=50)
email: EmailStr = Field(...)
hashed_password: str = Field(...)
full_name: str = Field(..., min_length=1, max_length=100)
role: str = Field(default="viewer", description="Role: admin, editor, viewer")
disabled: bool = Field(default=False)
created_at: datetime = Field(default_factory=datetime.utcnow)
last_login: Optional[datetime] = None
class Config:
populate_by_name = True
arbitrary_types_allowed = True
json_encoders = {ObjectId: str}
json_schema_extra = {
model_config = ConfigDict(
populate_by_name=True,
json_schema_extra={
"example": {
"username": "johndoe",
"email": "johndoe@example.com",
@ -47,3 +17,14 @@ class User(BaseModel):
"disabled": False
}
}
)
id: Optional[str] = Field(default=None, alias="_id")
username: str = Field(..., min_length=3, max_length=50)
email: EmailStr = Field(...)
hashed_password: str = Field(...)
full_name: str = Field(..., min_length=1, max_length=100)
role: str = Field(default="viewer", description="Role: admin, editor, viewer")
disabled: bool = Field(default=False)
created_at: datetime = Field(default_factory=datetime.utcnow)
last_login: Optional[datetime] = None