Mostly adding event device model, methods, and routes. Also general clean up of code.

app/models/event_device_models.py

@@ -0,0 +1,124 @@
+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 app.db_sql import redis_lookup_id_random
+from app.lib_general import log, logging
+
+from app.models.common_field_schema import base_fields, default_num_bytes
+from app.models.event_cfg_models import Event_Cfg_Base
+from app.models.event_location_models import Event_Location_Base
+
+# ### BEGIN ### API Event Device Models ### Event_Device_Base() ###
+class Event_Device_Base(BaseModel):
+    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    id_random: Optional[str] = Field(
+        **base_fields['event_device_id_random'],
+        alias = 'event_device_id_random',
+        default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
+    )
+    id: Optional[int] = Field(
+        alias = 'event_device_id'
+    )
+    account_id_random: Optional[str]
+    account_id: Optional[int]
+
+    event_id_random: Optional[str]
+    event_id: Optional[int]
+
+    event_location_id_random: Optional[str]
+    event_location_id: Optional[int]
+
+    code: Optional[str]
+
+    name: Optional[str]
+    description: Optional[str]
+
+    api_secret_key: Optional[str]
+
+    host_file_cache_path: Optional[str] # Path for hash file cache only
+    host_file_temp_path: Optional[str] # Path for copied and renamed temporary files from hash file cache directory
+    recording_path: Optional[str] # Path to save recordings
+
+    enable: Optional[bool]
+
+    # hide: Optional[bool]
+    # priority: Optional[bool]
+    # sort: Optional[int]
+    # group: Optional[str]
+
+    notes: Optional[str]
+
+    created_on: Optional[datetime.datetime] = None
+    updated_on: Optional[datetime.datetime] = None
+
+    # Including convenience data
+    # This is only for convenience. Probably going to keep unless it causes a problem.
+
+    # Including JSON data
+    # other_json: Optional[Json]
+    # meta_json: Optional[Json]
+
+    # Including other related objects
+    event_cfg: Optional[Event_Cfg_Base]
+    event_location: Optional[Event_Location_Base]
+
+    _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
+
+    #@validator('event_device_id_random', always=True)
+    def event_device_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 event_device_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='event_device')
+        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('event_id', always=True)
+    def event_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('event_id_random'):
+            return redis_lookup_id_random(record_id_random=id_random, table_name='event')
+        return None
+
+    @validator('event_location_id', always=True)
+    def event_location_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('event_location_id_random'):
+            return redis_lookup_id_random(record_id_random=id_random, table_name='event_location')
+        return None
+
+    class Config:
+        underscore_attrs_are_private = True
+        allow_population_by_field_name = True
+        fields = base_fields
+# ### END ### API Event Device Models ### Event_Device_Base() ###

app/models/event_file_models.py

@@ -71,7 +71,6 @@ class Event_File_Base(BaseModel):
     enable_to: Optional[datetime.datetime] = None
 
     hide: Optional[bool]
-
     priority: Optional[bool]
     sort: Optional[int]
     group: Optional[str] # Same or similar as file_purpose?

app/models/hosted_file_models.py

@@ -49,12 +49,12 @@ class Hosted_File_Base(BaseModel):
     copy_timer: Optional[str] # This will probably only be populated on upload results
     saved: Optional[str] # This will probably only be populated on upload results
 
-    #metadata: Optional[str]
+    # metadata: Optional[str]
 
-    #hide: Optional[int]
-    #priority: Optional[int]
-    #sort: Optional[int]
-    #group: Optional[str]
+    # hide: Optional[bool]
+    # priority: Optional[bool]
+    # sort: Optional[int]
+    # group: Optional[str]
 
     notes: Optional[str]
     created_on: Optional[datetime.datetime] = None