Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
1b1cf5f
Add db components from ispyb
stephen-riggs Dec 1, 2025
ce045b6
Merge together all similar tables
stephen-riggs Dec 1, 2025
e966b2a
Register movies on the murfey side
stephen-riggs Dec 2, 2025
7dad07e
Wrong naming
stephen-riggs Dec 2, 2025
4027b55
Split out the dbs
stephen-riggs Jan 7, 2026
3bc60aa
Columns different way around
stephen-riggs Jan 8, 2026
414ecdd
Got mappings wrong
stephen-riggs Jan 8, 2026
9579697
Merge branch 'main' into processing-db
stephen-riggs Jan 8, 2026
d5fe52b
Add setup options for processing tables
stephen-riggs Jan 9, 2026
b4ac97e
Merge branch 'main' into processing-db
stephen-riggs Jan 26, 2026
70ebca9
Test that the processing db can be set up
stephen-riggs Jan 26, 2026
c5cf415
Attempt model config
stephen-riggs Jan 26, 2026
8bcb49f
Try different relation method
stephen-riggs Jan 26, 2026
4d87a97
Back to arb types
stephen-riggs Jan 26, 2026
3e67f3d
Try importing whole db
stephen-riggs Feb 19, 2026
5e2003a
Import and pass
stephen-riggs Feb 19, 2026
ace3aba
Arbitrary types
stephen-riggs Feb 19, 2026
4f118ee
More of the chain
stephen-riggs Feb 19, 2026
1a6ba4b
keep going
stephen-riggs Feb 20, 2026
d6c752b
make table
stephen-riggs Feb 20, 2026
c0c686f
ignore types
stephen-riggs Feb 20, 2026
8ac9fe2
mapping
stephen-riggs Feb 20, 2026
9575c34
table inherit table
stephen-riggs Feb 20, 2026
9e2e595
Refactor for no inheritance
stephen-riggs Feb 20, 2026
7462261
Test imported wrong thing
stephen-riggs Feb 20, 2026
49bb064
foreign keys needed
stephen-riggs Feb 20, 2026
c14bc21
Add relations
stephen-riggs Feb 20, 2026
6913633
Maybe that was wrong
stephen-riggs Feb 20, 2026
2aa9f98
That was daft
stephen-riggs Feb 20, 2026
c56ce1e
That was also daft
stephen-riggs Feb 20, 2026
ee715f5
More foreign keys
stephen-riggs Feb 20, 2026
08e3c9a
Casings and typo
stephen-riggs Feb 20, 2026
b6adae7
Try reverting some of the keys
stephen-riggs Feb 20, 2026
fda1f74
Wrong keys
stephen-riggs Feb 20, 2026
09f4830
Merge branch 'main' into processing-db
stephen-riggs Feb 20, 2026
55388f4
missed bracket layer?
stephen-riggs Feb 20, 2026
7b34098
Try without the metadata bit
stephen-riggs Feb 20, 2026
c3a3e18
No need for mapper registry
stephen-riggs Feb 20, 2026
7fe54e5
combine schema files to avoid missing import errors from sqlalchemy s…
d-j-hatton Feb 26, 2026
462d439
small changes to try and help us move to numpy 2
d-j-hatton Feb 26, 2026
f615d4c
Add ice ring density field
stephen-riggs Feb 26, 2026
44249ae
REmove processing db from cli
stephen-riggs Feb 26, 2026
7ea39a7
Remove processing db
stephen-riggs Feb 26, 2026
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
2 changes: 1 addition & 1 deletion src/murfey/cli/create_db.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ def run():
parser = argparse.ArgumentParser(
description="Generate the necessary tables for the Murfey database"
)

parser.add_argument(
"--no-clear",
dest="clear",
Expand All @@ -22,4 +21,5 @@ def run():

if args.clear:
clear(url())

setup(url())
12 changes: 12 additions & 0 deletions src/murfey/server/api/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ async def request_spa_preprocessing(
db.add(feedback_params)
movie = Movie(
murfey_id=murfey_ids[0],
data_collection_id=detached_ids[1],
path=proc_file.path,
image_number=proc_file.image_number,
tag=proc_file.tag,
Expand Down Expand Up @@ -731,6 +732,17 @@ async def request_tomography_preprocessing(
0
].eer_fractionation_file

movie = Movie(
murfey_id=murfey_ids[0],
data_collection_id=dcid,
path=proc_file.path,
image_number=proc_file.image_number,
tag=proc_file.tag,
)
db.add(movie)
db.commit()
db.close()

zocalo_message: dict = {
"recipes": [recipe_name],
"parameters": {
Expand Down
5 changes: 3 additions & 2 deletions src/murfey/server/feedback.py
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,7 @@ def _flush_tomography_preprocessing(message: dict, _db):
p.parent.mkdir(parents=True)
movie = db.Movie(
murfey_id=murfey_ids[0],
data_collection_id=detached_ids[1],
path=f.file_path,
image_number=f.image_number,
tag=f.tag,
Expand Down Expand Up @@ -1818,8 +1819,8 @@ def _save_bfactor(message: dict, _db):
"ispyb_command": "insert_particle_classification"
},
"program_id": message["program_id"],
"bfactor_fit_intercept": str(bfactor_fitting[1]),
"bfactor_fit_linear": str(bfactor_fitting[0]),
"bfactor_fit_intercept": str(float(bfactor_fitting[1])),
"bfactor_fit_linear": str(float(bfactor_fitting[0])),
},
new_connection=True,
)
Expand Down
Loading