Merge pull request #263 from pbashyal-nmdp/pyard-status-show-all-tables

Update `pyard-status` to show all the tables.

Author: mmaiers-nmdp

pyard/mappings.py

@@ -42,6 +42,13 @@
     "who_alleles",
 ]
 
+serology_tables = [
+    "serology_broad_split_mapping",
+    "serology_mapping",
+]
+
+misc_tables = ["cwd2", "shortnulls", "v2_mapping", "mac_codes"]
+
 ARSMapping = namedtuple("ARSMapping", ars_mapping_tables)
 CodeMappings = namedtuple("CodeMappings", code_mapping_tables)
 AlleleGroups = namedtuple("AlleleGroups", allele_tables)

scripts/pyard-status

@@ -30,6 +30,8 @@ import pyard.mappings
 from pyard import db, data_repository
 from pyard.misc import get_data_dir
 
+LONG_DASH_LINE_LENGTH = 45
+
 
 def get_latest_imgt_version() -> int:
     """
@@ -70,7 +72,7 @@ if __name__ == "__main__":
             db_connection, db_filename = db.create_db_connection(
                 data_dir, imgt_version, ro=True
             )
-            print("-" * 43)
+            print("=" * LONG_DASH_LINE_LENGTH)
             if imgt_version == "Latest":
                 db_version = data_repository.get_db_version(db_connection)
                 print(f"IMGT DB Version: {imgt_version} ({db_version})")
@@ -90,19 +92,20 @@ if __name__ == "__main__":
             file_size = get_file_size(db_filename)
             print(f"File: {db_filename}")
             print(f"Size: {file_size:.2f}MB")
-            print("-" * 43)
-            print(f"|{'Table Name':20}|{'Rows':20}|")
-            print(f"|{'-' * 41}|")
-            for table in (
+            print("-" * LONG_DASH_LINE_LENGTH)
+            print(f"|{'Table Name':30}|{'Rows':>12}|")
+            print(f"|{'-' * (LONG_DASH_LINE_LENGTH - 2)}|")
+            for table in sorted(
                 pyard.mappings.ars_mapping_tables
                 + pyard.mappings.code_mapping_tables
                 + pyard.mappings.allele_tables
-                + ["mac_codes"]
+                + pyard.mappings.serology_tables
+                + pyard.mappings.misc_tables
             ):
                 if db.table_exists(db_connection, table):
                     total_rows = db.count_rows(db_connection, table)
-                    print(f"|{table:20}|{total_rows:20}|")
+                    print(f"|{table:30}|{int(total_rows):12,d}|")
                 else:
                     print(f"MISSING: {table} table")
-            print("-" * 43)
+            print("-" * LONG_DASH_LINE_LENGTH)
             db_connection.close()