From e9728d9e98fabe812749ae8eec2c84d033a8c9ff Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Wed, 15 Jan 2025 15:07:40 -0600 Subject: [PATCH 1/6] Add Ember instance types for DANDI CLI By adding an ember instance type (and ember-staging), the DANDI CLI should be able to be used as-is rather than requiring a custom PyPI. https://github.com/dandi/dandi-cli/issues/1517 https://github.com/dandi/dandi-cli/pull/1527 --- dandi/cli/tests/test_instances.py | 6 ++++++ dandi/consts.py | 12 +++++++++++- docs/source/cmdline/instances.rst | 8 +++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dandi/cli/tests/test_instances.py b/dandi/cli/tests/test_instances.py index 192b69659..f8f271210 100644 --- a/dandi/cli/tests/test_instances.py +++ b/dandi/cli/tests/test_instances.py @@ -25,4 +25,10 @@ def test_cmd_instances(monkeypatch): "linc-staging:\n" " api: https://staging-api.lincbrain.org/api\n" " gui: https://staging.lincbrain.org\n" + "ember:\n" + " api: https://api.ember-archive.org/api\n" + " gui: https://ember-archive.org\n" + "ember-staging:\n" + " api: https://staging-api.ember-archive.org/api\n" + " gui: https://staging.ember-archive.org\n" ) diff --git a/dandi/consts.py b/dandi/consts.py index 0b7bc1b76..57eeb49cc 100644 --- a/dandi/consts.py +++ b/dandi/consts.py @@ -141,7 +141,17 @@ def urls(self) -> Iterator[str]: "linc-staging", "https://staging.lincbrain.org", "https://staging-api.lincbrain.org/api", - ) + ), + "ember": DandiInstance( + "ember", + "https://ember-archive.org", + "https://api.ember-archive.org/api", + ), + "ember-staging": DandiInstance( + "ember-staging", + "https://staging.ember-archive.org", + "https://staging-api.ember-archive.org/api", + ), } # to map back url: name known_instances_rev = { diff --git a/docs/source/cmdline/instances.rst b/docs/source/cmdline/instances.rst index de0034c08..a2e16695d 100644 --- a/docs/source/cmdline/instances.rst +++ b/docs/source/cmdline/instances.rst @@ -27,4 +27,10 @@ Example output: gui: https://staging.lincbrain.org linc: api: https://api.lincbrain.org/api - gui: https://lincbrain.org \ No newline at end of file + gui: https://lincbrain.org + ember-staging: + api: https://staging-api.ember-archive.org/api + gui: https://staging.ember-archive.org + ember: + api: https://api.ember-archive.org/api + gui: https://ember-archive.org From a60e2b2faf01d1a24792a6ad6015050c25823e04 Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Wed, 15 Jan 2025 16:37:54 -0600 Subject: [PATCH 2/6] Rename ember instances s/staging/sandbox --- dandi/cli/tests/test_instances.py | 6 +++--- dandi/consts.py | 8 ++++---- docs/source/cmdline/instances.rst | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dandi/cli/tests/test_instances.py b/dandi/cli/tests/test_instances.py index f8f271210..483aac667 100644 --- a/dandi/cli/tests/test_instances.py +++ b/dandi/cli/tests/test_instances.py @@ -28,7 +28,7 @@ def test_cmd_instances(monkeypatch): "ember:\n" " api: https://api.ember-archive.org/api\n" " gui: https://ember-archive.org\n" - "ember-staging:\n" - " api: https://staging-api.ember-archive.org/api\n" - " gui: https://staging.ember-archive.org\n" + "ember-sandbox:\n" + " api: https://sandbox-api.ember-archive.org/api\n" + " gui: https://sandbox.ember-archive.org\n" ) diff --git a/dandi/consts.py b/dandi/consts.py index 57eeb49cc..a7245226f 100644 --- a/dandi/consts.py +++ b/dandi/consts.py @@ -147,10 +147,10 @@ def urls(self) -> Iterator[str]: "https://ember-archive.org", "https://api.ember-archive.org/api", ), - "ember-staging": DandiInstance( - "ember-staging", - "https://staging.ember-archive.org", - "https://staging-api.ember-archive.org/api", + "ember-sandbox": DandiInstance( + "ember-sandbox", + "https://sandbox.ember-archive.org", + "https://sandbox-api.ember-archive.org/api", ), } # to map back url: name diff --git a/docs/source/cmdline/instances.rst b/docs/source/cmdline/instances.rst index a2e16695d..17e172e78 100644 --- a/docs/source/cmdline/instances.rst +++ b/docs/source/cmdline/instances.rst @@ -28,9 +28,9 @@ Example output: linc: api: https://api.lincbrain.org/api gui: https://lincbrain.org - ember-staging: - api: https://staging-api.ember-archive.org/api - gui: https://staging.ember-archive.org + ember-sandbox: + api: https://sandbox-api.ember-archive.org/api + gui: https://sandbox.ember-archive.org ember: api: https://api.ember-archive.org/api gui: https://ember-archive.org From bbd8f14995f22295a5558428b7db85a1e613775d Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Thu, 6 Feb 2025 12:20:15 -0600 Subject: [PATCH 3/6] Use ember-chosen names and domain Apply suggestions from code review Co-authored-by: Nicole Stock --- dandi/cli/tests/test_instances.py | 8 ++++---- dandi/consts.py | 8 ++++---- docs/source/cmdline/instances.rst | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dandi/cli/tests/test_instances.py b/dandi/cli/tests/test_instances.py index 483aac667..22bf46fa7 100644 --- a/dandi/cli/tests/test_instances.py +++ b/dandi/cli/tests/test_instances.py @@ -26,9 +26,9 @@ def test_cmd_instances(monkeypatch): " api: https://staging-api.lincbrain.org/api\n" " gui: https://staging.lincbrain.org\n" "ember:\n" - " api: https://api.ember-archive.org/api\n" - " gui: https://ember-archive.org\n" + " api: https://api-dandi.emberarchive.org/api\n" + " gui: https://dandi.emberarchive.org\n" "ember-sandbox:\n" - " api: https://sandbox-api.ember-archive.org/api\n" - " gui: https://sandbox.ember-archive.org\n" + " api: https://api-dandi-staging.emberarchive.org/api\n" + " gui: https://dandi-staging.emberarchive.org\n" ) diff --git a/dandi/consts.py b/dandi/consts.py index a7245226f..3cd387ba0 100644 --- a/dandi/consts.py +++ b/dandi/consts.py @@ -144,13 +144,13 @@ def urls(self) -> Iterator[str]: ), "ember": DandiInstance( "ember", - "https://ember-archive.org", - "https://api.ember-archive.org/api", + "https://dandi.emberarchive.org", + "https://api-dandi.emberarchive.org/api", ), "ember-sandbox": DandiInstance( "ember-sandbox", - "https://sandbox.ember-archive.org", - "https://sandbox-api.ember-archive.org/api", + "https://dandi-staging.emberarchive.org", + "https://api-dandi-staging.emberarchive.org/api", ), } # to map back url: name diff --git a/docs/source/cmdline/instances.rst b/docs/source/cmdline/instances.rst index 17e172e78..72ec397da 100644 --- a/docs/source/cmdline/instances.rst +++ b/docs/source/cmdline/instances.rst @@ -29,8 +29,8 @@ Example output: api: https://api.lincbrain.org/api gui: https://lincbrain.org ember-sandbox: - api: https://sandbox-api.ember-archive.org/api - gui: https://sandbox.ember-archive.org + api: https://api-dandi-staging.emberarchive.org/api + gui: https://dandi-staging.emberarchive.org ember: - api: https://api.ember-archive.org/api - gui: https://ember-archive.org + api: https://api-dandi.emberarchive.org/api + gui: https://dandi.emberarchive.org From 2a685d5de60c8855c3323f24f276553070b23904 Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Thu, 6 Feb 2025 12:22:52 -0600 Subject: [PATCH 4/6] Rename ember instances s/staging/sandbox --- dandi/cli/tests/test_instances.py | 4 ++-- dandi/consts.py | 4 ++-- docs/source/cmdline/instances.rst | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dandi/cli/tests/test_instances.py b/dandi/cli/tests/test_instances.py index 22bf46fa7..52670b6ad 100644 --- a/dandi/cli/tests/test_instances.py +++ b/dandi/cli/tests/test_instances.py @@ -29,6 +29,6 @@ def test_cmd_instances(monkeypatch): " api: https://api-dandi.emberarchive.org/api\n" " gui: https://dandi.emberarchive.org\n" "ember-sandbox:\n" - " api: https://api-dandi-staging.emberarchive.org/api\n" - " gui: https://dandi-staging.emberarchive.org\n" + " api: https://api-dandi-sandbox.emberarchive.org/api\n" + " gui: https://dandi-sandbox.emberarchive.org\n" ) diff --git a/dandi/consts.py b/dandi/consts.py index 3cd387ba0..77c001263 100644 --- a/dandi/consts.py +++ b/dandi/consts.py @@ -149,8 +149,8 @@ def urls(self) -> Iterator[str]: ), "ember-sandbox": DandiInstance( "ember-sandbox", - "https://dandi-staging.emberarchive.org", - "https://api-dandi-staging.emberarchive.org/api", + "https://dandi-sandbox.emberarchive.org", + "https://api-dandi-sandbox.emberarchive.org/api", ), } # to map back url: name diff --git a/docs/source/cmdline/instances.rst b/docs/source/cmdline/instances.rst index 72ec397da..81a5f1dbd 100644 --- a/docs/source/cmdline/instances.rst +++ b/docs/source/cmdline/instances.rst @@ -29,8 +29,8 @@ Example output: api: https://api.lincbrain.org/api gui: https://lincbrain.org ember-sandbox: - api: https://api-dandi-staging.emberarchive.org/api - gui: https://dandi-staging.emberarchive.org + api: https://api-dandi-sandbox.emberarchive.org/api + gui: https://dandi-sandbox.emberarchive.org ember: api: https://api-dandi.emberarchive.org/api gui: https://dandi.emberarchive.org From a0be2e64fb8ef4a5dadf8606962ad5eeaa1f9e40 Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Wed, 12 Feb 2025 10:02:41 -0600 Subject: [PATCH 5/6] Apply suggestions from code review Co-authored-by: Nicole Stock --- dandi/cli/tests/test_instances.py | 6 +++--- dandi/consts.py | 8 ++++---- docs/source/cmdline/instances.rst | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dandi/cli/tests/test_instances.py b/dandi/cli/tests/test_instances.py index 52670b6ad..b6e643d9d 100644 --- a/dandi/cli/tests/test_instances.py +++ b/dandi/cli/tests/test_instances.py @@ -28,7 +28,7 @@ def test_cmd_instances(monkeypatch): "ember:\n" " api: https://api-dandi.emberarchive.org/api\n" " gui: https://dandi.emberarchive.org\n" - "ember-sandbox:\n" - " api: https://api-dandi-sandbox.emberarchive.org/api\n" - " gui: https://dandi-sandbox.emberarchive.org\n" + "ember-staging:\n" + " api: https://api-dandi-staging.emberarchive.org/api\n" + " gui: https://dandi-staging.emberarchive.org\n" ) diff --git a/dandi/consts.py b/dandi/consts.py index 77c001263..996f331f1 100644 --- a/dandi/consts.py +++ b/dandi/consts.py @@ -147,10 +147,10 @@ def urls(self) -> Iterator[str]: "https://dandi.emberarchive.org", "https://api-dandi.emberarchive.org/api", ), - "ember-sandbox": DandiInstance( - "ember-sandbox", - "https://dandi-sandbox.emberarchive.org", - "https://api-dandi-sandbox.emberarchive.org/api", + "ember-staging": DandiInstance( + "ember-staging", + "https://dandi-staging.emberarchive.org", + "https://api-dandi-staging.emberarchive.org/api", ), } # to map back url: name diff --git a/docs/source/cmdline/instances.rst b/docs/source/cmdline/instances.rst index 81a5f1dbd..67c1a16fb 100644 --- a/docs/source/cmdline/instances.rst +++ b/docs/source/cmdline/instances.rst @@ -28,9 +28,9 @@ Example output: linc: api: https://api.lincbrain.org/api gui: https://lincbrain.org - ember-sandbox: - api: https://api-dandi-sandbox.emberarchive.org/api - gui: https://dandi-sandbox.emberarchive.org + ember-staging: + api: https://api-dandi-staging.emberarchive.org/api + gui: https://dandi-staging.emberarchive.org ember: api: https://api-dandi.emberarchive.org/api gui: https://dandi.emberarchive.org From d814f95d0982f3e78870dd14396e9e8c2873cc50 Mon Sep 17 00:00:00 2001 From: Austin Macdonald Date: Wed, 12 Feb 2025 11:20:21 -0600 Subject: [PATCH 6/6] fixup order to pass test --- dandi/cli/tests/test_instances.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dandi/cli/tests/test_instances.py b/dandi/cli/tests/test_instances.py index b6e643d9d..8f0dd0b46 100644 --- a/dandi/cli/tests/test_instances.py +++ b/dandi/cli/tests/test_instances.py @@ -19,16 +19,16 @@ def test_cmd_instances(monkeypatch): "dandi-staging:\n" " api: https://api-staging.dandiarchive.org/api\n" " gui: https://gui-staging.dandiarchive.org\n" - "linc:\n" - " api: https://api.lincbrain.org/api\n" - " gui: https://lincbrain.org\n" - "linc-staging:\n" - " api: https://staging-api.lincbrain.org/api\n" - " gui: https://staging.lincbrain.org\n" "ember:\n" " api: https://api-dandi.emberarchive.org/api\n" " gui: https://dandi.emberarchive.org\n" "ember-staging:\n" " api: https://api-dandi-staging.emberarchive.org/api\n" " gui: https://dandi-staging.emberarchive.org\n" + "linc:\n" + " api: https://api.lincbrain.org/api\n" + " gui: https://lincbrain.org\n" + "linc-staging:\n" + " api: https://staging-api.lincbrain.org/api\n" + " gui: https://staging.lincbrain.org\n" )