Merge pull request bluesky#1215 from bluesky/demo-url

Update demo URL

Author: genematx

CHANGELOG.md

@@ -3,6 +3,16 @@ Write the date in place of the "Unreleased" in the case a new version is release
 
 # Changelog
 
+## Unreleased
+
+### Changed
+
+- The public demo hosted by NSLS2 has moved from `tiled-demo.blueskyproject.io`
+  to `tiled-demo.nsls2.bnl.gov`, for purely practical reasons. (It is easier to
+  manage the deployment and associated certificates.) **The demo remains
+  world-public, with no login required.** This change affects some
+  documentation and one test.
+
 ## v0.2.0 (2025-10-29)
 
 ### Added

docs/source/how-to/api-keys.md

@@ -41,7 +41,7 @@ is useful when:
 
 To follow along, you may start a Tiled server with a simple authentication provider,
 as shown. Alternatively, you may use an existing authenticated Tiled server, such as
-`https://tiled-demo.blueskyproject.io`; if you do, replace `http://localhost:8000`
+`https://tiled-demo.nsls2.bnl.gov`; if you do, replace `http://localhost:8000`
 in the example below with that address.
 
 ```

docs/source/how-to/client-logger.md

@@ -24,22 +24,22 @@ your program; it does not alter any global logging configuration.
 Requests (`->`) and responses (`<-`) will now be logged to the console, like so.
 
 ```py
->>> c = from_uri("https://tiled-demo.blueskyproject.io")
-16:49:22.307 -> GET 'https://tiled-demo.blueskyproject.io/?root_path=true' 'host:tiled-demo.blueskyproject.io' 'accept:*/*' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49'
+>>> c = from_uri("https://tiled-demo.nsls2.bnl.gov")
+16:49:22.307 -> GET 'https://tiled-demo.nsls2.bnl.gov/?root_path=true' 'host:tiled-demo.nsls2.bnl.gov' 'accept:*/*' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49'
 16:49:22.486 <- 200 server:nginx/1.18.0 (Ubuntu) date:Tue, 01 Feb 2022 21:49:22 GMT content-type:application/json content-length:761 connection:keep-alive etag:35b70c6412c39db8b7b5132ddf61973c expires:Tue, 01 Feb 2022 21:59:22 GMT content-encoding:gzip vary:Accept-Encoding server-timing:tok;dur=0.1, pack;dur=0.0, compress;dur=0.1;ratio=3.1, app;dur=3.9 set-cookie:tiled_csrf=-fyaLez0YkradgcEVYBJh4QotR5MNyzouV0SV0NWHmM; HttpOnly; Path=/; SameSite=lax
-16:49:22.492 -> GET 'https://tiled-demo.blueskyproject.io/?root_path=true' 'host:tiled-demo.blueskyproject.io' 'accept:application/x-msgpack' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49' 'cookie:tiled_csrf=-fyaLez0YkradgcEVYBJh4QotR5MNyzouV0SV0NWHmM'
+16:49:22.492 -> GET 'https://tiled-demo.nsls2.bnl.gov/?root_path=true' 'host:tiled-demo.nsls2.bnl.gov' 'accept:application/x-msgpack' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49' 'cookie:tiled_csrf=-fyaLez0YkradgcEVYBJh4QotR5MNyzouV0SV0NWHmM'
 16:49:22.531 <- 200 server:nginx/1.18.0 (Ubuntu) date:Tue, 01 Feb 2022 21:49:22 GMT content-type:application/x-msgpack content-length:773 connection:keep-alive etag:35b70c6412c39db8b7b5132ddf61973c expires:Tue, 01 Feb 2022 21:59:22 GMT content-encoding:gzip vary:Accept-Encoding server-timing:tok;dur=0.1, pack;dur=0.0, compress;dur=0.1;ratio=2.7, app;dur=4.5
-16:49:22.535 -> GET 'https://tiled-demo.blueskyproject.io//metadata/' 'host:tiled-demo.blueskyproject.io' 'accept:application/x-msgpack' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49' 'cookie:tiled_csrf=-fyaLez0YkradgcEVYBJh4QotR5MNyzouV0SV0NWHmM'
+16:49:22.535 -> GET 'https://tiled-demo.nsls2.bnl.gov//metadata/' 'host:tiled-demo.nsls2.bnl.gov' 'accept:application/x-msgpack' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49' 'cookie:tiled_csrf=-fyaLez0YkradgcEVYBJh4QotR5MNyzouV0SV0NWHmM'
 16:49:22.572 <- 200 server:nginx/1.18.0 (Ubuntu) date:Tue, 01 Feb 2022 21:49:22 GMT content-type:application/x-msgpack content-length:292 connection:keep-alive etag:821dd2a8b431ecd016f94cacd44af74f server-timing:tok;dur=0.0, pack;dur=0.0, app;dur=3.8
 
 >>> t = c['generated']['short_table']
-16:58:22.589 -> GET 'https://tiled-demo.blueskyproject.io/search/?filter%5Blookup%5D%5Bcondition%5D%5Bkey%5D=generated&sort=' 'host:tiled-demo.blueskyproject.io' 'accept:application/x-msgpack' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49.post0.dev0+g6dd1e5f' 'cookie:tiled_csrf=-fyaLez0YkradgcEVYBJh4QotR5MNyzouV0SV0NWHmM'
+16:58:22.589 -> GET 'https://tiled-demo.nsls2.bnl.gov/search/?filter%5Blookup%5D%5Bcondition%5D%5Bkey%5D=generated&sort=' 'host:tiled-demo.nsls2.bnl.gov' 'accept:application/x-msgpack' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49.post0.dev0+g6dd1e5f' 'cookie:tiled_csrf=-fyaLez0YkradgcEVYBJh4QotR5MNyzouV0SV0NWHmM'
 16:58:22.635 <- 200 server:nginx/1.18.0 (Ubuntu) date:Tue, 01 Feb 2022 21:58:22 GMT content-type:application/x-msgpack content-length:502 connection:keep-alive etag:53a7b8a84ec504259a8c29903a25ade0 server-timing:tok;dur=0.0, pack;dur=0.0, app;dur=5.9
-16:58:22.638 -> GET 'https://tiled-demo.blueskyproject.io/search/generated?filter%5Blookup%5D%5Bcondition%5D%5Bkey%5D=short_table&sort=' 'host:tiled-demo.blueskyproject.io' 'accept:application/x-msgpack' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49.post0.dev0+g6dd1e5f' 'cookie:tiled_csrf=-fyaLez0YkradgcEVYBJh4QotR5MNyzouV0SV0NWHmM'
+16:58:22.638 -> GET 'https://tiled-demo.nsls2.bnl.gov/search/generated?filter%5Blookup%5D%5Bcondition%5D%5Bkey%5D=short_table&sort=' 'host:tiled-demo.nsls2.bnl.gov' 'accept:application/x-msgpack' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49.post0.dev0+g6dd1e5f' 'cookie:tiled_csrf=-fyaLez0YkradgcEVYBJh4QotR5MNyzouV0SV0NWHmM'
 16:58:22.681 <- 200 server:nginx/1.18.0 (Ubuntu) date:Tue, 01 Feb 2022 21:58:22 GMT content-type:application/x-msgpack content-length:944 connection:keep-alive etag:8d81b7891000606ceeb87fa89689c045 content-encoding:gzip vary:Accept-Encoding server-timing:acl;dur=0.0, tok;dur=0.1, pack;dur=0.0, compress;dur=0.1;ratio=4.5, app;dur=12.0
 
 >>> t.read()
-16:58:27.134 -> GET 'https://tiled-demo.blueskyproject.io/table/partition/generated/short_table?partition=0' 'host:tiled-demo.blueskyproject.io' 'accept:application/vnd.apache.arrow.file' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49.post0.dev0+g6dd1e5f' 'cookie:tiled_csrf=-fyaLez0YkradgcEVYBJh4QotR5MNyzouV0SV0NWHmM'
+16:58:27.134 -> GET 'https://tiled-demo.nsls2.bnl.gov/table/partition/generated/short_table?partition=0' 'host:tiled-demo.nsls2.bnl.gov' 'accept:application/vnd.apache.arrow.file' 'accept-encoding:gzip,blosc2' 'connection:keep-alive' 'user-agent:python-tiled/0.1.0a49.post0.dev0+g6dd1e5f' 'cookie:tiled_csrf=-fyaLez0YkradgcEVYBJh4QotR5MNyzouV0SV0NWHmM'
 16:58:27.205 <- 200 server:nginx/1.18.0 (Ubuntu) date:Tue, 01 Feb 2022 21:58:27 GMT content-type:application/vnd.apache.arrow.file content-length:3847 connection:keep-alive etag:954688a8ef55915b012bba1e93769710 content-encoding:blosc2 vary:Accept-Encoding server-timing:acl;dur=0.0, read;dur=1.4, tok;dur=0.2, pack;dur=0.8, compress;dur=0.0;ratio=1.4, app;dur=9.1
               A         B         C
 index

docs/source/how-to/profiles.md

@@ -9,7 +9,7 @@ parameters in a file and gives them an alias, so that something like this:
 from tiled.client import from_uri
 from tiled.client.cache import Cache
 
-client = from_uri("https://tiled-demo.blueskyproject.io")
+client = from_uri("https://tiled-demo.nsls2.bnl.gov")
 ```
 
 can be replaced with the more memorable and succinct
@@ -24,7 +24,7 @@ client = from_profile("demo")
 ## Create a profile
 
 ```
-$ tiled profile create --name demo https://tiled-demo.blueskyproject.io
+$ tiled profile create --name demo https://tiled-demo.nsls2.bnl.gov
 ```
 
 ## Review and edit profiles

docs/source/reference/authentication.md

@@ -40,7 +40,7 @@ then, you can launch the server:
 ALICE_PASSWORD=secret1 BOB_PASSWORD=secret2 CARA_PASSWORD=secret3 tiled serve config example_configs/toy_authentication.yml
 ```
 
-To test the second kind, we'll use `https://tiled-demo.blueskyproject.io`, which
+To test the second kind, we'll use `https://tiled-demo.nsls2.bnl.gov`, which
 is configured to use [ORCID](https://orcid.org/) for authentication.
 
 ### Scenario 1: Authenticator Directly Handles Credentials
@@ -162,26 +162,26 @@ An initial handshake with the `/` route tells us that this server uses
 `"external"` authentication.
 
 ```
-$ http https://tiled-demo.blueskyproject.io/api/v1/ | jq .authentication.type
+$ http https://tiled-demo.nsls2.bnl.gov/api/v1/ | jq .authentication.type
 "external"
 ```
 
 Elsewhere in this same response, we can find the authentication endpoint for
 this external identity provider.
 
 ```
-$ http https://tiled-demo.blueskyproject.io/api/v1/ | jq .authentication.endpoint
-"https://orcid.org/oauth/authorize?client_id=APP-0ROS9DU5F717F7XN&response_type=code&scope=openid&redirect_uri=https://tiled-demo.blueskyproject.io/auth/code",
+$ http https://tiled-demo.nsls2.bnl.gov/api/v1/ | jq .authentication.endpoint
+"https://orcid.org/oauth/authorize?client_id=APP-0ROS9DU5F717F7XN&response_type=code&scope=openid&redirect_uri=https://tiled-demo.nsls2.bnl.gov/auth/code",
 ```
 
 Navigate to this address in a web browser, log in when prompted, and authorize
 Tiled when prompted.  You will be redirected to a page at
-`https://tiled-demo.blueskyproject.io/auth/code?code=[redacted]` and shown
+`https://tiled-demo.nsls2.bnl.gov/auth/code?code=[redacted]` and shown
 a valid refresh token from Tiled that encodes your ORCID username. Exchange the
 refresh token for an access token and a fresh refresh token like so.
 
 ```
-$ http POST https://tiled-demo.blueskyproject.io/api/v1/auth/session/refresh refresh_token="TOKEN PASTED FROM WEB BROWSER" > tokens.json
+$ http POST https://tiled-demo.nsls2.bnl.gov/api/v1/auth/session/refresh refresh_token="TOKEN PASTED FROM WEB BROWSER" > tokens.json
 ```
 
 From here, everything follows the same as in Scenario 1, above.

docs/source/reference/http-api-overview.md

@@ -44,7 +44,7 @@ nested under `/api/v1/auth/`.
 
 To view and try the *interactive* docs, visit
 
-[http://tiled-demo.blueskyproject.io/docs](http://tiled-demo.blueskyproject.io/docs)
+[http://tiled-demo.nsls2.bnl.gov/docs](http://tiled-demo.nsls2.bnl.gov/docs)
 
 or, to work fully locally, start the Tiled server with the demo
 Tree from a Terminal

docs/source/tutorials/login.md

@@ -2,15 +2,15 @@
 # Log into an Authenticated Tiled Server
 
 For this tutorial, we will log in to the demo Tiled server at
-`https://tiled-demo.blueskyproject.io`. This server is configured to use
+`https://tiled-demo.nsls2.bnl.gov`. This server is configured to use
 [ORCID](https://orcid.org) for authentication, so you will need an ORCID
 account.
 
 From Python, connect as usual.
 
 ```python
 >>> from tiled.client import from_uri
->>> c = from_uri("https://tiled-demo.blueskyproject.io")
+>>> c = from_uri("https://tiled-demo.nsls2.bnl.gov")
 ```
 
 Now, ask to log in.
@@ -62,13 +62,13 @@ Next, quit Python and start it fresh.
 
 ```python
 >>> from tiled.client import from_uri
->>> c = from_uri("https://tiled-demo.blueskyproject.io")
+>>> c = from_uri("https://tiled-demo.nsls2.bnl.gov")
 >>> c
 <Container {'big_image', 'small_image', 'medium_image', ...} ~13 entries>
 ```
 
 Notice that you are _not_ prompted to log in again. The login process
-stashed a file (under `~/.config/tiled/tokens/tiled-demo.blueskyproject.io/`)
+stashed a file (under `~/.config/tiled/tokens/tiled-demo.nsls2.bnl.gov/`)
 that enables the session to be reused. It expires if unused for some period. By
 default it expires after one week of disuse, but this is configurable and can
 vary from one Tiled server to another.

tiled/_tests/test_pickle.py

@@ -5,43 +5,52 @@
 
 import httpx
 import pytest
-from packaging.version import parse
+import uvicorn
 
 from ..client import from_context
 from ..client.cache import Cache
 from ..client.context import Context
+from ..config import Authentication
+from ..server.app import build_app
+from ..utils import import_object
+from .utils import Server
 
-MIN_VERSION = "0.1.0a104"
-API_URL = "https://tiled-demo.blueskyproject.io/api/v1/"
 
+@pytest.fixture(scope="module")
+def server_url():
+    EXAMPLE = "tiled.examples.generated:tree"
+    tree = import_object(EXAMPLE)
+    app = build_app(tree, authentication=Authentication(single_user_api_key="secret"))
 
-def test_pickle_context():
+    config = uvicorn.Config(app, host="127.0.0.1", port=0, log_level="info")
+    server = Server(config)
+    with server.run_in_thread() as url:
+        yield url
+
+
+def test_pickle_context(server_url):
     try:
-        httpx.get(API_URL).raise_for_status()
+        httpx.get(server_url).raise_for_status()
     except Exception:
-        raise pytest.skip(f"Could not connect to {API_URL}")
-    with Context(API_URL) as context:
+        raise pytest.skip(f"Could not connect to {server_url}")
+    with Context.from_any_uri(server_url, api_key="secret")[0] as context:
         pickle.loads(pickle.dumps(context))
 
 
 @pytest.mark.parametrize("structure_clients", ["numpy", "dask"])
-def test_pickle_clients(structure_clients, tmpdir):
+def test_pickle_clients(server_url, structure_clients, tmpdir):
     try:
-        httpx.get(API_URL).raise_for_status()
+        httpx.get(server_url).raise_for_status()
     except Exception:
-        raise pytest.skip(f"Could not connect to {API_URL}")
+        raise pytest.skip(f"Could not connect to {server_url}")
     cache = Cache(tmpdir / "http_response_cache.db")
-    with Context(API_URL, cache=cache) as context:
-        if parse(context.server_info.library_version) < parse(MIN_VERSION):
-            raise pytest.skip(
-                f"Server at {API_URL} is running too old a version to test against."
-            )
+    with Context.from_any_uri(server_url, api_key="secret", cache=cache)[0] as context:
         client = from_context(context, structure_clients)
         pickle.loads(pickle.dumps(client))
         for segments in [
-            ["generated"],
-            ["generated", "small_image"],
-            ["generated", "short_table"],
+            [],
+            ["nested", "images", "small_image"],
+            ["tables", "short_table"],
         ]:
             original = client
             for segment in segments: