Skip to content
Open
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
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ dependencies = [
"fastapi>=0.112.0",
"uvicorn",
"requests",
"super-state-machine", # https://github.com/DiamondLightSource/blueapi/issues/553
"GitPython",
"event-model==1.23.1", # https://github.com/DiamondLightSource/blueapi/issues/684
"bluesky-stomp>=0.1.6",
Expand Down
2 changes: 1 addition & 1 deletion src/blueapi/service/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from typing import Annotated

import jwt
from bluesky._vendor.super_state_machine.errors import TransitionError
from fastapi import (
APIRouter,
BackgroundTasks,
Expand All @@ -28,7 +29,6 @@
from opentelemetry.trace import get_tracer_provider
from pydantic import ValidationError
from starlette.responses import JSONResponse
from super_state_machine.errors import TransitionError

from blueapi.config import ApplicationConfig, OIDCConfig, Tag
from blueapi.service import interface
Expand Down
2 changes: 1 addition & 1 deletion src/blueapi/worker/event.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
from enum import StrEnum
from typing import Any, Literal, Self

from bluesky._vendor.super_state_machine.extras import PropertyMachine, ProxyString
from bluesky.run_engine import RunEngineStateMachine
from pydantic import Field, PydanticSchemaGenerationError, TypeAdapter
from pydantic_core import PydanticSerializationError
from super_state_machine.extras import PropertyMachine, ProxyString

from blueapi.utils import BlueapiBaseModel

Expand Down
2 changes: 1 addition & 1 deletion src/blueapi/worker/task_worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from threading import Event, RLock
from typing import Any, TypeVar

from bluesky._vendor.super_state_machine.errors import TransitionError
from bluesky.protocols import Status
from observability_utils.tracing import (
add_span_attributes,
Expand All @@ -20,7 +21,6 @@
from opentelemetry.trace import SpanKind
from pydantic import Field
from pydantic.json_schema import SkipJsonSchema
from super_state_machine.errors import TransitionError

from blueapi.core import (
OTLP_EXPORT_ENABLED,
Expand Down
2 changes: 1 addition & 1 deletion tests/unit_tests/service/test_rest_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

import jwt
import pytest
from bluesky._vendor.super_state_machine.errors import TransitionError
from bluesky.protocols import Stoppable
from fastapi import HTTPException, status
from fastapi.testclient import TestClient
from httpx2 import Headers
from pydantic import BaseModel, ValidationError
from pydantic_core import InitErrorDetails
from super_state_machine.errors import TransitionError

from blueapi.config import (
ApplicationConfig,
Expand Down
11 changes: 0 additions & 11 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading