Allow arbitrary strings for patient/lesion id

Author: danlamanna

isic_metadata/__init__.py

@@ -12,13 +12,11 @@
     Diagnosis,
     DiagnosisConfirmType,
     ImageType,
-    LesionId,
     MelClass,
     MelMitoticIndex,
     MelThickMm,
     MelType,
     NevusType,
-    PatientId,
     Sex,
 )
 
@@ -62,8 +60,8 @@
     ("mel_mitotic_index", MelMitoticIndex),
     ("anatom_site_general", AnatomSiteGeneral),
     ("color_tint", ColorTint),
-    ("patient_id", PatientId),
-    ("lesion_id", LesionId),
+    ("patient_id", str),
+    ("lesion_id", str),
 ]:
     FIELD_REGISTRY[field] = {
         "validator": validator,

isic_metadata/fields.py

@@ -4,8 +4,6 @@
 import re
 from typing import Optional, Union
 
-from pydantic.types import constr
-
 
 class BaseStr(str):
     @classmethod
@@ -323,7 +321,3 @@ def validate(cls, value: str) -> Optional[str]:
 
 class AcquisitionDay(int):
     pass
-
-
-PatientId = constr(pattern=r"^IP_[0-9]{7}$")
-LesionId = constr(pattern=r"^IL_[0-9]{7}$")

isic_metadata/metadata.py

@@ -25,13 +25,11 @@
     DiagnosisConfirmTypeEnum,
     DiagnosisEnum,
     ImageTypeEnum,
-    LesionId,
     MelClassEnum,
     MelMitoticIndexEnum,
     MelThickMm,
     MelTypeEnum,
     NevusTypeEnum,
-    PatientId,
     Sex,
 )
 
@@ -74,8 +72,8 @@ class MetadataRow(BaseModel):
     ] = None
     melanocytic: Optional[bool] = None
     # these can be passed as ints, floats, etc from pandas so they need to be coerced to strings
-    patient_id: Optional[Annotated[PatientId, BeforeValidator(lambda x: str(x))]] = None
-    lesion_id: Optional[Annotated[LesionId, BeforeValidator(lambda x: str(x))]] = None
+    patient_id: Optional[Annotated[str, BeforeValidator(lambda x: str(x))]] = None
+    lesion_id: Optional[Annotated[str, BeforeValidator(lambda x: str(x))]] = None
     acquisition_day: Optional[int] = None
     marker_pen: Optional[bool] = None
     hairy: Optional[bool] = None