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

Still working on bug...

Browse Source
This commit is contained in:
Scott Idem
2023-06-13 12:42:44 -04:00
parent a4bfcdad16
commit 8036e5e328
2 changed files with 319 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

635
app/main.py
View File

@@ -18,9 +18,10 @@ from . import config
from app.log import log, logging from app.log import log, logging
# Import the routers here first: # Import the routers here first:
# from app.routers import aether_cfg, api_crud, api, importing, sql, account, activity_log, address, archive, archive_content, contact, cont_edu_cert, cont_edu_cert_person, data_store, event, event_abstract, event_badge, event_badge_importing, event_badge_template, event_device, event_exhibit, event_exhibit_tracking, event_file, event_importing, event_location, event_person, event_person_detail, event_person_tracking, event_presentation, event_presenter, event_registration, event_session, flask_cfg, fundraising, hosted_file, journal, journal_entry, log_client_viewing, lookup, membership_cfg, membership_group, membership_person_group, membership_person, membership_person_profile, membership_type, membership_person_type, order, order_v3, order_line, order_cart, organization, page, person, person_user, post, post_comment, product, qr, site, site_domain, user, websockets_redis, e_confex, e_cvent, c_idaa, e_impexium, e_stripe from app.routers import aether_cfg, api_crud, api, importing, sql, account, activity_log, address, archive, archive_content, contact, cont_edu_cert, cont_edu_cert_person, data_store, event, event_abstract, event_badge, event_badge_importing, event_badge_template, event_device, event_exhibit, event_exhibit_tracking, event_file, event_importing, event_location, event_person, event_person_detail, event_person_tracking, event_presentation, event_presenter, event_registration, event_session, flask_cfg, fundraising, hosted_file, journal, journal_entry, log_client_viewing, lookup, membership_cfg, membership_group, membership_person_group, membership_person, membership_person_profile, membership_type, membership_person_type, order, order_v3, order_line, order_cart, organization, page, person, person_user, post, post_comment, product, qr, site, site_domain, user, websockets_redis, e_confex, e_cvent, c_idaa, e_impexium, e_stripe
# from app.routers import aether_cfg, sql
from app.routers import aether_cfg, sql
from app.db_sql import sql_select # , sql_connect from app.db_sql import sql_select # , sql_connect
@@ -94,29 +95,29 @@ app.include_router(
aether_cfg.router, aether_cfg.router,
tags=['Aether Config'], tags=['Aether Config'],
) )
# app.include_router( app.include_router(
# api_crud.router, api_crud.router,
# prefix='/crud', prefix='/crud',
# tags=['CRUD'], tags=['CRUD'],
# #dependencies=[Depends(get_token_header)], #dependencies=[Depends(get_token_header)],
# #dependencies=[Depends(get_account_header)], #dependencies=[Depends(get_account_header)],
# #responses={404: {'description': 'Not found'}}, #responses={404: {'description': 'Not found'}},
# ) )
# app.include_router( app.include_router(
# api.router, api.router,
# prefix='/api', prefix='/api',
# tags=['API'], tags=['API'],
# ) )
# app.include_router( app.include_router(
# flask_cfg.router, flask_cfg.router,
# prefix='/flask_cfg', prefix='/flask_cfg',
# tags=['Flask CFG'], tags=['Flask CFG'],
# ) )
# app.include_router( app.include_router(
# importing.router, importing.router,
# prefix='/importing', prefix='/importing',
# tags=['Importing'], tags=['Importing'],
# ) )
app.include_router( app.include_router(
sql.router, sql.router,
# prefix='/sql', # prefix='/sql',
@@ -128,301 +129,301 @@ app.include_router(
# # tags=['Redis'], # # tags=['Redis'],
# # ) # # )
app.include_router(
account.router,
# prefix='/account',
tags=['Account'],
)
app.include_router(
activity_log.router,
prefix='/activity_log',
tags=['Activity Log'],
)
app.include_router(
address.router,
prefix='/address',
tags=['Address'],
)
app.include_router(
archive.router,
# prefix='/archive',
tags=['Archive'],
)
app.include_router(
archive_content.router,
prefix='/archive/content',
tags=['Archive Content'],
)
app.include_router(
contact.router,
prefix='/contact',
tags=['Contact'],
)
app.include_router(
cont_edu_cert.router,
tags=['Cont Edu Cert'],
)
app.include_router(
cont_edu_cert_person.router,
tags=['Cont Edu Cert Person'],
)
app.include_router(
data_store.router,
# prefix='/data_store',
tags=['Data Store'],
)
app.include_router(
event.router,
# prefix='/event',
tags=['Event'],
)
app.include_router(
event_abstract.router,
tags=['Event Abstract'],
)
app.include_router(
event_badge.router,
tags=['Event Badge'],
)
app.include_router(
event_badge_importing.router,
tags=['Event Badge Importing'],
)
app.include_router(
event_badge_template.router,
# prefix='/event/badge/template',
tags=['Event Badge Template'],
)
app.include_router(
event_device.router,
# prefix='/event/device',
tags=['Event Device'],
)
app.include_router(
event_exhibit.router,
# prefix='/event/exhibit',
tags=['Event Exhibit'],
)
app.include_router(
event_exhibit_tracking.router,
# prefix='/event/exhibit/tracking',
tags=['Event Exhibit Tracking'],
)
app.include_router(
event_file.router,
# prefix='/event/file',
tags=['Event File'],
)
app.include_router(
event_importing.router,
# prefix='/event/importing',
tags=['Event Importing'],
)
app.include_router(
event_location.router,
# prefix='/event/location',
tags=['Event Location'],
)
app.include_router(
event_person.router,
# prefix='/event/person',
tags=['Event Person'],
)
app.include_router(
event_person.router,
prefix='/event/person/detail',
tags=['Event Person Detail'],
)
app.include_router(
event_person_tracking.router,
tags=['Event Person Tracking'],
)
app.include_router(
event_presentation.router,
# prefix='/event/presentation',
tags=['Event Presentation'],
)
app.include_router(
event_presenter.router,
prefix='/event/presenter',
tags=['Event Presenter'],
)
app.include_router(
event_registration.router,
prefix='/event/registration',
tags=['Event Registration'],
)
app.include_router(
event_session.router,
# prefix='/event/session',
tags=['Event Session'],
)
app.include_router(
fundraising.router,
tags=['Fundraising'],
)
app.include_router(
hosted_file.router,
prefix='/hosted_file',
tags=['Hosted File'],
)
app.include_router(
journal.router,
prefix='/journal',
tags=['Journal'],
)
app.include_router(
journal_entry.router,
# prefix='/journal/entry',
tags=['Journal Entry'],
)
app.include_router(
log_client_viewing.router,
# prefix='/log/client_viewing',
tags=['Log Client Viewing'],
)
app.include_router(
lookup.router,
prefix='/lu',
tags=['Lookup'],
)
app.include_router(
membership_cfg.router,
tags=['Membership Config'],
)
app.include_router(
membership_group.router,
tags=['Membership Group'],
)
app.include_router(
membership_person_group.router,
tags=['Membership Group Person'],
)
app.include_router(
membership_person_profile.router,
tags=['Membership Person Profile'],
)
app.include_router(
membership_person.router,
tags=['Membership Person'],
)
app.include_router(
membership_type.router,
tags=['Membership Type'],
)
app.include_router(
membership_person_type.router,
tags=['Membership Type Person'],
)
app.include_router(
order.router,
# prefix='/order',
tags=['Order'],
)
app.include_router(
order_v3.router,
# prefix='/order',
tags=['Order v3'],
)
app.include_router(
order_line.router,
# prefix='/order',
tags=['Order Line'],
)
app.include_router(
order_cart.router,
prefix='/order/cart',
tags=['Order Cart'],
)
app.include_router(
organization.router,
prefix='/organization',
tags=['Organization'],
)
app.include_router(
page.router,
prefix='/page',
tags=['Page'],
)
app.include_router(
person.router,
tags=['Person'],
)
app.include_router(
person_user.router,
prefix='/person_user',
tags=['Person User'],
)
app.include_router(
post.router,
# prefix='/post',
tags=['Post'],
)
app.include_router(
post_comment.router,
prefix='/post/comment',
tags=['Post Comment'],
)
app.include_router(
product.router,
# prefix='/product',
tags=['Product'],
)
app.include_router(
qr.router,
tags=['QR'],
)
app.include_router(
site.router,
# prefix='/site',
tags=['Site'],
)
app.include_router(
site_domain.router,
# prefix='/site/domain',
tags=['Site Domain'],
)
app.include_router(
user.router,
tags=['User'],
)
# app.include_router( # app.include_router(
# account.router, # websockets.router,
# # prefix='/account', # # prefix='/websocket',
# tags=['Account'], # tags=['Websockets'],
# ) # # dependencies=[Depends(get_token_header)],
# app.include_router( # # responses={404: {'description': 'Not found'}},
# activity_log.router,
# prefix='/activity_log',
# tags=['Activity Log'],
# )
# app.include_router(
# address.router,
# prefix='/address',
# tags=['Address'],
# )
# app.include_router(
# archive.router,
# # prefix='/archive',
# tags=['Archive'],
# )
# app.include_router(
# archive_content.router,
# prefix='/archive/content',
# tags=['Archive Content'],
# )
# app.include_router(
# contact.router,
# prefix='/contact',
# tags=['Contact'],
# )
# app.include_router(
# cont_edu_cert.router,
# tags=['Cont Edu Cert'],
# )
# app.include_router(
# cont_edu_cert_person.router,
# tags=['Cont Edu Cert Person'],
# )
# app.include_router(
# data_store.router,
# # prefix='/data_store',
# tags=['Data Store'],
# )
# app.include_router(
# event.router,
# # prefix='/event',
# tags=['Event'],
# )
# app.include_router(
# event_abstract.router,
# tags=['Event Abstract'],
# )
# app.include_router(
# event_badge.router,
# tags=['Event Badge'],
# )
# app.include_router(
# event_badge_importing.router,
# tags=['Event Badge Importing'],
# )
# app.include_router(
# event_badge_template.router,
# # prefix='/event/badge/template',
# tags=['Event Badge Template'],
# )
# app.include_router(
# event_device.router,
# # prefix='/event/device',
# tags=['Event Device'],
# )
# app.include_router(
# event_exhibit.router,
# # prefix='/event/exhibit',
# tags=['Event Exhibit'],
# )
# app.include_router(
# event_exhibit_tracking.router,
# # prefix='/event/exhibit/tracking',
# tags=['Event Exhibit Tracking'],
# )
# app.include_router(
# event_file.router,
# # prefix='/event/file',
# tags=['Event File'],
# )
# app.include_router(
# event_importing.router,
# # prefix='/event/importing',
# tags=['Event Importing'],
# )
# app.include_router(
# event_location.router,
# # prefix='/event/location',
# tags=['Event Location'],
# )
# app.include_router(
# event_person.router,
# # prefix='/event/person',
# tags=['Event Person'],
# )
# app.include_router(
# event_person.router,
# prefix='/event/person/detail',
# tags=['Event Person Detail'],
# )
# app.include_router(
# event_person_tracking.router,
# tags=['Event Person Tracking'],
# )
# app.include_router(
# event_presentation.router,
# # prefix='/event/presentation',
# tags=['Event Presentation'],
# )
# app.include_router(
# event_presenter.router,
# prefix='/event/presenter',
# tags=['Event Presenter'],
# )
# app.include_router(
# event_registration.router,
# prefix='/event/registration',
# tags=['Event Registration'],
# )
# app.include_router(
# event_session.router,
# # prefix='/event/session',
# tags=['Event Session'],
# )
# app.include_router(
# fundraising.router,
# tags=['Fundraising'],
# )
# app.include_router(
# hosted_file.router,
# prefix='/hosted_file',
# tags=['Hosted File'],
# )
# app.include_router(
# journal.router,
# prefix='/journal',
# tags=['Journal'],
# )
# app.include_router(
# journal_entry.router,
# # prefix='/journal/entry',
# tags=['Journal Entry'],
# )
# app.include_router(
# log_client_viewing.router,
# # prefix='/log/client_viewing',
# tags=['Log Client Viewing'],
# )
# app.include_router(
# lookup.router,
# prefix='/lu',
# tags=['Lookup'],
# )
# app.include_router(
# membership_cfg.router,
# tags=['Membership Config'],
# )
# app.include_router(
# membership_group.router,
# tags=['Membership Group'],
# )
# app.include_router(
# membership_person_group.router,
# tags=['Membership Group Person'],
# )
# app.include_router(
# membership_person_profile.router,
# tags=['Membership Person Profile'],
# )
# app.include_router(
# membership_person.router,
# tags=['Membership Person'],
# )
# app.include_router(
# membership_type.router,
# tags=['Membership Type'],
# )
# app.include_router(
# membership_person_type.router,
# tags=['Membership Type Person'],
# )
# app.include_router(
# order.router,
# # prefix='/order',
# tags=['Order'],
# )
# app.include_router(
# order_v3.router,
# # prefix='/order',
# tags=['Order v3'],
# )
# app.include_router(
# order_line.router,
# # prefix='/order',
# tags=['Order Line'],
# )
# app.include_router(
# order_cart.router,
# prefix='/order/cart',
# tags=['Order Cart'],
# )
# app.include_router(
# organization.router,
# prefix='/organization',
# tags=['Organization'],
# )
# app.include_router(
# page.router,
# prefix='/page',
# tags=['Page'],
# )
# app.include_router(
# person.router,
# tags=['Person'],
# )
# app.include_router(
# person_user.router,
# prefix='/person_user',
# tags=['Person User'],
# )
# app.include_router(
# post.router,
# # prefix='/post',
# tags=['Post'],
# )
# app.include_router(
# post_comment.router,
# prefix='/post/comment',
# tags=['Post Comment'],
# )
# app.include_router(
# product.router,
# # prefix='/product',
# tags=['Product'],
# )
# app.include_router(
# qr.router,
# tags=['QR'],
# )
# app.include_router(
# site.router,
# # prefix='/site',
# tags=['Site'],
# )
# app.include_router(
# site_domain.router,
# # prefix='/site/domain',
# tags=['Site Domain'],
# )
# app.include_router(
# user.router,
# tags=['User'],
# )
# # app.include_router(
# # websockets.router,
# # # prefix='/websocket',
# # tags=['Websockets'],
# # # dependencies=[Depends(get_token_header)],
# # # responses={404: {'description': 'Not found'}},
# # )
# app.include_router(
# websockets_redis.router,
# tags=['Websockets (Redis)'],
# )
# app.include_router(
# e_confex.router,
# prefix='/e/confex',
# tags=['External Service: Confex'],
# )
# app.include_router(
# e_cvent.router,
# prefix='/e/cvent',
# tags=['External Service: Cvent'],
# )
# app.include_router(
# e_impexium.router,
# prefix='/e/impexium',
# tags=['External Service: Impexium'],
# )
# app.include_router(
# e_stripe.router,
# prefix='/e/stripe',
# tags=['External Service: Stripe'],
# ) # )
app.include_router(
websockets_redis.router,
tags=['Websockets (Redis)'],
)
app.include_router(
e_confex.router,
prefix='/e/confex',
tags=['External Service: Confex'],
)
app.include_router(
e_cvent.router,
prefix='/e/cvent',
tags=['External Service: Cvent'],
)
app.include_router(
e_impexium.router,
prefix='/e/impexium',
tags=['External Service: Impexium'],
)
app.include_router(
e_stripe.router,
prefix='/e/stripe',
tags=['External Service: Stripe'],
)
# app.include_router( app.include_router(
# c_idaa.router, c_idaa.router,
# prefix='/c/idaa', prefix='/c/idaa',
# tags=['Client: IDAA'], tags=['Client: IDAA'],
# ) )
# BEGIN: CORS # BEGIN: CORS

2
app/routers/importing.py
View File

@@ -8,7 +8,7 @@ from app.lib_general import log, logging, secure_hash_string, common_route_param
from app.config import settings from app.config import settings
from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random
from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template # from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
from app.methods.contact_methods import load_contact_obj, update_contact_obj from app.methods.contact_methods import load_contact_obj, update_contact_obj
from app.methods.person_methods import create_update_person_obj_v4b, get_person_rec_list, load_person_obj from app.methods.person_methods import create_update_person_obj_v4b, get_person_rec_list, load_person_obj