large-image-tasks 1.32.10.dev6__tar.gz → 1.32.10.dev10__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: large-image-tasks
3
- Version: 1.32.10.dev6
3
+ Version: 1.32.10.dev10
4
4
  Summary: Girder Worker tasks for Large Image.
5
5
  Author: Kitware Inc
6
6
  Author-email: kitware@kitware.com
@@ -20,10 +20,10 @@ Description-Content-Type: text/x-rst
20
20
  License-File: LICENSE
21
21
  Requires-Dist: girder-worker-utils>=0.8.5
22
22
  Provides-Extra: girder
23
- Requires-Dist: large-image-converter>=1.32.10.dev6; extra == "girder"
23
+ Requires-Dist: large-image-converter>=1.32.10.dev10; extra == "girder"
24
24
  Requires-Dist: girder-worker[girder]>=0.6.0; extra == "girder"
25
25
  Provides-Extra: worker
26
- Requires-Dist: large-image-converter[sources]>=1.32.10.dev6; extra == "worker"
26
+ Requires-Dist: large-image-converter[sources]>=1.32.10.dev10; extra == "worker"
27
27
  Requires-Dist: girder-worker[worker]>=0.6.0; extra == "worker"
28
28
  Dynamic: author
29
29
  Dynamic: author-email
@@ -94,6 +94,7 @@ def convert_image_job(job):
94
94
 
95
95
  from girder_jobs.constants import JobStatus
96
96
  from girder_jobs.models.job import Job
97
+ from girder_large_image.models.image_item import ImageItem
97
98
 
98
99
  from girder.constants import AccessType
99
100
  from girder.models.file import File
@@ -106,6 +107,8 @@ def convert_image_job(job):
106
107
  toFolder = kwargs.pop('toFolder', True)
107
108
  item = Item().load(kwargs.pop('itemId'), force=True)
108
109
  fileObj = File().load(kwargs.pop('fileId'), force=True)
110
+
111
+ mayHaveAdjacent = ImageItem().mayHaveAdjacentFiles(item)
109
112
  userId = kwargs.pop('userId', None)
110
113
  user = User().load(userId, force=True) if userId else None
111
114
  if toFolder:
@@ -131,7 +134,8 @@ def convert_image_job(job):
131
134
  try:
132
135
  inputPath = File().getGirderMountFilePath(
133
136
  fileObj,
134
- **({'preferFlat': True} if 'preferFlat' in inspect.signature(
137
+ **({'preferFlat': True} if mayHaveAdjacent != 'local' and
138
+ 'preferFlat' in inspect.signature(
135
139
  File.getGirderMountFilePath).parameters else {}))
136
140
  except Exception:
137
141
  pass
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: large-image-tasks
3
- Version: 1.32.10.dev6
3
+ Version: 1.32.10.dev10
4
4
  Summary: Girder Worker tasks for Large Image.
5
5
  Author: Kitware Inc
6
6
  Author-email: kitware@kitware.com
@@ -20,10 +20,10 @@ Description-Content-Type: text/x-rst
20
20
  License-File: LICENSE
21
21
  Requires-Dist: girder-worker-utils>=0.8.5
22
22
  Provides-Extra: girder
23
- Requires-Dist: large-image-converter>=1.32.10.dev6; extra == "girder"
23
+ Requires-Dist: large-image-converter>=1.32.10.dev10; extra == "girder"
24
24
  Requires-Dist: girder-worker[girder]>=0.6.0; extra == "girder"
25
25
  Provides-Extra: worker
26
- Requires-Dist: large-image-converter[sources]>=1.32.10.dev6; extra == "worker"
26
+ Requires-Dist: large-image-converter[sources]>=1.32.10.dev10; extra == "worker"
27
27
  Requires-Dist: girder-worker[worker]>=0.6.0; extra == "worker"
28
28
  Dynamic: author
29
29
  Dynamic: author-email
@@ -1,9 +1,9 @@
1
1
  girder-worker-utils>=0.8.5
2
2
 
3
3
  [girder]
4
- large-image-converter>=1.32.10.dev6
4
+ large-image-converter>=1.32.10.dev10
5
5
  girder-worker[girder]>=0.6.0
6
6
 
7
7
  [worker]
8
- large-image-converter[sources]>=1.32.10.dev6
8
+ large-image-converter[sources]>=1.32.10.dev10
9
9
  girder-worker[worker]>=0.6.0