fixing circular dependency and mypy errors

Signed-off-by: Sajal-Kulshreshtha <sajalkulshreshtha9@gmail.com>

Author: skools-here

.github/workflows/mypy.yaml

@@ -21,7 +21,8 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install .[dev] 
+          pip install .[dev]
+          pip install mypy
 
       - name: Run mypy
         run: |

augur/application/config.py

@@ -4,7 +4,7 @@
 from typing import List, Any, Optional
 import os
 from augur.application.db.models import Config 
-from augur.application.db.util import execute_session_query, convert_type_of_value
+from augur.application.db.helpers import execute_session_query, convert_type_of_value
 
 def get_development_flag_from_config():
 

augur/application/db/helpers.py

@@ -0,0 +1,26 @@
+from typing import Any, Callable, Optional
+from augur.application.db.util import catch_operational_error
+
+def execute_session_query(query: Any, query_type: str = "all") -> Any:
+    """
+    Executes an SQLAlchemy ORM query with retries on OperationalError.
+    
+    Args:
+        query: SQLAlchemy ORM query object.
+        query_type: One of 'all', 'one', 'first'.
+    
+    Returns:
+        Query result according to query_type.
+    """
+    func: Optional[Callable[[], Any]] = None
+
+    if query_type == "all":
+        func = query.all
+    elif query_type == "one":
+        func = query.one
+    elif query_type == "first":
+        func = query.first
+    else:
+        raise Exception(f"ERROR: Unsupported query type '{query_type}'")
+
+    return catch_operational_error(func)

augur/application/db/lib.py

@@ -13,7 +13,7 @@
 from augur.application.db.models import Config, Repo, Commit, WorkerOauth, Issue, PullRequest, PullRequestReview, ContributorsAlias,UnresolvedCommitEmail, Contributor, CollectionStatus, UserGroup, RepoGroup
 from augur.tasks.util.collection_state import CollectionState
 from augur.application.db import get_session, get_engine
-from augur.application.db.util import execute_session_query, convert_type_of_value
+from augur.application.db.helpers import execute_session_query, convert_type_of_value
 from augur.application.db.session import remove_duplicates_by_uniques, remove_null_characters_from_list_of_dicts
 
 logger = logging.getLogger("db_lib")

augur/application/db/models/augur_data.py

@@ -30,7 +30,7 @@
 
 
 from augur.application.db.models.base import Base
-from augur.application.db.util import execute_session_query
+from augur.application.db.helpers import execute_session_query
 from augur.application.db import get_session
 
 DEFAULT_REPO_GROUP_ID = 1

augur/application/db/util.py

@@ -29,31 +29,6 @@ def catch_operational_error(func: Callable[[], Any]) -> Any:
 
     raise Exception(error)
 
-
-def execute_session_query(query: Any, query_type: str = "all") -> Any:
-    """
-    Executes an SQLAlchemy ORM query with retries on OperationalError.
-    
-    Args:
-        query: SQLAlchemy ORM query object.
-        query_type: One of 'all', 'one', 'first'.
-    
-    Returns:
-        Query result according to query_type.
-    """
-    func: Optional[Callable[[], Any]] = None
-
-    if query_type == "all":
-        func = query.all
-    elif query_type == "one":
-        func = query.one
-    elif query_type == "first":
-        func = query.first
-    else:
-        raise Exception(f"ERROR: Unsupported query type '{query_type}'")
-
-    return catch_operational_error(func)
-
 def convert_orm_list_to_dict_list(result: List["Base"]) -> List[Dict[str, Any]]:
     """
     Converts a list of ORM model instances to a list of dictionaries.

augur/application/logs.py

@@ -12,7 +12,7 @@
 
 from augur.application.db.models import Config 
 from augur.application.config import convert_type_of_value
-from augur.application.db.util import execute_session_query
+from augur.application.db.helpers import execute_session_query
 
 ROOT_AUGUR_DIRECTORY = os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 

augur/tasks/data_analysis/discourse_analysis/tasks.py

@@ -10,7 +10,7 @@
 from augur.tasks.init.celery_app import celery_app as celery
 from augur.application.db.lib import get_session, get_repo_by_repo_git
 from augur.application.db.models import Repo, DiscourseInsight
-from augur.application.db.util import execute_session_query
+from augur.application.db.helpers import execute_session_query
 from augur.tasks.init.celery_app import AugurMlRepoCollectionTask
 
 #import os, sys, time, requests, json

augur/tasks/git/util/facade_worker/facade_worker/repofetch.py

@@ -34,7 +34,7 @@
 from sqlalchemy.orm.exc import NoResultFound
 from augur.application.db.models.augur_data import *
 from augur.application.db.models.augur_operations import CollectionStatus
-from augur.application.db.util import execute_session_query, convert_orm_list_to_dict_list
+from augur.application.db.helpers import execute_session_query
 from augur.application.db.lib import execute_sql, get_repo_by_repo_git
 
 class GitCloneError(Exception):

augur/tasks/git/util/facade_worker/facade_worker/utilitymethods.py

@@ -33,7 +33,7 @@
 from .config import FacadeHelper as FacadeHelper
 from augur.tasks.util.worker_util import calculate_date_weight_from_timestamps
 from augur.application.db.lib import execute_sql, fetchall_data_from_sql_text, remove_working_commits_by_repo_id_and_hashes, remove_commits_by_repo_id_and_hashes, get_repo_by_repo_git, get_session
-from augur.application.db.util import execute_session_query
+from augur.application.db.helpers import execute_session_query
 #from augur.tasks.git.util.facade_worker.facade
 
 def update_repo_log(logger, facade_helper, repos_id,status):