rf: make "INSTANCE-NAME:ID" URI pattern more stringent - no arbitrary case, only capital

So it would avoid confusion with dandi:// URL.

Also fixing up tests for prior commit renames

Author: yarikoptic

dandi/dandiarchive.py

@@ -574,7 +574,9 @@ class _dandi_url_parser:
     # Should absorb port and "api/":
     server_grp = "(?P<server>(?P<protocol>https?)://(?P<hostname>[^/]+)/(api/)?)"
     # Build instance name pattern from known instances to avoid matching unknown patterns
-    instance_name_pattern = "|".join(re.escape(name) for name in known_instances.keys())
+    instance_name_pattern = "|".join(
+        re.escape(name.upper()) for name in known_instances
+    )
     known_urls: list[tuple[re.Pattern[str], dict[str, Any], str]] = [
         # List of (regex, settings, display string) triples
         #
@@ -594,7 +596,6 @@ class _dandi_url_parser:
                 rf"(?P<instance_name>{instance_name_pattern}):"
                 rf"{dandiset_id_grp}"
                 rf"(/(?P<version>{VERSION_REGEX}))?",
-                flags=re.I,
             ),
             {},
             "<INSTANCE>:<dandiset id>[/<version>]",

dandi/tests/test_dandiapi.py

@@ -869,7 +869,7 @@ def test_asset_as_readable_open(new_dandiset: SampleDandiset, tmp_path: Path) ->
         ("dandi", "DANDI_API_KEY"),
         ("dandi-api-local-docker-tests", "DANDI_API_LOCAL_DOCKER_TESTS_API_KEY"),
         ("dandi-sandbox", "DANDI_SANDBOX_API_KEY"),
-        ("ember-sandbox", "EMBER_SANDBOX_API_KEY"),
+        ("ember-dandi-sandbox", "EMBER_SANDBOX_API_KEY"),
     ],
 )
 def test_get_api_key_env_var(instance_name: str, expected_env_var_name: str) -> None:

dandi/tests/test_dandiarchive.py

@@ -108,9 +108,9 @@
                 version_id="draft",
             ),
         ),
-        # lower cased
+        # numeric version
         (
-            "dandi:000027/0.210831.2033",
+            "DANDI:000027/0.210831.2033",
             DandisetURL(
                 instance=known_instances["dandi"],
                 dandiset_id="000027",
@@ -126,14 +126,6 @@
                 version_id=None,
             ),
         ),
-        (
-            "dandi-sandbox:000029/draft",
-            DandisetURL(
-                instance=known_instances["dandi-sandbox"],
-                dandiset_id="000029",
-                version_id="draft",
-            ),
-        ),
         (
             "LINC:000029",
             DandisetURL(
@@ -143,25 +135,25 @@
             ),
         ),
         (
-            "linc:000029/0.210831.2033",
+            "LINC:000029/0.210831.2033",
             DandisetURL(
                 instance=known_instances["linc"],
                 dandiset_id="000029",
                 version_id="0.210831.2033",
             ),
         ),
         (
-            "EMBER:000029",
+            "EMBER-DANDI:000029",
             DandisetURL(
-                instance=known_instances["ember"],
+                instance=known_instances["ember-dandi"],
                 dandiset_id="000029",
                 version_id=None,
             ),
         ),
         (
-            "ember-sandbox:000029/draft",
+            "EMBER-DANDI-SANDBOX:000029/draft",
             DandisetURL(
-                instance=known_instances["ember-sandbox"],
+                instance=known_instances["ember-dandi-sandbox"],
                 dandiset_id="000029",
                 version_id="draft",
             ),