General clean up of models and methods.

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 .contact_model import Contact_Base
-    # from .organization_model import Organization_Base
-    # from .person_model import Person_Base
-    # from .user_model import User_Base
+    # from .address_models import Address_Base
+    # from .contact_models import Contact_Base
+    # from .organization_models import Organization_Base
+    # from .person_models import Person_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 .person_model import Person_Base
-    # from .user_model import User_Base
+    # from .account_models import Account_Base
+    # from .person_models import Person_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 .user_model import User_Base
+    # from .person_models import Person_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 .contact_model import Contact_Base
-    #from .person_model import Person_Base
-    #from .user_model import User_Base
+    #from .account_models import Account_Base
+    #from .contact_models import Contact_Base
+    #from .person_models import Person_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 .contact_model import Contact_Base
-    #from .organization_model import Organization_Base
-    #from .user_model import User_Base
+    #from .account_models import Account_Base
+    #from .contact_models import Contact_Base
+    #from .organization_models import Organization_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 .contact_model import Contact_Base
-    #from .organization_model import Organization_Base
-    #from .person_model import Person_Base
+    #from .account_models import Account_Base
+    #from .contact_models import Contact_Base
+    #from .organization_models import Organization_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):