diff --git a/app/models/cont_edu_cert_models.py b/app/models/cont_edu_cert_models.py index 1cef05a..f06031e 100644 --- a/app/models/cont_edu_cert_models.py +++ b/app/models/cont_edu_cert_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 @@ -11,6 +10,7 @@ from app.models.common_field_schema import base_fields, default_num_bytes from app.models.product_models import Product_Base +# ### BEGIN ### API Cont Edu Cert Models ### Cont_Edu_Cert_Base() ### class Cont_Edu_Cert_Base(BaseModel): log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -18,7 +18,7 @@ class Cont_Edu_Cert_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['cont_edu_cert_id_random'], alias = 'cont_edu_cert_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 = 'cont_edu_cert_id' @@ -85,3 +85,4 @@ class Cont_Edu_Cert_Base(BaseModel): underscore_attrs_are_private = True allow_population_by_field_name = True fields = base_fields +# ### END ### API Cont Edu Cert Models ### Cont_Edu_Cert_Base() ### diff --git a/app/models/cont_edu_cert_person_models.py b/app/models/cont_edu_cert_person_models.py index 26286ff..a9b07b6 100644 --- a/app/models/cont_edu_cert_person_models.py +++ b/app/models/cont_edu_cert_person_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 @@ -13,6 +12,7 @@ from app.models.person_models import Person_Base from app.models.user_models import User_Base +# ### BEGIN ### API Cont Edu Cert Person Models ### Cont_Edu_Cert_Person_Base() ### class Cont_Edu_Cert_Person_Base(BaseModel): log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -135,3 +135,4 @@ class Cont_Edu_Cert_Person_Base(BaseModel): underscore_attrs_are_private = True allow_population_by_field_name = True fields = base_fields +# ### END ### API Cont Edu Cert Person Models ### Cont_Edu_Cert_Person_Base() ### diff --git a/app/models/membership_person_models.py b/app/models/membership_person_models.py index bc14d25..9ab1a22 100644 --- a/app/models/membership_person_models.py +++ b/app/models/membership_person_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 @@ -19,6 +18,7 @@ from app.models.product_models import Product_Base # from app.models.user_models import User_Base +# ### BEGIN ### API Membership Person Models ### Membership_Person_Base() ### class Membership_Person_Base(BaseModel): log.setLevel(logging.INFO) log.debug(locals()) @@ -26,7 +26,6 @@ class Membership_Person_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['membership_person_id_random'], alias = 'membership_person_id_random', - default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( alias = 'membership_person_id' @@ -259,3 +258,4 @@ class Membership_Person_Base(BaseModel): underscore_attrs_are_private = True allow_population_by_field_name = True fields = base_fields +# ### END ### API Membership Person Models ### Membership_Person_Base() ### diff --git a/app/models/membership_person_type_models.py b/app/models/membership_person_type_models.py index d76c3a1..2a084e6 100644 --- a/app/models/membership_person_type_models.py +++ b/app/models/membership_person_type_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 @@ -13,6 +12,7 @@ from app.models.membership_type_models import Membership_Type_Base from app.models.product_models import Product_Base +# ### BEGIN ### API Membership Person Type Models ### Membership_Person_Type_Base() ### class Membership_Person_Type_Base(BaseModel): log.setLevel(logging.INFO) log.debug(locals()) @@ -20,7 +20,6 @@ class Membership_Person_Type_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['membership_person_type_id_random'], alias = 'membership_person_type_id_random', - default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( alias = 'membership_person_type_id' @@ -133,3 +132,4 @@ class Membership_Person_Type_Base(BaseModel): underscore_attrs_are_private = True allow_population_by_field_name = True fields = base_fields +# ### END ### API Membership Person Type Models ### Membership_Person_Type_Base() ###