Returning proper error toasters when data not available for selected hierarchy.

scripts/core/engine/oee_aggregator.py

@@ -6,7 +6,7 @@ from scripts.config import DBConf
 from scripts.core.engine.oee_calculator import OEETagFinder, OEECalculator
 from scripts.core.handlers.common_handler import CommonHandler
 from scripts.db.mongo.schema.tag_hierarchy import GetTagsLists, OutputTagsList
-from scripts.errors import DataNotFound
+from scripts.errors import DataNotFound, ILensError
 from scripts.logging import logger
 from scripts.schemas.batch_oee import ChartResponse, ChartDBResponse, ChartRequest
 from scripts.utils.common_utils import CommonUtils
@@ -50,13 +50,13 @@ class OEEAggregator:
             output_tags_dict = self.common_handler.tag_hierarchy_handler.get_output_tags_for_oee(
                 input_data=OutputTagsList(**request_data.dict()))
             if not output_tags_dict or not output_tags_dict.get(request_data.hierarchy):
-                return {}
+                raise ILensError("Data not found for selected Filters!!!")
             cycle_time_tag_id = self.oee_tag_finder.get_cycle_time_tag_id(input_data=hierarchy_tags)
             cycle_time_value = self.common_handler.get_cycle_time_value_from_hierarchy(
                 tag_id=cycle_time_tag_id.split("$")[-1])
             if isinstance(cycle_time_value, bool) and not cycle_time_value:
                 logger.debug(f"OEE Cycle Design parameter details not found for selected hierarchy")
-                raise ValueError("Cycle Design Parameters not found")
+                raise ILensError("Cycle Design Parameters not found")
             updated_dict = self.common_handler.validate_hierarchy_tags(output_tags_dict[request_data.hierarchy])
             new_columns_dict = self.common_handler.get_oee_keys_mapping_dict(output_tags_dict[request_data.hierarchy])
             tags_list = list(updated_dict.values())

scripts/services/ui_services.py

@@ -48,7 +48,7 @@ async def get_chart_data(request_data: ChartRequest, db: Session = Depends(get_d
             message="Chart data fetched successfully",
         )
     except ILensError as e:
-        return DefaultFailureResponse(error=e.args)
+        return DefaultResponse(message=e.args[0], status="info")
     except Exception as e:
         tb = traceback.format_exc()
         logger.exception(e)
@@ -86,29 +86,3 @@ async def save_layout(request_data: SaveLayoutRequest, meta: MetaInfoSchema = De
         logger.exception(e)
         logger.exception(tb)
         return DefaultFailureResponse(error=e.args)
-
-# -------------Code Demo Backup----------------#
-
-#
-# @ui_service_router.post(Endpoints.get_batch_oee_all)
-# async def get_all_batch_oee(get_oee_request: GetOEERequest,
-#                             db: Session = Depends(get_db)):
-#     try:
-#         return await api_handler.get_oee_all(get_oee_request=get_oee_request, db=db)
-#     except Exception as e:
-#         tb = traceback.format_exc()
-#         logger.exception(e)
-#         logger.exception(tb)
-#         return DefaultFailureResponse(error=e.args)
-#
-#
-# @ui_service_router.post(Endpoints.get_batch_oee_batch_id)
-# async def get_all_batch_oee(get_oee_request: GetOEERequestOneBatch,
-#                             db: Session = Depends(get_db)):
-#     try:
-#         return await api_handler.get_oee_batch(get_oee_request=get_oee_request, db=db)
-#     except Exception as e:
-#         tb = traceback.format_exc()
-#         logger.exception(e)
-#         logger.exception(tb)
-#         return DefaultFailureResponse(error=e.args)