From cd8e3aa7d5b90354b491e2b8f9cc0a2ed77929c5 Mon Sep 17 00:00:00 2001 From: Eugene M Date: Thu, 27 Feb 2025 09:35:46 -0500 Subject: [PATCH 1/4] MNT: gitignore _version.py --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e627f684e..d709d569c 100644 --- a/.gitignore +++ b/.gitignore @@ -138,3 +138,6 @@ docs/data.h5 # generated by docker-compose data/* + +# version file generated by setuptools +*_version.py From 7b7164b6e44717f429e086b8f2741ec73eeced3c Mon Sep 17 00:00:00 2001 From: Eugene M Date: Wed, 2 Apr 2025 12:02:36 -0400 Subject: [PATCH 2/4] UPD: updates to match the new Tiled auth system --- databroker/server.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/databroker/server.py b/databroker/server.py index f2033dbc8..1f7672925 100644 --- a/databroker/server.py +++ b/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 From 0013e50328b62633420a99be2bcd913c1dee6072 Mon Sep 17 00:00:00 2001 From: Dan Allan Date: Thu, 3 Apr 2025 12:32:53 -0400 Subject: [PATCH 3/4] Make dev requirements pip installable. --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 73352d008..489ac6afe 100644 --- a/setup.py +++ b/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 From 4e449a4f52705e21aaf113486fdc47382300b0e1 Mon Sep 17 00:00:00 2001 From: Dan Allan Date: Thu, 3 Apr 2025 12:36:43 -0400 Subject: [PATCH 4/4] Bump minimum tiled version --- requirements-client.txt | 2 +- requirements-server.txt | 2 +- requirements-test.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-client.txt b/requirements-client.txt index bac3aca92..c1c1ada85 100644 --- a/requirements-client.txt +++ b/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 diff --git a/requirements-server.txt b/requirements-server.txt index 1f4da3507..be7828adb 100644 --- a/requirements-server.txt +++ b/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 diff --git a/requirements-test.txt b/requirements-test.txt index 51106094e..b08a27ffe 100644 --- a/requirements-test.txt +++ b/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