diff --git a/app/models/person_models.py b/app/models/person_models.py index 6e0bbaa..7af002b 100644 --- a/app/models/person_models.py +++ b/app/models/person_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 @@ -26,7 +26,7 @@ class Person_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['person_id_random'], alias = 'person_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 = 'person_id' @@ -212,5 +212,3 @@ class Person_Base(BaseModel): allow_population_by_field_name = True fields = base_fields # ### END ### API Person Models ### Person_Base() ### - -Person_Base.update_forward_refs() diff --git a/app/models/user_models.py b/app/models/user_models.py index 7427022..ed62c86 100644 --- a/app/models/user_models.py +++ b/app/models/user_models.py @@ -1,4 +1,5 @@ -import datetime, hashlib, logging, os, pytz, redis, secrets +import datetime, pytz, secrets +# import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator @@ -8,7 +9,6 @@ from app.lib_general import log, logging, secure_hash_string from app.models.common_field_schema import base_fields, default_num_bytes # from app.models.contact_models import Contact_Base -# from app.models.membership_person_models import Membership_Person_Base from app.models.organization_models import Organization_Base # from app.models.person_models import Person_Base # Causes circular import # from app.models.user_role_models import User_Role_Base @@ -22,7 +22,7 @@ class User_New_Base(BaseModel): id_random: Optional[str] = Field( **base_fields['user_id_random'], alias = 'user_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 = 'user_id' @@ -222,13 +222,13 @@ class User_Out_Base(BaseModel): # ### BEGIN ### API User Models ### User_Base() ### class User_Base(BaseModel): - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) id_random: Optional[str] = Field( **base_fields['user_id_random'], alias = 'user_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 = 'user_id'