Skip to content

Commit d147bd4

Browse files
committed
Merge branch 'dev' of https://github.com/rmusser01/tldw_server into dev
2 parents 4b0668d + 5654da7 commit d147bd4

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

tldw_Server_API/app/api/v1/endpoints/media/versions.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -343,14 +343,22 @@ async def create_version(
343343

344344
with db.transaction():
345345
safe_metadata_json: Optional[str] = None
346-
try:
347-
if request_body.safe_metadata is not None:
346+
if request_body.safe_metadata is not None:
347+
try:
348348
safe_metadata_json = _json.dumps(
349349
request_body.safe_metadata,
350350
ensure_ascii=False,
351351
)
352-
except Exception:
353-
safe_metadata_json = None
352+
except Exception as exc:
353+
logger.warning(
354+
"Invalid safe_metadata for media {} on create_version: {}",
355+
media_id,
356+
exc,
357+
)
358+
raise HTTPException(
359+
status_code=status.HTTP_400_BAD_REQUEST,
360+
detail="safe_metadata is not JSON-serializable",
361+
) from exc
354362

355363
result_dict = db.create_document_version(
356364
media_id=media_id,
@@ -415,7 +423,6 @@ async def create_version(
415423
detail="Internal server error during version creation",
416424
) from exc
417425

418-
419426
@router.delete(
420427
"/{media_id:int}/versions/{version_number:int}",
421428
summary="Soft Delete Media Version",

tldw_Server_API/app/core/Web_Scraping/Article_Extractor_Lib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ async def scrape_article(url: str, custom_cookies: Optional[List[Dict[str, Any]]
366366
"date": "N/A",
367367
"content": "",
368368
"extraction_successful": False,
369-
"error": f"Egress policy evaluation failed: {_e}"
369+
"error": "Egress policy evaluation failed. Please contact system administrator."
370370
}
371371
# Resolve scraper plan via router (configurable via YAML)
372372
try:

0 commit comments

Comments
 (0)