Fix Install Chmod Issue as Well as SQL Syntax

augur/api/metrics/repo_meta.py

@@ -258,14 +258,22 @@ def nadia_project_labeling_badge(repo_group_id, repo_id=None):
         SELECT repo_id, COUNT(*) AS repo_contributor_count FROM
         (
         SELECT cntrb_id, repo_id, COUNT(*) FROM explorer_contributor_actions GROUP BY cntrb_id, repo_id
-        ) a GROUP BY repo_id
-        WHERE repo_id = :repo_id_param
-        ORDER BY repo_id; 
+        ) a
+        WHERE repo_id= :repo_id_param
+        GROUP BY repo_id
+        ORDER BY repo_id;
     """).bindparams(repo_id_param=repo_id)
 
     with current_app.engine.connect() as conn:
         raw_df = pd.read_sql(get_unique_contributor_ids_sql, conn)
-        unique_contribs = int(raw_df.at[0,1])
+        #print(raw_df)
+        try:
+            unique_contribs = int(raw_df.at[0,'repo_contributor_count'])
+        except KeyError:
+            result = {
+                "nadia_badge_level": "unknown"
+            }
+            return pd.DataFrame(result, index=[0])
 
     stars_count_SQL = s.sql.text("""
             SELECT repo_name, stars_count AS stars

augur/application/cli/db.py

@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: MIT
+import os
 from os import environ, chmod, path, getenv, stat
 import logging
 from sys import exit
@@ -11,6 +12,7 @@
 import pandas as pd
 import json
 import re
+import stat
 
 from augur.application.cli import test_connection, test_db_connection, with_database, DatabaseContext
 
@@ -41,14 +43,14 @@
     NOTE: The Group ID must already exist in the REPO_Groups Table.
 
     If you want to add an entire GitHub organization, refer to the command: augur db add-github-org"""   
     from augur.tasks.github.util.github_task_session import GithubTaskSession
     from augur.util.repo_load_controller import RepoLoadController
 
     with GithubTaskSession(logger, engine=ctx.obj.engine) as session:
 
         controller = RepoLoadController(session)
 
         with open(filename) as upload_repos_file:
             data = csv.reader(upload_repos_file, delimiter=",")
             for row in data:
 
@@ -112,7 +114,7 @@
         """
         )
 
         with open(filename) as create_repo_groups_file:
             data = csv.reader(create_repo_groups_file, delimiter=",")
             for row in data:
 
@@ -145,8 +147,8 @@
     """
     Create new repo groups in Augur's database
     """
     from augur.tasks.github.util.github_task_session import GithubTaskSession
     from augur.util.repo_load_controller import RepoLoadController
 
     with GithubTaskSession(logger, engine=ctx.obj.engine) as session:
 
@@ -303,7 +305,7 @@
 
 
     else:
          with open("db.config.json", "r") as f:
             config = json.load(f)
             print(f"Config: {config}")
             check_pgpass_credentials(config)
@@ -343,7 +345,7 @@
         }
     }
     check_pgpass_credentials(config)
     run_db_creation_psql_command(
         host, port, default_user, default_db_name, f"CREATE DATABASE {target_db_name};"
     )
     run_db_creation_psql_command(
@@ -391,7 +393,7 @@
     print("Successful db connection")
 
 
 # TODO: Fix this function
 def run_psql_command_in_database(target_type, target):
     if target_type not in ["-f", "-c"]:
         logger.error("Invalid target type. Exiting...")
@@ -404,7 +406,7 @@
 
     if augur_db_environment_var:
         pass
         #TODO: Add functionality for environment variable
     else:
         with open("db.config.json", 'r') as f:
             db_config = json.load(f)
@@ -443,7 +445,7 @@
         open(pgpass_file_path, "w+")
         chmod(pgpass_file_path, stat.S_IWRITE | stat.S_IREAD)
 
-    pgpass_file_mask = oct(stat(pgpass_file_path).st_mode & 0o777)
+    pgpass_file_mask = oct(os.stat(pgpass_file_path).st_mode & 0o777)
 
     if pgpass_file_mask != "0o600":
         print("Updating ~/.pgpass file permissions.")