Skip to content

fix: parse GraphQL response JSON once per PR page (#1056) #1060

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

Closed
alpurkan17 wants to merge 1 commit into from
Closed

fix: parse GraphQL response JSON once per PR page (#1056) #1060

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 11 additions & 15 deletions gittensor/utils/github_api_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ def execute_graphql_query(
class GraphQLPageResult:
"""Result of a paginated GraphQL query."""

response: Optional[requests.Response]
data: Optional[Dict[str, Any]] # already-parsed JSON, None on failure
page_size: int # actual page size used (may have been reduced on retry)


Expand All @@ -690,7 +690,7 @@ def get_github_graphql_query(
page_size: Override page size (used when retrying with smaller pages)

Returns:
GraphQLPageResult with response and the page size actually used
GraphQLPageResult with parsed data and the page size actually used
"""

max_attempts = 8
Expand All @@ -714,11 +714,11 @@ def get_github_graphql_query(
)

if response.status_code == 200:
# Check for RESOURCE_LIMITS_EXCEEDED in response body (GitHub returns 200 with errors)
# Parse once and check for RESOURCE_LIMITS_EXCEEDED
try:
data = response.json()
except Exception:
return GraphQLPageResult(response=response, page_size=limit)
return GraphQLPageResult(data=None, page_size=limit)

if _has_resource_limit_errors(data):
if attempt < (max_attempts - 1):
Expand All @@ -735,9 +735,10 @@ def get_github_graphql_query(
bt.logging.error(
f'GraphQL RESOURCE_LIMITS_EXCEEDED at page size {limit} after {max_attempts} attempts'
)
return GraphQLPageResult(response=None, page_size=limit)
return GraphQLPageResult(data=None, page_size=limit)

return GraphQLPageResult(response=response, page_size=limit)
# Return parsed data — caller no longer needs to parse again
return GraphQLPageResult(data=data, page_size=limit)

# HTTP error - log and retry
if attempt < (max_attempts - 1):
Expand Down Expand Up @@ -768,9 +769,9 @@ def get_github_graphql_query(
time.sleep(backoff_delay)
else:
bt.logging.error(f'GraphQL request failed after {max_attempts} attempts: {e}')
return GraphQLPageResult(response=None, page_size=limit)
return GraphQLPageResult(data=None, page_size=limit)

return GraphQLPageResult(response=None, page_size=limit)
return GraphQLPageResult(data=None, page_size=limit)


def _has_resource_limit_errors(data: Dict) -> bool:
Expand Down Expand Up @@ -950,17 +951,12 @@ def load_miners_prs(
# Carry reduced page size forward for subsequent pages
current_page_size = result.page_size

if not result.response:
if not result.data:
bt.logging.warning('No response from github, breaking fetch loop...')
miner_eval.github_pr_fetch_failed = True
break

try:
data: Dict = result.response.json()
except Exception as e:
bt.logging.error(f'Failed to parse GraphQL JSON response: {e}')
miner_eval.github_pr_fetch_failed = True
break
data: Dict = result.data

# Resource limit errors are already handled in get_github_graphql_query; break on others
if 'errors' in data:
Expand Down