Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 78 additions & 72 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ accessible-pygments==0.0.5
aioca==1.8.1
aiofiles==24.1.0
aiohappyeyeballs==2.6.1
aiosignal==1.3.2
aiohttp==3.12.14
aiosignal==1.4.0
alabaster==1.0.0
annotated-types==0.7.0
anyio==4.9.0
asgiref==3.8.1
asgiref==3.9.1
attrs==25.3.0
babel==2.17.0
beautifulsoup4==4.13.4
bidict==0.23.1
bluesky==1.13.1
bluesky-stomp==0.1.6
certifi==2025.1.31
bluesky==1.14.2
bluesky-stomp==0.1.7
certifi==2025.7.14
cffi==1.17.1
cfgv==3.4.0
charset-normalizer==3.4.2
Expand All @@ -22,36 +23,37 @@ colorama==0.4.6
colorlog==6.9.0
compress-pickle==2.1.0
contourpy==1.3.2
copier==9.7.1
coverage==7.8.2
cryptography==45.0.3
copier==9.8.0
coverage==7.9.2
cryptography==45.0.5
cycler==0.12.1
dataclasses-json==0.6.7
deepdiff==8.4.2
deepdiff==8.5.0
deepmerge==2.0
Deprecated==1.2.18
distlib==0.3.9
dls-dodal==1.46.0
dls-dodal==1.51.0
dnspython==2.7.0
docopt==0.6.2
docutils==0.21.2
dunamai==1.23.1
dunamai==1.25.0
email_validator==2.2.0
epicscorelibs==7.0.7.99.1.2a1
event-model==1.23
fastapi==0.115.12
fastapi-cli==0.0.7
fastapi==0.116.1
fastapi-cli==0.0.8
fastapi-cloud-cli==0.1.4
filelock==3.18.0
flexcache==0.3
flexparser==0.4
fonttools==4.57.0
frozenlist==1.6.0
fonttools==4.58.5
frozenlist==1.7.0
funcy==2.0
gitdb==4.0.12
GitPython==3.1.44
googleapis-common-protos==1.70.0
graypy==2.1.0
grpcio==1.71.0
grpcio==1.73.1
h11==0.16.0
historydict==1.2.6
httpcore==1.0.9
Expand All @@ -60,13 +62,13 @@ httpx==0.28.1
identify==2.6.12
idna==3.10
imagesize==1.4.1
importlib_metadata==8.6.1
importlib_metadata==8.7.0
importlib_resources==6.5.2
iniconfig==2.1.0
itsdangerous==2.2.0
Jinja2==3.1.6
jinja2-ansible-filters==1.3.2
jsonschema==4.23.0
jsonschema==4.24.0
jsonschema-specifications==2025.4.1
jwcrypto==1.5.6
kiwisolver==1.4.8
Expand All @@ -79,33 +81,33 @@ mdit-py-plugins==0.4.2
mdurl==0.1.2
mistune==3.1.3
mock==5.2.0
msgpack==1.1.0
msgpack==1.1.1
msgpack-numpy==0.4.8
multidict==6.4.4
multidict==6.6.3
mypy_extensions==1.1.0
myst-parser==4.0.1
networkx==3.4.2
networkx==3.5
nodeenv==1.9.1
nose2==0.15.1
numpy==2.2.6
observability-utils==0.1.4
opencv-python-headless==4.11.0.86
opentelemetry-api==1.32.1
opentelemetry-distro==0.53b1
opentelemetry-exporter-otlp==1.32.1
opentelemetry-exporter-otlp-proto-common==1.32.1
opentelemetry-exporter-otlp-proto-grpc==1.32.1
opentelemetry-exporter-otlp-proto-http==1.32.1
opentelemetry-instrumentation==0.53b1
opentelemetry-instrumentation-asgi==0.53b1
opentelemetry-instrumentation-fastapi==0.53b1
opentelemetry-proto==1.32.1
opentelemetry-sdk==1.32.1
opentelemetry-semantic-conventions==0.53b1
opentelemetry-util-http==0.53b1
ophyd==1.10.6
ophyd-async==0.10.0a3
orderly-set==5.4.1
observability-utils==0.1.5
opencv-python-headless==4.12.0.88
opentelemetry-api==1.35.0
opentelemetry-distro==0.56b0
opentelemetry-exporter-otlp==1.35.0
opentelemetry-exporter-otlp-proto-common==1.35.0
opentelemetry-exporter-otlp-proto-grpc==1.35.0
opentelemetry-exporter-otlp-proto-http==1.35.0
opentelemetry-instrumentation==0.56b0
opentelemetry-instrumentation-asgi==0.56b0
opentelemetry-instrumentation-fastapi==0.56b0
opentelemetry-proto==1.35.0
opentelemetry-sdk==1.35.0
opentelemetry-semantic-conventions==0.56b0
opentelemetry-util-http==0.56b0
ophyd==1.10.7
ophyd-async==0.11
orderly-set==5.5.0
orjson==3.10.18
p4p==4.2.0
packaging==25.0
Expand All @@ -115,50 +117,54 @@ picobox==4.0.0
pika==1.3.2
pillow==11.3.0
Pint==0.24.4
pipdeptree==2.26.1
pipdeptree==2.27.0
platformdirs==4.3.8
pluggy==1.5.0
pluggy==1.6.0
plumbum==1.9.0
ply==3.11
pre_commit==4.2.0
prompt_toolkit==3.0.51
propcache==0.3.1
protobuf==5.29.5
propcache==0.3.2
protobuf==6.31.1
pvxslibs==1.3.3
py==1.11.0
pycparser==2.22
pydantic==2.10.6
pydantic-extra-types==2.10.4
pydantic-settings==2.9.1
pydantic_core==2.27.2
pydantic==2.11.7
pydantic-extra-types==2.10.5
pydantic-settings==2.10.1
pydantic_core==2.33.2
pydantic_numpy==8.0.1
pydata-sphinx-theme==0.16.1
pyepics==3.5.7
Pygments==2.19.1
pyepics==3.5.8
Pygments==2.19.2
PyJWT==2.10.1
pyparsing==3.2.3
pyright==1.1.401
pytest==8.3.5
pyright==1.1.403
pytest==8.4.1
pytest-asyncio==1.0.0
pytest-cov==6.1.1
pytest-cov==6.2.1
python-dateutil==2.9.0.post0
python-dotenv==1.1.0
python-dotenv==1.1.1
python-multipart==0.0.20
PyYAML==6.0.2
pyzmq==26.3.0
questionary==2.1.0
redis==6.2.0
referencing==0.36.2
requests==2.32.4
responses==0.25.7
rich==14.0.0
rich-toolkit==0.14.3
rich-toolkit==0.14.8
rignore==0.6.2
roman-numerals-py==3.1.0
rpds-py==0.24.0
ruamel.yaml==0.18.10
rpds-py==0.26.0
ruamel.yaml==0.18.14
ruamel.yaml.clib==0.2.12
ruff==0.11.7
scanspec==0.7.8
ruff==0.12.3
scanspec==0.8.0
semver==3.0.4
sentry-sdk==2.32.0
setuptools==80.9.0
setuptools_dso==2.12.2
shellingham==1.5.4
six==1.17.0
Expand All @@ -180,33 +186,33 @@ sphinxcontrib-jsmath==1.0.1
sphinxcontrib-openapi==0.8.4
sphinxcontrib-qthelp==2.0.0
sphinxcontrib-serializinghtml==2.0.0
starlette==0.46.2
starlette==0.47.1
stomp.py==8.2.0
super-state-machine==2.0.2
tomlkit==0.13.2
tomlkit==0.13.3
toolz==1.0.0
tox==3.28.0
tox-direct==0.4
tqdm==4.67.1
typer==0.15.2
types-mock==5.2.0.20250306
types-PyYAML==6.0.12.20250402
types-requests==2.32.0.20250328
typer==0.16.0
types-mock==5.2.0.20250516
types-PyYAML==6.0.12.20250516
types-requests==2.32.4.20250611
types-urllib3==1.26.25.14
typing-inspect==0.9.0
typing-inspection==0.4.0
typing_extensions==4.13.2
typing-inspection==0.4.1
typing_extensions==4.14.1
ujson==5.10.0
urllib3==2.5.0
uvicorn==0.34.2
uvicorn==0.35.0
uvloop==0.21.0
virtualenv==20.30.0
watchfiles==1.0.5
virtualenv==20.31.2
watchfiles==1.1.0
wcwidth==0.2.13
websocket-client==1.8.0
websockets==15.0.1
workflows==3.2
wrapt==1.17.2
yarl==1.20.0
zipp==3.21.0
zocalo==1.2.0
yarl==1.20.1
zipp==3.23.0
zocalo==1.3.0
4 changes: 3 additions & 1 deletion docs/reference/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ components:
title: Name
type: string
schema:
additionalProperties: true
description: Schema of the plan's parameters
title: Schema
type: object
Expand Down Expand Up @@ -231,6 +232,7 @@ components:
title: Name
type: string
params:
additionalProperties: true
description: Values for parameters to plan, if any
title: Params
type: object
Expand Down Expand Up @@ -348,7 +350,7 @@ info:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0.html
title: BlueAPI Control
version: 1.0.1
version: 1.0.2
openapi: 3.1.0
paths:
/config/oidc:
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ dependencies = [
"bluesky[plotting]>=1.13.1", # plotting includes matplotlib, required for BestEffortCallback in run plans
"ophyd-async",
"aioca",
"pydantic(>=2.0,<=2.10.6)", # https://github.com/DiamondLightSource/blueapi/issues/908
"scanspec>=0.7.8",
"pydantic>=2.0",
"scanspec>=0.8.0",
"pydantic-settings",
"stomp-py",
"PyYAML>=6.0.2",
"click>=8.2.0",
"fastapi>=0.112.0",
"uvicorn",
"requests",
"dls-dodal>=1.46.0",
"dls-dodal>=1.51.0",
"super-state-machine", # https://github.com/DiamondLightSource/blueapi/issues/553
"GitPython",
"event-model==1.23", # https://github.com/DiamondLightSource/blueapi/issues/684
Expand Down
2 changes: 1 addition & 1 deletion src/blueapi/service/main.py
Comment thread
DiamondJoseph marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
from .runner import WorkerDispatcher

#: API version to publish in OpenAPI schema
REST_API_VERSION = "1.0.1"
REST_API_VERSION = "1.0.2"

LICENSE_INFO: dict[str, str] = {
"name": "Apache 2.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/system_tests/devices.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
]
},
{
"name": "sim",
"name": "stage",
"protocols": [
{
"name": "Readable",
Expand Down
Loading