Merge pull request #58 from ImageMarkup/isic-135-require-newer-isic-metadata

Author: danlamanna

isic_cli/cli/metadata.py

@@ -10,6 +10,7 @@
 from humanize import intcomma
 from isic_metadata.metadata import MetadataRow
 from isic_metadata.utils import get_unstructured_columns
+from pydantic import ValidationError
 from rich.console import Console
 from rich.progress import Progress, track
 from rich.table import Table
@@ -48,8 +49,8 @@ def validate(csv_file: io.BufferedReader):
 
     for i, (_, row) in track(enumerate(df.iterrows(), start=2), total=len(df)):
         try:
-            MetadataRow.parse_obj(row)
-        except Exception as e:
+            MetadataRow.model_validate(row.to_dict())
+        except ValidationError as e:
             for error in e.errors():
                 column = error["loc"][0]
                 column_problems[(column, error["msg"])].append(i)

setup.py

@@ -41,7 +41,7 @@
         "django-s3-file-field-client",
         "girder-cli-oauth-client",
         "humanize",
-        "isic-metadata>=0.0.6",
+        "isic-metadata>=0.1.0",
         "more-itertools",
         "numpy",
         "packaging",