From c43e958859b9fe2fbe752823d4eb9817829490f4 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Thu, 30 Jun 2022 15:43:00 -0400 Subject: [PATCH] More. Moving ID random generation to the SQL db instead. General clean up. --- app/models/account_models.py | 9 ++++----- app/models/archive_content_models.py | 8 +++----- app/models/archive_models.py | 8 +++----- app/models/data_store_models.py | 3 +-- app/models/page_models.py | 8 +++----- app/models/post_comment_models.py | 6 +++--- app/models/post_models.py | 8 +++----- app/models/site_domain_models.py | 5 +++-- app/models/site_models.py | 5 +++-- 9 files changed, 26 insertions(+), 34 deletions(-) diff --git a/app/models/account_models.py b/app/models/account_models.py index 3304715..197455b 100644 --- a/app/models/account_models.py +++ b/app/models/account_models.py @@ -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 @@ -18,6 +17,7 @@ from app.models.membership_cfg_models import Membership_Cfg_Base # from app.models.user_models import User_Base +# ### BEGIN ### API Account Models ### Account_Base() ### class Account_Base(BaseModel): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -25,7 +25,7 @@ class Account_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['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( alias = 'account_id' @@ -95,5 +95,4 @@ class Account_Base(BaseModel): class Config: underscore_attrs_are_private = True fields = base_fields - -#Account_Base.update_forward_refs() +# ### END ### API Account Models ### Account_Base() ### diff --git a/app/models/archive_content_models.py b/app/models/archive_content_models.py index 511681c..62a5219 100644 --- a/app/models/archive_content_models.py +++ b/app/models/archive_content_models.py @@ -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 Archive Content Models ### Archive_Content_Base() ### class Archive_Content_Base(BaseModel): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -17,7 +17,6 @@ class Archive_Content_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['archive_content_id_random'], alias = 'archive_content_id_random', - default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( alias = 'archive_content_id' @@ -114,5 +113,4 @@ class Archive_Content_Base(BaseModel): underscore_attrs_are_private = True allow_population_by_field_name = True fields = base_fields - -#Archive_Content_Base.update_forward_refs() +# ### END ### API Archive Content Models ### Archive_Content_Base() ### \ No newline at end of file diff --git a/app/models/archive_models.py b/app/models/archive_models.py index 338f194..77804c3 100644 --- a/app/models/archive_models.py +++ b/app/models/archive_models.py @@ -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 Archive Models ### Archive_Base() ### class Archive_Base(BaseModel): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -17,7 +17,6 @@ class Archive_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['archive_id_random'], alias = 'archive_id_random', - default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( alias = 'archive_id' @@ -98,5 +97,4 @@ class Archive_Base(BaseModel): underscore_attrs_are_private = True allow_population_by_field_name = True fields = base_fields - -#Archive_Base.update_forward_refs() +# ### END ### API Archive Models ### Archive_Base() ### \ No newline at end of file diff --git a/app/models/data_store_models.py b/app/models/data_store_models.py index 4d9d7fe..38c5a1c 100644 --- a/app/models/data_store_models.py +++ b/app/models/data_store_models.py @@ -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 @@ -17,7 +17,6 @@ class Data_Store_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['data_store_id_random'], alias = 'data_store_id_random', - default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( alias = 'data_store_id' diff --git a/app/models/page_models.py b/app/models/page_models.py index fd0af6c..06d04e2 100644 --- a/app/models/page_models.py +++ b/app/models/page_models.py @@ -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 * from app.models.common_field_schema import base_fields, default_num_bytes +# ### BEGIN ### API Page Models ### Page_Base() ### class Page_Base(BaseModel): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -17,7 +17,6 @@ class Page_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['page_id_random'], alias = 'page_id_random', - default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( #alias = 'page_id' @@ -68,5 +67,4 @@ class Page_Base(BaseModel): underscore_attrs_are_private = True allow_population_by_field_name = True fields = base_fields - -Page_Base.update_forward_refs() +# ### END ### API Page Models ### Page_Base() ### \ No newline at end of file diff --git a/app/models/post_comment_models.py b/app/models/post_comment_models.py index 88b7b24..ed8da9c 100644 --- a/app/models/post_comment_models.py +++ b/app/models/post_comment_models.py @@ -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 @@ -12,6 +11,7 @@ from app.models.person_models import Person_Base from app.models.user_models import User_Base +# ### BEGIN ### API Post Comment Models ### Post_Comment_Base() ### class Post_Comment_Base(BaseModel): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -19,7 +19,6 @@ class Post_Comment_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['post_comment_id_random'], alias = 'post_comment_id_random', - default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( #alias = 'post_comment_id' @@ -101,3 +100,4 @@ class Post_Comment_Base(BaseModel): underscore_attrs_are_private = True allow_population_by_field_name = True fields = base_fields +# ### END ### API Post Comment Models ### Post_Comment_Base() ### diff --git a/app/models/post_models.py b/app/models/post_models.py index a9fc1fe..35085c4 100644 --- a/app/models/post_models.py +++ b/app/models/post_models.py @@ -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 @@ -12,6 +11,7 @@ from app.models.person_models import Person_Base from app.models.user_models import User_Base +# ### BEGIN ### API Post Models ### Post_Base() ### class Post_Base(BaseModel): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -19,7 +19,6 @@ class Post_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['post_id_random'], alias = 'post_id_random', - default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( #alias = 'post_id' @@ -130,5 +129,4 @@ class Post_Base(BaseModel): class Config: underscore_attrs_are_private = True fields = base_fields - -Post_Base.update_forward_refs() +# ### END ### API Post Models ### Post_Base() ### diff --git a/app/models/site_domain_models.py b/app/models/site_domain_models.py index 4f9c0e5..df6bbf8 100644 --- a/app/models/site_domain_models.py +++ b/app/models/site_domain_models.py @@ -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 @@ -9,6 +9,7 @@ from app.lib_general import log, logging 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): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -16,7 +17,6 @@ class Site_Domain_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['site_domain_id_random'], alias = 'site_domain_id_random', - default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( alias = 'site_domain_id' @@ -61,3 +61,4 @@ class Site_Domain_Base(BaseModel): class Config: underscore_attrs_are_private = True fields = base_fields +# ### END ### API Site Domain Models ### Site_Domain_Base() ### diff --git a/app/models/site_models.py b/app/models/site_models.py index e7c9570..2a98d84 100644 --- a/app/models/site_models.py +++ b/app/models/site_models.py @@ -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.site_domain_models import Site_Domain_Base +# ### BEGIN ### API Site Models ### Site_Base() ### class Site_Base(BaseModel): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -17,7 +18,6 @@ class Site_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['site_id_random'], alias = 'site_id_random', - default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( alias = 'site_id' @@ -104,3 +104,4 @@ class Site_Base(BaseModel): underscore_attrs_are_private = True allow_population_by_field_name = True fields = base_fields +# ### END ### API Site Models ### Site_Base() ###