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

Minor changes and fixes.

Browse Source
This commit is contained in:
Scott Idem
2022-10-12 19:07:08 -04:00
parent 6cfd76c788
commit a1f5a996ae
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/event_device_models.py
View File

@@ -44,11 +44,11 @@ class Event_Device_Base(BaseModel):
api_secret_key: Optional[str] api_secret_key: Optional[str]
api_server_base_url: Optional[str] api_base_url: Optional[str]
app_server_base_url: Optional[str] app_server_base_url: Optional[str]
file_server_base_url: Optional[str] file_server_base_url: Optional[str]
api_server_base_url_bak: Optional[str] # Backup URL api_base_url_bak: Optional[str] # Backup URL
app_server_base_url_bak: Optional[str] # Backup URL app_server_base_url_bak: Optional[str] # Backup URL
file_server_base_url_bak: Optional[str] # Backup URL file_server_base_url_bak: Optional[str] # Backup URL
@@ -71,7 +71,7 @@ class Event_Device_Base(BaseModel):
trigger_show_admin: Optional[str] trigger_show_admin: Optional[str]
trigger_show_hidden: Optional[str] trigger_show_hidden: Optional[str]
host_file_cache_path: Optional[str] # Path for hash file cache only local_file_cache_path: Optional[str] # Path for hash file cache only
host_file_temp_path: Optional[str] # Path for copied and renamed temporary files from hash file cache directory host_file_temp_path: Optional[str] # Path for copied and renamed temporary files from hash file cache directory
recording_path: Optional[str] # Path to save recordings recording_path: Optional[str] # Path to save recordings

2
app/routers/event_device.py
View File

@@ -141,7 +141,7 @@ async def get_event_device_obj(
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.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
# ### SECTION ### Secondary data validation # ### SECTION ### Secondary data validation

3
app/routers/event_file.py
View File

@@ -279,10 +279,11 @@ async def download_event_file(
log.info(f'Full file path with subdirectory: {file_path_w_subdir}') log.info(f'Full file path with subdirectory: {file_path_w_subdir}')
if os.path.exists(file_path_w_subdir): if os.path.exists(file_path_w_subdir):
log.info('Hosted file found on server.')
return FileResponse(file_path_w_subdir, filename=filename) return FileResponse(file_path_w_subdir, filename=filename)
else: else:
log.error(f'The hosted file was not found on the server. Hash: {hash_sha256}') log.error(f'The hosted file was not found on the server. Hash: {hash_sha256}')
return mk_resp(data=False, status_code=400, response=commons.response, status_message='The hosted file was not found on the server.') # Bad Request return mk_resp(data=False, status_code=404, response=commons.response, status_message=f'The hosted file was not found on the server. Hash: {hash_sha256}') # Not Found
# ### END ### API Event File ### download_event_file() ### # ### END ### API Event File ### download_event_file() ###