Skip to content

Commit 48d52af

Browse files
committed
Add tag for deprecated endpoints
1 parent 74bbcf0 commit 48d52af

2 files changed

Lines changed: 14 additions & 18 deletions

File tree

src/blueapi/config.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ class Tag(StrEnum):
294294
DEVICE = "Device"
295295
ENV = "Environment"
296296
META = "Meta"
297+
DEPRECATED = "Deprecated"
297298

298299

299300
class ApplicationConfig(BlueapiBaseModel):
@@ -324,6 +325,7 @@ class ApplicationConfig(BlueapiBaseModel):
324325
{"name": Tag.DEVICE, "description": "Endpoints to get devices"},
325326
{"name": Tag.ENV, "description": "Endpoints related to server environment"},
326327
{"name": Tag.META, "description": "Endpoints used for auxiliary functions"},
328+
{"name": Tag.DEPRECATED, "description": "Deprecated endpoints"},
327329
]
328330

329331
stomp: StompConfig = Field(default_factory=StompConfig)

src/blueapi/service/main.py

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ async def inner(app: FastAPI):
100100

101101

102102
open_router = APIRouter()
103-
secure_router = APIRouter(deprecated=True)
103+
secure_router = APIRouter(deprecated=True, tags=[Tag.DEPRECATED])
104104
secure_router_v1 = APIRouter(prefix="/api/v1")
105105

106106

@@ -191,7 +191,7 @@ def root_redirect() -> RedirectResponse:
191191

192192

193193
@secure_router_v1.get("/environment", tags=[Tag.ENV])
194-
@secure_router.get("/environment", tags=[Tag.ENV])
194+
@secure_router.get("/environment")
195195
@start_as_current_span(TRACER, "runner")
196196
def get_environment(
197197
runner: Annotated[WorkerDispatcher, Depends(_runner)],
@@ -201,7 +201,7 @@ def get_environment(
201201

202202

203203
@secure_router_v1.delete("/environment", tags=[Tag.ENV])
204-
@secure_router.delete("/environment", tags=[Tag.ENV])
204+
@secure_router.delete("/environment")
205205
async def delete_environment(
206206
background_tasks: BackgroundTasks,
207207
runner: Annotated[WorkerDispatcher, Depends(_runner)],
@@ -232,7 +232,7 @@ def get_oidc_config(
232232

233233

234234
@secure_router_v1.get("/plans", tags=[Tag.PLAN])
235-
@secure_router.get("/plans", tags=[Tag.PLAN])
235+
@secure_router.get("/plans")
236236
@start_as_current_span(TRACER)
237237
def get_plans(runner: Annotated[WorkerDispatcher, Depends(_runner)]) -> PlanResponse:
238238
"""Retrieve information about all available plans."""
@@ -241,7 +241,7 @@ def get_plans(runner: Annotated[WorkerDispatcher, Depends(_runner)]) -> PlanResp
241241

242242

243243
@secure_router_v1.get("/plans/{name}", tags=[Tag.PLAN])
244-
@secure_router.get("/plans/{name}", tags=[Tag.PLAN])
244+
@secure_router.get("/plans/{name}")
245245
@start_as_current_span(TRACER, "name")
246246
def get_plan_by_name(
247247
name: str, runner: Annotated[WorkerDispatcher, Depends(_runner)]
@@ -251,7 +251,7 @@ def get_plan_by_name(
251251

252252

253253
@secure_router_v1.get("/devices", tags=[Tag.DEVICE])
254-
@secure_router.get("/devices", tags=[Tag.DEVICE])
254+
@secure_router.get("/devices")
255255
@start_as_current_span(TRACER)
256256
def get_devices(
257257
runner: Annotated[WorkerDispatcher, Depends(_runner)],
@@ -262,7 +262,7 @@ def get_devices(
262262

263263

264264
@secure_router_v1.get("/devices/{name}", tags=[Tag.DEVICE])
265-
@secure_router.get("/devices/{name}", tags=[Tag.DEVICE])
265+
@secure_router.get("/devices/{name}")
266266
@start_as_current_span(TRACER, "name")
267267
def get_device_by_name(
268268
name: str, runner: Annotated[WorkerDispatcher, Depends(_runner)]
@@ -279,7 +279,7 @@ def get_device_by_name(
279279

280280

281281
@secure_router_v1.post("/tasks", status_code=status.HTTP_201_CREATED, tags=[Tag.TASK])
282-
@secure_router.post("/tasks", status_code=status.HTTP_201_CREATED, tags=[Tag.TASK])
282+
@secure_router.post("/tasks", status_code=status.HTTP_201_CREATED)
283283
@start_as_current_span(
284284
TRACER,
285285
"request",
@@ -330,9 +330,7 @@ def submit_task(
330330
@secure_router_v1.delete(
331331
"/tasks/{task_id}", status_code=status.HTTP_200_OK, tags=[Tag.TASK]
332332
)
333-
@secure_router.delete(
334-
"/tasks/{task_id}", status_code=status.HTTP_200_OK, tags=[Tag.TASK]
335-
)
333+
@secure_router.delete("/tasks/{task_id}", status_code=status.HTTP_200_OK)
336334
@start_as_current_span(TRACER, "task_id")
337335
def delete_submitted_task(
338336
task_id: str,
@@ -350,7 +348,7 @@ def validate_task_status(v: str) -> TaskStatusEnum:
350348

351349

352350
@secure_router_v1.get("/tasks", status_code=status.HTTP_200_OK, tags=[Tag.TASK])
353-
@secure_router.get("/tasks", status_code=status.HTTP_200_OK, tags=[Tag.TASK])
351+
@secure_router.get("/tasks", status_code=status.HTTP_200_OK)
354352
@start_as_current_span(TRACER)
355353
def get_tasks(
356354
runner: Annotated[WorkerDispatcher, Depends(_runner)],
@@ -384,7 +382,6 @@ def get_tasks(
384382
@secure_router.put(
385383
"/worker/task",
386384
responses={status.HTTP_409_CONFLICT: {}},
387-
tags=[Tag.TASK],
388385
)
389386
@start_as_current_span(TRACER, "task.task_id")
390387
def set_active_task(
@@ -416,7 +413,7 @@ def get_passthrough_headers(request: Request) -> dict[str, str]:
416413

417414

418415
@secure_router_v1.get("/tasks/{task_id}", tags=[Tag.TASK])
419-
@secure_router.get("/tasks/{task_id}", tags=[Tag.TASK])
416+
@secure_router.get("/tasks/{task_id}")
420417
@start_as_current_span(TRACER, "task_id")
421418
def get_task(
422419
task_id: str,
@@ -435,7 +432,6 @@ def get_task(
435432
)
436433
@secure_router.get(
437434
"/worker/task",
438-
tags=[Tag.TASK],
439435
)
440436
@start_as_current_span(TRACER)
441437
def get_active_task(
@@ -452,7 +448,6 @@ def get_active_task(
452448
)
453449
@secure_router.get(
454450
"/worker/state",
455-
tags=[Tag.TASK],
456451
)
457452
@start_as_current_span(TRACER)
458453
def get_state(runner: Annotated[WorkerDispatcher, Depends(_runner)]) -> WorkerState:
@@ -491,7 +486,6 @@ def get_state(runner: Annotated[WorkerDispatcher, Depends(_runner)]) -> WorkerSt
491486
status.HTTP_400_BAD_REQUEST: {},
492487
status.HTTP_202_ACCEPTED: {},
493488
},
494-
tags=[Tag.TASK],
495489
)
496490
@start_as_current_span(TRACER, "state_change_request.new_state")
497491
def set_state(
@@ -543,7 +537,7 @@ def set_state(
543537

544538

545539
@secure_router_v1.get("/python_environment", tags=[Tag.ENV])
546-
@secure_router.get("/python_environment", tags=[Tag.ENV])
540+
@secure_router.get("/python_environment")
547541
@start_as_current_span(TRACER)
548542
def get_python_environment(
549543
runner: Annotated[WorkerDispatcher, Depends(_runner)],

0 commit comments

Comments
 (0)