ID Vision Phase 2: Standardize Page, Post, Person, Organization, and Hosted File objects

app/models/post_comment_models.py

@@ -1,7 +1,7 @@
 import datetime, pytz
 
 from typing import Dict, List, Optional, Set, Union
-from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
+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, secure_hash_string
@@ -17,25 +17,15 @@ class Post_Comment_Base(BaseModel):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    id_random: Optional[str] = Field(
-        **base_fields['post_comment_id_random'],
-        alias = 'post_comment_id_random',
-    )
-    id: Optional[int] = Field(
-        #alias = 'post_comment_id'
-    )
-
-    post_id_random: Optional[str]
-    post_id: Optional[int]
-
-    person_id_random: Optional[str]
-    person_id: Optional[int]
+    # --- Standardized Vision IDs (Strings) ---
+    id: Optional[str] = Field(None, **base_fields['post_comment_id_random'])
+    post_comment_id: Optional[str] = Field(None, **base_fields['post_comment_id_random'])
+    post_id: Optional[str] = Field(None, **base_fields['post_id_random'])
+    person_id: Optional[str] = Field(None, **base_fields['person_id_random'])
+    user_id: Optional[str] = Field(None, **base_fields['user_id_random'])
 
     external_person_id: Optional[str] # Person ID generated by external system (should be stable and not change)
 
-    user_id_random: Optional[str]
-    user_id: Optional[int]
-
     title: Optional[str]
     content: Optional[str]
 
@@ -65,45 +55,33 @@ class Post_Comment_Base(BaseModel):
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
-    #@validator('post_comment_id_random', always=True)
-    # def post_comment_id_random_copy(cls, v, values, **kwargs):
-    #     log.setLevel(logging.WARNING)
-    #     log.debug(locals())
-
-    #     if values['id_random']:
-    #         return values['id_random']
-    #     return None
-
-    @validator('id', always=True)
-    def post_comment_id_lookup(cls, v, values, **kwargs):
-        if isinstance(v, int) and v > 0: return v
-        elif id_random := values.get('id_random'):
-            return redis_lookup_id_random(record_id_random=id_random, table_name='post_comment')
-        return None
-
-    @validator('post_id', always=True)
-    def post_id_lookup(cls, v, values, **kwargs):
-        if isinstance(v, int) and v > 0: return v
-        elif id_random := values.get('post_id_random'):
-            return redis_lookup_id_random(record_id_random=id_random, table_name='post')
-        return None
-
-    @validator('person_id', always=True)
-    def person_id_lookup(cls, v, values, **kwargs):
-        if isinstance(v, int) and v > 0: return v
-        elif id_random := values.get('person_id_random'):
-            return redis_lookup_id_random(record_id_random=id_random, table_name='person')
-        return None
-
-    @validator('user_id', always=True)
-    def user_id_lookup(cls, v, values, **kwargs):
-        if isinstance(v, int) and v > 0: return v
-        elif id_random := values.get('user_id_random'):
-            return redis_lookup_id_random(record_id_random=id_random, table_name='user')
-        return None
+    @root_validator(pre=True)
+    def map_v3_ids(cls, values):
+        """
+        Vision Transformer:
+        Map DB keys to clean API keys and strip internal integers.
+        """
+        # 1. Map Random Strings to Clean Names
+        if rid := values.get('id_random') or values.get('post_comment_id_random'):
+            values['id'] = rid
+            values['post_comment_id'] = rid
+            
+        if p_rid := values.get('post_id_random'):
+            values['post_id'] = p_rid
+        if per_rid := values.get('person_id_random'):
+            values['person_id'] = per_rid
+        if u_rid := values.get('user_id_random'):
+            values['user_id'] = u_rid
+            
+        # 2. Prevent "Collision Population"
+        for k in ['id', 'post_id', 'person_id', 'user_id']:
+            if k in values and not isinstance(values[k], str):
+                del values[k]
+                
+        return values
 
     class Config:
         underscore_attrs_are_private = True
-        allow_population_by_field_name = True
+        allow_population_by_field_name = False
         fields = base_fields
 # ### END ### API Post Comment Models ### Post_Comment_Base() ###