Merge pull request #183 from PNNL-CompBio/sample-schema-fix

Sample schema fix

Author: sgosline

build/beatAML/GetBeatAML.py

@@ -131,9 +131,10 @@ def generate_samples_file(prev_samples_path):
     prot_samples.rename(columns={"specimenType": "common_name"}, inplace=True)
     prot_samples["cancer_type"] = "Acute Myeloid Leukaemia"
     prot_samples["model_type"] = "ex vivo"
-    prot_samples["other_id_source"] = "beatAML"    
+    prot_samples["other_id_source"] = "beatAML"
 
     all_samples = pd.concat([prot_samples, full_samples])
+    all_samples['species'] = 'Homo sapiens'
     maxval = max(pd.read_csv(prev_samples_path).improve_sample_id)
     mapping = {labId: i for i, labId in enumerate(all_samples['other_id'].unique(), start=(int(maxval)+1))}
     all_samples['improve_sample_id'] = all_samples['other_id'].map(mapping)

build/hcmi/01-createHCMISamplesFile.py

@@ -43,6 +43,7 @@ def align_to_linkml_schema(input_df):
     }
 
     # Apply mapping
+    input_df['species'] = 'Homo sapiens' ##i assume they're lal human? 
     input_df['model_type'] = input_df['model_type'].map(mapping_dict)
     input_df.dropna(subset=['model_type'], inplace=True)
 

build/mpnst/00_sample_gen.R

@@ -31,13 +31,13 @@ manifest<-synapser::synTableQuery("select * from syn53503360")$asDataFrame()
 ##first create samples for the original tumors
 tumorTable<-manifest|>
     dplyr::select(common_name='Sample')|>
-    dplyr::mutate(other_id_source='NF Data Portal',cancer_type="Malignant peripheral nerve sheath tumor",species='Human',model_type='tumor')|>
+    dplyr::mutate(other_id_source='NF Data Portal',other_names='',cancer_type="Malignant peripheral nerve sheath tumor",species='Human',model_type='tumor')|>
     tidyr::unite(col='other_id',c('common_name','model_type'),sep=' ',remove=FALSE)
 
 ##then create samples for the PDX
 sampTable<-manifest|>
     dplyr::select(c(common_name='Sample',MicroTissueDrugFolder))|>
-    dplyr::mutate(other_id_source='NF Data Portal',cancer_type="Malignant peripheral nerve sheath tumor",species='Human',model_type='patient derived xenograft')|>
+    dplyr::mutate(other_id_source='NF Data Portal',other_names='',cancer_type="Malignant peripheral nerve sheath tumor",species='Human',model_type='patient derived xenograft')|>
     tidyr::unite(col='other_id',c('common_name','model_type'),sep=' ',remove=FALSE)
 
 

build/mpnst/01_mpnst_get_omics.R

@@ -157,7 +157,8 @@ cnv<-do.call(rbind,lapply(setdiff(combined$CopyNumber,NA),function(x){
       subset(!is.na(entrez_id))|>
       dplyr::select(entrez_id,log2)|>
       dplyr::distinct()|>
-      dplyr::mutate(copy_number=2^log2)
+        dplyr::mutate(copy_number=2^log2)|>
+        dplyr::select(-log2)
 
   res<-long_df|> ##deep del < 0.5210507 < het loss < 0.7311832 < diploid < 1.214125 < gain < 1.422233 < amp
       dplyr::mutate(copy_call=ifelse(copy_number<0.5210507,'deep del',

build/utils/fit_curve.py

@@ -198,8 +198,8 @@ def main():
     fname = args.output or 'combined_single_response_agg'
     process_df_part(df_all, fname, beataml=args.beataml)#, start=args.start, count=args.count)
 
-    if args.beataml == False:
-        format_coderd_schema(fname+'.0')
+#    if args.beataml == False:
+    format_coderd_schema(fname+'.0')
 
 if __name__ == '__main__':
     main()