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

app/models/address_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 get_id_random, redis_lookup_id_random
 from app.lib_general import log, logging
@@ -14,23 +14,15 @@ class Address_Base(BaseModel):
     log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    id_random: Optional[str] = Field(
-        **base_fields['address_id_random'],
-        alias = 'address_id_random',
-        # default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
-    )
-    id: Optional[int] = Field(
-        alias = 'address_id'
-    )
-    account_id_random: Optional[str]
-    account_id: Optional[int]
+    # --- Standardized Vision IDs (Strings) ---
+    id: Optional[str] = Field(None, **base_fields['address_id_random'])
+    address_id: Optional[str] = Field(None, **base_fields['address_id_random'])
+    account_id: Optional[str] = Field(None, **base_fields['account_id_random'])
+    contact_id: Optional[str] = Field(None, **base_fields['contact_id_random'])
 
     for_type: Optional[str]
     for_id_random: Optional[str]
-    for_id: Optional[int]
-
-    contact_id_random: Optional[str]
-    contact_id: Optional[int]
+    for_id: Optional[int] = Field(None, exclude=True)
 
     #organization: Optional[Organization_Base] = Organization_Base()
 
@@ -72,63 +64,31 @@ class Address_Base(BaseModel):
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
-    #@validator('address_id_random', always=True)
-    def address_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 address_id_lookup(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
-
-        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='address')
-        return None
-
-    @validator('account_id', always=True)
-    def account_id_lookup(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
-
-        if isinstance(v, int) and v > 0: return v
-        elif id_random := values.get('account_id_random'):
-            return redis_lookup_id_random(record_id_random=id_random, table_name='account')
-        return None
-
-    @validator('account_id_random', always=True)
-    def account_id_random_lookup(cls, v, values, **kwargs):
-        if isinstance(v, str) and len(v) >= 11: return v
-        elif account_id := values.get('account_id'):
-            return get_id_random(record_id=account_id, table_name='account')
-        return None
-
-    @validator('contact_id', always=True)
-    def contact_id_lookup(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
-
-        if isinstance(v, int) and v > 0: return v
-        elif id_random := values.get('contact_id_random'):
-            return redis_lookup_id_random(record_id_random=id_random, table_name='contact')
-        return None
-
-    @validator('for_id', always=True)
-    def for_id_lookup(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
-
-        if values.get('for_id_random') and values.get('for_type'):
-            return redis_lookup_id_random(record_id_random=values['for_id_random'], table_name=values['for_type'])
-        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('address_id_random'):
+            values['id'] = rid
+            values['address_id'] = rid
+            
+        if a_rid := values.get('account_id_random'):
+            values['account_id'] = a_rid
+        if c_rid := values.get('contact_id_random'):
+            values['contact_id'] = c_rid
+            
+        # 2. Prevent "Collision Population"
+        for k in ['id', 'account_id', 'contact_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 Address Models ### Address_Base() ###