Merge branch 'master' into d3b-725

kids-first · Sep 10, 2024 · 4e4cbff · 4e4cbff
2 parents c1703ae + 54bece5
commit 4e4cbff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/kf_lib_data_ingest/common/concept_schema.py b/kf_lib_data_ingest/common/concept_schema.py
@@ -213,8 +213,11 @@ class GENOMIC_FILE(PropertyMixin, FileMixin):
         WORKFLOW_TOOL = None
         WORKFLOW_TYPE = None
         WORKFLOW_VERSION = None
+        WORKFLOW_ENDPOINT = None
         FILE_VERSION_DESCRIPTOR = None
         DATA_CATEGORY = None
+        CAVATICA_FILE_ID = None
+        CAVATICA_VOLUME = None
 
     class READ_GROUP(PropertyMixin):
         PAIRED_END = None

diff --git a/kf_lib_data_ingest/target_api_plugins/kids_first_dataservice.py b/kf_lib_data_ingest/target_api_plugins/kids_first_dataservice.py
@@ -769,6 +769,13 @@ def hashes(record):
             "reference_genome": record.get(
                 CONCEPT.GENOMIC_FILE.REFERENCE_GENOME
             ),
+            "cavatica_file_id": record.get(
+                CONCEPT.GENOMIC_FILE.CAVATICA_FILE_ID
+            ),
+            "cavatica_volume": record.get(CONCEPT.GENOMIC_FILE.CAVATICA_VOLUME),
+            "workflow_endpoint": record.get(
+                CONCEPT.GENOMIC_FILE.WORKFLOW_ENDPOINT
+            ),
             "workflow_type": record.get(CONCEPT.GENOMIC_FILE.WORKFLOW_TYPE),
             "workflow_tool": record.get(CONCEPT.GENOMIC_FILE.WORKFLOW_TOOL),
             "workflow_version": record.get(