From db0fe239438d7547101f1cd4ddabd8273f65570a Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 13 Dec 2024 12:31:01 +0000 Subject: [PATCH] raise error instead print error --- psl_proof/__main__.py | 2 +- psl_proof/proof.py | 10 +++++----- psl_proof/utils/submission.py | 10 +++++----- psl_proof/utils/validate_data.py | 2 +- psl_proof/utils/validation_api.py | 2 ++ psl_proof/utils/verification.py | 10 +++++----- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/psl_proof/__main__.py b/psl_proof/__main__.py index e196d29..0f0cbc6 100644 --- a/psl_proof/__main__.py +++ b/psl_proof/__main__.py @@ -19,7 +19,7 @@ def load_config() -> Dict[str, Any]: 'dlp_id': 1234, # Set your own DLP ID here 'input_dir': INPUT_DIR, 'salt': 'replace-this-salt', # TODO: replace this so that we can salt in a better way - 'validator_base_api_url': 'https://e3d8-169-0-170-105.ngrok-free.app' #Patrick_ToCheck + 'validator_base_api_url': 'https://89fb-169-0-170-105.ngrok-free.app' #Patrick_ToCheck } logging.info(f"Using config: {json.dumps(config, indent=2)}") return config diff --git a/psl_proof/proof.py b/psl_proof/proof.py index 2508f36..76ea1ba 100644 --- a/psl_proof/proof.py +++ b/psl_proof/proof.py @@ -68,7 +68,7 @@ def generate(self) -> ProofResponse: is_data_authentic = verify_result.is_valid proof_failed_reason = verify_result.error_text else : - proof_failed_reason = "Data is not authentic" + proof_failed_reason = "The provided data could not be verified as authentic." cargo_data = CargoData( source_data = source_data, @@ -86,7 +86,7 @@ def generate(self) -> ProofResponse: current_datetime = datetime.now().isoformat() if not is_data_authentic: #short circuit so we don't waste analysis - print(f"Not authentic: {proof_failed_reason}") + print(f"Validation proof failed: {proof_failed_reason}") self.proof_response.score = 0.0 self.proof_response.uniqueness = 0.0 self.proof_response.quality = 0.0 @@ -176,7 +176,7 @@ def get_source_data(input_data: Dict[str, Any]) -> SourceData: revision = input_data.get('revision', '') if (revision and revision != "01.01"): - print(f"Invalid Revision: {revision}") + raise RuntimeError(f"Invalid Revision: {revision}") submission_date = datetime.now() #print(f"submission_date: {submission_date}") @@ -187,7 +187,7 @@ def get_source_data(input_data: Dict[str, Any]) -> SourceData: if input_source_value == 'TELEGRAM': input_source = DataSource.telegram else: - print(f"Unmapped data source: {input_source_value}") + raise RuntimeError(f"Unmapped data source: {input_source_value}") submission_token = input_data.get('submission_token', '') @@ -224,7 +224,7 @@ def get_source_data(input_data: Dict[str, Any]) -> SourceData: source_chat ) else: - print(f"Unhandled data source: {input_source}") + raise RuntimeError(f"Unhandled data source: {input_source}") source_chats.append( source_chat ) diff --git a/psl_proof/utils/submission.py b/psl_proof/utils/submission.py index 08757c4..da6fbfe 100644 --- a/psl_proof/utils/submission.py +++ b/psl_proof/utils/submission.py @@ -63,14 +63,14 @@ def get_historical_chats( return chat_histories except ValueError as e: - print("Error parsing JSON response:", e) + RuntimeError("Error parsing JSON response:", e) return None else: - print(f"Validation failed. Status code: {response.status_code}, Response: {response.text}") + RuntimeError(f"Validation failed. Status code: {response.status_code}, Response: {response.text}") return None except requests.exceptions.RequestException as e: - print("An error occurred:", e) + RuntimeError("get_historical_chats:", e) return None @@ -89,8 +89,8 @@ def submit_data( response = requests.post(url, json=payload, headers=headers) if response.status_code != 200: - print(f"Submission failed. Status code: {response.status_code}, Response: {response.text}") + RuntimeError(f"Submission failed. Status code: {response.status_code}, Response: {response.text}") except requests.exceptions.RequestException as e: - print("An error occurred:", e) + RuntimeError("submit_data:", e) diff --git a/psl_proof/utils/validate_data.py b/psl_proof/utils/validate_data.py index 750d21f..988c622 100644 --- a/psl_proof/utils/validate_data.py +++ b/psl_proof/utils/validate_data.py @@ -32,7 +32,7 @@ def get_uniqueness_score( time_in_seconds = (chat_ended_on - historical_chat_ended_on).total_seconds() time_in_hours = int(time_in_seconds // 3600) - if time_in_hours < 12: # more than 12 Hours.. + if time_in_hours < 12: # within 12 Hours.. return 0.0 # If no matching source_chat_id is found, return 1 diff --git a/psl_proof/utils/validation_api.py b/psl_proof/utils/validation_api.py index 0887dad..284a5a4 100644 --- a/psl_proof/utils/validation_api.py +++ b/psl_proof/utils/validation_api.py @@ -5,6 +5,8 @@ def get_validation_api_url( api_path: str ) -> str: base_url = config['validator_base_api_url'] + if not base_url: + RuntimeError("validator_base_api_url: is not specified.") url = f"{base_url}/{api_path}" print(f"Connected: {url}") return url diff --git a/psl_proof/utils/verification.py b/psl_proof/utils/verification.py index c614372..a875d6b 100644 --- a/psl_proof/utils/verification.py +++ b/psl_proof/utils/verification.py @@ -29,12 +29,12 @@ def verify_token(config: Dict[str, Any], source_data: SourceData) -> Optional[Ve ) return result except ValueError as e: - print("Error parsing JSON response:", e) # Replace with logging in production - return None + print("Error parsing JSON response:", e) + RuntimeError("Error parsing JSON response:", e) # Replace with logging in production else: print(f"verify_token failed. Status code: {response.status_code}, Response: {response.text}") # Replace with logging - return None + RuntimeError(f"verify_token failed. Status code: {response.status_code}, Response: {response.text}") # Replace with logging except requests.exceptions.RequestException as e: - print("An error occurred:", e) # Replace with logging - return None + print("verify_token:", e) # Replace with logging + RuntimeError("verify_token:", e) # Replace with logging