Work on hosted files. Now with basic hosted directory check and clean up.

app/models/hosted_file_link_models.py

@@ -1,11 +1,12 @@
 import datetime, pytz
+
 from typing import Dict, List, Optional, Set, Union
 from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
 
 from app.db_sql import redis_lookup_id_random
 from app.lib_general import log, logging
 
-from .common_field_schema import base_fields, default_num_bytes
+from app.models.common_field_schema import base_fields, default_num_bytes
 
 
 # ### BEGIN ### API Hosted File Link Models ### Hosted_File_Link_Base() ###
@@ -13,10 +14,10 @@ class Hosted_File_Link_Base(BaseModel):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    id_random: Optional[str] = Field(
-        **base_fields['hosted_file_link_id_random'],
-        alias = 'hosted_file_link_id_random',
-    )
+    # id_random: Optional[str] = Field(
+    #     **base_fields['hosted_file_link_id_random'],
+    #     alias = 'hosted_file_link_id_random',
+    # )
     id: Optional[int] = Field(
         #alias = 'hosted_file_link_id'
     )
@@ -39,32 +40,11 @@ class Hosted_File_Link_Base(BaseModel):
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
-    #@validator('hosted_file_link_id_random', always=True)
-    def hosted_file_link_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 hosted_file_link_id_lookup(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
-
-        if values['id_random']:
-            log.debug(values['id_random'])
-            return redis_lookup_id_random(record_id_random=values['id_random'], table_name='hosted_file_link')
-        return None
-
     @validator('account_id', always=True)
     def account_id_lookup(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
-
-        if values['account_id_random']:
-            return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account')
+        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('link_to_id', always=True)
@@ -78,5 +58,6 @@ class Hosted_File_Link_Base(BaseModel):
 
     class Config:
         underscore_attrs_are_private = True
+        allow_population_by_field_name = True
         fields = base_fields
 # ### END ### API Hosted File Link Models ### Hosted_File_Link_Base() ###