From b855528ab67dc0072b1df5e8e776d410bbdadf6b Mon Sep 17 00:00:00 2001 From: Avik Datta Date: Tue, 16 Dec 2025 11:46:02 +0000 Subject: [PATCH 1/5] updated configs for dag49 --- igf_airflow/utils/dag49_cosmx_metadata_registration_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/igf_airflow/utils/dag49_cosmx_metadata_registration_utils.py b/igf_airflow/utils/dag49_cosmx_metadata_registration_utils.py index 31d44dd6..ee70f5e5 100644 --- a/igf_airflow/utils/dag49_cosmx_metadata_registration_utils.py +++ b/igf_airflow/utils/dag49_cosmx_metadata_registration_utils.py @@ -33,11 +33,11 @@ default_var='/api/v1/raw_cosmx_metadata/mark_ready_metadata_as_synced' ) METADATA_VALIDATION_SCHEMA = Variable.get( - 'igf_portal_conf', + 'manual_metadata_validation_schema', default_var=None ) DEFAULT_EMAIL = Variable.get( - 'default_email', + 'default_email_user', default_var=None ) From bc0a910e16b2b4fe6d81c347e55a4ce5591a87c9 Mon Sep 17 00:00:00 2001 From: Avik Datta Date: Tue, 16 Dec 2025 12:02:11 +0000 Subject: [PATCH 2/5] username is not required for minimal metadata --- data/validation_schema/minimal_metadata_validation.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/validation_schema/minimal_metadata_validation.json b/data/validation_schema/minimal_metadata_validation.json index 9ad5b908..a4bec036 100644 --- a/data/validation_schema/minimal_metadata_validation.json +++ b/data/validation_schema/minimal_metadata_validation.json @@ -49,7 +49,7 @@ "project_igf_id", "deliverable", "name", - "email_id", - "username"] + "email_id" + ] } } \ No newline at end of file From d116312002fbe79e4f52d9e0ac39509035567223 Mon Sep 17 00:00:00 2001 From: Avik Datta Date: Tue, 16 Dec 2025 12:03:01 +0000 Subject: [PATCH 3/5] minor changes --- data/validation_schema/minimal_metadata_validation.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/validation_schema/minimal_metadata_validation.json b/data/validation_schema/minimal_metadata_validation.json index a4bec036..a5c0d17d 100644 --- a/data/validation_schema/minimal_metadata_validation.json +++ b/data/validation_schema/minimal_metadata_validation.json @@ -13,7 +13,7 @@ "project_igf_id" : { "type" : "string", "pattern": "^IGF[a-zA-Z0-9-_]+$", - "maxLength": 50 + "maxLength": 70 }, "deliverable" : { "type" : "string", @@ -23,7 +23,7 @@ "name" : { "type" : "string", "pattern": "^\\w+\\s\\w+\\s?\\w+?$", - "maxLength": 30 + "maxLength": 40 }, "username" : { "type" : "string", From a1fe1efc325ab895742bf74007fc8f02b0188c50 Mon Sep 17 00:00:00 2001 From: Avik Datta Date: Tue, 16 Dec 2025 12:03:43 +0000 Subject: [PATCH 4/5] minor format change --- data/validation_schema/minimal_metadata_validation.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/validation_schema/minimal_metadata_validation.json b/data/validation_schema/minimal_metadata_validation.json index a5c0d17d..6e33ca86 100644 --- a/data/validation_schema/minimal_metadata_validation.json +++ b/data/validation_schema/minimal_metadata_validation.json @@ -4,7 +4,7 @@ "title": "IGF minimal metadata validation schema", "description": "Schema for validation of minimal metadata input file", "type" : "array", - "version": "1.0.0", + "version": "1.1.0", "minItems": 1, "uniqueItems": true, "items": { @@ -17,8 +17,10 @@ }, "deliverable" : { "type" : "string", - "enum" : ["FASTQ", - "COSMX"] + "enum" : [ + "FASTQ", + "COSMX" + ] }, "name" : { "type" : "string", From 80c8e7956b9ba29a74116a1ec6586c7f2608786c Mon Sep 17 00:00:00 2001 From: Avik Datta Date: Tue, 16 Dec 2025 12:13:01 +0000 Subject: [PATCH 5/5] username is required for metadata --- data/validation_schema/minimal_metadata_validation.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/validation_schema/minimal_metadata_validation.json b/data/validation_schema/minimal_metadata_validation.json index 6e33ca86..31442021 100644 --- a/data/validation_schema/minimal_metadata_validation.json +++ b/data/validation_schema/minimal_metadata_validation.json @@ -51,7 +51,8 @@ "project_igf_id", "deliverable", "name", - "email_id" + "email_id", + "username" ] } } \ No newline at end of file