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

Trying to fix a logging bug?

Browse Source
This commit is contained in:
Scott Idem
2023-06-13 11:55:56 -04:00
parent fdefe0e48f
commit b2683e71c5
2 changed files with 292 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

578
app/main.py
View File

@@ -18,7 +18,9 @@ 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, api_crud, api, importing, sql, account
from app.db_sql import sql_select # , sql_connect from app.db_sql import sql_select # , sql_connect
@@ -132,296 +134,296 @@ app.include_router(
# prefix='/account', # prefix='/account',
tags=['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(
# websockets.router, # activity_log.router,
# # prefix='/websocket', # prefix='/activity_log',
# tags=['Websockets'], # tags=['Activity Log'],
# # dependencies=[Depends(get_token_header)], # )
# # responses={404: {'description': 'Not found'}}, # 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

10
app/routers/hosted_file.py
View File

@@ -3,7 +3,7 @@ from fastapi import APIRouter, Body, Depends, File, Form, Header, HTTPException,
from fastapi.responses import FileResponse from fastapi.responses import FileResponse
from pydantic import BaseModel, EmailStr, Field from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
# from pdf2image import convert_from_path from pdf2image import convert_from_path
from app.lib_general import log, logging, common_route_params, Common_Route_Params, common_route_params_min, Common_Route_Params_Min from app.lib_general import log, logging, common_route_params, Common_Route_Params, common_route_params_min, Common_Route_Params_Min
from app.config import settings from app.config import settings
@@ -807,13 +807,7 @@ async def convert_file(
# 2K 2048x1080 # 2K 2048x1080
# HD 1920x1080 # HD 1920x1080
# Save as webp with 3840 size and 90 lossy quality works well for posters. Better than in the past with PNG. Higher resolution and smaller file size! -2023-05-04 # Save as webp with 3840 size and 90 lossy quality works well for posters. Better than in the past with PNG. Higher resolution and smaller file size! -2023-05-04
images = convert_from_path(full_file_path, size=(3840, None)) # 2160 works well
return mk_resp(data=None, status_code=500, response=commons.response)
# images = convert_from_path(full_file_path, size=(3840, None)) # 2160 works well
images = [] # delete this
for image in images: for image in images:
# *** Part 1: *** Convert the file and save the file to tmp and then save the hashed file to hosted_files directory. # *** Part 1: *** Convert the file and save the file to tmp and then save the hashed file to hosted_files directory.