diff --git a/app/lib_general_v3.py b/app/lib_general_v3.py index 53328a0..c872cd8 100644 --- a/app/lib_general_v3.py +++ b/app/lib_general_v3.py @@ -30,8 +30,6 @@ from pydantic import ( BaseModel, Field, ValidationError, - computed_field, - model_validator, ) # Internal imports (from this project) diff --git a/app/log.py b/app/log.py index e8a2de3..7f1e892 100644 --- a/app/log.py +++ b/app/log.py @@ -1,4 +1,4 @@ -import functools, logging +import functools, logging, logging.config from app.config import settings diff --git a/app/routers/api_crud_v3.py b/app/routers/api_crud_v3.py index 7c213ac..53e5422 100644 --- a/app/routers/api_crud_v3.py +++ b/app/routers/api_crud_v3.py @@ -1,12 +1,20 @@ from fastapi import APIRouter, Depends, Header, HTTPException, Path, Query, Request, Response, status from typing import Dict, List, Optional, Set, Union import json -import urllib +import urllib.parse +import time +import asyncio import logging log = logging.getLogger(__name__) -from app.lib_general import Common_Route_Params, common_route_params +from app.lib_general_v3 import ( + AccountContext, get_account_context, + PaginationParams, get_pagination_params, + StatusFilterParams, get_status_filter_params, + SerializationParams, get_serialization_params, + DelayParams, get_delay_params +) from app.models.response_models import * from app.ae_obj_types_def import obj_type_kv_li from app.db_sql import redis_lookup_id_random, sql_select, sql_insert, sql_update, sql_delete, get_id_random @@ -14,10 +22,15 @@ from app.db_sql import redis_lookup_id_random, sql_select, sql_insert, sql_updat router = APIRouter() @router.get("/health", response_model=Resp_Body_Base) -async def health_check(): +async def health_check( + delay: DelayParams = Depends(get_delay_params), + ): """ Health check endpoint for V3 API. """ + if delay.sleep_time_s > 0: + await asyncio.sleep(delay.sleep_time_s) + log.setLevel(logging.INFO) log.info("V3 Health Check Endpoint Hit") return mk_resp(data={"status": "V3 API is healthy!"}) @@ -25,9 +38,12 @@ async def health_check(): @router.get('/{obj_type_l1}/{obj_id}', response_model=Resp_Body_Base) async def get_obj( + response: Response, obj_type_l1: str = Path(min_length=2, max_length=50), obj_id: str = Path(min_length=11, max_length=22), - commons: Common_Route_Params = Depends(common_route_params), + account: AccountContext = Depends(get_account_context), + serialization: SerializationParams = Depends(get_serialization_params), + delay: DelayParams = Depends(get_delay_params), ): """ Get a single top-level object by its random ID. @@ -35,40 +51,47 @@ async def get_obj( - /v3/crud/journal/{journal_id} - /v3/crud/account/{account_id} """ + if delay.sleep_time_s > 0: + await asyncio.sleep(delay.sleep_time_s) + log.setLevel(logging.WARNING) log.debug(locals()) obj_name = obj_type_l1 if obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Object type '{obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Object type '{obj_name}' not found.") obj_cfg = obj_type_kv_li[obj_name] table_name = obj_cfg.get('tbl_default', obj_cfg.get('tbl')) base_name = obj_cfg.get('mdl_default', obj_cfg.get('mdl')) if not table_name or not base_name: - return mk_resp(data=False, status_code=500, response=commons.response, status_message=f"Configuration for object type '{obj_name}' is incomplete.") + return mk_resp(data=False, status_code=500, response=response, status_message=f"Configuration for object type '{obj_name}' is incomplete.") record_id = redis_lookup_id_random(record_id_random=obj_id, table_name=obj_name) if not record_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Object with ID '{obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Object with ID '{obj_id}' not found.") if sql_result := sql_select(table_name=table_name, record_id=record_id): - resp_data = base_name(**sql_result).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) - return mk_resp(data=resp_data, response=commons.response) + resp_data = base_name(**sql_result).dict(by_alias=serialization.by_alias, exclude_unset=serialization.exclude_unset) + return mk_resp(data=resp_data, response=response) else: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Object with ID '{obj_id}' not found in database.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Object with ID '{obj_id}' not found in database.") @router.get('/{obj_type_l1}/', response_model=Resp_Body_Base) async def get_obj_li( + response: Response, obj_type_l1: str, for_obj_type: Optional[str] = None, for_obj_id: Optional[str] = None, - hidden: str = 'not_hidden', order_by_li: Optional[str] = None, jp: Optional[Union[str, None]] = None, - commons: Common_Route_Params = Depends(common_route_params), + account: AccountContext = Depends(get_account_context), + pagination: PaginationParams = Depends(get_pagination_params), + status_filter: StatusFilterParams = Depends(get_status_filter_params), + serialization: SerializationParams = Depends(get_serialization_params), + delay: DelayParams = Depends(get_delay_params), ): """ Get a list of top-level objects. @@ -77,6 +100,9 @@ async def get_obj_li( - /v3/crud/journal/?for_obj_type=account&for_obj_id={account_id_random} - /v3/crud/journal/?jp={"qry":[{"type":"AND","field":"for_type","operator":"=","value":"user"},{"type":"AND","field":"for_id","operator":"=","value":}]} """ + if delay.sleep_time_s > 0: + await asyncio.sleep(delay.sleep_time_s) + log.setLevel(logging.WARNING) log.debug(locals()) @@ -94,7 +120,7 @@ async def get_obj_li( jp_obj = json.loads(urllib.parse.unquote(jp)) except Exception as e: log.warning(e) - return mk_resp(data=False, status_code=400, response=commons.response, status_message='The JSON string was not formatted correctly.') + return mk_resp(data=False, status_code=400, response=response, status_message='The JSON string was not formatted correctly.') if jp_obj.get('qry'): qry_dict_li = jp_obj['qry'] @@ -114,20 +140,20 @@ async def get_obj_li( obj_name = obj_type_l1 if obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Object type '{obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Object type '{obj_name}' not found.") obj_cfg = obj_type_kv_li[obj_name] table_name = obj_cfg.get('tbl_default', obj_cfg.get('tbl')) base_name = obj_cfg.get('mdl_default', obj_cfg.get('mdl')) if not table_name or not base_name: - return mk_resp(data=False, status_code=500, response=commons.response, status_message=f"Configuration for object type '{obj_name}' is incomplete.") + return mk_resp(data=False, status_code=500, response=response, status_message=f"Configuration for object type '{obj_name}' is incomplete.") if for_obj_type and for_obj_id: # Resolve random ID to integer ID resolved_for_obj_id = redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type) if not resolved_for_obj_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Parent object with ID '{for_obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Parent object with ID '{for_obj_id}' not found.") field_name = f'{for_obj_type}_id' # Assuming convention like 'account_id' for for_obj_type='account' @@ -135,8 +161,8 @@ async def get_obj_li( table_name=table_name, field_name=field_name, field_value=resolved_for_obj_id, - enabled=commons.enabled, - hidden=hidden, + enabled=status_filter.enabled, + hidden=status_filter.hidden, qry_dict_li=qry_dict_li, fulltext_qry_dict=fulltext_qry_dict_obj, and_qry_dict=and_qry_dict_obj, @@ -144,15 +170,15 @@ async def get_obj_li( or_like_dict=or_like_dict_obj, and_in_dict_li=and_in_dict_li_obj, order_by_li=order_by_li, - limit=commons.limit, - offset=commons.offset, + limit=pagination.limit, + offset=pagination.offset, as_list=True, ) else: sql_result = sql_select( table_name=table_name, - enabled=commons.enabled, - hidden=hidden, + enabled=status_filter.enabled, + hidden=status_filter.hidden, qry_dict_li=qry_dict_li, fulltext_qry_dict=fulltext_qry_dict_obj, and_qry_dict=and_qry_dict_obj, @@ -160,33 +186,39 @@ async def get_obj_li( or_like_dict=or_like_dict_obj, and_in_dict_li=and_in_dict_li_obj, order_by_li=order_by_li, - limit=commons.limit, - offset=commons.offset, + limit=pagination.limit, + offset=pagination.offset, as_list=True, ) if sql_result: resp_data_li = [] for record in sql_result: - resp_data = base_name(**record).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) + resp_data = base_name(**record).dict(by_alias=serialization.by_alias, exclude_unset=serialization.exclude_unset) resp_data_li.append(resp_data) - return mk_resp(data=resp_data_li, response=commons.response) + return mk_resp(data=resp_data_li, response=response) else: - return mk_resp(data=[], status_code=200, response=commons.response) # Return empty list on no results + return mk_resp(data=[], status_code=200, response=response) # Return empty list on no results @router.post('/{obj_type_l1}/', response_model=Resp_Body_Base) async def post_obj( request: Request, + response: Response, obj_type_l1: str = Path(min_length=2, max_length=50), return_obj: Optional[bool] = True, - commons: Common_Route_Params = Depends(common_route_params), + account: AccountContext = Depends(get_account_context), + serialization: SerializationParams = Depends(get_serialization_params), + delay: DelayParams = Depends(get_delay_params), ): """ Create a new top-level object. Examples: - POST /v3/crud/journal/ (with Journal_Base in body) """ + if delay.sleep_time_s > 0: + await asyncio.sleep(delay.sleep_time_s) + log.setLevel(logging.WARNING) log.debug(locals()) @@ -194,7 +226,7 @@ async def post_obj( obj_name = obj_type_l1 if obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Object type '{obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Object type '{obj_name}' not found.") obj_cfg = obj_type_kv_li[obj_name] table_name_insert = obj_cfg.get('tbl_update', obj_cfg.get('tbl')) @@ -203,14 +235,14 @@ async def post_obj( output_model = obj_cfg.get('mdl_out', obj_cfg.get('mdl_default', obj_cfg.get('mdl'))) if not table_name_insert or not input_model or not table_name_select or not output_model: - return mk_resp(data=False, status_code=500, response=commons.response, status_message=f"Configuration for object type '{obj_name}' is incomplete.") + return mk_resp(data=False, status_code=500, response=response, status_message=f"Configuration for object type '{obj_name}' is incomplete.") # Validate incoming data with the appropriate Pydantic model try: validated_obj = input_model(**obj_data) except Exception as e: log.warning(f"Validation error for {obj_name}: {e}") - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Validation error: {e}") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Validation error: {e}") # Convert to dict, excluding unset fields, for database insertion data_to_insert = validated_obj.dict(exclude_unset=True) @@ -221,29 +253,35 @@ async def post_obj( if return_obj: if sql_select_result := sql_select(table_name=table_name_select, record_id=new_obj_id): - resp_data = output_model(**sql_select_result).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) - return mk_resp(data=resp_data, response=commons.response) + resp_data = output_model(**sql_select_result).dict(by_alias=serialization.by_alias, exclude_unset=serialization.exclude_unset) + return mk_resp(data=resp_data, response=response) else: - return mk_resp(data={"obj_id": new_obj_id, "obj_id_random": new_obj_id_random}, status_code=404, response=commons.response, status_message="Object created but could not be retrieved.") + return mk_resp(data={"obj_id": new_obj_id, "obj_id_random": new_obj_id_random}, status_code=404, response=response, status_message="Object created but could not be retrieved.") else: - return mk_resp(data={"obj_id": new_obj_id, "obj_id_random": new_obj_id_random}, response=commons.response) + return mk_resp(data={"obj_id": new_obj_id, "obj_id_random": new_obj_id_random}, response=response) else: - return mk_resp(data=False, status_code=400, response=commons.response, status_message="Failed to create object in database.") + return mk_resp(data=False, status_code=400, response=response, status_message="Failed to create object in database.") @router.patch('/{obj_type_l1}/{obj_id}', response_model=Resp_Body_Base) async def patch_obj( request: Request, + response: Response, obj_type_l1: str = Path(min_length=2, max_length=50), obj_id: str = Path(min_length=11, max_length=22), return_obj: Optional[bool] = True, - commons: Common_Route_Params = Depends(common_route_params), + account: AccountContext = Depends(get_account_context), + serialization: SerializationParams = Depends(get_serialization_params), + delay: DelayParams = Depends(get_delay_params), ): """ Update a top-level object. Examples: - PATCH /v3/crud/journal/{journal_id} (with Journal_Base fields in body) """ + if delay.sleep_time_s > 0: + await asyncio.sleep(delay.sleep_time_s) + log.setLevel(logging.WARNING) log.debug(locals()) @@ -251,7 +289,7 @@ async def patch_obj( obj_name = obj_type_l1 if obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Object type '{obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Object type '{obj_name}' not found.") obj_cfg = obj_type_kv_li[obj_name] table_name_update = obj_cfg.get('tbl_update', obj_cfg.get('tbl')) @@ -260,11 +298,11 @@ async def patch_obj( output_model = obj_cfg.get('mdl_out', obj_cfg.get('mdl_default', obj_cfg.get('mdl'))) if not table_name_update or not input_model or not table_name_select or not output_model: - return mk_resp(data=False, status_code=500, response=commons.response, status_message=f"Configuration for object type '{obj_name}' is incomplete.") + return mk_resp(data=False, status_code=500, response=response, status_message=f"Configuration for object type '{obj_name}' is incomplete.") record_id = redis_lookup_id_random(record_id_random=obj_id, table_name=obj_name) if not record_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Object with ID '{obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Object with ID '{obj_id}' not found.") # Validate incoming data with the appropriate Pydantic model. # For PATCH, we don't want to fail on missing fields, so we don't validate like in POST. @@ -275,65 +313,77 @@ async def patch_obj( if return_obj: if sql_select_result := sql_select(table_name=table_name_select, record_id=record_id): - resp_data = output_model(**sql_select_result).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) - return mk_resp(data=resp_data, response=commons.response) + resp_data = output_model(**sql_select_result).dict(by_alias=serialization.by_alias, exclude_unset=serialization.exclude_unset) + return mk_resp(data=resp_data, response=response) else: - return mk_resp(data=True, status_code=404, response=commons.response, status_message="Object updated but could not be retrieved.") + return mk_resp(data=True, status_code=404, response=response, status_message="Object updated but could not be retrieved.") else: - return mk_resp(data=True, response=commons.response, status_message="Object updated successfully.") + return mk_resp(data=True, response=response, status_message="Object updated successfully.") else: - return mk_resp(data=False, status_code=400, response=commons.response, status_message="Failed to update object in database. It may not have been found, or the data was invalid.") + return mk_resp(data=False, status_code=400, response=response, status_message="Failed to update object in database. It may not have been found, or the data was invalid.") @router.delete('/{obj_type_l1}/{obj_id}', response_model=Resp_Body_Base) async def delete_obj( + response: Response, obj_type_l1: str = Path(min_length=2, max_length=50), obj_id: str = Path(min_length=11, max_length=22), - commons: Common_Route_Params = Depends(common_route_params), + account: AccountContext = Depends(get_account_context), + delay: DelayParams = Depends(get_delay_params), ): """ Delete a top-level object. Examples: - DELETE /v3/crud/journal/{journal_id} """ + if delay.sleep_time_s > 0: + await asyncio.sleep(delay.sleep_time_s) + log.setLevel(logging.WARNING) log.debug(locals()) obj_name = obj_type_l1 if obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Object type '{obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Object type '{obj_name}' not found.") obj_cfg = obj_type_kv_li[obj_name] table_name_delete = obj_cfg.get('tbl_update', obj_cfg.get('tbl')) if not table_name_delete: - return mk_resp(data=False, status_code=500, response=commons.response, status_message=f"Configuration for object type '{obj_name}' is incomplete (missing table for deletion).") + return mk_resp(data=False, status_code=500, response=response, status_message=f"Configuration for object type '{obj_name}' is incomplete (missing table for deletion).") record_id = redis_lookup_id_random(record_id_random=obj_id, table_name=obj_name) if not record_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Object with ID '{obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Object with ID '{obj_id}' not found.") if sql_delete_result := sql_delete(table_name=table_name_delete, record_id=record_id): - return mk_resp(data=True, response=commons.response, status_message=f"Object with ID '{obj_id}' deleted successfully.") + return mk_resp(data=True, response=response, status_message=f"Object with ID '{obj_id}' deleted successfully.") else: - return mk_resp(data=False, status_code=400, response=commons.response, status_message="Failed to delete object in database. It may not have been found.") + return mk_resp(data=False, status_code=400, response=response, status_message="Failed to delete object in database. It may not have been found.") @router.get('/{parent_obj_type}/{parent_obj_id}/{child_obj_type}/', response_model=Resp_Body_Base) async def get_child_obj_li( + response: Response, parent_obj_type: str, parent_obj_id: str, child_obj_type: str, - hidden: str = 'not_hidden', order_by_li: Optional[str] = None, jp: Optional[Union[str, None]] = None, - commons: Common_Route_Params = Depends(common_route_params), + account: AccountContext = Depends(get_account_context), + pagination: PaginationParams = Depends(get_pagination_params), + status_filter: StatusFilterParams = Depends(get_status_filter_params), + serialization: SerializationParams = Depends(get_serialization_params), + delay: DelayParams = Depends(get_delay_params), ): """ Get a list of child objects belonging to a parent. Examples: - /v3/crud/journal/{journal_id}/journal_entry/ """ + if delay.sleep_time_s > 0: + await asyncio.sleep(delay.sleep_time_s) + log.setLevel(logging.WARNING) log.debug(locals()) @@ -357,7 +407,7 @@ async def get_child_obj_li( jp_obj = json.loads(urllib.parse.unquote(jp)) except Exception as e: log.warning(e) - return mk_resp(data=False, status_code=400, response=commons.response, status_message='The JSON string was not formatted correctly.') + return mk_resp(data=False, status_code=400, response=response, status_message='The JSON string was not formatted correctly.') if jp_obj.get('qry'): qry_dict_li = jp_obj['qry'] @@ -377,19 +427,19 @@ async def get_child_obj_li( obj_name = child_obj_type if obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Object type '{obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Object type '{obj_name}' not found.") obj_cfg = obj_type_kv_li[obj_name] table_name = obj_cfg.get('tbl_default', obj_cfg.get('tbl')) base_name = obj_cfg.get('mdl_default', obj_cfg.get('mdl')) if not table_name or not base_name: - return mk_resp(data=False, status_code=500, response=commons.response, status_message=f"Configuration for object type '{obj_name}' is incomplete.") + return mk_resp(data=False, status_code=500, response=response, status_message=f"Configuration for object type '{obj_name}' is incomplete.") # Resolve parent's random ID to integer ID resolved_parent_id = redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type) if not resolved_parent_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Parent object '{for_obj_type}' with ID '{for_obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Parent object '{for_obj_type}' with ID '{for_obj_id}' not found.") field_name = f'{for_obj_type}_id' # Assuming convention like 'journal_id' @@ -397,8 +447,8 @@ async def get_child_obj_li( table_name=table_name, field_name=field_name, field_value=resolved_parent_id, - enabled=commons.enabled, - hidden=hidden, + enabled=status_filter.enabled, + hidden=status_filter.hidden, qry_dict_li=qry_dict_li, fulltext_qry_dict=fulltext_qry_dict_obj, and_qry_dict=and_qry_dict_obj, @@ -406,35 +456,41 @@ async def get_child_obj_li( or_like_dict=or_like_dict_obj, and_in_dict_li=and_in_dict_li_obj, order_by_li=order_by_li, - limit=commons.limit, - offset=commons.offset, + limit=pagination.limit, + offset=pagination.offset, as_list=True, ) if sql_result: resp_data_li = [] for record in sql_result: - resp_data = base_name(**record).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) + resp_data = base_name(**record).dict(by_alias=serialization.by_alias, exclude_unset=serialization.exclude_unset) resp_data_li.append(resp_data) - return mk_resp(data=resp_data_li, response=commons.response) + return mk_resp(data=resp_data_li, response=response) else: - return mk_resp(data=[], status_code=200, response=commons.response) # Return empty list on no results + return mk_resp(data=[], status_code=200, response=response) # Return empty list on no results @router.post('/{parent_obj_type}/{parent_obj_id}/{child_obj_type}/', response_model=Resp_Body_Base) async def post_child_obj( request: Request, + response: Response, parent_obj_type: str = Path(min_length=2, max_length=50), parent_obj_id: str = Path(min_length=11, max_length=22), child_obj_type: str = Path(min_length=2, max_length=50), return_obj: Optional[bool] = True, - commons: Common_Route_Params = Depends(common_route_params), + account: AccountContext = Depends(get_account_context), + serialization: SerializationParams = Depends(get_serialization_params), + delay: DelayParams = Depends(get_delay_params), ): """ Create a new child object for a given parent. Examples: - POST /v3/crud/journal/{journal_id}/journal_entry/ (with Journal_Entry_Base in body) """ + if delay.sleep_time_s > 0: + await asyncio.sleep(delay.sleep_time_s) + log.setLevel(logging.WARNING) log.debug(locals()) @@ -444,13 +500,13 @@ async def post_child_obj( child_obj_name = child_obj_type if parent_obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Parent object type '{parent_obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Parent object type '{parent_obj_name}' not found.") if child_obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Child object type '{child_obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Child object type '{child_obj_name}' not found.") resolved_parent_id = redis_lookup_id_random(record_id_random=parent_obj_id, table_name=parent_obj_name) if not resolved_parent_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Parent object '{parent_obj_name}' with ID '{parent_obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Parent object '{parent_obj_name}' with ID '{parent_obj_id}' not found.") obj_cfg = obj_type_kv_li[child_obj_name] table_name_insert = obj_cfg.get('tbl_update', obj_cfg.get('tbl')) @@ -459,7 +515,7 @@ async def post_child_obj( output_model = obj_cfg.get('mdl_out', obj_cfg.get('mdl_default', obj_cfg.get('mdl'))) if not table_name_insert or not input_model or not table_name_select or not output_model: - return mk_resp(data=False, status_code=500, response=commons.response, status_message=f"Configuration for child object type '{child_obj_name}' is incomplete.") + return mk_resp(data=False, status_code=500, response=response, status_message=f"Configuration for child object type '{child_obj_name}' is incomplete.") # Inject the parent ID into the child object's data parent_fk_field_name = f'{parent_obj_name}_id' @@ -470,7 +526,7 @@ async def post_child_obj( validated_obj = input_model(**obj_data) except Exception as e: log.warning(f"Validation error for {child_obj_name}: {e}") - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Validation error: {e}") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Validation error: {e}") # Convert to dict, excluding unset fields, for database insertion data_to_insert = validated_obj.dict(exclude_unset=True) @@ -481,29 +537,35 @@ async def post_child_obj( if return_obj: if sql_select_result := sql_select(table_name=table_name_select, record_id=new_obj_id): - resp_data = output_model(**sql_select_result).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) - return mk_resp(data=resp_data, response=commons.response) + resp_data = output_model(**sql_select_result).dict(by_alias=serialization.by_alias, exclude_unset=serialization.exclude_unset) + return mk_resp(data=resp_data, response=response) else: - return mk_resp(data={"obj_id": new_obj_id, "obj_id_random": new_obj_id_random}, status_code=404, response=commons.response, status_message="Child object created but could not be retrieved.") + return mk_resp(data={"obj_id": new_obj_id, "obj_id_random": new_obj_id_random}, status_code=404, response=response, status_message="Child object created but could not be retrieved.") else: - return mk_resp(data={"obj_id": new_obj_id, "obj_id_random": new_obj_id_random}, response=commons.response) + return mk_resp(data={"obj_id": new_obj_id, "obj_id_random": new_obj_id_random}, response=response) else: - return mk_resp(data=False, status_code=400, response=commons.response, status_message="Failed to create child object in database.") + return mk_resp(data=False, status_code=400, response=response, status_message="Failed to create child object in database.") @router.get('/{parent_obj_type}/{parent_obj_id}/{child_obj_type}/{child_obj_id}', response_model=Resp_Body_Base) async def get_child_obj( + response: Response, parent_obj_type: str = Path(min_length=2, max_length=50), parent_obj_id: str = Path(min_length=11, max_length=22), child_obj_type: str = Path(min_length=2, max_length=50), child_obj_id: str = Path(min_length=11, max_length=22), - commons: Common_Route_Params = Depends(common_route_params), + account: AccountContext = Depends(get_account_context), + serialization: SerializationParams = Depends(get_serialization_params), + delay: DelayParams = Depends(get_delay_params), ): """ Get a single child object by its ID, ensuring it belongs to the correct parent. Examples: - /v3/crud/journal/{journal_id}/journal_entry/{entry_id} """ + if delay.sleep_time_s > 0: + await asyncio.sleep(delay.sleep_time_s) + log.setLevel(logging.WARNING) log.debug(locals()) @@ -511,52 +573,58 @@ async def get_child_obj( child_obj_name = child_obj_type if parent_obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Parent object type '{parent_obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Parent object type '{parent_obj_name}' not found.") if child_obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Child object type '{child_obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Child object type '{child_obj_name}' not found.") resolved_parent_id = redis_lookup_id_random(record_id_random=parent_obj_id, table_name=parent_obj_name) if not resolved_parent_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Parent object '{parent_obj_name}' with ID '{parent_obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Parent object '{parent_obj_name}' with ID '{parent_obj_id}' not found.") obj_cfg = obj_type_kv_li[child_obj_name] table_name = obj_cfg.get('tbl_default', obj_cfg.get('tbl')) base_name = obj_cfg.get('mdl_default', obj_cfg.get('mdl')) if not table_name or not base_name: - return mk_resp(data=False, status_code=500, response=commons.response, status_message=f"Configuration for object type '{child_obj_name}' is incomplete.") + return mk_resp(data=False, status_code=500, response=response, status_message=f"Configuration for object type '{child_obj_name}' is incomplete.") resolved_child_id = redis_lookup_id_random(record_id_random=child_obj_id, table_name=child_obj_name) if not resolved_child_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Child object with ID '{child_obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Child object with ID '{child_obj_id}' not found.") if sql_result := sql_select(table_name=table_name, record_id=resolved_child_id): # Verify the child belongs to the parent parent_fk_field_name = f'{parent_obj_name}_id' if sql_result.get(parent_fk_field_name) != resolved_parent_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Child object '{child_obj_id}' not found under parent '{parent_obj_id}'.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Child object '{child_obj_id}' not found under parent '{parent_obj_id}'.") - resp_data = base_name(**sql_result).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) - return mk_resp(data=resp_data, response=commons.response) + resp_data = base_name(**sql_result).dict(by_alias=serialization.by_alias, exclude_unset=serialization.exclude_unset) + return mk_resp(data=resp_data, response=response) else: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Child object with ID '{child_obj_id}' not found in database.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Child object with ID '{child_obj_id}' not found in database.") @router.patch('/{parent_obj_type}/{parent_obj_id}/{child_obj_type}/{child_obj_id}', response_model=Resp_Body_Base) async def patch_child_obj( request: Request, + response: Response, parent_obj_type: str = Path(min_length=2, max_length=50), parent_obj_id: str = Path(min_length=11, max_length=22), child_obj_type: str = Path(min_length=2, max_length=50), child_obj_id: str = Path(min_length=11, max_length=22), return_obj: Optional[bool] = True, - commons: Common_Route_Params = Depends(common_route_params), + account: AccountContext = Depends(get_account_context), + serialization: SerializationParams = Depends(get_serialization_params), + delay: DelayParams = Depends(get_delay_params), ): """ Update a child object by its ID, ensuring it belongs to the correct parent. Examples: - PATCH /v3/crud/journal/{journal_id}/journal_entry/{entry_id} """ + if delay.sleep_time_s > 0: + await asyncio.sleep(delay.sleep_time_s) + log.setLevel(logging.WARNING) log.debug(locals()) @@ -566,18 +634,18 @@ async def patch_child_obj( child_obj_name = child_obj_type if parent_obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Parent object type '{parent_obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Parent object type '{parent_obj_name}' not found.") if child_obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Child object type '{child_obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Child object type '{child_obj_name}' not found.") # Resolve IDs resolved_parent_id = redis_lookup_id_random(record_id_random=parent_obj_id, table_name=parent_obj_name) if not resolved_parent_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Parent object '{parent_obj_name}' with ID '{parent_obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Parent object '{parent_obj_name}' with ID '{parent_obj_id}' not found.") resolved_child_id = redis_lookup_id_random(record_id_random=child_obj_id, table_name=child_obj_name) if not resolved_child_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Child object '{child_obj_name}' with ID '{child_obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Child object '{child_obj_name}' with ID '{child_obj_id}' not found.") # Get config for child object obj_cfg = obj_type_kv_li[child_obj_name] @@ -586,15 +654,15 @@ async def patch_child_obj( output_model = obj_cfg.get('mdl_out', obj_cfg.get('mdl_default', obj_cfg.get('mdl'))) if not table_name_update or not table_name_select or not output_model: - return mk_resp(data=False, status_code=500, response=commons.response, status_message=f"Configuration for child object type '{child_obj_name}' is incomplete.") + return mk_resp(data=False, status_code=500, response=response, status_message=f"Configuration for child object type '{child_obj_name}' is incomplete.") # Verify parentage before updating if existing_child := sql_select(table_name=table_name_select, record_id=resolved_child_id): parent_fk_field_name = f'{parent_obj_name}_id' if existing_child.get(parent_fk_field_name) != resolved_parent_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Child object '{child_obj_id}' not found under parent '{parent_obj_id}'.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Child object '{child_obj_id}' not found under parent '{parent_obj_id}'.") else: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Child object '{child_obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Child object '{child_obj_id}' not found.") # The sql_update function will only update the fields provided in the dict. data_to_update = obj_data @@ -602,29 +670,34 @@ async def patch_child_obj( if sql_update(data=data_to_update, table_name=table_name_update, record_id=resolved_child_id): if return_obj: if updated_child := sql_select(table_name=table_name_select, record_id=resolved_child_id): - resp_data = output_model(**updated_child).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) - return mk_resp(data=resp_data, response=commons.response) + resp_data = output_model(**updated_child).dict(by_alias=serialization.by_alias, exclude_unset=serialization.exclude_unset) + return mk_resp(data=resp_data, response=response) else: - return mk_resp(data=True, status_code=404, response=commons.response, status_message="Object updated but could not be retrieved post-update.") + return mk_resp(data=True, status_code=404, response=response, status_message="Object updated but could not be retrieved post-update.") else: - return mk_resp(data=True, response=commons.response, status_message="Object updated successfully.") + return mk_resp(data=True, response=response, status_message="Object updated successfully.") else: - return mk_resp(data=False, status_code=400, response=commons.response, status_message="Failed to update object in database.") + return mk_resp(data=False, status_code=400, response=response, status_message="Failed to update object in database.") @router.delete('/{parent_obj_type}/{parent_obj_id}/{child_obj_type}/{child_obj_id}', response_model=Resp_Body_Base) async def delete_child_obj( + response: Response, parent_obj_type: str = Path(min_length=2, max_length=50), parent_obj_id: str = Path(min_length=11, max_length=22), child_obj_type: str = Path(min_length=2, max_length=50), child_obj_id: str = Path(min_length=11, max_length=22), - commons: Common_Route_Params = Depends(common_route_params), + account: AccountContext = Depends(get_account_context), + delay: DelayParams = Depends(get_delay_params), ): """ Delete a child object by its ID, ensuring it belongs to the correct parent. Examples: - DELETE /v3/crud/journal/{journal_id}/journal_entry/{entry_id} """ + if delay.sleep_time_s > 0: + await asyncio.sleep(delay.sleep_time_s) + log.setLevel(logging.WARNING) log.debug(locals()) @@ -632,18 +705,18 @@ async def delete_child_obj( child_obj_name = child_obj_type if parent_obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Parent object type '{parent_obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Parent object type '{parent_obj_name}' not found.") if child_obj_name not in obj_type_kv_li: - return mk_resp(data=False, status_code=400, response=commons.response, status_message=f"Child object type '{child_obj_name}' not found.") + return mk_resp(data=False, status_code=400, response=response, status_message=f"Child object type '{child_obj_name}' not found.") # Resolve IDs resolved_parent_id = redis_lookup_id_random(record_id_random=parent_obj_id, table_name=parent_obj_name) if not resolved_parent_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Parent object '{parent_obj_name}' with ID '{parent_obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Parent object '{parent_obj_name}' with ID '{parent_obj_id}' not found.") resolved_child_id = redis_lookup_id_random(record_id_random=child_obj_id, table_name=child_obj_name) if not resolved_child_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Child object '{child_obj_name}' with ID '{child_obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Child object '{child_obj_name}' with ID '{child_obj_id}' not found.") # Get config for child object obj_cfg = obj_type_kv_li[child_obj_name] @@ -651,26 +724,18 @@ async def delete_child_obj( table_name_select = obj_cfg.get('tbl_default', obj_cfg.get('tbl')) # For verification if not table_name_delete or not table_name_select: - return mk_resp(data=False, status_code=500, response=commons.response, status_message=f"Configuration for child object type '{child_obj_name}' is incomplete.") + return mk_resp(data=False, status_code=500, response=response, status_message=f"Configuration for child object type '{child_obj_name}' is incomplete.") # Verify parentage before deleting if existing_child := sql_select(table_name=table_name_select, record_id=resolved_child_id): parent_fk_field_name = f'{parent_obj_name}_id' if existing_child.get(parent_fk_field_name) != resolved_parent_id: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Child object '{child_obj_id}' not found under parent '{parent_obj_id}'.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Child object '{child_obj_id}' not found under parent '{parent_obj_id}'.") else: - return mk_resp(data=False, status_code=404, response=commons.response, status_message=f"Child object '{child_obj_id}' not found.") + return mk_resp(data=False, status_code=404, response=response, status_message=f"Child object '{child_obj_id}' not found.") # If verification passes, delete the object if sql_delete(table_name=table_name_delete, record_id=resolved_child_id): - return mk_resp(data=True, response=commons.response, status_message=f"Object with ID '{child_obj_id}' deleted successfully.") + return mk_resp(data=True, response=response, status_message=f"Object with ID '{child_obj_id}' deleted successfully.") else: - return mk_resp(data=False, status_code=400, response=commons.response, status_message="Failed to delete object in database.") - - - - - - - - + return mk_resp(data=False, status_code=400, response=response, status_message="Failed to delete object in database.") \ No newline at end of file