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

Minor changes. Less debug

Browse Source
This commit is contained in:
Scott Idem
2024-02-26 16:23:09 -05:00
parent 8c774733ef
commit 4a05a30848
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/lib_general.py
View File

@@ -126,6 +126,7 @@ class Common_Route_Params:
def common_route_params( def common_route_params(
# x_account_id: str = Header(..., min_length=11, max_length=22), # NOTE WARNING: Commented out 2023-08-17 # x_account_id: str = Header(..., min_length=11, max_length=22), # NOTE WARNING: Commented out 2023-08-17
x_account_id: str = Header(None, min_length=11, max_length=22), # NOTE WARNING: Changed to this 2023-08-17 x_account_id: str = Header(None, min_length=11, max_length=22), # NOTE WARNING: Changed to this 2023-08-17
x_no_account_id: str = Header(None, min_length=11, max_length=22), # NOTE WARNING: Changed to this 2023-08-17
# x_aether_api_key: Optional[str] = Header(..., min_length=11, max_length=22), # x_aether_api_key: Optional[str] = Header(..., min_length=11, max_length=22),
# x_aether_api_token: Optional[str] = Header(..., min_length=11, max_length=22), # x_aether_api_token: Optional[str] = Header(..., min_length=11, max_length=22),
# x_aether_jwt_token: Optional[str] = Header(..., min_length=11, max_length=50), # x_aether_jwt_token: Optional[str] = Header(..., min_length=11, max_length=50),
@@ -141,7 +142,7 @@ def common_route_params(
# exclude: Optional[list] = [], # Leaving this and include commented out # exclude: Optional[list] = [], # Leaving this and include commented out
# include: Optional[list] = [], # Leaving this and exclude commented out # include: Optional[list] = [], # Leaving this and exclude commented out
response: Response = Response, response: Response = Response,
log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log_lvl: int = logging.INFO, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
) -> Common_Route_Params: ) -> Common_Route_Params:
log.setLevel(log_lvl) log.setLevel(log_lvl)
log.debug(locals()) log.debug(locals())
@@ -150,8 +151,18 @@ def common_route_params(
x_account_id_random = x_account_id x_account_id_random = x_account_id
if x_account_id := redis_lookup_id_random(table_name='account', record_id_random=x_account_id): if x_account_id:
log.info(f'Found the x-account-id header with the value: {x_account_id}') if x_account_id := redis_lookup_id_random(table_name='account', record_id_random=x_account_id):
log.info(f'Found the x-account-id header with the value: {x_account_id}')
else:
log.warning(f'The x-account-id header was found, but the Account ID was not found or is not valid. Account ID: {x_account_id}')
raise HTTPException(status_code=403, detail='The x-account-id Account ID was not found.') # Forbidden
elif x_no_account_id and len(x_no_account_id) > 10:
log.warning(f'Found the x_no_account_id header param with the value: {x_no_account_id}')
x_account_id = 0
x_account_id_random = '--- NOT SET ---'
elif x_no_account_id_token and len(x_no_account_id_token) > 10: # NOTE: Not a header value! elif x_no_account_id_token and len(x_no_account_id_token) > 10: # NOTE: Not a header value!
# NOTE WARNING: This token should be varified and able to be disabled quickly. # NOTE WARNING: This token should be varified and able to be disabled quickly.
log.warning(f'Found the x_no_account_id_token URL param with the value: {x_no_account_id_token}') log.warning(f'Found the x_no_account_id_token URL param with the value: {x_no_account_id_token}')
@@ -162,9 +173,12 @@ def common_route_params(
else: else:
x_account_id = 0 x_account_id = 0
x_account_id_random = '' x_account_id_random = ''
x_account_id = 0
x_account_id_random = '--- NOT SET ---'
else: else:
log.warning(f'The x-account-id header was found, but the Account ID was not found or is not valid. Account ID: {x_account_id}') log.warning(f'The x-account-id and x-no-account-id-token headers were not found.')
raise HTTPException(status_code=403, detail='The x-account-id Account ID was not found.') # Forbidden raise HTTPException(status_code=403, detail='The x-account-id and x-no-account-id-token headers were not found.') # Forbidden
commons = Common_Route_Params( x_account_id=x_account_id, x_account_id_random=x_account_id_random, x_no_account_id_token=x_no_account_id_token, limit=limit, offset=offset, enabled=enabled, by_alias=by_alias, exclude_unset=exclude_unset, response=response ) commons = Common_Route_Params( x_account_id=x_account_id, x_account_id_random=x_account_id_random, x_no_account_id_token=x_no_account_id_token, limit=limit, offset=offset, enabled=enabled, by_alias=by_alias, exclude_unset=exclude_unset, response=response )

2
app/routers/api_crud.py
View File

@@ -374,7 +374,7 @@ async def get_obj_li(
log.info(f'base_name was found. Returning data using {base_name} model.') log.info(f'base_name was found. Returning data using {base_name} model.')
resp_data = base_name(**record).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) resp_data = base_name(**record).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset)
else: else:
log.info('base_name model was not found. Returning raw data.') log.warning('base_name model was not found. Returning raw data.')
resp_data = record resp_data = record
resp_data_li.append(resp_data) resp_data_li.append(resp_data)
return mk_resp(data=resp_data_li, response=commons.response) return mk_resp(data=resp_data_li, response=commons.response)