Skip to content

Commit 62304fb

Browse files
committed
Replace ClientEnvironment with Session
1 parent 5f40177 commit 62304fb

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/murfey/server/__init__.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,15 @@ def get_job_ids(tilt_series_id: int, appid: int) -> JobIDs:
171171
db.ProcessingJob,
172172
db.DataCollection,
173173
db.DataCollectionGroup,
174-
db.ClientEnvironment,
174+
db.Session,
175175
)
176176
.where(db.TiltSeries.id == tilt_series_id)
177177
.where(db.DataCollection.tag == db.TiltSeries.tag)
178178
.where(db.ProcessingJob.id == db.AutoProcProgram.pj_id)
179179
.where(db.AutoProcProgram.id == appid)
180180
.where(db.ProcessingJob.dc_id == db.DataCollection.id)
181181
.where(db.DataCollectionGroup.id == db.DataCollection.dcg_id)
182-
.where(db.ClientEnvironment.session_id == db.TiltSeries.session_id)
182+
.where(db.Session.id == db.TiltSeries.session_id)
183183
).all()
184184
return JobIDs(
185185
dcgid=results[0][4].id,
@@ -1726,11 +1726,7 @@ def _register_3d_batch(message: dict, _db=murfey_db, demo: bool = False):
17261726
other_options = dict(feedback_params)
17271727

17281728
visit_name = (
1729-
_db.exec(
1730-
select(db.ClientEnvironment).where(
1731-
db.ClientEnvironment.session_id == message["session_id"]
1732-
)
1733-
)
1729+
_db.exec(select(db.Session).where(db.Session.id == message["session_id"]))
17341730
.one()
17351731
.visit
17361732
)
@@ -2676,6 +2672,7 @@ def feedback_callback(header: dict, message: dict) -> None:
26762672
_transport_object.transport.ack(header)
26772673
return None
26782674
elif message["register"] == "processing_job":
2675+
murfey_session_id = message["session_id"]
26792676
logger.info("registering processing job")
26802677
assert isinstance(global_state["data_collection_ids"], dict)
26812678
dc = murfey_db.exec(

0 commit comments

Comments
 (0)