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

Add progress context to dicomWEB assetstore _importData #1353

Merged
merged 5 commits into from
Nov 2, 2023
Merged

Add progress context to dicomWEB assetstore _importData #1353

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1f65ad
Add progress context to dwas _importData
willdunklin Nov 1, 2023
775dcae
Merge branch 'master' into amend-dicomweb-assetstore
willdunklin Nov 1, 2023
d8833d2
Merge branch 'master' into amend-dicomweb-assetstore
willdunklin Nov 1, 2023
019c91a
Merge branch 'master' into amend-dicomweb-assetstore
willdunklin Nov 2, 2023
9bf13e4
Clean up dwas progress context handling
willdunklin Nov 2, 2023
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
56 changes: 30 additions & 26 deletions sources/dicom/large_image_source_dicom/assetstore/rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def __init__(self):
self.resourceName = 'dicomweb_assetstore'
self.route('POST', (':id', 'import'), self.importData)

def _importData(self, assetstore, params):
def _importData(self, assetstore, params, progress):
"""

:param assetstore: the destination assetstore.
Expand Down Expand Up @@ -51,28 +51,22 @@ def _importData(self, assetstore, params):
msg = f'Invalid filters: {e}'
raise RestException(msg)

progress = self.boolParam('progress', params, default=False)

adapter = assetstore_utilities.getAssetstoreAdapter(assetstore)
items = adapter.importData(
parent,
destinationType,
{
'limit': limit,
'search_filters': search_filters,
'auth': None,
},
progress,
user,
)

with ProgressContext(
progress, user=user, title='Importing DICOM references',
) as ctx:
items = adapter.importData(
parent,
destinationType,
{
'limit': limit,
'search_filters': search_filters,
'auth': None,
},
ctx,
user,
)

if not items:
msg = 'No DICOM objects matching the search filters were found'
raise RestException(msg)
if not items:
msg = 'No DICOM objects matching the search filters were found'
raise RestException(msg)

@access.admin(scope=TokenScope.DATA_WRITE)
@autoDescribeRoute(
Expand All @@ -87,11 +81,21 @@ def _importData(self, assetstore, params):
.param('limit', 'The maximum number of results to import.',
required=False, dataType='int')
.param('filters', 'Any search parameters to filter DICOM objects.',
required=False, default={})
.param('progress', 'Whether to record progress on this operation ('
'default=False)', required=False, default=False, dataType='boolean')
required=False, default='{}')
.param('progress', 'Whether to record progress on this operation.',
required=False, default=False, dataType='boolean')
.errorResponse()
.errorResponse('You are not an administrator.', 403),
)
def importData(self, assetstore, params):
return self._importData(assetstore, params)
def importData(self, assetstore, destinationId, destinationType, limit, filters, progress):
user = self.getCurrentUser()

with ProgressContext(
progress, user=user, title='Importing DICOM references',
) as ctx:
return self._importData(assetstore, params={
'destinationId': destinationId,
'destinationType': destinationType,
'limit': limit,
'filters': filters,
}, progress=ctx)