Skip to content

Commit d00a65f

Browse files
committed
Merge branch 'main' into expeye-migration-phase-2
2 parents 55e081f + b671da3 commit d00a65f

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

‎Dockerfiles/murfey-server‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,19 @@ RUN \
3232
git \
3333
net-tools && \
3434
busybox --install && \
35+
python -m venv /venv && \
3536
echo "Installing Murfey..." && \
3637
cp -r /mnt/python-murfey /tmp/python-murfey && \
37-
python -m venv /venv && \
3838
/venv/bin/python -m pip install --upgrade \
3939
pip \
4040
build \
4141
&& \
4242
/venv/bin/python -m pip install /tmp/python-murfey[server] && \
43+
echo "Installing SmartEM..." && \
44+
git clone https://github.com/DiamondLightSource/smartem-decisions.git /tmp/smartem-decisions && \
45+
/venv/bin/python -m pip install \
46+
/tmp/smartem-decisions[backend,core,agent] \
47+
&&\
4348
echo "Installing IMOD..." && \
4449
mkdir /imod && \
4550
if [ -f /mnt/python-murfey/installers/${IMOD_INSTALLER} ]; then \

‎src/murfey/server/api/session_control.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ def register_square(
408408
else:
409409
gs = db.exec(
410410
select(GridSquare)
411-
.where(GridSquare.name == gsid)
411+
.where(GridSquare.name == int(gsid))
412412
.where(GridSquare.tag == square_registration_data.tag)
413413
.where(GridSquare.session_id == session_id)
414414
).one_or_none()

‎src/murfey/util/config.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ def get_extended_machine_config(
366366
return model(**data)
367367

368368

369+
@lru_cache(maxsize=1)
369370
def get_smartem_keycloak_client():
370371
keycloak_client = None
371372
if SMARTEM_ACTIVE:

0 commit comments

Comments
 (0)