Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More again again again again. Moving ID random generation to the SQL db instead. General clean up.

Browse Source
This commit is contained in:
Scott Idem
2022-06-30 17:34:47 -04:00
parent 5066cd099d
commit 511f420555
12 changed files with 28 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/models/event_abstract_models.py
View File

@@ -1,5 +1,4 @@
from __future__ import annotations
import datetime, hashlib, logging, os, pytz, redis, secrets
import datetime, pytz
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -7,17 +6,18 @@ from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationEr
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
from app.models.common_field_schema import base_fields, default_num_bytes
#from .event_models import Event_Base
from .event_person_models import Event_Person_Base
from .event_presentation_models import Event_Presentation_Base
#from .event_presenter_models import Event_Presenter_Base # This creates an import loop
from .event_session_models import Event_Session_Base
from .event_track_models import Event_Track_Base
from .person_models import Person_Base
#from app.models.event_models import Event_Base
from app.models.event_person_models import Event_Person_Base
from app.models.event_presentation_models import Event_Presentation_Base
#from app.models.event_presenter_models import Event_Presenter_Base # This creates an import loop
from app.models.event_session_models import Event_Session_Base
from app.models.event_track_models import Event_Track_Base
from app.models.person_models import Person_Base
# ### BEGIN ### API Event Abstract Models ### Event_Abstract_Base() ###
class Event_Abstract_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -25,7 +25,6 @@ class Event_Abstract_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_abstract_id_random'],
alias = 'event_abstract_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_abstract_id'
@@ -174,5 +173,4 @@ class Event_Abstract_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
#Event_Abstract_Base.update_forward_refs()
# ### END ### API Event Abstract Models ### Event_Abstract_Base() ###