Work on hosted files and archive content and related bug fixes.

app/models/archive_content_models.py

@@ -15,19 +15,22 @@ class Archive_Content_Base(BaseModel):
     log.debug(locals())
 
     id_random: Optional[str] = Field(
-        **base_fields['archive_id_random'],
-        alias = 'archive_id_random',
+        **base_fields['archive_content_id_random'],
+        alias = 'archive_content_id_random',
         default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
     )
     id: Optional[int] = Field(
-        alias = 'archive_id'
+        alias = 'archive_content_id'
     )
     account_id_random: Optional[str] # Is this field really needed?
     account_id: Optional[int] # Is this field really needed?
+
     archive_id_random: Optional[str]
     archive_id: Optional[int]
+
     archive_content_type_id: Optional[int]
     archive_content_type: Optional[str]
+
     lu_media_type_id: Optional[int]
     lu_media_type: Optional[str]
 
@@ -46,11 +49,10 @@ class Archive_Content_Base(BaseModel):
     filename: Optional[str]
     file_extension: Optional[str]
 
-    original_datetime: Optional[datetime.datetime] = None
-    original_datetime_timezone: Optional[str] = None
-    original_location: Optional[str] = None
-    original_address_id: Optional[int] = None
-
+    original_datetime: Optional[datetime.datetime]
+    original_datetime_timezone: Optional[str]
+    original_location: Optional[str]
+    original_address_id: Optional[int]
     original_url: Optional[str]
     original_url_text: Optional[str]
 
@@ -58,16 +60,16 @@ class Archive_Content_Base(BaseModel):
     access_key: Optional[str]
 
     enable: Optional[bool]
-    enable_from: Optional[datetime.datetime] = None
-    enable_to: Optional[datetime.datetime] = None
+    enable_from: Optional[datetime.datetime]
+    enable_to: Optional[datetime.datetime]
 
     priority: Optional[bool]
     sort: Optional[int]
     group: Optional[str]
 
     notes: Optional[str]
-    created_on: Optional[datetime.datetime] = None
-    updated_on: Optional[datetime.datetime] = None
+    created_on: Optional[datetime.datetime]
+    updated_on: Optional[datetime.datetime]
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
@@ -110,6 +112,7 @@ class Archive_Content_Base(BaseModel):
 
     class Config:
         underscore_attrs_are_private = True
+        allow_population_by_field_name = True
         fields = base_fields
 
 #Archive_Content_Base.update_forward_refs()

app/models/archive_models.py

@@ -20,7 +20,7 @@ class Archive_Base(BaseModel):
         default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
     )
     id: Optional[int] = Field(
-        #alias = 'archive_id'
+        alias = 'archive_id'
     )
     account_id_random: Optional[str]
     account_id: Optional[int]
@@ -93,6 +93,7 @@ class Archive_Base(BaseModel):
 
     class Config:
         underscore_attrs_are_private = True
+        allow_population_by_field_name = True
         fields = base_fields
 
 #Archive_Base.update_forward_refs()

app/models/common_field_schema.py

@@ -26,6 +26,7 @@ base_fields['account_id_random'] = xxx_id_random_field_schema
 base_fields['account_cfg_id_random'] = xxx_id_random_field_schema
 base_fields['address_id_random'] = xxx_id_random_field_schema
 base_fields['archive_id_random'] = xxx_id_random_field_schema
+base_fields['archive_content_id_random'] = xxx_id_random_field_schema
 base_fields['contact_id_random'] = xxx_id_random_field_schema
 base_fields['cont_edu_cert_id_random'] = xxx_id_random_field_schema
 base_fields['cont_edu_cert_person_id_random'] = xxx_id_random_field_schema

app/routers/archive_content.py

@@ -97,7 +97,7 @@ async def get_archive_content_obj(
         by_alias: Optional[bool] = True,
         exclude_unset: Optional[bool] = True,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     obj_type = 'archive_content'

app/routers/hosted_file.py

@@ -38,7 +38,7 @@ async def upload_files(
         by_alias: bool = True,
         exclude_unset: bool = True,
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     account_id_random = account_id # This is for the account random str ID