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
24 changes: 23 additions & 1 deletion src/murfey/server/api/hub.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
from logging import getLogger
from typing import List

from fastapi import APIRouter
from fastapi import APIRouter, HTTPException
from fastapi.responses import FileResponse
from pydantic import BaseModel
from sqlmodel import select

from murfey.server.murfey_db import murfey_db
from murfey.util.config import get_machine_config
from murfey.util.db import MagnificationImageShift

logger = getLogger("murfey.server.api.hub")

Expand Down Expand Up @@ -35,3 +38,22 @@ def get_instrument_image(instrument_name: str) -> FileResponse:
if config.get(instrument_name):
return FileResponse(config[instrument_name].image_path)
return FileResponse()


class ImageShift(BaseModel):
x: float
y: float


@router.get("/instrument/{instrument_name}/mag/{mag}/shifts")
def get_instrument_mag_image_shift(
instrument_name: str, mag: int, db=murfey_db
) -> ImageShift:
shifts = db.exec(
select(MagnificationImageShift)
.where(MagnificationImageShift.instrument_name == instrument_name)
.where(MagnificationImageShift.magnification == mag)
).one_or_none()
if shifts is None:
raise HTTPException(status_code=404, detail="Image shifts not found")
return ImageShift(x=shifts.x_shift, y=shifts.y_shift)
7 changes: 7 additions & 0 deletions src/murfey/util/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ class MagnificationLookup(SQLModel, table=True): # type: ignore
pixel_size: float = Field(primary_key=True)


class MagnificationImageShift(SQLModel, table=True): # type: ignore
magnification: int = Field(primary_key=True)
instrument_name: str = Field(primary_key=True)
x_shift: float # in microns
y_shift: float # in microns


class ClientEnvironment(SQLModel, table=True): # type: ignore
client_id: Optional[int] = Field(primary_key=True, unique=True)
visit: str = Field(default="")
Expand Down
9 changes: 9 additions & 0 deletions src/murfey/util/route_manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -507,6 +507,15 @@ murfey.server.api.hub.router:
type: str
methods:
- GET
- path: /instrument/{instrument_name}/mag/{mag}/shifts
function: get_instrument_mag_image_shift
path_params:
- name: instrument_name
type: str
- name: mag
type: int
methods:
- GET
murfey.server.api.instrument.router:
- path: /instrument_server/instruments/{instrument_name}/sessions/{session_id}/activate_instrument_server
function: activate_instrument_server_for_session
Expand Down
Loading