a7c82615ab
Hardened root_validators in Journal, Post, Page, and Hosted File models to use Union[int, str] for Vision ID fields. This prevents resolved integer IDs from being deleted during CREATE/UPDATE operations, resolving a critical regression found during Post Comment bug fixing.
89 lines
3.3 KiB
Python
89 lines
3.3 KiB
Python
import datetime, pytz
|
|
|
|
from typing import Dict, List, Optional, Set, Union
|
|
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator, root_validator
|
|
|
|
from app.db_sql import redis_lookup_id_random
|
|
from app.lib_general import log, logging
|
|
|
|
from app.models.common_field_schema import base_fields, default_num_bytes
|
|
|
|
|
|
# ### BEGIN ### API Page Models ### Page_Base() ###
|
|
class Page_Base(BaseModel):
|
|
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
|
log.debug(locals())
|
|
|
|
# --- Standardized Vision IDs (Strings for API, Integers for DB) ---
|
|
id: Optional[Union[int, str]] = Field(None, **base_fields['page_id_random'])
|
|
page_id: Optional[Union[int, str]] = Field(None, **base_fields['page_id_random'])
|
|
account_id: Optional[Union[int, str]] = Field(None, **base_fields['account_id_random'])
|
|
site_id: Optional[Union[int, str]] = Field(None, **base_fields['site_id_random'])
|
|
|
|
code: Optional[str]
|
|
name: Optional[str]
|
|
title: Optional[str]
|
|
description: Optional[str]
|
|
summary: Optional[str]
|
|
outline: Optional[str]
|
|
|
|
head_html: Optional[str]
|
|
body_html: Optional[str]
|
|
footer_html: Optional[str]
|
|
|
|
content_html: Optional[str]
|
|
content_json: Optional[Union[Json, None]]
|
|
|
|
# keywords: Optional[str]
|
|
tags: Optional[str]
|
|
|
|
start_datetime: Optional[datetime.datetime]
|
|
end_datetime: Optional[datetime.datetime]
|
|
timezone: Optional[str] # = 'UTC' # Default to UTC
|
|
|
|
cfg_json: Optional[Union[Json, None]]
|
|
data_json: Optional[Union[Json, None]] # Used to store additional data for the page
|
|
meta_json: Optional[Union[Json, None]] # Used to store additional data for about the page
|
|
|
|
enable: Optional[bool]
|
|
hide: Optional[bool]
|
|
priority: Optional[bool]
|
|
sort: Optional[int]
|
|
group: Optional[str]
|
|
|
|
notes: Optional[str]
|
|
created_on: Optional[datetime.datetime] = None
|
|
updated_on: Optional[datetime.datetime] = None
|
|
|
|
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
|
|
|
|
@root_validator(pre=True)
|
|
def map_v3_ids(cls, values):
|
|
"""
|
|
Vision Transformer:
|
|
Map DB keys to clean API keys and strip internal integers during READ operations.
|
|
During CREATE (POST) operations, we ensure resolved integers are preserved.
|
|
"""
|
|
# 1. Map Random Strings to Clean Names
|
|
rid = values.get('id_random') or values.get('page_id_random')
|
|
if rid and isinstance(rid, str):
|
|
values['id'] = rid
|
|
values['page_id'] = rid
|
|
|
|
if a_rid := values.get('account_id_random'): values['account_id'] = a_rid
|
|
if s_rid := values.get('site_id_random'): values['site_id'] = s_rid
|
|
|
|
# 2. Prevent "Collision Population" or leakage of integers during API responses
|
|
for k in ['id', 'account_id', 'site_id']:
|
|
val = values.get(k)
|
|
if val is not None and not isinstance(val, str):
|
|
if values.get(f'{k}_random') or (k=='id' and values.get('id_random')):
|
|
del values[k]
|
|
|
|
return values
|
|
|
|
class Config:
|
|
underscore_attrs_are_private = True
|
|
allow_population_by_field_name = False
|
|
fields = base_fields
|
|
# ### END ### API Page Models ### Page_Base() ### |