General clean up of models and methods.

app/models/hosted_file_models.py

@@ -0,0 +1,83 @@
+from __future__ import annotations
+import datetime, hashlib, logging, os, pytz, redis, secrets
+
+from typing import Dict, List, Optional, Set, Union
+from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
+
+from ..db_sql import redis_lookup_id_random
+from ..lib_general import *
+
+from .common_field_schema import base_fields, default_num_bytes
+
+
+class Hosted_File_Base(BaseModel):
+    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    id_random: Optional[str] = Field(
+        **base_fields['hosted_file_id_random'],
+        alias='hosted_file_id_random',
+        default_factory=lambda:secrets.token_urlsafe(default_num_bytes),
+    )
+    id: Optional[int] = Field(
+        #alias='hosted_file_id'
+    )
+    #account_id_random: Optional[str]
+    #account_id: Optional[int]
+
+    hash_sha256: Optional[str]
+    title: Optional[str]
+    description: Optional[str]
+
+    version: Optional[int]
+
+    directory_path: Optional[str]
+    filename: Optional[str]
+    extension: Optional[str]
+    content_type: Optional[str]
+    mimetype: Optional[str]
+    size: Optional[int] # In bytes
+
+    cloud_storage: Optional[str]
+    owner_user_id: Optional[int]
+    group_user_id: Optional[str]
+
+    package_name: Optional[str]
+
+    #metadata: Optional[str]
+
+    #hide: Optional[int]
+    #priority: Optional[int]
+    #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)
+
+    #@validator('hosted_file_id_random', always=True)
+    def hosted_file_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_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')
+        return None
+
+    class Config:
+        underscore_attrs_are_private = True
+        fields = base_fields
+
+Hosted_File_Base.update_forward_refs()