Merge pull request #28 from ImageMarkup/rename-fitzpatrick

ImageMarkup · Mar 5, 2024 · 4fb6fe9 · 4fb6fe9
2 parents f09c5af + 89f8d97
commit 4fb6fe9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/isic_metadata/__init__.py b/isic_metadata/__init__.py
@@ -61,7 +61,7 @@ class Field:
     "color_tint",
     "patient_id",
     "lesion_id",
-    "skin_type",
+    "fitzpatrick_skin_type",
 ]:
     FIELD_REGISTRY[field] = Field(
         search=SearchConfig(

diff --git a/isic_metadata/fields.py b/isic_metadata/fields.py
@@ -190,7 +190,7 @@ class ColorTintEnum(str, Enum):
     none = "none"
 
 
-class SkinType(str, Enum):
+class FitzpatrickSkinType(str, Enum):
     type_i = "I"
     type_ii = "II"
     type_iii = "III"

diff --git a/isic_metadata/metadata.py b/isic_metadata/metadata.py
@@ -25,13 +25,13 @@
     DermoscopicTypeEnum,
     DiagnosisConfirmTypeEnum,
     DiagnosisEnum,
+    FitzpatrickSkinType,
     ImageTypeEnum,
     MelClassEnum,
     MelMitoticIndexEnum,
     MelThickMm,
     MelTypeEnum,
     NevusTypeEnum,
-    SkinType,
     TBPTileTypeEnum,
 )
 
@@ -160,7 +160,7 @@ class MetadataRow(BaseModel):
     clin_size_long_diam_mm: (
         Annotated[float, BeforeValidator(ClinSizeLongDiamMm.parse_measurement_str)] | None
     ) = None
-    skin_type: SkinType | None = None
+    fitzpatrick_skin_type: FitzpatrickSkinType | None = None
     melanocytic: bool | None = None
     concomitant_biopsy: bool | None = None
 

diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -65,8 +65,8 @@ def test_age_special_case():
     assert MetadataRow.model_validate({"age": "85+"}).age == 85
 
 
-def test_skin_type():
-    MetadataRow.model_validate({"skin_type": "I"})
+def test_fitzpatrick_skin_type():
+    MetadataRow.model_validate({"fitzpatrick_skin_type": "I"})
 
 
 def test_benign_malignant():