Merge pull request #95 from ImageMarkup/remove-diagnosis-support

Drop legacy diagnosis support

Author: danlamanna

isic_cli/cli/types.py

@@ -9,13 +9,27 @@
 
 from isic_cli.io.http import get_cohort, get_collection
 
+unsupported_diagnosis_message = (
+    "\n\nThe 'diagnosis' search filter is no longer supported.\n"
+    "ISIC now uses a hierarchical taxonomy with diagnosis_1-5 fields.\n"
+    "\n"
+    "Example conversion:\n"
+    "  Old: 'diagnosis:melanoma'\n"
+    "  New: 'diagnosis_2:\"Malignant melanocytic proliferations (Melanoma)\"'\n"
+    "\n"
+    "For the complete taxonomy, refer to the ISIC Data Dictionary: https://www.isic-archive.com/data-dictionary"
+)
+
 
 class SearchString(click.ParamType):
     name = "search_string"
 
     def convert(self, value, param, ctx):
         value = super().convert(value, param, ctx)
 
+        if "diagnosis:" in value:
+            self.fail(click.style(unsupported_diagnosis_message, fg="yellow"), param, ctx)
+
         r = ctx.obj.session.get("images/search/", params={"query": value, "limit": 1})
         if r.status_code == 400 and "message" in r.json() and "query" in r.json()["message"]:
             self.fail(f'Invalid search query string "{value}"', param, ctx)

tests/test_cli_image.py

@@ -73,3 +73,10 @@ def test_image_download_cleanup(cli_run, outdir):
     assert partial_file.exists()
     cleanup_partially_downloaded_files(Path(outdir))
     assert not partial_file.exists()
+
+
+@pytest.mark.usefixtures("_isolated_filesystem", "_mock_images")
+def test_image_download_legacy_diagnosis_unsupported(cli_run, outdir):
+    result = cli_run(["image", "download", outdir, "--search", "diagnosis:melanoma"])
+    assert result.exit_code == 2
+    assert "no longer supported" in result.output