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

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

Browse Source
This commit is contained in:
Scott Idem
2022-06-30 15:43:00 -04:00
parent 493f4a7365
commit c43e958859
9 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/account_models.py
View File

@@ -1,5 +1,4 @@
from __future__ import annotations import datetime, pytz
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -18,6 +17,7 @@ from app.models.membership_cfg_models import Membership_Cfg_Base
# from app.models.user_models import User_Base # from app.models.user_models import User_Base
# ### BEGIN ### API Account Models ### Account_Base() ###
class Account_Base(BaseModel): class Account_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -25,7 +25,7 @@ class Account_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['account_id_random'], **base_fields['account_id_random'],
alias = 'account_id_random', alias = 'account_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes), # default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
alias = 'account_id' alias = 'account_id'
@@ -95,5 +95,4 @@ class Account_Base(BaseModel):
class Config: class Config:
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
# ### END ### API Account Models ### Account_Base() ###
#Account_Base.update_forward_refs()

8
app/models/archive_content_models.py
View File

@@ -1,5 +1,4 @@
from __future__ import annotations import datetime, pytz
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator 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 from app.models.common_field_schema import base_fields, default_num_bytes
# ### BEGIN ### API Archive Content Models ### Archive_Content_Base() ###
class Archive_Content_Base(BaseModel): class Archive_Content_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -17,7 +17,6 @@ class Archive_Content_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['archive_content_id_random'], **base_fields['archive_content_id_random'],
alias = 'archive_content_id_random', alias = 'archive_content_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
alias = 'archive_content_id' alias = 'archive_content_id'
@@ -114,5 +113,4 @@ class Archive_Content_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True allow_population_by_field_name = True
fields = base_fields fields = base_fields
# ### END ### API Archive Content Models ### Archive_Content_Base() ###
#Archive_Content_Base.update_forward_refs()

8
app/models/archive_models.py
View File

@@ -1,5 +1,4 @@
from __future__ import annotations import datetime, pytz
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator 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 from app.models.common_field_schema import base_fields, default_num_bytes
# ### BEGIN ### API Archive Models ### Archive_Base() ###
class Archive_Base(BaseModel): class Archive_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -17,7 +17,6 @@ class Archive_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['archive_id_random'], **base_fields['archive_id_random'],
alias = 'archive_id_random', alias = 'archive_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
alias = 'archive_id' alias = 'archive_id'
@@ -98,5 +97,4 @@ class Archive_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True allow_population_by_field_name = True
fields = base_fields fields = base_fields
# ### END ### API Archive Models ### Archive_Base() ###
#Archive_Base.update_forward_refs()

3
app/models/data_store_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 typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -17,7 +17,6 @@ class Data_Store_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['data_store_id_random'], **base_fields['data_store_id_random'],
alias = 'data_store_id_random', alias = 'data_store_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
alias = 'data_store_id' alias = 'data_store_id'

8
app/models/page_models.py
View File

@@ -1,5 +1,4 @@
from __future__ import annotations import datetime, pytz
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -10,6 +9,7 @@ from app.lib_general import *
from app.models.common_field_schema import base_fields, default_num_bytes from app.models.common_field_schema import base_fields, default_num_bytes
# ### BEGIN ### API Page Models ### Page_Base() ###
class Page_Base(BaseModel): class Page_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -17,7 +17,6 @@ class Page_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['page_id_random'], **base_fields['page_id_random'],
alias = 'page_id_random', alias = 'page_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
#alias = 'page_id' #alias = 'page_id'
@@ -68,5 +67,4 @@ class Page_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True allow_population_by_field_name = True
fields = base_fields fields = base_fields
# ### END ### API Page Models ### Page_Base() ###
Page_Base.update_forward_refs()

6
app/models/post_comment_models.py
View File

@@ -1,5 +1,4 @@
from __future__ import annotations import datetime, pytz
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -12,6 +11,7 @@ from app.models.person_models import Person_Base
from app.models.user_models import User_Base from app.models.user_models import User_Base
# ### BEGIN ### API Post Comment Models ### Post_Comment_Base() ###
class Post_Comment_Base(BaseModel): class Post_Comment_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -19,7 +19,6 @@ class Post_Comment_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['post_comment_id_random'], **base_fields['post_comment_id_random'],
alias = 'post_comment_id_random', alias = 'post_comment_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
#alias = 'post_comment_id' #alias = 'post_comment_id'
@@ -101,3 +100,4 @@ class Post_Comment_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True allow_population_by_field_name = True
fields = base_fields fields = base_fields
# ### END ### API Post Comment Models ### Post_Comment_Base() ###

8
app/models/post_models.py
View File

@@ -1,5 +1,4 @@
from __future__ import annotations import datetime, pytz
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -12,6 +11,7 @@ from app.models.person_models import Person_Base
from app.models.user_models import User_Base from app.models.user_models import User_Base
# ### BEGIN ### API Post Models ### Post_Base() ###
class Post_Base(BaseModel): class Post_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -19,7 +19,6 @@ class Post_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['post_id_random'], **base_fields['post_id_random'],
alias = 'post_id_random', alias = 'post_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
#alias = 'post_id' #alias = 'post_id'
@@ -130,5 +129,4 @@ class Post_Base(BaseModel):
class Config: class Config:
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
# ### END ### API Post Models ### Post_Base() ###
Post_Base.update_forward_refs()

5
app/models/site_domain_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 typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
@@ -9,6 +9,7 @@ from app.lib_general import log, logging
from app.models.common_field_schema import base_fields, default_num_bytes from app.models.common_field_schema import base_fields, default_num_bytes
# ### BEGIN ### API Site Domain Models ### Site_Domain_Base() ###
class Site_Domain_Base(BaseModel): class Site_Domain_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -16,7 +17,6 @@ class Site_Domain_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['site_domain_id_random'], **base_fields['site_domain_id_random'],
alias = 'site_domain_id_random', alias = 'site_domain_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
alias = 'site_domain_id' alias = 'site_domain_id'
@@ -61,3 +61,4 @@ class Site_Domain_Base(BaseModel):
class Config: class Config:
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
# ### END ### API Site Domain Models ### Site_Domain_Base() ###

5
app/models/site_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 typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator 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.site_domain_models import Site_Domain_Base from app.models.site_domain_models import Site_Domain_Base
# ### BEGIN ### API Site Models ### Site_Base() ###
class Site_Base(BaseModel): class Site_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -17,7 +18,6 @@ class Site_Base(BaseModel):
id_random: Optional[str] = Field( id_random: Optional[str] = Field(
**base_fields['site_id_random'], **base_fields['site_id_random'],
alias = 'site_id_random', alias = 'site_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
) )
id: Optional[int] = Field( id: Optional[int] = Field(
alias = 'site_id' alias = 'site_id'
@@ -104,3 +104,4 @@ class Site_Base(BaseModel):
underscore_attrs_are_private = True underscore_attrs_are_private = True
allow_population_by_field_name = True allow_population_by_field_name = True
fields = base_fields fields = base_fields
# ### END ### API Site Models ### Site_Base() ###