Skip to content

Commit

Permalink
Merge pull request #821 from danielballan/update-for-tiled-0.1.0b8
Browse files Browse the repository at this point in the history
Update for tiled v0.1.0b8
  • Loading branch information
jmaruland authored Sep 6, 2024
2 parents 11fa21f + 8a4dade commit b3457ab
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/bluesky/tiled:v0.1.0b7 as base
FROM ghcr.io/bluesky/tiled:v0.1.0b8 as base

FROM base as builder

Expand Down
6 changes: 3 additions & 3 deletions databroker/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from event_model import DocumentNames, schema_validators
from fastapi import APIRouter, HTTPException, Request
import pydantic
from tiled.server.core import PatchedStreamingResponse
from starlette.responses import StreamingResponse
from tiled.server.dependencies import SecureEntry


Expand Down Expand Up @@ -44,13 +44,13 @@ def generator_func():
yield packer.pack({"name": name, "doc": doc})

generator = generator_func()
return PatchedStreamingResponse(
return StreamingResponse(
generator, media_type="application/x-msgpack"
)
if media_type == "application/json-seq":
# (name, doc) pairs as newline-delimited JSON
generator = (json.dumps({"name": name, "doc": doc}) + "\n" for name, doc in run.documents(fill=fill))
return PatchedStreamingResponse(
return StreamingResponse(
generator, media_type="application/json-seq"
)
else:
Expand Down
2 changes: 1 addition & 1 deletion requirements-client.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mongoquery
msgpack >=1.0.0
orjson
tiled[client] >=0.1.0b4
tiled[client] >=0.1.0b8
2 changes: 1 addition & 1 deletion requirements-server.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pytz
rich
starlette
suitcase-mongo >=0.5.0
tiled[server] >=0.1.0b4
tiled[server] >=0.1.0b8
toolz
typer
tzlocal
Expand Down
2 changes: 1 addition & 1 deletion requirements-test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ sphinx
suitcase-jsonl >=0.1.0b2
suitcase-mongo >=0.5.0
suitcase-msgpack >=0.2.2
tiled[all] >=0.1.0b4
tiled[all] >=0.1.0b8
ujson
vcrpy

0 comments on commit b3457ab

Please sign in to comment.