Fix Merge Error

augur/tasks/git/facade_tasks.py

@@ -1,4 +1,4 @@
 #SPDX-License-Identifier: MIT
 
 import logging
 from celery import group, chain
@@ -13,7 +13,7 @@
 from augur.tasks.git.util.facade_worker.facade_worker.rebuildcache import fill_empty_affiliations, invalidate_caches, nuke_affiliations, rebuild_unknown_affiliation_and_web_caches
 
 
 from augur.tasks.github.facade_github.tasks import *
 from augur.tasks.git.util.facade_worker.facade_worker.config import FacadeHelper
 from augur.tasks.util.collection_state import CollectionState
 from augur.tasks.util.collection_util import get_collection_status_repo_git_from_filter
@@ -31,13 +31,13 @@
 from augur.tasks.git.dependency_libyear_tasks.tasks import process_libyear_dependency_metrics
 from augur.tasks.git.scc_value_tasks.tasks import process_scc_value_metrics
 
 from augur.tasks.github.util.github_task_session import *
 
 
 #define an error callback for chains in facade collection so facade doesn't make the program crash
 #if it does.
 @celery.task
 def facade_error_handler(request,exc,traceback):
 
     logger = logging.getLogger(facade_error_handler.__name__)
 
@@ -56,13 +56,13 @@
 
 #Predefine facade collection with tasks
 @celery.task(base=AugurFacadeRepoCollectionTask)
 def facade_analysis_init_facade_task(repo_git):
 
     logger = logging.getLogger(facade_analysis_init_facade_task.__name__)
     facade_helper = FacadeHelper(logger)
 
     facade_helper.update_status('Running analysis')
     facade_helper.log_activity('Info',f"Beginning analysis.")
 
 
 @celery.task(base=AugurFacadeRepoCollectionTask)
@@ -110,7 +110,7 @@
 
     #Get the huge list of commits to process.
     absolute_path = get_absolute_repo_path(facade_helper.repo_base_directory, repo.repo_id, repo.repo_path,repo.repo_name)
     repo_loc = (f"{absolute_path}/.git")
     # Grab the parents of HEAD
 
     parent_commits = get_parent_commits_set(repo_loc, start_date)
@@ -182,7 +182,7 @@
 
     #Get the huge list of commits to process.
     absolute_path = get_absolute_repo_path(facade_helper.repo_base_directory, repo.repo_id, repo.repo_path, repo.repo_name)
     repo_loc = (f"{absolute_path}/.git")
     # Grab the parents of HEAD
 
     parent_commits = get_parent_commits_set(repo_loc, start_date)
@@ -196,7 +196,7 @@
     facade_helper.log_activity('Debug',f"Commits missing from repo {repo_id}: {len(missing_commits)}")
 
 
     if not len(missing_commits) or repo_id is None:
         #session.log_activity('Info','Type of missing_commits: %s' % type(missing_commits))
         return
 
@@ -204,7 +204,7 @@
 
     logger.info(f"Got to analysis!")
     absolute_path = get_absolute_repo_path(facade_helper.repo_base_directory, repo.repo_id, repo.repo_path,repo.repo_name)
     repo_loc = (f"{absolute_path}/.git")
 
     pendingCommitRecordsToInsert = []
 
@@ -388,27 +388,6 @@
 
 
 
-def generate_contributor_sequence(logger,repo_git, session):
-
-    contributor_sequence = []
-    #all_repo_ids = []
-    repo_id = None
-
-    #contributor_sequence.append(facade_start_contrib_analysis_task.si())
-    repo = get_repo_by_repo_git(repo_git)
-    repo_id = repo.repo_id
-
-    #pdb.set_trace()
-    #breakpoint()
-    #for repo in all_repos:
-    #    contributor_sequence.append(insert_facade_contributors.si(repo['repo_id']))
-    #all_repo_ids = [repo['repo_id'] for repo in all_repos]
-
-    #contrib_group = create_grouped_task_load(dataList=all_repo_ids,task=insert_facade_contributors)#group(contributor_sequence)
-    #contrib_group.link_error(facade_error_handler.s())
-    #return contrib_group#chain(facade_start_contrib_analysis_task.si(), contrib_group)
-    return insert_facade_contributors.si(repo_id)
-
 
 def facade_phase(repo_git, full_collection):
     logger = logging.getLogger(facade_phase.__name__)
@@ -450,7 +429,7 @@
 
     #Generate contributor analysis task group.
     if not limited_run or (limited_run and run_facade_contributors):
-        facade_core_collection.append(generate_contributor_sequence(logger,repo_git,facade_helper))
+        facade_core_collection.append(insert_facade_contributors.si(repo_git))
 
 
     #These tasks need repos to be cloned by facade before they can work.

augur/tasks/github/facade_github/tasks.py

@@ -7,7 +7,7 @@
 from augur.tasks.github.util.github_random_key_auth import GithubRandomKeyAuth
 from augur.application.db.models import Contributor
 from augur.tasks.github.facade_github.core import *
-from augur.application.db.lib import execute_sql, get_contributor_aliases_by_email, get_unresolved_commit_emails_by_name, get_contributors_by_full_name
+from augur.application.db.lib import execute_sql, get_contributor_aliases_by_email, get_unresolved_commit_emails_by_name, get_contributors_by_full_name, get_repo_by_repo_git
 from augur.tasks.git.util.facade_worker.facade_worker.facade00mainprogram import *
 
 
@@ -195,10 +195,9 @@ def insert_facade_contributors(self, repo_git):
     # Set platform id to 1 since this task is github specific
     platform_id = 1
 
-    engine = self.app.engine
-
     logger = logging.getLogger(insert_facade_contributors.__name__)
-    repo_id = None
+    repo = get_repo_by_repo_git(repo_git)
+    repo_id = repo.repo_id
 
     # Get all of the commit data's emails and names from the commit table that do not appear
     # in the contributors table or the contributors_aliases table.