General clean up. Work on event device. Work on creating a common core object model.

app/models/event_device_models.py

@@ -18,7 +18,7 @@ class Event_Device_Base(BaseModel):
     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),
+        # default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
     )
     id: Optional[int] = Field(
         alias = 'event_device_id'
@@ -80,6 +80,10 @@ class Event_Device_Base(BaseModel):
     alert: Optional[bool]
     alert_msg: Optional[str]
 
+    info_hostname: Optional[bool]
+    info_ip: Optional[bool]
+    info_os: Optional[bool]
+
     enable: Optional[bool]
 
     # hide: Optional[bool]
@@ -107,13 +111,13 @@ class Event_Device_Base(BaseModel):
     _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())
+    # 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
+    #     if values['id_random']:
+    #         return values['id_random']
+    #     return None
 
     @validator('id', always=True)
     def event_device_id_lookup(cls, v, values, **kwargs):