From 7b9547efe7f15bf4ecdce7a7657f9f98d1aaf000 Mon Sep 17 00:00:00 2001 From: Phulare Date: Wed, 20 Apr 2022 11:48:30 +0530 Subject: [PATCH] Updated the Validation with individual code --- experimental/Validation/validation.py | 4 ++-- microservices/validation_service/src/routes/validation.py | 4 ++-- microservices/validation_service/src/utils/validation.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/experimental/Validation/validation.py b/experimental/Validation/validation.py index f1d65237..558cd48d 100644 --- a/experimental/Validation/validation.py +++ b/experimental/Validation/validation.py @@ -74,7 +74,7 @@ def get_values(documentlabel,cid,uid,entity): get_scoring(data,merge_query,documentlabel,entity) Logger.info(f"Validation completed for document with case id {cid}" f"and uid {uid}") - except Exception as e: + except (Exception,) as e: Logger.error(e) validation_score = None return validation_score @@ -109,7 +109,7 @@ def get_scoring(data,merge_query,documentlabel,entity): try: query_results = bigquery_client.query((query)) df = query_results.to_dataframe() - except Exception as e: + except (Exception,) as e: Logger.error(e) df = pd.DataFrame() df = df.drop_duplicates() diff --git a/microservices/validation_service/src/routes/validation.py b/microservices/validation_service/src/routes/validation.py index dfbd0fe5..11a9067d 100644 --- a/microservices/validation_service/src/routes/validation.py +++ b/microservices/validation_service/src/routes/validation.py @@ -10,7 +10,7 @@ router = APIRouter(prefix="/validation") SUCCESS_RESPONSE = {"status": "Success"} FAILED_RESPONSE = {"status": "Failed"} - +entity=[] @router.post("/validation_api") async def validation(case_id: str, uid: str, doc_class: str): @@ -25,7 +25,7 @@ async def validation(case_id: str, uid: str, doc_class: str): """ status = "fail" try: - validation_score = get_values(doc_class, case_id, uid) + validation_score = get_values(doc_class, case_id, uid,entity) if validation_score is not None: status = "success" update_validation_status(case_id, uid, validation_score, status) diff --git a/microservices/validation_service/src/utils/validation.py b/microservices/validation_service/src/utils/validation.py index f1d65237..558cd48d 100644 --- a/microservices/validation_service/src/utils/validation.py +++ b/microservices/validation_service/src/utils/validation.py @@ -74,7 +74,7 @@ def get_values(documentlabel,cid,uid,entity): get_scoring(data,merge_query,documentlabel,entity) Logger.info(f"Validation completed for document with case id {cid}" f"and uid {uid}") - except Exception as e: + except (Exception,) as e: Logger.error(e) validation_score = None return validation_score @@ -109,7 +109,7 @@ def get_scoring(data,merge_query,documentlabel,entity): try: query_results = bigquery_client.query((query)) df = query_results.to_dataframe() - except Exception as e: + except (Exception,) as e: Logger.error(e) df = pd.DataFrame() df = df.drop_duplicates()