From dc585fb9bd93a275197acfec74b55bbbb31ac6da Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Wed, 25 May 2022 14:02:54 -0400 Subject: [PATCH] Work on event device model and related. --- app/models/event_device_models.py | 4 ++-- app/models/event_location_models.py | 1 - app/models/event_models.py | 1 - app/models/event_presenter_models.py | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/models/event_device_models.py b/app/models/event_device_models.py index 95ef030..0e5820d 100644 --- a/app/models/event_device_models.py +++ b/app/models/event_device_models.py @@ -101,8 +101,8 @@ class Event_Device_Base(BaseModel): # 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] + other_json: Optional[Union[str,Json]] + meta_json: Optional[Union[str,Json]] # Including other related objects event_cfg: Optional[Event_Cfg_Base] diff --git a/app/models/event_location_models.py b/app/models/event_location_models.py index 330c754..f4dce51 100644 --- a/app/models/event_location_models.py +++ b/app/models/event_location_models.py @@ -1,4 +1,3 @@ -from __future__ import annotations import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union diff --git a/app/models/event_models.py b/app/models/event_models.py index e11205f..76fbd56 100644 --- a/app/models/event_models.py +++ b/app/models/event_models.py @@ -1,4 +1,3 @@ -from __future__ import annotations import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union diff --git a/app/models/event_presenter_models.py b/app/models/event_presenter_models.py index c216ecc..ad7d771 100644 --- a/app/models/event_presenter_models.py +++ b/app/models/event_presenter_models.py @@ -1,4 +1,3 @@ -from __future__ import annotations import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union