General clean up of models and methods.

app/methods/contact_methods.py

@@ -63,13 +63,13 @@ def load_contact_obj(contact_id:int|str, inc_address:bool=False) -> Contact_Base
     else: return False
 
     if contact_rec := sql_select(table_name='v_contact', record_id=contact_id):
-        log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.debug(contact_rec)
 
         if inc_address:
             if address_rec := sql_select(table_name='v_address', field_name='address_id', field_value=contact_rec.get('address_id', None)):
                 contact_rec['address'] = address_rec
-            log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
             log.debug(address_rec)
     else:
         return False

app/methods/event_person_methods.py

@@ -28,7 +28,7 @@ def create_event_person_obj(event_person_obj_new:Event_Person_Base) -> int|bool:
     else:
         return False
 
-    log.setLevel(logging.DEBUG)
+    #log.setLevel(logging.DEBUG)
     log.debug(event_person_obj_in_result)
 
     event_person_id = event_person_obj_in_result
@@ -55,7 +55,7 @@ def load_event_person_obj(
     else: return False
 
     if event_person_rec := sql_select(table_name='v_event_person', record_id=event_person_id):
-        log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         log.debug(event_person_rec)
 
         person_id = event_person_rec.get('person_id', None)

app/methods/membership_methods.py

@@ -7,12 +7,12 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from ..lib_general import *
 from ..db_sql import redis_lookup_id_random, sql_select
 
-#from .address_model import Address_Base
+#from .address_models import Address_Base
-#from .contact_model import Contact_Base
+#from .contact_models import Contact_Base
 from ..models.membership_models import Membership_Base
-#from .organization_model import Organization_Base
+#from .organization_models import Organization_Base
-#from .person_model import Person_Base
+#from .person_models import Person_Base
-#from .user_model import User_Base
+#from .user_models import User_Base
 
 
 # ### BEGIN ### API Membership Methods ### save_membership_obj() ###

app/methods/order_cart_methods.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from ..lib_general import *
 from ..db_sql import redis_lookup_id_random, sql_insert_or_update, sql_insert, sql_update, sql_select
 
-from ..models.order_cart_model import Order_Cart_Base
+from ..models.order_cart_models import Order_Cart_Base
 
 
 def update_order_cart_obj(order_cart_obj:Order_Cart_Base, repl_order_cart_line_li:bool=False):

app/methods/order_methods.py

@@ -7,7 +7,7 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
 from ..lib_general import *
 from ..db_sql import redis_lookup_id_random, sql_select
 
-from ..models.order_model import Order_Base
+from ..models.order_models import Order_Base
 #from ..models.person_models import Person_Base
 #from ..models.user_models import User_Base
 

app/methods/person_methods.py

@@ -29,7 +29,7 @@ def create_person_obj(person_obj_new:Person_Base):
     else:
         return False
 
-    log.setLevel(logging.DEBUG)
+    #log.setLevel(logging.DEBUG)
     log.debug(person_obj_in_result)
 
     person_id = person_obj_in_result

app/methods/user_methods.py

@@ -12,7 +12,7 @@ from ..methods.organization_methods import load_organization_obj
 #from ..methods.person_methods import load_person_obj
 
 from ..models.user_models import User_Base, User_New_Base, User_Out_Base
-from ..models.user_role_model import User_Role_Base
+from ..models.user_role_models import User_Role_Base
 
 
 # ### BEGIN ### API User Methods ### create_user_obj() ###
@@ -50,7 +50,7 @@ def create_user_obj(user_obj_new:User_New_Base) -> int|bool:
         else:
             return False
 
-        log.setLevel(logging.DEBUG)
+        #log.setLevel(logging.DEBUG)
         log.debug(user_obj_up_result)
 
         log.debug(f'Returning the existing user_id: {user_id}')
@@ -59,7 +59,7 @@ def create_user_obj(user_obj_new:User_New_Base) -> int|bool:
         else:
             return False
 
-        log.setLevel(logging.DEBUG)
+        #log.setLevel(logging.DEBUG)
         log.debug(user_obj_in_result)
 
         user_id = user_obj_in_result
@@ -71,7 +71,7 @@ def create_user_obj(user_obj_new:User_New_Base) -> int|bool:
 
 # ### BEGIN ### API User Methods ### load_user_obj() ###
 def load_user_obj(user_id:int|str, inc_roles:bool=False, inc_contact:bool=False, inc_organization:bool=False, inc_person:bool=False) -> User_Out_Base|bool:
-    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     if user_id := redis_lookup_id_random(record_id_random=user_id, table_name='user'): pass
@@ -84,7 +84,7 @@ def load_user_obj(user_id:int|str, inc_roles:bool=False, inc_contact:bool=False,
         if inc_roles:
             if role_rec_li := sql_select(table_name='v_user_role_detail', field_name='user_id', field_value=user_id, as_list=True):
                 user_rec['role_list'] = role_rec_li
-            log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+            #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
             log.debug(role_rec_li)
 
         if inc_contact:

app/models/membership_models.py

@@ -55,13 +55,13 @@ class Membership_Profile_Base(BaseModel):
 
     # if TYPE_CHECKING:
     #     from .supporting_core_models import Address_Base, Contact_Base, Organization_Base, User_Base
-    #     from .person_model import Person_Base
+    #     from .person_models import Person_Base
 
-    # from .address_model import Address_Base
+    # from .address_models import Address_Base
-    # from .contact_model import Contact_Base
+    # from .contact_models import Contact_Base
-    # from .organization_model import Organization_Base
+    # from .organization_models import Organization_Base
-    # from .person_model import Person_Base
+    # from .person_models import Person_Base
-    # from .user_model import User_Base
+    # from .user_models import User_Base
 
     id_random: Optional[str] = Field(
         **base_fields['membership_profile_id_random'],
@@ -165,9 +165,9 @@ class Membership_Base(BaseModel):
     log.debug(locals())
 
     #from .supporting_core_models import User_Base
-    # from .account_model import Account_Base
+    # from .account_models import Account_Base
-    # from .person_model import Person_Base
+    # from .person_models import Person_Base
-    # from .user_model import User_Base
+    # from .user_models import User_Base
 
     id_random: Optional[str] = Field(
         **base_fields['membership_id_random'],

app/models/order_models.py

@@ -109,8 +109,8 @@ class Order_Base(BaseModel):
     log.setLevel(logging.WARNING)
     log.debug(locals())
 
-    # from .person_model import Person_Base
+    # from .person_models import Person_Base
-    # from .user_model import User_Base
+    # from .user_models import User_Base
 
     id_random: Optional[str] = Field(
         **base_fields['order_id_random'],

app/models/organization_models.py

@@ -18,10 +18,10 @@ class Organization_Base(BaseModel):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    #from .account_model import Account_Base
+    #from .account_models import Account_Base
-    #from .contact_model import Contact_Base
+    #from .contact_models import Contact_Base
-    #from .person_model import Person_Base
+    #from .person_models import Person_Base
-    #from .user_model import User_Base
+    #from .user_models import User_Base
 
     id_random: Optional[str] = Field(
         **base_fields['organization_id_random'],

app/models/person_models.py

@@ -18,12 +18,12 @@ class Person_Base(BaseModel):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    #from .account_model import Account_Base
+    #from .account_models import Account_Base
-    #from .contact_model import Contact_Base
+    #from .contact_models import Contact_Base
-    #from .organization_model import Organization_Base
+    #from .organization_models import Organization_Base
-    #from .user_model import User_Base
+    #from .user_models import User_Base
 
-    #from .organization_model import Organization_Base
+    #from .organization_models import Organization_Base
     #if TYPE_CHECKING:
         #from .supporting_core_models import Address_Base, Contact_Base, Organization_Base, Person_Base, User_Base
     #from .supporting_core_models import Address_Base, Contact_Base, Organization_Base, User_Base

app/models/site_domain_models.py

@@ -8,7 +8,7 @@ from ..db_sql import redis_lookup_id_random
 from ..lib_general import *
 
 from .common_field_schema import base_fields, default_num_bytes
-#from .site_model import Site_Base as Site_Base_2
+#from .site_models import Site_Base as Site_Base_2
 
 
 class Site_Domain_Base(BaseModel):

app/models/site_models.py

@@ -8,7 +8,7 @@ from ..db_sql import redis_lookup_id_random
 from ..lib_general import *
 
 from .common_field_schema import base_fields, default_num_bytes
-from .site_domain_model import Site_Domain_Base as Site_Domain_Base_2
+from .site_domain_models import Site_Domain_Base as Site_Domain_Base_2
 
 
 class Site_Base(BaseModel):

app/models/user_models.py

@@ -12,7 +12,7 @@ from .common_field_schema import base_fields, default_num_bytes
 from .contact_models import Contact_Base
 #from .organization_models import Organization_Base
 #from .person_models import Person_Base
-from .user_role_model import User_Role_Base
+from .user_role_models import User_Role_Base
 
 
 # ### BEGIN ### API User Models ### User_New_Base() ###
@@ -199,13 +199,13 @@ class User_Base(BaseModel):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    #from .account_model import Account_Base
+    #from .account_models import Account_Base
-    #from .contact_model import Contact_Base
+    #from .contact_models import Contact_Base
-    #from .organization_model import Organization_Base
+    #from .organization_models import Organization_Base
-    #from .person_model import Person_Base
+    #from .person_models import Person_Base
 
     #if TYPE_CHECKING:
-        #from .person_model import Person_Base
+        #from .person_models import Person_Base
 
     id_random: Optional[str] = Field(
         **base_fields['user_id_random'],

app/models/user_role_models.py

@@ -8,7 +8,7 @@ from ..db_sql import redis_lookup_id_random
 from ..lib_general import *
 
 from .common_field_schema import base_fields, default_num_bytes
-#from .user_model import User_Base
+#from .user_models import User_Base
 
 
 class User_Role_Base(BaseModel):

app/routers/account.py

@@ -14,7 +14,7 @@ from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template
 from ..methods.account_methods import load_account_cfg_obj
 
 from ..models.account_models import Account_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/address.py

@@ -11,7 +11,7 @@ from app.db_sql import *
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
 from ..models.address_models import Address_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/api.py

@@ -10,8 +10,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.api_model import Api_Base
+from ..models.api_models import Api_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/api_crud.py

@@ -8,31 +8,31 @@ from ..lib_general import *
 from app.config import settings
 from app.db_sql import *
 
-from ..models.response_model import *
+from ..models.response_models import *
 
 from ..models.account_models import *
-from ..models.account_cfg_model import *
+from ..models.account_cfg_models import *
 from ..models.address_models import *
-from ..models.archive_model import *
+from ..models.archive_models import *
-from ..models.archive_content_model import *
+from ..models.archive_content_models import *
 from ..models.contact_models import *
 from ..models.event_models import *
 from ..models.event_exhibit_models import *
 from ..models.event_person_models import *
 from ..models.event_registration_models import *
 from ..models.membership_models import *
-from ..models.order_model import *
+from ..models.order_models import *
-from ..models.order_cart_model import *
+from ..models.order_cart_models import *
 from ..models.organization_models import *
-from ..models.page_model import *
+from ..models.page_models import *
 from ..models.person_models import *
-from ..models.product_model import *
+from ..models.product_models import *
-from ..models.post_model import *
+from ..models.post_models import *
-from ..models.post_comment_model import *
+from ..models.post_comment_models import *
-from ..models.site_model import *
+from ..models.site_models import *
-from ..models.site_domain_model import *
+from ..models.site_domain_models import *
 from ..models.user_models import *
-from ..models.user_role_model import *
+from ..models.user_role_models import *
 
 obj_type_li = {}
 

app/routers/archive.py

@@ -11,8 +11,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.archive_model import Archive_Base
+from ..models.archive_models import Archive_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/archive_content.py

@@ -11,8 +11,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.archive_content_model import Archive_Content_Base
+from ..models.archive_content_models import Archive_Content_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/contact.py

@@ -11,7 +11,7 @@ from app.db_sql import *
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
 from ..models.contact_models import Contact_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/event.py

@@ -12,7 +12,7 @@ from app.db_sql import *
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
 from ..models.event_models import Event_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/event_exhibit.py

@@ -11,7 +11,7 @@ from app.db_sql import *
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
 from ..models.event_exhibit_models import Event_Exhibit_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/event_person.py

@@ -17,7 +17,7 @@ from ..methods.user_methods import create_user_obj, load_user_obj
 
 from ..models.event_person_models import Event_Person_New_Base, Event_Person_Base
 from ..models.person_models import Person_Base
-from ..models.response_model import *
+from ..models.response_models import *
 from ..models.user_models import User_New_Base, User_Base
 
 

app/routers/event_person_detail.py

@@ -12,7 +12,7 @@ from app.db_sql import *
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
 from ..models.event_person_detail_models import Event_Person_Detail_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/event_registration.py

@@ -12,7 +12,7 @@ from app.db_sql import *
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
 from ..models.event_registration_models import Event_Registration_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/event_session.py

@@ -12,7 +12,7 @@ from app.db_sql import *
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
 from ..models.event_session_models import Event_Session_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/flask_cfg.py

@@ -10,8 +10,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.response_model import *
+from ..models.response_models import *
-from ..models.flask_cfg_model import Flask_Cfg_Base
+from ..models.flask_cfg_models import Flask_Cfg_Base
 
 
 router = APIRouter()

app/routers/hosted_file.py

@@ -11,8 +11,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.hosted_file_model import Hosted_File_Base
+from ..models.hosted_file_models import Hosted_File_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/journal.py

@@ -11,8 +11,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.journal_model import Journal_Base
+from ..models.journal_models import Journal_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/journal_entry.py

@@ -11,8 +11,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.journal_entry_model import Journal_Entry_Base
+from ..models.journal_entry_models import Journal_Entry_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/lookup.py

@@ -10,8 +10,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.response_model import *
+from ..models.response_models import *
-#from ..models.lookup_model import Lookup_Base
+#from ..models.lookup_models import Lookup_Base
 
 
 router = APIRouter()

app/routers/membership.py

@@ -13,7 +13,7 @@ from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template
 
 from ..models.membership_models import Membership_Base
 from ..methods.membership_methods import load_membership_obj
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/order.py

@@ -13,8 +13,8 @@ from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template
 
 from ..methods.order_methods import load_order_obj, save_order_obj
 
-from ..models.response_model import *
+from ..models.response_models import *
-from ..models.order_model import Order_Base
+from ..models.order_models import Order_Base
 
 
 router = APIRouter()

app/routers/order_cart.py

@@ -13,8 +13,8 @@ from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template
 
 from ..methods.order_cart_methods import update_order_cart_obj, load_order_cart_obj
 
-from ..models.order_cart_model import Order_Cart_Base
+from ..models.order_cart_models import Order_Cart_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/organization.py

@@ -12,7 +12,7 @@ from app.db_sql import *
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
 from ..models.organization_models import Organization_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/page.py

@@ -11,8 +11,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.page_model import Page_Base
+from ..models.page_models import Page_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/person.py

@@ -14,7 +14,7 @@ from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template
 from ..methods.person_methods import load_person_obj
 
 from ..models.person_models import Person_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/post.py

@@ -11,8 +11,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.post_model import Post_Base
+from ..models.post_models import Post_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/post_comment.py

@@ -11,8 +11,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.post_comment_model import Post_Comment_Base
+from ..models.post_comment_models import Post_Comment_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/product.py

@@ -11,8 +11,8 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.product_model import Product_Base
+from ..models.product_models import Product_Base
-from ..models.response_model import *
+from ..models.response_models import *
 
 
 router = APIRouter()

app/routers/site.py

@@ -11,9 +11,9 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.response_model import *
+from ..models.response_models import *
-from ..models.site_model import Site_Base
+from ..models.site_models import Site_Base
-from ..models.site_domain_model import Site_Domain_Base
+from ..models.site_domain_models import Site_Domain_Base
 
 
 router = APIRouter()

app/routers/site_domain.py

@@ -10,9 +10,9 @@ from app.db_sql import *
 
 from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
-from ..models.response_model import *
+from ..models.response_models import *
-from ..models.site_model import Site_Base
+from ..models.site_models import Site_Base
-from ..models.site_domain_model import Site_Domain_Base
+from ..models.site_domain_models import Site_Domain_Base
 
 
 router = APIRouter()

app/routers/user.py

@@ -14,7 +14,7 @@ from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template
 from ..methods.user_methods import load_user_obj
 
 from ..models.common_field_schema import default_num_bytes
-from ..models.response_model import *
+from ..models.response_models import *
 from ..models.user_models import User_Base, User_New_Base, User_Out_Base
 
 

app/routers/user_person.py

@@ -16,7 +16,7 @@ from ..methods.user_methods import load_user_obj
 
 from ..models.common_field_schema import default_num_bytes
 from ..models.person_models import Person_Base
-from ..models.response_model import *
+from ..models.response_models import *
 from ..models.user_models import User_Base, User_New_Base, User_Out_Base