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

Address release bugs #2872

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Address release bugs #2872

Show file tree
Hide file tree
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
8 changes: 6 additions & 2 deletions augur/tasks/github/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from augur.tasks.init.celery_app import celery_app as celery
from augur.tasks.init.celery_app import AugurCoreRepoCollectionTask
from augur.application.db.data_parse import *
from augur.tasks.github.util.github_data_access import GithubDataAccess
from augur.tasks.github.util.github_data_access import GithubDataAccess, UrlNotFoundException
from augur.tasks.github.util.github_task_session import GithubTaskManifest
from augur.tasks.util.worker_util import remove_duplicate_dicts
from augur.tasks.github.util.util import get_owner_repo
Expand Down Expand Up @@ -97,7 +97,11 @@ def process_large_issue_and_pr_message_collection(repo_id, repo_git: str, logger
all_data = []
for comment_url in comment_urls:

messages = list(github_data_access.paginate_resource(comment_url))
try:
messages = list(github_data_access.paginate_resource(comment_url))
except UrlNotFoundException as e:
logger.warning(e)
continue

all_data += messages

Expand Down
11 changes: 7 additions & 4 deletions augur/tasks/github/pull_requests/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@
from augur.tasks.init.celery_app import celery_app as celery
from augur.tasks.init.celery_app import AugurCoreRepoCollectionTask, AugurSecondaryRepoCollectionTask
from augur.application.db.data_parse import *
from augur.tasks.github.util.github_data_access import GithubDataAccess
from augur.tasks.github.util.github_paginator import GithubPaginator
from augur.tasks.github.util.github_data_access import GithubDataAccess, UrlNotFoundException
from augur.tasks.util.worker_util import remove_duplicate_dicts
from augur.tasks.github.util.util import add_key_value_pair_to_dicts, get_owner_repo
from augur.application.db.models import PullRequest, Message, PullRequestReview, PullRequestLabel, PullRequestReviewer, PullRequestMeta, PullRequestAssignee, PullRequestReviewMessageRef, Contributor, Repo
from augur.tasks.github.util.github_task_session import GithubTaskManifest
from augur.tasks.github.util.github_random_key_auth import GithubRandomKeyAuth
from augur.application.db.lib import get_session, get_repo_by_repo_git, bulk_insert_dicts, get_pull_request_reviews_by_repo_id

Check warning on line 14 in augur/tasks/github/pull_requests/tasks.py

View workflow job for this annotation

GitHub Actions / runner / pylint 

[pylint] reported by reviewdog 🐶
W0611: Unused get_session imported from augur.application.db.lib (unused-import)

Raw Output:
augur/tasks/github/pull_requests/tasks.py:14:0: W0611: Unused get_session imported from augur.application.db.lib (unused-import)
from augur.application.db.util import execute_session_query
from ..messages import process_github_comment_contributors
from augur.application.db.lib import get_secondary_data_last_collected, get_updated_prs, get_core_data_last_collected

from typing import Generator, List, Dict

Check warning on line 19 in augur/tasks/github/pull_requests/tasks.py

View workflow job for this annotation

GitHub Actions / runner / pylint 

[pylint] reported by reviewdog 🐶
W0611: Unused Generator imported from typing (unused-import)

Raw Output:
augur/tasks/github/pull_requests/tasks.py:19:0: W0611: Unused Generator imported from typing (unused-import)

Check warning on line 19 in augur/tasks/github/pull_requests/tasks.py

View workflow job for this annotation

GitHub Actions / runner / pylint 

[pylint] reported by reviewdog 🐶
W0611: Unused Dict imported from typing (unused-import)

Raw Output:
augur/tasks/github/pull_requests/tasks.py:19:0: W0611: Unused Dict imported from typing (unused-import)


platform_id = 1
Expand Down Expand Up @@ -53,11 +52,11 @@
total_count += len(all_data)
all_data.clear()

if len(all_data):

Check warning on line 55 in augur/tasks/github/pull_requests/tasks.py

View workflow job for this annotation

GitHub Actions / runner / pylint 

[pylint] reported by reviewdog 🐶
C1802: Do not use `len(SEQUENCE)` without comparison to determine if a sequence is empty (use-implicit-booleaness-not-len)

Raw Output:
augur/tasks/github/pull_requests/tasks.py:55:11: C1802: Do not use `len(SEQUENCE)` without comparison to determine if a sequence is empty (use-implicit-booleaness-not-len)
process_pull_requests(all_data, f"{owner}/{repo}: Github Pr task", repo_id, logger, augur_db)
total_count += len(all_data)

if total_count > 0:

Check warning on line 59 in augur/tasks/github/pull_requests/tasks.py

View workflow job for this annotation

GitHub Actions / runner / pylint 

[pylint] reported by reviewdog 🐶
R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return)

Raw Output:
augur/tasks/github/pull_requests/tasks.py:59:8: R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it (no-else-return)
return total_count
else:
logger.debug(f"{owner}/{repo} has no pull requests")
Expand Down Expand Up @@ -359,8 +358,12 @@

pr_review_url = f"https://api.github.com/repos/{owner}/{repo}/pulls/{pr_number}/reviews"

pr_reviews = list(github_data_access.paginate_resource(pr_review_url))

try:
pr_reviews = list(github_data_access.paginate_resource(pr_review_url))
except UrlNotFoundException as e:
logger.warning(e)
continue

if pr_reviews:
all_pr_reviews[pull_request_id] = pr_reviews

Expand Down
4 changes: 4 additions & 0 deletions augur/tasks/github/util/github_graphql_data_access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ def __extract_data_section(self, keys, json_response):

# iterate deeper into the json_response object until we get to the desired data
for value in keys:

if core is None:
raise Exception(f"Error: 'core' is None when trying to index by {value}. Response: {json_response}")

core = core[value]

return core
Expand Down
Loading