Merge remote-tracking branch 'origin' into multi_tomo

chanzuckerberg · Oct 4, 2024 · 06d3a7c · 06d3a7c
2 parents 8f6fe81 + cf8d2e0
commit 06d3a7c
Show file tree

Hide file tree

Showing 71 changed files with 15,004 additions and 9,918 deletions.
diff --git a/apiv2/Makefile b/apiv2/Makefile
@@ -38,7 +38,7 @@ build: ## Build docker containers
 update-schema: codegen alembic-autogenerate alembic-upgrade-head
 	# $(docker_compose_run) $(CONTAINER) ruff check --fix .
 	$(docker_compose_run) $(APP_CONTAINER) sh -c 'strawberry export-schema main:schema > /app/graphql_api/schema.graphql'
-	linkml generate erdiagram --structural --classes Alignment --classes AnnotationAuthor --classes AnnotationFile --classes AnnotationShape --classes Annotation --classes DatasetAuthor --classes DatasetFunding --classes Dataset --classes DepositionAuthor --classes Deposition --classes Frame --classes PerSectionAlignmentParameters --classes PerSectionParameters --classes Run --classes Tiltseries --classes TomogramAuthor --classes TomogramVoxelSpacing --classes Tomogram schema/schema.yaml> schema/README.md
+	linkml generate erdiagram --structural --classes Alignment --classes AnnotationAuthor --classes AnnotationFile --classes AnnotationShape --classes Annotation --classes DatasetAuthor --classes DatasetFunding --classes Dataset --classes DepositionAuthor --classes Deposition --classes Frame --classes PerSectionAlignmentParameters --classes AnnotationMethodLink --classes GainFile --classes FrameAcquisitionFile --classes Run --classes Tiltseries --classes TomogramAuthor --classes TomogramVoxelSpacing --classes Tomogram schema/schema.yaml> schema/README.md
 	docker compose up -d
 	sleep 5 # wait for the app to reload after having files updated.
 	docker compose exec $(APP_CONTAINER) python3 -m sgqlc.introspection --exclude-deprecated --exclude-description http://localhost:9009/graphql graphql_api/schema.json

diff --git a/apiv2/cerbos/policies/annotation_method_link.yaml b/apiv2/cerbos/policies/annotation_method_link.yaml
diff --git a/apiv2/cerbos/policies/frame_acquisition_file.yaml b/apiv2/cerbos/policies/frame_acquisition_file.yaml
diff --git a/apiv2/cerbos/policies/gain_file.yaml b/apiv2/cerbos/policies/gain_file.yaml
diff --git a/apiv2/database/migrations/versions/20241002_152402_autogenerated.py b/apiv2/database/migrations/versions/20241002_152402_autogenerated.py
diff --git a/apiv2/database/migrations/versions/20241003_144355_autogenerated.py b/apiv2/database/migrations/versions/20241003_144355_autogenerated.py
diff --git a/apiv2/database/models/__init__.py b/apiv2/database/models/__init__.py
diff --git a/apiv2/database/models/alignment.py b/apiv2/database/models/alignment.py