Cosmetic upgrades v1

Author: MarcelGeo

mergin/cli.py

@@ -489,7 +489,7 @@ def sync(ctx):
                     current_bar.finish()
 
                 # A new push job has started. Initialize a new progress bar.
-                click.echo(f"Starting upload")
+                click.echo(f"\nStarting upload")
                 current_job = job
 
                 # The length of the progress bar should be the total size of the job

mergin/client.py

@@ -19,8 +19,8 @@
 from time import sleep
 
 from .common import (
-    PUSH_ATTEMPT_WAIT,
-    PUSH_ATTEMPTS,
+    SYNC_ATTEMPT_WAIT,
+    SYNC_ATTEMPTS,
     SYNC_CALLBACK_WAIT,
     ClientError,
     LoginError,
@@ -1542,13 +1542,13 @@ def sync_project_generator(self, project_directory):
                 _, has_changes = get_push_changes_batch(self, project_directory)
                 server_conflict_attempts = 0
             except ClientError as e:
-                if e.is_retryable_sync() and server_conflict_attempts < PUSH_ATTEMPTS - 1:
+                if e.is_retryable_sync() and server_conflict_attempts < SYNC_ATTEMPTS - 1:
                     # retry on conflict, e.g. when server has changes that we do not have yet
                     mp.log.info(
-                        f"Restarting sync process (conflict on server) - {server_conflict_attempts + 1}/{PUSH_ATTEMPTS}"
+                        f"Restarting sync process (conflict on server) - {server_conflict_attempts + 1}/{SYNC_ATTEMPTS}"
                     )
                     server_conflict_attempts += 1
-                    sleep(PUSH_ATTEMPT_WAIT)
+                    sleep(SYNC_ATTEMPT_WAIT)
                     continue
                 raise e
 

mergin/client_push.py

@@ -36,6 +36,8 @@
 from .editor import filter_changes
 from .utils import get_data_checksum
 
+POST_JSON_HEADERS = {"Content-Type": "application/json"}
+
 
 class UploadChunksCache:
     """A cache for uploaded chunks to avoid re-uploading them, using checksum as key."""
@@ -248,13 +250,13 @@ def create_upload_job(
             mc.post(
                 f"/v2/projects/{project_id}/versions",
                 {**data, "check_only": True},
-                {"Content-Type": "application/json"},
+                POST_JSON_HEADERS,
             )
         else:
             resp = mc.post(
                 f"/v1/project/push/{project_path}",
                 data,
-                {"Content-Type": "application/json"},
+                POST_JSON_HEADERS,
             )
             push_start_resp = json.load(resp)
     except ClientError as err:

mergin/common.py

@@ -15,11 +15,11 @@
 # size of the log file part to send (if file is larger only this size from end will be sent)
 MAX_LOG_FILE_SIZE_TO_SEND = 5 * 1024 * 1024
 
-# number of attempts to push changes (in case of network issues etc)
-PUSH_ATTEMPTS = 10
+# number of attempts of sync changes (in case of conflicted version etc.)
+SYNC_ATTEMPTS = 10
 
-# seconds to wait between attempts to push changes
-PUSH_ATTEMPT_WAIT = 5
+# seconds to wait between attempts to sync changes (in case of conflicted version etc.)
+SYNC_ATTEMPT_WAIT = 5
 
 # seconds to wait between sync callback calls
 SYNC_CALLBACK_WAIT = 0.01

mergin/local_changes.py

@@ -5,6 +5,7 @@
 from .utils import is_versioned_file
 from .common import MAX_UPLOAD_MEDIA_SIZE, MAX_UPLOAD_VERSIONED_SIZE
 
+# Maximum changes uploading to server
 MAX_UPLOAD_CHANGES = 100
 
 

mergin/test/test_client.py

@@ -3198,7 +3198,7 @@ def test_client_project_sync_retry(mc):
             mc.sync_project(project_dir)
         assert mock_push_project_finalize.call_count == 1
 
-    with patch("mergin.client.push_project_async") as mock_push_project_async, patch("mergin.client.PUSH_ATTEMPTS", 2):
+    with patch("mergin.client.push_project_async") as mock_push_project_async, patch("mergin.client.SYNC_ATTEMPTS", 2):
         mock_push_project_async.side_effect = ClientError(
             detail="",
             server_code=ErrorCode.AnotherUploadRunning.value,
@@ -3208,7 +3208,7 @@ def test_client_project_sync_retry(mc):
     assert mock_push_project_async.call_count == 2
 
     # for v1 endpoints we are rising retry just from push start
-    with patch("mergin.client.push_project_async") as mock_push_project_async, patch("mergin.client.PUSH_ATTEMPTS", 2):
+    with patch("mergin.client.push_project_async") as mock_push_project_async, patch("mergin.client.SYNC_ATTEMPTS", 2):
         mock_push_project_async.side_effect = ClientError(
             detail="Another process is running. Please try later.",
             http_error=400,