Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A lot of general clean up of everything.

Browse Source
This commit is contained in:
Scott Idem
2021-05-28 03:52:31 -04:00
parent 01e1d2f82a
commit 443d2bab77
75 changed files with 249 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/db_sql.py
View File

@@ -190,7 +190,7 @@ def sql_update(sql:str=None, data:dict=None, table_name:str=None, record_id:int=
# ### BEGIN ### Core Help CRUD ### sql_insert_or_update() ###
# The catch all SQL INSERT or UPDATE function - STI 2021-02-17
# This one does it all for SQL INSERT and UPDATE queries
def sql_insert_or_update(sql:str=None, data:dict=None, table_name:str=None, rm_id_random:bool=None, id_random_length:int=None):
def sql_insert_or_update(sql:str|None=None, data:dict|None=None, table_name:str|None=None, rm_id_random:bool|None=None, id_random_length:int|None=None):
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -230,7 +230,7 @@ def sql_insert_or_update(sql:str=None, data:dict=None, table_name:str=None, rm_i
;
""")
log.setLevel(logging.DEBUG)
#log.setLevel(logging.DEBUG)
log.debug(f"""
INSERT INTO `{table_name}` ({fields_string}) VALUES ({values_string})
ON DUPLICATE KEY UPDATE
@@ -279,16 +279,16 @@ def sql_insert_or_update(sql:str=None, data:dict=None, table_name:str=None, rm_i
# The catch all SQL SELECT function - STI 2021-02-17
# This one does it all for SQL SELECT queries
def sql_select(
table_name=None,
record_id=None,
record_id_random=None,
field_name=None,
table_name:str|None=None,
record_id:int|None=None,
record_id_random:str|None=None,
field_name:str|None=None,
field_value=None,
sql=None,
data=None,
rm_id_random=None,
as_dict=True,
as_list=None
sql:str|None=None,
data:dict|None=None,
rm_id_random:bool|None=None,
as_dict:bool|None=True,
as_list:bool|None=False
):
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())

6
app/methods/account_methods.py
View File

@@ -4,10 +4,10 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..db_sql import redis_lookup_id_random, sql_select
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random, sql_select
from app.lib_general import log, logging
from ..models.membership_models import Membership_Cfg_Base
from app.models.membership_models import Membership_Cfg_Base
# ### BEGIN ### API Account Methods ### load_account_cfg_obj() ###

6
app/methods/address_methods.py
View File

@@ -4,10 +4,10 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select
from app.lib_general import log, logging
from ..models.address_models import Address_Base
from app.models.address_models import Address_Base
# ### BEGIN ### API Address Methods ### create_address_obj() ###

8
app/methods/contact_methods.py
View File

@@ -4,12 +4,12 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from app.lib_general import log, logging
from ..methods.address_methods import create_address_obj
from app.methods.address_methods import create_address_obj
from ..models.contact_models import Contact_Base
from app.models.contact_models import Contact_Base
# ### BEGIN ### API Contact Methods ### create_contact_obj() ###

10
app/methods/event_person_methods.py
View File

@@ -4,13 +4,13 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from app.lib_general import log, logging
from ..methods.person_methods import load_person_obj
from ..methods.user_methods import load_user_obj
from app.methods.person_methods import load_person_obj
from app.methods.user_methods import load_user_obj
from ..models.event_person_models import Event_Person_New_Base, Event_Person_Base
from app.models.event_person_models import Event_Person_New_Base, Event_Person_Base
# ### BEGIN ### API Event Person Methods ### create_event_person_obj() ###

6
app/methods/membership_methods.py
View File

@@ -4,12 +4,12 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_select
from app.lib_general import *
from app.db_sql import redis_lookup_id_random, sql_select
#from .address_models import Address_Base
#from .contact_models import Contact_Base
from ..models.membership_models import Membership_Base
from app.models.membership_models import Membership_Base
#from .organization_models import Organization_Base
#from .person_models import Person_Base
#from .user_models import User_Base

6
app/methods/order_cart_methods.py
View File

@@ -4,10 +4,10 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_insert_or_update, sql_insert, sql_update, sql_select
from app.lib_general import *
from app.db_sql import redis_lookup_id_random, sql_insert_or_update, sql_insert, sql_update, sql_select
from ..models.order_cart_models import Order_Cart_Base
from app.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):

10
app/methods/order_methods.py
View File

@@ -4,12 +4,12 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_select
from app.lib_general import *
from app.db_sql import redis_lookup_id_random, sql_select
from ..models.order_models import Order_Base
#from ..models.person_models import Person_Base
#from ..models.user_models import User_Base
from app.models.order_models import Order_Base
#from app.models.person_models import Person_Base
#from app.models.user_models import User_Base
# ### BEGIN ### API Order Methods ### save_order_obj() ###

12
app/methods/organization_methods.py
View File

@@ -4,18 +4,18 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select
from app.lib_general import log, logging
from ..methods.address_methods import load_address_obj
from ..methods.contact_methods import create_contact_obj, load_contact_obj
from app.methods.address_methods import load_address_obj
from app.methods.contact_methods import create_contact_obj, load_contact_obj
from ..models.organization_models import Organization_Base
from app.models.organization_models import Organization_Base
# ### BEGIN ### API Organization Methods ### load_organization_obj() ###
def load_organization_obj(organization_id:int|str, inc_contact:bool=False, inc_address:bool=False) -> Organization_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 organization_id := redis_lookup_id_random(record_id_random=organization_id, table_name='organization'): pass

14
app/methods/person_methods.py
View File

@@ -4,15 +4,15 @@ import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from app.lib_general import log, logging
from ..methods.address_methods import load_address_obj
from ..methods.contact_methods import create_contact_obj, load_contact_obj
from ..methods.organization_methods import load_organization_obj
from ..methods.user_methods import load_user_obj
from app.methods.address_methods import load_address_obj
from app.methods.contact_methods import create_contact_obj, load_contact_obj
from app.methods.organization_methods import load_organization_obj
from app.methods.user_methods import load_user_obj
from ..models.person_models import Person_Base
from app.models.person_models import Person_Base
# ### BEGIN ### API Person Methods ### create_person_obj() ###

4
app/models/account_cfg_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/account_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/address_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .account_models import Account_Base

4
app/models/api_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/archive_content_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/archive_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/contact_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .account_models import Account_Base

4
app/models/core_object_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/event_badge_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes

4
app/models/event_exhibit_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes

4
app/models/event_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes

4
app/models/event_person_detail_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .event_presentation_models import Event_Presentation_Base

4
app/models/event_person_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
from .event_models import Event_Base

4
app/models/event_registration_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/event_session_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes

4
app/models/flask_cfg_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/hosted_file_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes

4
app/models/journal_entry_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/journal_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/membership_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
from .address_models import Address_Base

4
app/models/order_cart_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/order_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes
#from .supporting_core_models import *

4
app/models/organization_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .account_models import Account_Base

4
app/models/page_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/person_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
# from .account_models import Account_Base

2
app/models/post_comment_models.py
View File

@@ -4,7 +4,7 @@ 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
from ..lib_general import *
from app.lib_general import *
from ..log import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/post_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/product_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes

4
app/models/response_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from app.config import settings

4
app/models/site_domain_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes
#from .site_models import Site_Base as Site_Base_2

4
app/models/site_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes
from .site_domain_models import Site_Domain_Base as Site_Domain_Base_2

4
app/models/user_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import log, logging
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from .common_field_schema import base_fields, default_num_bytes
#from .account_models import Account_Base

4
app/models/user_role_models.py
View File

@@ -4,8 +4,8 @@ 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
from ..db_sql import redis_lookup_id_random
from ..lib_general import *
from app.db_sql import redis_lookup_id_random
from app.lib_general import *
from .common_field_schema import base_fields, default_num_bytes
#from .user_models import User_Base

8
app/routers/account.py
View File

@@ -4,17 +4,17 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import log, logging
from app.lib_general import log, logging
#from ..log import *
from app.config import settings
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 ..methods.account_methods import load_account_cfg_obj
from app.methods.account_methods import load_account_cfg_obj
from ..models.account_models import Account_Base
from ..models.response_models import *
from app.models.account_models import Account_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/address.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import log, logging
from app.lib_general import log, logging
#from ..log import *
from app.config import settings
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_models import *
from app.models.address_models import Address_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/api.py
View File

@@ -4,14 +4,14 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from app.config import settings
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_models import Api_Base
from ..models.response_models import *
from app.models.api_models import Api_Base
from app.models.response_models import *
router = APIRouter()

50
app/routers/api_crud.py
View File

@@ -4,35 +4,35 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from app.config import settings
from app.db_sql import *
from ..models.response_models import *
from app.models.response_models import *
from ..models.account_models import *
from ..models.account_cfg_models import *
from ..models.address_models import *
from ..models.archive_models 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_models import *
from ..models.order_cart_models import *
from ..models.organization_models import *
from ..models.page_models import *
from ..models.person_models import *
from ..models.product_models import *
from ..models.post_models import *
from ..models.post_comment_models import *
from ..models.site_models import *
from ..models.site_domain_models import *
from ..models.user_models import *
from ..models.user_role_models import *
from app.models.account_models import *
from app.models.account_cfg_models import *
from app.models.address_models import *
from app.models.archive_models import *
from app.models.archive_content_models import *
from app.models.contact_models import *
from app.models.event_models import *
from app.models.event_exhibit_models import *
from app.models.event_person_models import *
from app.models.event_registration_models import *
from app.models.membership_models import *
from app.models.order_models import *
from app.models.order_cart_models import *
from app.models.organization_models import *
from app.models.page_models import *
from app.models.person_models import *
from app.models.product_models import *
from app.models.post_models import *
from app.models.post_comment_models import *
from app.models.site_models import *
from app.models.site_domain_models import *
from app.models.user_models import *
from app.models.user_role_models import *
obj_type_li = {}

6
app/routers/archive.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import Archive_Base
from ..models.response_models import *
from app.models.archive_models import Archive_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/archive_content.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import Archive_Content_Base
from ..models.response_models import *
from app.models.archive_content_models import Archive_Content_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/contact.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import log, logging
from app.lib_general import log, logging
#from ..log import *
from app.config import settings
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_models import *
from app.models.contact_models import Contact_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/event.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import *
from app.models.event_models import Event_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/event_exhibit.py
View File

@@ -4,14 +4,14 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from app.config import settings
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_models import *
from app.models.event_exhibit_models import Event_Exhibit_Base
from app.models.response_models import *
router = APIRouter()

16
app/routers/event_person.py
View File

@@ -4,21 +4,21 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import log, logging
from app.lib_general import log, logging
#from ..log import *
from app.config import settings
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 ..methods.event_person_methods import create_event_person_obj, load_event_person_obj
from ..methods.person_methods import create_person_obj, load_person_obj
from ..methods.user_methods import create_user_obj, load_user_obj
from app.methods.event_person_methods import create_event_person_obj, load_event_person_obj
from app.methods.person_methods import create_person_obj, load_person_obj
from app.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_models import *
from ..models.user_models import User_New_Base, User_Base
from app.models.event_person_models import Event_Person_New_Base, Event_Person_Base
from app.models.person_models import Person_Base
from app.models.response_models import *
from app.models.user_models import User_New_Base, User_Base
router = APIRouter()

6
app/routers/event_person_detail.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import log, logging
from app.lib_general import log, logging
#from ..log import *
from app.config import settings
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_models import *
from app.models.event_person_detail_models import Event_Person_Detail_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/event_registration.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import *
from app.models.event_registration_models import Event_Registration_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/event_session.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import log, logging
from app.lib_general import log, logging
#from ..log import *
from app.config import settings
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_models import *
from app.models.event_session_models import Event_Session_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/flask_cfg.py
View File

@@ -4,14 +4,14 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from app.config import settings
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_models import *
from ..models.flask_cfg_models import Flask_Cfg_Base
from app.models.response_models import *
from app.models.flask_cfg_models import Flask_Cfg_Base
router = APIRouter()

6
app/routers/hosted_file.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, File, Form, Header, HTTPException,
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import Hosted_File_Base
from ..models.response_models import *
from app.models.hosted_file_models import Hosted_File_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/journal.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import Journal_Base
from ..models.response_models import *
from app.models.journal_models import Journal_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/journal_entry.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import Journal_Entry_Base
from ..models.response_models import *
from app.models.journal_entry_models import Journal_Entry_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/lookup.py
View File

@@ -4,14 +4,14 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from app.config import settings
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_models import *
#from ..models.lookup_models import Lookup_Base
from app.models.response_models import *
#from app.models.lookup_models import Lookup_Base
router = APIRouter()

8
app/routers/membership.py
View File

@@ -4,16 +4,16 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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.membership_models import Membership_Base
from ..methods.membership_methods import load_membership_obj
from ..models.response_models import *
from app.models.membership_models import Membership_Base
from app.methods.membership_methods import load_membership_obj
from app.models.response_models import *
router = APIRouter()

8
app/routers/order.py
View File

@@ -4,17 +4,17 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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 ..methods.order_methods import load_order_obj, save_order_obj
from app.methods.order_methods import load_order_obj, save_order_obj
from ..models.response_models import *
from ..models.order_models import Order_Base
from app.models.response_models import *
from app.models.order_models import Order_Base
router = APIRouter()

8
app/routers/order_cart.py
View File

@@ -4,17 +4,17 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, Resp
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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 ..methods.order_cart_methods import update_order_cart_obj, load_order_cart_obj
from app.methods.order_cart_methods import update_order_cart_obj, load_order_cart_obj
from ..models.order_cart_models import Order_Cart_Base
from ..models.response_models import *
from app.models.order_cart_models import Order_Cart_Base
from app.models.response_models import *
router = APIRouter()

8
app/routers/organization.py
View File

@@ -4,17 +4,17 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import log, logging
from app.lib_general import log, logging
#from ..log import *
from app.config import settings
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 ..methods.organization_methods import load_organization_obj
from app.methods.organization_methods import load_organization_obj
from ..models.organization_models import Organization_Base
from ..models.response_models import *
from app.models.organization_models import Organization_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/page.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import Page_Base
from ..models.response_models import *
from app.models.page_models import Page_Base
from app.models.response_models import *
router = APIRouter()

8
app/routers/person.py
View File

@@ -4,17 +4,17 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import log, logging
from app.lib_general import log, logging
#from ..log import *
from app.config import settings
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 ..methods.person_methods import load_person_obj
from app.methods.person_methods import load_person_obj
from ..models.person_models import Person_Base
from ..models.response_models import *
from app.models.person_models import Person_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/post.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import Post_Base
from ..models.response_models import *
from app.models.post_models import Post_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/post_comment.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import Post_Comment_Base
from ..models.response_models import *
from app.models.post_comment_models import Post_Comment_Base
from app.models.response_models import *
router = APIRouter()

6
app/routers/product.py
View File

@@ -4,15 +4,15 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import Product_Base
from ..models.response_models import *
from app.models.product_models import Product_Base
from app.models.response_models import *
router = APIRouter()

8
app/routers/site.py
View File

@@ -4,16 +4,16 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
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_models import *
from ..models.site_models import Site_Base
from ..models.site_domain_models import Site_Domain_Base
from app.models.response_models import *
from app.models.site_models import Site_Base
from app.models.site_domain_models import Site_Domain_Base
router = APIRouter()

8
app/routers/site_domain.py
View File

@@ -4,16 +4,16 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import log, logging
from app.lib_general import log, logging
#from ..log import *
from app.config import settings
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_models import *
from ..models.site_models import Site_Base
from ..models.site_domain_models import Site_Domain_Base
from app.models.response_models import *
from app.models.site_models import Site_Base
from app.models.site_domain_models import Site_Domain_Base
router = APIRouter()

8
app/routers/user.py
View File

@@ -11,11 +11,11 @@ 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 ..methods.user_methods import load_user_obj
from app.methods.user_methods import load_user_obj
from ..models.common_field_schema import default_num_bytes
from ..models.response_models import *
from ..models.user_models import User_Base, User_New_Base, User_Out_Base
from app.models.common_field_schema import default_num_bytes
from app.models.response_models import *
from app.models.user_models import User_Base, User_New_Base, User_Out_Base
router = APIRouter()

14
app/routers/user_person.py
View File

@@ -4,20 +4,20 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, stat
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from ..lib_general import log, logging
from app.lib_general import log, logging
#from ..log import *
from app.config import settings
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 ..methods.person_methods import load_person_obj
from ..methods.user_methods import load_user_obj
from app.methods.person_methods import load_person_obj
from app.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_models import *
from ..models.user_models import User_Base, User_New_Base, User_Out_Base
from app.models.common_field_schema import default_num_bytes
from app.models.person_models import Person_Base
from app.models.response_models import *
from app.models.user_models import User_Base, User_New_Base, User_Out_Base
router = APIRouter()

2
app/routers/websockets.py
View File

@@ -3,7 +3,7 @@ from fastapi.responses import HTMLResponse
from typing import List
import aioredis, asyncio, json
from ..lib_general import *
from app.lib_general import *
from ..log import *
from app.config import settings
from app.db_sql import *