Compat with Tiled 0.1.0b21

.gitignore

@@ -138,3 +138,6 @@ docs/data.h5
 
 # generated by docker-compose
 data/*
+
+# version file generated by setuptools
+*_version.py

databroker/server.py

@@ -4,10 +4,10 @@
 from jsonschema import ValidationError
 
 from event_model import DocumentNames, schema_validators
-from fastapi import APIRouter, HTTPException, Request
+from fastapi import APIRouter, HTTPException, Request, Security
 import pydantic
 from starlette.responses import StreamingResponse
-from tiled.server.dependencies import SecureEntry
+from tiled.server.dependencies import get_entry
 
 
 class NamedDocument(pydantic.BaseModel):
@@ -23,7 +23,7 @@ class NamedDocument(pydantic.BaseModel):
 def get_documents(
     request: Request,
     fill: Optional[bool] = False,
-    run=SecureEntry(scopes=["read:data", "read:metadata"]),
+    run=Security(get_entry(), scopes=["read:data", "read:metadata"])
 ):
 
     from .mongo_normalized import BlueskyRun
@@ -65,7 +65,7 @@ def generator_func():
 def post_documents(
     request: Request,
     named_doc: NamedDocument,
-    catalog=SecureEntry(scopes=["write:data", "write:metadata"]),
+    catalog=Security(get_entry(), scopes=["write:data", "write:metadata"]),
 ):
     from .mongo_normalized import MongoAdapter
 

requirements-client.txt

@@ -1,4 +1,4 @@
 bluesky-tiled-plugins
 msgpack >=1.0.0
 orjson
-tiled[client] >=0.1.0-b13
+tiled[client] >=0.1.0b21

requirements-server.txt

@@ -17,7 +17,7 @@ pytz
 rich
 starlette
 suitcase-mongo >=0.5.0
-tiled[server] >=0.1.0-b13
+tiled[server] >=0.1.0b21
 toolz
 typer
 tzlocal

requirements-test.txt

@@ -17,6 +17,6 @@ sphinx
 suitcase-jsonl >=0.1.0b2
 suitcase-mongo >=0.5.0
 suitcase-msgpack >=0.2.2
-tiled[all] >=0.1.0-b13
+tiled[all] >=0.1.0b21
 ujson
 vcrpy

setup.py

@@ -42,8 +42,9 @@ def read_requirements(filename):
     return requirements
 
 
+suffixes = ["client", "server", "back-compat", "docs", "test"]
 extras_require = {
-    key: read_requirements(f"requirements-{key}.txt") for key in ["client", "server", "back-compat"]
+    suffix: read_requirements(f"requirements-{suffix}.txt") for suffix in suffixes
 }
 extras_require["complete"] = sorted(set(sum(extras_require.values(), [])))
 extras_require["all"] = extras_require["complete"]  # for back-compat