Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorder docker #629

Merged
merged 2 commits into from
Jan 26, 2024
Merged

Reorder docker #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c4ab3b
Reorder docker build
manthey Jan 24, 2024
8335e3c
Defer importing functions that connect to the database
manthey Jan 25, 2024
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
7 changes: 4 additions & 3 deletions devops/girder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ WORKDIR /src/large_image
RUN pip install -e .[all] -r requirements-test.txt --find-links https://girder.github.io/large_image_wheels
RUN pip install girder[mount] girder girder-user-quota
# RUN pip install .[all] ./girder[tasks] girder[mount] --find-links https://girder.github.io/large_image_wheels
RUN girder build

COPY ./provision.py /src/provision.py
COPY ./girder.cfg /etc/girder.cfg

COPY plugins/AnnotationPlugin /src/AnnotationPlugin
RUN pip install -e /src/AnnotationPlugin

COPY ./provision.py /src/provision.py
COPY ./girder.cfg /etc/girder.cfg
RUN girder build

ENTRYPOINT ["bash"]
32 changes: 18 additions & 14 deletions devops/girder/plugins/AnnotationPlugin/upenncontrast_annotation/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,32 @@
from .server.models.history import History as HistoryModel
from .server.models.documentChange import DocumentChange as DocumentChangeModel

from .server.api.annotation import Annotation
from .server.api.connections import AnnotationConnection
from .server.api.propertyValues import PropertyValues
from .server.api.property import AnnotationProperty
from .server.api.workerInterfaces import WorkerInterfaces
from .server.api.workerPreviews import WorkerPreviews
from .server.api.datasetView import DatasetView
from .server.api.history import History


class UPennContrastAnnotationAPIPlugin(GirderPlugin):
DISPLAY_NAME = 'UPennContrast Annotation Plugin'
def load(self, info):
# Laziliy do these imports as they can connect to the database
from .server.api.annotation import Annotation
from .server.api.connections import AnnotationConnection
from .server.api.propertyValues import PropertyValues
from .server.api.property import AnnotationProperty
from .server.api.workerInterfaces import WorkerInterfaces
from .server.api.workerPreviews import WorkerPreviews
from .server.api.datasetView import DatasetView
from .server.api.history import History

ModelImporter.registerModel('upenn_annotation', AnnotationModel, 'upenncontrast_annotation')
ModelImporter.registerModel('annotation_connection', ConnectionModel, 'upenncontrast_annotation')
ModelImporter.registerModel('annotation_property_values', PropertyValuesModel, 'upenncontrast_annotation')
ModelImporter.registerModel('annotation_property', PropertyModel, 'upenncontrast_annotation')
ModelImporter.registerModel(
'annotation_connection', ConnectionModel, 'upenncontrast_annotation')
ModelImporter.registerModel(
'annotation_property_values', PropertyValuesModel, 'upenncontrast_annotation')
ModelImporter.registerModel(
'annotation_property', PropertyModel, 'upenncontrast_annotation')
ModelImporter.registerModel('worker_interface', InterfaceModel, 'upenncontrast_annotation')
ModelImporter.registerModel('worker_preview', PreviewModel, 'upenncontrast_annotation')
ModelImporter.registerModel('dataset_view', DatasetViewModel, 'upenncontrast_annotation')
ModelImporter.registerModel('history', HistoryModel, 'upenncontrast_annotation')
ModelImporter.registerModel('document_change', DocumentChangeModel, 'upenncontrast_annotation')
ModelImporter.registerModel(
'document_change', DocumentChangeModel, 'upenncontrast_annotation')

info['apiRoot'].upenn_annotation = Annotation()
info['apiRoot'].annotation_connection = AnnotationConnection()
Expand Down
Loading