nci-cidc-schemas 0.26.29__tar.gz → 0.26.32__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of nci-cidc-schemas might be problematic. Click here for more details.

Files changed (234) hide show
  1. {nci_cidc_schemas-0.26.29/nci_cidc_schemas.egg-info → nci_cidc_schemas-0.26.32}/PKG-INFO +1 -1
  2. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/__init__.py +1 -1
  3. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/json_validation.py +4 -4
  4. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/prism/constants.py +2 -0
  5. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/prism/core.py +1 -0
  6. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/prism/extra_metadata.py +1 -0
  7. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/prism/pipelines.py +2 -0
  8. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_core.json +1 -0
  9. nci_cidc_schemas-0.26.32/cidc_schemas/schemas/artifacts/artifact_rdata.json +51 -0
  10. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/available_ngs_analyses.json +3 -0
  11. nci_cidc_schemas-0.26.32/cidc_schemas/schemas/assays/ctdna_analysis.json +52 -0
  12. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/ctdna_assay.json +3 -0
  13. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/ihc_assay.json +3 -2
  14. nci_cidc_schemas-0.26.32/cidc_schemas/schemas/templates/analyses/ctdna_analysis_template.json +121 -0
  15. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/ctdna_template.json +18 -0
  16. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/template.py +6 -4
  17. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/unprism.py +1 -0
  18. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32/nci_cidc_schemas.egg-info}/PKG-INFO +1 -1
  19. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/nci_cidc_schemas.egg-info/SOURCES.txt +4 -0
  20. nci_cidc_schemas-0.26.32/tests/data/schemas/target-templates/ctdna_analysis_template.json +117 -0
  21. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/cidc_test_data/analysis_data.py +222 -0
  22. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/cidc_test_data/assay_data.py +60 -0
  23. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/test_core.py +1 -0
  24. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/test_merger.py +2 -0
  25. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/test_pipelines.py +7 -6
  26. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_assays.py +7 -0
  27. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_template.py +11 -0
  28. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_templates.py +2 -4
  29. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_unprism.py +1 -1
  30. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/LICENSE +0 -0
  31. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/MANIFEST.in +0 -0
  32. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/README.md +0 -0
  33. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/cli.py +0 -0
  34. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/constants.py +0 -0
  35. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/metaschema/strict_meta_schema.json +0 -0
  36. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/migrations.py +0 -0
  37. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/pipeline_configs/rna_level1_analysis_config.yaml.j2 +0 -0
  38. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/prism/__init__.py +0 -0
  39. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/prism/merger.py +0 -0
  40. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/aliquot.json +0 -0
  41. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_bam.json +0 -0
  42. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_bam_bai.json +0 -0
  43. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_bed.json +0 -0
  44. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_bigwig.json +0 -0
  45. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_binary.json +0 -0
  46. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_clinical_csv.json +0 -0
  47. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_clinical_docx.json +0 -0
  48. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_clinical_xlsx.json +0 -0
  49. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_cncf.json +0 -0
  50. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_cns.json +0 -0
  51. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_csv.json +0 -0
  52. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_elisa_xlsx.json +0 -0
  53. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_fastq_gz.json +0 -0
  54. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_fcs.json +0 -0
  55. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_file.json +0 -0
  56. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_gz.json +0 -0
  57. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_image.json +0 -0
  58. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_jpg.json +0 -0
  59. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_json.json +0 -0
  60. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_junction.json +0 -0
  61. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_log.json +0 -0
  62. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_maf.json +0 -0
  63. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_narrowPeak.json +0 -0
  64. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_npx.json +0 -0
  65. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_pdf.json +0 -0
  66. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_png.json +0 -0
  67. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_rcc.json +0 -0
  68. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_tbi.json +0 -0
  69. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_text.json +0 -0
  70. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_tsv.json +0 -0
  71. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_vcf.json +0 -0
  72. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_vcf_gz.json +0 -0
  73. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_xlsx.json +0 -0
  74. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_yaml.json +0 -0
  75. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/artifacts/artifact_zip.json +0 -0
  76. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/atacseq_assay.json +0 -0
  77. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/antibody.json +0 -0
  78. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/assay_core.json +0 -0
  79. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/available_assays.json +0 -0
  80. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/composite_image.json +0 -0
  81. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/controls.json +0 -0
  82. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/enrichment_core.json +0 -0
  83. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/excluded_samples.json +0 -0
  84. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/image.json +0 -0
  85. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/imaging/mif_entry.json +0 -0
  86. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/imaging/mif_export.json +0 -0
  87. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/imaging/mif_input.json +0 -0
  88. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/imaging/mif_roi.json +0 -0
  89. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/imaging_data.json +0 -0
  90. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/local_file.json +0 -0
  91. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/mapping.json +0 -0
  92. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/mibi_antibody.json +0 -0
  93. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/mif_antibody.json +0 -0
  94. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/multiple_local_files.json +0 -0
  95. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/atacseq/atacseq_analysis.json +0 -0
  96. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/ngs_assay_record.json +0 -0
  97. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/rna/fusion.json +0 -0
  98. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/rna/microbiome.json +0 -0
  99. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/rna/msisensor.json +0 -0
  100. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/rna/neoantigen.json +0 -0
  101. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/rna/rna_analysis.json +0 -0
  102. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/rna/rna_level1_analysis.json +0 -0
  103. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/rna/rseqc.json +0 -0
  104. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/rna/salmon.json +0 -0
  105. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/rna/star.json +0 -0
  106. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs/rna/trust4.json +0 -0
  107. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs_assay_core.json +0 -0
  108. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/ngs_assay_record.json +0 -0
  109. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/reads_core.json +0 -0
  110. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/components/reads_with_index.json +0 -0
  111. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/cytof_assay.json +0 -0
  112. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/cytof_assay_core.json +0 -0
  113. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/elisa_assay.json +0 -0
  114. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/hande_assay.json +0 -0
  115. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/mibi_assay.json +0 -0
  116. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/microbiome_assay.json +0 -0
  117. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/mif_assay.json +0 -0
  118. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/misc_data.json +0 -0
  119. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/nanostring_assay.json +0 -0
  120. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/olink_assay.json +0 -0
  121. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/rna_assay-v0.json +0 -0
  122. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/rna_assay.json +0 -0
  123. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/tcr_analysis.json +0 -0
  124. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/tcr_assay.json +0 -0
  125. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/wes_analysis.json +0 -0
  126. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/wes_assay.json +0 -0
  127. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/wes_core.json +0 -0
  128. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/assays/wes_tumor_only_analysis.json +0 -0
  129. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/clinical_data.json +0 -0
  130. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/clinical_trial.json +0 -0
  131. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/participant.json +0 -0
  132. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/sample.json +0 -0
  133. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/shipping_core.json +0 -0
  134. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/analyses/atacseq_analysis_template.json +0 -0
  135. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/analyses/cytof_analysis_template.json +0 -0
  136. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/analyses/rna_level1_analysis_template.json +0 -0
  137. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/analyses/tcr_analysis_template.json +0 -0
  138. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/analyses/wes_analysis_template.json +0 -0
  139. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/analyses/wes_tumor_only_analysis_template.json +0 -0
  140. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/atacseq_fastq_template.json +0 -0
  141. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/clinical_data_template.json +0 -0
  142. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/cytof_template.json +0 -0
  143. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/elisa_template.json +0 -0
  144. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/hande_template.json +0 -0
  145. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/ihc_template.json +0 -0
  146. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/mibi_template.json +0 -0
  147. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/microbiome_template.json +0 -0
  148. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/mif_template.json +0 -0
  149. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/misc_data_template.json +0 -0
  150. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/nanostring_template.json +0 -0
  151. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/olink_template.json +0 -0
  152. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/rna_bam_template.json +0 -0
  153. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/rna_fastq_template.json +0 -0
  154. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/tcr_adaptive_template.json +0 -0
  155. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/tcr_fastq_template.json +0 -0
  156. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/wes_bam_template.json +0 -0
  157. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/assays/wes_fastq_template.json +0 -0
  158. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/manifests/h_and_e_template.json +0 -0
  159. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/manifests/microbiome_dna_template.json +0 -0
  160. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/manifests/normal_blood_dna_template.json +0 -0
  161. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/manifests/normal_tissue_dna_template.json +0 -0
  162. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/manifests/pbmc_template.json +0 -0
  163. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/manifests/plasma_template.json +0 -0
  164. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/manifests/tissue_slide_template.json +0 -0
  165. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/manifests/tumor_normal_pairing_template.json +0 -0
  166. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/manifests/tumor_tissue_dna_template.json +0 -0
  167. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/schemas/templates/manifests/tumor_tissue_rna_template.json +0 -0
  168. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/template_reader.py +0 -0
  169. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/template_writer.py +0 -0
  170. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/cidc_schemas/util.py +0 -0
  171. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/nci_cidc_schemas.egg-info/dependency_links.txt +0 -0
  172. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/nci_cidc_schemas.egg-info/entry_points.txt +0 -0
  173. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/nci_cidc_schemas.egg-info/not-zip-safe +0 -0
  174. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/nci_cidc_schemas.egg-info/requires.txt +0 -0
  175. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/nci_cidc_schemas.egg-info/top_level.txt +0 -0
  176. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/requirements.txt +0 -0
  177. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/setup.cfg +0 -0
  178. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/setup.py +0 -0
  179. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/__init__.py +0 -0
  180. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/conftest.py +0 -0
  181. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/constants.py +0 -0
  182. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinical_test_file.1.csv +0 -0
  183. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinical_test_file.1.xlsx +0 -0
  184. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinical_test_file.2.bom.csv +0 -0
  185. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinical_test_file.2.csv +0 -0
  186. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinical_test_file.2.xlsx +0 -0
  187. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinical_test_file.3.xlsx +0 -0
  188. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinical_test_file.docx +0 -0
  189. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinicaltrial_examples/CT_1.json +0 -0
  190. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinicaltrial_examples/CT_1PA_multiWES.json +0 -0
  191. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinicaltrial_examples/CT_cytof_with_analysis.json +0 -0
  192. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinicaltrial_examples/CT_ihc.json +0 -0
  193. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/clinicaltrial_examples/CT_minimal.json +0 -0
  194. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/date_examples.xlsx +0 -0
  195. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/elisa_test_file.1.xlsx +0 -0
  196. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/elisa_test_file.2.xlsx +0 -0
  197. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/hande_err_template.xlsx +0 -0
  198. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/olink/invalid_olink_assay_1_NPX.xlsx +0 -0
  199. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/olink/olink_assay_1_NPX.xlsx +0 -0
  200. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/olink/olink_assay_2_NPX.xlsx +0 -0
  201. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/olink/olink_assay_combined.xlsx +0 -0
  202. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/pbmc_invalid.xlsx +0 -0
  203. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/schemas/1.json +0 -0
  204. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/schemas/a.json +0 -0
  205. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/schemas/b.json +0 -0
  206. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/schemas/c.json +0 -0
  207. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/schemas/d1/3.json +0 -0
  208. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/schemas/d1/d2/2.json +0 -0
  209. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/schemas/invalid_ref.json +0 -0
  210. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/schemas/target-templates/atacseq_analysis_template.json +0 -0
  211. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/schemas/target-templates/rna_level1_analysis_template.json +0 -0
  212. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/schemas/target-templates/wes_analysis_template.json +0 -0
  213. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/schemas/target-templates/wes_tumor_only_analysis_template.json +0 -0
  214. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/tiny_invalid_manifest.xlsx +0 -0
  215. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/data/tiny_valid_manifest.xlsx +0 -0
  216. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/__init__.py +0 -0
  217. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/cidc_test_data/__init__.py +0 -0
  218. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/cidc_test_data/manifest_data.py +0 -0
  219. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/cidc_test_data/utils.py +0 -0
  220. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/schema/test_schema.json +0 -0
  221. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/test_cidc_data_model.py +0 -0
  222. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/test_constants.py +0 -0
  223. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/prism/test_extra_metadata.py +0 -0
  224. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_artifacts.py +0 -0
  225. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_clinicaltrial_examples.py +0 -0
  226. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_json_validation.py +0 -0
  227. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_migrations.py +0 -0
  228. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_schemas.py +0 -0
  229. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_strict_meta_schema.py +0 -0
  230. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_template_reader.py +0 -0
  231. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_template_writer.py +0 -0
  232. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_trial_core.py +0 -0
  233. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/test_util.py +0 -0
  234. {nci_cidc_schemas-0.26.29 → nci_cidc_schemas-0.26.32}/tests/utils/test_template_generator.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: nci_cidc_schemas
3
- Version: 0.26.29
3
+ Version: 0.26.32
4
4
  Summary: The CIDC data model and tools for working with it.
5
5
  Home-page: https://github.com/NCI-CIDC/cidc-schemas
6
6
  Author: NCI
@@ -2,4 +2,4 @@
2
2
 
3
3
  __author__ = """NCI"""
4
4
  __email__ = "nci-cidc-tools-admin@mail.nih.gov"
5
- __version__ = "0.26.29"
5
+ __version__ = "0.26.32"
@@ -110,10 +110,10 @@ class _Validator(jsonschema.Draft7Validator):
110
110
  ref_path_pattern = scope["ref_path_pattern"]
111
111
  # If there are no cached values for this ref path pattern, collect them
112
112
  if ref_path_pattern not in self._in_doc_refs_cache:
113
- self._in_doc_refs_cache[
114
- ref_path_pattern
115
- ] = self._get_values_for_path_pattern(
116
- ref_path_pattern, instance
113
+ self._in_doc_refs_cache[ref_path_pattern] = (
114
+ self._get_values_for_path_pattern(
115
+ ref_path_pattern, instance
116
+ )
117
117
  )
118
118
 
119
119
  # see: https://docs.python.org/3/library/contextlib.html
@@ -51,6 +51,7 @@ SUPPORTED_ANALYSES = [
51
51
  "tcr_analysis",
52
52
  "wes_analysis",
53
53
  "wes_tumor_only_analysis",
54
+ "ctdna_analysis",
54
55
  ]
55
56
 
56
57
  SUPPORTED_TEMPLATES = SUPPORTED_ASSAYS + SUPPORTED_MANIFESTS + SUPPORTED_ANALYSES
@@ -62,6 +63,7 @@ ASSAY_TO_FILEPATH: Dict[str, str] = {
62
63
  "rna_level1_analysis": "rna/",
63
64
  "wes_analysis": "wes/",
64
65
  "wes_tumor_only_analysis": "wes_tumor_only/",
66
+ "ctdna_analysis": "ctdna/",
65
67
  # assay specifics removed
66
68
  "atacseq_fastq": "atacseq/",
67
69
  "rna_bam": "rna/",
@@ -1,4 +1,5 @@
1
1
  """Build metadata dictionaries from Excel files."""
2
+
2
3
  import logging
3
4
  import base64
4
5
  import hmac
@@ -1,4 +1,5 @@
1
1
  """Parsers for extracting extra metadata from files containing molecular data."""
2
+
2
3
  import logging
3
4
  import re
4
5
  from codecs import BOM_UTF8
@@ -1,4 +1,5 @@
1
1
  """Analysis pipeline configuration generators."""
2
+
2
3
  from collections import defaultdict
3
4
  from datetime import datetime
4
5
  from io import BytesIO
@@ -15,6 +16,7 @@ from ..util import load_pipeline_config_template, participant_id_from_cimac
15
16
 
16
17
  logger = logging.getLogger(__file__)
17
18
 
19
+
18
20
  # Note, bucket names must be all lowercase, dash, and underscore
19
21
  # https://cloud.google.com/storage/docs/naming-buckets#requirements
20
22
  def RNA_GOOGLE_BUCKET_PATH_FN(trial_id: str, batch_num: int) -> str:
@@ -0,0 +1,51 @@
1
+ {
2
+ "$schema": "metaschema/strict_meta_schema.json#",
3
+ "$id": "rdata_artifact",
4
+ "title": "RData Artifact",
5
+ "type": "object",
6
+ "description": "Information about a rdata file.",
7
+ "additionalProperties": false,
8
+ "properties": {
9
+ "data_format": {
10
+ "description": "Data format.",
11
+ "const": "RDATA"
12
+ },
13
+ "upload_placeholder": {
14
+ "$ref": "artifacts/artifact_core.json#properties/upload_placeholder"
15
+ },
16
+ "artifact_creator": {
17
+ "$ref": "artifacts/artifact_core.json#properties/artifact_creator"
18
+ },
19
+ "uploader": { "$ref": "artifacts/artifact_core.json#properties/uploader" },
20
+ "uuid": { "$ref": "artifacts/artifact_core.json#properties/uuid" },
21
+ "file_name": {
22
+ "$ref": "artifacts/artifact_core.json#properties/file_name"
23
+ },
24
+ "object_url": {
25
+ "$ref": "artifacts/artifact_core.json#properties/object_url"
26
+ },
27
+ "uploaded_timestamp": {
28
+ "$ref": "artifacts/artifact_core.json#properties/uploaded_timestamp"
29
+ },
30
+ "file_size_bytes": {
31
+ "$ref": "artifacts/artifact_core.json#properties/file_size_bytes"
32
+ },
33
+ "md5_hash": { "$ref": "artifacts/artifact_core.json#properties/md5_hash" },
34
+ "crc32c_hash": {
35
+ "$ref": "artifacts/artifact_core.json#properties/crc32c_hash"
36
+ },
37
+ "visible": { "$ref": "artifacts/artifact_core.json#properties/visible" },
38
+ "artifact_category": {
39
+ "$ref": "artifacts/artifact_core.json#properties/artifact_category"
40
+ },
41
+ "facet_group": {
42
+ "$ref": "artifacts/artifact_core.json#properties/facet_group"
43
+ }
44
+ },
45
+ "allOf": [
46
+ {
47
+ "$ref": "artifacts/artifact_core.json"
48
+ }
49
+ ],
50
+ "mergeStrategy": "objectMerge"
51
+ }
@@ -13,6 +13,9 @@
13
13
  "wes_tumor_only_analysis": {
14
14
  "$ref": "assays/wes_tumor_only_analysis.json"
15
15
  },
16
+ "ctdna_analysis": {
17
+ "$ref": "assays/ctdna_analysis.json"
18
+ },
16
19
  "wes_analysis_old": {
17
20
  "$ref": "assays/wes_analysis.json"
18
21
  },
@@ -0,0 +1,52 @@
1
+ {
2
+ "$schema": "metaschema/strict_meta_schema.json#",
3
+ "$id": "ctdna_analysis",
4
+ "title": "ctDNA analysis",
5
+ "type": "object",
6
+ "description": "Combined analysis files for the ctDNA assay.",
7
+
8
+ "definitions": {
9
+ "sample_analysis": {
10
+ "type": "object",
11
+ "description": "ctDNA assay output files for a tumor normal pair of samples.",
12
+
13
+ "required": [
14
+ "run_id",
15
+ "tumor"
16
+ ],
17
+ "additionalProperties": false,
18
+ "properties": {
19
+ "run_id": {
20
+ "type": "string",
21
+ "description": "An id used as if this was a paired analysis run."
22
+ },
23
+ "error": { "$ref": "assays/wes_core.json#properties/error" },
24
+ "tumor": { "$ref": "assays/wes_assay.json#definitions/sample_analysis" },
25
+ "comments": {
26
+ "type": "string",
27
+ "description": "Comments on the tumor-only analysis run."
28
+ }
29
+ }
30
+ }
31
+ },
32
+
33
+ "required": [],
34
+ "additionalProperties": false,
35
+ "properties": {
36
+ "runs": {
37
+ "type": "array",
38
+ "items": {
39
+ "$ref": "assays/ctdna_analysis.json#definitions/sample_analysis"
40
+ },
41
+ "mergeStrategy": "arrayMergeById",
42
+ "mergeOptions": {
43
+ "$comment": "TODO fix to merge by a pair of normal and tumor ids. It requires improvements to the merge strategy code.",
44
+ "idRef": "/run_id"
45
+ }
46
+ },
47
+ "batch_id": {"$ref": "assays/tcr_assay.json#properties/batch_id"},
48
+ "excluded_samples": {
49
+ "$ref": "assays/components/excluded_samples.json"
50
+ }
51
+ }
52
+ }
@@ -41,6 +41,9 @@
41
41
  "bias_qc_plots": {"$ref": "artifacts/artifact_pdf.json"},
42
42
  "optimal_solution": {"$ref": "artifacts/artifact_zip.json"},
43
43
  "other_solutions": {"$ref": "artifacts/artifact_zip.json"},
44
+ "on_premise_corrected_depth_file": {"$ref": "artifacts/artifact_text.json"},
45
+ "on_premise_parameters_file": {"$ref": "artifacts/artifact_text.json"},
46
+ "on_premise_rdata_file": {"$ref": "artifacts/artifact_rdata.json"},
44
47
 
45
48
  "fraction_cna_subclonal": {
46
49
  "description": "Fraction of copy number altered bins that are subclonal. Accepts NaN. (0-1)",
@@ -129,7 +129,8 @@
129
129
  "enum": [
130
130
  "Vectra 2.0",
131
131
  "Hamamatsu",
132
- "AT2 Turbo"
132
+ "AT2 Turbo",
133
+ "Akoya PhenoImager HT"
133
134
  ]
134
135
  },
135
136
  "staining_platform": {
@@ -171,4 +172,4 @@
171
172
  "records"
172
173
  ],
173
174
  "mergeStrategy": "objectMerge"
174
- }
175
+ }
@@ -0,0 +1,121 @@
1
+ {
2
+ "title": "ctDNA analysis template",
3
+ "description": "ctDNA analysis submission.",
4
+ "prism_template_root_object_schema": "assays/ctdna_analysis.json",
5
+ "prism_template_root_object_pointer": "/analysis/ctdna_analysis",
6
+ "properties": {
7
+ "worksheets": {
8
+ "ctDNA Analysis": {
9
+ "preamble_rows": {
10
+ "protocol identifier": {
11
+ "merge_pointer": "2/protocol_identifier",
12
+ "type_ref": "clinical_trial.json#properties/protocol_identifier"
13
+ },
14
+ "folder": {
15
+ "do_not_merge": true,
16
+ "type": "string",
17
+ "allow_empty": true
18
+ },
19
+ "batch id": {
20
+ "merge_pointer": "0/batch_id",
21
+ "type_ref": "assays/tcr_assay.json#properties/batch_id"
22
+ }
23
+ },
24
+ "prism_data_object_pointer": "/runs/-",
25
+ "data_columns": {
26
+ "ctDNA Runs": {
27
+ "run id": {
28
+ "merge_pointer": "/run_id",
29
+ "type_ref": "assays/ctdna_analysis.json#definitions/sample_analysis/properties/run_id",
30
+ "process_as": [
31
+ {
32
+ "parse_through": "lambda run: f'{folder or \"\"}analysis/{run}_error.yaml'",
33
+ "merge_pointer": "/error",
34
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/error.yaml",
35
+ "type_ref": "assays/components/local_file.json#properties/file_path",
36
+ "is_artifact": 1,
37
+ "allow_empty": true
38
+ }
39
+ ]
40
+ },
41
+ "cimac id": {
42
+ "merge_pointer": "/tumor/cimac_id",
43
+ "type_ref": "sample.json#properties/cimac_id",
44
+ "process_as": [
45
+ {
46
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/align/{id}/{id}.sorted.dedup.bam'",
47
+ "merge_pointer": "/tumor/alignment/align_sorted_dedup",
48
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/sorted.dedup.bam",
49
+ "type_ref": "assays/components/local_file.json#properties/file_path",
50
+ "is_artifact": 1
51
+ },
52
+ {
53
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/align/{id}/{id}.sorted.dedup.bam.bai'",
54
+ "merge_pointer": "/tumor/alignment/align_sorted_dedup_index",
55
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/sorted.dedup.bam.bai",
56
+ "type_ref": "assays/components/local_file.json#properties/file_path",
57
+ "is_artifact": 1
58
+ },
59
+ {
60
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/align/{id}/{id}_recalibrated.bam'",
61
+ "merge_pointer": "/tumor/alignment/align_recalibrated",
62
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/recalibrated.bam",
63
+ "type_ref": "assays/components/local_file.json#properties/file_path",
64
+ "is_artifact": 1
65
+ },
66
+ {
67
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/align/{id}/{id}_recalibrated.bam.bai'",
68
+ "merge_pointer": "/tumor/alignment/align_recalibrated_index",
69
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/recalibrated.bam.bai",
70
+ "type_ref": "assays/components/local_file.json#properties/file_path",
71
+ "is_artifact": 1
72
+ },
73
+ {
74
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/hlahd/{id}/result/{id}_final.result.txt'",
75
+ "merge_pointer": "/tumor/hla/hla_final_result",
76
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/hla_final_result.txt",
77
+ "type_ref": "assays/components/local_file.json#properties/file_path",
78
+ "is_artifact": 1
79
+ },
80
+ {
81
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/optitype/{id}/{id}_result.tsv'",
82
+ "merge_pointer": "/tumor/hla/optitype_result",
83
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/optitype_result.tsv",
84
+ "type_ref": "assays/components/local_file.json#properties/file_path",
85
+ "is_artifact": 1
86
+ },
87
+ {
88
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/xhla/{id}/report-{id}-hla.json'",
89
+ "merge_pointer": "/tumor/hla/xhla_report_hla",
90
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/xhla_report_hla.json",
91
+ "type_ref": "assays/components/local_file.json#properties/file_path",
92
+ "is_artifact": 1
93
+ }
94
+ ]
95
+ },
96
+ "comments": {
97
+ "type_ref": "assays/ctdna_analysis.json#definitions/sample_analysis/properties/comments",
98
+ "merge_pointer": "0/comments",
99
+ "allow_empty": true
100
+ }
101
+ }
102
+ }
103
+ },
104
+ "Excluded Samples": {
105
+ "prism_data_object_pointer": "/excluded_samples/-",
106
+ "data_columns": {
107
+ "Samples Excluded From Analysis": {
108
+ "cimac id": {
109
+ "type_ref": "sample.json#properties/cimac_id",
110
+ "merge_pointer": "0/cimac_id"
111
+ },
112
+ "reason": {
113
+ "type_ref": "assays/components/excluded_samples.json#items/properties/reason_excluded",
114
+ "merge_pointer": "0/reason_excluded"
115
+ }
116
+ }
117
+ }
118
+ }
119
+ }
120
+ }
121
+ }
@@ -93,6 +93,24 @@
93
93
  "merge_pointer": "0/tumor_fraction",
94
94
  "type_ref": "assays/ctdna_assay.json#definitions/entry/properties/tumor_fraction"
95
95
  },
96
+ "on premise corrected depth file": {
97
+ "merge_pointer": "0/on_premise_corrected_depth_file",
98
+ "type_ref": "assays/components/local_file.json#properties/file_path",
99
+ "is_artifact": 1,
100
+ "gcs_uri_format": "{protocol identifier}/ctdna/{batch id}/{cimac id}/OnPrem.correctedDepth.txt"
101
+ },
102
+ "on premise parameters file": {
103
+ "merge_pointer": "0/on_premise_parameters_file",
104
+ "type_ref": "assays/components/local_file.json#properties/file_path",
105
+ "is_artifact": 1,
106
+ "gcs_uri_format": "{protocol identifier}/ctdna/{batch id}/{cimac id}/OnPrem.params.txt"
107
+ },
108
+ "on premise rdata file": {
109
+ "merge_pointer": "0/on_premise_rdata_file",
110
+ "type_ref": "assays/components/local_file.json#properties/file_path",
111
+ "is_artifact": 1,
112
+ "gcs_uri_format": "{protocol identifier}/ctdna/{batch id}/{cimac id}/OnPrem.RData"
113
+ },
96
114
  "comments": {
97
115
  "type_ref": "assays/ctdna_assay.json#definitions/entry/properties/comments",
98
116
  "merge_pointer": "0/comments",
@@ -232,6 +232,7 @@ def _initialize_template_schema(name: str, title: str, pointer: str):
232
232
  "rna": "RNA sequencing Level 1",
233
233
  "wes": "Whole Exome Sequencing (WES) Tumor-Normal Paired",
234
234
  "wes_tumor_only": "Whole Exome Sequencing (WES) Tumor-Only",
235
+ "ctDNA": "ctDNA",
235
236
  }[name]
236
237
 
237
238
  # static
@@ -419,6 +420,7 @@ def _convert_api_to_template(name: str, schema: dict, assay_schema: dict):
419
420
  "rna": "RNAseq level 1",
420
421
  "wes": "WES",
421
422
  "wes_tumor_only": "WES tumor-only",
423
+ "ctdna": "ctDNA",
422
424
  }[name]
423
425
 
424
426
  pointer = [
@@ -825,7 +827,7 @@ class _FieldDef(NamedTuple):
825
827
  uuid=file_uuid,
826
828
  format_context=dict(
827
829
  format_context,
828
- num=num # add num to be able to generate
830
+ num=num, # add num to be able to generate
829
831
  # different gcs keys for each multi-artifact file.
830
832
  ),
831
833
  )
@@ -1002,9 +1004,9 @@ class Template:
1002
1004
  data_schemas[table_name] = process_fields(table_schema)
1003
1005
  processed_worksheet[section_name] = data_schemas
1004
1006
  elif section_name == "prism_arbitrary_data_merge_pointer":
1005
- processed_worksheet[
1006
- "prism_arbitrary_data_merge_pointer"
1007
- ] = section_schema
1007
+ processed_worksheet["prism_arbitrary_data_merge_pointer"] = (
1008
+ section_schema
1009
+ )
1008
1010
 
1009
1011
  return processed_worksheet
1010
1012
 
@@ -1,4 +1,5 @@
1
1
  """Tools from extracting information from trial metadata blobs."""
2
+
2
3
  from io import StringIO, BytesIO
3
4
  from typing import Callable, Dict, List, NamedTuple, Optional, Union
4
5
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: nci_cidc_schemas
3
- Version: 0.26.29
3
+ Version: 0.26.32
4
4
  Summary: The CIDC data model and tools for working with it.
5
5
  Home-page: https://github.com/NCI-CIDC/cidc-schemas
6
6
  Author: NCI
@@ -56,6 +56,7 @@ cidc_schemas/schemas/artifacts/artifact_npx.json
56
56
  cidc_schemas/schemas/artifacts/artifact_pdf.json
57
57
  cidc_schemas/schemas/artifacts/artifact_png.json
58
58
  cidc_schemas/schemas/artifacts/artifact_rcc.json
59
+ cidc_schemas/schemas/artifacts/artifact_rdata.json
59
60
  cidc_schemas/schemas/artifacts/artifact_tbi.json
60
61
  cidc_schemas/schemas/artifacts/artifact_text.json
61
62
  cidc_schemas/schemas/artifacts/artifact_tsv.json
@@ -65,6 +66,7 @@ cidc_schemas/schemas/artifacts/artifact_xlsx.json
65
66
  cidc_schemas/schemas/artifacts/artifact_yaml.json
66
67
  cidc_schemas/schemas/artifacts/artifact_zip.json
67
68
  cidc_schemas/schemas/assays/atacseq_assay.json
69
+ cidc_schemas/schemas/assays/ctdna_analysis.json
68
70
  cidc_schemas/schemas/assays/ctdna_assay.json
69
71
  cidc_schemas/schemas/assays/cytof_assay.json
70
72
  cidc_schemas/schemas/assays/cytof_assay_core.json
@@ -121,6 +123,7 @@ cidc_schemas/schemas/assays/components/ngs/rna/salmon.json
121
123
  cidc_schemas/schemas/assays/components/ngs/rna/star.json
122
124
  cidc_schemas/schemas/assays/components/ngs/rna/trust4.json
123
125
  cidc_schemas/schemas/templates/analyses/atacseq_analysis_template.json
126
+ cidc_schemas/schemas/templates/analyses/ctdna_analysis_template.json
124
127
  cidc_schemas/schemas/templates/analyses/cytof_analysis_template.json
125
128
  cidc_schemas/schemas/templates/analyses/rna_level1_analysis_template.json
126
129
  cidc_schemas/schemas/templates/analyses/tcr_analysis_template.json
@@ -210,6 +213,7 @@ tests/data/schemas/invalid_ref.json
210
213
  tests/data/schemas/d1/3.json
211
214
  tests/data/schemas/d1/d2/2.json
212
215
  tests/data/schemas/target-templates/atacseq_analysis_template.json
216
+ tests/data/schemas/target-templates/ctdna_analysis_template.json
213
217
  tests/data/schemas/target-templates/rna_level1_analysis_template.json
214
218
  tests/data/schemas/target-templates/wes_analysis_template.json
215
219
  tests/data/schemas/target-templates/wes_tumor_only_analysis_template.json
@@ -0,0 +1,117 @@
1
+ {
2
+ "title": "ctDNA analysis template",
3
+ "description": "ctDNA analysis submission.",
4
+ "prism_template_root_object_schema": "assays/ctdna_analysis.json",
5
+ "prism_template_root_object_pointer": "/analysis/ctdna_analysis",
6
+ "properties": {
7
+ "worksheets": {
8
+ "ctDNA Analysis": {
9
+ "preamble_rows": {
10
+ "protocol identifier": {
11
+ "merge_pointer": "2/protocol_identifier",
12
+ "type_ref": "clinical_trial.json#properties/protocol_identifier"
13
+ },
14
+ "folder": {
15
+ "do_not_merge": true,
16
+ "type": "string",
17
+ "allow_empty": true
18
+ }
19
+ },
20
+ "prism_data_object_pointer": "/runs/-",
21
+ "data_columns": {
22
+ "ctDNA Runs": {
23
+ "run id": {
24
+ "merge_pointer": "/run_id",
25
+ "type_ref": "assays/ctdna_analysis.json#definitions/sample_analysis/properties/run_id",
26
+ "process_as": [
27
+ {
28
+ "parse_through": "lambda run: f'{folder or \"\"}analysis/{run}_error.yaml'",
29
+ "merge_pointer": "/error",
30
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/error.yaml",
31
+ "type_ref": "assays/components/local_file.json#properties/file_path",
32
+ "is_artifact": 1,
33
+ "allow_empty": true
34
+ }
35
+ ]
36
+ },
37
+ "cimac id": {
38
+ "merge_pointer": "/tumor/cimac_id",
39
+ "type_ref": "sample.json#properties/cimac_id",
40
+ "process_as": [
41
+ {
42
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/align/{id}/{id}.sorted.dedup.bam'",
43
+ "merge_pointer": "/tumor/alignment/align_sorted_dedup",
44
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/sorted.dedup.bam",
45
+ "type_ref": "assays/components/local_file.json#properties/file_path",
46
+ "is_artifact": 1
47
+ },
48
+ {
49
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/align/{id}/{id}.sorted.dedup.bam.bai'",
50
+ "merge_pointer": "/tumor/alignment/align_sorted_dedup_index",
51
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/sorted.dedup.bam.bai",
52
+ "type_ref": "assays/components/local_file.json#properties/file_path",
53
+ "is_artifact": 1
54
+ },
55
+ {
56
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/align/{id}/{id}_recalibrated.bam'",
57
+ "merge_pointer": "/tumor/alignment/align_recalibrated",
58
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/recalibrated.bam",
59
+ "type_ref": "assays/components/local_file.json#properties/file_path",
60
+ "is_artifact": 1
61
+ },
62
+ {
63
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/align/{id}/{id}_recalibrated.bam.bai'",
64
+ "merge_pointer": "/tumor/alignment/align_recalibrated_index",
65
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/recalibrated.bam.bai",
66
+ "type_ref": "assays/components/local_file.json#properties/file_path",
67
+ "is_artifact": 1
68
+ },
69
+ {
70
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/hlahd/{id}/result/{id}_final.result.txt'",
71
+ "merge_pointer": "/tumor/hla/hla_final_result",
72
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/hla_final_result.txt",
73
+ "type_ref": "assays/components/local_file.json#properties/file_path",
74
+ "is_artifact": 1
75
+ },
76
+ {
77
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/optitype/{id}/{id}_result.tsv'",
78
+ "merge_pointer": "/tumor/hla/optitype_result",
79
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/optitype_result.tsv",
80
+ "type_ref": "assays/components/local_file.json#properties/file_path",
81
+ "is_artifact": 1
82
+ },
83
+ {
84
+ "parse_through": "lambda id: f'{folder or \"\"}analysis/xhla/{id}/report-{id}-hla.json'",
85
+ "merge_pointer": "/tumor/hla/xhla_report_hla",
86
+ "gcs_uri_format": "{protocol identifier}/ctdna/{run id}/analysis/tumor/{cimac id}/xhla_report_hla.json",
87
+ "type_ref": "assays/components/local_file.json#properties/file_path",
88
+ "is_artifact": 1
89
+ }
90
+ ]
91
+ },
92
+ "comments": {
93
+ "type_ref": "assays/ctdna_analysis.json#definitions/sample_analysis/properties/comments",
94
+ "merge_pointer": "0/comments",
95
+ "allow_empty": true
96
+ }
97
+ }
98
+ }
99
+ },
100
+ "Excluded Samples": {
101
+ "prism_data_object_pointer": "/excluded_samples/-",
102
+ "data_columns": {
103
+ "Samples Excluded From Analysis": {
104
+ "cimac id": {
105
+ "type_ref": "sample.json#properties/cimac_id",
106
+ "merge_pointer": "0/cimac_id"
107
+ },
108
+ "reason": {
109
+ "type_ref": "assays/components/excluded_samples.json#items/properties/reason_excluded",
110
+ "merge_pointer": "0/reason_excluded"
111
+ }
112
+ }
113
+ }
114
+ }
115
+ }
116
+ }
117
+ }