General clean up of everything.
This commit is contained in:
@@ -4,15 +4,15 @@ import datetime
|
|||||||
from typing import Dict, List, Optional, Set, Union
|
from typing import Dict, List, Optional, Set, Union
|
||||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||||
|
|
||||||
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||||
from ..lib_general import log, logging
|
from app.lib_general import log, logging
|
||||||
|
|
||||||
from ..methods.contact_methods import load_contact_obj
|
from app.methods.contact_methods import load_contact_obj
|
||||||
from ..methods.organization_methods import load_organization_obj
|
from app.methods.organization_methods import load_organization_obj
|
||||||
#from ..methods.person_methods import load_person_obj
|
#from app.methods.person_methods import load_person_obj
|
||||||
|
|
||||||
from ..models.user_models import User_Base, User_New_Base, User_Out_Base
|
from app.models.user_models import User_Base, User_New_Base, User_Out_Base
|
||||||
from ..models.user_role_models import User_Role_Base
|
from app.models.user_role_models import User_Role_Base
|
||||||
|
|
||||||
|
|
||||||
# ### BEGIN ### API User Methods ### create_user_obj() ###
|
# ### BEGIN ### API User Methods ### create_user_obj() ###
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ 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
|
||||||
|
|
||||||
from ..db_sql import redis_lookup_id_random
|
from ..db_sql import redis_lookup_id_random
|
||||||
from ..lib_general import *
|
from ..lib_general import log, logging
|
||||||
|
|
||||||
from .common_field_schema import base_fields, default_num_bytes
|
from .common_field_schema import base_fields, default_num_bytes
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
|
|||||||
from pydantic import BaseModel, EmailStr, Field
|
from pydantic import BaseModel, EmailStr, Field
|
||||||
from typing import Dict, List, Optional, Set, Union
|
from typing import Dict, List, Optional, Set, Union
|
||||||
|
|
||||||
from ..lib_general import log, logging, secure_hash_string, verify_secure_hash_string
|
from app.lib_general import log, logging, secure_hash_string, verify_secure_hash_string
|
||||||
#from ..log import *
|
#from ..log import *
|
||||||
from app.config import settings
|
from app.config import settings
|
||||||
from app.db_sql import *
|
from app.db_sql import *
|
||||||
|
|||||||
Reference in New Issue
Block a user