girder 5.0.19.dev2__tar.gz → 5.0.19.dev6__tar.gz

{girder-5.0.19.dev2 → girder-5.0.19.dev6}/.circleci/Dockerfile

@@ -37,6 +37,7 @@ ENV NODE_VERSION=22
 RUN mkdir /.nvm && \
     curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | NVM_DIR=/.nvm bash && \
     . /.nvm/nvm.sh && \
+    npm install -g npm@latest && \
     npm config set fetch-timeout 600000 && \
     npm cache clean --force && \
     ln -s $(dirname `which npm`) /usr/local/node

{girder-5.0.19.dev2/girder.egg-info → girder-5.0.19.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.19.dev2
+Version: 5.0.19.dev6
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-5.0.19.dev2 → girder-5.0.19.dev6}/docs/list_env_settings.yaml

@@ -107,3 +107,6 @@ GIRDER_WORKER_JOB_GC_SCOPE: >-
 
 GIRDER_FILESYSTEMASSETSTORE_RESERVED_MBYTES: >-
   For filesystem assetstores, reserve this many megabytes of space.  Uploads will be rejected when there is less than this available.  If using the user quota plugin with fall-back assetstores, it will trigger the fall-back behavior.
+
+GIRDER_SETTING_CORE_SHOW_DOWNLOAD: >-
+  One of "all" (default), "admin", "user", or "none". This determines if download buttons and menu items are visible, and, if so, to which user authentication level.

{girder-5.0.19.dev2 → girder-5.0.19.dev6}/girder/models/upload.py

@@ -2,6 +2,7 @@ import datetime
 import io
 import logging
 
+import pymongo
 from bson.objectid import ObjectId
 
 from girder import events
@@ -142,11 +143,18 @@ class Upload(Model):
 
         assetstore = Assetstore().load(upload['assetstoreId'])
         adapter = assetstore_utilities.getAssetstoreAdapter(assetstore)
-
+        startReceived = upload['received']
         upload = adapter.uploadChunk(upload, chunk, uploadExtraParameters)
-        if '_id' in upload or upload['received'] != upload['size']:
-            upload = self.save(upload)
-
+        if '_id' in upload:
+            self.validate(upload)
+            update_result = self.collection.find_one_and_update(
+                {'_id': upload['_id'], 'received': int(startReceived)},
+                {'$set': {k: v for k, v in upload.items() if k != '_id'}},
+                return_document=pymongo.ReturnDocument.AFTER)
+            if update_result:
+                upload.update(update_result)
+            else:
+                raise GirderException('An upload with this ID was simultaneously modified')
         # If upload is finished, we finalize it
         if upload['received'] == upload['size']:
             file = self.finalizeUpload(upload, assetstore)

{girder-5.0.19.dev2 → girder-5.0.19.dev6}/girder/utility/filesystem_assetstore_adapter.py

@@ -206,8 +206,10 @@ class FilesystemAssetstoreAdapter(AbstractAssetstoreAdapter):
         try:
             self.checkUploadSize(upload, size)
         except ValidationException:
+            # Use the actual file size minus what we just wrote to handle
+            # concurrent uploads that may have updated upload['received'].
             with open(upload['tempFile'], 'a+b') as tempFile:
-                tempFile.truncate(upload['received'])
+                tempFile.truncate(os.path.getsize(upload['tempFile']) - size)
             raise
 
         # Persist the internal state of the checksum

{girder-5.0.19.dev2 → girder-5.0.19.dev6/girder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder
-Version: 5.0.19.dev2
+Version: 5.0.19.dev6
 Summary: Web-based data management platform
 Home-page: https://girder.readthedocs.org
 Author: Kitware, Inc.

{girder-5.0.19.dev2 → girder-5.0.19.dev6}/girder.egg-info/scm_file_list.json

@@ -1028,6 +1028,7 @@
     "test/test_disable_anonymous_access.py",
     "test/test_events.py",
     "test/test_file.py",
+    "test/test_filesystem_assetstore_rollback.py",
     "test/test_folder.py",
     "test/test_fs_assetstore_import.py",
     "test/test_hash_state.py",

girder-5.0.19.dev6/girder.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "5.0.18",
+  "distance": 6,
+  "node": "gf25da797f86a5bc102f6613a32344c1f20130521",
+  "dirty": false,
+  "branch": "master",
+  "node_date": "2026-09-16"
+}

girder-5.0.19.dev2/girder.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "5.0.18",
-  "distance": 2,
-  "node": "g7852cb88360f1a0b8377b8a748d62e38faa52550",
-  "dirty": false,
-  "branch": "master",
-  "node_date": "2026-09-15"
-}