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

Fix????

Browse Source
This commit is contained in:
Scott Idem
2023-04-09 20:49:32 -04:00
parent f2309a28a9
commit 73cf8bfd91
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/requirements.txt
View File

@@ -31,7 +31,7 @@ orjson
packaging packaging
pandas pandas
passlib passlib
pdf2image # pdf2image
Pillow Pillow
pycparser pycparser
pydantic pydantic
@@ -48,7 +48,7 @@ requests
rfc3986 rfc3986
six six
sniffio sniffio
SQLAlchemy==1.4.44 # 1.4.47 is the newest I am working with SQLAlchemy==1.4.47 # 1.4.47 is the newest I am working with
starlette starlette
stripe stripe
typing_extensions typing_extensions

64
app/routers/hosted_file.py
View File

@@ -699,44 +699,44 @@ async def get_hosted_file_obj(
# ### END ### API Hosted File ### get_hosted_file_obj() ### # ### END ### API Hosted File ### get_hosted_file_obj() ###
# ### BEGIN ### API Hosted File ### download_tmp() ### # # ### BEGIN ### API Hosted File ### download_tmp() ###
# Updated 2023-04-05 # # Updated 2023-04-05
@router.get('/tmp/{subdirectory}/{filename}/download', response_model=Resp_Body_Base) # @router.get('/tmp/{subdirectory}/{filename}/download', response_model=Resp_Body_Base)
async def download_tmp( # async def download_tmp(
subdirectory: str = Query(..., min_length=1, max_length=100), # subdirectory: str = Query(..., min_length=1, max_length=100),
filename: str = Query(..., min_length=4, max_length=120), # filename: str = Query(..., min_length=4, max_length=120),
commons: Common_Route_Params = Depends(common_route_params), # commons: Common_Route_Params = Depends(common_route_params),
): # ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) # log.debug(locals())
# NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING # # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING
time.sleep(3.5) # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING # time.sleep(3.5) # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING
# NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING # # NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING NOTE: WARNING
hosted_tmp_path = settings.FILES_PATH['hosted_tmp_root'] # hosted_tmp_path = settings.FILES_PATH['hosted_tmp_root']
log.info(f'Hosted Tmp Path: {hosted_tmp_path}') # log.info(f'Hosted Tmp Path: {hosted_tmp_path}')
log.debug(shutil.disk_usage(hosted_tmp_path)) # log.debug(shutil.disk_usage(hosted_tmp_path))
hosted_tmp_w_subdir = os.path.join(hosted_tmp_path, subdirectory) # hosted_tmp_w_subdir = os.path.join(hosted_tmp_path, subdirectory)
# if pathlib.Path(hosted_tmp_w_subdir): # # if pathlib.Path(hosted_tmp_w_subdir):
if os.path.exists(hosted_tmp_w_subdir): # if os.path.exists(hosted_tmp_w_subdir):
log.info('Hosted tmp with subdirectory found') # log.info('Hosted tmp with subdirectory found')
else: # else:
log.info('Hosted tmp with subdirectory not found') # log.info('Hosted tmp with subdirectory not found')
return mk_resp(data=False, status_code=404, response=commons.response, status_message='The hosted tmp file subdirectory was not found.') # Not Found # return mk_resp(data=False, status_code=404, response=commons.response, status_message='The hosted tmp file subdirectory was not found.') # Not Found
hosted_tmp_w_subdir_filename = os.path.join(hosted_tmp_path, subdirectory, filename) # hosted_tmp_w_subdir_filename = os.path.join(hosted_tmp_path, subdirectory, filename)
# if pathlib.Path(hosted_tmp_w_subdir_filename): # # if pathlib.Path(hosted_tmp_w_subdir_filename):
if os.path.exists(hosted_tmp_w_subdir_filename): # if os.path.exists(hosted_tmp_w_subdir_filename):
log.info('Hosted tmp with subdirectory and filename found') # log.info('Hosted tmp with subdirectory and filename found')
else: # else:
log.info('Hosted tmp with subdirectory and filename not found') # log.info('Hosted tmp with subdirectory and filename not found')
return mk_resp(data=False, status_code=404, response=commons.response, status_message='The hosted tmp file was not found.') # Not Found # return mk_resp(data=False, status_code=404, response=commons.response, status_message='The hosted tmp file was not found.') # Not Found
return FileResponse(hosted_tmp_w_subdir_filename, filename=filename) # return FileResponse(hosted_tmp_w_subdir_filename, filename=filename)
# ### END ### API Hosted File ### download_tmp() ### # # ### END ### API Hosted File ### download_tmp() ###
# # ### BEGIN ### API Hosted File Route ### convert_file() ### # # ### BEGIN ### API Hosted File Route ### convert_file() ###