diff --git a/app/db_sql.py b/app/db_sql.py index b5667ff..6fc8b13 100644 --- a/app/db_sql.py +++ b/app/db_sql.py @@ -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()) diff --git a/app/methods/account_methods.py b/app/methods/account_methods.py index e728789..005cfb0 100644 --- a/app/methods/account_methods.py +++ b/app/methods/account_methods.py @@ -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() ### diff --git a/app/methods/address_methods.py b/app/methods/address_methods.py index 92c4552..68abc8b 100644 --- a/app/methods/address_methods.py +++ b/app/methods/address_methods.py @@ -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() ### diff --git a/app/methods/contact_methods.py b/app/methods/contact_methods.py index 0ba0fb5..d6813e4 100644 --- a/app/methods/contact_methods.py +++ b/app/methods/contact_methods.py @@ -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() ### diff --git a/app/methods/event_person_methods.py b/app/methods/event_person_methods.py index 46a5457..4bcb3b9 100644 --- a/app/methods/event_person_methods.py +++ b/app/methods/event_person_methods.py @@ -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() ### diff --git a/app/methods/membership_methods.py b/app/methods/membership_methods.py index 7098544..d1a2a0a 100644 --- a/app/methods/membership_methods.py +++ b/app/methods/membership_methods.py @@ -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 diff --git a/app/methods/order_cart_methods.py b/app/methods/order_cart_methods.py index 076cbb7..f56e7d0 100644 --- a/app/methods/order_cart_methods.py +++ b/app/methods/order_cart_methods.py @@ -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): diff --git a/app/methods/order_methods.py b/app/methods/order_methods.py index d0c81ee..cbaf300 100644 --- a/app/methods/order_methods.py +++ b/app/methods/order_methods.py @@ -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() ### diff --git a/app/methods/organization_methods.py b/app/methods/organization_methods.py index a6615b7..509db22 100644 --- a/app/methods/organization_methods.py +++ b/app/methods/organization_methods.py @@ -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 diff --git a/app/methods/person_methods.py b/app/methods/person_methods.py index 763e765..d7c0b1a 100644 --- a/app/methods/person_methods.py +++ b/app/methods/person_methods.py @@ -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() ### diff --git a/app/models/account_cfg_models.py b/app/models/account_cfg_models.py index dd439d8..a7ad04c 100644 --- a/app/models/account_cfg_models.py +++ b/app/models/account_cfg_models.py @@ -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 diff --git a/app/models/account_models.py b/app/models/account_models.py index c70db6b..71b4192 100644 --- a/app/models/account_models.py +++ b/app/models/account_models.py @@ -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 diff --git a/app/models/address_models.py b/app/models/address_models.py index ed8ed52..5db54e8 100644 --- a/app/models/address_models.py +++ b/app/models/address_models.py @@ -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 diff --git a/app/models/api_models.py b/app/models/api_models.py index 7fb7cca..c821b9c 100644 --- a/app/models/api_models.py +++ b/app/models/api_models.py @@ -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 diff --git a/app/models/archive_content_models.py b/app/models/archive_content_models.py index 1c4ab5b..5881d42 100644 --- a/app/models/archive_content_models.py +++ b/app/models/archive_content_models.py @@ -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 diff --git a/app/models/archive_models.py b/app/models/archive_models.py index a6b4252..cfa398c 100644 --- a/app/models/archive_models.py +++ b/app/models/archive_models.py @@ -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 diff --git a/app/models/contact_models.py b/app/models/contact_models.py index 17e33a6..e86335e 100644 --- a/app/models/contact_models.py +++ b/app/models/contact_models.py @@ -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 diff --git a/app/models/core_object_models.py b/app/models/core_object_models.py index 90fb366..b9a4815 100644 --- a/app/models/core_object_models.py +++ b/app/models/core_object_models.py @@ -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 diff --git a/app/models/event_badge_models.py b/app/models/event_badge_models.py index dcd3e95..cba71ca 100644 --- a/app/models/event_badge_models.py +++ b/app/models/event_badge_models.py @@ -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 diff --git a/app/models/event_exhibit_models.py b/app/models/event_exhibit_models.py index ccff731..e03458a 100644 --- a/app/models/event_exhibit_models.py +++ b/app/models/event_exhibit_models.py @@ -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 diff --git a/app/models/event_models.py b/app/models/event_models.py index 3659356..e315086 100644 --- a/app/models/event_models.py +++ b/app/models/event_models.py @@ -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 diff --git a/app/models/event_person_detail_models.py b/app/models/event_person_detail_models.py index 544a1d3..4e26f06 100644 --- a/app/models/event_person_detail_models.py +++ b/app/models/event_person_detail_models.py @@ -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 diff --git a/app/models/event_person_models.py b/app/models/event_person_models.py index ce33bde..072cf6c 100644 --- a/app/models/event_person_models.py +++ b/app/models/event_person_models.py @@ -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 diff --git a/app/models/event_registration_models.py b/app/models/event_registration_models.py index 5baa95a..9259939 100644 --- a/app/models/event_registration_models.py +++ b/app/models/event_registration_models.py @@ -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 diff --git a/app/models/event_session_models.py b/app/models/event_session_models.py index 2f58147..a19ba47 100644 --- a/app/models/event_session_models.py +++ b/app/models/event_session_models.py @@ -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 diff --git a/app/models/flask_cfg_models.py b/app/models/flask_cfg_models.py index 115f4d4..3771824 100644 --- a/app/models/flask_cfg_models.py +++ b/app/models/flask_cfg_models.py @@ -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 diff --git a/app/models/hosted_file_models.py b/app/models/hosted_file_models.py index ef3f7a3..0e4393a 100644 --- a/app/models/hosted_file_models.py +++ b/app/models/hosted_file_models.py @@ -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 diff --git a/app/models/journal_entry_models.py b/app/models/journal_entry_models.py index d82fadd..d218c49 100644 --- a/app/models/journal_entry_models.py +++ b/app/models/journal_entry_models.py @@ -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 diff --git a/app/models/journal_models.py b/app/models/journal_models.py index 2181287..5a48888 100644 --- a/app/models/journal_models.py +++ b/app/models/journal_models.py @@ -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 diff --git a/app/models/membership_models.py b/app/models/membership_models.py index ad3b93f..edc20a1 100644 --- a/app/models/membership_models.py +++ b/app/models/membership_models.py @@ -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 diff --git a/app/models/order_cart_models.py b/app/models/order_cart_models.py index 01d5778..8c045ea 100644 --- a/app/models/order_cart_models.py +++ b/app/models/order_cart_models.py @@ -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 diff --git a/app/models/order_models.py b/app/models/order_models.py index bd4af89..3fbccd5 100644 --- a/app/models/order_models.py +++ b/app/models/order_models.py @@ -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 * diff --git a/app/models/organization_models.py b/app/models/organization_models.py index 3fbf24e..cd87e48 100644 --- a/app/models/organization_models.py +++ b/app/models/organization_models.py @@ -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 diff --git a/app/models/page_models.py b/app/models/page_models.py index 2306909..f478d71 100644 --- a/app/models/page_models.py +++ b/app/models/page_models.py @@ -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 diff --git a/app/models/person_models.py b/app/models/person_models.py index 0490115..24a10dd 100644 --- a/app/models/person_models.py +++ b/app/models/person_models.py @@ -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 diff --git a/app/models/post_comment_models.py b/app/models/post_comment_models.py index 37fad43..b9b3493 100644 --- a/app/models/post_comment_models.py +++ b/app/models/post_comment_models.py @@ -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 diff --git a/app/models/post_models.py b/app/models/post_models.py index 6507ac1..d9c3b31 100644 --- a/app/models/post_models.py +++ b/app/models/post_models.py @@ -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 diff --git a/app/models/product_models.py b/app/models/product_models.py index 49d4bc4..d025e16 100644 --- a/app/models/product_models.py +++ b/app/models/product_models.py @@ -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 diff --git a/app/models/response_models.py b/app/models/response_models.py index ebd37fd..eefbd3c 100644 --- a/app/models/response_models.py +++ b/app/models/response_models.py @@ -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 diff --git a/app/models/site_domain_models.py b/app/models/site_domain_models.py index d15e5bc..d2d4dcd 100644 --- a/app/models/site_domain_models.py +++ b/app/models/site_domain_models.py @@ -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 diff --git a/app/models/site_models.py b/app/models/site_models.py index 6e99cae..9dd7f31 100644 --- a/app/models/site_models.py +++ b/app/models/site_models.py @@ -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 diff --git a/app/models/user_models.py b/app/models/user_models.py index 7cb9d2b..65d3456 100644 --- a/app/models/user_models.py +++ b/app/models/user_models.py @@ -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 diff --git a/app/models/user_role_models.py b/app/models/user_role_models.py index f72a87c..3a4909f 100644 --- a/app/models/user_role_models.py +++ b/app/models/user_role_models.py @@ -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 diff --git a/app/routers/account.py b/app/routers/account.py index c7861a1..c923149 100644 --- a/app/routers/account.py +++ b/app/routers/account.py @@ -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() diff --git a/app/routers/address.py b/app/routers/address.py index 4800fae..8a1144a 100644 --- a/app/routers/address.py +++ b/app/routers/address.py @@ -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() diff --git a/app/routers/api.py b/app/routers/api.py index a76ab2b..62de0ff 100644 --- a/app/routers/api.py +++ b/app/routers/api.py @@ -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() diff --git a/app/routers/api_crud.py b/app/routers/api_crud.py index 2cc4dfe..c247bd2 100644 --- a/app/routers/api_crud.py +++ b/app/routers/api_crud.py @@ -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 = {} diff --git a/app/routers/archive.py b/app/routers/archive.py index acf1c64..a080167 100644 --- a/app/routers/archive.py +++ b/app/routers/archive.py @@ -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() diff --git a/app/routers/archive_content.py b/app/routers/archive_content.py index 1f03d2d..6911ee4 100644 --- a/app/routers/archive_content.py +++ b/app/routers/archive_content.py @@ -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() diff --git a/app/routers/contact.py b/app/routers/contact.py index bf992df..fd81f49 100644 --- a/app/routers/contact.py +++ b/app/routers/contact.py @@ -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() diff --git a/app/routers/event.py b/app/routers/event.py index 826ffd2..492efe9 100644 --- a/app/routers/event.py +++ b/app/routers/event.py @@ -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() diff --git a/app/routers/event_exhibit.py b/app/routers/event_exhibit.py index 6bc4230..3264c8b 100644 --- a/app/routers/event_exhibit.py +++ b/app/routers/event_exhibit.py @@ -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() diff --git a/app/routers/event_person.py b/app/routers/event_person.py index dbbb2f3..017ba79 100644 --- a/app/routers/event_person.py +++ b/app/routers/event_person.py @@ -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() diff --git a/app/routers/event_person_detail.py b/app/routers/event_person_detail.py index 35d07a5..a2e828e 100644 --- a/app/routers/event_person_detail.py +++ b/app/routers/event_person_detail.py @@ -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() diff --git a/app/routers/event_registration.py b/app/routers/event_registration.py index 13766b7..18200f1 100644 --- a/app/routers/event_registration.py +++ b/app/routers/event_registration.py @@ -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() diff --git a/app/routers/event_session.py b/app/routers/event_session.py index bbf36a1..34b3c6e 100644 --- a/app/routers/event_session.py +++ b/app/routers/event_session.py @@ -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() diff --git a/app/routers/flask_cfg.py b/app/routers/flask_cfg.py index 7fbce2f..cca7529 100644 --- a/app/routers/flask_cfg.py +++ b/app/routers/flask_cfg.py @@ -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() diff --git a/app/routers/hosted_file.py b/app/routers/hosted_file.py index eb62862..edefa1f 100644 --- a/app/routers/hosted_file.py +++ b/app/routers/hosted_file.py @@ -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() diff --git a/app/routers/journal.py b/app/routers/journal.py index 1f86cd8..3cc7f62 100644 --- a/app/routers/journal.py +++ b/app/routers/journal.py @@ -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() diff --git a/app/routers/journal_entry.py b/app/routers/journal_entry.py index 257630d..a74876b 100644 --- a/app/routers/journal_entry.py +++ b/app/routers/journal_entry.py @@ -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() diff --git a/app/routers/lookup.py b/app/routers/lookup.py index 7071b58..15510c6 100644 --- a/app/routers/lookup.py +++ b/app/routers/lookup.py @@ -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() diff --git a/app/routers/membership.py b/app/routers/membership.py index 6edf038..f34e49e 100644 --- a/app/routers/membership.py +++ b/app/routers/membership.py @@ -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() diff --git a/app/routers/order.py b/app/routers/order.py index 0cd6168..b9e0f01 100644 --- a/app/routers/order.py +++ b/app/routers/order.py @@ -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() diff --git a/app/routers/order_cart.py b/app/routers/order_cart.py index b5b90e6..3aa5c10 100644 --- a/app/routers/order_cart.py +++ b/app/routers/order_cart.py @@ -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() diff --git a/app/routers/organization.py b/app/routers/organization.py index 3fc4d54..ac00621 100644 --- a/app/routers/organization.py +++ b/app/routers/organization.py @@ -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() diff --git a/app/routers/page.py b/app/routers/page.py index 5fccbfc..f3e9b52 100644 --- a/app/routers/page.py +++ b/app/routers/page.py @@ -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() diff --git a/app/routers/person.py b/app/routers/person.py index 2d738d9..60c1ffa 100644 --- a/app/routers/person.py +++ b/app/routers/person.py @@ -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() diff --git a/app/routers/post.py b/app/routers/post.py index 46bf307..92881de 100644 --- a/app/routers/post.py +++ b/app/routers/post.py @@ -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() diff --git a/app/routers/post_comment.py b/app/routers/post_comment.py index 9e7697b..309aaa1 100644 --- a/app/routers/post_comment.py +++ b/app/routers/post_comment.py @@ -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() diff --git a/app/routers/product.py b/app/routers/product.py index 146f73d..7f4f875 100644 --- a/app/routers/product.py +++ b/app/routers/product.py @@ -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() diff --git a/app/routers/site.py b/app/routers/site.py index 3797d31..bfdbb14 100644 --- a/app/routers/site.py +++ b/app/routers/site.py @@ -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() diff --git a/app/routers/site_domain.py b/app/routers/site_domain.py index 2b74845..1b520ae 100644 --- a/app/routers/site_domain.py +++ b/app/routers/site_domain.py @@ -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() diff --git a/app/routers/user.py b/app/routers/user.py index 87b95de..f66342c 100644 --- a/app/routers/user.py +++ b/app/routers/user.py @@ -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() diff --git a/app/routers/user_person.py b/app/routers/user_person.py index db02b82..d823c72 100644 --- a/app/routers/user_person.py +++ b/app/routers/user_person.py @@ -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() diff --git a/app/routers/websockets.py b/app/routers/websockets.py index eff128a..74cdb4a 100644 --- a/app/routers/websockets.py +++ b/app/routers/websockets.py @@ -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 *