Skip to content

Commit 356b768

Browse files
authored
Merge pull request #327 from DigitalSlideArchive/max-annotation-input-file-length
Use the large_image max_annotation_input_file_length setting.
2 parents 264e79d + fd783d7 commit 356b768

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

histomicsui/handlers.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import time
44

55
import cachetools
6+
import large_image.config
67
import orjson
78
from girder import logger
89
from girder.constants import AccessType
@@ -134,7 +135,8 @@ def process_annotations(event): # noqa
134135
logger.error('Could not load models from the database')
135136
return
136137
try:
137-
if file['size'] > 1 * 1024 ** 3:
138+
if file['size'] > int(large_image.config.getConfig(
139+
'max_annotation_input_file_length', 1024 ** 3)):
138140
raise Exception('File is larger than will be read into memory.')
139141
data = []
140142
with File().open(file) as fptr:

histomicsui/web_client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
"tinycolor2": "~1.4.1",
4141
"url-search-params-polyfill": "^8.1.1",
4242
"vue": "~2.6.14",
43-
"vue-template-compiler": "~2.6.14",
44-
"vue-loader": "~15.9.8",
4543
"vue-color": "^2.8.1",
44+
"vue-loader": "~15.9.8",
45+
"vue-template-compiler": "~2.6.14",
4646
"webpack": "^3"
4747
},
4848
"devDependencies": {

0 commit comments

Comments
 (0)