From c179922d8f4e95f5605c7bed985817e5c4745501 Mon Sep 17 00:00:00 2001 From: HuangXiaoyan0106 Date: Thu, 4 Apr 2024 22:06:57 +0800 Subject: [PATCH 1/3] :sparkles: add princess maxima center --- kf_lib_data_ingest/common/constants.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kf_lib_data_ingest/common/constants.py b/kf_lib_data_ingest/common/constants.py index 01eb5a0e..d7a12a90 100644 --- a/kf_lib_data_ingest/common/constants.py +++ b/kf_lib_data_ingest/common/constants.py @@ -249,6 +249,10 @@ class NCI: class NIH: NAME = "National Institutes of Health" KF_ID = "SC_HEXD2E5R" + + class PRINCESS_MAXIMA: + NAME = "Princess Maxima Center" + KF_ID = "SC_V4CCQ3WE" class SICKKIDS: NAME = "SickKids" From c2c67fa0511c2957d036b732382e4abd9bd8900b Mon Sep 17 00:00:00 2001 From: HuangXiaoyan0106 Date: Mon, 8 Apr 2024 21:25:32 +0800 Subject: [PATCH 2/3] :lipstick: black constants.py --- kf_lib_data_ingest/common/constants.py | 62 ++++++-------------------- 1 file changed, 13 insertions(+), 49 deletions(-) diff --git a/kf_lib_data_ingest/common/constants.py b/kf_lib_data_ingest/common/constants.py index d7a12a90..07755655 100644 --- a/kf_lib_data_ingest/common/constants.py +++ b/kf_lib_data_ingest/common/constants.py @@ -249,7 +249,7 @@ class NCI: class NIH: NAME = "National Institutes of Health" KF_ID = "SC_HEXD2E5R" - + class PRINCESS_MAXIMA: NAME = "Princess Maxima Center" KF_ID = "SC_V4CCQ3WE" @@ -779,29 +779,14 @@ class GENDER: # relates generic relationship terms to gendered ones GENDERED_RELATIONSHIPS = { # PARTNERS: - R.SPOUSE: { - GENDER.MALE: R.HUSBAND, - GENDER.FEMALE: R.WIFE, - }, + R.SPOUSE: {GENDER.MALE: R.HUSBAND, GENDER.FEMALE: R.WIFE,}, # PARENTS: - R.PARENT: { - GENDER.MALE: R.FATHER, - GENDER.FEMALE: R.MOTHER, - }, + R.PARENT: {GENDER.MALE: R.FATHER, GENDER.FEMALE: R.MOTHER,}, # CHILDREN: - R.CHILD: { - GENDER.MALE: R.SON, - GENDER.FEMALE: R.DAUGHTER, - }, + R.CHILD: {GENDER.MALE: R.SON, GENDER.FEMALE: R.DAUGHTER,}, # SIBLINGS: - R.SIBLING: { - GENDER.MALE: R.BROTHER, - GENDER.FEMALE: R.SISTER, - }, - R.TWIN: { - GENDER.MALE: R.TWIN_BROTHER, - GENDER.FEMALE: R.TWIN_SISTER, - }, + R.SIBLING: {GENDER.MALE: R.BROTHER, GENDER.FEMALE: R.SISTER,}, + R.TWIN: {GENDER.MALE: R.TWIN_BROTHER, GENDER.FEMALE: R.TWIN_SISTER,}, R.MATERNAL_HALF_SIBLING: { GENDER.MALE: R.MATERNAL_HALF_BROTHER, GENDER.FEMALE: R.MATERNAL_HALF_SISTER, @@ -810,10 +795,7 @@ class GENDER: GENDER.MALE: R.PATERNAL_HALF_BROTHER, GENDER.FEMALE: R.PATERNAL_HALF_SISTER, }, - R.HALF_SIBLING: { - GENDER.MALE: R.HALF_BROTHER, - GENDER.FEMALE: R.HALF_SISTER, - }, + R.HALF_SIBLING: {GENDER.MALE: R.HALF_BROTHER, GENDER.FEMALE: R.HALF_SISTER,}, # GRANDPARENTS: R.MATERNAL_GRANDPARENT: { GENDER.MALE: R.MATERNAL_GRANDFATHER, @@ -823,10 +805,7 @@ class GENDER: GENDER.MALE: R.PATERNAL_GRANDFATHER, GENDER.FEMALE: R.PATERNAL_GRANDMOTHER, }, - R.GRANDPARENT: { - GENDER.MALE: R.GRANDFATHER, - GENDER.FEMALE: R.GRANDMOTHER, - }, + R.GRANDPARENT: {GENDER.MALE: R.GRANDFATHER, GENDER.FEMALE: R.GRANDMOTHER,}, # GRANDCHILDREN: R.MATERNAL_GRANDCHILD: { GENDER.MALE: R.MATERNAL_GRANDSON, @@ -836,10 +815,7 @@ class GENDER: GENDER.MALE: R.PATERNAL_GRANDSON, GENDER.FEMALE: R.PATERNAL_GRANDDAUGHTER, }, - R.GRANDCHILD: { - GENDER.MALE: R.GRANDSON, - GENDER.FEMALE: R.GRANDDAUGHTER, - }, + R.GRANDCHILD: {GENDER.MALE: R.GRANDSON, GENDER.FEMALE: R.GRANDDAUGHTER,}, # GREAT GRANDPARENTS: R.MATERNAL_GREAT_GRANDPARENT: { GENDER.MALE: R.MATERNAL_GREAT_GRANDFATHER, @@ -875,10 +851,7 @@ class GENDER: GENDER.MALE: R.PATERNAL_UNCLE, GENDER.FEMALE: R.PATERNAL_AUNT, }, - R.PIBLING: { - GENDER.MALE: R.UNCLE, - GENDER.FEMALE: R.AUNT, - }, + R.PIBLING: {GENDER.MALE: R.UNCLE, GENDER.FEMALE: R.AUNT,}, # NIECES/NEPHEWS: R.MATERNAL_NIBLING: { GENDER.MALE: R.MATERNAL_NEPHEW, @@ -888,10 +861,7 @@ class GENDER: GENDER.MALE: R.PATERNAL_NEPHEW, GENDER.FEMALE: R.PATERNAL_NIECE, }, - R.NIBLING: { - GENDER.MALE: R.NEPHEW, - GENDER.FEMALE: R.NIECE, - }, + R.NIBLING: {GENDER.MALE: R.NEPHEW, GENDER.FEMALE: R.NIECE,}, # GREAT AUNTS/UNCLES: R.MATERNAL_GREAT_PIBLING: { GENDER.MALE: R.MATERNAL_GREAT_UNCLE, @@ -901,10 +871,7 @@ class GENDER: GENDER.MALE: R.PATERNAL_GREAT_UNCLE, GENDER.FEMALE: R.PATERNAL_GREAT_AUNT, }, - R.GREAT_PIBLING: { - GENDER.MALE: R.GREAT_UNCLE, - GENDER.FEMALE: R.GREAT_AUNT, - }, + R.GREAT_PIBLING: {GENDER.MALE: R.GREAT_UNCLE, GENDER.FEMALE: R.GREAT_AUNT,}, # GREAT NIECES/NEPHEWS: R.MATERNAL_GREAT_NIBLING: { GENDER.MALE: R.MATERNAL_GREAT_NEPHEW, @@ -914,10 +881,7 @@ class GENDER: GENDER.MALE: R.PATERNAL_GREAT_NEPHEW, GENDER.FEMALE: R.PATERNAL_GREAT_NIECE, }, - R.GREAT_NIBLING: { - GENDER.MALE: R.GREAT_NEPHEW, - GENDER.FEMALE: R.GREAT_NIECE, - }, + R.GREAT_NIBLING: {GENDER.MALE: R.GREAT_NEPHEW, GENDER.FEMALE: R.GREAT_NIECE,}, # COUSINS: n/a } From e8193377c7f783085b2a9c569cbd8a4c5f505fec Mon Sep 17 00:00:00 2001 From: Natasha Singh Date: Mon, 8 Apr 2024 10:18:03 -0400 Subject: [PATCH 3/3] :rotating_light: Run latest black formatter --- kf_lib_data_ingest/common/constants.py | 60 ++++++++++++++++++++------ 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/kf_lib_data_ingest/common/constants.py b/kf_lib_data_ingest/common/constants.py index 07755655..f3f23013 100644 --- a/kf_lib_data_ingest/common/constants.py +++ b/kf_lib_data_ingest/common/constants.py @@ -779,14 +779,29 @@ class GENDER: # relates generic relationship terms to gendered ones GENDERED_RELATIONSHIPS = { # PARTNERS: - R.SPOUSE: {GENDER.MALE: R.HUSBAND, GENDER.FEMALE: R.WIFE,}, + R.SPOUSE: { + GENDER.MALE: R.HUSBAND, + GENDER.FEMALE: R.WIFE, + }, # PARENTS: - R.PARENT: {GENDER.MALE: R.FATHER, GENDER.FEMALE: R.MOTHER,}, + R.PARENT: { + GENDER.MALE: R.FATHER, + GENDER.FEMALE: R.MOTHER, + }, # CHILDREN: - R.CHILD: {GENDER.MALE: R.SON, GENDER.FEMALE: R.DAUGHTER,}, + R.CHILD: { + GENDER.MALE: R.SON, + GENDER.FEMALE: R.DAUGHTER, + }, # SIBLINGS: - R.SIBLING: {GENDER.MALE: R.BROTHER, GENDER.FEMALE: R.SISTER,}, - R.TWIN: {GENDER.MALE: R.TWIN_BROTHER, GENDER.FEMALE: R.TWIN_SISTER,}, + R.SIBLING: { + GENDER.MALE: R.BROTHER, + GENDER.FEMALE: R.SISTER, + }, + R.TWIN: { + GENDER.MALE: R.TWIN_BROTHER, + GENDER.FEMALE: R.TWIN_SISTER, + }, R.MATERNAL_HALF_SIBLING: { GENDER.MALE: R.MATERNAL_HALF_BROTHER, GENDER.FEMALE: R.MATERNAL_HALF_SISTER, @@ -795,7 +810,10 @@ class GENDER: GENDER.MALE: R.PATERNAL_HALF_BROTHER, GENDER.FEMALE: R.PATERNAL_HALF_SISTER, }, - R.HALF_SIBLING: {GENDER.MALE: R.HALF_BROTHER, GENDER.FEMALE: R.HALF_SISTER,}, + R.HALF_SIBLING: { + GENDER.MALE: R.HALF_BROTHER, + GENDER.FEMALE: R.HALF_SISTER, + }, # GRANDPARENTS: R.MATERNAL_GRANDPARENT: { GENDER.MALE: R.MATERNAL_GRANDFATHER, @@ -805,7 +823,10 @@ class GENDER: GENDER.MALE: R.PATERNAL_GRANDFATHER, GENDER.FEMALE: R.PATERNAL_GRANDMOTHER, }, - R.GRANDPARENT: {GENDER.MALE: R.GRANDFATHER, GENDER.FEMALE: R.GRANDMOTHER,}, + R.GRANDPARENT: { + GENDER.MALE: R.GRANDFATHER, + GENDER.FEMALE: R.GRANDMOTHER, + }, # GRANDCHILDREN: R.MATERNAL_GRANDCHILD: { GENDER.MALE: R.MATERNAL_GRANDSON, @@ -815,7 +836,10 @@ class GENDER: GENDER.MALE: R.PATERNAL_GRANDSON, GENDER.FEMALE: R.PATERNAL_GRANDDAUGHTER, }, - R.GRANDCHILD: {GENDER.MALE: R.GRANDSON, GENDER.FEMALE: R.GRANDDAUGHTER,}, + R.GRANDCHILD: { + GENDER.MALE: R.GRANDSON, + GENDER.FEMALE: R.GRANDDAUGHTER, + }, # GREAT GRANDPARENTS: R.MATERNAL_GREAT_GRANDPARENT: { GENDER.MALE: R.MATERNAL_GREAT_GRANDFATHER, @@ -851,7 +875,10 @@ class GENDER: GENDER.MALE: R.PATERNAL_UNCLE, GENDER.FEMALE: R.PATERNAL_AUNT, }, - R.PIBLING: {GENDER.MALE: R.UNCLE, GENDER.FEMALE: R.AUNT,}, + R.PIBLING: { + GENDER.MALE: R.UNCLE, + GENDER.FEMALE: R.AUNT, + }, # NIECES/NEPHEWS: R.MATERNAL_NIBLING: { GENDER.MALE: R.MATERNAL_NEPHEW, @@ -861,7 +888,10 @@ class GENDER: GENDER.MALE: R.PATERNAL_NEPHEW, GENDER.FEMALE: R.PATERNAL_NIECE, }, - R.NIBLING: {GENDER.MALE: R.NEPHEW, GENDER.FEMALE: R.NIECE,}, + R.NIBLING: { + GENDER.MALE: R.NEPHEW, + GENDER.FEMALE: R.NIECE, + }, # GREAT AUNTS/UNCLES: R.MATERNAL_GREAT_PIBLING: { GENDER.MALE: R.MATERNAL_GREAT_UNCLE, @@ -871,7 +901,10 @@ class GENDER: GENDER.MALE: R.PATERNAL_GREAT_UNCLE, GENDER.FEMALE: R.PATERNAL_GREAT_AUNT, }, - R.GREAT_PIBLING: {GENDER.MALE: R.GREAT_UNCLE, GENDER.FEMALE: R.GREAT_AUNT,}, + R.GREAT_PIBLING: { + GENDER.MALE: R.GREAT_UNCLE, + GENDER.FEMALE: R.GREAT_AUNT, + }, # GREAT NIECES/NEPHEWS: R.MATERNAL_GREAT_NIBLING: { GENDER.MALE: R.MATERNAL_GREAT_NEPHEW, @@ -881,7 +914,10 @@ class GENDER: GENDER.MALE: R.PATERNAL_GREAT_NEPHEW, GENDER.FEMALE: R.PATERNAL_GREAT_NIECE, }, - R.GREAT_NIBLING: {GENDER.MALE: R.GREAT_NEPHEW, GENDER.FEMALE: R.GREAT_NIECE,}, + R.GREAT_NIBLING: { + GENDER.MALE: R.GREAT_NEPHEW, + GENDER.FEMALE: R.GREAT_NIECE, + }, # COUSINS: n/a }