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

More 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:00:17 -04:00
parent 8a77f0c892
commit 5066cd099d
15 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/event_exhibit_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,9 +6,11 @@ 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 app.models.event_exhibit_tracking_models import Event_Exhibit_Tracking_Base
# ### BEGIN ### API Event Exhibit Models ### Event_Exhibit_Base() ###
class Event_Exhibit_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -17,7 +18,6 @@ class Event_Exhibit_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_exhibit_id_random'],
alias = 'event_exhibit_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_exhibit_id'
@@ -153,5 +153,4 @@ class Event_Exhibit_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
Event_Exhibit_Base.update_forward_refs()
# ### END ### API Event Exhibit Models ### Event_Exhibit_Base() ###

5
app/models/event_exhibit_tracking_models.py
View File

@@ -1,4 +1,4 @@
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
@@ -12,6 +12,7 @@ from app.models.event_badge_models import Event_Badge_Base
from app.models.event_person_models import Event_Person_Base
# ### BEGIN ### API Event Exhibit Tracking Models ### Event_Exhibit_Base() ###
class Event_Exhibit_Tracking_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -19,7 +20,6 @@ class Event_Exhibit_Tracking_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_exhibit_tracking_id_random'],
alias = 'event_exhibit_tracking_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_exhibit_tracking_id'
@@ -166,3 +166,4 @@ class Event_Exhibit_Tracking_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
# ### END ### API Event Exhibit Tracking Models ### Event_Exhibit_Base() ###

5
app/models/event_file_models.py
View File

@@ -1,4 +1,4 @@
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
@@ -10,6 +10,7 @@ from app.models.common_field_schema import base_fields, default_num_bytes
from app.models.hosted_file_models import Hosted_File_Base
# ### BEGIN ### API Event File Models ### Event_File_Base() ###
class Event_File_Base(BaseModel):
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -17,7 +18,6 @@ class Event_File_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_file_id_random'],
alias = 'event_file_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_file_id'
@@ -192,3 +192,4 @@ class Event_File_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
# ### END ### API Event File Models ### Event_File_Base() ###

5
app/models/event_models.py
View File

@@ -15,6 +15,7 @@ from app.models.person_models import Person_Base
from app.models.user_models import User_Base
# ### BEGIN ### API Event Models ### Event_Base() ###
class Event_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -262,8 +263,10 @@ class Event_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
# ### END ### API Event Models ### Event_Base() ###
# ### BEGIN ### API Event Models ### Event_Meeting_Flat_Base() ###
# Updated 2021-12-13
class Event_Meeting_Flat_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -272,7 +275,6 @@ class Event_Meeting_Flat_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_id_random'],
alias = 'event_id_random',
# default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_id'
@@ -501,3 +503,4 @@ class Event_Meeting_Flat_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
# ### END ### API Event Models ### Event_Meeting_Flat_Base() ###

14
app/models/event_person_detail_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,13 +6,14 @@ 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_presentation_models import Event_Presentation_Base
#from .event_presenter_models import Event_Presenter_Base
from .event_session_models import Event_Session_Base
# from app.models.event_presentation_models import Event_Presentation_Base
# from app.models.event_presenter_models import Event_Presenter_Base
from app.models.event_session_models import Event_Session_Base
# ### BEGIN ### API Event Person Detail Models ### Event_Person_Detail_Base() ###
class Event_Person_Detail_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -21,7 +21,6 @@ class Event_Person_Detail_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_person_detail_id_random'],
alias = 'event_person_detail_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
#alias = 'event_person_detail_id'
@@ -80,3 +79,4 @@ class Event_Person_Detail_Base(BaseModel):
class Config:
underscore_attrs_are_private = True
fields = base_fields
# ### END ### API Event Person Detail Models ### Event_Person_Detail_Base() ###

8
app/models/event_person_models.py
View File

@@ -1,4 +1,4 @@
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
@@ -16,6 +16,7 @@ from app.models.person_models import Person_Base
from app.models.user_models import User_Base, User_Out_Base
# ### BEGIN ### API Event Person Models ### Event_Person_Base() ###
class Event_Person_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -23,7 +24,6 @@ class Event_Person_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_person_id_random'],
alias = 'event_person_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_person_id'
@@ -207,8 +207,10 @@ class Event_Person_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
# ### END ### API Event Person Models ### Event_Person_Base() ###
# ### BEGIN ### API Event Person Models ### Event_Person_New_Base() ###
class Event_Person_New_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -216,7 +218,6 @@ class Event_Person_New_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_person_id_random'],
alias = 'event_person_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_person_id'
@@ -276,3 +277,4 @@ class Event_Person_New_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
# ### END ### API Event Person Models ### Event_Person_New_Base() ###

5
app/models/event_person_profile_models.py
View File

@@ -1,4 +1,4 @@
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
@@ -12,6 +12,7 @@ from app.models.event_cfg_models import Event_Cfg_Base
from app.models.organization_models import Organization_Base
# ### BEGIN ### API Event Person Profile Models ### Event_Person_Profile_Base() ###
class Event_Person_Profile_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -19,7 +20,6 @@ class Event_Person_Profile_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_person_profile_id_random'],
alias = 'event_person_profile_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_person_profile_id'
@@ -183,3 +183,4 @@ class Event_Person_Profile_Base_Up(Event_Person_Profile_Base):
# Including JSON data
extended_json: Optional[str]
# ### END ### API Event Person Profile Models ### Event_Person_Profile_Base() ###

5
app/models/event_presentation_models.py
View File

@@ -1,4 +1,4 @@
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
@@ -15,6 +15,7 @@ from app.models.event_presenter_models import Event_Presenter_Base
from app.models.person_models import Person_Base
# ### BEGIN ### API Event Presentation Models ### Event_Presentation_Base() ###
class Event_Presentation_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -22,7 +23,6 @@ class Event_Presentation_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_presentation_id_random'],
alias = 'event_presentation_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_presentation_id'
@@ -145,3 +145,4 @@ class Event_Presentation_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
# ### END ### API Event Presentation Models ### Event_Presentation_Base() ###

6
app/models/event_presenter_models.py
View File

@@ -1,4 +1,4 @@
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
@@ -14,9 +14,9 @@ from app.models.event_person_models import Event_Person_Base
# from app.models.event_presentation_models import Event_Presentation_Base
# from app.models.event_session_models import Event_Session_Base
# from app.models.person_models import Person_Base
# from app.models.user_models import User_Base
# ### BEGIN ### API Event Presenter Models ### Event_Presenter_Base() ###
class Event_Presenter_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -24,7 +24,6 @@ class Event_Presenter_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_presenter_id_random'],
alias = 'event_presenter_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_presenter_id'
@@ -213,3 +212,4 @@ class Event_Presenter_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
# ### END ### API Event Presenter Models ### Event_Presenter_Base() ###

5
app/models/event_session_models.py
View File

@@ -1,4 +1,4 @@
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
@@ -15,6 +15,7 @@ from app.models.event_track_models import Event_Track_Base
from app.models.person_models import Person_Base
# ### BEGIN ### API Event Session Models ### Event_Session_Base() ###
class Event_Session_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -22,7 +23,6 @@ class Event_Session_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_session_id_random'],
alias = 'event_session_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_session_id'
@@ -179,3 +179,4 @@ class Event_Session_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
# ### END ### API Event Session Models ### Event_Session_Base() ###

8
app/models/event_track_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
@@ -11,6 +10,7 @@ from app.models.common_field_schema import base_fields, default_num_bytes
# from app.models.event_models import Event_Base
# ### BEGIN ### API Event Track Models ### Event_Track_Base() ###
class Event_Track_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -18,7 +18,6 @@ class Event_Track_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['event_track_id_random'],
alias = 'event_track_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'event_track_id'
@@ -108,5 +107,4 @@ class Event_Track_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
#Event_Track_Base.update_forward_refs()
# ### END ### API Event Track Models ### Event_Track_Base() ###

9
app/models/hosted_file_link_models.py
View File

@@ -1,6 +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
@@ -10,6 +8,7 @@ from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
# ### BEGIN ### API Hosted File Link Models ### Hosted_File_Link_Base() ###
class Hosted_File_Link_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -17,7 +16,6 @@ class Hosted_File_Link_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['hosted_file_link_id_random'],
alias = 'hosted_file_link_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
#alias = 'hosted_file_link_id'
@@ -81,5 +79,4 @@ class Hosted_File_Link_Base(BaseModel):
class Config:
underscore_attrs_are_private = True
fields = base_fields
Hosted_File_Link_Base.update_forward_refs()
# ### END ### API Hosted File Link Models ### Hosted_File_Link_Base() ###

10
app/models/hosted_file_models.py
View File

@@ -1,4 +1,4 @@
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
@@ -6,9 +6,10 @@ 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
# ### BEGIN ### API Hosted File Models ### Hosted_File_Base() ###
class Hosted_File_Base(BaseModel):
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -16,7 +17,7 @@ class Hosted_File_Base(BaseModel):
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),
# default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'hosted_file_id'
@@ -88,5 +89,4 @@ class Hosted_File_Base(BaseModel):
class Config:
underscore_attrs_are_private = True
fields = base_fields
Hosted_File_Base.update_forward_refs()
# ### END ### API Hosted File Models ### Hosted_File_Base() ###

8
app/models/journal_entry_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
@@ -10,6 +9,7 @@ from app.lib_general import log, logging
from app.models.common_field_schema import base_fields, default_num_bytes
# ### BEGIN ### API Journal Entry Models ### Journal_Entry_Base() ###
class Journal_Entry_Base(BaseModel):
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -17,7 +17,6 @@ class Journal_Entry_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['journal_entry_id_random'],
alias = 'journal_entry_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'journal_entry_id'
@@ -75,5 +74,4 @@ class Journal_Entry_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
Journal_Entry_Base.update_forward_refs()
# ### END ### API Journal Entry Models ### Journal_Entry_Base() ###

8
app/models/journal_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
@@ -11,6 +10,7 @@ from app.models.common_field_schema import base_fields, default_num_bytes
from app.models.journal_entry_models import Journal_Entry_Base
# ### BEGIN ### API Journal Models ### Journal_Base() ###
class Journal_Base(BaseModel):
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -18,7 +18,6 @@ class Journal_Base(BaseModel):
id_random: Optional[str] = Field(
**base_fields['journal_id_random'],
alias = 'journal_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'journal_id'
@@ -90,5 +89,4 @@ class Journal_Base(BaseModel):
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields
Journal_Base.update_forward_refs()
# ### END ### API Journal Models ### Journal_Base() ###