merge fix

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "RDAS_PAKG/epi4GARD"]
 	path = RDAS_PAKG/epi4GARD
-	url = https://github.com/ncats/epi4GARD.git
+	url = git@github.com:ncats/epi4GARD.git
 [submodule "RDAS_PAKG/NaturalHistory4GARD"]
 	path = RDAS_PAKG/NaturalHistory4GARD
-	url = https://github.com/ncats/NaturalHistory4GARD.git
+	url = git@github.com:ncats/NaturalHistory4GARD.git

RDAS_GFKG/prep_neo4j_data.py

@@ -174,6 +174,12 @@ def run_normmap():
 	prj_files = sorted(prj_files)
 
 	for idx, abs_file in enumerate(abs_files):
+		year = re.findall(r'\d+', abs_file)[0]
+
+		if os.path.exists(data_raw(f'normmap/RePORTER_NORMMAP_{year}.csv')):
+			print(data_raw(f'normmap/RePORTER_NORMMAP_{year}.csv') + ' already exists... bypassing')
+			continue
+
 		prj_file = prj_files[idx]
 
 		print(abs_file, ' -merged- ',prj_file)
@@ -184,8 +190,6 @@ def run_normmap():
 		merged_df = pd.merge(tmp, tmp2, on=['APPLICATION_ID'])
 		merged_df['APPLICATION_ID'] = merged_df['APPLICATION_ID'].astype(int)
 
-		year = re.findall(r'\d+', abs_file)[0]
-
 		merged_df.to_csv(data_raw(f'normmap/RePORTER_NORMMAP_{year}.csv'), index=False)
 
 

start_dev.py

@@ -3,6 +3,7 @@
 import sys
 workspace = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(workspace)
+sys.path.append('/home/leadmandj/RDAS/')
 sys.path.append(os.getcwd())
 print(sys.path)
 import sysvars
@@ -13,8 +14,7 @@
 import argparse
 from datetime import date,datetime
 from AlertCypher import AlertCypher
-from gard.methods import get_node_counts
-import ses_firebase
+from RDAS_GARD.methods import get_node_counts
 import firebase_admin
 from firebase_admin import auth
 from firebase_admin import credentials

sysvars.py

@@ -14,6 +14,11 @@
 
 base_path = '/home/{current_user}/{base_directory_name}/'.format(current_user=current_user, base_directory_name=base_directory_name)
 
+# RDAS Team contacts for emails
+contacts = [
+    "[email protected]"
+]
+
 # Folder paths
 backup_path = '{base_path}backup/'.format(base_path=base_path)
 transfer_path = '{base_path}transfer/'.format(base_path=base_path)