Skip to content

Commit 86bee44

Browse files
committed
add logs and minor fix
1 parent 38becc0 commit 86bee44

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

src/murfey/server/api/instrument.py

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from werkzeug.utils import secure_filename
1515

1616
try:
17+
from smartem_backend.api_client import EntityConverter
1718
from smartem_common.schemas import AcquisitionData
1819

1920
SMARTEM_ACTIVE = True
@@ -157,13 +158,23 @@ async def setup_multigrid_watcher(
157158
async with aiohttp.ClientSession() as clientsession:
158159
acquisition_uuid = None
159160
if SMARTEM_ACTIVE and machine_config.smartem_api_url:
160-
acquisition_data = AcquisitionData(name=visit)
161-
async with clientsession.post(
162-
f"{machine_config.smartem_api_url}/acquisitions",
163-
acquisition_data.model_json_schema(),
164-
) as response:
165-
acquisition_response_data = await response.json()
166-
acquisition_uuid = acquisition_response_data.uuid
161+
log.info("registering an acquisition with smartem")
162+
try:
163+
acquisition_data = EntityConverter.acquisition_to_request(
164+
AcquisitionData(name=visit)
165+
)
166+
async with clientsession.post(
167+
f"{machine_config.smartem_api_url}/acquisitions",
168+
json=acquisition_data.model_dump(),
169+
) as response:
170+
acquisition_response_data = await response.json()
171+
acquisition_uuid = acquisition_response_data["uuid"]
172+
except Exception:
173+
log.warning(
174+
"failed to register acquisition with smartem", exc_info=True
175+
)
176+
else:
177+
log.info("smartem not configured")
167178
async with clientsession.post(
168179
f"{machine_config.instrument_server_url}{url_path_for('api.router', 'setup_multigrid_watcher', session_id=session_id)}",
169180
json={

src/murfey/server/api/session_control.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,8 @@ def register_atlas(
396396
grid_uuid=grid_uuid,
397397
)
398398
smartem_client.create_grid_atlas(atlas_data)
399+
else:
400+
logger.info("smartem deactivated so did not register atlas")
399401

400402

401403
@spa_router.post("/sessions/{session_id}/make_atlas_jpg")

0 commit comments

Comments
 (0)