Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add some try exception function. #57

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

add some try exception function. #57

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
238be1c
add some try exception function.
fengzz-coding Oct 8, 2024
67e68ba
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 8, 2024
98b6900
remove some unuse.
fengzz-coding Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 39 additions & 28 deletions src/validate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,36 +423,47 @@ def loop(
clean_model_cache(auto_clean_cache)

for index, task_id_num in enumerate(task_id_list):
resp = fed_ledger.request_validation_assignment(task_id_num)
if resp.status_code == 200:
last_successful_request_time[index] = time.time()
break
else:
if resp.json() == {
"detail": "No task submissions available to validate"
}:
logger.info(
"Failed to ask assignment_id: No task submissions available to validate"
)
try:
resp = fed_ledger.request_validation_assignment(task_id_num)
if resp.status_code == 200:
last_successful_request_time[index] = time.time()
break
else:
logger.error(f"Failed to ask assignment_id: {resp.content}")
if resp.json() == {
"detail": "Rate limit reached for validation assignment lookup: 1 per 3 minutes"
}:
time_since_last_success = (
time.time() - last_successful_request_time[index]
)
if time_since_last_success < ASSIGNMENT_LOOKUP_INTERVAL:
time_to_sleep = (
ASSIGNMENT_LOOKUP_INTERVAL - time_since_last_success
if not resp.headers.get("content-type", "").startswith(
"application/json"
):
logger.error(f"Failed to ask assignment_id: {resp.content}")
time.sleep(TIME_SLEEP)
continue
if resp.json() == {
"detail": "No task submissions available to validate"
}:
logger.info(
"Failed to ask assignment_id: No task submissions available to validate"
)
logger.info(f"Sleeping for {int(time_to_sleep)} seconds")
time.sleep(time_to_sleep)
continue
else:
logger.info(f"Sleeping for {int(TIME_SLEEP)} seconds")
time.sleep(TIME_SLEEP)
continue
else:
logger.error(f"Failed to ask assignment_id: {resp.content}")
if resp.json() == {
"detail": "Rate limit reached for validation assignment lookup: 1 per 3 minutes"
}:
time_since_last_success = (
time.time() - last_successful_request_time[index]
)
if time_since_last_success < ASSIGNMENT_LOOKUP_INTERVAL:
time_to_sleep = (
ASSIGNMENT_LOOKUP_INTERVAL - time_since_last_success
)
logger.info(f"Sleeping for {int(time_to_sleep)} seconds")
time.sleep(time_to_sleep)
continue
else:
logger.info(f"Sleeping for {int(TIME_SLEEP)} seconds")
time.sleep(TIME_SLEEP)
continue
except Exception as e:
logger.error(f"Failed to ask assignment_id: {e}")
time.sleep(TIME_SLEEP)
continue
nickcom007 marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Refactor the response handling logic to reduce duplication and improve readability

The current implementation has multiple nested if statements and repeated calls to resp.json(), which can be inefficient and make the code harder to read. Caching the result of resp.json() and restructuring the conditional logic can enhance performance and maintainability.

Consider refactoring the code as follows:

 try:
     resp = fed_ledger.request_validation_assignment(task_id_num)
     if resp.status_code == 200:
         last_successful_request_time[index] = time.time()
         break
     else:
         if not resp.headers.get("content-type", "").startswith("application/json"):
             logger.error(f"Failed to ask assignment_id: {resp.content}")
             time.sleep(TIME_SLEEP)
             continue
-        if resp.json() == {
+        resp_json = resp.json()
+        if resp_json == {
             "detail": "No task submissions available to validate"
         }:
             logger.info(
                 "Failed to ask assignment_id: No task submissions available to validate"
             )
-        else:
-            logger.error(f"Failed to ask assignment_id: {resp.content}")
-        if resp.json() == {
+        elif resp_json == {
             "detail": "Rate limit reached for validation assignment lookup: 1 per 3 minutes"
         }:
             time_since_last_success = (
                 time.time() - last_successful_request_time[index]
             )
             if time_since_last_success < ASSIGNMENT_LOOKUP_INTERVAL:
                 time_to_sleep = (
                     ASSIGNMENT_LOOKUP_INTERVAL - time_since_last_success
                 )
                 logger.info(f"Sleeping for {int(time_to_sleep)} seconds")
                 time.sleep(time_to_sleep)
             continue
+        else:
+            logger.error(f"Failed to ask assignment_id: {resp.content}")
+            logger.info(f"Sleeping for {int(TIME_SLEEP)} seconds")
+            time.sleep(TIME_SLEEP)
+            continue
 except Exception as e:
     logger.error(f"Failed to ask assignment_id: {e}")
     time.sleep(TIME_SLEEP)
     continue

This refactoring:

  • Caches resp.json() in the resp_json variable to avoid multiple JSON parsing.
  • Replaces the second if with an elif to streamline the logic.
  • Moves the continue statements inside the respective conditional blocks to reduce redundancy.
  • Enhances readability by reducing nested structures.
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
try:
resp = fed_ledger.request_validation_assignment(task_id_num)
if resp.status_code == 200:
last_successful_request_time[index] = time.time()
break
else:
logger.error(f"Failed to ask assignment_id: {resp.content}")
if resp.json() == {
"detail": "Rate limit reached for validation assignment lookup: 1 per 3 minutes"
}:
time_since_last_success = (
time.time() - last_successful_request_time[index]
)
if time_since_last_success < ASSIGNMENT_LOOKUP_INTERVAL:
time_to_sleep = (
ASSIGNMENT_LOOKUP_INTERVAL - time_since_last_success
if not resp.headers.get("content-type", "").startswith(
"application/json"
):
logger.error(f"Failed to ask assignment_id: {resp.content}")
time.sleep(TIME_SLEEP)
continue
if resp.json() == {
"detail": "No task submissions available to validate"
}:
logger.info(
"Failed to ask assignment_id: No task submissions available to validate"
)
logger.info(f"Sleeping for {int(time_to_sleep)} seconds")
time.sleep(time_to_sleep)
continue
else:
logger.info(f"Sleeping for {int(TIME_SLEEP)} seconds")
time.sleep(TIME_SLEEP)
continue
else:
logger.error(f"Failed to ask assignment_id: {resp.content}")
if resp.json() == {
"detail": "Rate limit reached for validation assignment lookup: 1 per 3 minutes"
}:
time_since_last_success = (
time.time() - last_successful_request_time[index]
)
if time_since_last_success < ASSIGNMENT_LOOKUP_INTERVAL:
time_to_sleep = (
ASSIGNMENT_LOOKUP_INTERVAL - time_since_last_success
)
logger.info(f"Sleeping for {int(time_to_sleep)} seconds")
time.sleep(time_to_sleep)
continue
else:
logger.info(f"Sleeping for {int(TIME_SLEEP)} seconds")
time.sleep(TIME_SLEEP)
continue
except Exception as e:
logger.error(f"Failed to ask assignment_id: {e}")
time.sleep(TIME_SLEEP)
continue
try:
resp = fed_ledger.request_validation_assignment(task_id_num)
if resp.status_code == 200:
last_successful_request_time[index] = time.time()
break
else:
if not resp.headers.get("content-type", "").startswith(
"application/json"
):
logger.error(f"Failed to ask assignment_id: {resp.content}")
time.sleep(TIME_SLEEP)
continue
resp_json = resp.json()
if resp_json == {
"detail": "No task submissions available to validate"
}:
logger.info(
"Failed to ask assignment_id: No task submissions available to validate"
)
elif resp_json == {
"detail": "Rate limit reached for validation assignment lookup: 1 per 3 minutes"
}:
time_since_last_success = (
time.time() - last_successful_request_time[index]
)
if time_since_last_success < ASSIGNMENT_LOOKUP_INTERVAL:
time_to_sleep = (
ASSIGNMENT_LOOKUP_INTERVAL - time_since_last_success
)
logger.info(f"Sleeping for {int(time_to_sleep)} seconds")
time.sleep(time_to_sleep)
continue
else:
logger.error(f"Failed to ask assignment_id: {resp.content}")
logger.info(f"Sleeping for {int(TIME_SLEEP)} seconds")
time.sleep(TIME_SLEEP)
continue
except Exception as e:
logger.error(f"Failed to ask assignment_id: {e}")
time.sleep(TIME_SLEEP)
continue


if resp is None or resp.status_code != 200:
continue
Expand Down