tweak _do_upload running outside of class to prevent threads mix

Author: MarcelGeo

mergin/client.py

@@ -106,7 +106,7 @@ def __init__(
         self._user_info = None
         self._server_type = None
         self._server_version = None
-        self._feature_flags = {}
+        self._server_features = {}
         self.upload_chunks_cache = UploadChunksCache()
         self.client_version = "Python-client/" + __version__
         if plugin_version is not None:  # this could be e.g. "Plugin/2020.1 QGIS/3.14"
@@ -396,14 +396,15 @@ def server_features(self):
         """
         Returns feature flags of the server.
         """
-        if self._feature_flags:
-            return self._feature_flags
+        if self._server_features:
+            return self._server_features
         config = self.server_config()
-        return {
+        self._server_features = {
             "v2_push_enabled": config.get("v2_push_enabled", False)
-            and is_version_acceptable(self.server_version(), "2025.6.2"),
+            and is_version_acceptable(self.server_version(), "2025.6.1"),
             "v2_pull_enabled": config.get("v2_pull_enabled", False),
         }
+        return self._server_features
 
     def workspaces_list(self):
         """

mergin/client_push.py

@@ -23,6 +23,14 @@
 from .merginproject import MerginProject
 from .editor import filter_changes
 
+def _do_upload(item, job):
+    """runs in worker thread, have to be defined here to avoid worker threads repeating this function"""
+    if job.is_cancelled:
+        return
+
+    item.upload_blocking()
+    job.transferred_size += item.size
+
 
 class UploadChunksCache:
     """A cache for uploaded chunks to avoid re-uploading them, using checksum as key."""
@@ -101,14 +109,12 @@ def upload_blocking(self):
             checksum_str = checksum.hexdigest()
 
             self.mp.log.debug(f"Uploading {self.file_path} part={self.chunk_index}")
-
             if self.mc.server_features().get("v2_push_enabled"):
                 # use v2 API for uploading chunks
                 self.upload_chunk_v2_api(data, checksum_str)
             else:
                 # use v1 API for uploading chunks
                 self.upload_chunk(data, checksum_str)
-            self.mc.upload_chunks_cache.add(checksum_str, self.chunk_id)
 
             self.mp.log.debug(f"Upload chunk finished: {self.file_path}")
 
@@ -138,17 +144,10 @@ def dump(self):
             print("- {} {} {}".format(item.file_path, item.chunk_index, item.size))
         print("--- END ---")
 
-    def __upload_item(self, item: UploadQueueItem):
-        """Upload a single item in the background"""
-        if self.is_cancelled:
-            return
-
-        item.upload_blocking()
-        self.transferred_size += item.size
 
     def submit_item_to_thread(self, item: UploadQueueItem):
         """Upload a single item in the background"""
-        feature = self.executor.submit(self.__upload_item, item)
+        feature = self.executor.submit(_do_upload, item, self)
         self.futures.append(feature)
 
     def add_items(self, items: List[UploadQueueItem], total_size: int):